mcc menu/panels improvments

2021-10-12 17:35:59 +02:00 · 2021-10-12 17:35:59 +02:00 · 113ad747d1
parent a9664b339a
commit 113ad747d1
2 changed files with 73 additions and 29 deletions
--- a/bin/mcc
+++ b/bin/mcc
@ -54,21 +54,27 @@ case $LANG in
        CONKY_EDIT="Edytuj Conky"
        OPEN_CONKYDIR="Otwórz katalog <i>~/.config/conky</i>"
        MENU_DESC="Główne menu (<small>wywoływane przez: prawy klik, skrót win+spacja lub z ikony w panelu</small>) umożliwia wyszukiwanie, należy po prostu zacząć pisać np. nazwę programu.\n<small><i>Dostępne są również dwa <b>panele boczne</b>, umożliwiające szybki dostęp np. do systemu plików.</i>\nPoniżej możesz dodać swoje własne polecenia na początku i na końcu paneli bocznych.</small>"
-        M_EDIT_MAIN="Edytuj główne menu (ulubione)"
+        M_EDIT_MAIN="Ulubione"
+        M_EDIT_MAIN_AFTER="Pod Aplikacjami"
        M_RESTORE_MAIN="Przywróć domyślne menu"
-        M_LEFT="\t\t\t<b>PANEL LEWY</b><small> (ctrl+super+left)</small>"
-        M_RIGHT="\t\t\t<b>PANEL PRAWY</b><small> (ctrl+super+left)</small>"
+        M_LEFT="<b>PANEL LEWY</b>"
+        M_LEFT_KEY="<small>(ctrl+super+left)</small>"
+        M_MAIN="<b>MENU GŁÓWNE</b>"
+        M_MAIN_KEY="<small>(super)</small>"
+        M_RIGHT="<b>PANEL PRAWY</b>"
+        M_RIGHT_KEY="<small>(ctrl+super+left)</small>"
        M_LEFT_DESC="<small>Lewy panel\n - szybka nawigacja po systemie plików\n - zakładki GTK\n - maszyny wirtualne</small>"
        M_RIGHT_DESC="<small>Prawy panel\n - ustawienia systemowe\n - pomoc\n - wyjście</small>"
-        M_CUSTOMIZE="Edytuj"
-        OWN_COMMANDS_TOP="własne komendy (Góra)"
-        OWN_COMMANDS_BOTTOM="własne komendy (Dół)"
+        M_CUSTOMIZE="<i>Edytuj komendy:</i>"
+        M_MORE="<b>WIĘCEJ USTAWIEŃ...</b>"
+        OWN_COMMANDS_TOP="(Góra)"
+        OWN_COMMANDS_BOTTOM="(Dół)"
        COMPOSITOR="Kompozytor"
        COMP_DESC="Menadżerem kompozycji w Maboxie jest <b>Picom</b> - fork Compton.\nSkrót klawiszowy do włączania/wyłączania menadżera kompozycji to (<b>win</b>+<b>c</b>)."
        COMP_GUI="Ustawienia"
        COMP_EDIT="Edytuj plik konfiguracyjny"
        COMP_RESTART="Restart"
-        COMP_TOGGLE="Włącz/Wyłącz (<b>win</b>+<b>c</b>)"
+        COMP_TOGGLE="Włącz/Wyłącz (<b>win</b>+<b>p</b>)"
        COMP_REMOVE="Usuń plik konfiguracyjny"
        COMP_DEFAULT="Przywróć domyślny plik konfiguracyjny"
        MT_MNGR="Menedżer Motywów Maboxa"
@ -118,21 +124,27 @@ case $LANG in
        CONKY_EDIT="Editar recuadro Conky"
        OPEN_CONKYDIR="Abrir la carpeta <i>~/.config/conky</i> "
        MENU_DESC="Menu principal (<small>accede con clic derecho, teclas Super+barra de espacio o desde el ícono del panel</small>) activa escribe sobre buscar. Sólo empieza a escribir el término que estas buscando.\n<small><i>There are also two <b>side-panels</b> available for quick access to file system locations for example.</i> Below you can add custom commands to both side-panels.</small>"
-        M_EDIT_MAIN="Editar menu principal"
+        M_EDIT_MAIN="Favoritos"
+        M_EDIT_MAIN_AFTER="Below Apps"
        M_RESTORE_MAIN="Reestablecer el menu por defecto"
