Change sidebar in theme to mode-switcher.

Fixes: #930
2019-03-19 22:45:10 +01:00 · 2019-03-19 22:45:10 +01:00 · 6fffe427c4
parent beeb9c8b27
commit 6fffe427c4
28 changed files with 201 additions and 676 deletions
--- a/doc/default_theme.rasi
+++ b/doc/default_theme.rasi
@ -103,7 +103,7 @@ scrollbar {
    handle-width: 8px ;
    padding:      0;
 }
-sidebar {
+mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: var(separatorcolor);
 }
--- a/doc/old-theme-convert-output.rasi
+++ b/doc/old-theme-convert-output.rasi
@ -103,7 +103,7 @@ scrollbar {
    handle-width: 8px ;
    padding:      0;
 }
-sidebar {
+mode-switcher {
    border:       2px 0px 0px ;
    border-color: var(separatorcolor);
 }
--- a/doc/rofi-theme.5
+++ b/doc/rofi-theme.5
--- a/doc/rofi-theme.5.markdown
+++ b/doc/rofi-theme.5.markdown
@ -512,7 +512,7 @@ The current widgets available in **rofi**:
    * `listview`: The listview.
       * `scrollbar`: the listview scrollbar
       * `element`: the entries in the listview
-    * `sidebar`: the main horizontal @box packing the buttons.
+    * `mode-switcher`: the main horizontal @box packing the buttons.
      * `button`: the buttons @textbox for each mode
    * `message`: The container holding the textbox.
      * `textbox`: the message textbox
@ -700,7 +700,7 @@ The current layout of **rofi** is structured as follows:
 | | |-----------------------------------------------------------------------------|  |
 | |                                                                               |  |
 | | |---------------------------------------------------------------------------| |  |
-| | |  sidebar {BOX:horizontal}                                                 | |  |
+| | |  mode-switcher {BOX:horizontal}                                           | |  |
 | | | |---------------|   |---------------|  |--------------| |---------------| | |  |
 | | | | Button        |   | Button        |  | Button       | | Button        | | |  |
 | | | |---------------|   |---------------|  |--------------| |---------------| | |  |
@ -739,13 +739,13 @@ The following widgets are fixed, as they provide core **rofi** functionality:
 * case-indicator
 * message
 * listview
- * sidebar
+ * mode-switcher

 The following keywords are defined and can be used to automatically pack a subset of the widgets.
 These are used in the default theme as depicted in the figure above.

 * mainbox
-   Packs: `inputbar, message, listview, sidebar`
+   Packs: `inputbar, message, listview, mode-switcher`
 * inputbar
   Packs: `prompt,entry,case-indicator`

--- a/include/keyb.h
+++ b/include/keyb.h
@ -48,8 +48,8 @@ typedef enum
 #define SCOPE_MIN_FIXED    SCOPE_MOUSE_EDITBOX
    SCOPE_MOUSE_EDITBOX,
    SCOPE_MOUSE_SCROLLBAR,
-    SCOPE_MOUSE_SIDEBAR_MODI,
-#define SCOPE_MAX_FIXED    SCOPE_MOUSE_SIDEBAR_MODI
+    SCOPE_MOUSE_MODE_SWITCHER,
+#define SCOPE_MAX_FIXED    SCOPE_MOUSE_MODE_SWITCHER
 } BindingsScope;

 /**
--- a/include/widgets/widget.h
+++ b/include/widgets/widget.h
@ -65,8 +65,8 @@ typedef enum
    WIDGET_TYPE_EDITBOX          = SCOPE_MOUSE_EDITBOX,
    /** The listview scrollbar */
    WIDGET_TYPE_SCROLLBAR        = SCOPE_MOUSE_SCROLLBAR,
