~ubuntu-branches/ubuntu/saucy/f-spot/saucy

« back to all changes in this revision

Viewing changes to src/Term.cs

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane
  • Date: 2010-05-24 10:35:57 UTC
  • mfrom: (2.4.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20100524103557-1j0i8f66caybci2n
Tags: 0.7.0-1
* New upstream release 0.7.0
 + First release of the unstable 0.7 development series. Massive changes.
 + Reparenting and detaching support (Anton Keks) (Closes: #559745)
 + A new Mallard-based documentation (Harold Schreckengost)
 + No longer embeds flickrnet, uses distribution copy (Iain Lane)
 + Adoption of a large amount of Hyena functionality (Paul Lange, Peter
   Goetz)
 + No longer embeds gnome-keyring-sharp
 + Completely rewritten import, much faster and less memory hungry (Ruben
   Vermeersch) (Closes: #559080, #492658, #341790, #357811, #426017) (LP:
   #412091)
 + No longer use gphoto2-sharp, now uses gvfs which is less crash-pron
   (Ruben Vermeersch)
 + Fix Facebook support (Ruben Vermeersch)
 + Modernized unit tests
 + Revamped build (Mike Gemünde)
 + Much improved duplicate detection (much faster too) (Ruben Vermeersch)
 + Mouse selection in Iconview (Vincent Pomey)
 + Image panning support using middle mouse button (Wojciech Dzierżanowski)
 + Timeline slider now restricted to the size of the window (Iain Churcher)
 + Over 100 bugs closed (http://bit.ly/cyVjnD)
   - No more warnings about schema defaults (Closes: #584215) (LP: #586132)
* debian/control: Clean up build deps to match configure checks
* debian/rules: Don't run dh_makeshilbs as we don't ship any shared
  libraries. There are some private ones though, which get picked up and
  result in a useless postinst/postrm call to ldconfig. Thanks, lintian.
* debian/patches/debian_fix-distclean.patch,
  debian/patches/debian_fix_f-spot.exe.config.patch,
  debian/patches/debian_link-system-flickrnet.patch,
  debian/patches/debian_link-system-gnome-keyring.patch,
  debian/patches/debian_disable-unit-tests,
  debian/patches/git_transition_duration.patch,
  debian/patches/ubuntu_fix_folder_export_hang.patch:
  Clean up obsolete patches which are no longer necessary 
* debian/patches/*: Temporarily disable patches which originated from Ubuntu
  and no longer apply cleanly. We will get these back in a future upstream
  development release.
* debian/patches/*: Refresh to apply cleanly 
* debian/rules: Add new include dir to autoreconf call to pick up f-spot
  macros 

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
using Mono.Unix;
12
12
using Gtk;
13
13
using Gdk;
 
14
using Hyena;
14
15
 
15
16
namespace FSpot {
16
17
        public abstract class Term {
17
18
                private ArrayList sub_terms = new ArrayList ();
18
19
                private Term parent = null;
19
 
                private string separator;
20
20
 
21
21
                protected bool is_negated = false;
22
22
                protected Tag tag = null;
287
287
                                return new OrTerm (parent, after);
288
288
                        }
289
289
 
290
 
                        Console.WriteLine ("Do not have Term for operator {0}", op);
 
290
                        Log.DebugFormat ("Do not have Term for operator {0}", op);
291
291
                        return null;
292
292
                }
293
293
        }
433
433
                        }
434
434
                }
435
435
 
436
 
                public static Tooltips Tips {
437
 
                        set {
438
 
                                tips = value;
439
 
                        }
440
 
                }
441
 
 
442
436
                public Tag Tag {
443
437
                        get {
444
438
                                return tag;
529
523
                                Gtk.Drag.DestSet (container, DestDefaults.All, tag_dest_target_table,
530
524
                                                  DragAction.Copy | DragAction.Move );
531
525
 
532
 
                                tips.SetTip (container, tag.Name, null);
 
526
                                container.TooltipText = tag.Name;
533
527
 
534
528
                                label.Show ();
535
529
                                image.Show ();
589
583
                        normal_icon = null;
590
584
                        negated_icon = null;
591
585
                        if (IsNegated) {
592
 
                                tips.SetTip (widget, String.Format (Catalog.GetString ("Not {0}"), tag.Name), null);
 
586
                                widget.TooltipText = String.Format (Catalog.GetString ("Not {0}"), tag.Name);
593
587
                                label.Text = "<s>" + System.Web.HttpUtility.HtmlEncode (tag.Name) + "</s>";
594
588
                                image.Pixbuf = NegatedIcon;
595
589
                        } else {
596
 
                                tips.SetTip (widget, tag.Name, null);
 
590
                                widget.TooltipText = tag.Name;
597
591
                                label.Text = System.Web.HttpUtility.HtmlEncode (tag.Name);
598
592
                                image.Pixbuf = NormalIcon;
599
593
                        }
901
895
                private Widget widget;
902
896
                private Pixbuf negated_icon;
903
897
                private static Pixbuf negated_overlay;
904
 
                private static Tooltips tips;
905
898
                private bool isHoveredOver = false;
906
899
 
907
900
                public delegate void NegatedToggleHandler (Literal group);