diff --git a/src/appearance.cpp b/src/appearance.cpp index 8a03e3a..736ee9b 100644 --- a/src/appearance.cpp +++ b/src/appearance.cpp @@ -21,11 +21,7 @@ #include #include -#include -#include -#include -#include #include Appearance::Appearance(QObject *parent) @@ -35,8 +31,6 @@ Appearance::Appearance(QObject *parent) "com.cutefish.Theme", QDBusConnection::sessionBus()) , m_dockSettings(new QSettings(QSettings::UserScope, "cutefishos", "dock")) - , m_kwinSettings(new QSettings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/kwinrc", - QSettings::IniFormat)) , m_dockIconSize(0) , m_dockDirection(0) , m_dockVisibility(0) @@ -49,10 +43,6 @@ Appearance::Appearance(QObject *parent) // Dock only supports the centered style. Migrate old Full style settings. m_dockSettings->setValue("Style", 0); - m_kwinSettings->beginGroup("Plugins"); - m_minimiumAnimation = m_kwinSettings->value("magiclampEnabled").toBool() ? 1 : 0; - m_kwinSettings->endGroup(); - // Init if (m_interface.isValid()) { m_fontPointSize = m_interface.property("systemFontPointSize").toInt(); @@ -239,22 +229,3 @@ void Appearance::setDevicePixelRatio(double value) iface.call("setDevicePixelRatio", value); } } - -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(); - } -} diff --git a/src/appearance.h b/src/appearance.h index f26e586..d4f4a4c 100644 --- a/src/appearance.h +++ b/src/appearance.h @@ -35,7 +35,6 @@ class Appearance : public QObject Q_PROPERTY(bool blurEnabled READ blurEnabled WRITE setBlurEnabled NOTIFY blurEnabledChanged) Q_PROPERTY(double devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged) Q_PROPERTY(bool dockRoundedWindow READ dockRoundedWindow WRITE setDockRoundedWindow NOTIFY dockRoundedWindowChanged) - Q_PROPERTY(int minimiumAnimation READ minimiumAnimation WRITE setMinimiumAnimation NOTIFY minimiumAnimationChanged) public: explicit Appearance(QObject *parent = nullptr); @@ -71,9 +70,6 @@ public: double devicePixelRatio() const; Q_INVOKABLE void setDevicePixelRatio(double value); - int minimiumAnimation() const; - void setMinimiumAnimation(int minimiumAnimation); - signals: void dockIconSizeChanged(); void dockDirectionChanged(); @@ -83,20 +79,16 @@ signals: void blurEnabledChanged(); void devicePixelRatioChanged(); void dockRoundedWindowChanged(); - void minimiumAnimationChanged(); private: QDBusInterface m_interface; QSettings *m_dockSettings; - QSettings *m_kwinSettings; bool m_dockRoundedWindow; int m_dockIconSize; int m_dockDirection; int m_dockVisibility; int m_fontPointSize; - - int m_minimiumAnimation; }; #endif // APPEARANCE_H diff --git a/src/qml/About/Main.qml b/src/qml/About/Main.qml index e357a65..9a5e54a 100644 --- a/src/qml/About/Main.qml +++ b/src/qml/About/Main.qml @@ -57,7 +57,7 @@ ItemPage { Label { Layout.alignment: Qt.AlignTop | Qt.AlignHCenter - text: "Openfish" + text: "Cutefish" visible: !about.isCutefishOS font.pointSize: 22 color: "#3385FF" diff --git a/src/qml/Appearance/Main.qml b/src/qml/Appearance/Main.qml index 32a883d..2ae233d 100644 --- a/src/qml/Appearance/Main.qml +++ b/src/qml/Appearance/Main.qml @@ -123,30 +123,6 @@ 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") diff --git a/translations/bn_BD.ts b/translations/bn_BD.ts index f5d731a..f7cd1e5 100644 --- a/translations/bn_BD.ts +++ b/translations/bn_BD.ts @@ -123,21 +123,6 @@ Dim the wallpaper in dark theme গাঢ় থিমে ওয়ালপেপার ম্লান করুন - - - Minimize animation - মিনিমাইজের এ্যানিমেশন - - - - Default - ডিফল্ট - - - - Magic Lamp - ম্যাজিক ল্যাম্প - Accent color diff --git a/translations/en_US.ts b/translations/en_US.ts index 883b177..1ce991d 100644 --- a/translations/en_US.ts +++ b/translations/en_US.ts @@ -123,21 +123,6 @@ Dim the wallpaper in dark theme - - - Minimize animation - - - - - Default - - - - - Magic Lamp - - Accent color diff --git a/translations/hr_HR.ts b/translations/hr_HR.ts index c3444fb..d41d947 100644 --- a/translations/hr_HR.ts +++ b/translations/hr_HR.ts @@ -123,21 +123,6 @@ Dim the wallpaper in dark theme Zamrači pozadinu u Tamnoj temi - - - Minimize animation - Smanji animacije - - - - Default - Zadano - - - - Magic Lamp - Magična lampa - Accent color diff --git a/translations/ja_JP.ts b/translations/ja_JP.ts index 53f3234..7862404 100644 --- a/translations/ja_JP.ts +++ b/translations/ja_JP.ts @@ -136,21 +136,6 @@ Dim the wallpaper in dark theme ダークテーマで壁紙を暗くする - - - Minimize animation - 最小化アニメーション - - - - Default - デフォルト - - - - Magic Lamp - 魔法のランプ - Accent color diff --git a/translations/mg.ts b/translations/mg.ts index d6faaf6..2bc6f3b 100644 --- a/translations/mg.ts +++ b/translations/mg.ts @@ -90,21 +90,6 @@ Dim the wallpaper in dark theme Hampifanarahana amin'ny loha-hevitra Maizina ny fond d'ecran - - - Minimize animation - Atao somary kelikely ny fihetsiketsehana - - - - Default - Par defaut - - - - Magic Lamp - Jiro majika - Accent color diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 6437514..6f16376 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -123,21 +123,6 @@ Dim the wallpaper in dark theme Verduister de bureaubladachtergrond van het donkere thema - - - Minimize animation - Minimaliseeranimatie - - - - Default - Standaard - - - - Magic Lamp - Magische lamp - Accent color diff --git a/translations/sr_RS.ts b/translations/sr_RS.ts index 8a7c423..e256776 100644 --- a/translations/sr_RS.ts +++ b/translations/sr_RS.ts @@ -136,21 +136,6 @@ Dim the wallpaper in dark theme Zatamni pozadinu u tamnom režimu - - - Minimize animation - Minimiziraj animaciju - - - - Default - Standardni - - - - Magic Lamp - Magicna Lampa - Accent color diff --git a/translations/tzm.ts b/translations/tzm.ts index 3dcae0b..f466fea 100644 --- a/translations/tzm.ts +++ b/translations/tzm.ts @@ -123,21 +123,6 @@ Dim the wallpaper in dark theme - - - Minimize animation - - - - - Default - - - - - Magic Lamp - - Accent color diff --git a/translations/vi_VN.ts b/translations/vi_VN.ts index 19d2766..fbb7ebd 100644 --- a/translations/vi_VN.ts +++ b/translations/vi_VN.ts @@ -90,21 +90,6 @@ Dim the wallpaper in dark theme Làm mờ hình nền khi ở chế độ tối - - - Minimize animation - Hiệu ứng thu nhỏ - - - - Default - Mặc định - - - - Magic Lamp - Chiếc đèn thần kì - Accent color diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 49e8254..282a66f 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -123,21 +123,6 @@ Dim the wallpaper in dark theme 在深色模式下调暗壁纸 - - - Minimize animation - 最小化动画 - - - - Default - 默认 - - - - Magic Lamp - 神灯 - Accent color