PyRoom

Merge lp:~matthew-pirocchi/pyroom/use-gtkbuilder-fixed into lp:pyroom

  1. use-gtkbuilder-fixed
  2. Merge into trunk
Proposed by Matthew Pirocchi
Status: Merged
Merged at revision: 198
Proposed branch: lp:~matthew-pirocchi/pyroom/use-gtkbuilder-fixed
Merge into: lp:pyroom
Diff against target: None lines
To merge this branch: bzr merge lp:~matthew-pirocchi/pyroom/use-gtkbuilder-fixed
Reviewer Review Type Date Requested Status
PyRoom Dev Team Pending
Review via email: mp+12194@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matthew Pirocchi (matthew-pirocchi) wrote :

This is the fixed version of this merge proposal:
https://code.launchpad.net/~matthew-pirocchi/pyroom/use-gtkbuilder/+merge/9991
It's in a separate branch because I forgot to check in one of the files in the old branch, and had since deleted it. I think this branch is cleaner anyway, and I divided the commits up better this time, so it works out.

Copied from the old proposal:
"PyRoom currently uses libglade for loading glade files. This is deprecated as of GTK+ 2.12 (see http://live.gnome.org/GnomeGoals/RemoveLibGladeUseGtkBuilder). Instead, applications should use GtkBuilder, which is now built into gtk (unlike libglade, which is a separate library).

I've refactored PyRoom to use GtkBuilder instead of libglade."

Note:
The two RuntimeWarnings are because there are two signals in the preferences gladefile that are not handled. They weren't handled in libglade either, but libglade didn't warn you about this. This probably means you don't use them for anything, but I figured I'd stick to a simple refactoring and let you take a look and see if you want to get rid of them.

Revision history for this message
Florian Heinle (tiax) wrote :

Hi,

