|
 |
b5cc75 |
diff -up kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp.classicmenu-logout kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
|
|
|
b5cc75 |
--- kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp.classicmenu-logout 2011-10-11 16:42:11.000000000 +0200
|
|
|
b5cc75 |
+++ kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2011-11-21 14:56:36.108858679 +0100
|
|
|
b5cc75 |
@@ -105,7 +105,8 @@ bool LeaveItemHandler::openUrl(const KUr
|
|
|
b5cc75 |
QTimer::singleShot(0, this, SLOT(switchUser()));
|
|
|
b5cc75 |
return true;
|
|
|
b5cc75 |
} else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
|
|
|
b5cc75 |
- m_logoutAction == "restart" || m_logoutAction == "shutdown") {
|
|
|
b5cc75 |
+ m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
|
|
|
b5cc75 |
+ m_logoutAction == "leave") {
|
|
|
b5cc75 |
// decouple dbus call, otherwise we'll run into a dead-lock
|
|
|
b5cc75 |
QTimer::singleShot(0, this, SLOT(logout()));
|
|
|
b5cc75 |
return true;
|
|
|
b5cc75 |
@@ -158,6 +159,10 @@ void LeaveItemHandler::logout()
|
|
|
b5cc75 |
type = KWorkSpace::ShutdownTypeReboot;
|
|
|
b5cc75 |
} else if (m_logoutAction == "shutdown") {
|
|
|
b5cc75 |
type = KWorkSpace::ShutdownTypeHalt;
|
|
|
b5cc75 |
+ } else if (m_logoutAction == "leave") {
|
|
|
b5cc75 |
+ // This one brings up the dialog, for use in the classic menu.
|
|
|
b5cc75 |
+ confirm = KWorkSpace::ShutdownConfirmYes;
|
|
|
b5cc75 |
+ type = KWorkSpace::ShutdownTypeDefault;
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
|
|
|
b5cc75 |
KWorkSpace::requestShutDown(confirm, type);
|
|
|
b5cc75 |
diff -up kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.classicmenu-logout kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
|
|
|
b5cc75 |
--- kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.classicmenu-logout 2011-11-04 15:33:12.000000000 +0100
|
|
|
b5cc75 |
+++ kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2011-11-21 14:48:59.281609964 +0100
|
|
|
b5cc75 |
@@ -209,6 +209,7 @@ public:
|
|
|
b5cc75 |
case Shutdown: return i18n("Shut down");
|
|
|
b5cc75 |
case Logout: return i18n("Log out");
|
|
|
b5cc75 |
case Leave: return i18n("Leave");
|
|
|
b5cc75 |
+ case LeaveDialog: return i18n("Leave...");
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
return QString();
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
@@ -234,6 +235,7 @@ public:
|
|
|
b5cc75 |
case Shutdown: return "system-shutdown";
|
|
|
b5cc75 |
case Logout: return "system-log-out";
|
|
|
b5cc75 |
case Leave: return "system-shutdown";
|
|
|
b5cc75 |
+ case LeaveDialog: return "system-shutdown";
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
return QString();
|
|
|
b5cc75 |
}
|
|
|
b5cc75 |
@@ -741,6 +743,8 @@ void MenuLauncherApplet::showMenu(bool p
|
|
|
b5cc75 |
menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
|
|
|
b5cc75 |
} else if(vtname == "Logout") {
|
|
|
b5cc75 |
menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
|
|
|
b5cc75 |
+ } else if(vtname == "LeaveDialog") {
|
|
|
b5cc75 |
+ menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
|
|
|
b5cc75 |
} else if(vtname == "Leave") {
|
|
|
b5cc75 |
Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(menuview);
|
|
|
b5cc75 |
leavemodel->updateModel();
|
|
|
b5cc75 |
diff -up kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h.classicmenu-logout kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
|
|
|
b5cc75 |
--- kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h.classicmenu-logout 2011-07-27 20:35:42.000000000 +0200
|
|
|
b5cc75 |
+++ kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2011-11-21 14:48:59.282609967 +0100
|
|
|
b5cc75 |
@@ -59,7 +59,8 @@ public:
|
|
|
b5cc75 |
Restart, ///< Restart Action
|
|
|
b5cc75 |
Shutdown, ///< Shutdown Action
|
|
|
b5cc75 |
Logout, ///< Logout Action
|
|
|
b5cc75 |
- Leave ///< Leave Menu
|
|
|
b5cc75 |
+ Leave, ///< Leave Menu
|
|
|
b5cc75 |
+ LeaveDialog ///< Leave Dialog Action
|
|
|
b5cc75 |
};
|
|
|
b5cc75 |
|
|
|
b5cc75 |
/**
|