Skip to content

Commit 1921b92

Browse files
committed
add config options to enable/disable skill view animations
1 parent 22652c3 commit 1921b92

File tree

3 files changed

+94
-6
lines changed

3 files changed

+94
-6
lines changed

import/globalsettings.cpp

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,63 @@ void GlobalSettings::setUseHivemindProtocol(bool useHivemindProtocol)
103103
m_settings.setValue(QStringLiteral("useHivemindProtocol"), useHivemindProtocol);
104104
emit useHivemindProtocolChanged();
105105
}
106+
107+
bool GlobalSettings::useEntryNameSpaceAnimation() const
108+
{
109+
return m_settings.value(QStringLiteral("useEntryNameSpaceAnimation"), true).toBool();
110+
}
111+
112+
void GlobalSettings::setUseEntryNameSpaceAnimation(bool useEntryNameSpaceAnimation)
113+
{
114+
if (GlobalSettings::useEntryNameSpaceAnimation() == useEntryNameSpaceAnimation) {
115+
return;
116+
}
117+
118+
m_settings.setValue(QStringLiteral("useEntryNameSpaceAnimation"), useEntryNameSpaceAnimation);
119+
emit useEntryNameSpaceAnimationChanged();
120+
}
121+
122+
bool GlobalSettings::useExitNameSpaceAnimation() const
123+
{
124+
return m_settings.value(QStringLiteral("useExitNameSpaceAnimation"), true).toBool();
125+
}
126+
127+
void GlobalSettings::setUseExitNameSpaceAnimation(bool useExitNameSpaceAnimation)
128+
{
129+
if (GlobalSettings::useExitNameSpaceAnimation() == useExitNameSpaceAnimation) {
130+
return;
131+
}
132+
133+
m_settings.setValue(QStringLiteral("useExitNameSpaceAnimation"), useExitNameSpaceAnimation);
134+
emit useExitNameSpaceAnimationChanged();
135+
}
136+
137+
bool GlobalSettings::useFocusAnimation() const
138+
{
139+
return m_settings.value(QStringLiteral("useFocusAnimation"), true).toBool();
140+
}
141+
142+
void GlobalSettings::setUseFocusAnimation(bool useFocusAnimation)
143+
{
144+
if (GlobalSettings::useFocusAnimation() == useFocusAnimation) {
145+
return;
146+
}
147+
148+
m_settings.setValue(QStringLiteral("useFocusAnimation"), useFocusAnimation);
149+
emit useFocusAnimationChanged();
150+
}
151+
152+
bool GlobalSettings::useDelegateAnimation() const
153+
{
154+
return m_settings.value(QStringLiteral("useDelegateAnimation"), true).toBool();
155+
}
156+
157+
void GlobalSettings::setUseDelegateAnimation(bool useDelegateAnimation)
158+
{
159+
if (GlobalSettings::useDelegateAnimation() == useDelegateAnimation) {
160+
return;
161+
}
162+
163+
m_settings.setValue(QStringLiteral("useDelegateAnimation"), useDelegateAnimation);
164+
emit useDelegateAnimationChanged();
165+
}

import/globalsettings.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ class GlobalSettings : public QObject
3636
Q_PROPERTY(bool displayRemoteConfig READ displayRemoteConfig WRITE setDisplayRemoteConfig NOTIFY displayRemoteConfigChanged)
3737
Q_PROPERTY(bool usePTTClient READ usePTTClient WRITE setUsePTTClient NOTIFY usePTTClient)
3838
Q_PROPERTY(bool useHivemindProtocol READ useHivemindProtocol WRITE setUseHivemindProtocol NOTIFY useHivemindProtocolChanged)
39+
Q_PROPERTY(bool useEntryNameSpaceAnimation READ useEntryNameSpaceAnimation WRITE setUseEntryNameSpaceAnimation NOTIFY useEntryNameSpaceAnimationChanged)
40+
Q_PROPERTY(bool useExitNameSpaceAnimation READ useExitNameSpaceAnimation WRITE setUseExitNameSpaceAnimation NOTIFY useExitNameSpaceAnimationChanged)
41+
Q_PROPERTY(bool useFocusAnimation READ useFocusAnimation WRITE setUseFocusAnimation NOTIFY useFocusAnimationChanged)
42+
Q_PROPERTY(bool useDelegateAnimation READ useDelegateAnimation WRITE setUseDelegateAnimation NOTIFY useDelegateAnimationChanged)
3943

4044
public:
4145
explicit GlobalSettings(QObject *parent=0);
@@ -55,6 +59,14 @@ class GlobalSettings : public QObject
5559
void setUsePTTClient(bool usePttClient);
5660
bool useHivemindProtocol() const;
5761
void setUseHivemindProtocol(bool useHivemindProtocol);
62+
bool useEntryNameSpaceAnimation() const;
63+
void setUseEntryNameSpaceAnimation(bool useEntryNameSpaceAnimation);
64+
bool useExitNameSpaceAnimation() const;
65+
void setUseExitNameSpaceAnimation(bool useExitNameSpaceAnimation);
66+
bool useFocusAnimation() const;
67+
void setUseFocusAnimation(bool useFocusAnimation);
68+
bool useDelegateAnimation() const;
69+
void setUseDelegateAnimation(bool useDelegateAnimation);
5870

5971
Q_SIGNALS:
6072
void webSocketChanged();
@@ -63,6 +75,10 @@ class GlobalSettings : public QObject
6375
void displayRemoteConfigChanged();
6476
void usePTTClientChanged();
6577
void useHivemindProtocolChanged();
78+
void useEntryNameSpaceAnimationChanged();
79+
void useExitNameSpaceAnimationChanged();
80+
void useFocusAnimationChanged();
81+
void useDelegateAnimationChanged();
6682

6783
private:
6884
QSettings m_settings;

import/qml/SkillView.qml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,19 @@ Mycroft.AbstractSkillView {
4444

4545
onOpenChanged: {
4646
if (open) {
47-
closeAnimation.running = false;
48-
openAnimation.restart();
47+
if(Mycroft.GlobalSettings.useExitNameSpaceAnimation) {
48+
closeAnimation.running = false;
49+
}
50+
if(Mycroft.GlobalSettings.useEntryNameSpaceAnimation) {
51+
openAnimation.restart();
52+
}
4953
} else {
50-
openAnimation.running = false;
51-
closeAnimation.restart();
54+
if(Mycroft.GlobalSettings.useEntryNameSpaceAnimation) {
55+
openAnimation.running = false;
56+
}
57+
if(Mycroft.GlobalSettings.useExitNameSpaceAnimation) {
58+
closeAnimation.restart();
59+
}
5260
}
5361
}
5462

@@ -183,7 +191,9 @@ Mycroft.AbstractSkillView {
183191
activeSkillsRepeater.currentDelegate = delegate;
184192
if (root.open === false) {
185193
root.open = true;
186-
enterAnim.restart();
194+
if(Mycroft.GlobalSettings.useDelegateAnimation) {
195+
enterAnim.restart();
196+
}
187197
}
188198
}
189199

@@ -252,7 +262,9 @@ Mycroft.AbstractSkillView {
252262
if (model.delegateUi.focus) {
253263
delegatesView.currentIndex = index;
254264
if (root.width >= root.switchWidth) {
255-
focusAnim.restart();
265+
if(Mycroft.GlobalSettings.useFocusAnimation) {
266+
focusAnim.restart();
267+
}
256268
}
257269
}
258270
}

0 commit comments

Comments
 (0)