diff --git a/bin/mcc b/bin/mcc index eda9989..9f11402 100755 --- a/bin/mcc +++ b/bin/mcc @@ -54,21 +54,27 @@ case $LANG in CONKY_EDIT="Edytuj Conky" OPEN_CONKYDIR="Otwórz katalog ~/.config/conky" MENU_DESC="Główne menu (wywoływane przez: prawy klik, skrót win+spacja lub z ikony w panelu) umożliwia wyszukiwanie, należy po prostu zacząć pisać np. nazwę programu.\nDostępne są również dwa panele boczne, umożliwiające szybki dostęp np. do systemu plików.\nPoniżej możesz dodać swoje własne polecenia na początku i na końcu paneli bocznych." - 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\tPANEL LEWY (ctrl+super+left)" - M_RIGHT="\t\t\tPANEL PRAWY (ctrl+super+left)" + M_LEFT="PANEL LEWY" + M_LEFT_KEY="(ctrl+super+left)" + M_MAIN="MENU GŁÓWNE" + M_MAIN_KEY="(super)" + M_RIGHT="PANEL PRAWY" + M_RIGHT_KEY="(ctrl+super+left)" M_LEFT_DESC="Lewy panel\n - szybka nawigacja po systemie plików\n - zakładki GTK\n - maszyny wirtualne" M_RIGHT_DESC="Prawy panel\n - ustawienia systemowe\n - pomoc\n - wyjście" - M_CUSTOMIZE="Edytuj" - OWN_COMMANDS_TOP="własne komendy (Góra)" - OWN_COMMANDS_BOTTOM="własne komendy (Dół)" + M_CUSTOMIZE="Edytuj komendy:" + M_MORE="WIĘCEJ USTAWIEŃ..." + OWN_COMMANDS_TOP="(Góra)" + OWN_COMMANDS_BOTTOM="(Dół)" COMPOSITOR="Kompozytor" COMP_DESC="Menadżerem kompozycji w Maboxie jest Picom - fork Compton.\nSkrót klawiszowy do włączania/wyłączania menadżera kompozycji to (win+c)." COMP_GUI="Ustawienia" COMP_EDIT="Edytuj plik konfiguracyjny" COMP_RESTART="Restart" - COMP_TOGGLE="Włącz/Wyłącz (win+c)" + COMP_TOGGLE="Włącz/Wyłącz (win+p)" 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 ~/.config/conky " MENU_DESC="Menu principal (accede con clic derecho, teclas Super+barra de espacio o desde el ícono del panel) activa escribe sobre buscar. Sólo empieza a escribir el término que estas buscando.\nThere are also two side-panels available for quick access to file system locations for example. Below you can add custom commands to both side-panels." - 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\tPANEL IZQUIERDO (ctrl+super+left)" - M_RIGHT="\t\t\tPANEL DERECHO (ctrl+super+right)" + M_LEFT="PANEL IZQUIERDO" + M_LEFT_KEY="(ctrl+super+left)" + M_MAIN="MENU PRINCIPAL" + M_MAIN_KEY="(super)" + M_RIGHT="PANEL DERECHO" + M_RIGHT_KEY="(ctrl+super+right)" M_LEFT_DESC="Panel izquierdo\n - Navegacion veloz\n - Marcadores GTK\n - Máquinas Virtuales" M_RIGHT_DESC="Panel derecho\n - Configuración del sistema\n - ayuda\n - opciones de salida" - M_CUSTOMIZE="Ajustes" - OWN_COMMANDS_TOP="own commands (TOP)" - OWN_COMMANDS_BOTTOM="own commands (BOTTOM)" + M_CUSTOMIZE="Ajustes:" + M_MORE="MORE SETTINGS.." + OWN_COMMANDS_TOP="(TOP)" + OWN_COMMANDS_BOTTOM="(BOTTOM)" COMPOSITOR="Compositor gráfico" COMP_DESC="Picom 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 (win+c)" + COMP_TOGGLE="Activar/desactivar compositor (win+p)" 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 ~/.config/conky directory" MENU_DESC="Main menu (access it by right click, win+space shortcut or from panel icon) have type to search functionality. Just start to type what you looking for.\nThere are also two side-panels available for quick access to file system locations for example. Below you can add custom commands to both side-panels." - 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\tLEFT PANEL (ctrl+super+left)" - M_RIGHT="\t\t\tRIGHT PANEL (ctrl+super+right)" + M_LEFT="LEFT PANEL" + M_LEFT_KEY="(ctrl+super+left)" + M_MAIN="MAIN MENU" + M_MAIN_KEY="(super)" + M_RIGHT="RIGHT PANEL" + M_RIGHT_KEY="(ctrl+super+right)" M_LEFT_DESC="Left panel\n - quick navigation\n - GTK Bookmarks\n - Virtualbox machines" M_RIGHT_DESC="Right panel\n - system settings\n - help\n - exit options" - M_CUSTOMIZE="Customize" - OWN_COMMANDS_TOP="own commands (TOP)" - OWN_COMMANDS_BOTTOM="own commands (BOTTOM)" + M_CUSTOMIZE="Customize commands:" + M_MORE="MORE SETTINGS.." + OWN_COMMANDS_TOP="(TOP)" + OWN_COMMANDS_BOTTOM="(BOTTOM)" COMPOSITOR="Compositor" COMP_DESC="Picom is used as composite manager in Mabox" COMP_GUI="Settings" COMP_EDIT="Edit config file" COMP_RESTART="Restart" - COMP_TOGGLE="Toggle (win+c)" + COMP_TOGGLE="Toggle (win+p)" 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" "" \ diff --git a/bin/reload-gtk b/bin/reload-gtk new file mode 100755 index 0000000..1a5ad09 --- /dev/null +++ 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