Replacing sidebar stack switcher with a more compact widget.

Author: phase1geo

data/com.github.phase1geo.minder.gschema.xml

@@ -304,11 +304,5 @@
       <summary>When 'default-global-style' is set to a value of 2, the name of the saved global style to use.</summary>
       <description>When 'default-global-style' is set to a value of 2, the name of the saved global style to use.</description>
     </key>
-    <key name="compact-sidebar-width" type="b">
-      <default>false</default>
-      <summary>Displays the sidebar using vertical tabs to allow the sidebar width to be smaller.</summary>
-      <description>When set, displays the sidebar with vertical tabs to keep the sidebar width as small as possible;
-        otherwise, displays the sidebar with horizontal tabs to maximize horizontal space in the sidebar.</description>
-    </key>
   </schema>
 </schemalist>

src/MainWindow.vala

@@ -73,7 +73,6 @@ public class MainWindow : Gtk.ApplicationWindow {
   private Paned             _pane           = null;
   private Notebook?         _inspector_nb   = null;
   private Stack?            _stack          = null;
-  private StackSwitcher?    _sidebar_switcher = null;
   private Popover?          _zoom           = null;
   private Popover?          _search         = null;
   private MenuButton?       _search_btn     = null;
@@ -325,7 +324,6 @@ public class MainWindow : Gtk.ApplicationWindow {
         case "auto-parse-embedded-urls"        :  setting_changed_embedded_urls();   break;
         case "enable-markdown"                 :  setting_changed_markdown();        break;
         case "enable-unicode-input"            :  setting_changed_unicode_input();   break;
-        case "compact-sidebar-width"           :  setting_changed_compact_sidebar(); break;
       }
     });
 
@@ -454,13 +452,6 @@ public class MainWindow : Gtk.ApplicationWindow {
     }
   }
 
-  //-------------------------------------------------------------
-  // Called whenever the compact sidebar width setting is changed.
-  private void setting_changed_compact_sidebar() {
-    _sidebar_switcher.orientation = Minder.settings.get_boolean( "compact-sidebar-width" ) ? Orientation.VERTICAL : Orientation.HORIZONTAL;
-    _pane.position = get_width() - 100;
-  }
-
   //-------------------------------------------------------------
   // Called whenever the current tab is switched in the notebook
   private void tab_switched( Widget page, uint page_num ) {
@@ -1238,14 +1229,38 @@ public class MainWindow : Gtk.ApplicationWindow {
     // Handle the enable-ui-animations value
     setting_changed_ui_animations();
 
-    _sidebar_switcher = new StackSwitcher() {
-      orientation = Minder.settings.get_boolean( "compact-sidebar-width" ) ? Orientation.VERTICAL : Orientation.HORIZONTAL,
-      halign      = Align.FILL,
-      stack       = _stack
+    var sidebar_switcher = new ModeButtons() {
+      halign = Align.CENTER
     };
 
+    sidebar_switcher.add_stack_tab( _( "Current" ) );
+    sidebar_switcher.add_stack_tab( _( "Style" ) );
+    sidebar_switcher.add_stack_tab( _( "Tags" ) );
+    sidebar_switcher.add_stack_tab( _( "Stickers" ) );
+    sidebar_switcher.add_stack_tab( _( "Map" ) );
+
+    sidebar_switcher.changed.connect((index) => {
+      switch( index ) {
+        case 0 :  _stack.visible_child_name = "current";  break;
+        case 1 :  _stack.visible_child_name = "style";    break;
+        case 2 :  _stack.visible_child_name = "tag";      break;
+        case 3 :  _stack.visible_child_name = "sticker";  break;
+        case 4 :  _stack.visible_child_name = "map";      break;
+      }
+    });
+
+    _stack.notify["visible-child-name"].connect(() => {
+      switch( _stack.visible_child_name ) {
+        case "current" :  sidebar_switcher.selected = 0;  break;
+        case "style"   :  sidebar_switcher.selected = 1;  break;
+        case "tag"     :  sidebar_switcher.selected = 2;  break;
+        case "sticker" :  sidebar_switcher.selected = 3;  break;
+        case "map"     :  sidebar_switcher.selected = 4;  break;
+      }
+    });
+
     // Make sure that the tabs are displayed nicely
-    Utils.set_switcher_tab_widths( _sidebar_switcher );
+    Utils.set_switcher_tab_widths( sidebar_switcher );
 
     var box = new Box( Orientation.VERTICAL, 20 ) {
       halign        = Align.FILL,
@@ -1255,7 +1270,7 @@ public class MainWindow : Gtk.ApplicationWindow {
       margin_top    = 5,
       margin_bottom = 5
     };
-    box.append( _sidebar_switcher );
+    box.append( sidebar_switcher );
     box.append( _stack );
 
     _themer = new ThemeEditor( this );

src/ModeButtons.vala

@@ -87,4 +87,28 @@ public class ModeButtons : Box {
 
   }
 
+  //-------------------------------------------------------------
+  // Adds a label tab to this ModeButton item.
+  public void add_stack_tab( string label ) {
+
+    var button = new ToggleButton.with_label( label ) {
+      halign = Align.CENTER
+    };
+
+    button.clicked.connect(() => {
+      _selected = Utils.get_child_index( this, button );
+      changed( _selected );
+    });
+
+    var first = get_first_child();
+    if( first != null ) {
+      button.set_group( (ToggleButton)first );
+    } else {
+      button.active = true;
+    }
+
+    append( button );
+
+  }
+
 }

src/Preferences.vala

@@ -188,10 +188,6 @@ public class Preferences : Granite.Dialog {
     grid.attach( make_switch( "hide-themes-not-matching-visual-style" ), 1, row );
     row++;
 
-    grid.attach( make_label( _( "Compact sidebar width" ) ), 0, row );
-    grid.attach( make_switch( "compact-sidebar-width" ), 1, row );
-    row++;
-
     grid.attach( make_label( _( "Default theme" ) ), 0, row );
     grid.attach( make_themes(), 1, row, 2 );
     grid.attach( make_info( _( "Sets the default theme to use for newly created mindmaps (use Map sidebar panel to make immediate changes)." ) ), 3, row );

src/Utils.vala

@@ -505,7 +505,7 @@ public class Utils {
   //-------------------------------------------------------------
   // Causes the given switcher to adjust tab widths to be the same
   // based on the largest tab.
-  public static void set_switcher_tab_widths( StackSwitcher switcher ) {
+  public static void set_switcher_tab_widths( Widget switcher ) {
 
     Widget child;
     var    i = 0;