diff --git a/src/appearance.cpp b/src/appearance.cpp index 094a211..f43558b 100644 --- a/src/appearance.cpp +++ b/src/appearance.cpp @@ -35,10 +35,12 @@ Appearance::Appearance(QObject *parent) , m_dockConfigWacher(new QFileSystemWatcher(this)) , m_dockIconSize(0) , m_dockDirection(0) + , m_dockVisibility(0) , m_fontPointSize(11) { 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_dockConfigWacher->addPath(m_dockSettings->fileName()); @@ -107,6 +109,20 @@ void Appearance::setDockDirection(int dockDirection) m_dockSettings->setValue("Direction", m_dockDirection); } +int Appearance::dockVisibility() const +{ + return m_dockVisibility; +} + +void Appearance::setDockVisibility(int visibility) +{ + if (m_dockVisibility != visibility) { + m_dockVisibility = visibility; + m_dockSettings->setValue("Visibility", m_dockVisibility); + emit dockVisibilityChanged(); + } +} + int Appearance::dockRoundedWindow() const { return m_dockRoundedWindow; diff --git a/src/appearance.h b/src/appearance.h index 4d6ef0d..4c4e79a 100644 --- a/src/appearance.h +++ b/src/appearance.h @@ -30,6 +30,7 @@ class Appearance : public QObject Q_OBJECT Q_PROPERTY(int dockIconSize READ dockIconSize WRITE setDockIconSize NOTIFY dockIconSizeChanged) Q_PROPERTY(int dockDirection READ dockDirection WRITE setDockDirection NOTIFY dockDirectionChanged) + Q_PROPERTY(int dockVisibility READ dockVisibility WRITE setDockVisibility NOTIFY dockVisibilityChanged) Q_PROPERTY(int fontPointSize READ fontPointSize WRITE setFontPointSize NOTIFY fontPointSizeChanged) Q_PROPERTY(bool dimsWallpaper READ dimsWallpaper WRITE setDimsWallpaper NOTIFY dimsWallpaperChanged) Q_PROPERTY(double devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged) @@ -49,6 +50,9 @@ public: int dockDirection() const; Q_INVOKABLE void setDockDirection(int dockDirection); + int dockVisibility() const; + Q_INVOKABLE void setDockVisibility(int visibility); + int dockRoundedWindow() const; Q_INVOKABLE void setDockRoundedWindow(bool enable); @@ -66,6 +70,7 @@ public: signals: void dockIconSizeChanged(); void dockDirectionChanged(); + void dockVisibilityChanged(); void fontPointSizeChanged(); void dimsWallpaperChanged(); void devicePixelRatioChanged(); @@ -79,6 +84,7 @@ private: int m_dockIconSize; int m_dockDirection; + int m_dockVisibility; int m_fontPointSize; }; diff --git a/src/qml/Dock/Main.qml b/src/qml/Dock/Main.qml index 3aacf04..506e572 100644 --- a/src/qml/Dock/Main.qml +++ b/src/qml/Dock/Main.qml @@ -74,6 +74,7 @@ ItemPage { } } + // Dock Size RoundedItem { Label { text: qsTr("Size") @@ -140,6 +141,29 @@ ItemPage { } } + // Visibility + RoundedItem { + Label { + text: qsTr("Visibility") + color: FishUI.Theme.disabledTextColor + } + + ComboBox { + Layout.fillWidth: true + model: ListModel { + ListElement { + name: qsTr("Always show") + } + + ListElement { + name: qsTr("Always hidden") + } + } + currentIndex: appearance.dockVisibility + onCurrentIndexChanged: appearance.setDockVisibility(currentIndex) + } + } + Item { Layout.fillHeight: true } diff --git a/translations/az_AZ.ts b/translations/az_AZ.ts index e7db414..58b898e 100644 --- a/translations/az_AZ.ts +++ b/translations/az_AZ.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/be_BY.ts b/translations/be_BY.ts index b2ea394..906434a 100644 --- a/translations/be_BY.ts +++ b/translations/be_BY.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index 9b6f2be..d23b40a 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -162,25 +162,25 @@ - + Small Malý - + Medium Střední - + Large Velký - + Huge Obrovský @@ -340,10 +340,25 @@ Vpravo - + Size Velikost + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Sítě diff --git a/translations/de_DE.ts b/translations/de_DE.ts index c566d64..528845d 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -162,25 +162,25 @@ - + Small Klein - + Medium Mittel - + Large Groß - + Huge Riesig @@ -340,10 +340,25 @@ Rechts - + Size Größe + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/en_US.ts b/translations/en_US.ts index a84745a..9c2e4e5 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/eo_XX.ts b/translations/eo_XX.ts index df9542c..109c22f 100644 --- a/translations/eo_XX.ts +++ b/translations/eo_XX.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/es_ES.ts b/translations/es_ES.ts index 15f1446..15d04b3 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/es_MX.ts b/translations/es_MX.ts index 2a7a51f..c4df6ac 100644 --- a/translations/es_MX.ts +++ b/translations/es_MX.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index 3f16072..c231d8b 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -162,25 +162,25 @@ - + Small کوچک - + Medium متوسط - + Large بزرگ - + Huge بسیار بزرگ @@ -340,10 +340,25 @@ راست - + Size اندازه + + + Visibility + + + + + Always show + + + + + Always hidden + + Network شبکه diff --git a/translations/fi_FI.ts b/translations/fi_FI.ts index a5972f6..fef5c22 100644 --- a/translations/fi_FI.ts +++ b/translations/fi_FI.ts @@ -162,25 +162,25 @@ - + Small Pieni - + Medium Keskikokoinen - + Large Suuri - + Huge Valtava @@ -340,10 +340,25 @@ Oikealla - + Size Koko + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Verkko diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index a08c02c..ae69c3a 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -162,25 +162,25 @@ - + Small Petite - + Medium Moyenne - + Large Large - + Huge Énorme @@ -340,10 +340,25 @@ Droite - + Size Taille + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Réseau diff --git a/translations/hi_IN.ts b/translations/hi_IN.ts index 166e548..11e3fa2 100644 --- a/translations/hi_IN.ts +++ b/translations/hi_IN.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/id_ID.ts b/translations/id_ID.ts index d920ba5..356e4b8 100644 --- a/translations/id_ID.ts +++ b/translations/id_ID.ts @@ -162,25 +162,25 @@ - + Small Kecil - + Medium Sedang - + Large Besar - + Huge Sangat Besar @@ -340,10 +340,25 @@ Kanan - + Size Ukuran + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Jaringan diff --git a/translations/it_IT.ts b/translations/it_IT.ts index f317c01..1116666 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -162,25 +162,25 @@ - + Small Piccolo - + Medium Medio - + Large Grande - + Huge Enorme @@ -340,10 +340,25 @@ Destra - + Size Dimensione + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Rete diff --git a/translations/nb_NO.ts b/translations/nb_NO.ts index 30819e9..0a5c8b7 100644 --- a/translations/nb_NO.ts +++ b/translations/nb_NO.ts @@ -162,25 +162,25 @@ - + Small Liten - + Medium Middels - + Large Stor - + Huge Enorm @@ -340,10 +340,25 @@ Høyre - + Size Størrelse + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Nettverk diff --git a/translations/ne_NP.ts b/translations/ne_NP.ts index b07eca4..a321f7f 100644 --- a/translations/ne_NP.ts +++ b/translations/ne_NP.ts @@ -162,25 +162,25 @@ - + Small सानो - + Medium मध्यम - + Large ठुलो - + Huge धेरै ठुलो @@ -340,10 +340,25 @@ दायाँ - + Size आकार + + + Visibility + + + + + Always show + + + + + Always hidden + + Network नेटवर्क diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index 599e80f..3267b87 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -162,25 +162,25 @@ - + Small Mały - + Medium Średni - + Large Duży - + Huge Ogromny @@ -340,10 +340,25 @@ Po prawej - + Size Rozmiar + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Sieć diff --git a/translations/pt_BR.ts b/translations/pt_BR.ts index bca9c65..3b99ef5 100644 --- a/translations/pt_BR.ts +++ b/translations/pt_BR.ts @@ -162,25 +162,25 @@ - + Small Pequeno - + Medium Médio - + Large Grande - + Huge Enorme @@ -340,10 +340,25 @@ Direita - + Size Tamanho + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Rede diff --git a/translations/pt_PT.ts b/translations/pt_PT.ts index 463fd40..9d377ec 100644 --- a/translations/pt_PT.ts +++ b/translations/pt_PT.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index f9b4ec7..6bccb99 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -162,25 +162,25 @@ - + Small Маленький - + Medium Средний - + Large Большой - + Huge Огромный @@ -340,10 +340,25 @@ Справа - + Size Размер + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Сеть diff --git a/translations/sv_SE.ts b/translations/sv_SE.ts index 4321e06..b990368 100644 --- a/translations/sv_SE.ts +++ b/translations/sv_SE.ts @@ -162,25 +162,25 @@ - + Small Litet - + Medium Medium - + Large Stort - + Huge Jättestort @@ -340,10 +340,25 @@ Höger - + Size Storlek + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Nätverk diff --git a/translations/tr_TR.ts b/translations/tr_TR.ts index 573a69c..d211444 100644 --- a/translations/tr_TR.ts +++ b/translations/tr_TR.ts @@ -162,25 +162,25 @@ - + Small Küçük - + Medium Orta - + Large Büyük - + Huge Büyük @@ -340,10 +340,25 @@ Sağ - + Size Boyut + + + Visibility + + + + + Always show + + + + + Always hidden + + Network Ağ diff --git a/translations/uk_UA.ts b/translations/uk_UA.ts index 417fd15..c7539a1 100644 --- a/translations/uk_UA.ts +++ b/translations/uk_UA.ts @@ -162,25 +162,25 @@ - + Small Малий - + Medium Середній - + Large Великий - + Huge Величезний @@ -340,10 +340,25 @@ Справа - + Size Розмір + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/uz_UZ.ts b/translations/uz_UZ.ts index 4b256a7..3fb6ee0 100644 --- a/translations/uz_UZ.ts +++ b/translations/uz_UZ.ts @@ -162,25 +162,25 @@ - + Small Kichik - + Medium O'rtacha - + Large Katta - + Huge Ulkan @@ -340,10 +340,25 @@ O'ng - + Size O'lcham + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 14d06dd..437cd19 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -162,25 +162,25 @@ - + Small 小 - + Medium 中 - + Large 大 - + Huge 巨大 @@ -340,10 +340,25 @@ 右侧 - + Size 尺寸 + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/zh_HK.ts b/translations/zh_HK.ts index cc3eca3..6220105 100644 --- a/translations/zh_HK.ts +++ b/translations/zh_HK.ts @@ -162,25 +162,25 @@ - + Small - + Medium - + Large - + Huge @@ -340,10 +340,25 @@ - + Size + + + Visibility + + + + + Always show + + + + + Always hidden + + diff --git a/translations/zh_TW.ts b/translations/zh_TW.ts index 4880ee3..7a68177 100644 --- a/translations/zh_TW.ts +++ b/translations/zh_TW.ts @@ -162,25 +162,25 @@ - + Small 小 - + Medium 中 - + Large 大 - + Huge 巨大 @@ -340,10 +340,25 @@ 右部 - + Size 大小 + + + Visibility + + + + + Always show + + + + + Always hidden + + Network 網路