-        M_LEFT="\t\t\t<b>PANEL IZQUIERDO</b><small> (ctrl+super+left)</small>"
-        M_RIGHT="\t\t\t<b>PANEL DERECHO</b><small> (ctrl+super+right)</small>"
+        M_LEFT="<b>PANEL IZQUIERDO</b>"
+        M_LEFT_KEY="<small>(ctrl+super+left)</small>"
+        M_MAIN="<b>MENU PRINCIPAL</b>"
+        M_MAIN_KEY="<small>(super)</small>"
+        M_RIGHT="<b>PANEL DERECHO</b>"
+        M_RIGHT_KEY="<small>(ctrl+super+right)</small>"
        M_LEFT_DESC="<small>Panel izquierdo\n - Navegacion veloz\n - Marcadores GTK\n - Máquinas Virtuales</small>"
        M_RIGHT_DESC="<small>Panel derecho\n - Configuración del sistema\n - ayuda\n - opciones de salida</small>"
-        M_CUSTOMIZE="Ajustes"
-        OWN_COMMANDS_TOP="own commands (TOP)"
-        OWN_COMMANDS_BOTTOM="own commands (BOTTOM)"
+        M_CUSTOMIZE="<i>Ajustes:</i>"
+        M_MORE="<b>MORE SETTINGS..</b>"
+        OWN_COMMANDS_TOP="(TOP)"
+        OWN_COMMANDS_BOTTOM="(BOTTOM)"
        COMPOSITOR="Compositor gráfico"
        COMP_DESC="<b>Picom</b> se usa como gestor gráfico en Mabox"
        COMP_GUI="Configuración"
        COMP_EDIT="Editar el archivo de configuración"
        COMP_RESTART="Reiniciar compositor gráfico"
-        COMP_TOGGLE="Activar/desactivar compositor (<b>win</b>+<b>c</b>)"
+        COMP_TOGGLE="Activar/desactivar compositor (<b>win</b>+<b>p</b>)"
        COMP_REMOVE="Eliminar archivo picom.conf"
        COMP_DEFAULT="Reestablecer compositor grafico por defecto"
        MT_MNGR="Gestor de Temas Mabox"
@ -182,21 +194,27 @@ case $LANG in
        CONKY_EDIT="Edit Conky"
        OPEN_CONKYDIR="Open <i>~/.config/conky</i> directory"
        MENU_DESC="Main menu (<small>access it by right click, win+space shortcut or from panel icon</small>) have type to search functionality. Just start to type what you looking for.\n<small><i>There are also two <b>side-panels</b> available for quick access to file system locations for example.</i> Below you can add custom commands to both side-panels.</small>"
-        M_EDIT_MAIN="Edit main menu (favorites)"
+        M_EDIT_MAIN="Edit Favorites"
+        M_EDIT_MAIN_AFTER="Edit below Apps"
        M_RESTORE_MAIN="Reset mainmenu to default"
-        M_LEFT="\t\t\t<b>LEFT PANEL</b><small> (ctrl+super+left)</small>"
-        M_RIGHT="\t\t\t<b>RIGHT PANEL</b><small> (ctrl+super+right)</small>"
+        M_LEFT="<b>LEFT PANEL</b>"
+        M_LEFT_KEY="<small>(ctrl+super+left)</small>"
+        M_MAIN="<b>MAIN MENU</b>"
+        M_MAIN_KEY="<small>(super)</small>"
+        M_RIGHT="<b>RIGHT PANEL</b>"
+        M_RIGHT_KEY="<small>(ctrl+super+right)</small>"
        M_LEFT_DESC="<small>Left panel\n - quick navigation\n - GTK Bookmarks\n - Virtualbox machines</small>"
        M_RIGHT_DESC="<small>Right panel\n - system settings\n - help\n - exit options</small>"
-        M_CUSTOMIZE="Customize"
-        OWN_COMMANDS_TOP="own commands (TOP)"
-        OWN_COMMANDS_BOTTOM="own commands (BOTTOM)"
+        M_CUSTOMIZE="<i>Customize commands:</i>"
+        M_MORE="<b>MORE SETTINGS..</b>"
+        OWN_COMMANDS_TOP="(TOP)"
+        OWN_COMMANDS_BOTTOM="(BOTTOM)"
        COMPOSITOR="Compositor"
        COMP_DESC="<b>Picom</b> is used as composite manager in Mabox"
        COMP_GUI="Settings"
        COMP_EDIT="Edit config file"
        COMP_RESTART="Restart"
