Changeset View
Changeset View
Standalone View
Standalone View
useractions.cpp
Show First 20 Lines • Show All 894 Lines • ▼ Show 20 Line(s) | 893 | { | |||
---|---|---|---|---|---|
895 | uint desk = action->data().toUInt(&ok); | 895 | uint desk = action->data().toUInt(&ok); | ||
896 | if (!ok) { | 896 | if (!ok) { | ||
897 | return; | 897 | return; | ||
898 | } | 898 | } | ||
899 | if (m_client.isNull()) { | 899 | if (m_client.isNull()) { | ||
900 | return; | 900 | return; | ||
901 | } | 901 | } | ||
902 | 902 | | |||
903 | Workspace *ws = Workspace::self(); | | |||
904 | VirtualDesktopManager *vds = VirtualDesktopManager::self(); | 903 | VirtualDesktopManager *vds = VirtualDesktopManager::self(); | ||
905 | if (desk == 0) { | 904 | if (desk == 0) { | ||
906 | // the 'on_all_desktops' menu entry | 905 | // the 'on_all_desktops' menu entry | ||
907 | m_client.data()->setOnAllDesktops(!m_client.data()->isOnAllDesktops()); | 906 | m_client.data()->setOnAllDesktops(!m_client.data()->isOnAllDesktops()); | ||
908 | return; | 907 | return; | ||
909 | } else if (desk > vds->count()) { | 908 | } else if (desk > vds->count()) { | ||
910 | vds->setCount(desk); | 909 | vds->setCount(desk); | ||
911 | } | 910 | } | ||
912 | 911 | | |||
913 | VirtualDesktop *virtualDesktop = VirtualDesktopManager::self()->desktopForX11Id(desk); | 912 | VirtualDesktop *virtualDesktop = VirtualDesktopManager::self()->desktopForX11Id(desk); | ||
914 | if (m_client.data()->desktops().contains(virtualDesktop)) { | 913 | if (m_client.data()->desktops().contains(virtualDesktop)) { | ||
915 | m_client.data()->unSetDesktop(desk); | 914 | m_client.data()->leaveDesktop(virtualDesktop); | ||
916 | } else { | 915 | } else { | ||
917 | ws->sendClientToDesktop(m_client.data(), desk, false); | 916 | m_client.data()->enterDesktop(virtualDesktop); | ||
918 | } | 917 | } | ||
919 | } | 918 | } | ||
920 | 919 | | |||
921 | void UserActionsMenu::slotSendToScreen(QAction *action) | 920 | void UserActionsMenu::slotSendToScreen(QAction *action) | ||
922 | { | 921 | { | ||
923 | const int screen = action->data().toInt(); | 922 | const int screen = action->data().toInt(); | ||
924 | if (m_client.isNull()) { | 923 | if (m_client.isNull()) { | ||
925 | return; | 924 | return; | ||
▲ Show 20 Lines • Show All 1006 Lines • Show Last 20 Lines |