-    /** A tab in the modi sidebar */
-    WIDGET_TYPE_SIDEBAR_MODI     = SCOPE_MOUSE_SIDEBAR_MODI,
+    /** A widget allowing user to swithc between modi */
+    WIDGET_TYPE_MODE_SWITCHER    = SCOPE_MOUSE_MODE_SWITCHER,
    /** Text-only textbox */
    WIDGET_TYPE_TEXTBOX_TEXT,
 } WidgetType;
--- a/source/theme.c
+++ b/source/theme.c
@ -897,7 +897,7 @@ void rofi_theme_convert_old ( void )
        if ( g_strcmp0 ( config.separator_style, "none" ) == 0 ) {
            const char *const str = "#listview { border: 0px; }";
            rofi_theme_parse_string ( str );
-            const char *const str2 = "#sidebar { border: 0px; }";
+            const char *const str2 = "#mode-switcher { border: 0px; }";
            rofi_theme_parse_string ( str2 );
            const char *const str3 = "#message { border: 0px; }";
            rofi_theme_parse_string ( str3 );
@ -905,7 +905,7 @@ void rofi_theme_convert_old ( void )
        else if  ( g_strcmp0 ( config.separator_style, "solid" ) == 0 ) {
            const char *const str = "#listview { border: 2px solid 0px 0px 0px; }";
            rofi_theme_parse_string ( str );
-            const char *const str2 = "#sidebar { border: 2px solid 0px 0px 0px; }";
+            const char *const str2 = "#mode-switcher { border: 2px solid 0px 0px 0px; }";
            rofi_theme_parse_string ( str2 );
            const char *const str3 = "#message { border: 2px solid 0px 0px 0px; }";
            rofi_theme_parse_string ( str3 );
--- a/source/view.c
+++ b/source/view.c
@ -1366,7 +1366,7 @@ gboolean rofi_view_trigger_action ( RofiViewState *state, BindingsScope scope, g
    case SCOPE_MOUSE_LISTVIEW_ELEMENT:
    case SCOPE_MOUSE_EDITBOX:
    case SCOPE_MOUSE_SCROLLBAR:
-    case SCOPE_MOUSE_SIDEBAR_MODI:
+    case SCOPE_MOUSE_MODE_SWITCHER:
    {
        gint   x = state->mouse.x, y = state->mouse.y;
        widget *target = widget_find_mouse_target ( WIDGET ( state->main_window ), scope, x, y );
@ -1556,7 +1556,7 @@ static void rofi_view_add_widget ( RofiViewState *state, widget *parent_widget,
        wid = (widget *) box_create ( parent_widget, name, ROFI_ORIENTATION_VERTICAL );
        box_add ( (box *) parent_widget, WIDGET ( wid ), TRUE );
        if ( config.sidebar_mode ) {
-            defaults = "inputbar,message,listview,sidebar";
+            defaults = "inputbar,message,listview,mode-switcher";
        } else {
            defaults = "inputbar,message,listview";
        }
@ -1644,11 +1644,11 @@ static void rofi_view_add_widget ( RofiViewState *state, widget *parent_widget,
        listview_set_max_lines ( state->list_view, state->num_lines );
    }
    /**
-     * SIDEBAR
+     * MODE SWITCHER
     */
-    else if ( strcmp ( name, "sidebar" ) == 0 ) {
+    else if ( strcmp ( name, "mode-switcher" ) == 0 ) {
        if ( state->sidebar_bar != NULL ) {
-            g_error ( "Sidebar widget can only be added once to the layout." );
+            g_error ( "Mode-switcher can only be added once to the layout." );
            return;
        }
        state->sidebar_bar = box_create ( parent_widget, name, ROFI_ORIENTATION_HORIZONTAL );
@ -1657,7 +1657,7 @@ static void rofi_view_add_widget ( RofiViewState *state, widget *parent_widget,
        state->modi     = g_malloc0 ( state->num_modi * sizeof ( textbox * ) );
        for ( unsigned int j = 0; j < state->num_modi; j++ ) {
            const Mode * mode = rofi_get_mode ( j );
-            state->modi[j] = textbox_create ( WIDGET ( state->sidebar_bar ), WIDGET_TYPE_SIDEBAR_MODI, "button", TB_AUTOHEIGHT, ( mode == state->sw ) ? HIGHLIGHT : NORMAL,
+            state->modi[j] = textbox_create ( WIDGET ( state->sidebar_bar ), WIDGET_TYPE_MODE_SWITCHER, "button", TB_AUTOHEIGHT, ( mode == state->sw ) ? HIGHLIGHT : NORMAL,
                    mode_get_display_name ( mode  ), 0.5, 0.5 );
            box_add ( state->sidebar_bar, WIDGET ( state->modi[j] ), TRUE );
            widget_set_trigger_action_handler ( WIDGET ( state->modi[j] ), textbox_sidebar_modi_trigger_action, state );
--- a/themes/Adapta-Nokto.rasi
+++ b/themes/Adapta-Nokto.rasi
@ -107,7 +107,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/Arc-Dark.rasi
+++ b/themes/Arc-Dark.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/Arc.rasi
+++ b/themes/Arc.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/DarkBlue.rasi
+++ b/themes/DarkBlue.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/Indego.rasi
+++ b/themes/Indego.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/Monokai.rasi
+++ b/themes/Monokai.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/Paper.rasi
+++ b/themes/Paper.rasi
@ -105,7 +105,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/Pop-Dark.rasi
+++ b/themes/Pop-Dark.rasi
@ -96,7 +96,7 @@
    text-color: @alternate-active-foreground;
    background-color: @alternate-active-background;
 }
-#sidebar {
+#mode-switcher {
    border: 1px dash 0px 0px ;
 }
 #button selected {
--- a/themes/android_notification.rasi
+++ b/themes/android_notification.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/arthur.rasi
+++ b/themes/arthur.rasi
@ -149,13 +149,13 @@

 #vertb {
    expand: false;
-    children: [ dummy0, sidebar, dummy1  ];
+    children: [ dummy0, mode-switcher, dummy1  ];
 }
 #dummy0,  dummy1 {
    expand: true;
 }

-#sidebar {
+#mode-switcher {
    expand: false;
    orientation: vertical;
    spacing: 0px;
--- a/themes/blue.rasi
+++ b/themes/blue.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/c64.rasi
+++ b/themes/c64.rasi
@ -109,7 +109,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/glue_pro_blue.rasi
+++ b/themes/glue_pro_blue.rasi
@ -105,7 +105,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/gruvbox-common.rasi
+++ b/themes/gruvbox-common.rasi
@ -94,7 +94,7 @@ scrollbar {
    padding:      0;
 }

-sidebar {
+mode-switcher {
    border:       2px 0 0;
    border-color: @separatorcolor;
 }
--- a/themes/lb.rasi
+++ b/themes/lb.rasi
@ -106,7 +106,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/paper-float.rasi
+++ b/themes/paper-float.rasi
@ -106,7 +106,7 @@
    background-color: #F5F5F500;
 }

-#sidebar {
+#mode-switcher {
    border: 2px;
    padding: 0.5em 1em;
    background-color: @grey;
--- a/themes/purple.rasi
+++ b/themes/purple.rasi
@ -105,7 +105,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/sidebar.rasi
+++ b/themes/sidebar.rasi
@ -50,7 +50,7 @@
    text-color: @lightwhite;
 }

-#sidebar {
+#mode-switcher {
    border: 2px 0px 0px 0px;
    background-color: @lightblack;
    padding: 4px;
--- a/themes/solarized.rasi
+++ b/themes/solarized.rasi
@ -105,7 +105,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }
--- a/themes/solarized_alternate.rasi
+++ b/themes/solarized_alternate.rasi
@ -105,7 +105,7 @@
    handle-width: 8px ;
    padding:      0;
 }
-#sidebar {
+#mode-switcher {
    border:       2px dash 0px 0px ;
    border-color: @separatorcolor;
 }