Add minimium animation option

pull/28/head
reionwong 4 years ago
parent ba2ac403a7
commit b26034cc21

@ -43,13 +43,16 @@ Appearance::Appearance(QObject *parent)
, m_fontPointSize(11)
, m_systemEffects(false)
{
m_kwinSettings->beginGroup("Compositing");
m_dockIconSize = m_dockSettings->value("IconSize").toInt();
m_dockDirection = m_dockSettings->value("Direction").toInt();
m_dockVisibility = m_dockSettings->value("Visibility").toInt();
m_dockRoundedWindow = m_dockSettings->value("RoundedWindow").toBool();
m_kwinSettings->beginGroup("Compositing");
m_systemEffects = !m_kwinSettings->value("OpenGLIsUnsafe", false).toBool();
m_kwinSettings->endGroup();
m_kwinSettings->beginGroup("Plugins");
m_minimiumAnimation = m_kwinSettings->value("magiclampEnabled").toBool() ? 1 : 0;
m_kwinSettings->endGroup();
// Init
if (m_interface.isValid()) {
@ -236,9 +239,30 @@ void Appearance::setSystemEffects(bool systemEffects)
{
if (m_systemEffects != systemEffects) {
m_systemEffects = systemEffects;
m_kwinSettings->beginGroup("Compositing");
m_kwinSettings->setValue("OpenGLIsUnsafe", !systemEffects);
m_kwinSettings->endGroup();
m_kwinSettings->sync();
QDBusInterface("org.kde.KWin", "/KWin").call("reconfigure");
emit systemEffectsChanged();
}
}
int Appearance::minimiumAnimation() const
{
return m_minimiumAnimation;
}
void Appearance::setMinimiumAnimation(int minimiumAnimation)
{
if (m_minimiumAnimation != minimiumAnimation) {
m_minimiumAnimation = minimiumAnimation;
m_kwinSettings->beginGroup("Plugins");
m_kwinSettings->setValue("magiclampEnabled", m_minimiumAnimation == 1);
m_kwinSettings->setValue("cutefish_squashEnabled", m_minimiumAnimation == 0);
m_kwinSettings->endGroup();
m_kwinSettings->sync();
QDBusInterface("org.kde.KWin", "/KWin").call("reconfigure");
emit minimiumAnimationChanged();
}
}

@ -35,6 +35,7 @@ class Appearance : public QObject
Q_PROPERTY(double devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged)
Q_PROPERTY(bool dockRoundedWindow READ dockRoundedWindow WRITE setDockRoundedWindow NOTIFY dockRoundedWindowChanged)
Q_PROPERTY(bool systemEffects READ systemEffects WRITE setSystemEffects NOTIFY systemEffectsChanged)
Q_PROPERTY(int minimiumAnimation READ minimiumAnimation WRITE setMinimiumAnimation NOTIFY minimiumAnimationChanged)
public:
explicit Appearance(QObject *parent = nullptr);
@ -70,6 +71,9 @@ public:
bool systemEffects() const;
void setSystemEffects(bool systemEffects);
int minimiumAnimation() const;
void setMinimiumAnimation(int minimiumAnimation);
signals:
void dockIconSizeChanged();
void dockDirectionChanged();
@ -79,6 +83,7 @@ signals:
void devicePixelRatioChanged();
void dockRoundedWindowChanged();
void systemEffectsChanged();
void minimiumAnimationChanged();
private:
QDBusInterface m_interface;
@ -92,6 +97,7 @@ private:
int m_fontPointSize;
bool m_systemEffects;
int m_minimiumAnimation;
};
#endif // APPEARANCE_H

@ -113,6 +113,30 @@ ItemPage {
}
}
RoundedItem {
RowLayout {
spacing: FishUI.Units.largeSpacing * 2
Label {
text: qsTr("Minimize animation")
}
TabBar {
Layout.fillWidth: true
currentIndex: appearance.minimiumAnimation
onCurrentIndexChanged: appearance.minimiumAnimation = currentIndex
TabButton {
text: qsTr("Default")
}
TabButton {
text: qsTr("Magic Lamp")
}
}
}
}
RoundedItem {
Label {
text: qsTr("Accent color")

@ -142,7 +142,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="118"/>
<location filename="../src/qml/Appearance/Main.qml" line="121"/>
<source>Minimize animation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="130"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="134"/>
<source>Magic Lamp</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="142"/>
<source>Accent color</source>
<translation type="unfinished"></translation>
</message>
@ -444,7 +459,7 @@
<location filename="../src/qml/Bluetooth/Main.qml" line="32"/>
<location filename="../src/qml/Bluetooth/Main.qml" line="71"/>
<source>Bluetooth</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Bluetooth</translation>
</message>
<message>
<location filename="../src/qml/Wired/Main.qml" line="32"/>
@ -501,7 +516,7 @@
<message>
<location filename="../src/qml/Hotspot/Main.qml" line="113"/>
<source>Password</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Password</translation>
</message>
<message>
<location filename="../src/qml/Hotspot/Main.qml" line="129"/>
@ -612,7 +627,7 @@
<message>
<location filename="../src/qml/SideBar.qml" line="96"/>
<source>Appearance</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Appearance</translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="141"/>
@ -653,7 +668,7 @@
<message>
<location filename="../src/qml/SideBar.qml" line="177"/>
<source>Language</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Language</translation>
</message>
<message>
<location filename="../src/qml/SideBar.qml" line="186"/>
@ -668,7 +683,7 @@
<message>
<location filename="../src/qml/SideBar.qml" line="204"/>
<source>About</source>
<translation type="unfinished"></translation>
<translation type="unfinished">About</translation>
</message>
</context>
<context>
@ -676,7 +691,7 @@
<message>
<location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="160"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Cancel</translation>
</message>
<message>
<location filename="../src/qml/DateTime/TimeZoneDialog.qml" line="165"/>
@ -707,7 +722,7 @@
<message>
<location filename="../src/qml/WLAN/WifiItem.qml" line="177"/>
<source>Password</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Password</translation>
</message>
<message>
<location filename="../src/qml/WLAN/WifiItem.qml" line="197"/>
@ -717,7 +732,7 @@
<message>
<location filename="../src/qml/WLAN/WifiItem.qml" line="206"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Cancel</translation>
</message>
<message>
<location filename="../src/qml/WLAN/WifiItem.qml" line="212"/>

@ -142,7 +142,22 @@
<translation></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="118"/>
<location filename="../src/qml/Appearance/Main.qml" line="121"/>
<source>Minimize animation</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="130"/>
<source>Default</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="134"/>
<source>Magic Lamp</source>
<translation></translation>
</message>
<message>
<location filename="../src/qml/Appearance/Main.qml" line="142"/>
<source>Accent color</source>
<translation></translation>
</message>

Loading…
Cancel
Save