[gitg] commit-paned: Use a GtkActionBar for the commit tool bar



commit a1441cd33530eeb9096b63f094e0b71e29ee4b39
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Tue Oct 16 10:26:25 2018 +0200

    commit-paned: Use a GtkActionBar for the commit tool bar
    
    Uses a GtkAction bar rather than a GtkFrame and a GtkBox to implement
    the commit tool bar. This better fits the role of this bar, avoids
    having double borders on the sides and the bottom, and dropd some custom
    styling.

 gitg/resources/ui/gitg-commit-paned.ui | 93 +++++++++++++++-------------------
 gitg/resources/ui/style.css            |  5 --
 2 files changed, 41 insertions(+), 57 deletions(-)
---
diff --git a/gitg/resources/ui/gitg-commit-paned.ui b/gitg/resources/ui/gitg-commit-paned.ui
index 9534d46d..b82ce42b 100644
--- a/gitg/resources/ui/gitg-commit-paned.ui
+++ b/gitg/resources/ui/gitg-commit-paned.ui
@@ -65,62 +65,51 @@
           </object>
         </child>
         <child>
-          <object class="GtkFrame" id="frame_commit">
+          <object class="GtkActionBar" id="box_commit">
             <property name="visible">True</property>
-            <style>
-              <class name="commit-frame"/>
-            </style>
             <child>
-              <object class="GtkBox" id="box_commit">
-                <property name="orientation">horizontal</property>
+              <object class="GtkCheckButton" id="check_button_skip_hooks">
                 <property name="visible">True</property>
-                <property name="margin">6</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkCheckButton" id="check_button_skip_hooks">
-                    <property name="visible">True</property>
-                    <property name="halign">start</property>
-                    <property name="hexpand">True</property>
-                    <property name="use_underline">True</property>
-                    <property name="label" translatable="yes">Skip commit _hooks</property>
-                  </object>
-                  <packing>
-                    <property name="pack-type">start</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_commit">
-                    <property name="visible">True</property>
-                    <property name="use_underline">True</property>
-                    <property name="label" translatable="yes">C_ommit</property>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_stage">
-                    <property name="visible">True</property>
-                    <property name="use_underline">True</property>
-                    <property name="label" translatable="yes">S_tage selection</property>
-                    <property name="sensitive">False</property>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_discard">
-                    <property name="visible">True</property>
-                    <property name="use_underline">True</property>
-                    <property name="label" translatable="yes">D_iscard selection</property>
-                    <property name="sensitive">False</property>
-                  </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                  </packing>
-                </child>
+                <property name="halign">start</property>
+                <property name="hexpand">True</property>
+                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">Skip commit _hooks</property>
               </object>
+              <packing>
+                <property name="pack-type">start</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_commit">
+                <property name="visible">True</property>
+                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">C_ommit</property>
+              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_stage">
+                <property name="visible">True</property>
+                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">S_tage selection</property>
+                <property name="sensitive">False</property>
+              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_discard">
+                <property name="visible">True</property>
+                <property name="use_underline">True</property>
+                <property name="label" translatable="yes">D_iscard selection</property>
+                <property name="sensitive">False</property>
+              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
             </child>
           </object>
           <packing>
diff --git a/gitg/resources/ui/style.css b/gitg/resources/ui/style.css
index 8b6d515b..a7c4a542 100644
--- a/gitg/resources/ui/style.css
+++ b/gitg/resources/ui/style.css
@@ -119,11 +119,6 @@ GitgHistoryPaned GtkEntry.ref_editing_entry:selected {
        background-color: @butter3;
 }
 
-GtkFrame.commit-frame {
-       border: 0px;
-       border-top: 1px solid @borders;
-}
-
 GitgHistoryRefRow {
        border: 0;
 }


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