meld r1125 - in trunk: . glade2
- From: kaiw svn gnome org
- To: svn-commits-list gnome org
- Subject: meld r1125 - in trunk: . glade2
- Date: Thu, 8 Jan 2009 23:27:20 +0000 (UTC)
Author: kaiw
Date: Thu Jan 8 23:27:20 2009
New Revision: 1125
URL: http://svn.gnome.org/viewvc/meld?rev=1125&view=rev
Log:
Remove now-unneeded headers from preference dialog tabs, and fix some HIG spacing
Modified:
trunk/glade2/meldapp.glade
trunk/meldapp.py
Modified: trunk/glade2/meldapp.glade
==============================================================================
--- trunk/glade2/meldapp.glade (original)
+++ trunk/glade2/meldapp.glade Thu Jan 8 23:27:20 2009
@@ -565,6 +565,7 @@
<property name="title" translatable="yes">Preferences : Meld</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
+ <property name="border-width">5</property>
<signal name="response" handler="on_response"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox4">
@@ -573,55 +574,12 @@
<widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="show_border">False</property>
+ <property name="border-width">5</property>
<child>
<widget class="GtkVBox" id="editor_tab">
<property name="visible">True</property>
<property name="spacing">12</property>
- <child>
- <widget class="GtkVBox" id="vbox19">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox14">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image588">
- <property name="visible">True</property>
- <property name="stock">gtk-justify-fill</property>
- <property name="icon_size">3</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label31">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="x-large">Editor</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="hseparator3">
- <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>
+ <property name="border-width">12</property>
<child>
<widget class="GtkVBox" id="vbox20">
<property name="visible">True</property>
@@ -724,7 +682,7 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -938,7 +896,7 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -1091,7 +1049,7 @@
</child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -1109,70 +1067,24 @@
<child>
<widget class="GtkVBox" id="file_filters_tab">
<property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="file_filters_box">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox31">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image592">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">3</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label58">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="x-large">File Filters</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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator7">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="spacing">12</property>
+ <property name="border-width">12</property>
<child>
<widget class="GtkLabel" id="label86">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xpad">15</property>
- <property name="ypad">15</property>
<property name="label" translatable="yes">When performing directory comparisons, you may filter out files and directories by name. Each pattern is a list of shell style wildcards separated by spaces.</property>
<property name="wrap">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox40">
<property name="visible">True</property>
- <property name="border_width">7</property>
<child>
<widget class="GtkCheckButton" id="checkbutton_ignore_symlinks">
<property name="visible">True</property>
@@ -1193,15 +1105,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</widget>
- </child>
- </widget>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
@@ -1221,57 +1131,12 @@
<child>
<widget class="GtkVBox" id="text_filters_tab">
<property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="text_filters_box">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image615">
- <property name="visible">True</property>
- <property name="stock">gtk-no</property>
- <property name="icon_size">3</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label60">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="x-large">Text Filters</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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator8">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="spacing">12</property>
+ <property name="border-width">12</property>
<child>
<widget class="GtkLabel" id="label87">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xpad">15</property>
- <property name="ypad">15</property>
<property name="label" translatable="yes">When performing file comparisons, you may ignore certain types of changes. Each pattern here is a python regular expression which replaces matching text with the empty string before comparison is performed. If the expression contains groups, only the groups are replaced. See the user manual for more details.</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_FILL</property>
@@ -1280,13 +1145,12 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox39">
<property name="visible">True</property>
- <property name="border_width">7</property>
<child>
<widget class="GtkCheckButton" id="checkbutton_ignore_blank_lines">
<property name="visible">True</property>
@@ -1300,21 +1164,18 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">5</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
- </widget>
- </child>
</widget>
<packing>
<property name="position">3</property>
@@ -1335,56 +1196,7 @@
<widget class="GtkVBox" id="encoding_tab">
<property name="visible">True</property>
<property name="spacing">12</property>
- <child>
- <widget class="GtkVBox" id="vbox36">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox26">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image591">
- <property name="visible">True</property>
- <property name="stock">gtk-spell-check</property>
- <property name="icon_size">3</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label49">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="x-large">Encoding</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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator6">
- <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>
+ <property name="border-width">12</property>
<child>
<widget class="GtkVBox" id="vbox39">
<property name="visible">True</property>
@@ -1467,7 +1279,7 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1488,7 +1300,6 @@
</child>
</widget>
<packing>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py (original)
+++ trunk/meldapp.py Thu Jan 8 23:27:20 2009
@@ -232,12 +232,12 @@
# file filters
cols = [ (_("Name"), type("")), (_("Active"), type(0)), (_("Pattern"), type("")) ]
self.filefilter = ListWidget( cols, self.prefs, "filters")
- self.file_filters_box.pack_start(self.filefilter.widget)
+ self.file_filters_tab.pack_start(self.filefilter.widget)
self.checkbutton_ignore_symlinks.set_active( self.prefs.ignore_symlinks)
# text filters
cols = [ (_("Name"), type("")), (_("Active"), type(0)), (_("Regex"), type("")) ]
self.textfilter = ListWidget( cols, self.prefs, "regexes")
- self.text_filters_box.pack_start(self.textfilter.widget)
+ self.text_filters_tab.pack_start(self.textfilter.widget)
self.checkbutton_ignore_blank_lines.set_active( self.prefs.ignore_blank_lines )
# encoding
self.entry_text_codecs.set_text( self.prefs.text_codecs )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
