diff --git a/bin/mb-obthemes b/bin/mb-obthemes
index abd6965..910bb02 100755
--- a/bin/mb-obthemes
+++ b/bin/mb-obthemes
@@ -600,6 +600,7 @@ function getOBname(){ # get OB theme name
if [[ "$OBTHEME" == "MBcolors" ]];then
mkdir -p $CONFIGDIR/MBcolors
cp -a ~/.themes/MBcolors/openbox-3/* $CONFIGDIR/MBcolors/
+ cp -a ~/.config/mabox/jgobthemes/MBcolors.colorrc $CONFIGDIR
fi
theme.sh -l|tail -n1 > "$CONFIGDIR/terminal_theme"
}
@@ -812,6 +813,7 @@ function restoreOBrc(){
MBCOLORS="$1/MBcolors"
if [[ -d "$MBCOLORS" ]];then
cp -a $MBCOLORS/* ~/.themes/MBcolors/openbox-3/
+ cp -a MBcolors.colorrc ~/.config/mabox/jgobthemes/
fi
TERMINAL_THEME="$1/terminal_theme"
if [[ -f "$TERMINAL_THEME" ]];then
diff --git a/bin/mcc b/bin/mcc
index 203ced9..d6c7521 100755
--- a/bin/mcc
+++ b/bin/mcc
@@ -31,7 +31,7 @@ case $LANG in
MENU="Menu i Panele"
THEMES="Motywy"
HELP="Pomoc"
- HELP_TXT="Visit Mabox Linux Manual to learn more about Mabox. \nDo you have questions? Want to get involved?\nTake a look at our: official website, forum, blog\n \nMabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small donation \nThank you for choosing to use Mabox Linux!"
+ HELP_TXT="Visit Mabox Linux Manual to learn more about Mabox. \nDo you have questions? Want to get involved?\nTake a look at our: official website, forum, blog\n \nMabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small donation \nThank you for choosing to use Mabox Linux!"
SYSTEM_DESC="Ustawienia oraz informacje systemowe i sprzętowe"
MONITORS="Monitor(y)"
SOFTWARE_DESC="Aktualizacja - Instalacja Programów - Preferowane programy\n"
@@ -43,7 +43,7 @@ case $LANG in
LOOK_DESC="Narzędzia do konfiguracji wyglądu\n"
EDIT_FILE="Edytuj plik"
TINT_DESC="Konfigurator paneli tint2\nTutaj możesz wybrać konfigurację panelu Tint2.\nW Maboxie dostępne są różne konfiguracje panelu tint2, możesz również dodać własne do katalogu ~/.config/tint2."
- T_CONF="Konfiguruj panel:"
+ T_CONF="Konfiguruj panel"
T_CHOOSE="Wybierz tint2!!Możesz uruchomić kilka paneli"
T_RESTART="Restartuj panel(e)"
T_LAUNCHERS="Dodaj/usuń programy do panelu"
@@ -101,7 +101,7 @@ case $LANG in
MENU="Menú y Paneles"
THEMES="Temas"
HELP="Help"
- HELP_TXT="Visit Mabox Linux Manual to learn more about Mabox. \nDo you have questions? Want to get involved?\nTake a look at our: official website, forum, blog\n \nMabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small donation \nThank you for choosing to use Mabox Linux!"
+ HELP_TXT="Visit Mabox Linux Manual to learn more about Mabox. \nDo you have questions? Want to get involved?\nTake a look at our: official website, forum, blog\n \nMabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small donation \nThank you for choosing to use Mabox Linux!"
SYSTEM_DESC="Ajustes e información del sistema y de hardware"
MONITORS="Monitor(es)"
SOFTWARE_DESC="Instalación y actualización de programas - Aplicaciones preferidas.\n"
@@ -113,7 +113,7 @@ case $LANG in
LOOK_DESC="Configurar la apariencia de tu escritorio.\n"
EDIT_FILE="Editar el archivo"
TINT_DESC="Configurador de paneles Tint2\nAquí puede elegir los ajustes para los paneles.\nExisten varios ajustes predefinidos en Mabox, y además puede agregar nuevos en este directorio ~/.config/tint2 ."
- T_CONF="Configurar panel:"
+ T_CONF="Configurar panel"
T_CHOOSE="Elija un panel tint2!!Puede ejecutar varios paneles de inmediato"
T_RESTART="Reiniciar panel tint2"
T_LAUNCHERS="Add/remove launchers..."
@@ -171,7 +171,7 @@ case $LANG in
MENU="Menu/Panels"
THEMES="Themes"
HELP="Help"
- HELP_TXT="Visit Mabox Linux Manual to learn more about Mabox. \nDo you have questions? Want to get involved?\nTake a look at our: official website, forum, blog\n \nMabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small donation \nThank you for choosing to use Mabox Linux!"
+ HELP_TXT="Visit Mabox Linux Manual to learn more about Mabox. \nDo you have questions? Want to get involved?\nTake a look at our: official website, forum, blog\n \nMabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small donation \nThank you for choosing to use Mabox Linux!"
SYSTEM_DESC="System and Hardware settings and information"
MONITORS="Monitor(s)"
SOFTWARE_DESC="Software installation and update - Preferred Applications.\n"
@@ -183,7 +183,7 @@ case $LANG in
LOOK_DESC="Customize Look and Feel of your desktop.\n"
EDIT_FILE="Edit file"
TINT_DESC="Tint2 panels Configurator\nHere you can choose Tint2 panel(s) configuration.\nThere are some predefined configurations in Mabox, you can also add your own to ~/.config/tint2 directory."
- T_CONF="Configure panel:"
+ T_CONF="Configure panel"
T_CHOOSE="Choose tint2!!You can run several tint2 panels at once"
T_RESTART="Restart tint2"
T_LAUNCHERS="Add/remove launchers..."
@@ -222,14 +222,14 @@ case $LANG in
;;
esac
-if [ "$(pidof tint2)" ];then
- while read -r pid cmd; do
- if [[ ${cmd%% *} = tint2 ]]; then
- TINT=${cmd##* }
- TINT2FILE=${TINT#$HOME/.config/tint2/}
- fi
- done < <(pgrep -a tint2|head -n 1)
-fi
+#if [ "$(pidof tint2)" ];then
+# while read -r pid cmd; do
+# if [[ ${cmd%% *} = tint2 ]]; then
+# TINT=${cmd##* }
+# TINT2FILE=${TINT#$HOME/.config/tint2/}
+# fi
+# done < <(pgrep -a tint2|head -n 1)
+#fi
maindialog () {
@@ -295,7 +295,7 @@ yad --plug=$KEY --tabnum=5 --borders=10 \
--text="$TINT_DESC" --image=tint2conf \
--columns=1 --form \
--field="$T_CHOOSE:FBTN" "mb-tint2-manager" \
---field="$T_CONF $TINT2FILE:FBTN" "tint2conf $TINT" \
+--field="$T_CONF:FBTN" "jgtint2-pipe -s" \
--field="$T_RESTART:FBTN" "mb-tint2restart" \
--field="$T_LAUNCHERS:FBTN" "jgtint2launcher" \
--field=":LBL" "" \
diff --git a/bin/mwelcome b/bin/mwelcome
index 02d6af8..36234c7 100755
--- a/bin/mwelcome
+++ b/bin/mwelcome
@@ -124,10 +124,9 @@ values=($(yad --window-icon=distributor-logo-mabox --center --buttons-layout="e
--field=" :LBL" ""\
--field="$PROJECT:LBL" ""\
--field="$DEVELOPMENT" "exo-open --launch WebBrowser git.maboxlinux.org/Mabox"\
- --field="$IRC" "hexchat"\
- --field="$DONATE" "exo-open --launch WebBrowser https://maboxlinux.org/donate"\
+ --field="$DONATE" "exo-open --launch WebBrowser https://ko-fi.com/maboxlinux"\
--field="$LAUNCH_AT_START" "$show_welcome" \
- --button=" FB":"$FB" --button="輸 YT":"exo-open --launch WebBrowser www.youtube.com/channel/UCuiznSWZXPCnkRKjNfWwF5Q" --button=$CLOSE:0))
+ --button=" FB":"$FB" --button="輸 YT":"exo-open --launch WebBrowser www.youtube.com/channel/UCuiznSWZXPCnkRKjNfWwF5Q" --button=$CLOSE:0))
#if [ $? -eq 0 ]; then
while IFS='|' read -ra ADDR; do
@@ -143,3 +142,4 @@ case $VAL in
esac
exit
+ #--field="$IRC" "hexchat" \
diff --git a/mcc/appearance/colorizer.desktop b/mcc/appearance/colorizer.desktop
new file mode 100644
index 0000000..8451c42
--- /dev/null
+++ b/mcc/appearance/colorizer.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Colorizer
+Comment=Mabox Colorizer
+Keywords=
+StartupNotify=false
+Icon=colorizer
+TryExec=colorizer -s
+Exec=colorizer -s
+Categories=Settings;
+#NoDisplay=true