Merge lp:~francesco-marella/specto/code-to-glade into lp:specto
- code-to-glade
- Merge into main
Status: | Needs review |
---|---|
Proposed branch: | lp:~francesco-marella/specto/code-to-glade |
Merge into: | lp:specto |
Diff against target: |
1731 lines (+626/-427) 7 files modified
data/uis/about.ui (+59/-0) data/uis/import_export.ui (+117/-24) data/uis/notifier.ui (+399/-186) spectlib/about.py (+8/-25) spectlib/export_watch.py (+15/-59) spectlib/import_watch.py (+15/-54) spectlib/notifier.py (+13/-79) |
To merge this branch: | bzr merge lp:~francesco-marella/specto/code-to-glade |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeff Fortin Tam | Needs Fixing | ||
Review via email: mp+60883@code.launchpad.net |
Commit message
Description of the change
- 168. By Francesco Marella
-
some fixes, but the checkboxes are still not centered
thanks to Jeff for pointing out these regressions.
- 169. By Francesco Marella
-
vertical scrollbar -> never
Francesco Marella (francesco-marella) wrote : | # |
Hi Jeff, thanks for your review. Some comments inline.
> This is quite interesting! A couple of things though:
>
> - mousing over the "Add" submenu makes two menus appear (the toolbar's popup
> menu shows up). Wtf?
Fixed.
> - how do we actually edit the contents now? What's the difference in the glade
> editor?
We still edit the contents like before. We create in glade some more widgets (eg. TreeViewColumns and CellRenderers) and then we get these objects via GtkBuilder.
> - maybe you want to take a look at lp:~kiddo/specto/pygi too
Yeah, I've tried to start it but crashes. (pygi + Gtk+ 3.0)
> - I guess this simplifies the code a lot, however I'd like someone else to
> review this too
> - it looks different than the current UI... the patch below makes it ressemble
> the main branch more, but it still has different column headers, the
> checkboxes are not centered, etc.
Thanks for the patch. I've tried to align the checkboxes with no luck in glade, I wonder if it's a bug. I'll ping you again when this issue will be fixed.
>
>
>
> === modified file 'data/uis/
> --- data/uis/
> +++ data/uis/
> @@ -1,7 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <interface>
> <requires lib="gtk+" version="2.18"/>
> - <!-- interface-
> <object class="
> <object class="GtkWindow" id="error_dialog">
> <property name="can_
> @@ -57,8 +56,6 @@
> <object class="
> <property name="visible"
> <property name="can_
> - <property name="hscrollba
> - <property name="vscrollba
> <child>
> <object class="GtkTextView" id="error_message">
> <property name="height_
> @@ -612,18 +609,19 @@
> <property name="visible"
> <property name="can_
> <property name="hscrollba
> - <property name="vscrollba
> <property name="shadow_
> <child>
> <object class="GtkTreeView" id="treeview">
> <property name="visible"
> <property name="can_
> <property name="model"
> - <property name="headers_
> + <property name="rules_
> <property name="search_
> - <property name="enable_
> <signal name="cursor-
> swapped="no"/>
> <signal name="row-
> swapped="no"/>
> + <child internal-
> + ...
Unmerged revisions
- 169. By Francesco Marella
-
vertical scrollbar -> never
- 168. By Francesco Marella
-
some fixes, but the checkboxes are still not centered
thanks to Jeff for pointing out these regressions.
- 167. By Francesco Marella
-
Move GUI code to Glade files (treeview related code mostly)
Glade (v. 3.8) it's a great tool for GUI creation and improved so much (read as no frequent crashes).
The process of migrate Specto to PyGI and GTK+ 3.0 will be easier and painless (hopefully).GTK+ >= 2.18 is required.
Preview Diff
1 | === added file 'data/uis/about.ui' | |||
2 | --- data/uis/about.ui 1970-01-01 00:00:00 +0000 | |||
3 | +++ data/uis/about.ui 2011-05-24 17:11:46 +0000 | |||
4 | @@ -0,0 +1,59 @@ | |||
5 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
6 | 2 | <interface> | ||
7 | 3 | <requires lib="gtk+" version="2.18"/> | ||
8 | 4 | <!-- interface-naming-policy project-wide --> | ||
9 | 5 | <object class="GtkAboutDialog" id="aboutdialog1"> | ||
10 | 6 | <property name="can_focus">False</property> | ||
11 | 7 | <property name="border_width">5</property> | ||
12 | 8 | <property name="type_hint">dialog</property> | ||
13 | 9 | <property name="program_name">Specto</property> | ||
14 | 10 | <property name="copyright" translatable="yes">Copyright © Jean-François Fortin Tam & Wout Clymans</property> | ||
15 | 11 | <property name="comments" translatable="yes">Be notified of everything</property> | ||
16 | 12 | <property name="website">http://specto.sourceforge.net</property> | ||
17 | 13 | <property name="website_label" translatable="yes">Specto's Website</property> | ||
18 | 14 | <property name="authors">Project and copyright owners | ||
19 | 15 | ---------------------------- | ||
20 | 16 | Jean-François "Kiddo" Fortin Tam | ||
21 | 17 | Wout Clymans | ||
22 | 18 | |||
23 | 19 | Developers | ||
24 | 20 | ----------- | ||
25 | 21 | Jean-François "Kiddo" Fortin Tam | ||
26 | 22 | Wout Clymans | ||
27 | 23 | Francesco Marella <fmarl@paranoici.org> | ||
28 | 24 | |||
29 | 25 | Past contributors | ||
30 | 26 | ----------------- | ||
31 | 27 | Christopher Halse Rogers | ||
32 | 28 | Pascal Potvin | ||
33 | 29 | Giulio "Dullboy" Lotti | ||
34 | 30 | Thomas McColgan | ||
35 | 31 | Conor "Majikstreet" Callahan | ||
36 | 32 | "Trygvebw" | ||
37 | 33 | Adrian "Hikaru79" Petrescu</property> | ||
38 | 34 | <property name="translator_credits" translatable="yes">translator-credits</property> | ||
39 | 35 | <child internal-child="vbox"> | ||
40 | 36 | <object class="GtkVBox" id="dialog-vbox1"> | ||
41 | 37 | <property name="visible">True</property> | ||
42 | 38 | <property name="can_focus">False</property> | ||
43 | 39 | <property name="spacing">2</property> | ||
44 | 40 | <child internal-child="action_area"> | ||
45 | 41 | <object class="GtkHButtonBox" id="dialog-action_area1"> | ||
46 | 42 | <property name="visible">True</property> | ||
47 | 43 | <property name="can_focus">False</property> | ||
48 | 44 | <property name="layout_style">end</property> | ||
49 | 45 | </object> | ||
50 | 46 | <packing> | ||
51 | 47 | <property name="expand">False</property> | ||
52 | 48 | <property name="fill">True</property> | ||
53 | 49 | <property name="pack_type">end</property> | ||
54 | 50 | <property name="position">0</property> | ||
55 | 51 | </packing> | ||
56 | 52 | </child> | ||
57 | 53 | <child> | ||
58 | 54 | <placeholder/> | ||
59 | 55 | </child> | ||
60 | 56 | </object> | ||
61 | 57 | </child> | ||
62 | 58 | </object> | ||
63 | 59 | </interface> | ||
64 | 0 | 60 | ||
65 | === modified file 'data/uis/import_export.ui' | |||
66 | --- data/uis/import_export.ui 2010-10-28 17:50:39 +0000 | |||
67 | +++ data/uis/import_export.ui 2011-05-24 17:11:46 +0000 | |||
68 | @@ -1,9 +1,15 @@ | |||
69 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
70 | 2 | <interface> | 2 | <interface> |
72 | 3 | <requires lib="gtk+" version="2.16"/> | 3 | <requires lib="gtk+" version="2.18"/> |
73 | 4 | <!-- interface-naming-policy toplevel-contextual --> | 4 | <!-- interface-naming-policy toplevel-contextual --> |
74 | 5 | <object class="GtkAdjustment" id="adjustment1"> | ||
75 | 6 | <property name="upper">100</property> | ||
76 | 7 | <property name="step_increment">1</property> | ||
77 | 8 | <property name="page_increment">10</property> | ||
78 | 9 | </object> | ||
79 | 5 | <object class="GtkDialog" id="import_export"> | 10 | <object class="GtkDialog" id="import_export"> |
80 | 6 | <property name="visible">True</property> | 11 | <property name="visible">True</property> |
81 | 12 | <property name="can_focus">False</property> | ||
82 | 7 | <property name="border_width">12</property> | 13 | <property name="border_width">12</property> |
83 | 8 | <property name="title">dialog1</property> | 14 | <property name="title">dialog1</property> |
84 | 9 | <property name="default_height">150</property> | 15 | <property name="default_height">150</property> |
85 | @@ -11,29 +17,12 @@ | |||
86 | 11 | <child internal-child="vbox"> | 17 | <child internal-child="vbox"> |
87 | 12 | <object class="GtkVBox" id="dialog-vbox1"> | 18 | <object class="GtkVBox" id="dialog-vbox1"> |
88 | 13 | <property name="visible">True</property> | 19 | <property name="visible">True</property> |
89 | 20 | <property name="can_focus">False</property> | ||
90 | 14 | <property name="spacing">12</property> | 21 | <property name="spacing">12</property> |
91 | 15 | <child> | ||
92 | 16 | <object class="GtkScrolledWindow" id="scrolledwindow1"> | ||
93 | 17 | <property name="height_request">250</property> | ||
94 | 18 | <property name="visible">True</property> | ||
95 | 19 | <property name="can_focus">True</property> | ||
96 | 20 | <property name="hscrollbar_policy">automatic</property> | ||
97 | 21 | <property name="vscrollbar_policy">automatic</property> | ||
98 | 22 | <property name="shadow_type">in</property> | ||
99 | 23 | <child> | ||
100 | 24 | <object class="GtkTreeView" id="treeview"> | ||
101 | 25 | <property name="visible">True</property> | ||
102 | 26 | <property name="can_focus">True</property> | ||
103 | 27 | </object> | ||
104 | 28 | </child> | ||
105 | 29 | </object> | ||
106 | 30 | <packing> | ||
107 | 31 | <property name="position">1</property> | ||
108 | 32 | </packing> | ||
109 | 33 | </child> | ||
110 | 34 | <child internal-child="action_area"> | 22 | <child internal-child="action_area"> |
111 | 35 | <object class="GtkHButtonBox" id="dialog-action_area1"> | 23 | <object class="GtkHButtonBox" id="dialog-action_area1"> |
112 | 36 | <property name="visible">True</property> | 24 | <property name="visible">True</property> |
113 | 25 | <property name="can_focus">False</property> | ||
114 | 37 | <property name="layout_style">end</property> | 26 | <property name="layout_style">end</property> |
115 | 38 | <child> | 27 | <child> |
116 | 39 | <object class="GtkButton" id="button_select_all"> | 28 | <object class="GtkButton" id="button_select_all"> |
117 | @@ -42,8 +31,9 @@ | |||
118 | 42 | <property name="can_focus">True</property> | 31 | <property name="can_focus">True</property> |
119 | 43 | <property name="can_default">True</property> | 32 | <property name="can_default">True</property> |
120 | 44 | <property name="receives_default">False</property> | 33 | <property name="receives_default">False</property> |
121 | 34 | <property name="use_action_appearance">False</property> | ||
122 | 45 | <property name="use_underline">True</property> | 35 | <property name="use_underline">True</property> |
124 | 46 | <signal name="clicked" handler="on_button_select_all_clicked"/> | 36 | <signal name="clicked" handler="select_all" swapped="no"/> |
125 | 47 | </object> | 37 | </object> |
126 | 48 | <packing> | 38 | <packing> |
127 | 49 | <property name="expand">False</property> | 39 | <property name="expand">False</property> |
128 | @@ -58,8 +48,9 @@ | |||
129 | 58 | <property name="can_focus">True</property> | 48 | <property name="can_focus">True</property> |
130 | 59 | <property name="can_default">True</property> | 49 | <property name="can_default">True</property> |
131 | 60 | <property name="receives_default">False</property> | 50 | <property name="receives_default">False</property> |
132 | 51 | <property name="use_action_appearance">False</property> | ||
133 | 61 | <property name="use_underline">True</property> | 52 | <property name="use_underline">True</property> |
135 | 62 | <signal name="clicked" handler="on_button_deselect_all_clicked"/> | 53 | <signal name="clicked" handler="deselect_all" swapped="no"/> |
136 | 63 | </object> | 54 | </object> |
137 | 64 | <packing> | 55 | <packing> |
138 | 65 | <property name="expand">False</property> | 56 | <property name="expand">False</property> |
139 | @@ -74,8 +65,9 @@ | |||
140 | 74 | <property name="can_focus">True</property> | 65 | <property name="can_focus">True</property> |
141 | 75 | <property name="can_default">True</property> | 66 | <property name="can_default">True</property> |
142 | 76 | <property name="receives_default">False</property> | 67 | <property name="receives_default">False</property> |
143 | 68 | <property name="use_action_appearance">False</property> | ||
144 | 77 | <property name="use_stock">True</property> | 69 | <property name="use_stock">True</property> |
146 | 78 | <signal name="clicked" handler="on_button_close_clicked"/> | 70 | <signal name="clicked" handler="delete_event" swapped="no"/> |
147 | 79 | </object> | 71 | </object> |
148 | 80 | <packing> | 72 | <packing> |
149 | 81 | <property name="expand">False</property> | 73 | <property name="expand">False</property> |
150 | @@ -89,8 +81,9 @@ | |||
151 | 89 | <property name="visible">True</property> | 81 | <property name="visible">True</property> |
152 | 90 | <property name="can_focus">False</property> | 82 | <property name="can_focus">False</property> |
153 | 91 | <property name="receives_default">False</property> | 83 | <property name="receives_default">False</property> |
154 | 84 | <property name="use_action_appearance">False</property> | ||
155 | 92 | <property name="use_stock">True</property> | 85 | <property name="use_stock">True</property> |
157 | 93 | <signal name="clicked" handler="on_button_action_clicked"/> | 86 | <signal name="clicked" handler="do_action" swapped="no"/> |
158 | 94 | </object> | 87 | </object> |
159 | 95 | <packing> | 88 | <packing> |
160 | 96 | <property name="expand">False</property> | 89 | <property name="expand">False</property> |
161 | @@ -101,10 +94,96 @@ | |||
162 | 101 | </object> | 94 | </object> |
163 | 102 | <packing> | 95 | <packing> |
164 | 103 | <property name="expand">False</property> | 96 | <property name="expand">False</property> |
165 | 97 | <property name="fill">True</property> | ||
166 | 104 | <property name="pack_type">end</property> | 98 | <property name="pack_type">end</property> |
167 | 105 | <property name="position">0</property> | 99 | <property name="position">0</property> |
168 | 106 | </packing> | 100 | </packing> |
169 | 107 | </child> | 101 | </child> |
170 | 102 | <child> | ||
171 | 103 | <object class="GtkScrolledWindow" id="scrolledwindow1"> | ||
172 | 104 | <property name="height_request">250</property> | ||
173 | 105 | <property name="visible">True</property> | ||
174 | 106 | <property name="can_focus">True</property> | ||
175 | 107 | <property name="hscrollbar_policy">automatic</property> | ||
176 | 108 | <property name="vscrollbar_policy">automatic</property> | ||
177 | 109 | <property name="shadow_type">in</property> | ||
178 | 110 | <child> | ||
179 | 111 | <object class="GtkTreeView" id="treeview"> | ||
180 | 112 | <property name="visible">True</property> | ||
181 | 113 | <property name="can_focus">True</property> | ||
182 | 114 | <property name="model">liststore1</property> | ||
183 | 115 | <property name="search_column">3</property> | ||
184 | 116 | <child> | ||
185 | 117 | <object class="GtkTreeViewColumn" id="select_treeviewcolumn"> | ||
186 | 118 | <property name="title" translatable="yes">Select</property> | ||
187 | 119 | <property name="clickable">True</property> | ||
188 | 120 | <child> | ||
189 | 121 | <object class="GtkCellRendererToggle" id="cellrenderertoggle1"> | ||
190 | 122 | <signal name="toggled" handler="check_clicked" swapped="no"/> | ||
191 | 123 | </object> | ||
192 | 124 | <attributes> | ||
193 | 125 | <attribute name="active">0</attribute> | ||
194 | 126 | </attributes> | ||
195 | 127 | </child> | ||
196 | 128 | </object> | ||
197 | 129 | </child> | ||
198 | 130 | <child> | ||
199 | 131 | <object class="GtkTreeViewColumn" id="type_treeviewcolumn"> | ||
200 | 132 | <property name="title" translatable="yes">Type</property> | ||
201 | 133 | <child> | ||
202 | 134 | <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/> | ||
203 | 135 | <attributes> | ||
204 | 136 | <attribute name="pixbuf">1</attribute> | ||
205 | 137 | </attributes> | ||
206 | 138 | </child> | ||
207 | 139 | </object> | ||
208 | 140 | </child> | ||
209 | 141 | <child> | ||
210 | 142 | <object class="GtkTreeViewColumn" id="name_treeviewcolumn"> | ||
211 | 143 | <property name="resizable">True</property> | ||
212 | 144 | <property name="title" translatable="yes">Name</property> | ||
213 | 145 | <property name="expand">True</property> | ||
214 | 146 | <child> | ||
215 | 147 | <object class="GtkCellRendererText" id="cellrenderertext1"/> | ||
216 | 148 | <attributes> | ||
217 | 149 | <attribute name="text">2</attribute> | ||
218 | 150 | </attributes> | ||
219 | 151 | </child> | ||
220 | 152 | </object> | ||
221 | 153 | </child> | ||
222 | 154 | <child> | ||
223 | 155 | <object class="GtkTreeViewColumn" id="_ID_treeviewcolumn"> | ||
224 | 156 | <property name="visible">False</property> | ||
225 | 157 | <property name="title" translatable="yes">ID</property> | ||
226 | 158 | <child> | ||
227 | 159 | <object class="GtkCellRendererText" id="cellrenderertext3"/> | ||
228 | 160 | <attributes> | ||
229 | 161 | <attribute name="text">3</attribute> | ||
230 | 162 | </attributes> | ||
231 | 163 | </child> | ||
232 | 164 | </object> | ||
233 | 165 | </child> | ||
234 | 166 | <child> | ||
235 | 167 | <object class="GtkTreeViewColumn" id="_TYPE_treeviewcolumn"> | ||
236 | 168 | <property name="visible">False</property> | ||
237 | 169 | <property name="title" translatable="yes">TYPE</property> | ||
238 | 170 | <child> | ||
239 | 171 | <object class="GtkCellRendererText" id="cellrenderertext2"/> | ||
240 | 172 | <attributes> | ||
241 | 173 | <attribute name="text">4</attribute> | ||
242 | 174 | </attributes> | ||
243 | 175 | </child> | ||
244 | 176 | </object> | ||
245 | 177 | </child> | ||
246 | 178 | </object> | ||
247 | 179 | </child> | ||
248 | 180 | </object> | ||
249 | 181 | <packing> | ||
250 | 182 | <property name="expand">True</property> | ||
251 | 183 | <property name="fill">True</property> | ||
252 | 184 | <property name="position">1</property> | ||
253 | 185 | </packing> | ||
254 | 186 | </child> | ||
255 | 108 | </object> | 187 | </object> |
256 | 109 | </child> | 188 | </child> |
257 | 110 | <action-widgets> | 189 | <action-widgets> |
258 | @@ -114,4 +193,18 @@ | |||
259 | 114 | <action-widget response="0">button_action</action-widget> | 193 | <action-widget response="0">button_action</action-widget> |
260 | 115 | </action-widgets> | 194 | </action-widgets> |
261 | 116 | </object> | 195 | </object> |
262 | 196 | <object class="GtkListStore" id="liststore1"> | ||
263 | 197 | <columns> | ||
264 | 198 | <!-- column-name gboolean1 --> | ||
265 | 199 | <column type="gboolean"/> | ||
266 | 200 | <!-- column-name GdkPixbuf1 --> | ||
267 | 201 | <column type="GdkPixbuf"/> | ||
268 | 202 | <!-- column-name gchararray2 --> | ||
269 | 203 | <column type="gchararray"/> | ||
270 | 204 | <!-- column-name gint1 --> | ||
271 | 205 | <column type="gint"/> | ||
272 | 206 | <!-- column-name gchararray3 --> | ||
273 | 207 | <column type="gchararray"/> | ||
274 | 208 | </columns> | ||
275 | 209 | </object> | ||
276 | 117 | </interface> | 210 | </interface> |
277 | 118 | 211 | ||
278 | === modified file 'data/uis/notifier.ui' | |||
279 | --- data/uis/notifier.ui 2011-01-10 18:26:51 +0000 | |||
280 | +++ data/uis/notifier.ui 2011-05-24 17:11:46 +0000 | |||
281 | @@ -1,70 +1,286 @@ | |||
282 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
283 | 2 | <interface> | 2 | <interface> |
285 | 3 | <requires lib="gtk+" version="2.16"/> | 3 | <requires lib="gtk+" version="2.18"/> |
286 | 4 | <!-- interface-naming-policy toplevel-contextual --> | 4 | <!-- interface-naming-policy toplevel-contextual --> |
287 | 5 | <object class="GtkAccelGroup" id="accelgroup1"/> | ||
288 | 6 | <object class="GtkWindow" id="error_dialog"> | ||
289 | 7 | <property name="can_focus">False</property> | ||
290 | 8 | <property name="title" translatable="yes">Error</property> | ||
291 | 9 | <property name="resizable">False</property> | ||
292 | 10 | <property name="window_position">center-on-parent</property> | ||
293 | 11 | <child> | ||
294 | 12 | <object class="GtkVBox" id="vbox1"> | ||
295 | 13 | <property name="visible">True</property> | ||
296 | 14 | <property name="can_focus">False</property> | ||
297 | 15 | <property name="border_width">6</property> | ||
298 | 16 | <child> | ||
299 | 17 | <object class="GtkHBox" id="hbox4"> | ||
300 | 18 | <property name="visible">True</property> | ||
301 | 19 | <property name="can_focus">False</property> | ||
302 | 20 | <child> | ||
303 | 21 | <object class="GtkImage" id="image"> | ||
304 | 22 | <property name="visible">True</property> | ||
305 | 23 | <property name="can_focus">False</property> | ||
306 | 24 | <property name="stock">gtk-missing-image</property> | ||
307 | 25 | </object> | ||
308 | 26 | <packing> | ||
309 | 27 | <property name="expand">True</property> | ||
310 | 28 | <property name="fill">True</property> | ||
311 | 29 | <property name="position">0</property> | ||
312 | 30 | </packing> | ||
313 | 31 | </child> | ||
314 | 32 | <child> | ||
315 | 33 | <object class="GtkLabel" id="label4"> | ||
316 | 34 | <property name="visible">True</property> | ||
317 | 35 | <property name="can_focus">False</property> | ||
318 | 36 | </object> | ||
319 | 37 | <packing> | ||
320 | 38 | <property name="expand">True</property> | ||
321 | 39 | <property name="fill">True</property> | ||
322 | 40 | <property name="padding">6</property> | ||
323 | 41 | <property name="position">1</property> | ||
324 | 42 | </packing> | ||
325 | 43 | </child> | ||
326 | 44 | </object> | ||
327 | 45 | <packing> | ||
328 | 46 | <property name="expand">False</property> | ||
329 | 47 | <property name="fill">False</property> | ||
330 | 48 | <property name="padding">6</property> | ||
331 | 49 | <property name="position">0</property> | ||
332 | 50 | </packing> | ||
333 | 51 | </child> | ||
334 | 52 | <child> | ||
335 | 53 | <object class="GtkExpander" id="expander1"> | ||
336 | 54 | <property name="visible">True</property> | ||
337 | 55 | <property name="can_focus">True</property> | ||
338 | 56 | <child> | ||
339 | 57 | <object class="GtkScrolledWindow" id="scrolledwindow1"> | ||
340 | 58 | <property name="visible">True</property> | ||
341 | 59 | <property name="can_focus">True</property> | ||
342 | 60 | <child> | ||
343 | 61 | <object class="GtkTextView" id="error_message"> | ||
344 | 62 | <property name="height_request">200</property> | ||
345 | 63 | <property name="visible">True</property> | ||
346 | 64 | <property name="can_focus">True</property> | ||
347 | 65 | </object> | ||
348 | 66 | </child> | ||
349 | 67 | </object> | ||
350 | 68 | </child> | ||
351 | 69 | <child type="label"> | ||
352 | 70 | <object class="GtkLabel" id="label2"> | ||
353 | 71 | <property name="visible">True</property> | ||
354 | 72 | <property name="can_focus">False</property> | ||
355 | 73 | <property name="label" translatable="yes">Debug information</property> | ||
356 | 74 | </object> | ||
357 | 75 | </child> | ||
358 | 76 | </object> | ||
359 | 77 | <packing> | ||
360 | 78 | <property name="expand">True</property> | ||
361 | 79 | <property name="fill">True</property> | ||
362 | 80 | <property name="padding">6</property> | ||
363 | 81 | <property name="position">1</property> | ||
364 | 82 | </packing> | ||
365 | 83 | </child> | ||
366 | 84 | <child> | ||
367 | 85 | <object class="GtkHSeparator" id="hseparator1"> | ||
368 | 86 | <property name="visible">True</property> | ||
369 | 87 | <property name="can_focus">False</property> | ||
370 | 88 | </object> | ||
371 | 89 | <packing> | ||
372 | 90 | <property name="expand">False</property> | ||
373 | 91 | <property name="fill">True</property> | ||
374 | 92 | <property name="padding">6</property> | ||
375 | 93 | <property name="position">2</property> | ||
376 | 94 | </packing> | ||
377 | 95 | </child> | ||
378 | 96 | <child> | ||
379 | 97 | <object class="GtkHBox" id="hbox3"> | ||
380 | 98 | <property name="visible">True</property> | ||
381 | 99 | <property name="can_focus">False</property> | ||
382 | 100 | <child> | ||
383 | 101 | <object class="GtkButton" id="send"> | ||
384 | 102 | <property name="label" translatable="yes">Visit the issue tracker</property> | ||
385 | 103 | <property name="visible">True</property> | ||
386 | 104 | <property name="can_focus">True</property> | ||
387 | 105 | <property name="receives_default">True</property> | ||
388 | 106 | <property name="use_action_appearance">False</property> | ||
389 | 107 | </object> | ||
390 | 108 | <packing> | ||
391 | 109 | <property name="expand">True</property> | ||
392 | 110 | <property name="fill">True</property> | ||
393 | 111 | <property name="padding">6</property> | ||
394 | 112 | <property name="position">0</property> | ||
395 | 113 | </packing> | ||
396 | 114 | </child> | ||
397 | 115 | <child> | ||
398 | 116 | <object class="GtkLabel" id="label3"> | ||
399 | 117 | <property name="visible">True</property> | ||
400 | 118 | <property name="can_focus">False</property> | ||
401 | 119 | </object> | ||
402 | 120 | <packing> | ||
403 | 121 | <property name="expand">True</property> | ||
404 | 122 | <property name="fill">True</property> | ||
405 | 123 | <property name="padding">6</property> | ||
406 | 124 | <property name="position">1</property> | ||
407 | 125 | </packing> | ||
408 | 126 | </child> | ||
409 | 127 | <child> | ||
410 | 128 | <object class="GtkLabel" id="label1"> | ||
411 | 129 | <property name="visible">True</property> | ||
412 | 130 | <property name="can_focus">False</property> | ||
413 | 131 | </object> | ||
414 | 132 | <packing> | ||
415 | 133 | <property name="expand">True</property> | ||
416 | 134 | <property name="fill">True</property> | ||
417 | 135 | <property name="position">2</property> | ||
418 | 136 | </packing> | ||
419 | 137 | </child> | ||
420 | 138 | <child> | ||
421 | 139 | <object class="GtkButton" id="ok"> | ||
422 | 140 | <property name="label">gtk-ok</property> | ||
423 | 141 | <property name="visible">True</property> | ||
424 | 142 | <property name="can_focus">True</property> | ||
425 | 143 | <property name="receives_default">True</property> | ||
426 | 144 | <property name="use_action_appearance">False</property> | ||
427 | 145 | <property name="use_stock">True</property> | ||
428 | 146 | </object> | ||
429 | 147 | <packing> | ||
430 | 148 | <property name="expand">True</property> | ||
431 | 149 | <property name="fill">True</property> | ||
432 | 150 | <property name="padding">6</property> | ||
433 | 151 | <property name="position">3</property> | ||
434 | 152 | </packing> | ||
435 | 153 | </child> | ||
436 | 154 | </object> | ||
437 | 155 | <packing> | ||
438 | 156 | <property name="expand">False</property> | ||
439 | 157 | <property name="fill">False</property> | ||
440 | 158 | <property name="padding">6</property> | ||
441 | 159 | <property name="position">3</property> | ||
442 | 160 | </packing> | ||
443 | 161 | </child> | ||
444 | 162 | </object> | ||
445 | 163 | </child> | ||
446 | 164 | </object> | ||
447 | 165 | <object class="GtkImage" id="image1"> | ||
448 | 166 | <property name="visible">True</property> | ||
449 | 167 | <property name="can_focus">False</property> | ||
450 | 168 | <property name="stock">gtk-open</property> | ||
451 | 169 | </object> | ||
452 | 170 | <object class="GtkImage" id="image2"> | ||
453 | 171 | <property name="visible">True</property> | ||
454 | 172 | <property name="can_focus">False</property> | ||
455 | 173 | <property name="stock">gtk-save</property> | ||
456 | 174 | </object> | ||
457 | 175 | <object class="GtkImage" id="image3"> | ||
458 | 176 | <property name="visible">True</property> | ||
459 | 177 | <property name="can_focus">False</property> | ||
460 | 178 | <property name="stock">gtk-clear</property> | ||
461 | 179 | </object> | ||
462 | 180 | <object class="GtkImage" id="image4"> | ||
463 | 181 | <property name="visible">True</property> | ||
464 | 182 | <property name="can_focus">False</property> | ||
465 | 183 | <property name="stock">gtk-clear</property> | ||
466 | 184 | </object> | ||
467 | 185 | <object class="GtkImage" id="image5"> | ||
468 | 186 | <property name="visible">True</property> | ||
469 | 187 | <property name="can_focus">False</property> | ||
470 | 188 | <property name="stock">gtk-sort-ascending</property> | ||
471 | 189 | </object> | ||
472 | 190 | <object class="GtkListStore" id="liststore"> | ||
473 | 191 | <columns> | ||
474 | 192 | <!-- column-name gboolean1 --> | ||
475 | 193 | <column type="gboolean"/> | ||
476 | 194 | <!-- column-name GdkPixbuf1 --> | ||
477 | 195 | <column type="GdkPixbuf"/> | ||
478 | 196 | <!-- column-name gchararray2 --> | ||
479 | 197 | <column type="gchararray"/> | ||
480 | 198 | <!-- column-name gint1 --> | ||
481 | 199 | <column type="gint"/> | ||
482 | 200 | <!-- column-name gchararray3 --> | ||
483 | 201 | <column type="gchararray"/> | ||
484 | 202 | <!-- column-name PangoStyle1 --> | ||
485 | 203 | <column type="PangoWeight"/> | ||
486 | 204 | </columns> | ||
487 | 205 | </object> | ||
488 | 5 | <object class="GtkWindow" id="notifier"> | 206 | <object class="GtkWindow" id="notifier"> |
489 | 207 | <property name="can_focus">False</property> | ||
490 | 6 | <property name="title" translatable="yes">Notifications</property> | 208 | <property name="title" translatable="yes">Notifications</property> |
491 | 7 | <property name="icon_name">gtk-dialog-info</property> | 209 | <property name="icon_name">gtk-dialog-info</property> |
492 | 8 | <accel-groups> | 210 | <accel-groups> |
493 | 9 | <group name="accelgroup1"/> | 211 | <group name="accelgroup1"/> |
494 | 10 | </accel-groups> | 212 | </accel-groups> |
496 | 11 | <signal name="delete_event" handler="on_close_activate"/> | 213 | <signal name="delete-event" handler="delete_event" swapped="no"/> |
497 | 12 | <child> | 214 | <child> |
498 | 13 | <object class="GtkVBox" id="vbox"> | 215 | <object class="GtkVBox" id="vbox"> |
499 | 14 | <property name="visible">True</property> | 216 | <property name="visible">True</property> |
500 | 217 | <property name="can_focus">False</property> | ||
501 | 15 | <child> | 218 | <child> |
502 | 16 | <object class="GtkMenuBar" id="menubar1"> | 219 | <object class="GtkMenuBar" id="menubar1"> |
503 | 17 | <property name="visible">True</property> | 220 | <property name="visible">True</property> |
504 | 221 | <property name="can_focus">False</property> | ||
505 | 18 | <child> | 222 | <child> |
506 | 19 | <object class="GtkMenuItem" id="menu_file"> | 223 | <object class="GtkMenuItem" id="menu_file"> |
507 | 20 | <property name="visible">True</property> | 224 | <property name="visible">True</property> |
508 | 225 | <property name="can_focus">False</property> | ||
509 | 226 | <property name="use_action_appearance">False</property> | ||
510 | 21 | <property name="label" translatable="yes">_File</property> | 227 | <property name="label" translatable="yes">_File</property> |
511 | 22 | <property name="use_underline">True</property> | 228 | <property name="use_underline">True</property> |
512 | 23 | <child type="submenu"> | 229 | <child type="submenu"> |
513 | 24 | <object class="GtkMenu" id="menu_file_menu"> | 230 | <object class="GtkMenu" id="menu_file_menu"> |
514 | 231 | <property name="can_focus">False</property> | ||
515 | 25 | <child> | 232 | <child> |
516 | 26 | <object class="GtkImageMenuItem" id="import_watches"> | 233 | <object class="GtkImageMenuItem" id="import_watches"> |
517 | 27 | <property name="label" translatable="yes">_Import Watches</property> | 234 | <property name="label" translatable="yes">_Import Watches</property> |
518 | 28 | <property name="visible">True</property> | 235 | <property name="visible">True</property> |
519 | 236 | <property name="can_focus">False</property> | ||
520 | 237 | <property name="use_action_appearance">False</property> | ||
521 | 29 | <property name="use_underline">True</property> | 238 | <property name="use_underline">True</property> |
522 | 30 | <property name="image">image1</property> | 239 | <property name="image">image1</property> |
523 | 31 | <property name="use_stock">False</property> | 240 | <property name="use_stock">False</property> |
525 | 32 | <signal name="activate" handler="on_import_watches_activate"/> | 241 | <signal name="activate" handler="import_watches" swapped="no"/> |
526 | 33 | </object> | 242 | </object> |
527 | 34 | </child> | 243 | </child> |
528 | 35 | <child> | 244 | <child> |
529 | 36 | <object class="GtkImageMenuItem" id="export_watches"> | 245 | <object class="GtkImageMenuItem" id="export_watches"> |
530 | 37 | <property name="label" translatable="yes">_Export Watches</property> | 246 | <property name="label" translatable="yes">_Export Watches</property> |
531 | 38 | <property name="visible">True</property> | 247 | <property name="visible">True</property> |
532 | 248 | <property name="can_focus">False</property> | ||
533 | 249 | <property name="use_action_appearance">False</property> | ||
534 | 39 | <property name="use_underline">True</property> | 250 | <property name="use_underline">True</property> |
535 | 40 | <property name="image">image2</property> | 251 | <property name="image">image2</property> |
536 | 41 | <property name="use_stock">False</property> | 252 | <property name="use_stock">False</property> |
538 | 42 | <signal name="activate" handler="on_export_watches_activate"/> | 253 | <signal name="activate" handler="export_watches" swapped="no"/> |
539 | 43 | </object> | 254 | </object> |
540 | 44 | </child> | 255 | </child> |
541 | 45 | <child> | 256 | <child> |
542 | 46 | <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> | 257 | <object class="GtkSeparatorMenuItem" id="separatormenuitem1"> |
543 | 47 | <property name="visible">True</property> | 258 | <property name="visible">True</property> |
544 | 259 | <property name="can_focus">False</property> | ||
545 | 48 | </object> | 260 | </object> |
546 | 49 | </child> | 261 | </child> |
547 | 50 | <child> | 262 | <child> |
548 | 51 | <object class="GtkImageMenuItem" id="close"> | 263 | <object class="GtkImageMenuItem" id="close"> |
549 | 52 | <property name="label">gtk-close</property> | 264 | <property name="label">gtk-close</property> |
550 | 53 | <property name="visible">True</property> | 265 | <property name="visible">True</property> |
551 | 266 | <property name="can_focus">False</property> | ||
552 | 267 | <property name="use_action_appearance">False</property> | ||
553 | 54 | <property name="use_underline">True</property> | 268 | <property name="use_underline">True</property> |
554 | 55 | <property name="use_stock">True</property> | 269 | <property name="use_stock">True</property> |
555 | 56 | <property name="accel_group">accelgroup1</property> | 270 | <property name="accel_group">accelgroup1</property> |
557 | 57 | <signal name="activate" handler="on_close_activate"/> | 271 | <signal name="activate" handler="close_event" swapped="no"/> |
558 | 58 | </object> | 272 | </object> |
559 | 59 | </child> | 273 | </child> |
560 | 60 | <child> | 274 | <child> |
561 | 61 | <object class="GtkImageMenuItem" id="quit"> | 275 | <object class="GtkImageMenuItem" id="quit"> |
562 | 62 | <property name="label">gtk-quit</property> | 276 | <property name="label">gtk-quit</property> |
563 | 63 | <property name="visible">True</property> | 277 | <property name="visible">True</property> |
564 | 278 | <property name="can_focus">False</property> | ||
565 | 279 | <property name="use_action_appearance">False</property> | ||
566 | 64 | <property name="use_underline">True</property> | 280 | <property name="use_underline">True</property> |
567 | 65 | <property name="use_stock">True</property> | 281 | <property name="use_stock">True</property> |
568 | 66 | <property name="accel_group">accelgroup1</property> | 282 | <property name="accel_group">accelgroup1</property> |
570 | 67 | <signal name="activate" handler="on_quit_activate"/> | 283 | <signal name="activate" handler="delete_event" swapped="no"/> |
571 | 68 | </object> | 284 | </object> |
572 | 69 | </child> | 285 | </child> |
573 | 70 | </object> | 286 | </object> |
574 | @@ -74,14 +290,19 @@ | |||
575 | 74 | <child> | 290 | <child> |
576 | 75 | <object class="GtkMenuItem" id="menu_edit"> | 291 | <object class="GtkMenuItem" id="menu_edit"> |
577 | 76 | <property name="visible">True</property> | 292 | <property name="visible">True</property> |
578 | 293 | <property name="can_focus">False</property> | ||
579 | 294 | <property name="use_action_appearance">False</property> | ||
580 | 77 | <property name="label" translatable="yes">_Edit</property> | 295 | <property name="label" translatable="yes">_Edit</property> |
581 | 78 | <property name="use_underline">True</property> | 296 | <property name="use_underline">True</property> |
582 | 79 | <child type="submenu"> | 297 | <child type="submenu"> |
583 | 80 | <object class="GtkMenu" id="menu_edit_menu"> | 298 | <object class="GtkMenu" id="menu_edit_menu"> |
584 | 299 | <property name="can_focus">False</property> | ||
585 | 81 | <child> | 300 | <child> |
586 | 82 | <object class="GtkImageMenuItem" id="add"> | 301 | <object class="GtkImageMenuItem" id="add"> |
587 | 83 | <property name="label">gtk-add</property> | 302 | <property name="label">gtk-add</property> |
588 | 84 | <property name="visible">True</property> | 303 | <property name="visible">True</property> |
589 | 304 | <property name="can_focus">False</property> | ||
590 | 305 | <property name="use_action_appearance">False</property> | ||
591 | 85 | <property name="use_underline">True</property> | 306 | <property name="use_underline">True</property> |
592 | 86 | <property name="use_stock">True</property> | 307 | <property name="use_stock">True</property> |
593 | 87 | <property name="accel_group">accelgroup1</property> | 308 | <property name="accel_group">accelgroup1</property> |
594 | @@ -91,45 +312,54 @@ | |||
595 | 91 | <object class="GtkImageMenuItem" id="remove"> | 312 | <object class="GtkImageMenuItem" id="remove"> |
596 | 92 | <property name="label">gtk-remove</property> | 313 | <property name="label">gtk-remove</property> |
597 | 93 | <property name="visible">True</property> | 314 | <property name="visible">True</property> |
598 | 315 | <property name="can_focus">False</property> | ||
599 | 316 | <property name="use_action_appearance">False</property> | ||
600 | 94 | <property name="use_underline">True</property> | 317 | <property name="use_underline">True</property> |
601 | 95 | <property name="use_stock">True</property> | 318 | <property name="use_stock">True</property> |
602 | 96 | <property name="accel_group">accelgroup1</property> | 319 | <property name="accel_group">accelgroup1</property> |
604 | 97 | <signal name="activate" handler="on_remove_activate"/> | 320 | <signal name="activate" handler="remove_watch" swapped="no"/> |
605 | 98 | </object> | 321 | </object> |
606 | 99 | </child> | 322 | </child> |
607 | 100 | <child> | 323 | <child> |
608 | 101 | <object class="GtkImageMenuItem" id="edit"> | 324 | <object class="GtkImageMenuItem" id="edit"> |
609 | 102 | <property name="label">gtk-edit</property> | 325 | <property name="label">gtk-edit</property> |
610 | 103 | <property name="visible">True</property> | 326 | <property name="visible">True</property> |
611 | 327 | <property name="can_focus">False</property> | ||
612 | 328 | <property name="use_action_appearance">False</property> | ||
613 | 104 | <property name="use_underline">True</property> | 329 | <property name="use_underline">True</property> |
614 | 105 | <property name="use_stock">True</property> | 330 | <property name="use_stock">True</property> |
615 | 106 | <property name="accel_group">accelgroup1</property> | 331 | <property name="accel_group">accelgroup1</property> |
617 | 107 | <signal name="activate" handler="on_edit_activate"/> | 332 | <signal name="activate" handler="show_edit_watch" swapped="no"/> |
618 | 108 | </object> | 333 | </object> |
619 | 109 | </child> | 334 | </child> |
620 | 110 | <child> | 335 | <child> |
621 | 111 | <object class="GtkImageMenuItem" id="clear"> | 336 | <object class="GtkImageMenuItem" id="clear"> |
622 | 112 | <property name="label" translatable="yes">Mark as read</property> | 337 | <property name="label" translatable="yes">Mark as read</property> |
623 | 113 | <property name="visible">True</property> | 338 | <property name="visible">True</property> |
624 | 339 | <property name="can_focus">False</property> | ||
625 | 340 | <property name="use_action_appearance">False</property> | ||
626 | 114 | <property name="use_underline">True</property> | 341 | <property name="use_underline">True</property> |
627 | 115 | <property name="image">image3</property> | 342 | <property name="image">image3</property> |
628 | 116 | <property name="use_stock">False</property> | 343 | <property name="use_stock">False</property> |
630 | 117 | <signal name="activate" handler="on_clear_activate"/> | 344 | <signal name="activate" handler="_mark_watch_as_read" swapped="no"/> |
631 | 118 | </object> | 345 | </object> |
632 | 119 | </child> | 346 | </child> |
633 | 120 | <child> | 347 | <child> |
634 | 121 | <object class="GtkSeparatorMenuItem" id="separator3"> | 348 | <object class="GtkSeparatorMenuItem" id="separator3"> |
635 | 122 | <property name="visible">True</property> | 349 | <property name="visible">True</property> |
636 | 350 | <property name="can_focus">False</property> | ||
637 | 123 | </object> | 351 | </object> |
638 | 124 | </child> | 352 | </child> |
639 | 125 | <child> | 353 | <child> |
640 | 126 | <object class="GtkImageMenuItem" id="preferences"> | 354 | <object class="GtkImageMenuItem" id="preferences"> |
641 | 127 | <property name="label">gtk-preferences</property> | 355 | <property name="label">gtk-preferences</property> |
642 | 128 | <property name="visible">True</property> | 356 | <property name="visible">True</property> |
643 | 357 | <property name="can_focus">False</property> | ||
644 | 358 | <property name="use_action_appearance">False</property> | ||
645 | 129 | <property name="use_underline">True</property> | 359 | <property name="use_underline">True</property> |
646 | 130 | <property name="use_stock">True</property> | 360 | <property name="use_stock">True</property> |
647 | 131 | <property name="accel_group">accelgroup1</property> | 361 | <property name="accel_group">accelgroup1</property> |
649 | 132 | <signal name="activate" handler="on_preferences_activate"/> | 362 | <signal name="activate" handler="show_preferences" swapped="no"/> |
650 | 133 | </object> | 363 | </object> |
651 | 134 | </child> | 364 | </child> |
652 | 135 | </object> | 365 | </object> |
653 | @@ -139,83 +369,103 @@ | |||
654 | 139 | <child> | 369 | <child> |
655 | 140 | <object class="GtkMenuItem" id="menu_view"> | 370 | <object class="GtkMenuItem" id="menu_view"> |
656 | 141 | <property name="visible">True</property> | 371 | <property name="visible">True</property> |
657 | 372 | <property name="can_focus">False</property> | ||
658 | 373 | <property name="use_action_appearance">False</property> | ||
659 | 142 | <property name="label" translatable="yes">_View</property> | 374 | <property name="label" translatable="yes">_View</property> |
660 | 143 | <property name="use_underline">True</property> | 375 | <property name="use_underline">True</property> |
661 | 144 | <child type="submenu"> | 376 | <child type="submenu"> |
662 | 145 | <object class="GtkMenu" id="menu_view_menu"> | 377 | <object class="GtkMenu" id="menu_view_menu"> |
663 | 378 | <property name="can_focus">False</property> | ||
664 | 146 | <child> | 379 | <child> |
665 | 147 | <object class="GtkImageMenuItem" id="refresh"> | 380 | <object class="GtkImageMenuItem" id="refresh"> |
666 | 148 | <property name="label">gtk-refresh</property> | 381 | <property name="label">gtk-refresh</property> |
667 | 149 | <property name="visible">True</property> | 382 | <property name="visible">True</property> |
668 | 383 | <property name="can_focus">False</property> | ||
669 | 384 | <property name="use_action_appearance">False</property> | ||
670 | 150 | <property name="use_underline">True</property> | 385 | <property name="use_underline">True</property> |
671 | 151 | <property name="use_stock">True</property> | 386 | <property name="use_stock">True</property> |
672 | 152 | <property name="accel_group">accelgroup1</property> | 387 | <property name="accel_group">accelgroup1</property> |
673 | 153 | <accelerator key="F5" signal="activate"/> | 388 | <accelerator key="F5" signal="activate"/> |
675 | 154 | <signal name="activate" handler="on_refresh_activate"/> | 389 | <signal name="activate" handler="refresh_all_watches" swapped="no"/> |
676 | 155 | </object> | 390 | </object> |
677 | 156 | </child> | 391 | </child> |
678 | 157 | <child> | 392 | <child> |
679 | 158 | <object class="GtkImageMenuItem" id="clear_all1"> | 393 | <object class="GtkImageMenuItem" id="clear_all1"> |
680 | 159 | <property name="label" translatable="yes">_Mark all read</property> | 394 | <property name="label" translatable="yes">_Mark all read</property> |
681 | 160 | <property name="visible">True</property> | 395 | <property name="visible">True</property> |
682 | 396 | <property name="can_focus">False</property> | ||
683 | 397 | <property name="use_action_appearance">False</property> | ||
684 | 161 | <property name="use_underline">True</property> | 398 | <property name="use_underline">True</property> |
685 | 162 | <property name="image">image4</property> | 399 | <property name="image">image4</property> |
686 | 163 | <property name="use_stock">False</property> | 400 | <property name="use_stock">False</property> |
688 | 164 | <signal name="activate" handler="on_clear_all_activate"/> | 401 | <signal name="activate" handler="mark_all_as_read" swapped="no"/> |
689 | 165 | </object> | 402 | </object> |
690 | 166 | </child> | 403 | </child> |
691 | 167 | <child> | 404 | <child> |
692 | 168 | <object class="GtkSeparatorMenuItem" id="separator1"> | 405 | <object class="GtkSeparatorMenuItem" id="separator1"> |
693 | 169 | <property name="visible">True</property> | 406 | <property name="visible">True</property> |
694 | 407 | <property name="can_focus">False</property> | ||
695 | 170 | </object> | 408 | </object> |
696 | 171 | </child> | 409 | </child> |
697 | 172 | <child> | 410 | <child> |
698 | 173 | <object class="GtkMenuItem" id="error_log"> | 411 | <object class="GtkMenuItem" id="error_log"> |
699 | 174 | <property name="visible">True</property> | 412 | <property name="visible">True</property> |
700 | 413 | <property name="can_focus">False</property> | ||
701 | 414 | <property name="use_action_appearance">False</property> | ||
702 | 175 | <property name="label" translatable="yes">_Error Log</property> | 415 | <property name="label" translatable="yes">_Error Log</property> |
703 | 176 | <property name="use_underline">True</property> | 416 | <property name="use_underline">True</property> |
705 | 177 | <signal name="activate" handler="on_error_log_activate"/> | 417 | <signal name="activate" handler="show_error_log" swapped="no"/> |
706 | 178 | </object> | 418 | </object> |
707 | 179 | </child> | 419 | </child> |
708 | 180 | <child> | 420 | <child> |
709 | 181 | <object class="GtkSeparatorMenuItem" id="separator4"> | 421 | <object class="GtkSeparatorMenuItem" id="separator4"> |
710 | 182 | <property name="visible">True</property> | 422 | <property name="visible">True</property> |
711 | 423 | <property name="can_focus">False</property> | ||
712 | 183 | </object> | 424 | </object> |
713 | 184 | </child> | 425 | </child> |
714 | 185 | <child> | 426 | <child> |
715 | 186 | <object class="GtkImageMenuItem" id="sorting"> | 427 | <object class="GtkImageMenuItem" id="sorting"> |
716 | 187 | <property name="label" translatable="yes">Sorting</property> | 428 | <property name="label" translatable="yes">Sorting</property> |
717 | 188 | <property name="visible">True</property> | 429 | <property name="visible">True</property> |
718 | 430 | <property name="can_focus">False</property> | ||
719 | 431 | <property name="use_action_appearance">False</property> | ||
720 | 189 | <property name="use_underline">True</property> | 432 | <property name="use_underline">True</property> |
721 | 190 | <property name="image">image5</property> | 433 | <property name="image">image5</property> |
722 | 191 | <property name="use_stock">False</property> | 434 | <property name="use_stock">False</property> |
723 | 192 | <child type="submenu"> | 435 | <child type="submenu"> |
724 | 193 | <object class="GtkMenu" id="sorting_menu"> | 436 | <object class="GtkMenu" id="sorting_menu"> |
725 | 437 | <property name="can_focus">False</property> | ||
726 | 194 | <child> | 438 | <child> |
727 | 195 | <object class="GtkRadioMenuItem" id="by_watch_type"> | 439 | <object class="GtkRadioMenuItem" id="by_watch_type"> |
728 | 196 | <property name="visible">True</property> | 440 | <property name="visible">True</property> |
729 | 441 | <property name="can_focus">False</property> | ||
730 | 442 | <property name="use_action_appearance">False</property> | ||
731 | 197 | <property name="label" translatable="yes">By Watch Type</property> | 443 | <property name="label" translatable="yes">By Watch Type</property> |
732 | 198 | <property name="use_underline">True</property> | 444 | <property name="use_underline">True</property> |
733 | 199 | <property name="active">True</property> | 445 | <property name="active">True</property> |
735 | 200 | <signal name="activate" handler="on_by_watch_type_activate"/> | 446 | <signal name="activate" handler="sort_type" swapped="no"/> |
736 | 201 | </object> | 447 | </object> |
737 | 202 | </child> | 448 | </child> |
738 | 203 | <child> | 449 | <child> |
739 | 204 | <object class="GtkRadioMenuItem" id="by_name"> | 450 | <object class="GtkRadioMenuItem" id="by_name"> |
740 | 205 | <property name="visible">True</property> | 451 | <property name="visible">True</property> |
741 | 452 | <property name="can_focus">False</property> | ||
742 | 453 | <property name="use_action_appearance">False</property> | ||
743 | 206 | <property name="label" translatable="yes">By Name</property> | 454 | <property name="label" translatable="yes">By Name</property> |
744 | 207 | <property name="use_underline">True</property> | 455 | <property name="use_underline">True</property> |
745 | 208 | <property name="group">by_watch_type</property> | 456 | <property name="group">by_watch_type</property> |
747 | 209 | <signal name="activate" handler="on_by_name_activate"/> | 457 | <signal name="activate" handler="sort_name" swapped="no"/> |
748 | 210 | </object> | 458 | </object> |
749 | 211 | </child> | 459 | </child> |
750 | 212 | <child> | 460 | <child> |
751 | 213 | <object class="GtkRadioMenuItem" id="by_watch_active"> | 461 | <object class="GtkRadioMenuItem" id="by_watch_active"> |
752 | 214 | <property name="visible">True</property> | 462 | <property name="visible">True</property> |
753 | 463 | <property name="can_focus">False</property> | ||
754 | 464 | <property name="use_action_appearance">False</property> | ||
755 | 215 | <property name="label" translatable="yes">By Active</property> | 465 | <property name="label" translatable="yes">By Active</property> |
756 | 216 | <property name="use_underline">True</property> | 466 | <property name="use_underline">True</property> |
757 | 217 | <property name="group">by_watch_type</property> | 467 | <property name="group">by_watch_type</property> |
759 | 218 | <signal name="activate" handler="on_by_watch_active_activate"/> | 468 | <signal name="activate" handler="sort_active" swapped="no"/> |
760 | 219 | </object> | 469 | </object> |
761 | 220 | </child> | 470 | </child> |
762 | 221 | </object> | 471 | </object> |
763 | @@ -225,23 +475,28 @@ | |||
764 | 225 | <child> | 475 | <child> |
765 | 226 | <object class="GtkSeparatorMenuItem" id="separator2"> | 476 | <object class="GtkSeparatorMenuItem" id="separator2"> |
766 | 227 | <property name="visible">True</property> | 477 | <property name="visible">True</property> |
767 | 478 | <property name="can_focus">False</property> | ||
768 | 228 | </object> | 479 | </object> |
769 | 229 | </child> | 480 | </child> |
770 | 230 | <child> | 481 | <child> |
771 | 231 | <object class="GtkCheckMenuItem" id="display_all_watches"> | 482 | <object class="GtkCheckMenuItem" id="display_all_watches"> |
772 | 232 | <property name="visible">True</property> | 483 | <property name="visible">True</property> |
773 | 484 | <property name="can_focus">False</property> | ||
774 | 485 | <property name="use_action_appearance">False</property> | ||
775 | 233 | <property name="label" translatable="yes">Display _All Watches</property> | 486 | <property name="label" translatable="yes">Display _All Watches</property> |
776 | 234 | <property name="use_underline">True</property> | 487 | <property name="use_underline">True</property> |
778 | 235 | <signal name="activate" handler="on_display_all_watches_activate"/> | 488 | <signal name="activate" handler="toggle_show_deactivated_watches" swapped="no"/> |
779 | 236 | </object> | 489 | </object> |
780 | 237 | </child> | 490 | </child> |
781 | 238 | <child> | 491 | <child> |
782 | 239 | <object class="GtkCheckMenuItem" id="display_toolbar"> | 492 | <object class="GtkCheckMenuItem" id="display_toolbar"> |
783 | 240 | <property name="visible">True</property> | 493 | <property name="visible">True</property> |
784 | 494 | <property name="can_focus">False</property> | ||
785 | 495 | <property name="use_action_appearance">False</property> | ||
786 | 241 | <property name="label" translatable="yes">Display _Toolbar</property> | 496 | <property name="label" translatable="yes">Display _Toolbar</property> |
787 | 242 | <property name="use_underline">True</property> | 497 | <property name="use_underline">True</property> |
788 | 243 | <property name="active">True</property> | 498 | <property name="active">True</property> |
790 | 244 | <signal name="activate" handler="on_display_toolbar_activate"/> | 499 | <signal name="activate" handler="toggle_display_toolbar" swapped="no"/> |
791 | 245 | </object> | 500 | </object> |
792 | 246 | </child> | 501 | </child> |
793 | 247 | </object> | 502 | </object> |
794 | @@ -251,28 +506,35 @@ | |||
795 | 251 | <child> | 506 | <child> |
796 | 252 | <object class="GtkMenuItem" id="menu_help"> | 507 | <object class="GtkMenuItem" id="menu_help"> |
797 | 253 | <property name="visible">True</property> | 508 | <property name="visible">True</property> |
798 | 509 | <property name="can_focus">False</property> | ||
799 | 510 | <property name="use_action_appearance">False</property> | ||
800 | 254 | <property name="label" translatable="yes">_Help</property> | 511 | <property name="label" translatable="yes">_Help</property> |
801 | 255 | <property name="use_underline">True</property> | 512 | <property name="use_underline">True</property> |
802 | 256 | <child type="submenu"> | 513 | <child type="submenu"> |
803 | 257 | <object class="GtkMenu" id="menu_help_menu"> | 514 | <object class="GtkMenu" id="menu_help_menu"> |
804 | 515 | <property name="can_focus">False</property> | ||
805 | 258 | <child> | 516 | <child> |
806 | 259 | <object class="GtkImageMenuItem" id="help"> | 517 | <object class="GtkImageMenuItem" id="help"> |
807 | 260 | <property name="label">gtk-help</property> | 518 | <property name="label">gtk-help</property> |
808 | 261 | <property name="visible">True</property> | 519 | <property name="visible">True</property> |
809 | 520 | <property name="can_focus">False</property> | ||
810 | 521 | <property name="use_action_appearance">False</property> | ||
811 | 262 | <property name="use_underline">True</property> | 522 | <property name="use_underline">True</property> |
812 | 263 | <property name="use_stock">True</property> | 523 | <property name="use_stock">True</property> |
813 | 264 | <property name="accel_group">accelgroup1</property> | 524 | <property name="accel_group">accelgroup1</property> |
815 | 265 | <signal name="activate" handler="on_help_activate"/> | 525 | <signal name="activate" handler="show_help" swapped="no"/> |
816 | 266 | </object> | 526 | </object> |
817 | 267 | </child> | 527 | </child> |
818 | 268 | <child> | 528 | <child> |
819 | 269 | <object class="GtkImageMenuItem" id="about"> | 529 | <object class="GtkImageMenuItem" id="about"> |
820 | 270 | <property name="label">gtk-about</property> | 530 | <property name="label">gtk-about</property> |
821 | 271 | <property name="visible">True</property> | 531 | <property name="visible">True</property> |
822 | 532 | <property name="can_focus">False</property> | ||
823 | 533 | <property name="use_action_appearance">False</property> | ||
824 | 272 | <property name="use_underline">True</property> | 534 | <property name="use_underline">True</property> |
825 | 273 | <property name="use_stock">True</property> | 535 | <property name="use_stock">True</property> |
826 | 274 | <property name="accel_group">accelgroup1</property> | 536 | <property name="accel_group">accelgroup1</property> |
828 | 275 | <signal name="activate" handler="on_about_activate"/> | 537 | <signal name="activate" handler="show_about" swapped="no"/> |
829 | 276 | </object> | 538 | </object> |
830 | 277 | </child> | 539 | </child> |
831 | 278 | </object> | 540 | </object> |
832 | @@ -289,14 +551,17 @@ | |||
833 | 289 | <child> | 551 | <child> |
834 | 290 | <object class="GtkToolbar" id="toolbar"> | 552 | <object class="GtkToolbar" id="toolbar"> |
835 | 291 | <property name="visible">True</property> | 553 | <property name="visible">True</property> |
836 | 554 | <property name="can_focus">False</property> | ||
837 | 292 | <child> | 555 | <child> |
838 | 293 | <object class="GtkToolButton" id="button_refresh"> | 556 | <object class="GtkToolButton" id="button_refresh"> |
839 | 294 | <property name="visible">True</property> | 557 | <property name="visible">True</property> |
840 | 558 | <property name="can_focus">False</property> | ||
841 | 559 | <property name="use_action_appearance">False</property> | ||
842 | 295 | <property name="is_important">True</property> | 560 | <property name="is_important">True</property> |
843 | 296 | <property name="label" translatable="yes">_Refresh All</property> | 561 | <property name="label" translatable="yes">_Refresh All</property> |
844 | 297 | <property name="use_underline">True</property> | 562 | <property name="use_underline">True</property> |
845 | 298 | <property name="stock_id">gtk-refresh</property> | 563 | <property name="stock_id">gtk-refresh</property> |
847 | 299 | <signal name="clicked" handler="on_refresh_activate"/> | 564 | <signal name="clicked" handler="refresh_all_watches" swapped="no"/> |
848 | 300 | </object> | 565 | </object> |
849 | 301 | <packing> | 566 | <packing> |
850 | 302 | <property name="expand">False</property> | 567 | <property name="expand">False</property> |
851 | @@ -306,11 +571,13 @@ | |||
852 | 306 | <child> | 571 | <child> |
853 | 307 | <object class="GtkToolButton" id="button_clear_all"> | 572 | <object class="GtkToolButton" id="button_clear_all"> |
854 | 308 | <property name="visible">True</property> | 573 | <property name="visible">True</property> |
855 | 574 | <property name="can_focus">False</property> | ||
856 | 575 | <property name="use_action_appearance">False</property> | ||
857 | 309 | <property name="is_important">True</property> | 576 | <property name="is_important">True</property> |
858 | 310 | <property name="label" translatable="yes">_Mark all read</property> | 577 | <property name="label" translatable="yes">_Mark all read</property> |
859 | 311 | <property name="use_underline">True</property> | 578 | <property name="use_underline">True</property> |
860 | 312 | <property name="stock_id">gtk-clear</property> | 579 | <property name="stock_id">gtk-clear</property> |
862 | 313 | <signal name="clicked" handler="on_clear_all_activate"/> | 580 | <signal name="clicked" handler="mark_all_as_read" swapped="no"/> |
863 | 314 | </object> | 581 | </object> |
864 | 315 | <packing> | 582 | <packing> |
865 | 316 | <property name="expand">False</property> | 583 | <property name="expand">False</property> |
866 | @@ -320,9 +587,11 @@ | |||
867 | 320 | <child> | 587 | <child> |
868 | 321 | <object class="GtkMenuToolButton" id="button_add"> | 588 | <object class="GtkMenuToolButton" id="button_add"> |
869 | 322 | <property name="visible">True</property> | 589 | <property name="visible">True</property> |
870 | 590 | <property name="can_focus">False</property> | ||
871 | 591 | <property name="use_action_appearance">False</property> | ||
872 | 323 | <property name="is_important">True</property> | 592 | <property name="is_important">True</property> |
873 | 324 | <property name="stock_id">gtk-add</property> | 593 | <property name="stock_id">gtk-add</property> |
875 | 325 | <signal name="clicked" handler="on_add_activate"/> | 594 | <signal name="clicked" handler="show_add_watch_menu" swapped="no"/> |
876 | 326 | </object> | 595 | </object> |
877 | 327 | <packing> | 596 | <packing> |
878 | 328 | <property name="expand">False</property> | 597 | <property name="expand">False</property> |
879 | @@ -340,20 +609,96 @@ | |||
880 | 340 | <property name="visible">True</property> | 609 | <property name="visible">True</property> |
881 | 341 | <property name="can_focus">True</property> | 610 | <property name="can_focus">True</property> |
882 | 342 | <property name="hscrollbar_policy">never</property> | 611 | <property name="hscrollbar_policy">never</property> |
884 | 343 | <property name="vscrollbar_policy">automatic</property> | 612 | <property name="vscrollbar_policy">never</property> |
885 | 344 | <property name="shadow_type">in</property> | 613 | <property name="shadow_type">in</property> |
886 | 345 | <child> | 614 | <child> |
887 | 346 | <object class="GtkTreeView" id="treeview"> | 615 | <object class="GtkTreeView" id="treeview"> |
888 | 347 | <property name="visible">True</property> | 616 | <property name="visible">True</property> |
889 | 348 | <property name="can_focus">True</property> | 617 | <property name="can_focus">True</property> |
890 | 618 | <property name="model">liststore</property> | ||
891 | 349 | <property name="rules_hint">True</property> | 619 | <property name="rules_hint">True</property> |
895 | 350 | <property name="enable_search">False</property> | 620 | <property name="search_column">0</property> |
896 | 351 | <signal name="cursor_changed" handler="on_treeview_cursor_changed"/> | 621 | <signal name="cursor-changed" handler="show_watch_info" swapped="no"/> |
897 | 352 | <signal name="row_activated" handler="on_treeview_row_activated"/> | 622 | <signal name="row-activated" handler="open_watch_callback" swapped="no"/> |
898 | 623 | <child> | ||
899 | 624 | <object class="GtkTreeViewColumn" id="active_treeviewcolumn"> | ||
900 | 625 | <property name="title" translatable="yes">Active</property> | ||
901 | 626 | <property name="reorderable">True</property> | ||
902 | 627 | <property name="sort_column_id">0</property> | ||
903 | 628 | <signal name="clicked" handler="sort_active_from_treeview_headers" swapped="no"/> | ||
904 | 629 | <child> | ||
905 | 630 | <object class="GtkCellRendererToggle" id="cellrenderertoggle1"> | ||
906 | 631 | <signal name="toggled" handler="check_clicked" swapped="no"/> | ||
907 | 632 | </object> | ||
908 | 633 | <attributes> | ||
909 | 634 | <attribute name="active">0</attribute> | ||
910 | 635 | </attributes> | ||
911 | 636 | </child> | ||
912 | 637 | </object> | ||
913 | 638 | </child> | ||
914 | 639 | <child> | ||
915 | 640 | <object class="GtkTreeViewColumn" id="type_treeviewcolumn"> | ||
916 | 641 | <property name="title" translatable="yes">Type</property> | ||
917 | 642 | <property name="reorderable">True</property> | ||
918 | 643 | <property name="sort_column_id">1</property> | ||
919 | 644 | <signal name="clicked" handler="sort_type_from_treeview_headers" swapped="no"/> | ||
920 | 645 | <child> | ||
921 | 646 | <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/> | ||
922 | 647 | <attributes> | ||
923 | 648 | <attribute name="pixbuf">1</attribute> | ||
924 | 649 | </attributes> | ||
925 | 650 | </child> | ||
926 | 651 | </object> | ||
927 | 652 | </child> | ||
928 | 653 | <child> | ||
929 | 654 | <object class="GtkTreeViewColumn" id="name_treeviewcolumn"> | ||
930 | 655 | <property name="resizable">True</property> | ||
931 | 656 | <property name="title" translatable="yes">Name</property> | ||
932 | 657 | <property name="expand">True</property> | ||
933 | 658 | <property name="reorderable">True</property> | ||
934 | 659 | <property name="sort_column_id">2</property> | ||
935 | 660 | <signal name="clicked" handler="sort_name_from_treeview_headers" swapped="no"/> | ||
936 | 661 | <child> | ||
937 | 662 | <object class="GtkCellRendererText" id="cellrenderertext1"> | ||
938 | 663 | <property name="editable">True</property> | ||
939 | 664 | <signal name="edited" handler="change_entry_name" swapped="no"/> | ||
940 | 665 | </object> | ||
941 | 666 | <attributes> | ||
942 | 667 | <attribute name="text">2</attribute> | ||
943 | 668 | </attributes> | ||
944 | 669 | </child> | ||
945 | 670 | </object> | ||
946 | 671 | </child> | ||
947 | 672 | <child> | ||
948 | 673 | <object class="GtkTreeViewColumn" id="_ID_treeviewcolumn"> | ||
949 | 674 | <property name="visible">False</property> | ||
950 | 675 | <property name="title" translatable="yes">ID</property> | ||
951 | 676 | <child> | ||
952 | 677 | <object class="GtkCellRendererText" id="cellrenderertext2"/> | ||
953 | 678 | <attributes> | ||
954 | 679 | <attribute name="text">3</attribute> | ||
955 | 680 | </attributes> | ||
956 | 681 | </child> | ||
957 | 682 | </object> | ||
958 | 683 | </child> | ||
959 | 684 | <child> | ||
960 | 685 | <object class="GtkTreeViewColumn" id="_TYPE_treeviewcolumn"> | ||
961 | 686 | <property name="visible">False</property> | ||
962 | 687 | <property name="title" translatable="yes">TYPE</property> | ||
963 | 688 | <child> | ||
964 | 689 | <object class="GtkCellRendererText" id="cellrenderertext3"/> | ||
965 | 690 | <attributes> | ||
966 | 691 | <attribute name="text">4</attribute> | ||
967 | 692 | </attributes> | ||
968 | 693 | </child> | ||
969 | 694 | </object> | ||
970 | 695 | </child> | ||
971 | 353 | </object> | 696 | </object> |
972 | 354 | </child> | 697 | </child> |
973 | 355 | </object> | 698 | </object> |
974 | 356 | <packing> | 699 | <packing> |
975 | 700 | <property name="expand">True</property> | ||
976 | 701 | <property name="fill">True</property> | ||
977 | 357 | <property name="position">2</property> | 702 | <property name="position">2</property> |
978 | 358 | </packing> | 703 | </packing> |
979 | 359 | </child> | 704 | </child> |
980 | @@ -361,11 +706,13 @@ | |||
981 | 361 | <object class="GtkHBox" id="hbox1"> | 706 | <object class="GtkHBox" id="hbox1"> |
982 | 362 | <property name="height_request">145</property> | 707 | <property name="height_request">145</property> |
983 | 363 | <property name="visible">True</property> | 708 | <property name="visible">True</property> |
984 | 709 | <property name="can_focus">False</property> | ||
985 | 364 | <property name="border_width">6</property> | 710 | <property name="border_width">6</property> |
986 | 365 | <property name="spacing">6</property> | 711 | <property name="spacing">6</property> |
987 | 366 | <child> | 712 | <child> |
988 | 367 | <object class="GtkHBox" id="vbox_info"> | 713 | <object class="GtkHBox" id="vbox_info"> |
989 | 368 | <property name="visible">True</property> | 714 | <property name="visible">True</property> |
990 | 715 | <property name="can_focus">False</property> | ||
991 | 369 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 716 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
992 | 370 | <child> | 717 | <child> |
993 | 371 | <object class="GtkNotebook" id="notebook1"> | 718 | <object class="GtkNotebook" id="notebook1"> |
994 | @@ -375,22 +722,26 @@ | |||
995 | 375 | <child> | 722 | <child> |
996 | 376 | <object class="GtkHBox" id="hbox2"> | 723 | <object class="GtkHBox" id="hbox2"> |
997 | 377 | <property name="visible">True</property> | 724 | <property name="visible">True</property> |
998 | 725 | <property name="can_focus">False</property> | ||
999 | 378 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 726 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
1000 | 379 | <property name="spacing">6</property> | 727 | <property name="spacing">6</property> |
1001 | 380 | <child> | 728 | <child> |
1002 | 381 | <object class="GtkImage" id="watch_icon"> | 729 | <object class="GtkImage" id="watch_icon"> |
1003 | 382 | <property name="visible">True</property> | 730 | <property name="visible">True</property> |
1004 | 731 | <property name="can_focus">False</property> | ||
1005 | 383 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 732 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
1006 | 384 | <property name="stock">gtk-info</property> | 733 | <property name="stock">gtk-info</property> |
1007 | 385 | </object> | 734 | </object> |
1008 | 386 | <packing> | 735 | <packing> |
1009 | 387 | <property name="expand">False</property> | 736 | <property name="expand">False</property> |
1010 | 737 | <property name="fill">True</property> | ||
1011 | 388 | <property name="position">0</property> | 738 | <property name="position">0</property> |
1012 | 389 | </packing> | 739 | </packing> |
1013 | 390 | </child> | 740 | </child> |
1014 | 391 | <child> | 741 | <child> |
1015 | 392 | <object class="GtkVBox" id="vbox_watch_info"> | 742 | <object class="GtkVBox" id="vbox_watch_info"> |
1016 | 393 | <property name="visible">True</property> | 743 | <property name="visible">True</property> |
1017 | 744 | <property name="can_focus">False</property> | ||
1018 | 394 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 745 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
1019 | 395 | <property name="border_width">6</property> | 746 | <property name="border_width">6</property> |
1020 | 396 | <child> | 747 | <child> |
1021 | @@ -398,6 +749,8 @@ | |||
1022 | 398 | </child> | 749 | </child> |
1023 | 399 | </object> | 750 | </object> |
1024 | 400 | <packing> | 751 | <packing> |
1025 | 752 | <property name="expand">True</property> | ||
1026 | 753 | <property name="fill">True</property> | ||
1027 | 401 | <property name="position">1</property> | 754 | <property name="position">1</property> |
1028 | 402 | </packing> | 755 | </packing> |
1029 | 403 | </child> | 756 | </child> |
1030 | @@ -406,6 +759,7 @@ | |||
1031 | 406 | <child type="tab"> | 759 | <child type="tab"> |
1032 | 407 | <object class="GtkLabel" id="label20"> | 760 | <object class="GtkLabel" id="label20"> |
1033 | 408 | <property name="visible">True</property> | 761 | <property name="visible">True</property> |
1034 | 762 | <property name="can_focus">False</property> | ||
1035 | 409 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 763 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
1036 | 410 | <property name="label" translatable="yes">General</property> | 764 | <property name="label" translatable="yes">General</property> |
1037 | 411 | </object> | 765 | </object> |
1038 | @@ -416,6 +770,7 @@ | |||
1039 | 416 | <child> | 770 | <child> |
1040 | 417 | <object class="GtkLabel" id="lblExtraInfo"> | 771 | <object class="GtkLabel" id="lblExtraInfo"> |
1041 | 418 | <property name="visible">True</property> | 772 | <property name="visible">True</property> |
1042 | 773 | <property name="can_focus">False</property> | ||
1043 | 419 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 774 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
1044 | 420 | <property name="xalign">0</property> | 775 | <property name="xalign">0</property> |
1045 | 421 | <property name="xpad">6</property> | 776 | <property name="xpad">6</property> |
1046 | @@ -431,6 +786,7 @@ | |||
1047 | 431 | <child type="tab"> | 786 | <child type="tab"> |
1048 | 432 | <object class="GtkLabel" id="label21"> | 787 | <object class="GtkLabel" id="label21"> |
1049 | 433 | <property name="visible">True</property> | 788 | <property name="visible">True</property> |
1050 | 789 | <property name="can_focus">False</property> | ||
1051 | 434 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> | 790 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
1052 | 435 | <property name="label" translatable="yes">Extra information</property> | 791 | <property name="label" translatable="yes">Extra information</property> |
1053 | 436 | </object> | 792 | </object> |
1054 | @@ -441,17 +797,22 @@ | |||
1055 | 441 | </child> | 797 | </child> |
1056 | 442 | </object> | 798 | </object> |
1057 | 443 | <packing> | 799 | <packing> |
1058 | 800 | <property name="expand">True</property> | ||
1059 | 801 | <property name="fill">True</property> | ||
1060 | 444 | <property name="position">-1</property> | 802 | <property name="position">-1</property> |
1061 | 445 | </packing> | 803 | </packing> |
1062 | 446 | </child> | 804 | </child> |
1063 | 447 | </object> | 805 | </object> |
1064 | 448 | <packing> | 806 | <packing> |
1065 | 807 | <property name="expand">True</property> | ||
1066 | 808 | <property name="fill">True</property> | ||
1067 | 449 | <property name="position">0</property> | 809 | <property name="position">0</property> |
1068 | 450 | </packing> | 810 | </packing> |
1069 | 451 | </child> | 811 | </child> |
1070 | 452 | <child> | 812 | <child> |
1071 | 453 | <object class="GtkVButtonBox" id="vbox_panel_buttons"> | 813 | <object class="GtkVButtonBox" id="vbox_panel_buttons"> |
1072 | 454 | <property name="visible">True</property> | 814 | <property name="visible">True</property> |
1073 | 815 | <property name="can_focus">False</property> | ||
1074 | 455 | <property name="spacing">6</property> | 816 | <property name="spacing">6</property> |
1075 | 456 | <property name="layout_style">start</property> | 817 | <property name="layout_style">start</property> |
1076 | 457 | <child> | 818 | <child> |
1077 | @@ -461,8 +822,9 @@ | |||
1078 | 461 | <property name="can_focus">True</property> | 822 | <property name="can_focus">True</property> |
1079 | 462 | <property name="can_default">True</property> | 823 | <property name="can_default">True</property> |
1080 | 463 | <property name="receives_default">False</property> | 824 | <property name="receives_default">False</property> |
1081 | 825 | <property name="use_action_appearance">False</property> | ||
1082 | 464 | <property name="use_stock">True</property> | 826 | <property name="use_stock">True</property> |
1084 | 465 | <signal name="clicked" handler="on_btnOpen_clicked"/> | 827 | <signal name="clicked" handler="open_watch_callback" swapped="no"/> |
1085 | 466 | </object> | 828 | </object> |
1086 | 467 | <packing> | 829 | <packing> |
1087 | 468 | <property name="expand">False</property> | 830 | <property name="expand">False</property> |
1088 | @@ -477,7 +839,8 @@ | |||
1089 | 477 | <property name="can_focus">True</property> | 839 | <property name="can_focus">True</property> |
1090 | 478 | <property name="can_default">True</property> | 840 | <property name="can_default">True</property> |
1091 | 479 | <property name="receives_default">False</property> | 841 | <property name="receives_default">False</property> |
1093 | 480 | <signal name="clicked" handler="on_btnClear_clicked"/> | 842 | <property name="use_action_appearance">False</property> |
1094 | 843 | <signal name="clicked" handler="mark_watch_as_read" swapped="no"/> | ||
1095 | 481 | </object> | 844 | </object> |
1096 | 482 | <packing> | 845 | <packing> |
1097 | 483 | <property name="expand">False</property> | 846 | <property name="expand">False</property> |
1098 | @@ -492,8 +855,9 @@ | |||
1099 | 492 | <property name="can_focus">True</property> | 855 | <property name="can_focus">True</property> |
1100 | 493 | <property name="can_default">True</property> | 856 | <property name="can_default">True</property> |
1101 | 494 | <property name="receives_default">False</property> | 857 | <property name="receives_default">False</property> |
1102 | 858 | <property name="use_action_appearance">False</property> | ||
1103 | 495 | <property name="use_stock">True</property> | 859 | <property name="use_stock">True</property> |
1105 | 496 | <signal name="clicked" handler="on_btnEdit_clicked"/> | 860 | <signal name="clicked" handler="show_edit_watch" swapped="no"/> |
1106 | 497 | </object> | 861 | </object> |
1107 | 498 | <packing> | 862 | <packing> |
1108 | 499 | <property name="expand">False</property> | 863 | <property name="expand">False</property> |
1109 | @@ -504,6 +868,7 @@ | |||
1110 | 504 | </object> | 868 | </object> |
1111 | 505 | <packing> | 869 | <packing> |
1112 | 506 | <property name="expand">False</property> | 870 | <property name="expand">False</property> |
1113 | 871 | <property name="fill">True</property> | ||
1114 | 507 | <property name="pack_type">end</property> | 872 | <property name="pack_type">end</property> |
1115 | 508 | <property name="position">1</property> | 873 | <property name="position">1</property> |
1116 | 509 | </packing> | 874 | </packing> |
1117 | @@ -516,168 +881,16 @@ | |||
1118 | 516 | </packing> | 881 | </packing> |
1119 | 517 | </child> | 882 | </child> |
1120 | 518 | <child> | 883 | <child> |
1122 | 519 | <object class="GtkStatusbar" id="statusbar1"/> | 884 | <object class="GtkStatusbar" id="statusbar1"> |
1123 | 885 | <property name="can_focus">False</property> | ||
1124 | 886 | </object> | ||
1125 | 520 | <packing> | 887 | <packing> |
1126 | 521 | <property name="expand">False</property> | 888 | <property name="expand">False</property> |
1127 | 889 | <property name="fill">True</property> | ||
1128 | 522 | <property name="position">4</property> | 890 | <property name="position">4</property> |
1129 | 523 | </packing> | 891 | </packing> |
1130 | 524 | </child> | 892 | </child> |
1131 | 525 | </object> | 893 | </object> |
1132 | 526 | </child> | 894 | </child> |
1133 | 527 | </object> | 895 | </object> |
1134 | 528 | <object class="GtkWindow" id="error_dialog"> | ||
1135 | 529 | <property name="title" translatable="yes">Error</property> | ||
1136 | 530 | <property name="resizable">False</property> | ||
1137 | 531 | <property name="window_position">center-on-parent</property> | ||
1138 | 532 | <child> | ||
1139 | 533 | <object class="GtkVBox" id="vbox1"> | ||
1140 | 534 | <property name="visible">True</property> | ||
1141 | 535 | <property name="border_width">6</property> | ||
1142 | 536 | <child> | ||
1143 | 537 | <object class="GtkHBox" id="hbox4"> | ||
1144 | 538 | <property name="visible">True</property> | ||
1145 | 539 | <child> | ||
1146 | 540 | <object class="GtkImage" id="image"> | ||
1147 | 541 | <property name="visible">True</property> | ||
1148 | 542 | <property name="stock">gtk-missing-image</property> | ||
1149 | 543 | </object> | ||
1150 | 544 | <packing> | ||
1151 | 545 | <property name="position">0</property> | ||
1152 | 546 | </packing> | ||
1153 | 547 | </child> | ||
1154 | 548 | <child> | ||
1155 | 549 | <object class="GtkLabel" id="label4"> | ||
1156 | 550 | <property name="visible">True</property> | ||
1157 | 551 | </object> | ||
1158 | 552 | <packing> | ||
1159 | 553 | <property name="padding">6</property> | ||
1160 | 554 | <property name="position">1</property> | ||
1161 | 555 | </packing> | ||
1162 | 556 | </child> | ||
1163 | 557 | </object> | ||
1164 | 558 | <packing> | ||
1165 | 559 | <property name="expand">False</property> | ||
1166 | 560 | <property name="fill">False</property> | ||
1167 | 561 | <property name="padding">6</property> | ||
1168 | 562 | <property name="position">0</property> | ||
1169 | 563 | </packing> | ||
1170 | 564 | </child> | ||
1171 | 565 | <child> | ||
1172 | 566 | <object class="GtkExpander" id="expander1"> | ||
1173 | 567 | <property name="visible">True</property> | ||
1174 | 568 | <property name="can_focus">True</property> | ||
1175 | 569 | <child> | ||
1176 | 570 | <object class="GtkScrolledWindow" id="scrolledwindow1"> | ||
1177 | 571 | <property name="visible">True</property> | ||
1178 | 572 | <property name="can_focus">True</property> | ||
1179 | 573 | <property name="hscrollbar_policy">automatic</property> | ||
1180 | 574 | <property name="vscrollbar_policy">automatic</property> | ||
1181 | 575 | <child> | ||
1182 | 576 | <object class="GtkTextView" id="error_message"> | ||
1183 | 577 | <property name="height_request">200</property> | ||
1184 | 578 | <property name="visible">True</property> | ||
1185 | 579 | <property name="can_focus">True</property> | ||
1186 | 580 | </object> | ||
1187 | 581 | </child> | ||
1188 | 582 | </object> | ||
1189 | 583 | </child> | ||
1190 | 584 | <child type="label"> | ||
1191 | 585 | <object class="GtkLabel" id="label2"> | ||
1192 | 586 | <property name="visible">True</property> | ||
1193 | 587 | <property name="label" translatable="yes">Debug information</property> | ||
1194 | 588 | </object> | ||
1195 | 589 | </child> | ||
1196 | 590 | </object> | ||
1197 | 591 | <packing> | ||
1198 | 592 | <property name="padding">6</property> | ||
1199 | 593 | <property name="position">1</property> | ||
1200 | 594 | </packing> | ||
1201 | 595 | </child> | ||
1202 | 596 | <child> | ||
1203 | 597 | <object class="GtkHSeparator" id="hseparator1"> | ||
1204 | 598 | <property name="visible">True</property> | ||
1205 | 599 | </object> | ||
1206 | 600 | <packing> | ||
1207 | 601 | <property name="expand">False</property> | ||
1208 | 602 | <property name="padding">6</property> | ||
1209 | 603 | <property name="position">2</property> | ||
1210 | 604 | </packing> | ||
1211 | 605 | </child> | ||
1212 | 606 | <child> | ||
1213 | 607 | <object class="GtkHBox" id="hbox3"> | ||
1214 | 608 | <property name="visible">True</property> | ||
1215 | 609 | <child> | ||
1216 | 610 | <object class="GtkButton" id="send"> | ||
1217 | 611 | <property name="label" translatable="yes">Visit the issue tracker</property> | ||
1218 | 612 | <property name="visible">True</property> | ||
1219 | 613 | <property name="can_focus">True</property> | ||
1220 | 614 | <property name="receives_default">True</property> | ||
1221 | 615 | </object> | ||
1222 | 616 | <packing> | ||
1223 | 617 | <property name="padding">6</property> | ||
1224 | 618 | <property name="position">0</property> | ||
1225 | 619 | </packing> | ||
1226 | 620 | </child> | ||
1227 | 621 | <child> | ||
1228 | 622 | <object class="GtkLabel" id="label3"> | ||
1229 | 623 | <property name="visible">True</property> | ||
1230 | 624 | </object> | ||
1231 | 625 | <packing> | ||
1232 | 626 | <property name="padding">6</property> | ||
1233 | 627 | <property name="position">1</property> | ||
1234 | 628 | </packing> | ||
1235 | 629 | </child> | ||
1236 | 630 | <child> | ||
1237 | 631 | <object class="GtkLabel" id="label1"> | ||
1238 | 632 | <property name="visible">True</property> | ||
1239 | 633 | </object> | ||
1240 | 634 | <packing> | ||
1241 | 635 | <property name="position">2</property> | ||
1242 | 636 | </packing> | ||
1243 | 637 | </child> | ||
1244 | 638 | <child> | ||
1245 | 639 | <object class="GtkButton" id="ok"> | ||
1246 | 640 | <property name="label">gtk-ok</property> | ||
1247 | 641 | <property name="visible">True</property> | ||
1248 | 642 | <property name="can_focus">True</property> | ||
1249 | 643 | <property name="receives_default">True</property> | ||
1250 | 644 | <property name="use_stock">True</property> | ||
1251 | 645 | </object> | ||
1252 | 646 | <packing> | ||
1253 | 647 | <property name="padding">6</property> | ||
1254 | 648 | <property name="position">3</property> | ||
1255 | 649 | </packing> | ||
1256 | 650 | </child> | ||
1257 | 651 | </object> | ||
1258 | 652 | <packing> | ||
1259 | 653 | <property name="expand">False</property> | ||
1260 | 654 | <property name="fill">False</property> | ||
1261 | 655 | <property name="padding">6</property> | ||
1262 | 656 | <property name="position">3</property> | ||
1263 | 657 | </packing> | ||
1264 | 658 | </child> | ||
1265 | 659 | </object> | ||
1266 | 660 | </child> | ||
1267 | 661 | </object> | ||
1268 | 662 | <object class="GtkImage" id="image1"> | ||
1269 | 663 | <property name="visible">True</property> | ||
1270 | 664 | <property name="stock">gtk-open</property> | ||
1271 | 665 | </object> | ||
1272 | 666 | <object class="GtkImage" id="image2"> | ||
1273 | 667 | <property name="visible">True</property> | ||
1274 | 668 | <property name="stock">gtk-save</property> | ||
1275 | 669 | </object> | ||
1276 | 670 | <object class="GtkImage" id="image3"> | ||
1277 | 671 | <property name="visible">True</property> | ||
1278 | 672 | <property name="stock">gtk-clear</property> | ||
1279 | 673 | </object> | ||
1280 | 674 | <object class="GtkImage" id="image4"> | ||
1281 | 675 | <property name="visible">True</property> | ||
1282 | 676 | <property name="stock">gtk-clear</property> | ||
1283 | 677 | </object> | ||
1284 | 678 | <object class="GtkImage" id="image5"> | ||
1285 | 679 | <property name="visible">True</property> | ||
1286 | 680 | <property name="stock">gtk-sort-ascending</property> | ||
1287 | 681 | </object> | ||
1288 | 682 | <object class="GtkAccelGroup" id="accelgroup1"/> | ||
1289 | 683 | </interface> | 896 | </interface> |
1290 | 684 | 897 | ||
1291 | === modified file 'spectlib/about.py' | |||
1292 | --- spectlib/about.py 2010-11-23 15:42:22 +0000 | |||
1293 | +++ spectlib/about.py 2011-05-24 17:11:46 +0000 | |||
1294 | @@ -40,35 +40,18 @@ | |||
1295 | 40 | 40 | ||
1296 | 41 | license_file_path = (os.path.join(get_path(category="doc"), "COPYING")) | 41 | license_file_path = (os.path.join(get_path(category="doc"), "COPYING")) |
1297 | 42 | with open(license_file_path, "r") as license_file: | 42 | with open(license_file_path, "r") as license_file: |
1304 | 43 | license = license_file.read() | 43 | _license = license_file.read() |
1299 | 44 | |||
1300 | 45 | authors_file_path = (os.path.join(get_path(category="doc"), "AUTHORS")) | ||
1301 | 46 | with open(authors_file_path, "r") as authors_file: | ||
1302 | 47 | # this is a hack, because gtk.AboutDialog expects a list, not a file | ||
1303 | 48 | authors = authors_file.readlines() | ||
1305 | 49 | 44 | ||
1306 | 50 | logo = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_about.png")) | 45 | logo = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_about.png")) |
1307 | 51 | 46 | ||
1316 | 52 | # gtk.AboutDialog will detect if "translator-credits" is untranslated, | 47 | uifile = os.path.join(self.specto.PATH, "uis/about.ui") |
1317 | 53 | # and hide the tab. | 48 | windowname = "about" |
1318 | 54 | translator_credits = _("translator-credits") | 49 | self.builder = gtk.Builder() |
1319 | 55 | 50 | self.builder.set_translation_domain("specto") | |
1320 | 56 | #create tree | 51 | self.builder.add_from_file(uifile) |
1321 | 57 | self.about = gtk.AboutDialog() | 52 | self.about = self.builder.get_object("aboutdialog1") |
1314 | 58 | |||
1315 | 59 | self.about.set_name("Specto") | ||
1322 | 60 | self.about.set_version(self.specto.VERSION) | 53 | self.about.set_version(self.specto.VERSION) |
1334 | 61 | self.about.set_copyright("Copyright © Jean-François Fortin Tam & Wout Clymans") | 54 | self.about.set_license(_license) |
1324 | 62 | self.about.set_comments(_("Be notified of everything")) | ||
1325 | 63 | self.about.set_license(license) | ||
1326 | 64 | #self.wTree.set_wrap_license(license) | ||
1327 | 65 | gtk.about_dialog_set_url_hook(lambda about, url: show_webpage(url)) | ||
1328 | 66 | self.about.set_website("http://specto.sourceforge.net") | ||
1329 | 67 | self.about.set_website_label(_("Specto's Website")) | ||
1330 | 68 | self.about.set_authors(authors) | ||
1331 | 69 | #self.about.set_documenters(documenters) | ||
1332 | 70 | #self.about.set_artists(artists) | ||
1333 | 71 | self.about.set_translator_credits(translator_credits) | ||
1335 | 72 | self.about.set_logo(logo) | 55 | self.about.set_logo(logo) |
1336 | 73 | 56 | ||
1337 | 74 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.png")) | 57 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.png")) |
1338 | 75 | 58 | ||
1339 | === modified file 'spectlib/export_watch.py' | |||
1340 | --- spectlib/export_watch.py 2010-11-23 15:28:11 +0000 | |||
1341 | +++ spectlib/export_watch.py 2011-05-24 17:11:46 +0000 | |||
1342 | @@ -57,80 +57,35 @@ | |||
1343 | 57 | self.export_watch.set_title(_("Export watches")) | 57 | self.export_watch.set_title(_("Export watches")) |
1344 | 58 | self.builder.get_object("button_action").set_label(_("Export watches")) | 58 | self.builder.get_object("button_action").set_label(_("Export watches")) |
1345 | 59 | 59 | ||
1348 | 60 | self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gtk.gdk.Pixbuf, \ | 60 | self.model = self.builder.get_object("liststore1") |
1347 | 61 | gobject.TYPE_STRING, gobject.TYPE_INT, gobject.TYPE_STRING) | ||
1349 | 62 | self.new_watch_db = {} | 61 | self.new_watch_db = {} |
1357 | 63 | 62 | ||
1351 | 64 | #catch some events | ||
1352 | 65 | dic = {"on_button_select_all_clicked": self.select_all, | ||
1353 | 66 | "on_button_deselect_all_clicked": self.deselect_all, | ||
1354 | 67 | "on_button_action_clicked": self.do_action, | ||
1355 | 68 | "on_button_close_clicked": self.delete_event} | ||
1356 | 69 | |||
1358 | 70 | #attach the events | 63 | #attach the events |
1360 | 71 | self.builder.connect_signals(dic) | 64 | self.builder.connect_signals(self) |
1361 | 72 | 65 | ||
1362 | 73 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.png")) | 66 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.png")) |
1363 | 74 | self.export_watch.set_icon(icon) | 67 | self.export_watch.set_icon(icon) |
1364 | 75 | 68 | ||
1365 | 76 | self.treeview = self.builder.get_object("treeview") | 69 | self.treeview = self.builder.get_object("treeview") |
1366 | 77 | self.treeview.set_model(self.model) | ||
1367 | 78 | self.treeview.set_flags(gtk.TREE_MODEL_ITERS_PERSIST) | 70 | self.treeview.set_flags(gtk.TREE_MODEL_ITERS_PERSIST) |
1368 | 79 | self.iter = {} | 71 | self.iter = {} |
1369 | 80 | 72 | ||
1370 | 81 | ### Checkbox | ||
1371 | 82 | self.renderer = gtk.CellRendererToggle() | ||
1372 | 83 | self.renderer.set_property("activatable", True) | ||
1373 | 84 | self.renderer.connect("toggled", self.check_clicked, self.model) | ||
1374 | 85 | self.columnCheck = gtk.TreeViewColumn(_("Select"), \ | ||
1375 | 86 | self.renderer, active=0) | ||
1376 | 87 | self.treeview.append_column(self.columnCheck) | ||
1377 | 88 | |||
1378 | 89 | ### Icon | ||
1379 | 90 | self.renderer = gtk.CellRendererPixbuf() | ||
1380 | 91 | self.columnIcon = gtk.TreeViewColumn(_("Type"), \ | ||
1381 | 92 | self.renderer, pixbuf=1) | ||
1382 | 93 | self.treeview.append_column(self.columnIcon) | ||
1383 | 94 | |||
1384 | 95 | ### Titre | ||
1385 | 96 | self.renderer = gtk.CellRendererText() | ||
1386 | 97 | self.columnTitel = gtk.TreeViewColumn(_("Name"), \ | ||
1387 | 98 | self.renderer, markup=2) | ||
1388 | 99 | self.columnTitel.set_expand(True) | ||
1389 | 100 | self.columnTitel.set_resizable(True) | ||
1390 | 101 | self.treeview.append_column(self.columnTitel) | ||
1391 | 102 | |||
1392 | 103 | ### ID | ||
1393 | 104 | self.renderer = gtk.CellRendererText() | ||
1394 | 105 | self.column = gtk.TreeViewColumn(_("ID"), self.renderer, markup=3) | ||
1395 | 106 | self.column.set_visible(False) | ||
1396 | 107 | #self.column.set_sort_column_id(3) | ||
1397 | 108 | self.treeview.append_column(self.column) | ||
1398 | 109 | |||
1399 | 110 | ### type | ||
1400 | 111 | self.renderer = gtk.CellRendererText() | ||
1401 | 112 | self.columnType = gtk.TreeViewColumn(_("TYPE"), \ | ||
1402 | 113 | self.renderer, markup=4) | ||
1403 | 114 | self.columnType.set_visible(False) | ||
1404 | 115 | #self.columnType.set_sort_column_id(4) | ||
1405 | 116 | self.treeview.append_column(self.columnType) | ||
1406 | 117 | |||
1407 | 118 | for watch in self.specto.watch_db: | 73 | for watch in self.specto.watch_db: |
1409 | 119 | if watch.deleted == False: | 74 | if not watch.deleted: |
1410 | 120 | self.add_watch_entry(watch.id) | 75 | self.add_watch_entry(watch.id) |
1411 | 121 | 76 | ||
1412 | 122 | def select_all(self, widget): | 77 | def select_all(self, widget): |
1413 | 123 | db = self.specto.watch_db | 78 | db = self.specto.watch_db |
1414 | 124 | 79 | ||
1415 | 125 | for watch in db: | 80 | for watch in db: |
1417 | 126 | if watch.deleted == False: | 81 | if not watch.deleted: |
1418 | 127 | self.model.set_value(self.iter[watch.id], 0, 1) | 82 | self.model.set_value(self.iter[watch.id], 0, 1) |
1419 | 128 | 83 | ||
1420 | 129 | def deselect_all(self, widget): | 84 | def deselect_all(self, widget): |
1421 | 130 | db = self.specto.watch_db | 85 | db = self.specto.watch_db |
1422 | 131 | 86 | ||
1423 | 132 | for watch in db: | 87 | for watch in db: |
1425 | 133 | if watch.deleted == False: | 88 | if not watch.deleted: |
1426 | 134 | self.model.set_value(self.iter[watch.id], 0, 0) | 89 | self.model.set_value(self.iter[watch.id], 0, 0) |
1427 | 135 | 90 | ||
1428 | 136 | def do_action(self, widget): | 91 | def do_action(self, widget): |
1429 | @@ -154,7 +109,7 @@ | |||
1430 | 154 | watch_db = self.specto.watch_db | 109 | watch_db = self.specto.watch_db |
1431 | 155 | 110 | ||
1432 | 156 | for watch in watch_db: | 111 | for watch in watch_db: |
1434 | 157 | if watch.deleted == False: | 112 | if not watch.deleted: |
1435 | 158 | if self.model.get_value(self.iter[watch.id], 0) == True: | 113 | if self.model.get_value(self.iter[watch.id], 0) == True: |
1436 | 159 | selected_watches_db[i] = watch | 114 | selected_watches_db[i] = watch |
1437 | 160 | i += 1 | 115 | i += 1 |
1438 | @@ -175,16 +130,17 @@ | |||
1439 | 175 | def set_new_watch_db(self, watch_db): | 130 | def set_new_watch_db(self, watch_db): |
1440 | 176 | self.new_watch_db = watch_db | 131 | self.new_watch_db = watch_db |
1441 | 177 | 132 | ||
1443 | 178 | def check_clicked(self, object, path, model): | 133 | def check_clicked(self, obj, model): |
1444 | 179 | """ Call the main function to start/stop the selected watch. """ | 134 | """ Call the main function to start/stop the selected watch. """ |
1445 | 180 | sel = self.treeview.get_selection() | 135 | sel = self.treeview.get_selection() |
1451 | 181 | sel.select_path(path) | 136 | sel.select_path(model) |
1452 | 182 | model, iter = self.treeview.get_selection().get_selected() | 137 | model, _iter = sel.get_selected() |
1453 | 183 | 138 | if not _iter: | |
1454 | 184 | if model.get_value(iter, 0): | 139 | return |
1455 | 185 | model.set_value(iter, 0, 0) | 140 | if model.get_value(_iter, 0): |
1456 | 141 | model.set_value(_iter, 0, 0) | ||
1457 | 186 | else: | 142 | else: |
1459 | 187 | model.set_value(iter, 0, 1) | 143 | model.set_value(_iter, 0, 1) |
1460 | 188 | 144 | ||
1461 | 189 | 145 | ||
1462 | 190 | class ExportSaveDialog(SaveDialog): | 146 | class ExportSaveDialog(SaveDialog): |
1463 | 191 | 147 | ||
1464 | === modified file 'spectlib/import_watch.py' | |||
1465 | --- spectlib/import_watch.py 2010-11-23 15:28:11 +0000 | |||
1466 | +++ spectlib/import_watch.py 2011-05-24 17:11:46 +0000 | |||
1467 | @@ -67,72 +67,32 @@ | |||
1468 | 67 | self.import_watch.set_title(_("Import watches")) | 67 | self.import_watch.set_title(_("Import watches")) |
1469 | 68 | self.builder.get_object("button_action").set_label(_("Import watches")) | 68 | self.builder.get_object("button_action").set_label(_("Import watches")) |
1470 | 69 | 69 | ||
1472 | 70 | self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gtk.gdk.Pixbuf, gobject.TYPE_STRING, gobject.TYPE_INT, gobject.TYPE_STRING) | 70 | self.model = self.builder.get_object("liststore1") |
1473 | 71 | self.new_watch_db = {} | 71 | self.new_watch_db = {} |
1474 | 72 | 72 | ||
1475 | 73 | #catch some events | ||
1476 | 74 | dic = {"on_button_select_all_clicked": self.select_all, | ||
1477 | 75 | "on_button_deselect_all_clicked": self.deselect_all, | ||
1478 | 76 | "on_button_action_clicked": self.import_watches, | ||
1479 | 77 | "on_button_close_clicked": self.delete_event} | ||
1480 | 78 | |||
1481 | 79 | #attach the events | 73 | #attach the events |
1483 | 80 | self.builder.connect_signals(dic) | 74 | self.builder.connect_signals(self) |
1484 | 81 | 75 | ||
1485 | 82 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.png")) | 76 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.png")) |
1486 | 83 | self.import_watch.set_icon(icon) | 77 | self.import_watch.set_icon(icon) |
1487 | 84 | 78 | ||
1488 | 85 | self.treeview = self.builder.get_object("treeview") | 79 | self.treeview = self.builder.get_object("treeview") |
1489 | 86 | self.treeview.set_model(self.model) | ||
1490 | 87 | self.treeview.set_flags(gtk.TREE_MODEL_ITERS_PERSIST) | 80 | self.treeview.set_flags(gtk.TREE_MODEL_ITERS_PERSIST) |
1491 | 88 | self.iter = {} | 81 | self.iter = {} |
1492 | 89 | 82 | ||
1493 | 90 | ### Checkbox | ||
1494 | 91 | self.renderer = gtk.CellRendererToggle() | ||
1495 | 92 | self.renderer.set_property("activatable", True) | ||
1496 | 93 | self.renderer.connect("toggled", self.check_clicked, self.model) | ||
1497 | 94 | self.columnCheck = gtk.TreeViewColumn(_("Select"), self.renderer, active=0) | ||
1498 | 95 | self.treeview.append_column(self.columnCheck) | ||
1499 | 96 | |||
1500 | 97 | ### Icon | ||
1501 | 98 | self.renderer = gtk.CellRendererPixbuf() | ||
1502 | 99 | self.columnIcon = gtk.TreeViewColumn(_("Type"), self.renderer, pixbuf=1) | ||
1503 | 100 | self.treeview.append_column(self.columnIcon) | ||
1504 | 101 | |||
1505 | 102 | ### Titre | ||
1506 | 103 | self.renderer = gtk.CellRendererText() | ||
1507 | 104 | self.columnTitel = gtk.TreeViewColumn(_("Name"), self.renderer, markup=2) | ||
1508 | 105 | self.columnTitel.set_expand(True) | ||
1509 | 106 | self.columnTitel.set_resizable(True) | ||
1510 | 107 | self.treeview.append_column(self.columnTitel) | ||
1511 | 108 | |||
1512 | 109 | ### ID | ||
1513 | 110 | self.renderer = gtk.CellRendererText() | ||
1514 | 111 | self.column = gtk.TreeViewColumn(_("ID"), self.renderer, markup=3) | ||
1515 | 112 | self.column.set_visible(False) | ||
1516 | 113 | #self.column.set_sort_column_id(3) | ||
1517 | 114 | self.treeview.append_column(self.column) | ||
1518 | 115 | |||
1519 | 116 | ### type | ||
1520 | 117 | self.renderer = gtk.CellRendererText() | ||
1521 | 118 | self.columnType = gtk.TreeViewColumn(_("TYPE"), self.renderer, markup=4) | ||
1522 | 119 | self.columnType.set_visible(False) | ||
1523 | 120 | #self.columnType.set_sort_column_id(4) | ||
1524 | 121 | self.treeview.append_column(self.columnType) | ||
1525 | 122 | |||
1526 | 123 | def select_all(self, widget): | 83 | def select_all(self, widget): |
1527 | 124 | db = self.new_watch_db | 84 | db = self.new_watch_db |
1528 | 125 | for watch in db: | 85 | for watch in db: |
1530 | 126 | if watch.deleted == False: | 86 | if not watch.deleted: |
1531 | 127 | self.model.set_value(self.iter[watch.id], 0, 1) | 87 | self.model.set_value(self.iter[watch.id], 0, 1) |
1532 | 128 | 88 | ||
1533 | 129 | def deselect_all(self, widget): | 89 | def deselect_all(self, widget): |
1534 | 130 | db = self.new_watch_db | 90 | db = self.new_watch_db |
1535 | 131 | for watch in db: | 91 | for watch in db: |
1537 | 132 | if watch.deleted == False: | 92 | if not watch.deleted: |
1538 | 133 | self.model.set_value(self.iter[watch.id], 0, 0) | 93 | self.model.set_value(self.iter[watch.id], 0, 0) |
1539 | 134 | 94 | ||
1541 | 135 | def import_watches(self, widget): | 95 | def do_action(self, widget): |
1542 | 136 | self.import_watch.hide_all() | 96 | self.import_watch.hide_all() |
1543 | 137 | 97 | ||
1544 | 138 | watches = self.get_selected_watches() | 98 | watches = self.get_selected_watches() |
1545 | @@ -176,7 +136,7 @@ | |||
1546 | 176 | i = 0 | 136 | i = 0 |
1547 | 177 | watch_db = self.new_watch_db | 137 | watch_db = self.new_watch_db |
1548 | 178 | for watch in watch_db: | 138 | for watch in watch_db: |
1550 | 179 | if watch.deleted == False: | 139 | if not watch.deleted: |
1551 | 180 | if self.model.get_value(self.iter[watch.id], 0) == True: | 140 | if self.model.get_value(self.iter[watch.id], 0) == True: |
1552 | 181 | selected_watches_db[i] = watch | 141 | selected_watches_db[i] = watch |
1553 | 182 | i += 1 | 142 | i += 1 |
1554 | @@ -197,16 +157,17 @@ | |||
1555 | 197 | def set_new_watch_db(self, watch_db): | 157 | def set_new_watch_db(self, watch_db): |
1556 | 198 | self.new_watch_db = watch_db | 158 | self.new_watch_db = watch_db |
1557 | 199 | 159 | ||
1559 | 200 | def check_clicked(self, object, path, model): | 160 | def check_clicked(self, obj, model): |
1560 | 201 | """ Call the main function to start/stop the selected watch. """ | 161 | """ Call the main function to start/stop the selected watch. """ |
1561 | 202 | sel = self.treeview.get_selection() | 162 | sel = self.treeview.get_selection() |
1567 | 203 | sel.select_path(path) | 163 | sel.select_path(model) |
1568 | 204 | model, iter = self.treeview.get_selection().get_selected() | 164 | model, _iter = sel.get_selected() |
1569 | 205 | 165 | if not _iter: | |
1570 | 206 | if model.get_value(iter, 0): | 166 | return |
1571 | 207 | model.set_value(iter, 0, 0) | 167 | if model.get_value(_iter, 0): |
1572 | 168 | model.set_value(_iter, 0, 0) | ||
1573 | 208 | else: | 169 | else: |
1575 | 209 | model.set_value(iter, 0, 1) | 170 | model.set_value(_iter, 0, 1) |
1576 | 210 | 171 | ||
1577 | 211 | 172 | ||
1578 | 212 | class ImportOpenDialog(OpenDialog): | 173 | class ImportOpenDialog(OpenDialog): |
1579 | @@ -231,7 +192,7 @@ | |||
1580 | 231 | 192 | ||
1581 | 232 | def read_options(self, file_name): | 193 | def read_options(self, file_name): |
1582 | 233 | watch_io = Watch_io(self.specto, file_name) | 194 | watch_io = Watch_io(self.specto, file_name) |
1584 | 234 | if watch_io.valid == False: | 195 | if not watch_io.valid: |
1585 | 235 | return False | 196 | return False |
1586 | 236 | 197 | ||
1587 | 237 | values = watch_io.read_all_watches() | 198 | values = watch_io.read_all_watches() |
1588 | 238 | 199 | ||
1589 | === modified file 'spectlib/notifier.py' | |||
1590 | --- spectlib/notifier.py 2010-11-23 15:28:11 +0000 | |||
1591 | +++ spectlib/notifier.py 2011-05-24 17:11:46 +0000 | |||
1592 | @@ -86,6 +86,7 @@ | |||
1593 | 86 | self.builder = gtk.Builder() | 86 | self.builder = gtk.Builder() |
1594 | 87 | self.builder.set_translation_domain("specto") | 87 | self.builder.set_translation_domain("specto") |
1595 | 88 | self.builder.add_from_file(uifile) | 88 | self.builder.add_from_file(uifile) |
1596 | 89 | self.builder.connect_signals(self) | ||
1597 | 89 | self.notifier = self.builder.get_object("notifier") | 90 | self.notifier = self.builder.get_object("notifier") |
1598 | 90 | if INDICATOR: | 91 | if INDICATOR: |
1599 | 91 | self.indicator = Indicator(specto) | 92 | self.indicator = Indicator(specto) |
1600 | @@ -102,36 +103,7 @@ | |||
1601 | 102 | 103 | ||
1602 | 103 | #create tree | 104 | #create tree |
1603 | 104 | self.iter = {} | 105 | self.iter = {} |
1634 | 105 | self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gtk.gdk.Pixbuf, gobject.TYPE_STRING, gobject.TYPE_INT, gobject.TYPE_STRING, pango.Weight) | 106 | self.model = self.builder.get_object('liststore') |
1605 | 106 | |||
1606 | 107 | #catch some events | ||
1607 | 108 | dic = { | ||
1608 | 109 | "on_add_activate": self.show_add_watch_menu, | ||
1609 | 110 | "on_edit_activate": self.show_edit_watch, | ||
1610 | 111 | "on_clear_all_activate": self.mark_all_as_read, | ||
1611 | 112 | "on_preferences_activate": self.show_preferences, | ||
1612 | 113 | "on_refresh_activate": self.refresh_all_watches, | ||
1613 | 114 | "on_close_activate": self.close_event, | ||
1614 | 115 | "on_quit_activate": self.delete_event, | ||
1615 | 116 | "on_import_watches_activate": self.import_watches, | ||
1616 | 117 | "on_export_watches_activate": self.export_watches, | ||
1617 | 118 | "on_error_log_activate": self.show_error_log, | ||
1618 | 119 | "on_display_all_watches_activate": self.toggle_show_deactivated_watches, | ||
1619 | 120 | "on_display_toolbar_activate": self.toggle_display_toolbar, | ||
1620 | 121 | "on_help_activate": self.show_help, | ||
1621 | 122 | "on_about_activate": self.show_about, | ||
1622 | 123 | "on_treeview_row_activated": self.open_watch_callback, | ||
1623 | 124 | "on_btnOpen_clicked": self.open_watch_callback, | ||
1624 | 125 | "on_btnClear_clicked": self.mark_watch_as_read, | ||
1625 | 126 | "on_treeview_cursor_changed": self.show_watch_info, | ||
1626 | 127 | "on_btnEdit_clicked": self.show_edit_watch, | ||
1627 | 128 | "on_by_watch_type_activate": self.sort_type, | ||
1628 | 129 | "on_by_name_activate": self.sort_name, | ||
1629 | 130 | "on_by_watch_active_activate": self.sort_active, | ||
1630 | 131 | "on_remove_clicked": self.remove_watch, | ||
1631 | 132 | "on_clear_activate": self._mark_watch_as_read, | ||
1632 | 133 | "on_remove_activate": self.remove_watch} | ||
1633 | 134 | self.builder.connect_signals(dic) | ||
1635 | 135 | 107 | ||
1636 | 136 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.svg")) | 108 | icon = gtk.gdk.pixbuf_new_from_file(os.path.join(self.specto.PATH, "icons/specto_window_icon.svg")) |
1637 | 137 | self.notifier.set_icon(icon) | 109 | self.notifier.set_icon(icon) |
1638 | @@ -359,17 +331,17 @@ | |||
1639 | 359 | id = int(self.model.get_value(iter, 3)) | 331 | id = int(self.model.get_value(iter, 3)) |
1640 | 360 | self.model.remove(iter) | 332 | self.model.remove(iter) |
1641 | 361 | 333 | ||
1643 | 362 | def check_clicked(self, object, path, model): | 334 | def check_clicked(self, obj, model): |
1644 | 363 | """ Call the main function to start/stop the selected watch. """ | 335 | """ Call the main function to start/stop the selected watch. """ |
1645 | 364 | sel = self.treeview.get_selection() | 336 | sel = self.treeview.get_selection() |
1647 | 365 | sel.select_path(path) | 337 | sel.select_path(model) |
1648 | 366 | 338 | ||
1651 | 367 | model, iter = self.treeview.get_selection().get_selected() | 339 | model, _iter = sel.get_selected() |
1652 | 368 | id = int(model.get_value(iter, 3)) | 340 | id = int(model.get_value(_iter, 3)) |
1653 | 369 | watch = self.specto.watch_db[id] | 341 | watch = self.specto.watch_db[id] |
1654 | 370 | 342 | ||
1657 | 371 | if model.get_value(iter, 0): | 343 | if model.get_value(_iter, 0): |
1658 | 372 | model.set_value(iter, 0, 0) | 344 | model.set_value(_iter, 0, 0) |
1659 | 373 | if watch.changed: | 345 | if watch.changed: |
1660 | 374 | self.mark_watch_as_read("", id) | 346 | self.mark_watch_as_read("", id) |
1661 | 375 | self.mark_watch_status("idle", id) | 347 | self.mark_watch_status("idle", id) |
1662 | @@ -377,7 +349,7 @@ | |||
1663 | 377 | if not self.builder.get_object("display_all_watches").active: | 349 | if not self.builder.get_object("display_all_watches").active: |
1664 | 378 | self.remove_notifier_entry(id) | 350 | self.remove_notifier_entry(id) |
1665 | 379 | else: | 351 | else: |
1667 | 380 | model.set_value(iter, 0, 1) | 352 | model.set_value(_iter, 0, 1) |
1668 | 381 | watch.start() | 353 | watch.start() |
1669 | 382 | 354 | ||
1670 | 383 | def connected_message(self, connected): | 355 | def connected_message(self, connected): |
1671 | @@ -696,6 +668,10 @@ | |||
1672 | 696 | 668 | ||
1673 | 697 | if self.specto.specto_gconf.get_entry("show_in_windowlist") == False: | 669 | if self.specto.specto_gconf.get_entry("show_in_windowlist") == False: |
1674 | 698 | self.notifier.set_skip_taskbar_hint(True) | 670 | self.notifier.set_skip_taskbar_hint(True) |
1675 | 671 | |||
1676 | 672 | self.columnTitle = self.builder.get_object('name_treeviewcolumn') | ||
1677 | 673 | self.columnType = self.builder.get_object('type_treeviewcolumn') | ||
1678 | 674 | self.columnCheck = self.builder.get_object('active_treeviewcolumn') | ||
1679 | 699 | 675 | ||
1680 | 700 | 676 | ||
1681 | 701 | ### Initiate the window | 677 | ### Initiate the window |
1682 | @@ -718,50 +694,8 @@ | |||
1683 | 718 | if not self.specto.notifier_hide: | 694 | if not self.specto.notifier_hide: |
1684 | 719 | self.notifier.show() | 695 | self.notifier.show() |
1685 | 720 | 696 | ||
1686 | 721 | ### Checkbox | ||
1687 | 722 | self.columnCheck_renderer = gtk.CellRendererToggle() | ||
1688 | 723 | self.columnCheck_renderer.set_property("activatable", True) | ||
1689 | 724 | self.columnCheck_renderer.connect("toggled", self.check_clicked, self.model) | ||
1690 | 725 | self.columnCheck = gtk.TreeViewColumn(_("Active"), self.columnCheck_renderer, active=0) | ||
1691 | 726 | self.columnCheck.connect("clicked", self.sort_active_from_treeview_headers) | ||
1692 | 727 | self.columnCheck.set_sort_column_id(0) | ||
1693 | 728 | self.treeview.append_column(self.columnCheck) | ||
1694 | 729 | |||
1695 | 730 | ### Icon | ||
1696 | 731 | self.columnIcon_renderer = gtk.CellRendererPixbuf() | ||
1697 | 732 | self.columnIcon = gtk.TreeViewColumn(_("Type"), self.columnIcon_renderer, pixbuf=1) | ||
1698 | 733 | self.columnIcon.set_clickable(True) | ||
1699 | 734 | self.columnIcon.connect("clicked", self.sort_type_from_treeview_headers) | ||
1700 | 735 | self.treeview.append_column(self.columnIcon) | ||
1701 | 736 | |||
1702 | 737 | ### Titre | ||
1703 | 738 | self.columnTitle_renderer = gtk.CellRendererText() | ||
1704 | 739 | #self.columnTitle_renderer.set_property("editable", True) | ||
1705 | 740 | #self.columnTitle_renderer.connect('edited', self.change_entry_name) | ||
1706 | 741 | self.columnTitle = gtk.TreeViewColumn(_("Name"), self.columnTitle_renderer, text=2, weight=5) | ||
1707 | 742 | self.columnTitle.connect("clicked", self.sort_name_from_treeview_headers) | ||
1708 | 743 | self.columnTitle.set_expand(True) | ||
1709 | 744 | self.columnTitle.set_resizable(True) | ||
1710 | 745 | self.columnTitle.set_sort_column_id(2) | ||
1711 | 746 | self.treeview.append_column(self.columnTitle) | ||
1712 | 747 | |||
1713 | 748 | ### ID | ||
1714 | 749 | self.columnID_renderer = gtk.CellRendererText() | ||
1715 | 750 | self.columnID = gtk.TreeViewColumn(_("ID"), self.columnID_renderer, markup=3) | ||
1716 | 751 | self.columnID.set_visible(False) | ||
1717 | 752 | self.columnID.set_sort_column_id(3) | ||
1718 | 753 | self.treeview.append_column(self.columnID) | ||
1719 | 754 | |||
1720 | 755 | ### type | ||
1721 | 756 | self.renderer = gtk.CellRendererText() | ||
1722 | 757 | self.columnType = gtk.TreeViewColumn(_("TYPE"), self.renderer, markup=4) | ||
1723 | 758 | self.columnType.set_visible(False) | ||
1724 | 759 | self.columnType.set_sort_column_id(4) | ||
1725 | 760 | self.treeview.append_column(self.columnType) | ||
1726 | 761 | |||
1727 | 762 | self.get_startup_sort_order() | 697 | self.get_startup_sort_order() |
1728 | 763 | 698 | ||
1729 | 764 | |||
1730 | 765 | ###Create info-panel | 699 | ###Create info-panel |
1731 | 766 | vbox_info = self.builder.get_object("vbox_info") | 700 | vbox_info = self.builder.get_object("vbox_info") |
1732 | 767 | 701 |
This is quite interesting! A couple of things though:
- mousing over the "Add" submenu makes two menus appear (the toolbar's popup menu shows up). Wtf?
- how do we actually edit the contents now? What's the difference in the glade editor?
- maybe you want to take a look at lp:~kiddo/specto/pygi too
- I guess this simplifies the code a lot, however I'd like someone else to review this too
- it looks different than the current UI... the patch below makes it ressemble the main branch more, but it still has different column headers, the checkboxes are not centered, etc.
=== modified file 'data/uis/ notifier. ui' notifier. ui 2011-05-13 09:56:54 +0000 notifier. ui 2011-05-15 22:15:31 +0000 naming- policy toplevel-contextual --> GtkAccelGroup" id="accelgroup1"/> focus"> False</ property>
<object class=" GtkScrolledWind ow" id="scrolledwin dow1">
<property name="visible" >True</ property>
<property name="can_ focus"> True</property> r_policy" >automatic< /property> r_policy" >automatic< /property>
<child>
<object class="GtkTextView" id="error_message">
<property name="height_ request" >200</property>
< property name="visible" >True</ property>
< property name="can_ focus"> True</property>
< property name="hscrollba r_policy" >never< /property> r_policy" >automatic< /property>
< property name="shadow_ type">in< /property>
< child>
<object class="GtkTreeView" id="treeview">
<property name="visible" >True</ property>
<property name="can_ focus"> True</property>
<property name="model" >liststore< /property> clickable" >False< /property> hint">True< /property>
<property name="search_ column" >0</property> grid_lines" >both</ property>
<signal name="cursor- changed" handler= "show_watch_ info" swapped="no"/>
<signal name="row- activated" handler= "open_watch_ callback" swapped="no"/> child=" selection" > GtkTreeSelectio n" id="treeview- selection1" />
<child>
<object class=" GtkTreeViewColu mn" id="select_ treeviewcolumn" >
<property name="title" translatable= "yes">Select< /property>
--- data/uis/
+++ data/uis/
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.18"/>
- <!-- interface-
<object class="
<object class="GtkWindow" id="error_dialog">
<property name="can_
@@ -57,8 +56,6 @@
- <property name="hscrollba
- <property name="vscrollba
@@ -612,18 +609,19 @@
- <property name="vscrollba
- <property name="headers_
+ <property name="rules_
- <property name="enable_
+ <child internal-
+ <object class="
+ </child>