meld r1004 - in trunk: . glade2
- From: stevek svn gnome org
- To: svn-commits-list gnome org
- Subject: meld r1004 - in trunk: . glade2
- Date: Thu, 19 Jun 2008 23:17:32 +0000 (UTC)
Author: stevek
Date: Thu Jun 19 23:17:32 2008
New Revision: 1004
URL: http://svn.gnome.org/viewvc/meld?rev=1004&view=rev
Log:
Remove obsolete CVS preferences. Bug 361109. Kai Willadsen
Modified:
trunk/glade2/meldapp.glade
trunk/meldapp.py
Modified: trunk/glade2/meldapp.glade
==============================================================================
--- trunk/glade2/meldapp.glade (original)
+++ trunk/glade2/meldapp.glade Thu Jun 19 23:17:32 2008
@@ -2436,308 +2436,6 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vc_tab">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkVBox" id="vbox13">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image585">
- <property name="visible">True</property>
- <property name="pixbuf">pixmaps/vc-icon.png</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="x-large">CVS</span></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox14">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label27">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Global options</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="hbox12">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label28">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox15">
- <property name="visible">True</property>
- <child>
- <widget class="GtkCheckButton" id="cvs_quiet_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Quiet mode (-q)</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_cvs_quiet_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkCheckButton" id="cvs_compression_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use Compression (-z)</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_cvs_compression_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="cvs_compression_value_spin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">3 0 9 1 10 10</property>
- <property name="climb_rate">1</property>
- <signal name="value_changed" handler="on_cvs_compression_value_changed"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cvs_ignore_cvsrc_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Ignore .cvsrc (-f)</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_cvs_ignore_cvsrc_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox30">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label56">
- <property name="visible">True</property>
- <property name="label" translatable="yes">CVS binary</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GnomeFileEntry" id="cvs_binary_fileentry">
- <property name="visible">True</property>
- <property name="browse_dialog_title">Locate CVS binary : Meld</property>
- <property name="max_saved">10</property>
- <signal name="activate" handler="on_cvs_binary_activate"/>
- <child internal-child="entry">
- <widget class="GtkEntry" id="combo-entry1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <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">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox16">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Update Options</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="hbox13">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label30">
- <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="GtkVBox" id="vbox17">
- <property name="visible">True</property>
- <child>
- <widget class="GtkCheckButton" id="cvs_create_missing_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Create missing directories (-d)</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_cvs_create_missing_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="cvs_prune_empty_check">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Prune empty directories (-P)</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_cvs_prune_empty_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">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">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="cvs_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">CVS</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
<widget class="GtkImage" id="image589">
<property name="visible">True</property>
<property name="pixbuf">pixmaps/icon.png</property>
Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py (original)
+++ trunk/meldapp.py Thu Jun 19 23:17:32 2008
@@ -259,14 +259,6 @@
self.entry_text_codecs.set_text( self.prefs.text_codecs )
self._map_widgets_into_lists( ["save_encoding"] )
self.save_encoding[self.prefs.save_encoding].set_active(1)
- # cvs
- self.cvs_quiet_check.set_active( self.prefs.cvs_quiet )
- self.cvs_compression_check.set_active( self.prefs.cvs_compression )
- self.cvs_compression_value_spin.set_value( self.prefs.cvs_compression_value )
- self.cvs_ignore_cvsrc_check.set_active( self.prefs.cvs_ignore_cvsrc )
- self.cvs_binary_fileentry.set_filename( self.prefs.cvs_binary )
- self.cvs_create_missing_check.set_active( self.prefs.cvs_create_missing )
- self.cvs_prune_empty_check.set_active( self.prefs.cvs_prune_empty )
self.treeview.set_cursor(0)
#
# treeview
@@ -328,23 +320,6 @@
def on_save_encoding_toggled(self, radio):
if radio.get_active():
self.prefs.save_encoding = self.save_encoding.index(radio)
- #
- # cvs
- #
- def on_cvs_quiet_toggled(self, toggle):
- self.prefs.cvs_quiet = toggle.get_active()
- def on_cvs_compression_toggled(self, toggle):
- self.prefs.cvs_compression = toggle.get_active()
- def on_cvs_compression_value_changed(self, spin):
- self.prefs.cvs_compression_value = int(spin.get_value())
- def on_cvs_ignore_cvsrc_toggled(self, toggle):
- self.prefs.cvs_ignore_cvsrc = toggle.get_active()
- def on_cvs_binary_activate(self, fileentry):
- self.prefs.cvs_binary = fileentry.gtk_entry().get_text()
- def on_cvs_create_missing_toggled(self, toggle):
- self.prefs.cvs_create_missing = toggle.get_active()
- def on_cvs_prune_empty_toggled(self, toggle):
- self.prefs.cvs_prune_empty = toggle.get_active()
def on_response(self, dialog, arg):
if arg==gtk.RESPONSE_CLOSE:
self.prefs.text_codecs = self.entry_text_codecs.get_property("text")
@@ -421,13 +396,6 @@
"draw_style": prefs.Value(prefs.INT,2),
"toolbar_style": prefs.Value(prefs.INT,0),
"ignore_symlinks": prefs.Value(prefs.BOOL,0),
- "cvs_quiet": prefs.Value(prefs.BOOL, 1),
- "cvs_compression": prefs.Value(prefs.BOOL, 1),
- "cvs_compression_value": prefs.Value(prefs.INT, 3),
- "cvs_ignore_cvsrc": prefs.Value(prefs.BOOL, 0),
- "cvs_binary": prefs.Value(prefs.STRING, "/usr/bin/cvs"),
- "cvs_create_missing": prefs.Value(prefs.BOOL, 1),
- "cvs_prune_empty": prefs.Value(prefs.BOOL, 1),
"vc_console_visible": prefs.Value(prefs.BOOL, 0),
"color_delete_bg" : prefs.Value(prefs.STRING, "DarkSeaGreen1"),
"color_delete_fg" : prefs.Value(prefs.STRING, "Red"),
@@ -466,22 +434,6 @@
def __init__(self):
prefs.Preferences.__init__(self, "/apps/meld", self.defaults)
- def get_cvs_command(self, op=None):
- cmd = [self.cvs_binary]
- if self.cvs_quiet:
- cmd.append("-q")
- if self.cvs_compression:
- cmd.append("-z%i" % self.cvs_compression_value)
- if self.cvs_ignore_cvsrc:
- cmd.append("-f")
- if op:
- cmd.append(op)
- if op == "update":
- if self.cvs_create_missing:
- cmd.append("-d")
- if self.cvs_prune_empty:
- cmd.append("-P")
- return cmd
def get_current_font(self):
if self.use_custom_font:
return self.custom_font
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
