diff --git a/bin/mb-jgtools b/bin/mb-jgtools index c9d7dba..c7e4e32 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -47,7 +47,7 @@ case $jgmenu_theme in done < "$HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc" ;; *) - #export color_norm_fg="#FFFFFF " + export color_title_fg="#FFFFFF " while read -r a b c do [[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c" @@ -516,7 +516,7 @@ case $LANG in SYSINFO="System information" SHORTCUTS="Atajos del teclado" MENUPANELS="Menu/Paneles laterales" - SSH_CONN="SSH" + SSH_CONN="Conexiones SSH" ;; *) QUICK_NAV="Quick Navigation" @@ -527,7 +527,7 @@ case $LANG in SYSINFO="System information" SHORTCUTS="Keyboard shortcuts" MENUPANELS="Menu/Sidepanels settings" - SSH_CONN="SSH hosts" + SSH_CONN="SSH connections" ;; esac @@ -763,48 +763,6 @@ EOF jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null } -reset() { -case $LANG in - pl*) LNGDIR="pl";; - es*) LNGDIR="es";; - *) LNGDIR="en";; -esac -#echo "$LNGDIR $1" -case $1 in - all*) - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/settings* $HOME/.config/mabox/ - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/jgmenu/*.csv $HOME/.config/jgmenu/ - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/places* $HOME/.config/mabox/ - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/right* $HOME/.config/mabox/ - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/exit.csv $HOME/.config/mabox/ - ;; - main*) - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/jgmenu/*.csv $HOME/.config/jgmenu/ - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/favorites.csv $HOME/.config/mabox/ - - ;; - left*) - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/places* $HOME/.config/mabox/ - ;; - right*) - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/right* $HOME/.config/mabox/ - ;; - logout*) - rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/exit.csv $HOME/.config/mabox/ - ;; - themes*) - rsync -a /usr/share/mb-jgtools/jgobthemes/* $HOME/.config/mabox/jgobthemes/ - ;; - *) - echo dupa - ;; -esac -#mb-setvar places_softwarepipe=true -#mb-setvar places_sysinfopipe=true -#mb-setvar places_keyspipe=true -#mb-setvar places_menusettingspipe=true -} - #--------------------------------------------------------------------+ #Color picker, usage: printf $BLD$CUR$RED$BBLU'Hello World!'$DEF | #-------------------------+--------------------------------+---------+ @@ -840,7 +798,6 @@ case "$1" in settings) settings "$2";; screenshot) screenshot;; places) places;; - reset) reset "$2";; *) echo -e " ${GRN}Kolekcja narzędzi dla Mabox-a stworzonych z pomocą Jgmenu @@ -856,7 +813,6 @@ ${YLW} >${RED} right ${YLW} -${DEF} right panel ${YLW} >${RED} places ${YLW} -${DEF} places - left sidepanel ${YLW} >${RED} mblogout ${YLW} -${DEF} run logout script ${YLW} >${RED} screenshot ${YLW} -${DEF} run screenshot script -${YLW} >${RED} reset ${YLW} -${DEF} reset or update settings to (new) defaults " >&2 exit 1 ;; diff --git a/bin/mb-reset b/bin/mb-reset new file mode 100755 index 0000000..55edb2b --- /dev/null +++ b/bin/mb-reset @@ -0,0 +1,97 @@ +#!/bin/bash +# Daniel Napora 2021 +#: mb-reset - reset user config files to current defaults. It only affects files shipped with Mabox. +#: Usage: mb-reset option +#: +#: Options: +#: tint2 - overwrite tint2 panel configs in ~/.config/tint2/ +#: jgthemes - overwrite menu/sidepanels color schemes in ~/.config/mabox/jgobthemes/ +#: mainmenu - overwrite main menu files (favorites.csv) +#: leftpanel - left panel custom commands +#: rightpanel - right panel custom commands +#: logout - logout dialog +#: + +case $LANG in + pl*) LNGDIR="pl";; + es*) LNGDIR="es";; + *) LNGDIR="en";; +esac + +__usage() { + grep "^#:" $0 | while read DOC; do printf '%s\n' "${DOC###:}"; done + exit +} + +__allmenus() { +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/settings* $HOME/.config/mabox/ +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/jgmenu/*.csv $HOME/.config/jgmenu/ +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/places* $HOME/.config/mabox/ +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/right* $HOME/.config/mabox/ +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/exit.csv $HOME/.config/mabox/ +} + +__mainmenu() { +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/jgmenu/*.csv $HOME/.config/jgmenu/ +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/favorites.csv $HOME/.config/mabox/ +} + +__leftpanel() { +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/places* $HOME/.config/mabox/ +mb-setvar places_menusettingspipe=true +mb-setvar places_sysinfopipe=true +mb-setvar places_keyspipe=true +mb-setvar places_sshpipe=true +mb-setvar places_softwarepipe=true +} + +__rightpanel() { +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/right* $HOME/.config/mabox/ +} + +__logout() { +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/mabox/exit.csv $HOME/.config/mabox/ +} + +__tint2() { +rsync -a /usr/share/mabox/lang/$LNGDIR/.config/tint2/*.tint2rc $HOME/.config/tint2/ +killall -SIGUSR1 tint2 +} + +__jgthemes() { +rsync -a /usr/share/mb-jgtools/jgobthemes/* $HOME/.config/mabox/jgobthemes/ +} + +__conkies() { +echo "Not implemented yet" +} + +__maboxthemes() { +echo "Not implemented yet" +} + +__obrcxml() { +echo "Not implemented yet" +} + +__obautostart() { +echo "Not implemented yet" +} + +case "$1" in + "allmenus") __allmenus ;; + "mainmenu") __mainmenu ;; + "leftpanel") __leftpanel ;; + "rightpanel") __rightpanel ;; + "logout") __logout ;; + "tint2") __tint2 ;; + "jgthemes") __jgthemes ;; + "conkies") __conkies ;; + "maboxthemes") __maboxthemes ;; + "obrcxml") __obrcxml ;; + "obautostart") __obautostart ;; + "-h|--help") __usage ;; + *) __usage ;; +esac + +exit 0 diff --git a/mb-jgtools/jgobthemes/Dusk.colorrc b/mb-jgtools/jgobthemes/Dusk.colorrc new file mode 100644 index 0000000..dda1b4a --- /dev/null +++ b/mb-jgtools/jgobthemes/Dusk.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 0 +sep_halign = right +menu_gradient_pos=top_right +color_menu_bg = #FD746C 90 +color_menu_bg_to = #2C3E50 90 +color_menu_border = #2C3E50 100 +color_norm_bg = #FD746C#222222 0 +color_norm_fg = #222222 100 +color_sel_bg = #222222 60 +color_sel_fg = #DDDDDD 90 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #222222 30 +color_title_fg = #DDDDDD 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/Firewatch.colorrc b/mb-jgtools/jgobthemes/Firewatch.colorrc new file mode 100644 index 0000000..8b41569 --- /dev/null +++ b/mb-jgtools/jgobthemes/Firewatch.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 0 +sep_halign = right +menu_gradient_pos=left +color_menu_bg = #cb2d3e 90 +color_menu_bg_to = #ef473a 90 +color_menu_border = #ef473a 90 +color_norm_bg = #222222 0 +color_norm_fg = #222222 100 +color_sel_bg = #222222 60 +color_sel_fg = #DDDDDD 90 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #222222 30 +color_title_fg = #DDDDDD 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/Influenza.colorrc b/mb-jgtools/jgobthemes/Influenza.colorrc new file mode 100644 index 0000000..9b808c5 --- /dev/null +++ b/mb-jgtools/jgobthemes/Influenza.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=top_right +color_menu_bg = #C04848 90 +color_menu_bg_to = #480048 100 +color_menu_border = #480048 100 +color_norm_bg = #222222 0 +color_norm_fg = #DDDDDD 100 +color_sel_bg = #DDDDDD 100 +color_sel_fg = #222222 100 +color_sel_border = #222222 30 +color_sep_fg = #222222 40 +color_title_bg = #DDDDDD 30 +color_title_fg = #222222 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/LightOrange.colorrc b/mb-jgtools/jgobthemes/LightOrange.colorrc new file mode 100644 index 0000000..099c052 --- /dev/null +++ b/mb-jgtools/jgobthemes/LightOrange.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 0 +sep_halign = right +menu_gradient_pos=bottom_left +color_menu_bg = #FFB75E 90 +color_menu_bg_to = #ED8F03 90 +color_menu_border = #ED8F03 100 +color_norm_bg = #222222 0 +color_norm_fg = #222222 100 +color_sel_bg = #222222 60 +color_sel_fg = #DDDDDD 90 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #222222 30 +color_title_fg = #DDDDDD 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/Lush.colorrc b/mb-jgtools/jgobthemes/Lush.colorrc new file mode 100644 index 0000000..a170ddf --- /dev/null +++ b/mb-jgtools/jgobthemes/Lush.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 0 +sep_halign = right +menu_gradient_pos=top +color_menu_bg = #56ab2f 90 +color_menu_bg_to = #a8e063 90 +color_menu_border = #a8e063 100 +color_norm_bg = #222222 0 +color_norm_fg = #222222 100 +color_sel_bg = #222222 60 +color_sel_fg = #DDDDDD 90 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #222222 30 +color_title_fg = #DDDDDD 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/Mauve.colorrc b/mb-jgtools/jgobthemes/Mauve.colorrc new file mode 100644 index 0000000..682a190 --- /dev/null +++ b/mb-jgtools/jgobthemes/Mauve.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=bottom +color_menu_bg = #42275a 90 +color_menu_bg_to = #734b6d 90 +color_menu_border = #734b6d 100 +color_norm_bg = #222222 0 +color_norm_fg = #DDDDDD 100 +color_sel_bg = #DDDDDD 50 +color_sel_fg = #222222 100 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #DDDDDD 30 +color_title_fg = #222222 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/Mirage.colorrc b/mb-jgtools/jgobthemes/Mirage.colorrc new file mode 100644 index 0000000..6dad0e1 --- /dev/null +++ b/mb-jgtools/jgobthemes/Mirage.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=top_right +color_menu_bg = #16222A 90 +color_menu_bg_to = #3A6073 100 +color_menu_border = #3A6073 100 +color_norm_bg = #222222 0 +color_norm_fg = #CCCCCC 100 +color_sel_bg = #16222A 100 +color_sel_fg = #FFFFFF 100 +color_sel_border = #222222 30 +color_sep_fg = #3A6073 60 +color_title_bg = #3A6073 60 +color_title_fg = #FFFFFF 100 +color_title_border = #3A6073 100 diff --git a/mb-jgtools/jgobthemes/Nord.colorrc b/mb-jgtools/jgobthemes/Nord.colorrc index 2c16973..a18302c 100644 --- a/mb-jgtools/jgobthemes/Nord.colorrc +++ b/mb-jgtools/jgobthemes/Nord.colorrc @@ -1,17 +1,18 @@ item_radius = 1 -item_border = 1 +item_border = 0 sep_height = 5 sep_halign = right -menu_gradient_pos=top +menu_gradient_pos=left color_menu_bg = #2E3440 80 -color_menu_bg_to = #2E3440 100 +color_menu_bg_to = #4C566A 90 color_menu_border = #4C566A 100 color_norm_bg = #2E3440 0 -color_norm_fg = #8FBCBB 100 -color_sel_bg = #2E3440 30 -color_sel_fg = #D8DEE9 100 +color_norm_fg = #81A1C1 100 +#color_sel_bg = #2E3440 100 +color_sel_bg = #3B4252 100 +color_sel_fg = #E5E9F0 100 color_sel_border = #4C566A 30 -color_sep_fg = #4C566A 20 -color_title_bg = #4C566A 20 -color_title_fg = #5E81AC 100 +color_sep_fg = #4C566A 40 +color_title_bg = #4C566A 100 +color_title_fg = #D8DEE9 100 color_title_border = #4C566A 30 diff --git a/mb-jgtools/jgobthemes/PinotNoir.colorrc b/mb-jgtools/jgobthemes/PinotNoir.colorrc new file mode 100644 index 0000000..cba788f --- /dev/null +++ b/mb-jgtools/jgobthemes/PinotNoir.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=bottom +color_menu_bg = #4b6cb7 90 +color_menu_bg_to = #182848 100 +color_menu_border = #182848 100 +color_norm_bg = #222222 0 +color_norm_fg = #DDDDDD 90 +color_sel_bg = #182848 100 +color_sel_fg = #FFFFFF 100 +color_sel_border = #222222 30 +color_sep_fg = #DDDDDD 10 +color_title_bg = #DDDDDD 30 +color_title_fg = #222222 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/ServQuick.colorrc b/mb-jgtools/jgobthemes/ServQuick.colorrc new file mode 100644 index 0000000..8b0c891 --- /dev/null +++ b/mb-jgtools/jgobthemes/ServQuick.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=left +color_menu_bg = #485563 90 +color_menu_bg_to = #29323C 90 +color_menu_border = #29323C 100 +color_norm_bg = #222222 0 +color_norm_fg = #DDDDDD 100 +color_sel_bg = #DDDDDD 50 +color_sel_fg = #222222 100 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #DDDDDD 30 +color_title_fg = #222222 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/Sherbert.colorrc b/mb-jgtools/jgobthemes/Sherbert.colorrc new file mode 100644 index 0000000..ee25655 --- /dev/null +++ b/mb-jgtools/jgobthemes/Sherbert.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 0 +sep_halign = right +menu_gradient_pos=bottom_left +color_menu_bg = #f79d00 90 +color_menu_bg_to = #64f38c 90 +color_menu_border = #64f38c 90 +color_norm_bg = #222222 0 +color_norm_fg = #222222 100 +color_sel_bg = #222222 60 +color_sel_fg = #DDDDDD 90 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #222222 30 +color_title_fg = #DDDDDD 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/TheStrain.colorrc b/mb-jgtools/jgobthemes/TheStrain.colorrc new file mode 100644 index 0000000..9dd8de9 --- /dev/null +++ b/mb-jgtools/jgobthemes/TheStrain.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=top +color_menu_bg = #870000 100 +color_menu_bg_to = #190A05 90 +color_menu_border = #870000 100 +color_norm_bg = #222222 0 +color_norm_fg = #DDDDDD 100 +color_sel_bg = #222222 50 +color_sel_fg = #FFFFFF 100 +color_sel_border = #FFFFFF 30 +color_sep_fg = #222222 40 +color_title_bg = #000000 30 +color_title_fg = #DDDDDD 50 +color_title_border = #000000 0 diff --git a/mb-jgtools/jgobthemes/Titanum.colorrc b/mb-jgtools/jgobthemes/Titanum.colorrc new file mode 100644 index 0000000..b0533dd --- /dev/null +++ b/mb-jgtools/jgobthemes/Titanum.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=bottom_left +color_menu_bg = #283048 100 +color_menu_bg_to = #859398 90 +color_menu_border = #283048 100 +color_norm_bg = #222222 0 +color_norm_fg = #DDDDDD 100 +color_sel_bg = #DDDDDD 100 +color_sel_fg = #222222 100 +color_sel_border = #222222 30 +color_sep_fg = #222222 40 +color_title_bg = #DDDDDD 30 +color_title_fg = #222222 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/Virgin.colorrc b/mb-jgtools/jgobthemes/Virgin.colorrc new file mode 100644 index 0000000..287bfda --- /dev/null +++ b/mb-jgtools/jgobthemes/Virgin.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 0 +sep_halign = right +menu_gradient_pos=top +color_menu_bg = #C9FFBF 90 +color_menu_bg_to = #FFAFBD 100 +color_menu_border = #FFAFBD 100 +color_norm_bg = #222222 0 +color_norm_fg = #222222 100 +color_sel_bg = #222222 60 +color_sel_fg = #DDDDDD 90 +color_sel_border = #DDDDDD 30 +color_sep_fg = #222222 40 +color_title_bg = #222222 30 +color_title_fg = #DDDDDD 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/base-text-dark.colorrc b/mb-jgtools/jgobthemes/base-text-dark.colorrc new file mode 100644 index 0000000..a5d37e2 --- /dev/null +++ b/mb-jgtools/jgobthemes/base-text-dark.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 0 +sep_halign = right +menu_gradient_pos=bottom_left +color_menu_bg = #DDDDDD 90 +color_menu_bg_to = #444444 90 +color_menu_border = #222222 100 +color_norm_bg = #222222 0 +color_norm_fg = #222222 100 +color_sel_bg = #222222 60 +color_sel_fg = #DDDDDD 90 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #222222 30 +color_title_fg = #DDDDDD 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/base-text-light.colorrc b/mb-jgtools/jgobthemes/base-text-light.colorrc new file mode 100644 index 0000000..37f49c0 --- /dev/null +++ b/mb-jgtools/jgobthemes/base-text-light.colorrc @@ -0,0 +1,17 @@ +item_radius = 2 +item_border = 1 +sep_height = 5 +sep_halign = right +menu_gradient_pos=top_right +color_menu_bg = #999999 90 +color_menu_bg_to = #222222 90 +color_menu_border = #222222 100 +color_norm_bg = #222222 0 +color_norm_fg = #DDDDDD 100 +color_sel_bg = #DDDDDD 50 +color_sel_fg = #222222 100 +color_sel_border = #222222 50 +color_sep_fg = #222222 40 +color_title_bg = #DDDDDD 30 +color_title_fg = #222222 100 +color_title_border = #222222 30 diff --git a/mb-jgtools/jgobthemes/gradient001.colorrc b/mb-jgtools/jgobthemes/gradient001.colorrc new file mode 100644 index 0000000..1281a06 --- /dev/null +++ b/mb-jgtools/jgobthemes/gradient001.colorrc @@ -0,0 +1,18 @@ +menu_border = 0 +item_radius = 8 +item_border = 1 +sep_height = 1 +sep_halign = Right +menu_gradient_pos=right +color_menu_bg = #00b09b 85 +color_menu_bg_to = #96c93d 85 +color_menu_border = #2c2c2c 100 +#color_norm_bg = #2b303b 0 +color_norm_fg = #222222 100 +color_sel_bg = #cccccc 90 +color_sel_fg = #000000 100 +color_sel_border = #169f6f 40 +color_sep_fg = #2A3833 40 +color_title_bg = #264D3F 100 +color_title_fg = #e9e9e9 100 +color_title_border = #169f6f 100 diff --git a/mb-jgtools/jgobthemes/transparent-text-light.colorrc b/mb-jgtools/jgobthemes/transparent-text-light.colorrc new file mode 100644 index 0000000..3ce5806 --- /dev/null +++ b/mb-jgtools/jgobthemes/transparent-text-light.colorrc @@ -0,0 +1,17 @@ +item_radius = 4 +item_border = 1 +sep_height = 1 +sep_halign = right +menu_gradient_pos=none +color_menu_bg = #999999 0 +color_menu_bg_to = #222222 90 +color_menu_border = #222222 0 +color_norm_bg = #222222 60 +color_norm_fg = #DDDDDD 100 +color_sel_bg = #DDDDDD 100 +color_sel_fg = #222222 100 +color_sel_border = #222222 30 +color_sep_fg = #222222 40 +color_title_bg = #666600 90 +color_title_fg = #222222 100 +color_title_border = #222222 30