Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

shutdown: bring into correspondence with dde-shutdown

Browse Source 
Change-Id: I4c7fce7ad31988af5c8c4fb299f097cd955b15d6
This commit is contained in:
kirigaya 2017-07-12 16:05:04 +08:00 committed by Deepin Code Review
parent db193ee0e8
commit 0915546060
Notes: Deepin Code Review 2017-07-13 13:47:10 +08:00 
Verified+1: Anonymous Coward #1000004
Verified+1: <zhaofangfang@linuxdeepin.com>
Code-Review+2: kirigaya <kirigaya@mkacg.com>
Submitted-by: kirigaya <kirigaya@mkacg.com>
Submitted-at: Thu, 13 Jul 2017 13:47:08 +0800
Reviewed-on: https://cr.deepin.io/24504
Project: dde/dde-dock
Branch: refs/heads/master
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/shutdown/shutdownplugin.cpp
View File

@ -105,18 +105,24 @@ const QString ShutdownPlugin::itemContextMenu(const QString &itemKey)
reboot["isActive"] = true;
items.push_back(reboot);
QMap<QString, QVariant> logout;
logout["itemId"] = "Logout";
logout["itemText"] = tr("Log out");
logout["isActive"] = true;
items.push_back(logout);
QMap<QString, QVariant> suspend;
suspend["itemId"] = "Suspend";
suspend["itemText"] = tr("Suspend");
suspend["isActive"] = true;
items.push_back(suspend);
QMap<QString, QVariant> lock;
lock["itemId"] = "Lock";
lock["itemText"] = tr("Lock");
lock["isActive"] = true;
items.push_back(lock);
QMap<QString, QVariant> logout;
logout["itemId"] = "Logout";
logout["itemText"] = tr("Log out");
logout["isActive"] = true;
items.push_back(logout);
if (DBusAccount().userList().count() > 1)
{
QMap<QString, QVariant> switchUser;
@ -151,6 +157,11 @@ void ShutdownPlugin::invokedMenuItem(const QString &itemKey, const QString &menu
if (menuId == "power")
QProcess::startDetached("dde-control-center", QStringList() << "power");
else if (menuId == "Lock")
QProcess::startDetached("dbus-send", QStringList() << "--print-reply"
<< "--dest=com.deepin.dde.lockFront"
<< "/com/deepin/dde/lockFront"
<< QString("com.deepin.dde.lockFront.Show"));
else
QProcess::startDetached("dbus-send", QStringList() << "--print-reply"
<< "--dest=com.deepin.dde.shutdownFront"

27
translations/dde-dock.ts
View File

@ -201,37 +201,42 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="60"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="62"/>
<source>Charged %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="62"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="64"/>
<source>Charging %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="102"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="104"/>
<source>Restart</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="108"/>
<source>Log out</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="114"/>
<source>Suspend</source>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="116"/>
<source>Lock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="122"/>
<source>Log out</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="110"/>
<source>Suspend</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="130"/>
<source>Switch account</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="132"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="140"/>
<source>Power settings</source>
<translation type="unfinished"></translation>
</message>