# HG changeset patch # User Aleksej Bobylev # Date 1478948129 -7200 # Node ID 18201249701bd2b74c6264baf97d57ea24169be8 # Parent e517df532f55846553253dc4f0de156cf4930b22 Logout menu handling diff -r e517df532f55 -r 18201249701b Makefile --- a/Makefile Mon Oct 24 04:36:33 2016 -0200 +++ b/Makefile Sat Nov 12 12:55:29 2016 +0200 @@ -41,3 +41,4 @@ clean: rm -rf po/mo rm -f po/*~ + rm -f po/*.mo diff -r e517df532f55 -r 18201249701b ob-menu/menu.xml.in --- a/ob-menu/menu.xml.in Mon Oct 24 04:36:33 2016 -0200 +++ b/ob-menu/menu.xml.in Sat Nov 12 12:55:29 2016 +0200 @@ -38,7 +38,7 @@ tazbox tazapps - + terminal -e tazx diff -r e517df532f55 -r 18201249701b po/fr.po --- a/po/fr.po Mon Oct 24 04:36:33 2016 -0200 +++ b/po/fr.po Sat Nov 12 12:55:29 2016 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: slitaz-ob-menu 5.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-24 14:10+0300\n" +"POT-Creation-Date: 2016-11-12 12:34+0200\n" "PO-Revision-Date: 2013-08-01 01:22+0300\n" "Last-Translator: Christophe Lincoln \n" "Language: fr\n" @@ -39,6 +39,11 @@ msgid "Configure favorites" msgstr "Configuration des favoris" +#: ob-menu/menu.xml.in:41 +#, fuzzy +msgid "Configure/install favorites (tazx)" +msgstr "Configuration des favoris" + #: ob-menu/menu.xml.in:47 msgid "Desktop Effects" msgstr "Effets visuels" diff -r e517df532f55 -r 18201249701b po/hu.po --- a/po/hu.po Mon Oct 24 04:36:33 2016 -0200 +++ b/po/hu.po Sat Nov 12 12:55:29 2016 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: slitaz-ob-menu 5.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-24 14:10+0300\n" +"POT-Creation-Date: 2016-11-12 12:34+0200\n" "PO-Revision-Date: 2013-08-01 01:27+0300\n" "Last-Translator: Christophe Lincoln \n" "Language: hu\n" @@ -39,6 +39,11 @@ msgid "Configure favorites" msgstr "Configure favorites" +#: ob-menu/menu.xml.in:41 +#, fuzzy +msgid "Configure/install favorites (tazx)" +msgstr "Configure favorites" + #: ob-menu/menu.xml.in:47 msgid "Desktop Effects" msgstr "Asztali hatások" diff -r e517df532f55 -r 18201249701b po/pt.po --- a/po/pt.po Mon Oct 24 04:36:33 2016 -0200 +++ b/po/pt.po Sat Nov 12 12:55:29 2016 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: slitaz-ob-menu 5.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-24 14:10+0300\n" +"POT-Creation-Date: 2016-11-12 12:34+0200\n" "PO-Revision-Date: 2014-01-14 21:42+0300\n" "Last-Translator: Claudinei Pereira \n" "Language: pt_BR\n" @@ -40,6 +40,11 @@ msgid "Configure favorites" msgstr "Configurar favoritos" +#: ob-menu/menu.xml.in:41 +#, fuzzy +msgid "Configure/install favorites (tazx)" +msgstr "Configurar favoritos" + #: ob-menu/menu.xml.in:47 msgid "Desktop Effects" msgstr "Efeitos Visuais" diff -r e517df532f55 -r 18201249701b po/ru.po --- a/po/ru.po Mon Oct 24 04:36:33 2016 -0200 +++ b/po/ru.po Sat Nov 12 12:55:29 2016 +0200 @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: slitaz-ob-menu 5.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-24 14:10+0300\n" -"PO-Revision-Date: 2016-09-24 14:15+0300\n" +"POT-Creation-Date: 2016-11-12 12:34+0200\n" +"PO-Revision-Date: 2016-11-12 12:34+0200\n" "Last-Translator: Aleksej Bobylev \n" "Language-Team: \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.6\n" #: ob-menu/menu.xml.in:24 msgid "Favorite Applications" @@ -40,6 +41,10 @@ msgid "Configure favorites" msgstr "Настроить избранное" +#: ob-menu/menu.xml.in:41 +msgid "Configure/install favorites (tazx)" +msgstr "Настроить/установить избранное (tazx)" + #: ob-menu/menu.xml.in:47 msgid "Desktop Effects" msgstr "Эффекты рабочего стола" diff -r e517df532f55 -r 18201249701b po/slitaz-ob-menu.pot --- a/po/slitaz-ob-menu.pot Mon Oct 24 04:36:33 2016 -0200 +++ b/po/slitaz-ob-menu.pot Sat Nov 12 12:55:29 2016 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: slitaz-ob-menu 5.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-24 14:16+0300\n" +"POT-Creation-Date: 2016-11-12 12:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,6 +41,10 @@ msgid "Configure favorites" msgstr "" +#: ob-menu/menu.xml.in:41 +msgid "Configure/install favorites (tazx)" +msgstr "" + #: ob-menu/menu.xml.in:47 msgid "Desktop Effects" msgstr "" diff -r e517df532f55 -r 18201249701b po/zh_CN.po --- a/po/zh_CN.po Mon Oct 24 04:36:33 2016 -0200 +++ b/po/zh_CN.po Sat Nov 12 12:55:29 2016 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: slitaz-ob-menu 5.1.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-24 14:16+0300\n" +"POT-Creation-Date: 2016-11-12 12:34+0200\n" "PO-Revision-Date: 2014-07-13 08:38+0800\n" "Last-Translator: rhsky \n" "Language-Team: rhsky \n" @@ -42,6 +42,11 @@ msgid "Configure favorites" msgstr "配置收藏夹" +#: ob-menu/menu.xml.in:41 +#, fuzzy +msgid "Configure/install favorites (tazx)" +msgstr "配置收藏夹" + #: ob-menu/menu.xml.in:47 msgid "Desktop Effects" msgstr "桌面效果" diff -r e517df532f55 -r 18201249701b rootfs/etc/lxpanel/slitaz/panels/panel --- a/rootfs/etc/lxpanel/slitaz/panels/panel Mon Oct 24 04:36:33 2016 -0200 +++ b/rootfs/etc/lxpanel/slitaz/panels/panel Sat Nov 12 12:55:29 2016 +0200 @@ -131,7 +131,6 @@ type = batt Config { HideIfNoBattery=0 - AlarmCommand=tazbox notify "Warning: battery low" "dialog-warning" AlarmTime=5 BackgroundColor=#404040 BorderWidth=3 @@ -179,8 +178,19 @@ image=avatar-default tintcolor=#33230D item { - image=system-shutdown-panel-restart - command=logout + image=system-log-out-panel + name=Close X session + action=tazbox logout exit + } + item { + image=system-reboot-panel + name=Reboot system + action=tazbox logout reboot + } + item { + image=system-shutdown-panel + name=Shutdown system + action=tazbox logout halt } } } diff -r e517df532f55 -r 18201249701b rootfs/etc/skel/.xinitrc --- a/rootfs/etc/skel/.xinitrc Mon Oct 24 04:36:33 2016 -0200 +++ b/rootfs/etc/skel/.xinitrc Sat Nov 12 12:55:29 2016 +0200 @@ -3,8 +3,7 @@ # it permanently with your personal applications.conf file. # . $HOME/.config/slitaz/applications.conf -dd="$HOME/.local/share/desktop-directories"; mkdir -p "$dd" -echo -e "[Desktop Entry]\nType=Directory\nName=$(whoami)" > "$dd/user.directory" +tazbox mkmenu [ "$1" ] && WINDOW_MANAGER="$1"