[gnome-color-manager] Don't resize the window on startup. Fixes #607391



commit 5b31f65d6db3b66b5aedaaac1a5238ee205e29dc
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jan 19 14:10:23 2010 +0000

    Don't resize the window on startup. Fixes #607391

 data/gcm-prefs.ui |   44 ++++++++++++++------------------------------
 src/gcm-prefs.c   |    5 +++--
 2 files changed, 17 insertions(+), 32 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index ccbc026..ae9542f 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -1125,6 +1125,7 @@
                                                         <property name="label">filename</property>
                                                         <property name="use_markup">True</property>
                                                         <property name="wrap">True</property>
+                                                        <property name="wrap_mode">word-char</property>
                                                         <property name="selectable">True</property>
                                                       </object>
                                                       <packing>
@@ -1134,6 +1135,7 @@
                                                     </child>
                                                   </object>
                                                   <packing>
+                                                    <property name="expand">False</property>
                                                     <property name="position">1</property>
                                                   </packing>
                                                 </child>
@@ -1164,32 +1166,9 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkVBox" id="vbox_profile_graphs">
+                              <object class="GtkExpander" id="expander_profile_graphs">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkHBox" id="hbox3">
-                                    <property name="visible">True</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label_cie_title">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes" comments="Section heading for CIE and TRC graphs">Profile Graphs</property>
-                                        <attributes>
-                                          <attribute name="weight" value="bold"/>
-                                        </attributes>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment6">
                                     <property name="visible">True</property>
@@ -1252,15 +1231,20 @@
                                       </object>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label7">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Profile Graphs</property>
+                                    <attributes>
+                                      <attribute name="weight" value="bold"/>
+                                    </attributes>
+                                  </object>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 77c1c17..61d0f5b 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -1821,7 +1821,7 @@ gcm_prefs_profiles_treeview_clicked_cb (GtkTreeSelection *selection, gpointer us
 	gtk_widget_set_sensitive (widget, ret);
 
 	/* should we show the pane at all */
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_profile_graphs"));
+	widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander_profile_graphs"));
 	gtk_widget_set_visible (widget, show_section);
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_profile_info"));
 	gtk_widget_set_visible (widget, TRUE);
@@ -2779,7 +2779,7 @@ main (int argc, char **argv)
 	gtk_widget_set_sensitive (widget, FALSE);
 
 	/* hidden until a profile is selected */
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_profile_graphs"));
+	widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander_profile_graphs"));
 	gtk_widget_set_visible (widget, FALSE);
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_profile_info"));
 	gtk_widget_set_visible (widget, FALSE);
@@ -2927,6 +2927,7 @@ main (int argc, char **argv)
 	gtk_box_pack_start (GTK_BOX(widget), info_bar, FALSE, FALSE, 0);
 
 	/* show main UI */
+	gtk_window_set_default_size (GTK_WINDOW(main_window), 1000, 450);
 	gtk_widget_show (main_window);
 
 	/* connect up sliders */



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