meld r1120 - in trunk: . glade2
- From: kaiw svn gnome org
- To: svn-commits-list gnome org
- Subject: meld r1120 - in trunk: . glade2
- Date: Wed, 7 Jan 2009 22:34:20 +0000 (UTC)
Author: kaiw
Date: Wed Jan 7 22:34:20 2009
New Revision: 1120
URL: http://svn.gnome.org/viewvc/meld?rev=1120&view=rev
Log:
Remove toolbar style preference
Modified:
trunk/glade2/meldapp.glade
trunk/meldapp.py
Modified: trunk/glade2/meldapp.glade
==============================================================================
--- trunk/glade2/meldapp.glade (original)
+++ trunk/glade2/meldapp.glade Wed Jan 7 22:34:20 2009
@@ -1189,144 +1189,6 @@
<property name="fill">False</property>
</packing>
</child>
- <child>
- <widget class="GtkVBox" id="vbox28">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label39">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Toolbar Appearance</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox21">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label40">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <child>
- <widget class="GtkRadioButton" id="toolbar_style0">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Gnome Default</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_toolbar_style_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="toolbar_style1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Icons Only</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">toolbar_style0</property>
- <signal name="toggled" handler="on_toolbar_style_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="toolbar_style2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Text Only</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">toolbar_style0</property>
- <signal name="toggled" handler="on_toolbar_style_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="toolbar_style3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Text Under Icons</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">toolbar_style0</property>
- <signal name="toggled" handler="on_toolbar_style_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="toolbar_style4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Text Beside Icons</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">toolbar_style0</property>
- <signal name="toggled" handler="on_toolbar_style_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
<packing>
<property name="position">1</property>
Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py (original)
+++ trunk/meldapp.py Wed Jan 7 22:34:20 2009
@@ -242,9 +242,6 @@
self.editor_command[ self.editor_radio_values.get(self.prefs.edit_command_type, "internal") ].set_active(1)
self.gnome_default_editor_label.set_text( "(%s)" % " ".join(self.prefs.get_gnome_editor_command([])) )
self.custom_edit_command_entry.set_text( " ".join(self.prefs.get_custom_editor_command([])) )
- # display
- self.map_widgets_into_lists( ["toolbar_style"] )
- self.toolbar_style[self.prefs.toolbar_style].set_active(1)
# file filters
cols = [ (_("Name"), type("")), (_("Active"), type(0)), (_("Pattern"), type("")) ]
self.filefilter = ListWidget( cols, self.prefs, "filters")
@@ -300,12 +297,6 @@
self.prefs.edit_command_type = k
break
#
- # display
- #
- def on_toolbar_style_toggled(self, radio):
- if radio.get_active():
- self.prefs.toolbar_style = self.toolbar_style.index(radio)
- #
# filters
#
def on_checkbutton_ignore_symlinks_toggled(self, check):
@@ -432,7 +423,6 @@
"edit_command_custom" : prefs.Value(prefs.STRING, "gedit"),
"supply_newline": prefs.Value(prefs.BOOL,1),
"text_codecs": prefs.Value(prefs.STRING, "utf8 latin1"),
- "toolbar_style": prefs.Value(prefs.INT,0),
"ignore_symlinks": prefs.Value(prefs.BOOL,0),
"vc_console_visible": prefs.Value(prefs.BOOL, 0),
"color_delete_bg" : prefs.Value(prefs.STRING, "DarkSeaGreen1"),
@@ -479,16 +469,12 @@
return self._gconf.get_string('/desktop/gnome/interface/monospace_font_name') or "Monospace 10"
def get_toolbar_style(self):
- if self.toolbar_style == 0:
- style = self._gconf.get_string('/desktop/gnome/interface/toolbar_style') or "both"
- style = style.replace("-","_")
- style = {"both":gtk.TOOLBAR_BOTH, "text":gtk.TOOLBAR_TEXT,
- "icon":gtk.TOOLBAR_ICONS, "icons":gtk.TOOLBAR_ICONS,
- "both_horiz":gtk.TOOLBAR_BOTH_HORIZ,
- "both-horiz":gtk.TOOLBAR_BOTH_HORIZ
- }[style]
- else:
- style = self.toolbar_style - 1
+ style = self._gconf.get_string('/desktop/gnome/interface/toolbar_style') or "both"
+ style = {"both":gtk.TOOLBAR_BOTH, "text":gtk.TOOLBAR_TEXT,
+ "icon":gtk.TOOLBAR_ICONS, "icons":gtk.TOOLBAR_ICONS,
+ "both_horiz":gtk.TOOLBAR_BOTH_HORIZ,
+ "both-horiz":gtk.TOOLBAR_BOTH_HORIZ
+ }[style]
return style
def get_gnome_editor_command(self, files):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
