diff --git a/bin/mabox-logo b/bin/mabox-logo
index 4ef7a5b..6db5165 100755
--- a/bin/mabox-logo
+++ b/bin/mabox-logo
@@ -63,6 +63,7 @@ mb-setvar logo_in_color=$in_color
mb-setvar logo_out_color=$out_color
mb-setvar logo_in_opacity=$in_opacity
mb-setvar logo_out_opacity=$out_opacity
+killall -SIGUSR1 tint2
}
mkconky() {
cat << 'EOF' > ${CONKYLOGO}
diff --git a/bin/mwelcome b/bin/mwelcome
index 0f56e81..43034df 100755
--- a/bin/mwelcome
+++ b/bin/mwelcome
@@ -11,7 +11,7 @@ exo-open --launch WebBrowser https://pl.maboxlinux.org
}
export -f homewww
function userguide() {
-exo-open --launch WebBrowser https://pl.maboxlinux.org/przewodnik-uzytkownika/
+exo-open --launch WebBrowser https://pl.maboxlinux.org/przewodnik-uzytkownika/wprowadzenie-do-mabox-linux/
}
export -f userguide
;;
@@ -31,7 +31,7 @@ exo-open --launch WebBrowser https://maboxlinux.org
}
export -f homewww
function userguide() {
-exo-open --launch WebBrowser https://manual.maboxlinux.org/en/
+exo-open --launch WebBrowser https://maboxlinux.org/users-guide/introduction-to-mabox-linux-desktop/
}
export -f userguide
;;
@@ -94,7 +94,7 @@ Poniższe odnośniki pomogą Ci w rozpoczęciu używania nowego systemu.
MCC="Mabox Control Center:FBTN"
RELNOTES="Install Popular Apps!!Install popular applications:FBTN"
RESOURCES="RESOURCES"
- QUICKSTART="Quick Start Guide"
+ QUICKSTART="User Guide"
WWW="Website"
PROJECT="PROJECT"
DEVELOPMENT="Development:FBTN"
@@ -116,7 +116,7 @@ values=($(yad --window-icon=distributor-logo-mabox --center --buttons-layout="e
--title="$TITLE" \
--columns=3 --align="center" --form \
--field="$START:LBL" ""\
- --field="$UPDATE:FBTN" "pamac-manager --updates" \
+ --field="$UPDATE:FBTN" "mb-cli update" \
--field="$MCC" "mcc" \
--field="$RELNOTES" "manjaro-application-utility"\
--field=" :LBL" ""\
@@ -127,9 +127,9 @@ values=($(yad --window-icon=distributor-logo-mabox --center --buttons-layout="e
--field=" :LBL" ""\
--field="$PROJECT:LBL" ""\
--field="$DEVELOPMENT" "exo-open --launch WebBrowser https://git.maboxlinux.org/Mabox"\
- --field="$DONATE" "exo-open --launch WebBrowser https://ko-fi.com/maboxlinux"\
+ --field="$DONATE" "exo-open --launch WebBrowser https://maboxlinux.org/donate/"\
--field="$LAUNCH_AT_START" "$show_welcome" \
- --button=" FB":"$FB" --button="輸 YT":"$YT" --button=$CLOSE:0))
+ --button="Facebook":"$FB" --button="Youtube":"$YT" --button=$CLOSE:0))
#if [ $? -eq 0 ]; then
while IFS='|' read -ra ADDR; do
diff --git a/bin/t2ctl b/bin/t2ctl
index 1b0edee..faea7ba 100755
--- a/bin/t2ctl
+++ b/bin/t2ctl
@@ -612,6 +612,30 @@ switchto(){
mb-tint2-session
}
+logo(){
+ case "$1" in
+ default)
+ #notify-send.sh "$1" "$2"
+ sd "^button_icon = ~/.icons/mabox-logo-.*$" "button_icon = ~/.icons/mabox-logo-square-default.svg" ${2}
+ ;;
+ color)
+ sd "^button_icon = ~/.icons/mabox-logo-.*$" "button_icon = ~/.icons/mabox-logo-square.svg" ${2}
+ case $LANG in
+ pl*)
+ TITLE="Kolorowalne Logo w panelu"
+ DESC="\nUżyj widżetu Conky: Mabox Logo SVG, aby zmieniać kolory logo.\nKliknij prawym w logo i zmieniaj kolory z menu kontekstowego.\n"
+ RUN_CONKYMNGR="Uruchom Menedżera Widżetów Conky"
+ ;;
+ *)
+ TITLE="Colorable logo in panel"
+ DESC="\nUse Mabox Logo SVG conky widget to change logo colors.\nRight-click in logo nad change colors from context menu.\n"
+ RUN_CONKYMNGR="Run Conky Widget Manager"
+ ;;
+ esac
+ notify-send.sh -i ~/.icons/mabox-logo-square.svg -o "$RUN_CONKYMNGR:colorizer-conky -s" "$TITLE" "$DESC"
+ ;;
+ esac
+}
case "$1" in
position) pos "$2";;
@@ -682,6 +706,7 @@ case "$1" in
allelements) allelements "$2";;
preset) preset "$2";;
switchto)switchto "$2";;
+ logo)logo "$2" "$3";;
*) : ;;
esac
restartt2
diff --git a/mcc/appearance/obconf-qt.desktop b/mcc/appearance/obconf-qt.desktop
new file mode 100644
index 0000000..c668673
--- /dev/null
+++ b/mcc/appearance/obconf-qt.desktop
@@ -0,0 +1,125 @@
+[Desktop Entry]
+Type=Application
+Exec=obconf-qt
+Categories=Qt;Settings;DesktopSettings;
+Icon=obconf-qt
+StartupNotify=true
+
+Name=Openbox Settings
+GenericName=Window Manager Settings
+Comment=Configure the Openbox window manager
+Name[ar]=إعدادات Openbox
+GenericName[ar]=إعدادات مدير النوافذ
+Comment[ar]=اعداد مدير نافذة Openbox
+Name[bg]=Настройки на Openbox
+GenericName[bg]=Настройки на мениджър на прозорци
+Comment[bg]=Конфигуриране на Openbox
+Name[ca]=Ajusts d'Openbox
+GenericName[ca]=Ajusts del gestor de finestres
+Comment[ca]=Configureu el gestor de finestres Openbox
+Name[cs]=Nastavení pro Openbox
+GenericName[cs]=Nastavení správce oken
+Comment[cs]=Nastavit správce oken Openbox
+Name[da]=Openbox-indstillinger
+GenericName[da]=Indstillinger for vindueshåndtering
+Comment[da]=Konfigurer Openbox-vindueshåndteringen
+Name[de]=Fenstermanager Openbox
+GenericName[de]=Openbox Einstellungen
+Comment[de]=Konfiguration des Fenstermanagers Openbox (Qt-Version)
+Name[el]=Ρυθμίσεις Openbox
+GenericName[el]=Ρυθμίσεις του διαχειριστή παραθύρων
+Comment[el]=Διαμόρφωση του διαχειριστή παραθύρων Openbox
+Name[es]=Configuración de Openbox
+GenericName[es]=Configuración del gestor de ventanas
+Comment[es]=Configurar el gestor de ventanas Openbox
+Name[et]=Openbox'i seadistused
+GenericName[et]=Aknahalduri seadistused
+Comment[et]=Seadista Openbox aknahaldurit
+Name[eu]=OpenBox-en Ezarpenak
+GenericName[eu]=Leiho Kudeatzailearen Ezarpenak
+Comment[eu]=Konfiguratu OpenBox Leiho kudeatzailea
+Name[fi]=Openboxin asetukset
+GenericName[fi]=Ikkunanhallintaohjelman asetukset
+Comment[fi]=Määritä Openbox-ikkunanhallintaohjelma
+Name[fr]=Gestionnaire de fenêtres Openbox
+GenericName[fr]=Paramétrage de Openbox
+Comment[fr]=Paramétrage du gestionnaire de fenêtres Openbox (Version Qt)
+Name[gl]=Configuración do Openbox
+GenericName[gl]=Configuración do xestor de xanelas
+Comment[gl]=Configurar o xestor de xanelas Openbox
+Name[he]=הגדרות Openbox
+GenericName[he]=הגדרות מנהל החלונות
+Comment[he]=הגדרת מנהל החלונות Openbox
+Name[hr]=Openbox postavke
+GenericName[hr]=Postavke upravljača prozora
+Comment[hr]=Konfiguriraj Openbox upravljača prozora
+Name[hu]=Openbox beállítások
+GenericName[hu]=Ablakkezelő beállítások
+Comment[hu]=Az Openbox ablakkezelő beállítása
+Name[id]=Pengaturan Openbox
+GenericName[id]=Penganturan Manajer Jendela
+Comment[id]=Mengkonfirgurasi manajer jendela Openbox
+Name[it]=Impostazioni Openbox
+GenericName[it]=Impostazioni del gestore finestre
+Comment[it]=Configura il gestore finestre Openbox
+Name[ja]=Openbox 設定
+GenericName[ja]=ウィンドウマネージャーの設定
+Comment[ja]=Openbox ウィンドウマネージャーを設定します
+Name[ka]=Openbox-ის მორგება
+GenericName[ka]=ფანჯრების მმართველის მორგება
+Comment[ka]=ფანჯრების მმართველი Openbox-ის მორგება
+Name[kab]=Iɣewwaṛen n Openbox
+Name[kk]=Openbox баптаулары
+GenericName[kk]=Терезелер басқарушысы баптаулары
+Comment[kk]=Openbox терезелер басқарушысын баптау
+Name[ko]=Openbox 설정
+GenericName[ko]=창 관리자 설정
+Comment[ko]=Openbox 창 관리자 구성하기
+Name[lg]=Enteekateeka za Openbox
+GenericName[lg]=Obutegeke bwa kiteekateekamadirisa
+Comment[lg]=Tegeka ekiteekateekamadirisa kya Openbox
+Name[lt]=Openbox nustatymai
+GenericName[lt]=Langų tvarkytuvės nustatymai
+Comment[lt]=Konfigūruoti Openbox langų tvarkytuvę
+Name[nb_NO]=Openbox-innstillinger
+GenericName[nb_NO]=Vindusbehandlingsinnstillinger
+Comment[nb_NO]=Sett opp Openbox-vindusbehandleren
+Name[nl]=Openbox-instellingen
+GenericName[nl]=Vensterbeheerinstellingen
+Comment[nl]=Stel de Openbox-vensterbeheerder in
+Name[oc]=Gestionari de fenèstras Openbox
+GenericName[oc]=Paramètres de fenèstras Openbox
+Comment[oc]=Configurar lo gestionari de fenèstra Openbox (Version Qt)
+Name[pl]=Edytor konfiguracji Openbox
+GenericName[pl]=Ustawienia menedżera okien
+Comment[pl]=Skonfiguruj menedżer okien Openbox
+Name[pt]=Definições do Openbox
+GenericName[pt]=Definições do gestor de janelas
+Comment[pt]=Configurar o gestor de janelas Openbox
+Name[pt_BR]=Configurações do Openbox
+GenericName[pt_BR]=Configurações do gerenciador de janelas
+Comment[pt_BR]=Configurar o gerenciador de janelas Openbox
+Name[ru_RU]=Настройки Openbox
+GenericName[ru_RU]=Настройки оконного менеджера
+Comment[ru_RU]=Настроить оконный менеджер Openbox
+Name[sk]=Nastavenia Openbox-u
+GenericName[sk]=Nastavenia správcu okien
+Comment[sk]=Nastaviť Openbox - správcu okien
+Name[sv]=Openbox-inställningar
+GenericName[sv]=Inställningar för fönsterhanteraren
+Comment[sv]=Konfigurera färg och form för Openbox-fönsterhanterare
+Name[tr]=Openbox Ayarları
+GenericName[tr]=Pencere Yöneticisi Ayarları
+Comment[tr]=Openbox pencere yöneticisini yapılandırma
+Name[uk]=Налаштування Openbox
+GenericName[uk]=Налаштування віконного менеджера
+Comment[uk]=Налаштування віконного менеджера Openbox
+Name[vi]=Cài đặt Openbox
+GenericName[vi]=Cài đặt Trình quản lí Cửa số
+Comment[vi]=Tinh chỉnh trình quản lí cửa sổ Openbox
+Name[zh_CN]=Openbox 设置
+GenericName[zh_CN]=窗口管理器设置
+Comment[zh_CN]=配置窗口管理器
+Name[zh_TW]=Openbox 設定
+GenericName[zh_TW]=視窗管理員設定
+Comment[zh_TW]=設定視窗管理員
diff --git a/mcc/appearance/obconf.desktop b/mcc/appearance/obconf.desktop
deleted file mode 100644
index 23ec021..0000000
--- a/mcc/appearance/obconf.desktop
+++ /dev/null
@@ -1,23 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Openbox Configuration Manager
-Name[pl]=Menadżer konfiguracji Openbox
-Name[pt_BR]=Gerenciador de configurações do Openbox
-Name[ru]=Менеджер настройки Openbox
-Name[zh_TW]=Openbox 組態管理器
-GenericName=Configuration Manager
-GenericName[pt_BR]=Gerenciador de configurações
-GenericName[ru]=Менеджер настройки Openbox
-GenericName[zh_TW]=Openbox 組態管理器
-Comment=Tweak settings for Openbox
-Comment[pl]=Dostosuj ustawienia Openbox
-Comment[pt_BR]=Configure as opções do Openbox
-Comment[ru]=Настройка Openbox
-Comment[zh_TW]=管理 Openbox 組態設定
-Icon=obconf
-Exec=obconf %f
-Categories=Settings;DesktopSettings;GTK;
-MimeType=application/x-openbox-theme;
-StartupNotify=true
-Terminal=false
diff --git a/mcc/appearance/tint2conf.desktop b/mcc/appearance/tint2conf.desktop
deleted file mode 100644
index 26f7de4..0000000
--- a/mcc/appearance/tint2conf.desktop
+++ /dev/null
@@ -1,116 +0,0 @@
-[Desktop Entry]
-Type=Application
-
-Name=Tint2 Settings
-Name[am]=ፓነል አስተዳዳሪ
-Name[ar]=مدير الائحة :
-Name[ast]=Alministrador de panel
-Name[be]=Кіраўнік Панэляў
-Name[ca]=Gestor de quadres
-Name[cs]=Správce panelu
-Name[da]=Panelhåndtering
-Name[de]=Leistenverwaltung
-Name[dz]=པེ་ནཱལ་འཛིན་སྐྱོང་པ།
-Name[el]=Διαχειριστής ταμπλό
-Name[en_GB]=Panel Manager
-Name[eo]=Administrilo de Panelo
-Name[es]=Administrador de panel
-Name[et]=Paneelihaldur
-Name[eu]=Panel Kudeatzailea:
-Name[fi]=Paneelin hallinta
-Name[fr]=Gestionnaire du panneau tint2
-Name[gl]=Xestor de paneis
-Name[he]=מנהל הלוח
-Name[hu]=Panelkezelő
-Name[id]=Manajer Panel
-Name[it]=Gestore dei pannelli
-Name[ja]=パネルマネージャ
-Name[kk]=Панель менеджері
-Name[ko]=패널 관리자
-Name[ku]=Gerinendeyê panelan
-Name[lv]=Paneļu pārvaldnieks
-Name[mk]=Менаџер за панели
-Name[nb]=Panelbehandler
-Name[nl]=Paneel Manager
-Name[nn]=Panelhandsamar
-Name[pa]=ਪੈਨਲ ਮੈਨੇਜਰ
-Name[pl]=Ustawienia panelu tint2
-Name[pt]=Gestor do Painel
-Name[pt_BR]=Gerenciador do painel
-Name[ro]=Manager de panouri
-Name[ru]=Настройки tint2
-Name[si]=පුවරු කළමණාකරු
-Name[sk]=Nastavenie panelu
-Name[sq]=Përgjegjës Panelesh
-Name[sv]=Panelhanterare
-Name[ta]=பலகை மேளாலர்:
-Name[tr]=Panel Yöneticisi
-Name[ug]=Panel باشقۇرغۇ
-Name[uk]=Настройки tint2
-Name[ur]=پینل منیجر
-Name[ur_PK]=پینل منیجر
-Name[vi]=Quản lý panel
-Name[zh_CN]=面板管理器
-Name[zh_TW]=面板管理程式
-
-GenericName=Panel configurator
-GenericName[am]=ፓነል አስተዳዳሪ
-GenericName[ar]=مدير الائحة :
-GenericName[ast]=Alministrador de panel
-GenericName[be]=Кіраўнік Панэляў
-GenericName[ca]=Gestor de quadres
-GenericName[cs]=Správce panelu
-GenericName[da]=Panelhåndtering
-GenericName[de]=Leistenverwaltung
-GenericName[dz]=པེ་ནཱལ་འཛིན་སྐྱོང་པ།
-GenericName[el]=Διαχειριστής ταμπλό
-GenericName[en_GB]=Panel Manager
-GenericName[eo]=Administrilo de Panelo
-GenericName[es]=Administrador de panel
-GenericName[et]=Paneelihaldur
-GenericName[eu]=Panel Kudeatzailea:
-GenericName[fi]=Paneelin hallinta
-GenericName[fr]=Gestionnaire de panneau
-GenericName[gl]=Xestor de paneis
-GenericName[he]=מנהל הלוח
-GenericName[hu]=Panelkezelő
-GenericName[id]=Manajer Panel
-GenericName[it]=Gestore dei pannelli
-GenericName[ja]=パネルマネージャ
-GenericName[kk]=Панель менеджері
-GenericName[ko]=패널 관리자
-GenericName[ku]=Gerinendeyê panelan
-GenericName[lv]=Paneļu pārvaldnieks
-GenericName[mk]=Менаџер за панели
-GenericName[nb]=Panelbehandler
-GenericName[nl]=Paneel Manager
-GenericName[nn]=Panelhandsamar
-GenericName[pa]=ਪੈਨਲ ਮੈਨੇਜਰ
-GenericName[pl]=Ustawienia panelu tint2
-GenericName[pt]=Gestor do Painel
-GenericName[pt_BR]=Gerenciador do painel
-GenericName[ro]=Manager de panouri
-GenericName[ru]=Настройки панелей
-GenericName[si]=පුවරු කළමණාකරු
-GenericName[sk]=Nastavenie panelu
-GenericName[sq]=Përgjegjës Panelesh
-GenericName[sv]=Panelhanterare
-GenericName[ta]=பலகை மேளாலர்:
-GenericName[tr]=Panel Yöneticisi
-GenericName[ug]=Panel باشقۇرغۇ
-GenericName[uk]=Настройки панелi
-GenericName[ur]=پینل منیجر
-GenericName[ur_PK]=پینل منیجر
-GenericName[vi]=Quản lý panel
-GenericName[zh_CN]=面板管理器
-GenericName[zh_TW]=面板管理程式
-
-Comment=Tool to configure the tint2 panel
-Comment[pl]=Narzędzie do konfiguracji panelu tint2
-Comment[ru]=Инструмент конфигурирования панели tint2
-
-Exec=jgtint2-pipe -s
-Icon=tint2conf
-Terminal=false
-Categories=Settings;DesktopSettings;
-MimeType=application/x-tint2-theme