Merge lp:~mrand/mythbuntu/mythbuntu-common into lp:~mythbuntu/mythbuntu/mythbuntu-common
- mythbuntu-common
- Merge into mythbuntu-common
Proposed by
MarcRandolph
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | not available | ||||
Proposed branch: | lp:~mrand/mythbuntu/mythbuntu-common | ||||
Merge into: | lp:~mythbuntu/mythbuntu/mythbuntu-common | ||||
Diff against target: |
805 lines (+340/-416) 3 files modified
debian/changelog (+7/-0) mythbuntu_common/dictionaries.py (+0/-1) plugins/ui/tab_plugins.ui (+333/-415) |
||||
To merge this branch: | bzr merge lp:~mrand/mythbuntu/mythbuntu-common | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thomas Mashos | Approve | ||
Mythbuntu Team | Pending | ||
Review via email: mp+21901@code.launchpad.net |
Commit message
Description of the change
Change #211 removes NetFlix from mythbuntu-
Change #212 is cosmetic - it moves the repeated use of alignment containers with just one alignment container.
To post a comment you must log in.
- 212. By MarcRandolph
-
Clean up plugins section of MCC (use just one alignment rather than 7)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2010-03-06 23:19:42 +0000 |
3 | +++ debian/changelog 2010-03-22 23:31:26 +0000 |
4 | @@ -1,3 +1,10 @@ |
5 | +mythbuntu-common (0.47-0ubuntu2) UNRELEASED; urgency=low |
6 | + |
7 | + * Remove MythFlix (LP: #544521) |
8 | + * Clean up plugins section of MCC (use just one alignment rather than 7) |
9 | + |
10 | + -- Marc Randolph <mrand@pobox.com> Mon, 22 Mar 2010 15:42:49 -0500 |
11 | + |
12 | mythbuntu-common (0.47-0ubuntu1) lucid; urgency=low |
13 | |
14 | * Return errors on do_connection_test if there are any, None if not. |
15 | |
16 | === modified file 'mythbuntu_common/dictionaries.py' |
17 | --- mythbuntu_common/dictionaries.py 2010-02-18 05:48:37 +0000 |
18 | +++ mythbuntu_common/dictionaries.py 2010-03-22 23:31:26 +0000 |
19 | @@ -51,7 +51,6 @@ |
20 | list = { |
21 | "mytharchive": self.mytharchive_checkbox, \ |
22 | "mythbrowser": self.mythbrowser_checkbox, \ |
23 | - "mythflix": self.mythflix_checkbox, \ |
24 | "mythgame": self.mythgame_checkbox, \ |
25 | "mythgallery": self.mythgallery_checkbox, \ |
26 | "mythmusic": self.mythmusic_checkbox, \ |
27 | |
28 | === modified file 'plugins/ui/tab_plugins.ui' |
29 | --- plugins/ui/tab_plugins.ui 2010-03-06 23:18:20 +0000 |
30 | +++ plugins/ui/tab_plugins.ui 2010-03-22 23:31:26 +0000 |
31 | @@ -54,9 +54,7 @@ |
32 | <child> |
33 | <object class="GtkVBox" id="vbox1"> |
34 | <property name="visible">True</property> |
35 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
36 | <property name="orientation">vertical</property> |
37 | - <property name="spacing">10</property> |
38 | <child> |
39 | <object class="GtkLabel" id="label1"> |
40 | <property name="visible">True</property> |
41 | @@ -75,431 +73,351 @@ |
42 | <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
43 | <property name="left_padding">25</property> |
44 | <child> |
45 | - <object class="GtkCheckButton" id="selectall_plugins_checkbox"> |
46 | - <property name="label" translatable="yes">Enable/Disable All MythTV Plugins</property> |
47 | - <property name="visible">True</property> |
48 | - <property name="can_focus">True</property> |
49 | - <property name="receives_default">False</property> |
50 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
51 | - <property name="draw_indicator">True</property> |
52 | - <signal name="toggled" handler="toggle_plugins"/> |
53 | - </object> |
54 | - </child> |
55 | - </object> |
56 | - <packing> |
57 | - <property name="position">1</property> |
58 | - </packing> |
59 | - </child> |
60 | - <child> |
61 | - <object class="GtkTable" id="table1"> |
62 | - <property name="visible">True</property> |
63 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
64 | - <property name="n_rows">4</property> |
65 | - <property name="n_columns">3</property> |
66 | - <child> |
67 | - <object class="GtkAlignment" id="alignment4"> |
68 | - <property name="visible">True</property> |
69 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
70 | - <property name="xalign">0</property> |
71 | - <property name="yalign">0</property> |
72 | - <property name="xscale">0</property> |
73 | - <property name="left_padding">25</property> |
74 | - <child> |
75 | - <object class="GtkCheckButton" id="mytharchive_checkbox"> |
76 | - <property name="label" translatable="yes">MythArchive</property> |
77 | - <property name="width_request">175</property> |
78 | - <property name="visible">True</property> |
79 | - <property name="can_focus">True</property> |
80 | - <property name="receives_default">False</property> |
81 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
82 | - <property name="draw_indicator">True</property> |
83 | - </object> |
84 | - </child> |
85 | - </object> |
86 | - <packing> |
87 | - <property name="x_options">GTK_FILL</property> |
88 | - <property name="y_options">GTK_FILL</property> |
89 | - </packing> |
90 | - </child> |
91 | - <child> |
92 | - <object class="GtkAlignment" id="alignment3"> |
93 | - <property name="visible">True</property> |
94 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
95 | - <property name="xalign">0</property> |
96 | - <property name="yalign">0</property> |
97 | - <property name="xscale">0</property> |
98 | - <property name="yscale">0</property> |
99 | - <property name="left_padding">25</property> |
100 | - <child> |
101 | - <object class="GtkCheckButton" id="mythbrowser_checkbox"> |
102 | - <property name="label" translatable="yes">MythBrowser</property> |
103 | - <property name="width_request">175</property> |
104 | - <property name="visible">True</property> |
105 | - <property name="can_focus">True</property> |
106 | - <property name="receives_default">False</property> |
107 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
108 | - <property name="draw_indicator">True</property> |
109 | - </object> |
110 | - </child> |
111 | - </object> |
112 | - <packing> |
113 | - <property name="top_attach">1</property> |
114 | - <property name="bottom_attach">2</property> |
115 | - <property name="x_options">GTK_FILL</property> |
116 | - <property name="y_options">GTK_FILL</property> |
117 | - </packing> |
118 | - </child> |
119 | - <child> |
120 | - <object class="GtkAlignment" id="alignment8"> |
121 | - <property name="visible">True</property> |
122 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
123 | - <property name="xalign">0</property> |
124 | - <property name="yalign">0</property> |
125 | - <property name="xscale">0</property> |
126 | - <property name="yscale">0</property> |
127 | - <property name="left_padding">25</property> |
128 | - <child> |
129 | - <object class="GtkCheckButton" id="mythflix_checkbox"> |
130 | - <property name="label" translatable="yes">MythFlix</property> |
131 | - <property name="width_request">175</property> |
132 | - <property name="visible">True</property> |
133 | - <property name="can_focus">True</property> |
134 | - <property name="receives_default">False</property> |
135 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
136 | - <property name="draw_indicator">True</property> |
137 | - </object> |
138 | - </child> |
139 | - </object> |
140 | - <packing> |
141 | - <property name="top_attach">2</property> |
142 | - <property name="bottom_attach">3</property> |
143 | - <property name="x_options">GTK_FILL</property> |
144 | - <property name="y_options">GTK_FILL</property> |
145 | - </packing> |
146 | - </child> |
147 | - <child> |
148 | - <object class="GtkAlignment" id="alignment5"> |
149 | - <property name="visible">True</property> |
150 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
151 | - <property name="xalign">0</property> |
152 | - <property name="yalign">0</property> |
153 | - <property name="xscale">0</property> |
154 | - <property name="yscale">0</property> |
155 | - <property name="left_padding">25</property> |
156 | - <child> |
157 | - <object class="GtkCheckButton" id="mythgame_checkbox"> |
158 | - <property name="label" translatable="yes">MythGame</property> |
159 | - <property name="width_request">175</property> |
160 | - <property name="visible">True</property> |
161 | - <property name="can_focus">True</property> |
162 | - <property name="receives_default">False</property> |
163 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
164 | - <property name="draw_indicator">True</property> |
165 | - </object> |
166 | - </child> |
167 | - </object> |
168 | - <packing> |
169 | - <property name="top_attach">3</property> |
170 | - <property name="bottom_attach">4</property> |
171 | - <property name="x_options">GTK_FILL</property> |
172 | - <property name="y_options">GTK_FILL</property> |
173 | - </packing> |
174 | - </child> |
175 | - <child> |
176 | - <object class="GtkCheckButton" id="mythgallery_checkbox"> |
177 | - <property name="label" translatable="yes">MythGallery</property> |
178 | - <property name="width_request">175</property> |
179 | - <property name="visible">True</property> |
180 | - <property name="can_focus">True</property> |
181 | - <property name="receives_default">False</property> |
182 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
183 | - <property name="draw_indicator">True</property> |
184 | - </object> |
185 | - <packing> |
186 | - <property name="left_attach">1</property> |
187 | - <property name="right_attach">2</property> |
188 | - <property name="x_options">GTK_FILL</property> |
189 | - <property name="y_options">GTK_FILL</property> |
190 | - </packing> |
191 | - </child> |
192 | - <child> |
193 | - <object class="GtkCheckButton" id="mythweb_checkbox"> |
194 | - <property name="label" translatable="yes">MythWeb</property> |
195 | - <property name="width_request">175</property> |
196 | - <property name="visible">True</property> |
197 | - <property name="can_focus">True</property> |
198 | - <property name="receives_default">False</property> |
199 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
200 | - <property name="draw_indicator">True</property> |
201 | - <signal name="toggled" handler="toggle_plugins"/> |
202 | - </object> |
203 | - <packing> |
204 | - <property name="left_attach">2</property> |
205 | - <property name="right_attach">3</property> |
206 | - <property name="top_attach">3</property> |
207 | - <property name="bottom_attach">4</property> |
208 | - <property name="x_options">GTK_FILL</property> |
209 | - <property name="y_options">GTK_FILL</property> |
210 | - </packing> |
211 | - </child> |
212 | - <child> |
213 | - <object class="GtkCheckButton" id="mythweather_checkbox"> |
214 | - <property name="label" translatable="yes">MythWeather</property> |
215 | - <property name="width_request">175</property> |
216 | - <property name="visible">True</property> |
217 | - <property name="can_focus">True</property> |
218 | - <property name="receives_default">False</property> |
219 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
220 | - <property name="draw_indicator">True</property> |
221 | - </object> |
222 | - <packing> |
223 | - <property name="left_attach">2</property> |
224 | - <property name="right_attach">3</property> |
225 | - <property name="top_attach">2</property> |
226 | - <property name="bottom_attach">3</property> |
227 | - <property name="x_options">GTK_FILL</property> |
228 | - <property name="y_options">GTK_FILL</property> |
229 | - </packing> |
230 | - </child> |
231 | - <child> |
232 | - <object class="GtkCheckButton" id="mythvideo_checkbox"> |
233 | - <property name="label" translatable="yes">MythVideo</property> |
234 | - <property name="width_request">175</property> |
235 | - <property name="visible">True</property> |
236 | - <property name="can_focus">True</property> |
237 | - <property name="receives_default">False</property> |
238 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
239 | - <property name="draw_indicator">True</property> |
240 | - </object> |
241 | - <packing> |
242 | - <property name="left_attach">2</property> |
243 | - <property name="right_attach">3</property> |
244 | - <property name="top_attach">1</property> |
245 | - <property name="bottom_attach">2</property> |
246 | - <property name="x_options">GTK_FILL</property> |
247 | - <property name="y_options">GTK_FILL</property> |
248 | - </packing> |
249 | - </child> |
250 | - <child> |
251 | - <object class="GtkCheckButton" id="mythmusic_checkbox"> |
252 | - <property name="label" translatable="yes">MythMusic</property> |
253 | - <property name="width_request">175</property> |
254 | - <property name="visible">True</property> |
255 | - <property name="can_focus">True</property> |
256 | - <property name="receives_default">False</property> |
257 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
258 | - <property name="draw_indicator">True</property> |
259 | - </object> |
260 | - <packing> |
261 | - <property name="left_attach">2</property> |
262 | - <property name="right_attach">3</property> |
263 | - <property name="x_options">GTK_FILL</property> |
264 | - <property name="y_options">GTK_FILL</property> |
265 | - </packing> |
266 | - </child> |
267 | - <child> |
268 | - <object class="GtkCheckButton" id="mythmovies_checkbox"> |
269 | - <property name="label" translatable="yes">MythMovies</property> |
270 | - <property name="width_request">175</property> |
271 | - <property name="visible">True</property> |
272 | - <property name="can_focus">True</property> |
273 | - <property name="receives_default">False</property> |
274 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
275 | - <property name="draw_indicator">True</property> |
276 | - </object> |
277 | - <packing> |
278 | - <property name="left_attach">1</property> |
279 | - <property name="right_attach">2</property> |
280 | - <property name="top_attach">3</property> |
281 | - <property name="bottom_attach">4</property> |
282 | - <property name="x_options">GTK_FILL</property> |
283 | - <property name="y_options">GTK_FILL</property> |
284 | - </packing> |
285 | - </child> |
286 | - <child> |
287 | - <object class="GtkCheckButton" id="mythnews_checkbox"> |
288 | - <property name="label" translatable="yes">MythNews</property> |
289 | - <property name="width_request">175</property> |
290 | - <property name="visible">True</property> |
291 | - <property name="can_focus">True</property> |
292 | - <property name="receives_default">False</property> |
293 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
294 | - <property name="draw_indicator">True</property> |
295 | - </object> |
296 | - <packing> |
297 | - <property name="left_attach">1</property> |
298 | - <property name="right_attach">2</property> |
299 | - <property name="top_attach">2</property> |
300 | - <property name="bottom_attach">3</property> |
301 | - <property name="x_options">GTK_FILL</property> |
302 | - <property name="y_options">GTK_FILL</property> |
303 | - </packing> |
304 | - </child> |
305 | - <child> |
306 | - <object class="GtkCheckButton" id="mythnetvision_checkbox"> |
307 | - <property name="label" translatable="yes">MythNetvision</property> |
308 | - <property name="width_request">175</property> |
309 | - <property name="visible">True</property> |
310 | - <property name="can_focus">True</property> |
311 | - <property name="receives_default">False</property> |
312 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
313 | - <property name="draw_indicator">True</property> |
314 | - </object> |
315 | - <packing> |
316 | - <property name="left_attach">1</property> |
317 | - <property name="right_attach">2</property> |
318 | - <property name="top_attach">1</property> |
319 | - <property name="bottom_attach">2</property> |
320 | - <property name="x_options">GTK_FILL</property> |
321 | - <property name="y_options">GTK_FILL</property> |
322 | - </packing> |
323 | - </child> |
324 | - </object> |
325 | - <packing> |
326 | - <property name="position">2</property> |
327 | - </packing> |
328 | - </child> |
329 | - <child> |
330 | - <object class="GtkAlignment" id="alignment11"> |
331 | - <property name="visible">True</property> |
332 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
333 | - <property name="xalign">0</property> |
334 | - <property name="yalign">0</property> |
335 | - <property name="xscale">0</property> |
336 | - <property name="yscale">0</property> |
337 | - <property name="left_padding">25</property> |
338 | - <child> |
339 | - <object class="GtkHBox" id="hbox1"> |
340 | - <property name="visible">True</property> |
341 | - <child> |
342 | - <object class="GtkComboBox" id="mythweb_password_combobox"> |
343 | - <property name="visible">True</property> |
344 | - <property name="model">liststore1</property> |
345 | - <signal name="changed" handler="toggle_plugins"/> |
346 | - <child> |
347 | - <object class="GtkCellRendererText" id="renderer1"/> |
348 | - <attributes> |
349 | - <attribute name="text">0</attribute> |
350 | - </attributes> |
351 | - </child> |
352 | + <object class="GtkVBox" id="vbox3"> |
353 | + <property name="visible">True</property> |
354 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
355 | + <property name="orientation">vertical</property> |
356 | + <property name="spacing">10</property> |
357 | + <child> |
358 | + <object class="GtkCheckButton" id="selectall_plugins_checkbox"> |
359 | + <property name="label" translatable="yes">Enable/Disable All MythTV Plugins</property> |
360 | + <property name="visible">True</property> |
361 | + <property name="can_focus">True</property> |
362 | + <property name="receives_default">False</property> |
363 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
364 | + <property name="draw_indicator">True</property> |
365 | + <signal name="toggled" handler="toggle_plugins"/> |
366 | </object> |
367 | <packing> |
368 | <property name="position">0</property> |
369 | </packing> |
370 | </child> |
371 | <child> |
372 | - <object class="GtkLabel" id="label3"> |
373 | + <object class="GtkTable" id="table1"> |
374 | <property name="visible">True</property> |
375 | - <property name="xpad">25</property> |
376 | - <property name="label" translatable="yes">Password Protect Mythweb</property> |
377 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
378 | + <property name="n_rows">4</property> |
379 | + <property name="n_columns">3</property> |
380 | + <child> |
381 | + <object class="GtkCheckButton" id="mythweb_checkbox"> |
382 | + <property name="label" translatable="yes">MythWeb</property> |
383 | + <property name="width_request">175</property> |
384 | + <property name="visible">True</property> |
385 | + <property name="can_focus">True</property> |
386 | + <property name="receives_default">False</property> |
387 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
388 | + <property name="draw_indicator">True</property> |
389 | + <signal name="toggled" handler="toggle_plugins"/> |
390 | + </object> |
391 | + <packing> |
392 | + <property name="left_attach">2</property> |
393 | + <property name="right_attach">3</property> |
394 | + <property name="top_attach">2</property> |
395 | + <property name="bottom_attach">3</property> |
396 | + <property name="x_options">GTK_FILL</property> |
397 | + <property name="y_options">GTK_FILL</property> |
398 | + </packing> |
399 | + </child> |
400 | + <child> |
401 | + <object class="GtkCheckButton" id="mythweather_checkbox"> |
402 | + <property name="label" translatable="yes">MythWeather</property> |
403 | + <property name="width_request">175</property> |
404 | + <property name="visible">True</property> |
405 | + <property name="can_focus">True</property> |
406 | + <property name="receives_default">False</property> |
407 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
408 | + <property name="draw_indicator">True</property> |
409 | + </object> |
410 | + <packing> |
411 | + <property name="left_attach">2</property> |
412 | + <property name="right_attach">3</property> |
413 | + <property name="top_attach">1</property> |
414 | + <property name="bottom_attach">2</property> |
415 | + <property name="x_options">GTK_FILL</property> |
416 | + <property name="y_options">GTK_FILL</property> |
417 | + </packing> |
418 | + </child> |
419 | + <child> |
420 | + <object class="GtkCheckButton" id="mythvideo_checkbox"> |
421 | + <property name="label" translatable="yes">MythVideo</property> |
422 | + <property name="width_request">175</property> |
423 | + <property name="visible">True</property> |
424 | + <property name="can_focus">True</property> |
425 | + <property name="receives_default">False</property> |
426 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
427 | + <property name="draw_indicator">True</property> |
428 | + </object> |
429 | + <packing> |
430 | + <property name="left_attach">2</property> |
431 | + <property name="right_attach">3</property> |
432 | + <property name="x_options">GTK_FILL</property> |
433 | + <property name="y_options">GTK_FILL</property> |
434 | + </packing> |
435 | + </child> |
436 | + <child> |
437 | + <object class="GtkCheckButton" id="mythmusic_checkbox"> |
438 | + <property name="label" translatable="yes">MythMusic</property> |
439 | + <property name="width_request">175</property> |
440 | + <property name="visible">True</property> |
441 | + <property name="can_focus">True</property> |
442 | + <property name="receives_default">False</property> |
443 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
444 | + <property name="draw_indicator">True</property> |
445 | + </object> |
446 | + <packing> |
447 | + <property name="left_attach">1</property> |
448 | + <property name="right_attach">2</property> |
449 | + <property name="top_attach">1</property> |
450 | + <property name="bottom_attach">2</property> |
451 | + <property name="x_options">GTK_FILL</property> |
452 | + <property name="y_options">GTK_FILL</property> |
453 | + </packing> |
454 | + </child> |
455 | + <child> |
456 | + <object class="GtkCheckButton" id="mythmovies_checkbox"> |
457 | + <property name="label" translatable="yes">MythMovies</property> |
458 | + <property name="width_request">175</property> |
459 | + <property name="visible">True</property> |
460 | + <property name="can_focus">True</property> |
461 | + <property name="receives_default">False</property> |
462 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
463 | + <property name="draw_indicator">True</property> |
464 | + </object> |
465 | + <packing> |
466 | + <property name="left_attach">1</property> |
467 | + <property name="right_attach">2</property> |
468 | + <property name="x_options">GTK_FILL</property> |
469 | + <property name="y_options">GTK_FILL</property> |
470 | + </packing> |
471 | + </child> |
472 | + <child> |
473 | + <object class="GtkCheckButton" id="mythnews_checkbox"> |
474 | + <property name="label" translatable="yes">MythNews</property> |
475 | + <property name="width_request">175</property> |
476 | + <property name="visible">True</property> |
477 | + <property name="can_focus">True</property> |
478 | + <property name="receives_default">False</property> |
479 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
480 | + <property name="draw_indicator">True</property> |
481 | + </object> |
482 | + <packing> |
483 | + <property name="left_attach">1</property> |
484 | + <property name="right_attach">2</property> |
485 | + <property name="top_attach">3</property> |
486 | + <property name="bottom_attach">4</property> |
487 | + <property name="x_options">GTK_FILL</property> |
488 | + <property name="y_options">GTK_FILL</property> |
489 | + </packing> |
490 | + </child> |
491 | + <child> |
492 | + <object class="GtkCheckButton" id="mythnetvision_checkbox"> |
493 | + <property name="label" translatable="yes">MythNetvision</property> |
494 | + <property name="width_request">175</property> |
495 | + <property name="visible">True</property> |
496 | + <property name="can_focus">True</property> |
497 | + <property name="receives_default">False</property> |
498 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
499 | + <property name="draw_indicator">True</property> |
500 | + </object> |
501 | + <packing> |
502 | + <property name="left_attach">1</property> |
503 | + <property name="right_attach">2</property> |
504 | + <property name="top_attach">2</property> |
505 | + <property name="bottom_attach">3</property> |
506 | + <property name="x_options">GTK_FILL</property> |
507 | + <property name="y_options">GTK_FILL</property> |
508 | + </packing> |
509 | + </child> |
510 | + <child> |
511 | + <object class="GtkCheckButton" id="mythgame_checkbox"> |
512 | + <property name="label" translatable="yes">MythGame</property> |
513 | + <property name="width_request">175</property> |
514 | + <property name="visible">True</property> |
515 | + <property name="can_focus">True</property> |
516 | + <property name="receives_default">False</property> |
517 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
518 | + <property name="draw_indicator">True</property> |
519 | + </object> |
520 | + <packing> |
521 | + <property name="top_attach">3</property> |
522 | + <property name="bottom_attach">4</property> |
523 | + </packing> |
524 | + </child> |
525 | + <child> |
526 | + <object class="GtkCheckButton" id="mythgallery_checkbox"> |
527 | + <property name="label" translatable="yes">MythGallery</property> |
528 | + <property name="width_request">175</property> |
529 | + <property name="visible">True</property> |
530 | + <property name="can_focus">True</property> |
531 | + <property name="receives_default">False</property> |
532 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
533 | + <property name="draw_indicator">True</property> |
534 | + </object> |
535 | + <packing> |
536 | + <property name="top_attach">2</property> |
537 | + <property name="bottom_attach">3</property> |
538 | + </packing> |
539 | + </child> |
540 | + <child> |
541 | + <object class="GtkCheckButton" id="mythbrowser_checkbox"> |
542 | + <property name="label" translatable="yes">MythBrowser</property> |
543 | + <property name="width_request">175</property> |
544 | + <property name="visible">True</property> |
545 | + <property name="can_focus">True</property> |
546 | + <property name="receives_default">False</property> |
547 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
548 | + <property name="draw_indicator">True</property> |
549 | + </object> |
550 | + <packing> |
551 | + <property name="top_attach">1</property> |
552 | + <property name="bottom_attach">2</property> |
553 | + </packing> |
554 | + </child> |
555 | + <child> |
556 | + <placeholder/> |
557 | + </child> |
558 | + <child> |
559 | + <object class="GtkCheckButton" id="mytharchive_checkbox"> |
560 | + <property name="label" translatable="yes">MythArchive</property> |
561 | + <property name="width_request">175</property> |
562 | + <property name="visible">True</property> |
563 | + <property name="can_focus">True</property> |
564 | + <property name="receives_default">False</property> |
565 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
566 | + <property name="draw_indicator">True</property> |
567 | + </object> |
568 | + </child> |
569 | </object> |
570 | <packing> |
571 | <property name="position">1</property> |
572 | </packing> |
573 | </child> |
574 | - </object> |
575 | - </child> |
576 | - </object> |
577 | - <packing> |
578 | - <property name="position">3</property> |
579 | - </packing> |
580 | - </child> |
581 | - <child> |
582 | - <object class="GtkAlignment" id="alignment9"> |
583 | - <property name="visible">True</property> |
584 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
585 | - <property name="xalign">0</property> |
586 | - <property name="yalign">0</property> |
587 | - <property name="xscale">0</property> |
588 | - <property name="yscale">0</property> |
589 | - <property name="left_padding">25</property> |
590 | - <child> |
591 | - <object class="GtkTable" id="password_table"> |
592 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
593 | - <property name="n_rows">2</property> |
594 | - <property name="n_columns">2</property> |
595 | - <child> |
596 | - <object class="GtkLabel" id="mythweb_username_label"> |
597 | - <property name="visible">True</property> |
598 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
599 | - <property name="xalign">0</property> |
600 | - <property name="label" translatable="yes">Username</property> |
601 | - </object> |
602 | - <packing> |
603 | - <property name="x_options">GTK_FILL</property> |
604 | - <property name="x_padding">25</property> |
605 | - </packing> |
606 | - </child> |
607 | - <child> |
608 | - <object class="GtkLabel" id="mythweb_password_label"> |
609 | - <property name="visible">True</property> |
610 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
611 | - <property name="xalign">0</property> |
612 | - <property name="label" translatable="yes">Password</property> |
613 | - </object> |
614 | - <packing> |
615 | - <property name="top_attach">1</property> |
616 | - <property name="bottom_attach">2</property> |
617 | - <property name="x_options">GTK_FILL</property> |
618 | - <property name="x_padding">25</property> |
619 | - </packing> |
620 | - </child> |
621 | - <child> |
622 | - <object class="GtkAlignment" id="alignment2"> |
623 | - <property name="visible">True</property> |
624 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
625 | - <property name="xalign">0</property> |
626 | - <property name="yalign">0</property> |
627 | - <property name="xscale">0</property> |
628 | - <property name="yscale">0</property> |
629 | - <child> |
630 | - <object class="GtkEntry" id="mythweb_username"> |
631 | - <property name="visible">True</property> |
632 | - <property name="can_focus">True</property> |
633 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
634 | - <property name="invisible_char">●</property> |
635 | - <signal name="changed" handler="toggle_plugins"/> |
636 | - </object> |
637 | - </child> |
638 | - </object> |
639 | - <packing> |
640 | - <property name="left_attach">1</property> |
641 | - <property name="right_attach">2</property> |
642 | - </packing> |
643 | - </child> |
644 | - <child> |
645 | - <object class="GtkAlignment" id="alignment10"> |
646 | - <property name="visible">True</property> |
647 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
648 | - <property name="xalign">0</property> |
649 | - <property name="yalign">0</property> |
650 | - <property name="xscale">0</property> |
651 | - <property name="yscale">0</property> |
652 | - <child> |
653 | - <object class="GtkEntry" id="mythweb_password"> |
654 | - <property name="visible">True</property> |
655 | - <property name="can_focus">True</property> |
656 | - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
657 | - <property name="visibility">False</property> |
658 | - <property name="invisible_char">●</property> |
659 | - <signal name="changed" handler="toggle_plugins"/> |
660 | - </object> |
661 | - </child> |
662 | - </object> |
663 | - <packing> |
664 | - <property name="left_attach">1</property> |
665 | - <property name="right_attach">2</property> |
666 | - <property name="top_attach">1</property> |
667 | - <property name="bottom_attach">2</property> |
668 | - <property name="x_options">GTK_FILL</property> |
669 | - <property name="y_options"></property> |
670 | - </packing> |
671 | - </child> |
672 | - </object> |
673 | - </child> |
674 | - </object> |
675 | - <packing> |
676 | - <property name="position">4</property> |
677 | + <child> |
678 | + <object class="GtkHBox" id="hbox1"> |
679 | + <property name="visible">True</property> |
680 | + <child> |
681 | + <object class="GtkComboBox" id="mythweb_password_combobox"> |
682 | + <property name="visible">True</property> |
683 | + <property name="model">liststore1</property> |
684 | + <signal name="changed" handler="toggle_plugins"/> |
685 | + <child> |
686 | + <object class="GtkCellRendererText" id="renderer1"/> |
687 | + <attributes> |
688 | + <attribute name="text">0</attribute> |
689 | + </attributes> |
690 | + </child> |
691 | + </object> |
692 | + <packing> |
693 | + <property name="position">0</property> |
694 | + </packing> |
695 | + </child> |
696 | + <child> |
697 | + <object class="GtkLabel" id="label3"> |
698 | + <property name="visible">True</property> |
699 | + <property name="xpad">25</property> |
700 | + <property name="label" translatable="yes">Password Protect Mythweb</property> |
701 | + </object> |
702 | + <packing> |
703 | + <property name="position">1</property> |
704 | + </packing> |
705 | + </child> |
706 | + </object> |
707 | + <packing> |
708 | + <property name="position">2</property> |
709 | + </packing> |
710 | + </child> |
711 | + <child> |
712 | + <object class="GtkTable" id="password_table"> |
713 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
714 | + <property name="n_rows">2</property> |
715 | + <property name="n_columns">2</property> |
716 | + <child> |
717 | + <object class="GtkLabel" id="mythweb_username_label"> |
718 | + <property name="visible">True</property> |
719 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
720 | + <property name="xalign">0</property> |
721 | + <property name="label" translatable="yes">Username</property> |
722 | + </object> |
723 | + <packing> |
724 | + <property name="x_options">GTK_FILL</property> |
725 | + <property name="x_padding">25</property> |
726 | + </packing> |
727 | + </child> |
728 | + <child> |
729 | + <object class="GtkLabel" id="mythweb_password_label"> |
730 | + <property name="visible">True</property> |
731 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
732 | + <property name="xalign">0</property> |
733 | + <property name="label" translatable="yes">Password</property> |
734 | + </object> |
735 | + <packing> |
736 | + <property name="top_attach">1</property> |
737 | + <property name="bottom_attach">2</property> |
738 | + <property name="x_options">GTK_FILL</property> |
739 | + <property name="x_padding">25</property> |
740 | + </packing> |
741 | + </child> |
742 | + <child> |
743 | + <object class="GtkAlignment" id="alignment2"> |
744 | + <property name="visible">True</property> |
745 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
746 | + <property name="xalign">0</property> |
747 | + <property name="yalign">0</property> |
748 | + <property name="xscale">0</property> |
749 | + <property name="yscale">0</property> |
750 | + <child> |
751 | + <object class="GtkEntry" id="mythweb_username"> |
752 | + <property name="visible">True</property> |
753 | + <property name="can_focus">True</property> |
754 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
755 | + <property name="invisible_char">●</property> |
756 | + <signal name="changed" handler="toggle_plugins"/> |
757 | + </object> |
758 | + </child> |
759 | + </object> |
760 | + <packing> |
761 | + <property name="left_attach">1</property> |
762 | + <property name="right_attach">2</property> |
763 | + </packing> |
764 | + </child> |
765 | + <child> |
766 | + <object class="GtkAlignment" id="alignment10"> |
767 | + <property name="visible">True</property> |
768 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
769 | + <property name="xalign">0</property> |
770 | + <property name="yalign">0</property> |
771 | + <property name="xscale">0</property> |
772 | + <property name="yscale">0</property> |
773 | + <child> |
774 | + <object class="GtkEntry" id="mythweb_password"> |
775 | + <property name="visible">True</property> |
776 | + <property name="can_focus">True</property> |
777 | + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |
778 | + <property name="visibility">False</property> |
779 | + <property name="invisible_char">●</property> |
780 | + <signal name="changed" handler="toggle_plugins"/> |
781 | + </object> |
782 | + </child> |
783 | + </object> |
784 | + <packing> |
785 | + <property name="left_attach">1</property> |
786 | + <property name="right_attach">2</property> |
787 | + <property name="top_attach">1</property> |
788 | + <property name="bottom_attach">2</property> |
789 | + <property name="x_options">GTK_FILL</property> |
790 | + <property name="y_options"></property> |
791 | + </packing> |
792 | + </child> |
793 | + </object> |
794 | + <packing> |
795 | + <property name="position">3</property> |
796 | + </packing> |
797 | + </child> |
798 | + </object> |
799 | + </child> |
800 | + </object> |
801 | + <packing> |
802 | + <property name="position">1</property> |
803 | </packing> |
804 | </child> |
805 | </object> |
Code looks good and runs fine on my system here