[gitg] Bug 620284 - Cleaned up preferences dialog

From: Jesse van den Kieboom <jessevdk src gnome org>
To: commits-list gnome org
Cc:
Subject: [gitg] Bug 620284 - Cleaned up preferences dialog
Date: Tue, 1 Jun 2010 21:07:44 +0000 (UTC)
commit f02798f762e854b03d9c2dd2b61e542d144edf7b
Author: Garrett Regier <alias301 gmail com>
Date:   Tue Jun 1 10:13:27 2010 -0700

    Bug 620284 - Cleaned up preferences dialog

 gitg/gitg-preferences.ui |  327 +++++++++++++++++++++++++---------------------
 1 files changed, 175 insertions(+), 152 deletions(-)
---
diff --git a/gitg/gitg-preferences.ui b/gitg/gitg-preferences.ui
index 114c705..778252e 100644
--- a/gitg/gitg-preferences.ui
+++ b/gitg/gitg-preferences.ui
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-requires gitg 0.2 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment_collapse_inactive_lanes">
-    <property name="value">2</property>
-    <property name="upper">5</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-    <property name="page_size">1</property>
-    <signal name="notify::value" handler="on_collapse_inactive_lanes_changed"/>
+  <object class="GtkImage" id="image_underline">
+    <property name="visible">True</property>
+    <property name="stock">gtk-underline</property>
+    <property name="icon-size">1</property>
   </object>
-  <object class="GtkAdjustment" id="spin_button_right_margin_adjustment">
-    <property name="value">72</property>
-    <property name="lower">1</property>
-    <property name="upper">160</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+  <object class="GtkImage" id="image_italic">
+    <property name="visible">True</property>
+    <property name="stock">gtk-italic</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image_bold">
+    <property name="visible">True</property>
+    <property name="stock">gtk-bold</property>
+    <property name="icon-size">1</property>
   </object>
   <object class="GitgPreferencesDialog" id="dialog_preferences">
     <property name="border_width">5</property>
@@ -34,19 +34,82 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkVBox" id="vbox_history">
                 <property name="visible">True</property>
+                <property name="border_width">12</property>
                 <property name="spacing">18</property>
                 <child>
+                  <object class="GtkVBox" id="vbox1">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label130">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Interface&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox23">
+                        <property name="visible">True</property>
+                        <child>
+                          <object class="GtkLabel" id="label22">
+                            <property name="visible">True</property>
+                            <property name="label">    </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkVBox" id="vbox54">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCheckButton" id="check_button_main_layout_vertical">
+                                <property name="label" translatable="yes">Use vertical layout</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
-                    <property name="border_width">12</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;History&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Revisions&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
@@ -181,8 +244,8 @@
                             <child>
                               <object class="GtkCheckButton" id="check_button_history_show_virtual_unstaged">
                                 <property name="label" translatable="yes">Show unstaged changes in history</property>
-                                <property name="can_focus">True</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -193,8 +256,8 @@
                             <child>
                               <object class="GtkCheckButton" id="check_button_history_topo_order">
                                 <property name="label" translatable="yes">Show history in topological order</property>
-                                <property name="can_focus">True</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -213,62 +276,10 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label130">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Main&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox23">
-                        <property name="visible">True</property>
-                        <child>
-                          <object class="GtkLabel" id="label22">
-                            <property name="visible">True</property>
-                            <property name="label">    </property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="vbox54">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCheckButton" id="check_button_main_layout_vertical">
-                                <property name="label" translatable="yes">Use vertical layout</property>
-                                <property name="can_focus">True</property>
-                                <property name="visible">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
-                    <property name="position">0</property>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
@@ -276,8 +287,8 @@
             <child type="tab">
               <object class="GtkLabel" id="label_view">
                 <property name="visible">True</property>
-                <property name="tooltip_text" translatable="yes">Preferences that apply to the revision view</property>
-                <property name="label" translatable="yes">View</property>
+                <property name="tooltip_text" translatable="yes">Preferences that apply to the history view</property>
+                <property name="label" translatable="yes">History</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -286,11 +297,11 @@
             <child>
               <object class="GtkVBox" id="vbox_commit">
                 <property name="visible">True</property>
+                <property name="border_width">12</property>
                 <property name="spacing">18</property>
                 <child>
-                  <object class="GtkVBox" id="vbox_commit_intern">
+                  <object class="GtkVBox" id="vbox11">
                     <property name="visible">True</property>
-                    <property name="border_width">12</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label1">
@@ -305,7 +316,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox_commit_message">
+                      <object class="GtkHBox" id="hbox9">
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkLabel" id="label2">
@@ -386,6 +397,7 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -406,101 +418,112 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox_commit_intern1">
+              <object class="GtkVBox" id="vbox_configure">
                 <property name="visible">True</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;User&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="spacing">18</property>
                 <child>
-                  <object class="GtkHBox" id="hbox_commit_message1">
+                  <object class="GtkVBox" id="vbox">
                     <property name="visible">True</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkLabel" id="label5">
+                      <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
-                        <property name="label">    </property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;User&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkTable" id="table1">
+                      <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
-                        <property name="n_rows">2</property>
-                        <property name="n_columns">2</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="label_configuration_user_name">
+                          <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Name:</property>
-                          </object>
-                          <packing>
-                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_configuration_user_email">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">E-mail:</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry_configuration_user_name">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <signal name="focus_out_event" handler="on_entry_configuration_user_name_focus_out_event"/>
+                            <property name="label">    </property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="entry_configuration_user_email">
+                          <object class="GtkTable" id="table1">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <signal name="focus_out_event" handler="on_entry_configuration_user_email_focus_out_event"/>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">6</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_configuration_user_name">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Name:</property>
+                              </object>
+                              <packing>
+                                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label_configuration_user_email">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">E-mail:</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry_configuration_user_name">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">â??</property>
+                                <property name="invisible_char_set">True</property>
+                                <signal name="focus-out-event" handler="on_entry_configuration_user_name_focus_out_event" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry_configuration_user_email">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">â??</property>
+                                <property name="invisible_char_set">True</property>
+                                <signal name="focus-out-event" handler="on_entry_configuration_user_email_focus_out_event" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
@@ -555,19 +578,19 @@
       <action-widget response="-7">button_close</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image_bold">
-    <property name="visible">True</property>
-    <property name="stock">gtk-bold</property>
-    <property name="icon-size">1</property>
-  </object>
-  <object class="GtkImage" id="image_italic">
-    <property name="visible">True</property>
-    <property name="stock">gtk-italic</property>
-    <property name="icon-size">1</property>
+  <object class="GtkAdjustment" id="spin_button_right_margin_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">160</property>
+    <property name="value">72</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
-  <object class="GtkImage" id="image_underline">
-    <property name="visible">True</property>
-    <property name="stock">gtk-underline</property>
-    <property name="icon-size">1</property>
+  <object class="GtkAdjustment" id="adjustment_collapse_inactive_lanes">
+    <property name="upper">5</property>
+    <property name="value">2</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+    <property name="page_size">1</property>
+    <signal name="notify::value" handler="on_collapse_inactive_lanes_changed" swapped="no"/>
   </object>
 </interface>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]