[transmageddon] Add fixes from Laszlo Pandy for GtkBuilder code
- From: Christian Fredrik Kalager Schaller <uraeus src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [transmageddon] Add fixes from Laszlo Pandy for GtkBuilder code
- Date: Sun, 1 Nov 2009 23:44:10 +0000 (UTC)
commit ed254bc5b94c158a6c7e7ec8dc19e82dc0a2f922
Author: Christian F.K. Schaller <christian schaller collabora co uk>
Date: Sun Nov 1 23:43:29 2009 +0000
Add fixes from Laszlo Pandy for GtkBuilder code
src/transmageddon.py | 33 +++--------
src/transmageddon.ui | 156 ++++++++++++++++----------------------------------
2 files changed, 57 insertions(+), 132 deletions(-)
---
diff --git a/src/transmageddon.py b/src/transmageddon.py
index dbae80d..4939508 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -125,8 +125,6 @@ class TransmageddonUI:
self.builder = gtk.Builder()
- self.builder.set_translation_domain("transmageddon")
-
#Set the Glade file
self.uifile = "transmageddon.ui"
self.builder.add_from_file(self.uifile)
@@ -240,26 +238,17 @@ class TransmageddonUI:
# Populate the Container format combobox
self.lst = supported_containers
- liststore = gtk.ListStore(gobject.TYPE_STRING)
for i in self.lst:
- liststore.append([i])
- self.containerchoice.set_model(liststore)
- cell = gtk.CellRendererText()
- self.containerchoice.pack_start(cell, True)
- self.containerchoice.add_attribute(cell, "text", 0)
+ self.containerchoice.append_text(i)
# Populate the rotatation box
self.rotationlist = [_("No rotation (default)"), _("Clockwise 90 degrees"), _("Rotate 180 degrees"),
_("Counterclockwise 90 degrees"), _("Horizontal flip"),
_("Vertical flip"), _("Upper left diagonal flip"),
_("Upper right diagnonal flip") ]
- liststore = gtk.ListStore(gobject.TYPE_STRING)
+
for y in self.rotationlist:
- liststore.append([y])
- self.rotationchoice.set_model(liststore)
- cell = gtk.CellRendererText()
- self.rotationchoice.pack_start(cell, True)
- self.rotationchoice.add_attribute(cell, "text", 0)
+ self.rotationchoice.append_text(y)
self.rotationchoice.set_active(0)
self.rotationvalue = int(0)
@@ -267,23 +256,17 @@ class TransmageddonUI:
# Populate Device Presets combobox
devicelist = []
shortname = []
- liststore = gtk.ListStore(gobject.TYPE_STRING)
- for x, (name, device) in enumerate(sorted(presets.get().items(),
- lambda x, y: cmp(x[1].make + x[1].model,
- y[1].make + y[1].model))):
- liststore.append([str(device)])
+ preset_list = sorted(presets.get().items(),
+ key = (lambda x: x[1].make + x[1].model))
+ for x, (name, device) in enumerate(preset_list):
+ self.presetchoice.append_text(str(device))
devicelist.append(str(device))
shortname.append(str(name))
#for (name, device) in (presets.get().items()):
# shortname.append(str(name))
self.presetchoices = dict(zip(devicelist, shortname))
- liststore.prepend(["No Presets"])
-
- self.presetchoice.set_model(liststore)
- cell = gtk.CellRendererText()
- self.presetchoice.pack_start(cell, True)
- self.presetchoice.add_attribute(cell, "text", 0)
+ self.presetchoice.prepend_text("No Presets")
self.waiting_for_signal="False"
diff --git a/src/transmageddon.ui b/src/transmageddon.ui
index 8c87857..74c125f 100644
--- a/src/transmageddon.ui
+++ b/src/transmageddon.ui
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="TopWindow">
<property name="visible">True</property>
<property name="title" translatable="yes">Transmageddon</property>
@@ -9,6 +9,7 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
@@ -16,111 +17,6 @@
<property name="pack_direction">rtl</property>
<property name="child_pack_direction">rtl</property>
<child>
- <object class="GtkMenuItem" id="menuitem5">
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu4">
- <property name="visible">True</property>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem11">
- <property name="label">gtk-new</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem12">
- <property name="label">gtk-open</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem13">
- <property name="label">gtk-save</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem14">
- <property name="label">gtk-save-as</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
- <property name="visible">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem15">
- <property name="label">gtk-quit</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="menuitem6">
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu5">
- <property name="visible">True</property>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem16">
- <property name="label">gtk-cut</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem17">
- <property name="label">gtk-copy</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem18">
- <property name="label">gtk-paste</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="imagemenuitem19">
- <property name="label">gtk-delete</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="menuitem7">
- <property name="label" translatable="yes">_View</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
<object class="GtkMenuItem" id="help">
<property name="visible">True</property>
<property name="label" translatable="yes">_Help</property>
@@ -130,8 +26,9 @@
<property name="visible">True</property>
<child>
<object class="GtkImageMenuItem" id="debug">
- <property name="label">Debug</property>
+ <property name="label" translatable="yes">_Debug</property>
<property name="visible">True</property>
+ <property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_debug_activate"/>
</object>
@@ -159,6 +56,7 @@
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
@@ -232,8 +130,15 @@
<child>
<object class="GtkComboBox" id="presetchoice">
<property name="visible">True</property>
+ <property name="model">presetsmodel</property>
<property name="active">0</property>
<signal name="changed" handler="on_presetchoice_changed"/>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -404,8 +309,15 @@
<child>
<object class="GtkComboBox" id="containerchoice">
<property name="visible">True</property>
+ <property name="model">outputformatmodel</property>
<property name="active">0</property>
<signal name="changed" handler="on_containerchoice_changed"/>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1068,6 +980,7 @@
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="rotationlabel">
<property name="visible">True</property>
@@ -1084,8 +997,15 @@
<child>
<object class="GtkComboBox" id="rotationchoice">
<property name="visible">True</property>
+ <property name="model">rotationmodel</property>
<property name="active">0</property>
<signal name="changed" handler="on_rotationchoice_changed"/>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -1167,4 +1087,26 @@
</object>
</child>
</object>
+ <object class="GtkListStore" id="rotationmodel">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="presetsmodel">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="outputformatmodel">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-info</property>
+ </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
