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

Prepare Aurorae for a QML based theme

Browse source
This commit is contained in:
Martin Gräßlin 2012-01-07 17:05:22 +01:00
parent ee882624e4
commit e8e4029a79
2 changed files with 42 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
clients/aurorae/src/aurorae.cpp
View file

@ -1,5 +1,5 @@
/******************************************************************** /********************************************************************
Copyright (C) 2009, 2010 Martin Gräßlin <kde@martin-graesslin.com> Copyright (C) 2009, 2010, 2012 Martin Gräßlin <mgraesslin@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -405,6 +405,21 @@ void AuroraeClient::updateWindowShape()
setMask(mask); setMask(mask);
} }
void AuroraeClient::titlePressed(int button, int buttons)
{
titlePressed(static_cast<Qt::MouseButton>(button), static_cast<Qt::MouseButtons>(buttons));
}
void AuroraeClient::titleReleased(int button, int buttons)
{
titleReleased(static_cast<Qt::MouseButton>(button), static_cast<Qt::MouseButtons>(buttons));
}
void AuroraeClient::titleMouseMoved(int button, int buttons)
{
titleMouseMoved(static_cast<Qt::MouseButton>(button), static_cast<Qt::MouseButtons>(buttons));
}
void AuroraeClient::titlePressed(Qt::MouseButton button, Qt::MouseButtons buttons) void AuroraeClient::titlePressed(Qt::MouseButton button, Qt::MouseButtons buttons)
{ {
QMouseEvent *event = new QMouseEvent(QEvent::MouseButtonPress, widget()->mapFromGlobal(QCursor::pos()), QMouseEvent *event = new QMouseEvent(QEvent::MouseButtonPress, widget()->mapFromGlobal(QCursor::pos()),
@ -498,6 +513,18 @@ void AuroraeClient::tabMovedToGroup(long int uid, int before)
moveItemToClientGroup(uid, before); moveItemToClientGroup(uid, before);
} }
QString AuroraeClient::rightButtons() const
{
// TODO: make independent of Aurorae
return options()->customButtonPositions() ? options()->titleButtonsRight() : AuroraeFactory::instance()->theme()->defaultButtonsRight();
}
QString AuroraeClient::leftButtons() const
{
// TODO: make independent of Aurorae
return options()->customButtonPositions() ? options()->titleButtonsLeft() : AuroraeFactory::instance()->theme()->defaultButtonsLeft();
}
} // namespace Aurorae } // namespace Aurorae
extern "C" extern "C"

21
clients/aurorae/src/aurorae.h
View file

@ -1,5 +1,5 @@
/******************************************************************** /********************************************************************
Copyright (C) 2009, 2010 Martin Gräßlin <kde@martin-graesslin.com> Copyright (C) 2009, 2010, 2012 Martin Gräßlin <mgraesslin@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -66,14 +66,14 @@ class AuroraeClient : public KDecorationUnstable
Q_PROPERTY(QRect geometry READ geometry) Q_PROPERTY(QRect geometry READ geometry)
Q_PROPERTY(int height READ height) Q_PROPERTY(int height READ height)
Q_PROPERTY(QIcon icon READ icon NOTIFY iconChanged) Q_PROPERTY(QIcon icon READ icon NOTIFY iconChanged)
Q_PROPERTY(bool closeable READ isCloseable) Q_PROPERTY(bool closeable READ isCloseable CONSTANT)
Q_PROPERTY(bool maximizeable READ isMaximizable) Q_PROPERTY(bool maximizeable READ isMaximizable CONSTANT)
Q_PROPERTY(bool minimizeable READ isMinimizable) Q_PROPERTY(bool minimizeable READ isMinimizable CONSTANT)
Q_PROPERTY(bool modal READ isModal) Q_PROPERTY(bool modal READ isModal)
Q_PROPERTY(bool moveable READ isMovable) Q_PROPERTY(bool moveable READ isMovable CONSTANT)
Q_PROPERTY(bool onAllDesktops READ isOnAllDesktops NOTIFY desktopChanged) Q_PROPERTY(bool onAllDesktops READ isOnAllDesktops NOTIFY desktopChanged)
Q_PROPERTY(bool preview READ isPreview CONSTANT) Q_PROPERTY(bool preview READ isPreview CONSTANT)
Q_PROPERTY(bool resizeable READ isResizable) Q_PROPERTY(bool resizeable READ isResizable CONSTANT)
Q_PROPERTY(bool setShade READ isSetShade NOTIFY shadeChanged) Q_PROPERTY(bool setShade READ isSetShade NOTIFY shadeChanged)
Q_PROPERTY(bool shade READ isShade WRITE setShade NOTIFY shadeChanged) Q_PROPERTY(bool shade READ isShade WRITE setShade NOTIFY shadeChanged)
Q_PROPERTY(bool shadeable READ isShadeable) Q_PROPERTY(bool shadeable READ isShadeable)
@ -85,6 +85,8 @@ class AuroraeClient : public KDecorationUnstable
Q_PROPERTY(int width READ width) Q_PROPERTY(int width READ width)
Q_PROPERTY(qulonglong windowId READ windowId CONSTANT) Q_PROPERTY(qulonglong windowId READ windowId CONSTANT)
// TODO: window tabs - they suck for dynamic features // TODO: window tabs - they suck for dynamic features
Q_PROPERTY(QString leftButtons READ leftButtons CONSTANT)
Q_PROPERTY(QString rightButtons READ rightButtons CONSTANT)
public: public:
AuroraeClient(KDecorationBridge* bridge, KDecorationFactory* factory); AuroraeClient(KDecorationBridge* bridge, KDecorationFactory* factory);
virtual ~AuroraeClient(); virtual ~AuroraeClient();
@ -102,6 +104,8 @@ public:
// optional overrides // optional overrides
virtual void padding(int &left, int &right, int &top, int &bottom) const; virtual void padding(int &left, int &right, int &top, int &bottom) const;
virtual void reset(long unsigned int changed); virtual void reset(long unsigned int changed);
QString leftButtons() const;
QString rightButtons() const;
Q_SIGNALS: Q_SIGNALS:
void activeChanged(); void activeChanged();
@ -113,13 +117,16 @@ Q_SIGNALS:
void keepAboveChanged(); void keepAboveChanged();
void keepBelowChanged(); void keepBelowChanged();
private slots: public slots:
void menuClicked(); void menuClicked();
void toggleShade(); void toggleShade();
void slotKeepAboveChanged(bool above); void slotKeepAboveChanged(bool above);
void slotKeepBelowChanged(bool below); void slotKeepBelowChanged(bool below);
void toggleKeepAbove(); void toggleKeepAbove();
void toggleKeepBelow(); void toggleKeepBelow();
void titlePressed(int button, int buttons);
void titleReleased(int button, int buttons);
void titleMouseMoved(int button, int buttons);
void titlePressed(Qt::MouseButton button, Qt::MouseButtons buttons); void titlePressed(Qt::MouseButton button, Qt::MouseButtons buttons);
void titleReleased(Qt::MouseButton button, Qt::MouseButtons buttons); void titleReleased(Qt::MouseButton button, Qt::MouseButtons buttons);
void titleMouseMoved(Qt::MouseButton button, Qt::MouseButtons buttons); void titleMouseMoved(Qt::MouseButton button, Qt::MouseButtons buttons);