yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workspace::setupWindowShortcut operates on AbstractClient

Browse source
This commit is contained in:
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 isActive() const = 0;
virtual void sendToScreen(int screen) = 0;
virtual const QKeySequence &shortcut() const = 0;
virtual void setShortcut(const QString &cut) = 0;
// TODO: remove boolean trap
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();
bool providesContextHelp() const;
const QKeySequence &shortcut() const;
void setShortcut(const QString& cut);
const QKeySequence &shortcut() const override;
void setShortcut(const QString& cut) override;
Options::WindowOperation mouseButtonToWindowOperation(Qt::MouseButtons button);
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
}
void Workspace::setupWindowShortcut(Client* c)
void Workspace::setupWindowShortcut(AbstractClient* c)
{
assert(client_keys_dialog == NULL);
// TODO: PORT ME (KGlobalAccel related)

6
workspace.h
View file

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