[meld] Delay showing the preference dialog until the end of setup



commit 1a526ad4653f0f0398a1b6c40ddbb18c6dcce09c
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Feb 11 16:32:50 2011 +1000

    Delay showing the preference dialog until the end of setup
    
    Among other minor things, this avoids getting a layout change when we
    pack several labels into a size group.

 data/ui/preferences.ui |    2 +-
 meld/preferences.py    |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 839c3ef..c689bf6 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -11,7 +11,7 @@
   <!-- interface-requires gtk+ 2.8 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="preferencesdialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Meld Preferences</property>
     <property name="type_hint">dialog</property>
diff --git a/meld/preferences.py b/meld/preferences.py
index 878676f..0cd2771 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -175,9 +175,8 @@ class PreferencesDialog(gnomeglade.Component):
         self.checkbutton_ignore_blank_lines.set_active( self.prefs.ignore_blank_lines )
         # encoding
         self.entry_text_codecs.set_text( self.prefs.text_codecs )
-    #
-    # editor
-    #
+        self.widget.show()
+
     def on_fontpicker_font_set(self, picker):
         self.prefs.custom_font = picker.get_font_name()
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]