Fixed UI on deck (added 'Menu' text, removed additional app icon)

kozec · Oct 2, 2022 · 6411b9d · 6411b9d
1 parent ff8ebfc
commit 6411b9d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/glade/app.glade b/glade/app.glade
@@ -1098,14 +1098,41 @@
             <property name="relief">none</property>
             <property name="popup">mnuDaemon</property>
             <child>
-              <object class="GtkImage" id="imgDaemonStatus">
-                <property name="width_request">24</property>
-                <property name="height_request">24</property>
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkImage" id="imgDaemonStatus">
+                    <property name="width_request">24</property>
+                    <property name="height_request">24</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Menu</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                    <property name="padding">5</property>
+                  </packing>
+                </child>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkButton" id="btUndo">

diff --git a/scc/gui/dwsnc.py b/scc/gui/dwsnc.py
@@ -32,8 +32,11 @@ def child_get_property(parent, child, propname):
 def headerbar(bar):
 	"""
 	Moves all buttons from left to right (and vice versa) if user's desktop
-	environment is identified as Unity
+	environment is identified as Unity.
+	
+	Removes 'icon' button otherwise
 	"""
+	bar.set_decoration_layout(":minimize,close")
 	pass	# Not outside of Unity
 
 IS_UNITY = False