thanks for your work, the branch has been merged into trunk at revision 198!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'PyRoom/__init__.py'
2--- PyRoom/__init__.py 2009-08-02 14:31:56 +0000
3+++ PyRoom/__init__.py 2009-09-21 20:06:16 +0000
4@@ -8,7 +8,6 @@
5
6 import gettext
7 import gtk
8-from gtk import glade
9
10 import os
11 from os.path import pardir, abspath, dirname, join
12@@ -27,9 +26,8 @@
13 if lang_in_env:
14 languages_used.extend(lang_in_env.split())
15
16-for module in gettext, glade:
17- module.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
18- module.textdomain(GETTEXT_DOMAIN)
19+gettext.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
20+gettext.textdomain(GETTEXT_DOMAIN)
21
22 translation = gettext.translation(GETTEXT_DOMAIN, LOCALE_PATH,
23 languages=languages_used,
24
25=== modified file 'PyRoom/basic_edit.py'
26--- PyRoom/basic_edit.py 2009-08-16 20:41:22 +0000
27+++ PyRoom/basic_edit.py 2009-09-21 20:20:31 +0000
28@@ -26,7 +26,6 @@
29 """
30
31 import gtk
32-import gtk.glade
33 import os
34 import urllib
35
36@@ -391,31 +390,24 @@
37 max_height=monitor_geometry.height
38 )
39
40- # Defines the glade file functions for use on closing a buffer
41- self.wTree = gtk.glade.XML(os.path.join(
42- state['absolute_path'], "interface.glade"),
43- "SaveBuffer")
44- self.dialog = self.wTree.get_widget("SaveBuffer")
45+ # Defines the glade file functions for use on closing a buffer or exit
46+ gladefile = os.path.join(state['absolute_path'], "interface.glade")
47+ builder = gtk.Builder()
48+ builder.add_from_file(gladefile)
49+ self.dialog = builder.get_object("SaveBuffer")
50 self.dialog.set_transient_for(self.window)
51+ self.quitdialog = builder.get_object("QuitSave")
52+ self.quitdialog.set_transient_for(self.window)
53 dic = {
54 "on_button-close_clicked": self.unsave_dialog,
55 "on_button-cancel_clicked": self.cancel_dialog,
56 "on_button-save_clicked": self.save_dialog,
57- }
58- self.wTree.signal_autoconnect(dic)
59-
60- #Defines the glade file functions for use on exit
61- self.aTree = gtk.glade.XML(os.path.join(
62- state['absolute_path'], "interface.glade"),
63- "QuitSave")
64- self.quitdialog = self.aTree.get_widget("QuitSave")
65- self.quitdialog.set_transient_for(self.window)
66- dic = {
67 "on_button-close2_clicked": self.quit_quit,
68 "on_button-cancel2_clicked": self.cancel_quit,
69 "on_button-save2_clicked": self.save_quit,
70 }
71- self.aTree.signal_autoconnect(dic)
72+ builder.connect_signals(dic)
73+
74 self.keybindings = define_keybindings(self)
75 # this sucks, shouldn't have to call this here, textbox should
76 # have its background and padding color from GUI().__init__() already
77
78=== modified file 'PyRoom/gui.py'
79--- PyRoom/gui.py 2009-09-21 11:41:37 +0000
80+++ PyRoom/gui.py 2009-09-21 20:01:25 +0000
81@@ -27,7 +27,6 @@
82 import gtk
83 import gobject
84 import pango
85-import gtk.glade
86 import ConfigParser
87 import os
88 from sys import platform
89
90=== modified file 'PyRoom/interface.glade'
91--- PyRoom/interface.glade 2009-07-09 12:46:06 +0000
92+++ PyRoom/interface.glade 2009-09-21 20:11:31 +0000
93@@ -1,1048 +1,8 @@
94 <?xml version="1.0"?>
95-<glade-interface>
96- <!-- interface-requires gtk+ 2.16 -->
97+<interface>
98+ <requires lib="gtk+" version="2.16"/>
99 <!-- interface-naming-policy toplevel-contextual -->
100- <widget class="GtkDialog" id="dialog-preferences">
101- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
102- <property name="border_width">5</property>
103- <property name="title" translatable="yes">Pyroom Preferences</property>
104- <property name="resizable">False</property>
105- <property name="destroy_with_parent">True</property>
106- <property name="type_hint">dialog</property>
107- <property name="skip_taskbar_hint">True</property>
108- <property name="has_separator">False</property>
109- <signal name="delete_event" handler="on_close"/>
110- <child internal-child="vbox">
111- <widget class="GtkVBox" id="dialog-vbox1">
112- <property name="visible">True</property>
113- <property name="spacing">2</property>
114- <child>
115- <widget class="GtkNotebook" id="notebook1">
116- <property name="visible">True</property>
117- <property name="can_focus">True</property>
118- <child>
119- <widget class="GtkVBox" id="generaltab">
120- <property name="visible">True</property>
121- <property name="border_width">12</property>
122- <property name="spacing">18</property>
123- <child>
124- <widget class="GtkVBox" id="vbox4">
125- <property name="visible">True</property>
126- <property name="spacing">6</property>
127- <child>
128- <widget class="GtkLabel" id="label1">
129- <property name="visible">True</property>
130- <property name="xalign">0</property>
131- <property name="label" translatable="yes">&lt;b&gt;Autosave&lt;/b&gt;</property>
132- <property name="use_markup">True</property>
133- </widget>
134- <packing>
135- <property name="expand">False</property>
136- <property name="fill">False</property>
137- <property name="position">0</property>
138- </packing>
139- </child>
140- <child>
141- <widget class="GtkHBox" id="hbox3">
142- <property name="visible">True</property>
143- <child>
144- <widget class="GtkLabel" id="label4">
145- <property name="visible">True</property>
146- <property name="label"> </property>
147- </widget>
148- <packing>
149- <property name="expand">False</property>
150- <property name="fill">False</property>
151- <property name="position">0</property>
152- </packing>
153- </child>
154- <child>
155- <widget class="GtkHBox" id="hbox8">
156- <property name="visible">True</property>
157- <property name="spacing">6</property>
158- <child>
159- <widget class="GtkCheckButton" id="autosavetext">
160- <property name="label" translatable="yes">Autosave files every </property>
161- <property name="visible">True</property>
162- <property name="can_focus">True</property>
163- <property name="receives_default">False</property>
164- <property name="use_underline">True</property>
165- <property name="draw_indicator">True</property>
166- </widget>
167- <packing>
168- <property name="expand">False</property>
169- <property name="fill">False</property>
170- <property name="position">0</property>
171- </packing>
172- </child>
173- <child>
174- <widget class="GtkSpinButton" id="autosavetime">
175- <property name="visible">True</property>
176- <property name="can_focus">True</property>
177- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
178- <property name="adjustment">1 1 100 1 10 0</property>
179- <property name="climb_rate">1</property>
180- </widget>
181- <packing>
182- <property name="expand">False</property>
183- <property name="fill">False</property>
184- <property name="position">1</property>
185- </packing>
186- </child>
187- <child>
188- <widget class="GtkLabel" id="label2">
189- <property name="visible">True</property>
190- <property name="label" translatable="yes"> minutes.</property>
191- </widget>
192- <packing>
193- <property name="expand">False</property>
194- <property name="fill">False</property>
195- <property name="position">2</property>
196- </packing>
197- </child>
198- </widget>
199- <packing>
200- <property name="position">1</property>
201- </packing>
202- </child>
203- </widget>
204- <packing>
205- <property name="expand">False</property>
206- <property name="fill">False</property>
207- <property name="position">1</property>
208- </packing>
209- </child>
210- </widget>
211- <packing>
212- <property name="expand">False</property>
213- <property name="fill">False</property>
214- <property name="position">0</property>
215- </packing>
216- </child>
217- <child>
218- <widget class="GtkVBox" id="vbox6">
219- <property name="visible">True</property>
220- <property name="spacing">6</property>
221- <child>
222- <widget class="GtkLabel" id="label10">
223- <property name="visible">True</property>
224- <property name="xalign">0</property>
225- <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
226- <property name="use_markup">True</property>
227- </widget>
228- <packing>
229- <property name="expand">False</property>
230- <property name="fill">False</property>
231- <property name="position">0</property>
232- </packing>
233- </child>
234- <child>
235- <widget class="GtkHBox" id="hbox11">
236- <property name="visible">True</property>
237- <child>
238- <widget class="GtkLabel" id="label16">
239- <property name="visible">True</property>
240- <property name="label"> </property>
241- </widget>
242- <packing>
243- <property name="expand">False</property>
244- <property name="fill">False</property>
245- <property name="position">0</property>
246- </packing>
247- </child>
248- <child>
249- <widget class="GtkCheckButton" id="showborder">
250- <property name="label" translatable="yes">Show border</property>
251- <property name="visible">True</property>
252- <property name="can_focus">True</property>
253- <property name="receives_default">False</property>
254- <property name="draw_indicator">True</property>
255- </widget>
256- <packing>
257- <property name="position">1</property>
258- </packing>
259- </child>
260- </widget>
261- <packing>
262- <property name="expand">False</property>
263- <property name="fill">False</property>
264- <property name="position">1</property>
265- </packing>
266- </child>
267- <child>
268- <widget class="GtkHBox" id="hbox10">
269- <property name="visible">True</property>
270- <child>
271- <widget class="GtkLabel" id="label14">
272- <property name="visible">True</property>
273- <property name="label"> </property>
274- </widget>
275- <packing>
276- <property name="expand">False</property>
277- <property name="fill">False</property>
278- <property name="position">0</property>
279- </packing>
280- </child>
281- <child>
282- <widget class="GtkLabel" id="label15">
283- <property name="visible">True</property>
284- <property name="label" translatable="yes">Modify line spacing (in pixels)</property>
285- </widget>
286- <packing>
287- <property name="position">1</property>
288- </packing>
289- </child>
290- <child>
291- <widget class="GtkSpinButton" id="linespacing">
292- <property name="visible">True</property>
293- <property name="can_focus">True</property>
294- <property name="adjustment">0 0 100 1 10 0</property>
295- <property name="climb_rate">1</property>
296- </widget>
297- <packing>
298- <property name="position">2</property>
299- </packing>
300- </child>
301- </widget>
302- <packing>
303- <property name="expand">False</property>
304- <property name="fill">False</property>
305- <property name="position">2</property>
306- </packing>
307- </child>
308- <child>
309- <widget class="GtkHBox" id="hbox16">
310- <property name="visible">True</property>
311- <child>
312- <widget class="GtkLabel" id="label21">
313- <property name="visible">True</property>
314- <property name="label"> </property>
315- </widget>
316- <packing>
317- <property name="expand">False</property>
318- <property name="position">0</property>
319- </packing>
320- </child>
321- <child>
322- <widget class="GtkCheckButton" id="indent_check">
323- <property name="label" translatable="yes">Indent new paragraphs</property>
324- <property name="visible">True</property>
325- <property name="can_focus">True</property>
326- <property name="receives_default">False</property>
327- <property name="draw_indicator">True</property>
328- </widget>
329- <packing>
330- <property name="position">1</property>
331- </packing>
332- </child>
333- </widget>
334- <packing>
335- <property name="position">3</property>
336- </packing>
337- </child>
338- </widget>
339- <packing>
340- <property name="position">1</property>
341- </packing>
342- </child>
343- <child>
344- <widget class="GtkVBox" id="vbox2">
345- <property name="visible">True</property>
346- <property name="orientation">vertical</property>
347- <child>
348- <widget class="GtkLabel" id="label3">
349- <property name="visible">True</property>
350- <property name="xalign">0</property>
351- <property name="label" translatable="yes">&lt;b&gt;Textbox orientation&lt;/b&gt;</property>
352- <property name="use_markup">True</property>
353- </widget>
354- <packing>
355- <property name="expand">False</property>
356- <property name="fill">False</property>
357- <property name="position">0</property>
358- </packing>
359- </child>
360- <child>
361- <widget class="GtkHBox" id="hbox1">
362- <property name="visible">True</property>
363- <child>
364- <widget class="GtkLabel" id="label6">
365- <property name="visible">True</property>
366- <property name="label" translatable="yes"> </property>
367- </widget>
368- <packing>
369- <property name="expand">False</property>
370- <property name="fill">False</property>
371- <property name="position">0</property>
372- </packing>
373- </child>
374- <child>
375- <widget class="GtkRadioButton" id="orientation_center">
376- <property name="label" translatable="yes">Center of the screen</property>
377- <property name="visible">True</property>
378- <property name="can_focus">True</property>
379- <property name="receives_default">False</property>
380- <property name="active">True</property>
381- <property name="draw_indicator">True</property>
382- </widget>
383- <packing>
384- <property name="position">1</property>
385- </packing>
386- </child>
387- </widget>
388- <packing>
389- <property name="position">1</property>
390- </packing>
391- </child>
392- <child>
393- <widget class="GtkHBox" id="hbox2">
394- <property name="visible">True</property>
395- <child>
396- <widget class="GtkLabel" id="label23">
397- <property name="visible">True</property>
398- <property name="label" translatable="yes"> </property>
399- </widget>
400- <packing>
401- <property name="expand">False</property>
402- <property name="fill">False</property>
403- <property name="position">0</property>
404- </packing>
405- </child>
406- <child>
407- <widget class="GtkRadioButton" id="orientation_top">
408- <property name="label" translatable="yes">Top of the screen</property>
409- <property name="visible">True</property>
410- <property name="can_focus">True</property>
411- <property name="receives_default">False</property>
412- <property name="active">True</property>
413- <property name="draw_indicator">True</property>
414- <property name="group">orientation_center</property>
415- </widget>
416- <packing>
417- <property name="position">1</property>
418- </packing>
419- </child>
420- </widget>
421- <packing>
422- <property name="position">2</property>
423- </packing>
424- </child>
425- </widget>
426- <packing>
427- <property name="position">2</property>
428- </packing>
429- </child>
430- <child>
431- <widget class="GtkVBox" id="vbox5">
432- <property name="visible">True</property>
433- <child>
434- <widget class="GtkLabel" id="label8">
435- <property name="visible">True</property>
436- <property name="xalign">0</property>
437- <property name="label" translatable="yes">&lt;b&gt;Text font&lt;/b&gt;</property>
438- <property name="use_markup">True</property>
439- </widget>
440- <packing>
441- <property name="expand">False</property>
442- <property name="fill">False</property>
443- <property name="padding">1</property>
444- <property name="position">0</property>
445- </packing>
446- </child>
447- <child>
448- <widget class="GtkHBox" id="hbox7">
449- <property name="visible">True</property>
450- <child>
451- <widget class="GtkLabel" id="label13">
452- <property name="visible">True</property>
453- <property name="label"> </property>
454- </widget>
455- <packing>
456- <property name="expand">False</property>
457- <property name="fill">False</property>
458- <property name="position">0</property>
459- </packing>
460- </child>
461- <child>
462- <widget class="GtkRadioButton" id="radio_document_font">
463- <property name="label" translatable="yes">Default _document font</property>
464- <property name="visible">True</property>
465- <property name="sensitive">False</property>
466- <property name="can_focus">True</property>
467- <property name="receives_default">False</property>
468- <property name="use_underline">True</property>
469- <property name="draw_indicator">True</property>
470- </widget>
471- <packing>
472- <property name="position">1</property>
473- </packing>
474- </child>
475- </widget>
476- <packing>
477- <property name="padding">2</property>
478- <property name="position">1</property>
479- </packing>
480- </child>
481- <child>
482- <widget class="GtkHBox" id="hbox14">
483- <property name="visible">True</property>
484- <child>
485- <widget class="GtkLabel" id="label19">
486- <property name="visible">True</property>
487- <property name="label"> </property>
488- </widget>
489- <packing>
490- <property name="expand">False</property>
491- <property name="fill">False</property>
492- <property name="position">0</property>
493- </packing>
494- </child>
495- <child>
496- <widget class="GtkRadioButton" id="radio_monospace_font">
497- <property name="label" translatable="yes">Default _monospace font</property>
498- <property name="visible">True</property>
499- <property name="sensitive">False</property>
500- <property name="can_focus">True</property>
501- <property name="receives_default">False</property>
502- <property name="use_underline">True</property>
503- <property name="draw_indicator">True</property>
504- <property name="group">radio_document_font</property>
505- </widget>
506- <packing>
507- <property name="position">1</property>
508- </packing>
509- </child>
510- </widget>
511- <packing>
512- <property name="padding">2</property>
513- <property name="position">2</property>
514- </packing>
515- </child>
516- <child>
517- <widget class="GtkHBox" id="hbox15">
518- <property name="visible">True</property>
519- <child>
520- <widget class="GtkLabel" id="label20">
521- <property name="visible">True</property>
522- <property name="label"> </property>
523- </widget>
524- <packing>
525- <property name="expand">False</property>
526- <property name="fill">False</property>
527- <property name="position">0</property>
528- </packing>
529- </child>
530- <child>
531- <widget class="GtkRadioButton" id="radio_custom_font">
532- <property name="label" translatable="yes">_Custom font</property>
533- <property name="visible">True</property>
534- <property name="can_focus">True</property>
535- <property name="receives_default">False</property>
536- <property name="use_underline">True</property>
537- <property name="active">True</property>
538- <property name="draw_indicator">True</property>
539- <property name="group">radio_document_font</property>
540- </widget>
541- <packing>
542- <property name="position">1</property>
543- </packing>
544- </child>
545- <child>
546- <widget class="GtkFontButton" id="fontbutton1">
547- <property name="visible">True</property>
548- <property name="can_focus">True</property>
549- <property name="receives_default">True</property>
550- <property name="title" translatable="yes">Select a font</property>
551- </widget>
552- <packing>
553- <property name="position">2</property>
554- </packing>
555- </child>
556- </widget>
557- <packing>
558- <property name="padding">2</property>
559- <property name="position">3</property>
560- </packing>
561- </child>
562- </widget>
563- <packing>
564- <property name="position">3</property>
565- </packing>
566- </child>
567- </widget>
568- </child>
569- <child>
570- <widget class="GtkLabel" id="viewlabel">
571- <property name="visible">True</property>
572- <property name="label" translatable="yes">General</property>
573- </widget>
574- <packing>
575- <property name="tab_fill">False</property>
576- <property name="type">tab</property>
577- </packing>
578- </child>
579- <child>
580- <widget class="GtkVBox" id="themetab">
581- <property name="visible">True</property>
582- <property name="spacing">8</property>
583- <child>
584- <widget class="GtkLabel" id="label5">
585- <property name="visible">True</property>
586- <property name="label" translatable="yes">&lt;b&gt;Themes&lt;/b&gt;</property>
587- <property name="use_markup">True</property>
588- <property name="width_chars">0</property>
589- </widget>
590- <packing>
591- <property name="padding">8</property>
592- <property name="position">0</property>
593- </packing>
594- </child>
595- <child>
596- <widget class="GtkHBox" id="hbox4">
597- <property name="visible">True</property>
598- <child>
599- <widget class="GtkLabel" id="label7">
600- <property name="visible">True</property>
601- <property name="label"> </property>
602- </widget>
603- <packing>
604- <property name="expand">False</property>
605- <property name="fill">False</property>
606- <property name="position">0</property>
607- </packing>
608- </child>
609- <child>
610- <widget class="GtkTable" id="table2">
611- <property name="visible">True</property>
612- <property name="n_columns">3</property>
613- <child>
614- <widget class="GtkLabel" id="presetslabel">
615- <property name="visible">True</property>
616- <property name="label" translatable="yes">Presets:</property>
617- <property name="justify">center</property>
618- </widget>
619- <packing>
620- <property name="y_options"></property>
621- </packing>
622- </child>
623- <child>
624- <widget class="GtkComboBox" id="presetscombobox">
625- <property name="visible">True</property>
626- <property name="items" translatable="yes">Custom</property>
627- </widget>
628- <packing>
629- <property name="left_attach">1</property>
630- <property name="right_attach">2</property>
631- <property name="y_options"></property>
632- </packing>
633- </child>
634- <child>
635- <widget class="GtkButton" id="save_custom_theme">
636- <property name="label" translatable="yes">_Save</property>
637- <property name="visible">True</property>
638- <property name="sensitive">False</property>
639- <property name="can_focus">True</property>
640- <property name="receives_default">True</property>
641- <property name="use_underline">True</property>
642- </widget>
643- <packing>
644- <property name="left_attach">2</property>
645- <property name="right_attach">3</property>
646- </packing>
647- </child>
648- </widget>
649- <packing>
650- <property name="position">1</property>
651- </packing>
652- </child>
653- <child>
654- <widget class="GtkLabel" id="label9">
655- <property name="visible">True</property>
656- <property name="label"> </property>
657- </widget>
658- <packing>
659- <property name="expand">False</property>
660- <property name="fill">False</property>
661- <property name="position">2</property>
662- </packing>
663- </child>
664- </widget>
665- <packing>
666- <property name="position">1</property>
667- </packing>
668- </child>
669- <child>
670- <widget class="GtkHSeparator" id="hseparator1">
671- <property name="visible">True</property>
672- </widget>
673- <packing>
674- <property name="expand">False</property>
675- <property name="position">2</property>
676- </packing>
677- </child>
678- <child>
679- <widget class="GtkHBox" id="hbox9">
680- <property name="visible">True</property>
681- <child>
682- <widget class="GtkTable" id="table1">
683- <property name="visible">True</property>
684- <property name="n_rows">7</property>
685- <property name="n_columns">2</property>
686- <property name="column_spacing">6</property>
687- <property name="homogeneous">True</property>
688- <child>
689- <widget class="GtkColorButton" id="textboxbgbutton">
690- <property name="visible">True</property>
691- <property name="can_focus">True</property>
692- <property name="receives_default">True</property>
693- <property name="color">#000000000000</property>
694- </widget>
695- <packing>
696- <property name="left_attach">1</property>
697- <property name="right_attach">2</property>
698- <property name="top_attach">2</property>
699- <property name="bottom_attach">3</property>
700- </packing>
701- </child>
702- <child>
703- <widget class="GtkColorButton" id="bgbutton">
704- <property name="visible">True</property>
705- <property name="can_focus">True</property>
706- <property name="receives_default">False</property>
707- <property name="use_alpha">True</property>
708- </widget>
709- <packing>
710- <property name="left_attach">1</property>
711- <property name="right_attach">2</property>
712- </packing>
713- </child>
714- <child>
715- <widget class="GtkColorButton" id="borderbutton">
716- <property name="visible">True</property>
717- <property name="can_focus">True</property>
718- <property name="receives_default">False</property>
719- <property name="use_alpha">True</property>
720- </widget>
721- <packing>
722- <property name="left_attach">1</property>
723- <property name="right_attach">2</property>
724- <property name="top_attach">1</property>
725- <property name="bottom_attach">2</property>
726- </packing>
727- </child>
728- <child>
729- <widget class="GtkColorButton" id="colorbutton">
730- <property name="visible">True</property>
731- <property name="can_focus">True</property>
732- <property name="receives_default">False</property>
733- <property name="use_alpha">True</property>
734- <signal name="color_set" handler="on_colorbutton1_color_set"/>
735- </widget>
736- <packing>
737- <property name="left_attach">1</property>
738- <property name="right_attach">2</property>
739- <property name="top_attach">3</property>
740- <property name="bottom_attach">4</property>
741- </packing>
742- </child>
743- <child>
744- <widget class="GtkHBox" id="hbox12">
745- <property name="visible">True</property>
746- <child>
747- <widget class="GtkSpinButton" id="heighttext">
748- <property name="visible">True</property>
749- <property name="can_focus">True</property>
750- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
751- <property name="adjustment">5 5 95 1 10 0</property>
752- <property name="climb_rate">1</property>
753- </widget>
754- <packing>
755- <property name="position">0</property>
756- </packing>
757- </child>
758- <child>
759- <widget class="GtkLabel" id="label18">
760- <property name="visible">True</property>
761- <property name="label" translatable="yes">%</property>
762- <property name="width_chars">2</property>
763- </widget>
764- <packing>
765- <property name="expand">False</property>
766- <property name="fill">False</property>
767- <property name="position">1</property>
768- </packing>
769- </child>
770- </widget>
771- <packing>
772- <property name="left_attach">1</property>
773- <property name="right_attach">2</property>
774- <property name="top_attach">4</property>
775- <property name="bottom_attach">5</property>
776- </packing>
777- </child>
778- <child>
779- <widget class="GtkHBox" id="hbox13">
780- <property name="visible">True</property>
781- <child>
782- <widget class="GtkSpinButton" id="widthtext">
783- <property name="visible">True</property>
784- <property name="can_focus">True</property>
785- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
786- <property name="adjustment">5 5 95 1 10 0</property>
787- <property name="climb_rate">1</property>
788- </widget>
789- <packing>
790- <property name="position">0</property>
791- </packing>
792- </child>
793- <child>
794- <widget class="GtkLabel" id="label22">
795- <property name="visible">True</property>
796- <property name="label" translatable="yes">%</property>
797- <property name="width_chars">3</property>
798- </widget>
799- <packing>
800- <property name="expand">False</property>
801- <property name="fill">False</property>
802- <property name="position">1</property>
803- </packing>
804- </child>
805- </widget>
806- <packing>
807- <property name="left_attach">1</property>
808- <property name="right_attach">2</property>
809- <property name="top_attach">5</property>
810- <property name="bottom_attach">6</property>
811- </packing>
812- </child>
813- <child>
814- <widget class="GtkHBox" id="hbox17">
815- <property name="visible">True</property>
816- <child>
817- <placeholder/>
818- </child>
819- <child>
820- <widget class="GtkLabel" id="bglabel">
821- <property name="visible">True</property>
822- <property name="label" translatable="yes">Background color:</property>
823- <property name="use_underline">True</property>
824- <property name="justify">center</property>
825- <property name="mnemonic_widget">bgbutton</property>
826- </widget>
827- <packing>
828- <property name="expand">False</property>
829- <property name="fill">False</property>
830- <property name="pack_type">end</property>
831- <property name="position">1</property>
832- </packing>
833- </child>
834- </widget>
835- <packing>
836- <property name="y_options"></property>
837- </packing>
838- </child>
839- <child>
840- <widget class="GtkHBox" id="hbox18">
841- <property name="visible">True</property>
842- <child>
843- <placeholder/>
844- </child>
845- <child>
846- <widget class="GtkLabel" id="borderlabel">
847- <property name="visible">True</property>
848- <property name="label" translatable="yes">Border color:</property>
849- <property name="justify">center</property>
850- </widget>
851- <packing>
852- <property name="expand">False</property>
853- <property name="fill">False</property>
854- <property name="pack_type">end</property>
855- <property name="position">1</property>
856- </packing>
857- </child>
858- </widget>
859- <packing>
860- <property name="top_attach">1</property>
861- <property name="bottom_attach">2</property>
862- <property name="y_options"></property>
863- </packing>
864- </child>
865- <child>
866- <widget class="GtkHBox" id="hbox19">
867- <property name="visible">True</property>
868- <child>
869- <placeholder/>
870- </child>
871- <child>
872- <widget class="GtkLabel" id="textboxbackground">
873- <property name="visible">True</property>
874- <property name="label" translatable="yes">Textbox background:</property>
875- <property name="justify">center</property>
876- </widget>
877- <packing>
878- <property name="expand">False</property>
879- <property name="fill">False</property>
880- <property name="pack_type">end</property>
881- <property name="position">1</property>
882- </packing>
883- </child>
884- </widget>
885- <packing>
886- <property name="top_attach">2</property>
887- <property name="bottom_attach">3</property>
888- <property name="y_options"></property>
889- </packing>
890- </child>
891- <child>
892- <widget class="GtkHBox" id="hbox20">
893- <property name="visible">True</property>
894- <child>
895- <placeholder/>
896- </child>
897- <child>
898- <widget class="GtkLabel" id="colorlabel">
899- <property name="visible">True</property>
900- <property name="label" translatable="yes">Text color:</property>
901- <property name="justify">center</property>
902- </widget>
903- <packing>
904- <property name="expand">False</property>
905- <property name="fill">False</property>
906- <property name="pack_type">end</property>
907- <property name="position">1</property>
908- </packing>
909- </child>
910- </widget>
911- <packing>
912- <property name="top_attach">3</property>
913- <property name="bottom_attach">4</property>
914- <property name="y_options"></property>
915- </packing>
916- </child>
917- <child>
918- <widget class="GtkHBox" id="hbox21">
919- <property name="visible">True</property>
920- <child>
921- <placeholder/>
922- </child>
923- <child>
924- <widget class="GtkLabel" id="heightlabel">
925- <property name="visible">True</property>
926- <property name="label" translatable="yes">Height:</property>
927- </widget>
928- <packing>
929- <property name="expand">False</property>
930- <property name="fill">False</property>
931- <property name="pack_type">end</property>
932- <property name="position">1</property>
933- </packing>
934- </child>
935- </widget>
936- <packing>
937- <property name="top_attach">4</property>
938- <property name="bottom_attach">5</property>
939- <property name="y_options"></property>
940- </packing>
941- </child>
942- <child>
943- <widget class="GtkHBox" id="hbox22">
944- <property name="visible">True</property>
945- <child>
946- <placeholder/>
947- </child>
948- <child>
949- <widget class="GtkLabel" id="widthlabel">
950- <property name="visible">True</property>
951- <property name="label" translatable="yes">Width:</property>
952- <property name="justify">center</property>
953- </widget>
954- <packing>
955- <property name="expand">False</property>
956- <property name="fill">False</property>
957- <property name="pack_type">end</property>
958- <property name="position">1</property>
959- </packing>
960- </child>
961- </widget>
962- <packing>
963- <property name="top_attach">5</property>
964- <property name="bottom_attach">6</property>
965- <property name="y_options"></property>
966- </packing>
967- </child>
968- <child>
969- <widget class="GtkHBox" id="hbox23">
970- <property name="visible">True</property>
971- <child>
972- <placeholder/>
973- </child>
974- <child>
975- <widget class="GtkLabel" id="paddinglabel">
976- <property name="visible">True</property>
977- <property name="label" translatable="yes">Padding:</property>
978- <property name="justify">center</property>
979- </widget>
980- <packing>
981- <property name="expand">False</property>
982- <property name="fill">False</property>
983- <property name="pack_type">end</property>
984- <property name="position">1</property>
985- </packing>
986- </child>
987- </widget>
988- <packing>
989- <property name="top_attach">6</property>
990- <property name="bottom_attach">7</property>
991- <property name="y_options"></property>
992- </packing>
993- </child>
994- <child>
995- <widget class="GtkHBox" id="hbox24">
996- <property name="visible">True</property>
997- <child>
998- <widget class="GtkSpinButton" id="paddingtext">
999- <property name="visible">True</property>
1000- <property name="can_focus">True</property>
1001- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1002- <property name="adjustment">0 0 100 1 10 0</property>
1003- <property name="climb_rate">1</property>
1004- </widget>
1005- <packing>
1006- <property name="position">0</property>
1007- </packing>
1008- </child>
1009- <child>
1010- <widget class="GtkLabel" id="label17">
1011- <property name="visible">True</property>
1012- <property name="label" translatable="yes">px</property>
1013- <property name="width_chars">3</property>
1014- </widget>
1015- <packing>
1016- <property name="expand">False</property>
1017- <property name="fill">False</property>
1018- <property name="position">1</property>
1019- </packing>
1020- </child>
1021- </widget>
1022- <packing>
1023- <property name="left_attach">1</property>
1024- <property name="right_attach">2</property>
1025- <property name="top_attach">6</property>
1026- <property name="bottom_attach">7</property>
1027- </packing>
1028- </child>
1029- </widget>
1030- <packing>
1031- <property name="position">0</property>
1032- </packing>
1033- </child>
1034- <child>
1035- <widget class="GtkVBox" id="vbox1">
1036- <property name="visible">True</property>
1037- <child>
1038- <widget class="GtkLabel" id="label12">
1039- <property name="visible">True</property>
1040- <property name="label"> </property>
1041- </widget>
1042- <packing>
1043- <property name="expand">False</property>
1044- <property name="fill">False</property>
1045- <property name="position">0</property>
1046- </packing>
1047- </child>
1048- </widget>
1049- <packing>
1050- <property name="expand">False</property>
1051- <property name="fill">False</property>
1052- <property name="position">1</property>
1053- </packing>
1054- </child>
1055- </widget>
1056- <packing>
1057- <property name="position">3</property>
1058- </packing>
1059- </child>
1060- <child>
1061- <widget class="GtkLabel" id="label11">
1062- <property name="height_request">1</property>
1063- <property name="visible">True</property>
1064- <property name="xalign">0.0099999997764825821</property>
1065- <property name="yalign">0.0099999997764825821</property>
1066- <property name="label"> </property>
1067- </widget>
1068- <packing>
1069- <property name="expand">False</property>
1070- <property name="fill">False</property>
1071- <property name="position">4</property>
1072- </packing>
1073- </child>
1074- </widget>
1075- <packing>
1076- <property name="position">1</property>
1077- </packing>
1078- </child>
1079- <child>
1080- <widget class="GtkLabel" id="themelabel">
1081- <property name="visible">True</property>
1082- <property name="label" translatable="yes">Theme</property>
1083- </widget>
1084- <packing>
1085- <property name="position">1</property>
1086- <property name="tab_fill">False</property>
1087- <property name="type">tab</property>
1088- </packing>
1089- </child>
1090- </widget>
1091- <packing>
1092- <property name="position">1</property>
1093- </packing>
1094- </child>
1095- <child internal-child="action_area">
1096- <widget class="GtkHButtonBox" id="dialog-action_area1">
1097- <property name="visible">True</property>
1098- <property name="layout_style">end</property>
1099- <child>
1100- <widget class="GtkButton" id="button-close">
1101- <property name="label">gtk-cancel</property>
1102- <property name="visible">True</property>
1103- <property name="can_focus">True</property>
1104- <property name="receives_default">False</property>
1105- <property name="use_stock">True</property>
1106- <signal name="clicked" handler="on_button-close_clicked"/>
1107- </widget>
1108- <packing>
1109- <property name="expand">False</property>
1110- <property name="fill">False</property>
1111- <property name="position">0</property>
1112- </packing>
1113- </child>
1114- <child>
1115- <widget class="GtkButton" id="button-ok">
1116- <property name="label">gtk-ok</property>
1117- <property name="visible">True</property>
1118- <property name="can_focus">True</property>
1119- <property name="receives_default">False</property>
1120- <property name="use_stock">True</property>
1121- <signal name="clicked" handler="on_button-ok_clicked"/>
1122- <signal name="activate" handler="on_button-ok_activate"/>
1123- </widget>
1124- <packing>
1125- <property name="expand">False</property>
1126- <property name="fill">False</property>
1127- <property name="position">1</property>
1128- </packing>
1129- </child>
1130- </widget>
1131- <packing>
1132- <property name="expand">False</property>
1133- <property name="pack_type">end</property>
1134- <property name="position">0</property>
1135- </packing>
1136- </child>
1137- </widget>
1138- </child>
1139- </widget>
1140- <widget class="GtkWindow" id="SaveBuffer">
1141+ <object class="GtkWindow" id="SaveBuffer">
1142 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1143 <property name="title" translatable="yes">Save changes?</property>
1144 <property name="window_position">center</property>
1145@@ -1051,95 +11,95 @@
1146 <property name="type_hint">dialog</property>
1147 <property name="skip_taskbar_hint">True</property>
1148 <child>
1149- <widget class="GtkVBox" id="vbox2">
1150+ <object class="GtkVBox" id="vbox2">
1151 <property name="visible">True</property>
1152 <child>
1153- <widget class="GtkHBox" id="hbox1">
1154+ <object class="GtkHBox" id="hbox1">
1155 <property name="visible">True</property>
1156 <child>
1157- <widget class="GtkImage" id="image1">
1158+ <object class="GtkImage" id="image1">
1159 <property name="visible">True</property>
1160 <property name="xpad">5</property>
1161 <property name="ypad">1</property>
1162 <property name="stock">gtk-dialog-warning</property>
1163 <property name="icon-size">6</property>
1164- </widget>
1165+ </object>
1166 <packing>
1167 <property name="position">0</property>
1168 </packing>
1169 </child>
1170 <child>
1171- <widget class="GtkLabel" id="label3">
1172+ <object class="GtkLabel" id="label3">
1173 <property name="visible">True</property>
1174 <property name="label" translatable="yes">&lt;b&gt;Warning!&lt;/b&gt;
1175 You are about to close your current document leaving unsaved changes. If you continue, any changes will be lost.</property>
1176 <property name="use_markup">True</property>
1177 <property name="wrap">True</property>
1178- </widget>
1179+ </object>
1180 <packing>
1181 <property name="position">1</property>
1182 </packing>
1183 </child>
1184- </widget>
1185+ </object>
1186 <packing>
1187 <property name="position">0</property>
1188 </packing>
1189 </child>
1190 <child>
1191- <widget class="GtkHBox" id="hbox2">
1192+ <object class="GtkHBox" id="hbox2">
1193 <property name="visible">True</property>
1194 <child>
1195- <widget class="GtkButton" id="button-close1">
1196+ <object class="GtkButton" id="button-close1">
1197 <property name="label" translatable="yes">Close without saving</property>
1198 <property name="visible">True</property>
1199 <property name="can_focus">True</property>
1200 <property name="receives_default">False</property>
1201 <property name="use_underline">True</property>
1202 <signal name="clicked" handler="on_button-close_clicked"/>
1203- </widget>
1204+ </object>
1205 <packing>
1206 <property name="padding">2</property>
1207 <property name="position">0</property>
1208 </packing>
1209 </child>
1210 <child>
1211- <widget class="GtkButton" id="button-cancel">
1212+ <object class="GtkButton" id="button-cancel">
1213 <property name="label">gtk-cancel</property>
1214 <property name="visible">True</property>
1215 <property name="can_focus">True</property>
1216 <property name="receives_default">False</property>
1217 <property name="use_stock">True</property>
1218 <signal name="clicked" handler="on_button-cancel_clicked"/>
1219- </widget>
1220+ </object>
1221 <packing>
1222 <property name="position">1</property>
1223 </packing>
1224 </child>
1225 <child>
1226- <widget class="GtkButton" id="button-save">
1227+ <object class="GtkButton" id="button-save">
1228 <property name="label">gtk-save</property>
1229 <property name="visible">True</property>
1230 <property name="can_focus">True</property>
1231 <property name="receives_default">False</property>
1232 <property name="use_stock">True</property>
1233 <signal name="clicked" handler="on_button-save_clicked"/>
1234- </widget>
1235+ </object>
1236 <packing>
1237 <property name="padding">2</property>
1238 <property name="position">2</property>
1239 </packing>
1240 </child>
1241- </widget>
1242+ </object>
1243 <packing>
1244 <property name="expand">False</property>
1245 <property name="padding">4</property>
1246 <property name="position">1</property>
1247 </packing>
1248 </child>
1249- </widget>
1250+ </object>
1251 </child>
1252- </widget>
1253- <widget class="GtkWindow" id="QuitSave">
1254+ </object>
1255+ <object class="GtkWindow" id="QuitSave">
1256 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1257 <property name="title" translatable="yes">Save changes?</property>
1258 <property name="window_position">center</property>
1259@@ -1148,92 +108,92 @@
1260 <property name="type_hint">dialog</property>
1261 <property name="skip_taskbar_hint">True</property>
1262 <child>
1263- <widget class="GtkVBox" id="vbox3">
1264+ <object class="GtkVBox" id="vbox3">
1265 <property name="visible">True</property>
1266 <child>
1267- <widget class="GtkHBox" id="hbox5">
1268+ <object class="GtkHBox" id="hbox5">
1269 <property name="visible">True</property>
1270 <child>
1271- <widget class="GtkImage" id="image3">
1272+ <object class="GtkImage" id="image3">
1273 <property name="visible">True</property>
1274 <property name="xpad">5</property>
1275 <property name="ypad">1</property>
1276 <property name="stock">gtk-dialog-warning</property>
1277 <property name="icon-size">6</property>
1278- </widget>
1279+ </object>
1280 <packing>
1281 <property name="position">0</property>
1282 </packing>
1283 </child>
1284 <child>
1285- <widget class="GtkLabel" id="label6">
1286+ <object class="GtkLabel" id="label6">
1287 <property name="visible">True</property>
1288 <property name="label" translatable="yes">&lt;b&gt;Warning!&lt;/b&gt;
1289 You are about to quit leaving documents with unsaved changes. If you continue, you will loose any changes that you have made.</property>
1290 <property name="use_markup">True</property>
1291 <property name="wrap">True</property>
1292- </widget>
1293+ </object>
1294 <packing>
1295 <property name="position">1</property>
1296 </packing>
1297 </child>
1298- </widget>
1299+ </object>
1300 <packing>
1301 <property name="position">0</property>
1302 </packing>
1303 </child>
1304 <child>
1305- <widget class="GtkHBox" id="hbox6">
1306+ <object class="GtkHBox" id="hbox6">
1307 <property name="visible">True</property>
1308 <child>
1309- <widget class="GtkButton" id="button-close2">
1310+ <object class="GtkButton" id="button-close2">
1311 <property name="label" translatable="yes">Close without saving</property>
1312 <property name="visible">True</property>
1313 <property name="can_focus">True</property>
1314 <property name="receives_default">False</property>
1315 <property name="use_underline">True</property>
1316 <signal name="clicked" handler="on_button-close2_clicked"/>
1317- </widget>
1318+ </object>
1319 <packing>
1320 <property name="padding">2</property>
1321 <property name="position">0</property>
1322 </packing>
1323 </child>
1324 <child>
1325- <widget class="GtkButton" id="button-cancel2">
1326+ <object class="GtkButton" id="button-cancel2">
1327 <property name="label">gtk-cancel</property>
1328 <property name="visible">True</property>
1329 <property name="can_focus">True</property>
1330 <property name="receives_default">False</property>
1331 <property name="use_stock">True</property>
1332 <signal name="clicked" handler="on_button-cancel2_clicked"/>
1333- </widget>
1334+ </object>
1335 <packing>
1336 <property name="position">1</property>
1337 </packing>
1338 </child>
1339 <child>
1340- <widget class="GtkButton" id="button-save2">
1341+ <object class="GtkButton" id="button-save2">
1342 <property name="label">gtk-save</property>
1343 <property name="visible">True</property>
1344 <property name="can_focus">True</property>
1345 <property name="receives_default">False</property>
1346 <property name="use_stock">True</property>
1347 <signal name="clicked" handler="on_button-save2_clicked"/>
1348- </widget>
1349+ </object>
1350 <packing>
1351 <property name="padding">2</property>
1352 <property name="position">2</property>
1353 </packing>
1354 </child>
1355- </widget>
1356+ </object>
1357 <packing>
1358 <property name="expand">False</property>
1359 <property name="padding">4</property>
1360 <property name="position">1</property>
1361 </packing>
1362 </child>
1363- </widget>
1364+ </object>
1365 </child>
1366- </widget>
1367-</glade-interface>
1368+ </object>
1369+</interface>
1370
1371=== added file 'PyRoom/preferences.glade'
1372--- PyRoom/preferences.glade 1970-01-01 00:00:00 +0000
1373+++ PyRoom/preferences.glade 2009-09-21 20:11:31 +0000
1374@@ -0,0 +1,1105 @@
1375+<?xml version="1.0"?>
1376+<interface>
1377+ <requires lib="gtk+" version="2.16"/>
1378+ <!-- interface-naming-policy project-wide -->
1379+ <object class="GtkDialog" id="dialog-preferences">
1380+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1381+ <property name="border_width">5</property>
1382+ <property name="title" translatable="yes">Pyroom Preferences</property>
1383+ <property name="resizable">False</property>
1384+ <property name="destroy_with_parent">True</property>
1385+ <property name="type_hint">dialog</property>
1386+ <property name="skip_taskbar_hint">True</property>
1387+ <property name="has_separator">False</property>
1388+ <signal name="delete_event" handler="on_close"/>
1389+ <child internal-child="vbox">
1390+ <object class="GtkVBox" id="dialog-vbox2">
1391+ <property name="visible">True</property>
1392+ <property name="spacing">2</property>
1393+ <child>
1394+ <object class="GtkNotebook" id="notebook1">
1395+ <property name="visible">True</property>
1396+ <property name="can_focus">True</property>
1397+ <child>
1398+ <object class="GtkVBox" id="generaltab">
1399+ <property name="visible">True</property>
1400+ <property name="border_width">12</property>
1401+ <property name="orientation">vertical</property>
1402+ <property name="spacing">18</property>
1403+ <child>
1404+ <object class="GtkVBox" id="vbox4">
1405+ <property name="visible">True</property>
1406+ <property name="orientation">vertical</property>
1407+ <property name="spacing">6</property>
1408+ <child>
1409+ <object class="GtkLabel" id="label1">
1410+ <property name="visible">True</property>
1411+ <property name="xalign">0</property>
1412+ <property name="label" translatable="yes">&lt;b&gt;Autosave&lt;/b&gt;</property>
1413+ <property name="use_markup">True</property>
1414+ </object>
1415+ <packing>
1416+ <property name="expand">False</property>
1417+ <property name="fill">False</property>
1418+ <property name="position">0</property>
1419+ </packing>
1420+ </child>
1421+ <child>
1422+ <object class="GtkHBox" id="hbox3">
1423+ <property name="visible">True</property>
1424+ <child>
1425+ <object class="GtkLabel" id="label4">
1426+ <property name="visible">True</property>
1427+ <property name="label"> </property>
1428+ </object>
1429+ <packing>
1430+ <property name="expand">False</property>
1431+ <property name="fill">False</property>
1432+ <property name="position">0</property>
1433+ </packing>
1434+ </child>
1435+ <child>
1436+ <object class="GtkHBox" id="hbox8">
1437+ <property name="visible">True</property>
1438+ <property name="spacing">6</property>
1439+ <child>
1440+ <object class="GtkCheckButton" id="autosavetext">
1441+ <property name="label" translatable="yes">Autosave files every </property>
1442+ <property name="visible">True</property>
1443+ <property name="can_focus">True</property>
1444+ <property name="receives_default">False</property>
1445+ <property name="use_underline">True</property>
1446+ <property name="draw_indicator">True</property>
1447+ </object>
1448+ <packing>
1449+ <property name="expand">False</property>
1450+ <property name="fill">False</property>
1451+ <property name="position">0</property>
1452+ </packing>
1453+ </child>
1454+ <child>
1455+ <object class="GtkSpinButton" id="autosavetime">
1456+ <property name="visible">True</property>
1457+ <property name="can_focus">True</property>
1458+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1459+ <property name="invisible_char">&#x25CF;</property>
1460+ <property name="adjustment">adjustment5</property>
1461+ <property name="climb_rate">1</property>
1462+ </object>
1463+ <packing>
1464+ <property name="expand">False</property>
1465+ <property name="fill">False</property>
1466+ <property name="position">1</property>
1467+ </packing>
1468+ </child>
1469+ <child>
1470+ <object class="GtkLabel" id="label2">
1471+ <property name="visible">True</property>
1472+ <property name="label" translatable="yes"> minutes.</property>
1473+ </object>
1474+ <packing>
1475+ <property name="expand">False</property>
1476+ <property name="fill">False</property>
1477+ <property name="position">2</property>
1478+ </packing>
1479+ </child>
1480+ </object>
1481+ <packing>
1482+ <property name="position">1</property>
1483+ </packing>
1484+ </child>
1485+ </object>
1486+ <packing>
1487+ <property name="expand">False</property>
1488+ <property name="fill">False</property>
1489+ <property name="position">1</property>
1490+ </packing>
1491+ </child>
1492+ </object>
1493+ <packing>
1494+ <property name="expand">False</property>
1495+ <property name="fill">False</property>
1496+ <property name="position">0</property>
1497+ </packing>
1498+ </child>
1499+ <child>
1500+ <object class="GtkVBox" id="vbox6">
1501+ <property name="visible">True</property>
1502+ <property name="orientation">vertical</property>
1503+ <property name="spacing">6</property>
1504+ <child>
1505+ <object class="GtkLabel" id="label10">
1506+ <property name="visible">True</property>
1507+ <property name="xalign">0</property>
1508+ <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
1509+ <property name="use_markup">True</property>
1510+ </object>
1511+ <packing>
1512+ <property name="expand">False</property>
1513+ <property name="fill">False</property>
1514+ <property name="position">0</property>
1515+ </packing>
1516+ </child>
1517+ <child>
1518+ <object class="GtkHBox" id="hbox11">
1519+ <property name="visible">True</property>
1520+ <child>
1521+ <object class="GtkLabel" id="label16">
1522+ <property name="visible">True</property>
1523+ <property name="label"> </property>
1524+ </object>
1525+ <packing>
1526+ <property name="expand">False</property>
1527+ <property name="fill">False</property>
1528+ <property name="position">0</property>
1529+ </packing>
1530+ </child>
1531+ <child>
1532+ <object class="GtkCheckButton" id="showborder">
1533+ <property name="label" translatable="yes">Show border</property>
1534+ <property name="visible">True</property>
1535+ <property name="can_focus">True</property>
1536+ <property name="receives_default">False</property>
1537+ <property name="draw_indicator">True</property>
1538+ </object>
1539+ <packing>
1540+ <property name="position">1</property>
1541+ </packing>
1542+ </child>
1543+ </object>
1544+ <packing>
1545+ <property name="expand">False</property>
1546+ <property name="fill">False</property>
1547+ <property name="position">1</property>
1548+ </packing>
1549+ </child>
1550+ <child>
1551+ <object class="GtkHBox" id="hbox10">
1552+ <property name="visible">True</property>
1553+ <child>
1554+ <object class="GtkLabel" id="label14">
1555+ <property name="visible">True</property>
1556+ <property name="label"> </property>
1557+ </object>
1558+ <packing>
1559+ <property name="expand">False</property>
1560+ <property name="fill">False</property>
1561+ <property name="position">0</property>
1562+ </packing>
1563+ </child>
1564+ <child>
1565+ <object class="GtkLabel" id="label15">
1566+ <property name="visible">True</property>
1567+ <property name="label" translatable="yes">Modify line spacing (in pixels)</property>
1568+ </object>
1569+ <packing>
1570+ <property name="position">1</property>
1571+ </packing>
1572+ </child>
1573+ <child>
1574+ <object class="GtkSpinButton" id="linespacing">
1575+ <property name="visible">True</property>
1576+ <property name="can_focus">True</property>
1577+ <property name="invisible_char">&#x25CF;</property>
1578+ <property name="adjustment">adjustment4</property>
1579+ <property name="climb_rate">1</property>
1580+ </object>
1581+ <packing>
1582+ <property name="position">2</property>
1583+ </packing>
1584+ </child>
1585+ </object>
1586+ <packing>
1587+ <property name="expand">False</property>
1588+ <property name="fill">False</property>
1589+ <property name="position">2</property>
1590+ </packing>
1591+ </child>
1592+ <child>
1593+ <object class="GtkHBox" id="hbox16">
1594+ <property name="visible">True</property>
1595+ <child>
1596+ <object class="GtkLabel" id="label21">
1597+ <property name="visible">True</property>
1598+ <property name="label"> </property>
1599+ </object>
1600+ <packing>
1601+ <property name="expand">False</property>
1602+ <property name="position">0</property>
1603+ </packing>
1604+ </child>
1605+ <child>
1606+ <object class="GtkCheckButton" id="indent_check">
1607+ <property name="label" translatable="yes">Indent new paragraphs</property>
1608+ <property name="visible">True</property>
1609+ <property name="can_focus">True</property>
1610+ <property name="receives_default">False</property>
1611+ <property name="draw_indicator">True</property>
1612+ </object>
1613+ <packing>
1614+ <property name="position">1</property>
1615+ </packing>
1616+ </child>
1617+ </object>
1618+ <packing>
1619+ <property name="position">3</property>
1620+ </packing>
1621+ </child>
1622+ </object>
1623+ <packing>
1624+ <property name="position">1</property>
1625+ </packing>
1626+ </child>
1627+ <child>
1628+ <object class="GtkVBox" id="vbox2">
1629+ <property name="visible">True</property>
1630+ <property name="orientation">vertical</property>
1631+ <child>
1632+ <object class="GtkLabel" id="label3">
1633+ <property name="visible">True</property>
1634+ <property name="xalign">0</property>
1635+ <property name="label" translatable="yes">&lt;b&gt;Textbox orientation&lt;/b&gt;</property>
1636+ <property name="use_markup">True</property>
1637+ </object>
1638+ <packing>
1639+ <property name="expand">False</property>
1640+ <property name="fill">False</property>
1641+ <property name="position">0</property>
1642+ </packing>
1643+ </child>
1644+ <child>
1645+ <object class="GtkHBox" id="hbox1">
1646+ <property name="visible">True</property>
1647+ <child>
1648+ <object class="GtkLabel" id="label6">
1649+ <property name="visible">True</property>
1650+ <property name="label" translatable="yes"> </property>
1651+ </object>
1652+ <packing>
1653+ <property name="expand">False</property>
1654+ <property name="fill">False</property>
1655+ <property name="position">0</property>
1656+ </packing>
1657+ </child>
1658+ <child>
1659+ <object class="GtkRadioButton" id="orientation_center">
1660+ <property name="label" translatable="yes">Center of the screen</property>
1661+ <property name="visible">True</property>
1662+ <property name="can_focus">True</property>
1663+ <property name="receives_default">False</property>
1664+ <property name="active">True</property>
1665+ <property name="draw_indicator">True</property>
1666+ </object>
1667+ <packing>
1668+ <property name="position">1</property>
1669+ </packing>
1670+ </child>
1671+ </object>
1672+ <packing>
1673+ <property name="position">1</property>
1674+ </packing>
1675+ </child>
1676+ <child>
1677+ <object class="GtkHBox" id="hbox2">
1678+ <property name="visible">True</property>
1679+ <child>
1680+ <object class="GtkLabel" id="label23">
1681+ <property name="visible">True</property>
1682+ <property name="label" translatable="yes"> </property>
1683+ </object>
1684+ <packing>
1685+ <property name="expand">False</property>
1686+ <property name="fill">False</property>
1687+ <property name="position">0</property>
1688+ </packing>
1689+ </child>
1690+ <child>
1691+ <object class="GtkRadioButton" id="orientation_top">
1692+ <property name="label" translatable="yes">Top of the screen</property>
1693+ <property name="visible">True</property>
1694+ <property name="can_focus">True</property>
1695+ <property name="receives_default">False</property>
1696+ <property name="draw_indicator">True</property>
1697+ <property name="group">orientation_center</property>
1698+ </object>
1699+ <packing>
1700+ <property name="position">1</property>
1701+ </packing>
1702+ </child>
1703+ </object>
1704+ <packing>
1705+ <property name="position">2</property>
1706+ </packing>
1707+ </child>
1708+ </object>
1709+ <packing>
1710+ <property name="position">2</property>
1711+ </packing>
1712+ </child>
1713+ <child>
1714+ <object class="GtkVBox" id="vbox5">
1715+ <property name="visible">True</property>
1716+ <property name="orientation">vertical</property>
1717+ <child>
1718+ <object class="GtkLabel" id="label8">
1719+ <property name="visible">True</property>
1720+ <property name="xalign">0</property>
1721+ <property name="label" translatable="yes">&lt;b&gt;Text font&lt;/b&gt;</property>
1722+ <property name="use_markup">True</property>
1723+ </object>
1724+ <packing>
1725+ <property name="expand">False</property>
1726+ <property name="fill">False</property>
1727+ <property name="padding">1</property>
1728+ <property name="position">0</property>
1729+ </packing>
1730+ </child>
1731+ <child>
1732+ <object class="GtkHBox" id="hbox7">
1733+ <property name="visible">True</property>
1734+ <child>
1735+ <object class="GtkLabel" id="label13">
1736+ <property name="visible">True</property>
1737+ <property name="label"> </property>
1738+ </object>
1739+ <packing>
1740+ <property name="expand">False</property>
1741+ <property name="fill">False</property>
1742+ <property name="position">0</property>
1743+ </packing>
1744+ </child>
1745+ <child>
1746+ <object class="GtkRadioButton" id="radio_document_font">
1747+ <property name="label" translatable="yes">Default _document font</property>
1748+ <property name="visible">True</property>
1749+ <property name="sensitive">False</property>
1750+ <property name="can_focus">True</property>
1751+ <property name="receives_default">False</property>
1752+ <property name="use_underline">True</property>
1753+ <property name="active">True</property>
1754+ <property name="draw_indicator">True</property>
1755+ </object>
1756+ <packing>
1757+ <property name="position">1</property>
1758+ </packing>
1759+ </child>
1760+ </object>
1761+ <packing>
1762+ <property name="padding">2</property>
1763+ <property name="position">1</property>
1764+ </packing>
1765+ </child>
1766+ <child>
1767+ <object class="GtkHBox" id="hbox14">
1768+ <property name="visible">True</property>
1769+ <child>
1770+ <object class="GtkLabel" id="label19">
1771+ <property name="visible">True</property>
1772+ <property name="label"> </property>
1773+ </object>
1774+ <packing>
1775+ <property name="expand">False</property>
1776+ <property name="fill">False</property>
1777+ <property name="position">0</property>
1778+ </packing>
1779+ </child>
1780+ <child>
1781+ <object class="GtkRadioButton" id="radio_monospace_font">
1782+ <property name="label" translatable="yes">Default _monospace font</property>
1783+ <property name="visible">True</property>
1784+ <property name="sensitive">False</property>
1785+ <property name="can_focus">True</property>
1786+ <property name="receives_default">False</property>
1787+ <property name="use_underline">True</property>
1788+ <property name="draw_indicator">True</property>
1789+ <property name="group">radio_document_font</property>
1790+ </object>
1791+ <packing>
1792+ <property name="position">1</property>
1793+ </packing>
1794+ </child>
1795+ </object>
1796+ <packing>
1797+ <property name="padding">2</property>
1798+ <property name="position">2</property>
1799+ </packing>
1800+ </child>
1801+ <child>
1802+ <object class="GtkHBox" id="hbox15">
1803+ <property name="visible">True</property>
1804+ <child>
1805+ <object class="GtkLabel" id="label20">
1806+ <property name="visible">True</property>
1807+ <property name="label"> </property>
1808+ </object>
1809+ <packing>
1810+ <property name="expand">False</property>
1811+ <property name="fill">False</property>
1812+ <property name="position">0</property>
1813+ </packing>
1814+ </child>
1815+ <child>
1816+ <object class="GtkRadioButton" id="radio_custom_font">
1817+ <property name="label" translatable="yes">_Custom font</property>
1818+ <property name="visible">True</property>
1819+ <property name="can_focus">True</property>
1820+ <property name="receives_default">False</property>
1821+ <property name="use_underline">True</property>
1822+ <property name="draw_indicator">True</property>
1823+ <property name="group">radio_document_font</property>
1824+ </object>
1825+ <packing>
1826+ <property name="position">1</property>
1827+ </packing>
1828+ </child>
1829+ <child>
1830+ <object class="GtkFontButton" id="fontbutton1">
1831+ <property name="visible">True</property>
1832+ <property name="can_focus">True</property>
1833+ <property name="receives_default">True</property>
1834+ <property name="title" translatable="yes">Select a font</property>
1835+ </object>
1836+ <packing>
1837+ <property name="position">2</property>
1838+ </packing>
1839+ </child>
1840+ </object>
1841+ <packing>
1842+ <property name="padding">2</property>
1843+ <property name="position">3</property>
1844+ </packing>
1845+ </child>
1846+ </object>
1847+ <packing>
1848+ <property name="position">3</property>
1849+ </packing>
1850+ </child>
1851+ </object>
1852+ </child>
1853+ <child type="tab">
1854+ <object class="GtkLabel" id="viewlabel">
1855+ <property name="visible">True</property>
1856+ <property name="label" translatable="yes">General</property>
1857+ </object>
1858+ <packing>
1859+ <property name="tab_fill">False</property>
1860+ </packing>
1861+ </child>
1862+ <child>
1863+ <object class="GtkVBox" id="themetab">
1864+ <property name="visible">True</property>
1865+ <property name="orientation">vertical</property>
1866+ <property name="spacing">8</property>
1867+ <child>
1868+ <object class="GtkLabel" id="label5">
1869+ <property name="visible">True</property>
1870+ <property name="label" translatable="yes">&lt;b&gt;Themes&lt;/b&gt;</property>
1871+ <property name="use_markup">True</property>
1872+ <property name="width_chars">0</property>
1873+ </object>
1874+ <packing>
1875+ <property name="padding">8</property>
1876+ <property name="position">0</property>
1877+ </packing>
1878+ </child>
1879+ <child>
1880+ <object class="GtkHBox" id="hbox4">
1881+ <property name="visible">True</property>
1882+ <child>
1883+ <object class="GtkLabel" id="label7">
1884+ <property name="visible">True</property>
1885+ <property name="label"> </property>
1886+ </object>
1887+ <packing>
1888+ <property name="expand">False</property>
1889+ <property name="fill">False</property>
1890+ <property name="position">0</property>
1891+ </packing>
1892+ </child>
1893+ <child>
1894+ <object class="GtkTable" id="table2">
1895+ <property name="visible">True</property>
1896+ <property name="n_columns">3</property>
1897+ <child>
1898+ <object class="GtkLabel" id="presetslabel">
1899+ <property name="visible">True</property>
1900+ <property name="label" translatable="yes">Presets:</property>
1901+ <property name="justify">center</property>
1902+ </object>
1903+ <packing>
1904+ <property name="y_options"></property>
1905+ </packing>
1906+ </child>
1907+ <child>
1908+ <object class="GtkComboBox" id="presetscombobox">
1909+ <property name="visible">True</property>
1910+ <property name="model">liststore1</property>
1911+ <child>
1912+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
1913+ <attributes>
1914+ <attribute name="text">0</attribute>
1915+ </attributes>
1916+ </child>
1917+ </object>
1918+ <packing>
1919+ <property name="left_attach">1</property>
1920+ <property name="right_attach">2</property>
1921+ <property name="y_options"></property>
1922+ </packing>
1923+ </child>
1924+ <child>
1925+ <object class="GtkButton" id="save_custom_theme">
1926+ <property name="label" translatable="yes">_Save</property>
1927+ <property name="visible">True</property>
1928+ <property name="sensitive">False</property>
1929+ <property name="can_focus">True</property>
1930+ <property name="receives_default">True</property>
1931+ <property name="use_underline">True</property>
1932+ </object>
1933+ <packing>
1934+ <property name="left_attach">2</property>
1935+ <property name="right_attach">3</property>
1936+ </packing>
1937+ </child>
1938+ </object>
1939+ <packing>
1940+ <property name="position">1</property>
1941+ </packing>
1942+ </child>
1943+ <child>
1944+ <object class="GtkLabel" id="label9">
1945+ <property name="visible">True</property>
1946+ <property name="label"> </property>
1947+ </object>
1948+ <packing>
1949+ <property name="expand">False</property>
1950+ <property name="fill">False</property>
1951+ <property name="position">2</property>
1952+ </packing>
1953+ </child>
1954+ </object>
1955+ <packing>
1956+ <property name="position">1</property>
1957+ </packing>
1958+ </child>
1959+ <child>
1960+ <object class="GtkHSeparator" id="hseparator1">
1961+ <property name="visible">True</property>
1962+ </object>
1963+ <packing>
1964+ <property name="expand">False</property>
1965+ <property name="position">2</property>
1966+ </packing>
1967+ </child>
1968+ <child>
1969+ <object class="GtkHBox" id="hbox9">
1970+ <property name="visible">True</property>
1971+ <child>
1972+ <object class="GtkTable" id="table1">
1973+ <property name="visible">True</property>
1974+ <property name="n_rows">7</property>
1975+ <property name="n_columns">2</property>
1976+ <property name="column_spacing">6</property>
1977+ <property name="homogeneous">True</property>
1978+ <child>
1979+ <object class="GtkColorButton" id="textboxbgbutton">
1980+ <property name="visible">True</property>
1981+ <property name="can_focus">True</property>
1982+ <property name="receives_default">True</property>
1983+ <property name="color">#000000000000</property>
1984+ </object>
1985+ <packing>
1986+ <property name="left_attach">1</property>
1987+ <property name="right_attach">2</property>
1988+ <property name="top_attach">2</property>
1989+ <property name="bottom_attach">3</property>
1990+ </packing>
1991+ </child>
1992+ <child>
1993+ <object class="GtkColorButton" id="bgbutton">
1994+ <property name="visible">True</property>
1995+ <property name="can_focus">True</property>
1996+ <property name="receives_default">True</property>
1997+ <property name="use_alpha">True</property>
1998+ <property name="color">#000000000000</property>
1999+ </object>
2000+ <packing>
2001+ <property name="left_attach">1</property>
2002+ <property name="right_attach">2</property>
2003+ </packing>
2004+ </child>
2005+ <child>
2006+ <object class="GtkColorButton" id="borderbutton">
2007+ <property name="visible">True</property>
2008+ <property name="can_focus">True</property>
2009+ <property name="receives_default">True</property>
2010+ <property name="use_alpha">True</property>
2011+ <property name="color">#000000000000</property>
2012+ </object>
2013+ <packing>
2014+ <property name="left_attach">1</property>
2015+ <property name="right_attach">2</property>
2016+ <property name="top_attach">1</property>
2017+ <property name="bottom_attach">2</property>
2018+ </packing>
2019+ </child>
2020+ <child>
2021+ <object class="GtkColorButton" id="colorbutton">
2022+ <property name="visible">True</property>
2023+ <property name="can_focus">True</property>
2024+ <property name="receives_default">True</property>
2025+ <property name="use_alpha">True</property>
2026+ <property name="color">#000000000000</property>
2027+ <signal name="color_set" handler="on_colorbutton1_color_set"/>
2028+ </object>
2029+ <packing>
2030+ <property name="left_attach">1</property>
2031+ <property name="right_attach">2</property>
2032+ <property name="top_attach">3</property>
2033+ <property name="bottom_attach">4</property>
2034+ </packing>
2035+ </child>
2036+ <child>
2037+ <object class="GtkHBox" id="hbox12">
2038+ <property name="visible">True</property>
2039+ <child>
2040+ <object class="GtkSpinButton" id="heighttext">
2041+ <property name="visible">True</property>
2042+ <property name="can_focus">True</property>
2043+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2044+ <property name="invisible_char">&#x25CF;</property>
2045+ <property name="adjustment">adjustment3</property>
2046+ <property name="climb_rate">1</property>
2047+ </object>
2048+ <packing>
2049+ <property name="position">0</property>
2050+ </packing>
2051+ </child>
2052+ <child>
2053+ <object class="GtkLabel" id="label18">
2054+ <property name="visible">True</property>
2055+ <property name="label" translatable="yes">%</property>
2056+ <property name="width_chars">2</property>
2057+ </object>
2058+ <packing>
2059+ <property name="expand">False</property>
2060+ <property name="fill">False</property>
2061+ <property name="position">1</property>
2062+ </packing>
2063+ </child>
2064+ </object>
2065+ <packing>
2066+ <property name="left_attach">1</property>
2067+ <property name="right_attach">2</property>
2068+ <property name="top_attach">4</property>
2069+ <property name="bottom_attach">5</property>
2070+ </packing>
2071+ </child>
2072+ <child>
2073+ <object class="GtkHBox" id="hbox13">
2074+ <property name="visible">True</property>
2075+ <child>
2076+ <object class="GtkSpinButton" id="widthtext">
2077+ <property name="visible">True</property>
2078+ <property name="can_focus">True</property>
2079+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2080+ <property name="invisible_char">&#x25CF;</property>
2081+ <property name="adjustment">adjustment2</property>
2082+ <property name="climb_rate">1</property>
2083+ </object>
2084+ <packing>
2085+ <property name="position">0</property>
2086+ </packing>
2087+ </child>
2088+ <child>
2089+ <object class="GtkLabel" id="label22">
2090+ <property name="visible">True</property>
2091+ <property name="label" translatable="yes">%</property>
2092+ <property name="width_chars">3</property>
2093+ </object>
2094+ <packing>
2095+ <property name="expand">False</property>
2096+ <property name="fill">False</property>
2097+ <property name="position">1</property>
2098+ </packing>
2099+ </child>
2100+ </object>
2101+ <packing>
2102+ <property name="left_attach">1</property>
2103+ <property name="right_attach">2</property>
2104+ <property name="top_attach">5</property>
2105+ <property name="bottom_attach">6</property>
2106+ </packing>
2107+ </child>
2108+ <child>
2109+ <object class="GtkHBox" id="hbox17">
2110+ <property name="visible">True</property>
2111+ <child>
2112+ <placeholder/>
2113+ </child>
2114+ <child>
2115+ <object class="GtkLabel" id="bglabel">
2116+ <property name="visible">True</property>
2117+ <property name="label" translatable="yes">Background color:</property>
2118+ <property name="use_underline">True</property>
2119+ <property name="justify">center</property>
2120+ <property name="mnemonic_widget">bgbutton</property>
2121+ </object>
2122+ <packing>
2123+ <property name="expand">False</property>
2124+ <property name="fill">False</property>
2125+ <property name="pack_type">end</property>
2126+ <property name="position">1</property>
2127+ </packing>
2128+ </child>
2129+ </object>
2130+ <packing>
2131+ <property name="y_options"></property>
2132+ </packing>
2133+ </child>
2134+ <child>
2135+ <object class="GtkHBox" id="hbox18">
2136+ <property name="visible">True</property>
2137+ <child>
2138+ <placeholder/>
2139+ </child>
2140+ <child>
2141+ <object class="GtkLabel" id="borderlabel">
2142+ <property name="visible">True</property>
2143+ <property name="label" translatable="yes">Border color:</property>
2144+ <property name="justify">center</property>
2145+ </object>
2146+ <packing>
2147+ <property name="expand">False</property>
2148+ <property name="fill">False</property>
2149+ <property name="pack_type">end</property>
2150+ <property name="position">1</property>
2151+ </packing>
2152+ </child>
2153+ </object>
2154+ <packing>
2155+ <property name="top_attach">1</property>
2156+ <property name="bottom_attach">2</property>
2157+ <property name="y_options"></property>
2158+ </packing>
2159+ </child>
2160+ <child>
2161+ <object class="GtkHBox" id="hbox19">
2162+ <property name="visible">True</property>
2163+ <child>
2164+ <placeholder/>
2165+ </child>
2166+ <child>
2167+ <object class="GtkLabel" id="textboxbackground">
2168+ <property name="visible">True</property>
2169+ <property name="label" translatable="yes">Textbox background:</property>
2170+ <property name="justify">center</property>
2171+ </object>
2172+ <packing>
2173+ <property name="expand">False</property>
2174+ <property name="fill">False</property>
2175+ <property name="pack_type">end</property>
2176+ <property name="position">1</property>
2177+ </packing>
2178+ </child>
2179+ </object>
2180+ <packing>
2181+ <property name="top_attach">2</property>
2182+ <property name="bottom_attach">3</property>
2183+ <property name="y_options"></property>
2184+ </packing>
2185+ </child>
2186+ <child>
2187+ <object class="GtkHBox" id="hbox20">
2188+ <property name="visible">True</property>
2189+ <child>
2190+ <placeholder/>
2191+ </child>
2192+ <child>
2193+ <object class="GtkLabel" id="colorlabel">
2194+ <property name="visible">True</property>
2195+ <property name="label" translatable="yes">Text color:</property>
2196+ <property name="justify">center</property>
2197+ </object>
2198+ <packing>
2199+ <property name="expand">False</property>
2200+ <property name="fill">False</property>
2201+ <property name="pack_type">end</property>
2202+ <property name="position">1</property>
2203+ </packing>
2204+ </child>
2205+ </object>
2206+ <packing>
2207+ <property name="top_attach">3</property>
2208+ <property name="bottom_attach">4</property>
2209+ <property name="y_options"></property>
2210+ </packing>
2211+ </child>
2212+ <child>
2213+ <object class="GtkHBox" id="hbox21">
2214+ <property name="visible">True</property>
2215+ <child>
2216+ <placeholder/>
2217+ </child>
2218+ <child>
2219+ <object class="GtkLabel" id="heightlabel">
2220+ <property name="visible">True</property>
2221+ <property name="label" translatable="yes">Height:</property>
2222+ </object>
2223+ <packing>
2224+ <property name="expand">False</property>
2225+ <property name="fill">False</property>
2226+ <property name="pack_type">end</property>
2227+ <property name="position">1</property>
2228+ </packing>
2229+ </child>
2230+ </object>
2231+ <packing>
2232+ <property name="top_attach">4</property>
2233+ <property name="bottom_attach">5</property>
2234+ <property name="y_options"></property>
2235+ </packing>
2236+ </child>
2237+ <child>
2238+ <object class="GtkHBox" id="hbox22">
2239+ <property name="visible">True</property>
2240+ <child>
2241+ <placeholder/>
2242+ </child>
2243+ <child>
2244+ <object class="GtkLabel" id="widthlabel">
2245+ <property name="visible">True</property>
2246+ <property name="label" translatable="yes">Width:</property>
2247+ <property name="justify">center</property>
2248+ </object>
2249+ <packing>
2250+ <property name="expand">False</property>
2251+ <property name="fill">False</property>
2252+ <property name="pack_type">end</property>
2253+ <property name="position">1</property>
2254+ </packing>
2255+ </child>
2256+ </object>
2257+ <packing>
2258+ <property name="top_attach">5</property>
2259+ <property name="bottom_attach">6</property>
2260+ <property name="y_options"></property>
2261+ </packing>
2262+ </child>
2263+ <child>
2264+ <object class="GtkHBox" id="hbox23">
2265+ <property name="visible">True</property>
2266+ <child>
2267+ <placeholder/>
2268+ </child>
2269+ <child>
2270+ <object class="GtkLabel" id="paddinglabel">
2271+ <property name="visible">True</property>
2272+ <property name="label" translatable="yes">Padding:</property>
2273+ <property name="justify">center</property>
2274+ </object>
2275+ <packing>
2276+ <property name="expand">False</property>
2277+ <property name="fill">False</property>
2278+ <property name="pack_type">end</property>
2279+ <property name="position">1</property>
2280+ </packing>
2281+ </child>
2282+ </object>
2283+ <packing>
2284+ <property name="top_attach">6</property>
2285+ <property name="bottom_attach">7</property>
2286+ <property name="y_options"></property>
2287+ </packing>
2288+ </child>
2289+ <child>
2290+ <object class="GtkHBox" id="hbox24">
2291+ <property name="visible">True</property>
2292+ <child>
2293+ <object class="GtkSpinButton" id="paddingtext">
2294+ <property name="visible">True</property>
2295+ <property name="can_focus">True</property>
2296+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2297+ <property name="invisible_char">&#x25CF;</property>
2298+ <property name="adjustment">adjustment1</property>
2299+ <property name="climb_rate">1</property>
2300+ </object>
2301+ <packing>
2302+ <property name="position">0</property>
2303+ </packing>
2304+ </child>
2305+ <child>
2306+ <object class="GtkLabel" id="label17">
2307+ <property name="visible">True</property>
2308+ <property name="label" translatable="yes">px</property>
2309+ <property name="width_chars">3</property>
2310+ </object>
2311+ <packing>
2312+ <property name="expand">False</property>
2313+ <property name="fill">False</property>
2314+ <property name="position">1</property>
2315+ </packing>
2316+ </child>
2317+ </object>
2318+ <packing>
2319+ <property name="left_attach">1</property>
2320+ <property name="right_attach">2</property>
2321+ <property name="top_attach">6</property>
2322+ <property name="bottom_attach">7</property>
2323+ </packing>
2324+ </child>
2325+ </object>
2326+ <packing>
2327+ <property name="position">0</property>
2328+ </packing>
2329+ </child>
2330+ <child>
2331+ <object class="GtkVBox" id="vbox1">
2332+ <property name="visible">True</property>
2333+ <property name="orientation">vertical</property>
2334+ <child>
2335+ <object class="GtkLabel" id="label12">
2336+ <property name="visible">True</property>
2337+ <property name="label"> </property>
2338+ </object>
2339+ <packing>
2340+ <property name="expand">False</property>
2341+ <property name="fill">False</property>
2342+ <property name="position">0</property>
2343+ </packing>
2344+ </child>
2345+ </object>
2346+ <packing>
2347+ <property name="expand">False</property>
2348+ <property name="fill">False</property>
2349+ <property name="position">1</property>
2350+ </packing>
2351+ </child>
2352+ </object>
2353+ <packing>
2354+ <property name="position">3</property>
2355+ </packing>
2356+ </child>
2357+ <child>
2358+ <object class="GtkLabel" id="label11">
2359+ <property name="height_request">1</property>
2360+ <property name="visible">True</property>
2361+ <property name="xalign">0.0099999997764825821</property>
2362+ <property name="yalign">0.0099999997764825821</property>
2363+ <property name="label"> </property>
2364+ </object>
2365+ <packing>
2366+ <property name="expand">False</property>
2367+ <property name="fill">False</property>
2368+ <property name="position">4</property>
2369+ </packing>
2370+ </child>
2371+ </object>
2372+ <packing>
2373+ <property name="position">1</property>
2374+ </packing>
2375+ </child>
2376+ <child type="tab">
2377+ <object class="GtkLabel" id="themelabel">
2378+ <property name="visible">True</property>
2379+ <property name="label" translatable="yes">Theme</property>
2380+ </object>
2381+ <packing>
2382+ <property name="position">1</property>
2383+ <property name="tab_fill">False</property>
2384+ </packing>
2385+ </child>
2386+ </object>
2387+ <packing>
2388+ <property name="position">1</property>
2389+ </packing>
2390+ </child>
2391+ <child internal-child="action_area">
2392+ <object class="GtkHButtonBox" id="dialog-action_area2">
2393+ <property name="visible">True</property>
2394+ <property name="layout_style">end</property>
2395+ <child>
2396+ <object class="GtkButton" id="button-close">
2397+ <property name="label">gtk-cancel</property>
2398+ <property name="visible">True</property>
2399+ <property name="can_focus">True</property>
2400+ <property name="receives_default">True</property>
2401+ <property name="use_stock">True</property>
2402+ <signal name="clicked" handler="on_button-close_clicked"/>
2403+ </object>
2404+ <packing>
2405+ <property name="expand">False</property>
2406+ <property name="fill">False</property>
2407+ <property name="position">0</property>
2408+ </packing>
2409+ </child>
2410+ <child>
2411+ <object class="GtkButton" id="button-ok">
2412+ <property name="label">gtk-ok</property>
2413+ <property name="visible">True</property>
2414+ <property name="can_focus">True</property>
2415+ <property name="receives_default">True</property>
2416+ <property name="use_stock">True</property>
2417+ <signal name="clicked" handler="on_button-ok_clicked"/>
2418+ <signal name="activate" handler="on_button-ok_activate"/>
2419+ </object>
2420+ <packing>
2421+ <property name="expand">False</property>
2422+ <property name="fill">False</property>
2423+ <property name="position">1</property>
2424+ </packing>
2425+ </child>
2426+ </object>
2427+ <packing>
2428+ <property name="expand">False</property>
2429+ <property name="pack_type">end</property>
2430+ <property name="position">0</property>
2431+ </packing>
2432+ </child>
2433+ </object>
2434+ </child>
2435+ <action-widgets>
2436+ <action-widget response="0">button-close</action-widget>
2437+ <action-widget response="0">button-ok</action-widget>
2438+ </action-widgets>
2439+ </object>
2440+ <object class="GtkListStore" id="liststore1">
2441+ <columns>
2442+ <!-- column-name item -->
2443+ <column type="gchararray"/>
2444+ </columns>
2445+ <data>
2446+ <row>
2447+ <col id="0" translatable="yes">Custom</col>
2448+ </row>
2449+ </data>
2450+ </object>
2451+ <object class="GtkAdjustment" id="adjustment5">
2452+ <property name="lower">1</property>
2453+ <property name="upper">100</property>
2454+ <property name="step_increment">1</property>
2455+ <property name="page_increment">10</property>
2456+ </object>
2457+ <object class="GtkAdjustment" id="adjustment4">
2458+ <property name="upper">100</property>
2459+ <property name="step_increment">1</property>
2460+ <property name="page_increment">10</property>
2461+ </object>
2462+ <object class="GtkAdjustment" id="adjustment3">
2463+ <property name="lower">5</property>
2464+ <property name="upper">95</property>
2465+ <property name="step_increment">1</property>
2466+ <property name="page_increment">10</property>
2467+ </object>
2468+ <object class="GtkAdjustment" id="adjustment2">
2469+ <property name="lower">5</property>
2470+ <property name="upper">95</property>
2471+ <property name="step_increment">1</property>
2472+ <property name="page_increment">10</property>
2473+ </object>
2474+ <object class="GtkAdjustment" id="adjustment1">
2475+ <property name="upper">100</property>
2476+ <property name="step_increment">1</property>
2477+ <property name="page_increment">10</property>
2478+ </object>
2479+</interface>
2480
2481=== modified file 'PyRoom/preferences.py'
2482--- PyRoom/preferences.py 2009-09-04 08:14:37 +0000
2483+++ PyRoom/preferences.py 2009-09-21 20:29:17 +0000
2484@@ -27,7 +27,6 @@
2485 """
2486
2487 import gtk
2488-import gtk.glade
2489 import os
2490
2491 from gui import Theme
2492@@ -38,41 +37,41 @@
2493 class Preferences(object):
2494 """our main preferences object, to be passed around where needed"""
2495 def __init__(self):
2496- self.wTree = gtk.glade.XML(os.path.join(
2497- state['absolute_path'], "interface.glade"),
2498- "dialog-preferences")
2499+ gladefile = os.path.join(state['absolute_path'], "preferences.glade")
2500+ builder = gtk.Builder()
2501+ builder.add_from_file(gladefile)
2502
2503 # Defining widgets needed
2504- self.window = self.wTree.get_widget("dialog-preferences")
2505- self.colorpreference = self.wTree.get_widget("colorbutton")
2506- self.textboxbgpreference = self.wTree.get_widget("textboxbgbutton")
2507- self.bgpreference = self.wTree.get_widget("bgbutton")
2508- self.borderpreference = self.wTree.get_widget("borderbutton")
2509- self.paddingpreference = self.wTree.get_widget("paddingtext")
2510- self.heightpreference = self.wTree.get_widget("heighttext")
2511+ self.window = builder.get_object("dialog-preferences")
2512+ self.colorpreference = builder.get_object("colorbutton")
2513+ self.textboxbgpreference = builder.get_object("textboxbgbutton")
2514+ self.bgpreference = builder.get_object("bgbutton")
2515+ self.borderpreference = builder.get_object("borderbutton")
2516+ self.paddingpreference = builder.get_object("paddingtext")
2517+ self.heightpreference = builder.get_object("heighttext")
2518 self.heightpreference.set_range(5, 95)
2519- self.widthpreference = self.wTree.get_widget("widthtext")
2520+ self.widthpreference = builder.get_object("widthtext")
2521 self.widthpreference.set_range(5, 95)
2522- self.presetscombobox = self.wTree.get_widget("presetscombobox")
2523- self.showborderbutton = self.wTree.get_widget("showborder")
2524- self.autosave = self.wTree.get_widget("autosavetext")
2525- self.autosave_spinbutton = self.wTree.get_widget("autosavetime")
2526- self.linespacing_spinbutton = self.wTree.get_widget("linespacing")
2527- self.indent_check = self.wTree.get_widget("indent_check")
2528+ self.presetscombobox = builder.get_object("presetscombobox")
2529+ self.showborderbutton = builder.get_object("showborder")
2530+ self.autosave = builder.get_object("autosavetext")
2531+ self.autosave_spinbutton = builder.get_object("autosavetime")
2532+ self.linespacing_spinbutton = builder.get_object("linespacing")
2533+ self.indent_check = builder.get_object("indent_check")
2534 if config.get('visual', 'indent') == '1':
2535 self.indent_check.set_active(True)
2536- self.save_custom_button = self.wTree.get_widget("save_custom_theme")
2537- self.custom_font_preference = self.wTree.get_widget("fontbutton1")
2538+ self.save_custom_button = builder.get_object("save_custom_theme")
2539+ self.custom_font_preference = builder.get_object("fontbutton1")
2540 if not config.get('visual', 'use_font_type') == 'custom':
2541 self.custom_font_preference.set_sensitive(False)
2542 self.font_radios = {
2543- 'document':self.wTree.get_widget("radio_document_font"),
2544- 'monospace':self.wTree.get_widget("radio_monospace_font"),
2545- 'custom':self.wTree.get_widget("radio_custom_font")
2546+ 'document':builder.get_object("radio_document_font"),
2547+ 'monospace':builder.get_object("radio_monospace_font"),
2548+ 'custom':builder.get_object("radio_custom_font")
2549 }
2550 self.orientation_radios = {
2551- 'top':self.wTree.get_widget('orientation_top'),
2552- 'center':self.wTree.get_widget('orientation_center'),
2553+ 'top':builder.get_object('orientation_top'),
2554+ 'center':builder.get_object('orientation_center'),
2555 }
2556 for widget in self.font_radios.values():
2557 if not widget.get_name() == 'radio_custom_font':
2558@@ -131,7 +130,8 @@
2559 "on_button-close_clicked": self.kill_preferences,
2560 "on_close": self.kill_preferences
2561 }
2562- self.wTree.signal_autoconnect(dic)
2563+ builder.connect_signals(dic)
2564+
2565 self.showborderbutton.connect('toggled', self.toggleborder)
2566 self.autosave.connect('toggled', self.toggleautosave)
2567 self.autosave_spinbutton.connect('value-changed', self.toggleautosave)
2568@@ -309,7 +309,7 @@
2569
2570 def show(self):
2571 """display the preferences dialog"""
2572- self.dlg = self.wTree.get_widget("dialog-preferences")
2573+ self.dlg = self.window
2574 self.dlg.show()
2575
2576 def toggle_indent(self, widget):

Subscribers

People subscribed via source and target branches

to status/vote changes: