deskbar-applet-02-multihead-support.diff revision 13275
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings--- deskbar-applet-2.23.2.old/deskbar/ui/AbstractCuemiacDeskbarIcon.py 2008-05-29 16:18:39.929746000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+++ deskbar-applet-2.23.2/deskbar/ui/AbstractCuemiacDeskbarIcon.py 2008-05-29 16:20:59.272081000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -31,7 +31,7 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self._active_view = deskbar.BUTTON_UI_NAME
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def create_window_ui(self):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings- self._view = CuemiacWindowView(self._controller, self._core)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+ self._view = CuemiacWindowView(self._controller, self._core, self.applet)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self._active_view = deskbar.WINDOW_UI_NAME
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def _setup_core (self):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings--- deskbar-applet-2.23.2.old/deskbar/ui/CuemiacAlignedView.py 2008-05-29 16:18:39.930265000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+++ deskbar-applet-2.23.2/deskbar/ui/CuemiacAlignedView.py 2008-05-29 16:27:55.476993000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -24,6 +24,7 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self.set_type_hint (gtk.gdk.WINDOW_TYPE_HINT_MENU)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self.applet.set_applet_flags(gnomeapplet.EXPAND_MINOR)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self.applet.connect("change-orient", self._on_change_orient)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self._screen_height = self.get_screen().get_height ()
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -59,6 +60,9 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def get_toplevel(self):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+ def get_topwindow(self):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def receive_focus(self, time):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -135,4 +139,4 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self.vbox_main.reorder_child(self.results_box, 0)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings\ No newline at end of file
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings--- deskbar-applet-2.23.2.old/deskbar/ui/CuemiacWindowView.py 2008-05-29 16:18:39.930125000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+++ deskbar-applet-2.23.2/deskbar/ui/CuemiacWindowView.py 2008-05-29 16:25:32.072521000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -8,11 +8,13 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings This class is responsible for setting up the GUI.
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings- def __init__(self, controller, model):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+ def __init__(self, controller, model, applet):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings AbstractCuemiacView.__init__(self, controller, model)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self.__small_window_height = None
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self.connect("configure-event", self.__save_window_size)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings self.connect("delete-event", self._controller.on_quit)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -50,7 +52,10 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def get_toplevel(self):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+ def get_topwindow(self):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def receive_focus(self, time):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings--- deskbar-applet-2.23.2.old/deskbar/ui/CuemiacWindowController.py 2008-05-29 16:18:39.929974000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+++ deskbar-applet-2.23.2/deskbar/ui/CuemiacWindowController.py 2008-05-29 16:24:18.865026000 +0100
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -1,6 +1,6 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings-import gnomevfs
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings import logging
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings import deskbar
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings@@ -49,14 +49,14 @@
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def on_show_about(self, sender):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def on_show_preferences(self, sender):
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings prefs = DeskbarPreferences(self._model)
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings- prefs.show_run_hide(self._view.get_toplevel())
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings+ prefs.show_run_hide(self._view.get_topwindow())
449854c2a07b50ea64d9d6a8b03d18d4afeeee43Ken Stubbings def on_show_help(self, sender):
- gnomevfs.url_show("ghelp:deskbar")
+ gnome.ui.help_display_uri_on_screen("ghelp:deskbar", (self._view_get_topwindow()).get_screen())