← Back to branch summary

~ubuntu-branches/ubuntu/wily/gnome-do/wily

« back to all changes in this revision

Viewing changes to Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2009-06-27 10:40:45 UTC
  • mfrom: (1.1.8 upstream) (0.1.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090627104045-7st10y1cqr6dpz37
Tags: 0.8.2+dfsg-1
https://launchpad.net/bugs/343096
https://launchpad.net/bugs/330025
https://launchpad.net/bugs/361679
https://launchpad.net/bugs/346347
https://launchpad.net/bugs/390150
https://launchpad.net/bugs/354729
https://launchpad.net/bugs/347052
https://launchpad.net/bugs/382843
http://bugs.debian.org/526023
https://launchpad.net/bugs/369988
http://bugs.debian.org/531779
https://launchpad.net/bugs/393729
* New upstream release
  + No longer uses a plugin repository.  Fixes many plugin-
    related issues. (LP: #343096, LP: #330025, LP #345001)
  + No longer blocks on "About Do" (LP: #361679)
  + Reacts correctly when a Composite manager is enabled/
    disabled at runtime. (LP: #346347, LP: #390150)
  + Fixes for space reserved by Docky blocking drag and 
    drop operations. (LP: #354729, LP: #347052, LP: #382843)
  + Properly sets "Hidden" key on autostart files in response to 
    "Start on login" option.  (Closes: #526023) (LP: #369988)
* debian/patches/10_application_search_path:
  + Drop; included upstream
* debian/patches/10_sk_translation_update:
  + Import sk translation update from Debian BTS.
    (Closes: #531779)
* debian/patches/11_fix_autostart_when_directory_does_not_exist:
  + Patch from upstream.  Fixes the "Start on login" option when the 
    ~/.config/autostart directory does not exist. (LP: #393729)
* debian/control:
  + Update standards version to 3.8.2; no changes required.
  + Add libtool to Build-Depends; required for autoreconf.
  + Add Recommends: on new gnome-do-docklets package.
* debian/gnome-do.1
  + Fix spelling: GNOME-Do => GNOME Do.
  + Miscelaneous lintian fixes; NAME section, escaping minus signs with \-
* debian/copyright:
  + Update for new copyright holders.
  + Minor update to DEP-5 format

Show diffs side-by-side

added added

removed removed

Lines of Context:
Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs
41
41
                PositionWindow positionWindow;
42
42
                HBox resultsHBox;
43
43
                IconBox[] iconbox;
44
 
                GConf.Client gconfClient;
45
44
                IDoController controller;
46
45
                
47
46
                const int IconBoxIconSize = 128;
96
95
                {
97
96
                        this.controller = controller;
98
97
                        
99
 
                        gconfClient = new GConf.Client ();
100
 
                        gconfClient.AddNotify ("/desktop/gnome/interface",
101
 
                                new GConf.NotifyEventHandler (DesktopThemeChanged));
102
 
                        
103
98
                        Build ();
104
99
                }
105
100
                
250
245
                        Reposition ();
251
246
                }
252
247
                
253
 
                private void DesktopThemeChanged (object o, GConf.NotifyEventArgs e)
 
248
                protected override void OnStyleSet (Gtk.Style previous_style)
254
249
                {
255
 
                        //this is needed to account for the delay between the gconf change
256
 
                        //and the theme change propogating to this application.
257
 
                        GLib.Timeout.Add (3000, delegate {
258
 
                                Gdk.Threads.Enter ();
259
 
                                frame.FrameColor = frame.FillColor = BackgroundColor;
260
 
                                resultsWindow.UpdateColors (BackgroundColor);
261
 
                                Gdk.Threads.Leave ();
262
 
                                return false;
263
 
                        });
 
250
                        frame.FrameColor = frame.FillColor = BackgroundColor;
 
251
                        resultsWindow.UpdateColors (BackgroundColor);
 
252
                        
 
253
                        base.OnStyleSet (previous_style);
264
254
                }
265
255
                
266
256
                public virtual void Reposition ()
324
314
                {
325
315
                        frame.Radius = Screen.IsComposited ? IconBoxRadius : 0;
326
316
 
327
 
                        PositionWindow.GetMonitor ();
328
317
                        Resize (1, 1);
329
318
                        Reposition ();
330
319
                        Show ();
348
337
                        Resize (1, 1);
349
338
                        Reposition ();
350
339
                        
351
 
                        iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxElement ();
 
340
                        iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxItem ();
352
341
                        label.SetDisplayLabel (Catalog.GetString ("Type to begin searching"), 
353
342
                                               Catalog.GetString ("Type to start searching."));
354
343
                }
382
371
                        if (!context.Results.Any () && !context.LargeTextDisplay) {
383
372
                                if (pane == Pane.First && context.ParentContext == null) {
384
373
                                        iconbox[0].TextOverlay = context.LargeTextDisplay;
385
 
                                        iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxElement ();
 
374
                                        iconbox[0].DisplayObject = new Do.Interface.Widgets.DefaultIconBoxItem ();
386
375
                                        label.SetDisplayLabel (Catalog.GetString ("Type to begin searching"), 
387
376
                                                               Catalog.GetString ("Type to start searching."));
388
377
                                } else {
389
 
                                        Element noRes = new NoResultsFoundElement (context.Query);
 
378
                                        Do.Universe.Item noRes = new NoResultsFoundItem (context.Query);
390
379
                                        for (int i = (int) pane; i < 3; i++) {
391
380
                                                iconbox[i].Clear ();
392
381
                                                iconbox[i].DisplayObject = noRes;
401
390
                        
402
391
                        if (string.IsNullOrEmpty (context.Query) && context.LargeTextDisplay) {
403
392
                                iconbox[(int) pane].TextOverlay = context.LargeTextDisplay;
404
 
                                iconbox[(int) pane].DisplayObject = new TextItem ("Enter Text") as Element;
 
393
                                iconbox[(int) pane].DisplayObject = new TextItem ("Enter Text") as Do.Universe.Item;
405
394
 
406
395
                                if (!context.Results.Any ()) return;
407
396
                        } else {