[anjuta/git-shell] git: Rework the Log UI

[James Liggett <jrliggett src gnome org>]

commit 015988e578b80ca0845ac9130080a84bc61b6bc0
Author: James Liggett <jrliggett cox net>
Date:   Fri Aug 20 16:57:32 2010 -0700

    git: Rework the Log UI
    
    - Eliminate the View Log button. This is an experiment to see if always
      refreshing logs is a good idea performance wise.
    
    - Dump the file drop entry; use the whole log viewer as a drop target instead
    
    - Move the branch combo next to the path entry so we don't waste so much
      horizontal space

 plugins/git/anjuta-git.ui |  142 +++++++++++++++++++++------------------------
 1 files changed, 66 insertions(+), 76 deletions(-)
---
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index 8df60e6..7e70d4e 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -1046,103 +1046,97 @@
     <property name="visible">True</property>
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkFrame" id="frame10">
+      <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment10">
+          <object class="GtkFrame" id="frame10">
             <property name="visible">True</property>
-            <property name="left_padding">12</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkAlignment" id="alignment10">
                 <property name="visible">True</property>
-                <property name="spacing">2</property>
-                <child>
-                  <object class="AnjutaFileDropEntry" id="path_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkButton" id="log_view_button">
-                    <property name="label" translatable="yes">View Log</property>
+                  <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="image">find_button_image</property>
+                    <property name="spacing">2</property>
+                    <child>
+                      <object class="GtkEntry" id="path_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
             </child>
+            <child type="label">
+              <object class="GtkLabel" id="label19">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">View the Log for File/Folder:</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
-        <child type="label">
-          <object class="GtkLabel" id="label19">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">View the Log for File/Folder:</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkFrame" id="frame17">
-        <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment17">
+          <object class="GtkFrame" id="frame17">
             <property name="visible">True</property>
-            <property name="left_padding">12</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkComboBox" id="branch_combo">
+              <object class="GtkAlignment" id="alignment17">
                 <property name="visible">True</property>
-                <property name="model">log_branch_combo_model</property>
-                <child>
-                  <object class="GtkCellRendererPixbuf" id="log_branch_combo_active_icon"/>
-                  <attributes>
-                    <attribute name="stock-id">0</attribute>
-                  </attributes>
-                </child>
+                <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkCellRendererText" id="log_branch_combo_name"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
+                  <object class="GtkComboBox" id="branch_combo">
+                    <property name="visible">True</property>
+                    <property name="model">log_branch_combo_model</property>
+                    <child>
+                      <object class="GtkCellRendererPixbuf" id="log_branch_combo_active_icon"/>
+                      <attributes>
+                        <attribute name="stock-id">0</attribute>
+                      </attributes>
+                    </child>
+                    <child>
+                      <object class="GtkCellRendererText" id="log_branch_combo_name"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                 </child>
               </object>
             </child>
+            <child type="label">
+              <object class="GtkLabel" id="label21">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Branch:</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
           </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label21">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Branch:</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </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>
     <child>
@@ -1356,7 +1350,7 @@
         </child>
       </object>
       <packing>
-        <property name="position">2</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>
@@ -2736,8 +2730,4 @@
       </packing>
     </child>
   </object>
-  <object class="GtkImage" id="find_button_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-find</property>
-  </object>
 </interface>