Ubuntu Studio Controls (development moved)

Merge lp:~rlameiro/ubuntustudio-controls/gtkbuilder into lp:~ubuntustudio-dev/ubuntustudio-controls/old

  1. gtkbuilder
  2. Merge into old
Proposed by Eric Hedekar
Status: Merged
Approved by: Eric Hedekar
Approved revision: not available
Merged at revision: 105
Proposed branch: lp:~rlameiro/ubuntustudio-controls/gtkbuilder
Merge into: lp:~ubuntustudio-dev/ubuntustudio-controls/old
Diff against target: 840 lines (+384/-366)
4 files modified
setup.py (+1/-1)
src/gui.glade (+0/-344)
src/gui.xml (+360/-0)
src/ubuntustudio-controls (+23/-21)
To merge this branch: bzr merge lp:~rlameiro/ubuntustudio-controls/gtkbuilder
Reviewer Review Type Date Requested Status
Eric Hedekar (community) Approve
Review via email: mp+18175@code.launchpad.net

Commit message

rlamiero's branch switches to gtkbuilder from glade

To post a comment you must log in.
Revision history for this message
Eric Hedekar (stochastic) wrote :

Switch ubuntustudio-controls to gtkbuilder from glade

Revision history for this message
Eric Hedekar (stochastic) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'setup.py'
--- setup.py 2008-01-10 23:58:25 +0000
+++ setup.py 2010-01-28 02:35:23 +0000
@@ -11,6 +11,6 @@
11 package_dir = {'':'src'},11 package_dir = {'':'src'},
12 py_modules = ['changesettings', 'meminfo_total'],12 py_modules = ['changesettings', 'meminfo_total'],
13 scripts = ['src/ubuntustudio-controls'],13 scripts = ['src/ubuntustudio-controls'],
14 data_files = [('share/ubuntustudio-controls', ['src/gui.glade', 'src/ubuntustudio-controls.svg'])],14 data_files = [('share/ubuntustudio-controls', ['src/gui.xml', 'src/ubuntustudio-controls.svg'])],
15 classifiers = ['License :: OSI Approved :: GNU General Public License (GPL)'])15 classifiers = ['License :: OSI Approved :: GNU General Public License (GPL)'])
1616
1717
=== removed file 'src/gui.glade'
--- src/gui.glade 2009-08-09 21:29:18 +0000
+++ src/gui.glade 1970-01-01 00:00:00 +0000
@@ -1,344 +0,0 @@
1<?xml version="1.0"?>
2<glade-interface>
3 <!-- interface-requires gtk+ 2.16 -->
4 <!-- interface-naming-policy toplevel-contextual -->
5 <widget class="GtkWindow" id="mainWindow">
6 <property name="visible">True</property>
7 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
8 <property name="title" translatable="yes">Ubuntu Studio Controls</property>
9 <property name="resizable">False</property>
10 <property name="icon">ubuntustudio-controls.svg</property>
11 <signal name="destroy" handler="on_mainWindow_destroy"/>
12 <child>
13 <widget class="GtkVBox" id="vbox1">
14 <property name="visible">True</property>
15 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
16 <property name="spacing">5</property>
17 <child>
18 <widget class="GtkHButtonBox" id="hbuttonbox2">
19 <property name="visible">True</property>
20 <child>
21 <widget class="GtkCheckButton" id="memlock_checkButton">
22 <property name="label" translatable="yes">Enable memlock</property>
23 <property name="visible">True</property>
24 <property name="can_focus">True</property>
25 <property name="receives_default">False</property>
26 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
27 <property name="draw_indicator">True</property>
28 <signal name="toggled" handler="on_memlock_checkButton_toggled"/>
29 </widget>
30 <packing>
31 <property name="expand">False</property>
32 <property name="fill">False</property>
33 <property name="position">0</property>
34 </packing>
35 </child>
36 <child>
37 <widget class="GtkSpinButton" id="memlock_spinbutton">
38 <property name="visible">True</property>
39 <property name="sensitive">False</property>
40 <property name="can_focus">True</property>
41 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
42 <property name="adjustment">0 0 100 1 10 10</property>
43 <property name="numeric">True</property>
44 <signal name="value_changed" handler="on_memlock_spinbutton_value_changed"/>
45 </widget>
46 <packing>
47 <property name="expand">False</property>
48 <property name="fill">False</property>
49 <property name="position">1</property>
50 </packing>
51 </child>
52 <child>
53 <widget class="GtkLabel" id="memlock_mbLabel">
54 <property name="visible">True</property>
55 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
56 <property name="label" translatable="yes"> % of system memory </property>
57 </widget>
58 <packing>
59 <property name="expand">False</property>
60 <property name="fill">False</property>
61 <property name="pack_type">end</property>
62 <property name="position">2</property>
63 </packing>
64 </child>
65 </widget>
66 <packing>
67 <property name="position">0</property>
68 </packing>
69 </child>
70 <child>
71 <widget class="GtkHSeparator" id="hseparator1">
72 <property name="visible">True</property>
73 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
74 </widget>
75 <packing>
76 <property name="expand">False</property>
77 <property name="position">1</property>
78 </packing>
79 </child>
80 <child>
81 <widget class="GtkHBox" id="hbox4">
82 <property name="visible">True</property>
83 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
84 <child>
85 <widget class="GtkCheckButton" id="raw1394_checkbutton">
86 <property name="label" translatable="yes">Enable raw1394 access</property>
87 <property name="visible">True</property>
88 <property name="can_focus">True</property>
89 <property name="receives_default">False</property>
90 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
91 <property name="draw_indicator">True</property>
92 <signal name="toggled" handler="on_raw1394_checkbutton_toggled"/>
93 </widget>
94 <packing>
95 <property name="expand">False</property>
96 <property name="fill">False</property>
97 <property name="position">0</property>
98 </packing>
99 </child>
100 <child>
101 <placeholder/>
102 </child>
103 <child>
104 <placeholder/>
105 </child>
106 </widget>
107 <packing>
108 <property name="position">2</property>
109 </packing>
110 </child>
111 <child>
112 <widget class="GtkHSeparator" id="hseparator2">
113 <property name="visible">True</property>
114 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
115 </widget>
116 <packing>
117 <property name="expand">False</property>
118 <property name="position">3</property>
119 </packing>
120 </child>
121 <child>
122 <widget class="GtkHButtonBox" id="hbuttonbox1">
123 <property name="visible">True</property>
124 <child>
125 <widget class="GtkCheckButton" id="EnableNice">
126 <property name="label" translatable="yes">Enable nice</property>
127 <property name="visible">True</property>
128 <property name="can_focus">True</property>
129 <property name="receives_default">False</property>
130 <property name="draw_indicator">True</property>
131 <signal name="toggled" handler="on_EnableNice_toggled"/>
132 </widget>
133 <packing>
134 <property name="expand">False</property>
135 <property name="fill">False</property>
136 <property name="position">0</property>
137 </packing>
138 </child>
139 <child>
140 <widget class="GtkSpinButton" id="nicePercentageAmount">
141 <property name="visible">True</property>
142 <property name="can_focus">True</property>
143 <property name="adjustment">-10 -99 0 1 10 10</property>
144 <property name="numeric">True</property>
145 <signal name="value_changed" handler="on_nicePercentageAmount_value_changed"/>
146 </widget>
147 <packing>
148 <property name="expand">False</property>
149 <property name="fill">False</property>
150 <property name="position">1</property>
151 </packing>
152 </child>
153 <child>
154 <widget class="GtkLabel" id="nicePercentage">
155 <property name="visible">True</property>
156 <property name="label" translatable="yes">Nice percentage</property>
157 </widget>
158 <packing>
159 <property name="expand">False</property>
160 <property name="fill">False</property>
161 <property name="position">2</property>
162 </packing>
163 </child>
164 </widget>
165 <packing>
166 <property name="position">4</property>
167 </packing>
168 </child>
169 <child>
170 <widget class="GtkHBox" id="hbox1">
171 <property name="visible">True</property>
172 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
173 <child>
174 <widget class="GtkButton" id="about_button">
175 <property name="label" translatable="yes"> About </property>
176 <property name="visible">True</property>
177 <property name="can_focus">True</property>
178 <property name="receives_default">True</property>
179 <property name="events">GDK_BUTTON_PRESS_MASK</property>
180 <signal name="clicked" handler="on_about_button_clicked"/>
181 </widget>
182 <packing>
183 <property name="expand">False</property>
184 <property name="position">0</property>
185 </packing>
186 </child>
187 <child>
188 <widget class="GtkLabel" id="label3">
189 <property name="visible">True</property>
190 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
191 <property name="label" translatable="yes"> </property>
192 </widget>
193 <packing>
194 <property name="position">2</property>
195 </packing>
196 </child>
197 <child>
198 <widget class="GtkHBox" id="hbox3">
199 <property name="visible">True</property>
200 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
201 <property name="homogeneous">True</property>
202 <child>
203 <widget class="GtkButton" id="apply_button">
204 <property name="label" translatable="yes"> Apply </property>
205 <property name="visible">True</property>
206 <property name="sensitive">False</property>
207 <property name="can_focus">True</property>
208 <property name="receives_default">True</property>
209 <property name="events">GDK_BUTTON_PRESS_MASK</property>
210 <signal name="clicked" handler="on_apply_button_clicked"/>
211 </widget>
212 <packing>
213 <property name="expand">False</property>
214 <property name="position">0</property>
215 </packing>
216 </child>
217 <child>
218 <widget class="GtkButton" id="close_button">
219 <property name="label" translatable="yes"> Close </property>
220 <property name="visible">True</property>
221 <property name="can_focus">True</property>
222 <property name="receives_default">True</property>
223 <property name="events">GDK_BUTTON_PRESS_MASK</property>
224 <signal name="clicked" handler="on_closeButton_clicked"/>
225 </widget>
226 <packing>
227 <property name="expand">False</property>
228 <property name="pack_type">end</property>
229 <property name="position">1</property>
230 </packing>
231 </child>
232 </widget>
233 <packing>
234 <property name="pack_type">end</property>
235 <property name="position">1</property>
236 </packing>
237 </child>
238 </widget>
239 <packing>
240 <property name="position">6</property>
241 </packing>
242 </child>
243 <child>
244 <placeholder/>
245 </child>
246 <child>
247 <placeholder/>
248 </child>
249 </widget>
250 </child>
251 </widget>
252 <widget class="GtkAboutDialog" id="about">
253 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
254 <property name="border_width">5</property>
255 <property name="title" translatable="yes">About Ubuntu Studio Controls</property>
256 <property name="window_position">center-on-parent</property>
257 <property name="type_hint">dialog</property>
258 <property name="has_separator">False</property>
259 <property name="program_name">Ubuntu Studio Controls</property>
260 <property name="version">0.4</property>
261 <property name="copyright" translatable="yes">Copyright &#xA9; 2008 Andrew Hunter, Luis de Bethencourt</property>
262 <property name="comments" translatable="yes">Ubuntu Studio Controls is the official Ubuntu Studio application to handle your system controls. </property>
263 <property name="website">http://www.ubuntustudio.org</property>
264 <property name="website_label" translatable="yes">http://www.ubuntustudio.org</property>
265 <property name="license" translatable="yes">Ubuntu Studio Controls is free software; you can redistribute it and/or modify it
266under the terms of the GNU General Public License as published
267by the Free Software Foundation; either version 2 of the License,
268or (at your option) any later version.
269
270ubuntustudio-controls is distributed in the hope that it will be useful, but
271WITHOUT ANY WARRANTY; without even the implied warranty of
272MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
273the GNU General Public License for more details.
274
275You should have received a copy of the GNU General Public
276License along with Nautilus; if not, write to the Free Software
277Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
27802111-1307 USA</property>
279 <property name="authors">Andrew Hunter, Luis de Bethencourt, Cory Kontros</property>
280 <property name="documenters"></property>
281 <property name="artists">Huw Wilkins &lt;hushimi@gmail.com&gt;</property>
282 <property name="logo">ubuntustudio-controls.svg</property>
283 <signal name="close" handler="on_about_close"/>
284 <child internal-child="vbox">
285 <widget class="GtkVBox" id="dialog-vbox1">
286 <property name="visible">True</property>
287 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
288 <property name="spacing">2</property>
289 <child>
290 <placeholder/>
291 </child>
292 <child internal-child="action_area">
293 <widget class="GtkHButtonBox" id="dialog-action_area1">
294 <property name="visible">True</property>
295 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
296 <property name="layout_style">end</property>
297 </widget>
298 <packing>
299 <property name="expand">False</property>
300 <property name="pack_type">end</property>
301 <property name="position">0</property>
302 </packing>
303 </child>
304 </widget>
305 </child>
306 </widget>
307 <widget class="GtkMessageDialog" id="raw_dialog">
308 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
309 <property name="border_width">5</property>
310 <property name="resizable">False</property>
311 <property name="window_position">center-on-parent</property>
312 <property name="type_hint">dialog</property>
313 <property name="skip_taskbar_hint">True</property>
314 <property name="has_separator">False</property>
315 <property name="message_type">warning</property>
316 <property name="buttons">close</property>
317 <property name="text">Warning: Enabling this feature can pose a security risk as raw1394 devices are run with root privilages.</property>
318 <child internal-child="vbox">
319 <widget class="GtkVBox" id="dialog-vbox2">
320 <property name="visible">True</property>
321 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
322 <property name="spacing">2</property>
323 <child internal-child="action_area">
324 <widget class="GtkHButtonBox" id="dialog-action_area2">
325 <property name="visible">True</property>
326 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
327 <property name="layout_style">end</property>
328 <child>
329 <placeholder/>
330 </child>
331 <child>
332 <placeholder/>
333 </child>
334 </widget>
335 <packing>
336 <property name="expand">False</property>
337 <property name="pack_type">end</property>
338 <property name="position">0</property>
339 </packing>
340 </child>
341 </widget>
342 </child>
343 </widget>
344</glade-interface>
3450
=== added file 'src/gui.xml'
--- src/gui.xml 1970-01-01 00:00:00 +0000
+++ src/gui.xml 2010-01-28 02:35:23 +0000
@@ -0,0 +1,360 @@
1<?xml version="1.0"?>
2<interface>
3 <object class="GtkAdjustment" id="adjustment1">
4 <property name="upper">100</property>
5 <property name="lower">0</property>
6 <property name="page_increment">10</property>
7 <property name="step_increment">1</property>
8 <property name="page_size">10</property>
9 <property name="value">0</property>
10 </object>
11 <object class="GtkAdjustment" id="adjustment2">
12 <property name="upper">0</property>
13 <property name="lower">-99</property>
14 <property name="page_increment">10</property>
15 <property name="step_increment">1</property>
16 <property name="page_size">10</property>
17 <property name="value">0</property>
18 </object>
19 <!-- interface-requires gtk+ 2.16 -->
20 <!-- interface-naming-policy toplevel-contextual -->
21 <object class="GtkWindow" id="mainWindow">
22 <property name="visible">True</property>
23 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
24 <property name="title" translatable="yes">Ubuntu Studio Controls</property>
25 <property name="resizable">False</property>
26 <property name="icon">ubuntustudio-controls.svg</property>
27 <signal handler="on_mainWindow_destroy" name="destroy"/>
28 <child>
29 <object class="GtkVBox" id="vbox1">
30 <property name="visible">True</property>
31 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
32 <property name="spacing">5</property>
33 <child>
34 <object class="GtkHButtonBox" id="hbuttonbox2">
35 <property name="visible">True</property>
36 <child>
37 <object class="GtkCheckButton" id="memlock_checkButton">
38 <property name="label" translatable="yes">Enable memlock</property>
39 <property name="visible">True</property>
40 <property name="can_focus">True</property>
41 <property name="receives_default">False</property>
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="draw_indicator">True</property>
44 <signal handler="on_memlock_checkButton_toggled" name="toggled"/>
45 </object>
46 <packing>
47 <property name="expand">False</property>
48 <property name="fill">False</property>
49 <property name="position">0</property>
50 </packing>
51 </child>
52 <child>
53 <object class="GtkSpinButton" id="memlock_spinbutton">
54 <property name="visible">True</property>
55 <property name="sensitive">False</property>
56 <property name="can_focus">True</property>
57 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
58 <property name="adjustment">adjustment1</property>
59 <property name="numeric">True</property>
60 <signal handler="on_memlock_spinbutton_value_changed" name="value_changed"/>
61 </object>
62 <packing>
63 <property name="expand">False</property>
64 <property name="fill">False</property>
65 <property name="position">1</property>
66 </packing>
67 </child>
68 <child>
69 <object class="GtkLabel" id="memlock_mbLabel">
70 <property name="visible">True</property>
71 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
72 <property name="label" translatable="yes"> % of system memory </property>
73 </object>
74 <packing>
75 <property name="expand">False</property>
76 <property name="fill">False</property>
77 <property name="pack_type">end</property>
78 <property name="position">2</property>
79 </packing>
80 </child>
81 </object>
82 <packing>
83 <property name="position">0</property>
84 </packing>
85 </child>
86 <child>
87 <object class="GtkHSeparator" id="hseparator1">
88 <property name="visible">True</property>
89 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
90 </object>
91 <packing>
92 <property name="expand">False</property>
93 <property name="position">1</property>
94 </packing>
95 </child>
96 <child>
97 <object class="GtkHBox" id="hbox4">
98 <property name="visible">True</property>
99 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
100 <child>
101 <object class="GtkCheckButton" id="raw1394_checkbutton">
102 <property name="label" translatable="yes">Enable raw1394 access</property>
103 <property name="visible">True</property>
104 <property name="can_focus">True</property>
105 <property name="receives_default">False</property>
106 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
107 <property name="draw_indicator">True</property>
108 <signal handler="on_raw1394_checkbutton_toggled" name="toggled"/>
109 </object>
110 <packing>
111 <property name="expand">False</property>
112 <property name="fill">False</property>
113 <property name="position">0</property>
114 </packing>
115 </child>
116 <child>
117 <placeholder/>
118 </child>
119 <child>
120 <placeholder/>
121 </child>
122 </object>
123 <packing>
124 <property name="position">2</property>
125 </packing>
126 </child>
127 <child>
128 <object class="GtkHSeparator" id="hseparator2">
129 <property name="visible">True</property>
130 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
131 </object>
132 <packing>
133 <property name="expand">False</property>
134 <property name="position">3</property>
135 </packing>
136 </child>
137 <child>
138 <object class="GtkHButtonBox" id="hbuttonbox1">
139 <property name="visible">True</property>
140 <child>
141 <object class="GtkCheckButton" id="EnableNice">
142 <property name="label" translatable="yes">Enable nice</property>
143 <property name="visible">True</property>
144 <property name="can_focus">True</property>
145 <property name="receives_default">False</property>
146 <property name="draw_indicator">True</property>
147 <signal handler="on_EnableNice_toggled" name="toggled"/>
148 </object>
149 <packing>
150 <property name="expand">False</property>
151 <property name="fill">False</property>
152 <property name="position">0</property>
153 </packing>
154 </child>
155 <child>
156 <object class="GtkSpinButton" id="nicePercentageAmount">
157 <property name="visible">True</property>
158 <property name="can_focus">True</property>
159 <property name="adjustment">adjustment2</property>
160 <property name="numeric">True</property>
161 <signal handler="on_nicePercentageAmount_value_changed" name="value_changed"/>
162 </object>
163 <packing>
164 <property name="expand">False</property>
165 <property name="fill">False</property>
166 <property name="position">1</property>
167 </packing>
168 </child>
169 <child>
170 <object class="GtkLabel" id="nicePercentage">
171 <property name="visible">True</property>
172 <property name="label" translatable="yes">Nice percentage</property>
173 </object>
174 <packing>
175 <property name="expand">False</property>
176 <property name="fill">False</property>
177 <property name="position">2</property>
178 </packing>
179 </child>
180 </object>
181 <packing>
182 <property name="position">4</property>
183 </packing>
184 </child>
185 <child>
186 <object class="GtkHBox" id="hbox1">
187 <property name="visible">True</property>
188 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
189 <child>
190 <object class="GtkButton" id="about_button">
191 <property name="label" translatable="yes"> About </property>
192 <property name="visible">True</property>
193 <property name="can_focus">True</property>
194 <property name="receives_default">True</property>
195 <property name="events">GDK_BUTTON_PRESS_MASK</property>
196 <signal handler="on_about_button_clicked" name="clicked"/>
197 </object>
198 <packing>
199 <property name="expand">False</property>
200 <property name="position">0</property>
201 </packing>
202 </child>
203 <child>
204 <object class="GtkLabel" id="label3">
205 <property name="visible">True</property>
206 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
207 <property name="label" translatable="yes"> </property>
208 </object>
209 <packing>
210 <property name="position">2</property>
211 </packing>
212 </child>
213 <child>
214 <object class="GtkHBox" id="hbox3">
215 <property name="visible">True</property>
216 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
217 <property name="homogeneous">True</property>
218 <child>
219 <object class="GtkButton" id="apply_button">
220 <property name="label" translatable="yes"> Apply </property>
221 <property name="visible">True</property>
222 <property name="sensitive">False</property>
223 <property name="can_focus">True</property>
224 <property name="receives_default">True</property>
225 <property name="events">GDK_BUTTON_PRESS_MASK</property>
226 <signal handler="on_apply_button_clicked" name="clicked"/>
227 </object>
228 <packing>
229 <property name="expand">False</property>
230 <property name="position">0</property>
231 </packing>
232 </child>
233 <child>
234 <object class="GtkButton" id="close_button">
235 <property name="label" translatable="yes"> Close </property>
236 <property name="visible">True</property>
237 <property name="can_focus">True</property>
238 <property name="receives_default">True</property>
239 <property name="events">GDK_BUTTON_PRESS_MASK</property>
240 <signal handler="on_closeButton_clicked" name="clicked"/>
241 </object>
242 <packing>
243 <property name="expand">False</property>
244 <property name="pack_type">end</property>
245 <property name="position">1</property>
246 </packing>
247 </child>
248 </object>
249 <packing>
250 <property name="pack_type">end</property>
251 <property name="position">1</property>
252 </packing>
253 </child>
254 </object>
255 <packing>
256 <property name="position">6</property>
257 </packing>
258 </child>
259 <child>
260 <placeholder/>
261 </child>
262 <child>
263 <placeholder/>
264 </child>
265 </object>
266 </child>
267 </object>
268 <object class="GtkAboutDialog" id="about">
269 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
270 <property name="border_width">5</property>
271 <property name="title" translatable="yes">About Ubuntu Studio Controls</property>
272 <property name="window_position">center-on-parent</property>
273 <property name="type_hint">dialog</property>
274 <property name="has_separator">False</property>
275 <property name="program_name">Ubuntu Studio Controls</property>
276 <property name="version">0.4</property>
277 <property name="copyright" translatable="yes">Copyright &#xA9; 2008 Andrew Hunter, Luis de Bethencourt</property>
278 <property name="comments" translatable="yes">Ubuntu Studio Controls is the official Ubuntu Studio application to handle your system controls. </property>
279 <property name="website">http://www.ubuntustudio.org</property>
280 <property name="website_label" translatable="yes">http://www.ubuntustudio.org</property>
281 <property name="license" translatable="yes">Ubuntu Studio Controls is free software; you can redistribute it and/or modify it
282under the terms of the GNU General Public License as published
283by the Free Software Foundation; either version 2 of the License,
284or (at your option) any later version.
285
286ubuntustudio-controls is distributed in the hope that it will be useful, but
287WITHOUT ANY WARRANTY; without even the implied warranty of
288MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
289the GNU General Public License for more details.
290
291You should have received a copy of the GNU General Public
292License along with Nautilus; if not, write to the Free Software
293Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
29402111-1307 USA</property>
295 <property name="authors">Andrew Hunter, Luis de Bethencourt, Cory Kontros</property>
296 <property name="documenters"/>
297 <property name="artists">Huw Wilkins &lt;hushimi@gmail.com&gt;</property>
298 <property name="logo">ubuntustudio-controls.svg</property>
299 <signal handler="on_about_close" name="close"/>
300 <child internal-child="vbox">
301 <object class="GtkVBox" id="dialog-vbox1">
302 <property name="visible">True</property>
303 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
304 <property name="spacing">2</property>
305 <child>
306 <placeholder/>
307 </child>
308 <child internal-child="action_area">
309 <object class="GtkHButtonBox" id="dialog-action_area1">
310 <property name="visible">True</property>
311 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
312 <property name="layout_style">end</property>
313 </object>
314 <packing>
315 <property name="expand">False</property>
316 <property name="pack_type">end</property>
317 <property name="position">0</property>
318 </packing>
319 </child>
320 </object>
321 </child>
322 </object>
323 <object class="GtkMessageDialog" id="raw_dialog">
324 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
325 <property name="border_width">5</property>
326 <property name="resizable">False</property>
327 <property name="window_position">center-on-parent</property>
328 <property name="type_hint">dialog</property>
329 <property name="skip_taskbar_hint">True</property>
330 <property name="has_separator">False</property>
331 <property name="message_type">warning</property>
332 <property name="buttons">close</property>
333 <property name="text">Warning: Enabling this feature can pose a security risk as raw1394 devices are run with root privilages.</property>
334 <child internal-child="vbox">
335 <object class="GtkVBox" id="dialog-vbox2">
336 <property name="visible">True</property>
337 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
338 <property name="spacing">2</property>
339 <child internal-child="action_area">
340 <object class="GtkHButtonBox" id="dialog-action_area2">
341 <property name="visible">True</property>
342 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
343 <property name="layout_style">end</property>
344 <child>
345 <placeholder/>
346 </child>
347 <child>
348 <placeholder/>
349 </child>
350 </object>
351 <packing>
352 <property name="expand">False</property>
353 <property name="pack_type">end</property>
354 <property name="position">0</property>
355 </packing>
356 </child>
357 </object>
358 </child>
359 </object>
360</interface>
0361
=== modified file 'src/ubuntustudio-controls'
--- src/ubuntustudio-controls 2009-08-09 21:29:18 +0000
+++ src/ubuntustudio-controls 2010-01-28 02:35:23 +0000
@@ -18,7 +18,6 @@
18#Error message dialoge lifted from Terminator. http://launchpad.net/terminator18#Error message dialoge lifted from Terminator. http://launchpad.net/terminator
19try:19try:
20 import gtk, meminfo_total, sys, os, cPickle20 import gtk, meminfo_total, sys, os, cPickle
21 from gtk import glade
22 from changesettings import ChangeSettings21 from changesettings import ChangeSettings
23except:22except:
24 import_error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, ('You need to install python bindings for gtk and/or glade ("python-gtk2 & python-glade2" in debian/ubuntu)'))23 import_error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, ('You need to install python bindings for gtk and/or glade ("python-gtk2 & python-glade2" in debian/ubuntu)'))
@@ -28,14 +27,17 @@
28class Uscontrols:27class Uscontrols:
29 def __init__(self):28 def __init__(self):
30 #Set the Glade file29 #Set the Glade file
31 self.gladefile = "/usr/share/ubuntustudio-controls/gui.glade" #Remove /usr/share/ubuntustudio-controls/ to run from src dir30 #debug src directory
32 self.wTree = gtk.glade.XML(self.gladefile)31 self.gtkbuilderfile = "gui.xml"
3332 #self.gtkbuilderfile = "/usr/share/ubuntustudio-controls/gui.gtkbuilder" #Remove /usr/share/ubuntustudio-controls/ to run from src dir
33 #builder = gtk.glade.XML(self.gladefile)
34 self.builder = gtk.Builder()
35 self.builder.add_from_file(self.gtkbuilderfile)
34 #Get the Main Window, and connect the "destroy" event36 #Get the Main Window, and connect the "destroy" event
35 self.window = self.wTree.get_widget("mainWindow")37 self.window = self.builder.get_object("mainWindow")
36 self.aboutWidget = self.wTree.get_widget("about")38 self.aboutWidget = self.builder.get_object("about")
37 self.raw1394Warning = self.wTree.get_widget("raw_dialog")39 self.raw1394Warning = self.builder.get_object("raw_dialog")
3840
39 #Create our dictionary and connect it41 #Create our dictionary and connect it
40 dic = { "on_closeButton_clicked" : self.close_window,42 dic = { "on_closeButton_clicked" : self.close_window,
41 "on_mainWindow_destroy" : self.close_window,43 "on_mainWindow_destroy" : self.close_window,
@@ -48,7 +50,7 @@
48 "on_nicePercentageAmount_value_changed" : self.set_nice_amount,50 "on_nicePercentageAmount_value_changed" : self.set_nice_amount,
49 }51 }
5052
51 self.wTree.signal_autoconnect(dic)53 self.builder.connect_signals(dic)
5254
53 #Determine how much memory is on the system55 #Determine how much memory is on the system
54 memtotal = meminfo_total.meminfo_total()56 memtotal = meminfo_total.meminfo_total()
@@ -81,9 +83,9 @@
8183
82 def apply_settings(self, apply_button):84 def apply_settings(self, apply_button):
83 #Get all the widgets and add those widgets to a diction in the format {widget : self.instance}85 #Get all the widgets and add those widgets to a diction in the format {widget : self.instance}
84 self.active_settings = { self.wTree.get_widget('memlock_checkButton') : [self.memlock], 86 self.active_settings = { self.builder.get_object('memlock_checkButton') : [self.memlock],
85 self.wTree.get_widget('raw1394_checkbutton') : [self.raw1394, self.load_raw1394_module], 87 self.builder.get_object('raw1394_checkbutton') : [self.raw1394, self.load_raw1394_module],
86 self.wTree.get_widget('EnableNice') : [self.nice]88 self.builder.get_object('EnableNice') : [self.nice]
87 }89 }
88 #Apply those settings90 #Apply those settings
89 for widget, instanceArray in self.active_settings.items():91 for widget, instanceArray in self.active_settings.items():
@@ -102,12 +104,12 @@
102 memlock_entry_amount = str(int(self.memtotal*(spin_object.get_value()/100)))104 memlock_entry_amount = str(int(self.memtotal*(spin_object.get_value()/100)))
103 self.memlock.line_replacement = "@audio - memlock " + memlock_entry_amount105 self.memlock.line_replacement = "@audio - memlock " + memlock_entry_amount
104 print self.memlock.line_replacement106 print self.memlock.line_replacement
105 apply_button = self.wTree.get_widget('apply_button')107 apply_button = self.builder.get_object('apply_button')
106 apply_button.set_sensitive(True)108 apply_button.set_sensitive(True)
107109
108 def set_memlock_enable(self, memlock_checkButton):110 def set_memlock_enable(self, memlock_checkButton):
109 self.memlock_enabled = memlock_checkButton.get_active()111 self.memlock_enabled = memlock_checkButton.get_active()
110 memlock_spinbutton = self.wTree.get_widget('memlock_spinbutton')112 memlock_spinbutton = self.builder.get_object('memlock_spinbutton')
111 memlock_spinbutton.set_sensitive(memlock_checkButton.get_active())113 memlock_spinbutton.set_sensitive(memlock_checkButton.get_active())
112 print self.memlock_enabled114 print self.memlock_enabled
113115
@@ -127,7 +129,7 @@
127 self.raw1394Warning.hide()129 self.raw1394Warning.hide()
128130
129 def set_apply_sensitive(self):131 def set_apply_sensitive(self):
130 apply_button = self.wTree.get_widget('apply_button')132 apply_button = self.builder.get_object('apply_button')
131 apply_button.set_sensitive(True)133 apply_button.set_sensitive(True)
132134
133 def set_nice_amount(self, spin_button):135 def set_nice_amount(self, spin_button):
@@ -137,15 +139,15 @@
137 print self.nice.line_replacement139 print self.nice.line_replacement
138140
139 def set_nice_enable(self, check_button):141 def set_nice_enable(self, check_button):
140 self.nice_spin_button = self.wTree.get_widget('nicePercentageAmount')142 self.nice_spin_button = self.builder.get_object('nicePercentageAmount')
141 self.nice_spin_button.set_sensitive(check_button.get_active())143 self.nice_spin_button.set_sensitive(check_button.get_active())
142 print 'Nice toggled'144 print 'Nice toggled'
143145
144 def serialize_settings(self):146 def serialize_settings(self):
145 self.settings_value = {}147 self.settings_value = {}
146 self.settings_value['memlock'] = { 'memlock_checkButton' : self.wTree.get_widget('memlock_checkButton').get_active(), 'memlock_spinbutton' : self.wTree.get_widget('memlock_spinbutton').get_value() }148 self.settings_value['memlock'] = { 'memlock_checkButton' : self.builder.get_object('memlock_checkButton').get_active(), 'memlock_spinbutton' : self.builder.get_object('memlock_spinbutton').get_value() }
147 self.settings_value['raw1394'] = { 'raw1394_checkbutton' : self.wTree.get_widget('raw1394_checkbutton').get_active() } 149 self.settings_value['raw1394'] = { 'raw1394_checkbutton' : self.builder.get_object('raw1394_checkbutton').get_active() }
148 self.settings_value['nice'] = { 'EnableNice' : self.wTree.get_widget('EnableNice').get_active(), 'nicePercentageAmount' : self.wTree.get_widget('nicePercentageAmount').get_value() }150 self.settings_value['nice'] = { 'EnableNice' : self.builder.get_object('EnableNice').get_active(), 'nicePercentageAmount' : self.builder.get_object('nicePercentageAmount').get_value() }
149 us_config = open(os.path.expanduser('~/.us-controls'), 'w')151 us_config = open(os.path.expanduser('~/.us-controls'), 'w')
150 cPickle.dump(self.settings_value, us_config)152 cPickle.dump(self.settings_value, us_config)
151 us_config.close()153 us_config.close()
@@ -156,9 +158,9 @@
156 for key, value in self.settings_value.items():158 for key, value in self.settings_value.items():
157 for widget, value in value.items():159 for widget, value in value.items():
158 try:160 try:
159 self.wTree.get_widget(widget).set_value(value)161 self.builder.get_object(widget).set_value(value)
160 except:162 except:
161 self.wTree.get_widget(widget).set_active(value)163 self.builder.get_object(widget).set_active(value)
162 us_config.close()164 us_config.close()
163165
164print __name__166print __name__

Subscribers

People subscribed via source and target branches