-        COMP_TOGGLE="Toggle (<b>win</b>+<b>c</b>)"
+        COMP_TOGGLE="Toggle (<b>win</b>+<b>p</b>)"
        COMP_REMOVE="Remove picom.conf"
        COMP_DEFAULT="Reset to default"
        MT_MNGR="Mabox Theme Manager"
@ -297,15 +315,29 @@ yad --plug=$KEY --tabnum=6 --borders=10 \
 # TAB 7 MENU
 yad --plug=$KEY --tabnum=7 --borders=10 \
 --text="$MENU_DESC" --image=menu-editor \
--columns=2 --form \
+--columns=3 --form \
+--field="$M_LEFT:FBTN" "mb-jgtools places" \
+--field="$M_LEFT_KEY:LBL" "" \
+--field="$M_CUSTOMIZE:LBL" "" \
+--field="$OWN_COMMANDS_TOP:FBTN" "geany $HOME/.config/mabox/places-prepend.csv" \
+--field="$OWN_COMMANDS_BOTTOM:FBTN" "geany $HOME/.config/mabox/places-append.csv" \
+--field=":LBL" "" \
+--field=" :LBL" "" \
+--field=" :LBL" "" \
+--field="$M_MAIN:FBTN" "mb-jgtools main" \
+--field="$M_MAIN_KEY:LBL" "" \
+--field=" :LBL" "" \
 --field="$M_EDIT_MAIN:FBTN" "geany $HOME/.config/mabox/favorites.csv" \
--field="$M_LEFT:LBL" "" \
--field="$M_CUSTOMIZE $OWN_COMMANDS_TOP:FBTN" "geany $HOME/.config/mabox/places-prepend.csv" \
--field="$M_CUSTOMIZE $OWN_COMMANDS_BOTTOM:FBTN" "geany $HOME/.config/mabox/places-append.csv" \
--field="$M_RESTORE_MAIN:FBTN" "mb-restore-menu" \
--field="$M_RIGHT:LBL" "" \
--field="$M_CUSTOMIZE $OWN_COMMANDS_TOP:FBTN" "geany $HOME/.config/mabox/right-prepend.csv" \
--field="$M_CUSTOMIZE $OWN_COMMANDS_BOTTOM:FBTN" "geany $HOME/.config/mabox/right-append.csv" \
+--field="$M_EDIT_MAIN_AFTER:FBTN" "geany $HOME/.config/mabox/mainmenu_below_apps.csv" \
+--field=":LBL" "" \
+--field=" :LBL" "" \
+--field="$M_MORE:FBTN" "jgmenusettings-pipe -s" \
+--field="$M_RIGHT:FBTN" "mb-jgtools right" \
+--field="$M_RIGHT_KEY:LBL" "" \
+--field=" :LBL" "" \
+--field="$OWN_COMMANDS_TOP:FBTN" "geany $HOME/.config/mabox/right-prepend.csv" \
+--field="$OWN_COMMANDS_BOTTOM:FBTN" "geany $HOME/.config/mabox/right-append.csv" \
+--field=":LBL" "" \
 > $res7 &
 #--field="$M_LEFT_DESC:LBL" "" \
 #--field="$M_RIGHT_DESC:LBL" "" \
--- a/bin/reload-gtk
+++ b/bin/reload-gtk
@ -0,0 +1,12 @@
+#!/bin/bash
+mkdir -p $HOME/.config/xsettingsd
+
+gtk_theme="$(grep "^[^#]*gtk-theme-name" "${HOME}/.config/gtk-3.0/settings.ini")"
+gtk_theme="${gtk_theme/gtk-theme-name*=}"
+echo "Net/ThemeName \"$gtk_theme\"" > "$HOME/.config/xsettingsd/xsettingsd.conf"
+
+gtk_theme_icons="$(grep "^[^#]*gtk-icon-theme-name" "${HOME}/.config/gtk-3.0/settings.ini")"
+gtk_theme_icons="${gtk_theme_icons/gtk-icon-theme-name*=}"
+echo "Net/IconThemeName \"$gtk_theme_icons\"" >> "$HOME/.config/xsettingsd/xsettingsd.conf"
+
+bl-reload-gtk23