vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Workspace::setupWindowShortcut operates on AbstractClient

icc-effect-5.14.5
Martin Gräßlin 2015-03-06 09:03:08 +01:00
parent aa1e9161d5
commit 942b49e2c4
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abstract_client.h
View File

@ -61,6 +61,8 @@ public:
virtual bool isSpecialWindow() const = 0; virtual bool isSpecialWindow() const = 0;
virtual bool isActive() const = 0; virtual bool isActive() const = 0;
virtual void sendToScreen(int screen) = 0; virtual void sendToScreen(int screen) = 0;
virtual const QKeySequence &shortcut() const = 0;
virtual void setShortcut(const QString &cut) = 0;
// TODO: remove boolean trap // TODO: remove boolean trap
static bool belongToSameApplication(const AbstractClient* c1, const AbstractClient* c2, bool active_hack = false); static bool belongToSameApplication(const AbstractClient* c1, const AbstractClient* c2, bool active_hack = false);

4
client.h
View File

@ -489,8 +489,8 @@ public:
void shrinkVertical(); void shrinkVertical();
bool providesContextHelp() const; bool providesContextHelp() const;
const QKeySequence &shortcut() const; const QKeySequence &shortcut() const override;
void setShortcut(const QString& cut); void setShortcut(const QString& cut) override;
Options::WindowOperation mouseButtonToWindowOperation(Qt::MouseButtons button); Options::WindowOperation mouseButtonToWindowOperation(Qt::MouseButtons button);
bool performMouseCommand(Options::MouseCommand, const QPoint& globalPos); bool performMouseCommand(Options::MouseCommand, const QPoint& globalPos);

2
useractions.cpp
View File

@ -954,7 +954,7 @@ void Workspace::initShortcuts()
m_userActionsMenu->discard(); // so that it's recreated next time m_userActionsMenu->discard(); // so that it's recreated next time
} }
void Workspace::setupWindowShortcut(Client* c) void Workspace::setupWindowShortcut(AbstractClient* c)
{ {
assert(client_keys_dialog == NULL); assert(client_keys_dialog == NULL);
// TODO: PORT ME (KGlobalAccel related) // TODO: PORT ME (KGlobalAccel related)

6
workspace.h
View File

@ -467,7 +467,7 @@ private:
template <typename Slot> template <typename Slot>
void initShortcut(const QString &actionName, const QString &description, const QKeySequence &shortcut, void initShortcut(const QString &actionName, const QString &description, const QKeySequence &shortcut,
Slot slot, const QVariant &data = QVariant()); Slot slot, const QVariant &data = QVariant());
void setupWindowShortcut(Client* c); void setupWindowShortcut(AbstractClient* c);
enum Direction { enum Direction {
DirectionNorth, DirectionNorth,
DirectionEast, DirectionEast,
@ -503,7 +503,7 @@ private:
Client *findClientToActivateOnDesktop(uint desktop); Client *findClientToActivateOnDesktop(uint desktop);
QWidget* active_popup; QWidget* active_popup;
Client* active_popup_client; AbstractClient* active_popup_client;
void loadSessionInfo(); void loadSessionInfo();
void addSessionInfo(KConfigGroup &cg); void addSessionInfo(KConfigGroup &cg);
@ -556,7 +556,7 @@ private:
void modalActionsSwitch(bool enabled); void modalActionsSwitch(bool enabled);
ShortcutDialog* client_keys_dialog; ShortcutDialog* client_keys_dialog;
Client* client_keys_client; AbstractClient* client_keys_client;
bool global_shortcuts_disabled_for_client; bool global_shortcuts_disabled_for_client;
// Timer to collect requests for 'reconfigure' // Timer to collect requests for 'reconfigure'