diff --git a/CMakeLists.txt b/CMakeLists.txt index dc055ab..74b8733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,14 +7,13 @@ project(cutefish-settings set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src") -set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_CURRENT_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -set(QT Core Gui Quick QuickControls2 DBus Xml Concurrent LinguistTools) +set(QT Core Gui Quick QuickControls2 DBus Concurrent LinguistTools) find_package(Qt6 REQUIRED ${QT}) find_package(Freetype REQUIRED) find_package(PkgConfig REQUIRED) @@ -48,7 +47,6 @@ set(SRCS src/cursor/cursortheme.cpp src/cursor/mouse.cpp src/datetime/time.cpp - src/datetime/timezonedata.h src/datetime/timezonemap.cpp src/datetime/timedated_interface.cpp src/touchpad.cpp @@ -81,9 +79,7 @@ target_link_libraries(${PROJECT_NAME} Qt6::Quick Qt6::QuickControls2 Qt6::DBus - Qt6::Xml Qt6::Concurrent - # FishUI PkgConfig::FontConfig ${FREETYPE_LIBRARIES} diff --git a/src/about.cpp b/src/about.cpp index 0c7e12c..cede478 100644 --- a/src/about.cpp +++ b/src/about.cpp @@ -66,31 +66,16 @@ QString About::version() return this->prettyProductName(); } -QString About::osName() -{ - return QSysInfo::prettyProductName(); -} - QString About::architecture() { return QSysInfo::currentCpuArchitecture(); } -QString About::kernelType() -{ - return QSysInfo::kernelType(); -} - QString About::kernelVersion() { return QSysInfo::kernelVersion(); } -QString About::hostname() -{ - return QSysInfo::machineHostName(); -} - QString About::userName() { QByteArray userName = qgetenv("USER"); diff --git a/src/about.h b/src/about.h index 2167dc9..de1db38 100644 --- a/src/about.h +++ b/src/about.h @@ -13,10 +13,8 @@ class About : public QObject { Q_OBJECT Q_PROPERTY(QString version READ version CONSTANT) - Q_PROPERTY(QString osName READ osName CONSTANT) Q_PROPERTY(QString architecture READ architecture CONSTANT) Q_PROPERTY(QString kernelVersion READ kernelVersion CONSTANT) - Q_PROPERTY(QString hostname READ hostname CONSTANT) Q_PROPERTY(QString userName READ userName CONSTANT) Q_PROPERTY(QString memorySize READ memorySize CONSTANT) Q_PROPERTY(QString prettyProductName READ prettyProductName CONSTANT) @@ -28,13 +26,9 @@ public: QString version(); - QString osName(); QString architecture(); - QString kernelType(); QString kernelVersion(); - QString hostname(); QString userName(); - QString settingsVersion(); QString memorySize(); QString prettyProductName(); QString internalStorage(); diff --git a/src/batteryhistorymodel.cpp b/src/batteryhistorymodel.cpp index 9e6d5f2..b3d43b5 100644 --- a/src/batteryhistorymodel.cpp +++ b/src/batteryhistorymodel.cpp @@ -119,15 +119,6 @@ int BatteryHistoryModel::count() const return m_values.count(); } -int BatteryHistoryModel::firstDataPointTime() const -{ - if (m_values.isEmpty()) { - return 0; - } - - return m_values.first().time; -} - int BatteryHistoryModel::lastDataPointTime() const { if (m_values.isEmpty()) { diff --git a/src/batteryhistorymodel.h b/src/batteryhistorymodel.h index ea2d850..b53ff1c 100644 --- a/src/batteryhistorymodel.h +++ b/src/batteryhistorymodel.h @@ -47,7 +47,6 @@ class BatteryHistoryModel : public QObject, public QQmlParserStatus Q_PROPERTY(QVariantList points READ asPoints NOTIFY dataChanged) Q_PROPERTY(int count READ count NOTIFY dataChanged) - Q_PROPERTY(int firstDataPointTime READ firstDataPointTime NOTIFY dataChanged) Q_PROPERTY(int lastDataPointTime READ lastDataPointTime NOTIFY dataChanged) Q_PROPERTY(int largestValue READ largestValue NOTIFY dataChanged) @@ -77,7 +76,6 @@ public: QVariantList asPoints() const; int count() const; - int firstDataPointTime() const; int lastDataPointTime() const; int largestValue() const; diff --git a/src/datetime/timezonedata.h b/src/datetime/timezonedata.h deleted file mode 100644 index 771b19f..0000000 --- a/src/datetime/timezonedata.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TIMEZONEDATA_H -#define TIMEZONEDATA_H - -#include - -class TimeZoneData -{ -public: - QString id; - QString region; - QString city; - QString comment; - bool checked; - int offsetFromUtc; -}; - -#endif // TIMEZONEDATA_H diff --git a/src/images/sidebar/light/about.svg b/src/images/sidebar/light/about.svg deleted file mode 100644 index 06214f8..0000000 --- a/src/images/sidebar/light/about.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/src/images/sidebar/light/accounts.svg b/src/images/sidebar/light/accounts.svg deleted file mode 100644 index b6a516c..0000000 --- a/src/images/sidebar/light/accounts.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/images/sidebar/light/appearance.svg b/src/images/sidebar/light/appearance.svg deleted file mode 100644 index b188ef7..0000000 --- a/src/images/sidebar/light/appearance.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/images/sidebar/light/battery.svg b/src/images/sidebar/light/battery.svg deleted file mode 100644 index 9da12b3..0000000 --- a/src/images/sidebar/light/battery.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/src/images/sidebar/light/bluetooth.svg b/src/images/sidebar/light/bluetooth.svg deleted file mode 100644 index 3a24e0f..0000000 --- a/src/images/sidebar/light/bluetooth.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/images/sidebar/light/display.svg b/src/images/sidebar/light/display.svg deleted file mode 100644 index f69a9a5..0000000 --- a/src/images/sidebar/light/display.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/images/sidebar/light/dock.svg b/src/images/sidebar/light/dock.svg deleted file mode 100644 index 5478ba0..0000000 --- a/src/images/sidebar/light/dock.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/images/sidebar/light/language.svg b/src/images/sidebar/light/language.svg deleted file mode 100644 index 08e412b..0000000 --- a/src/images/sidebar/light/language.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/src/images/sidebar/light/network.svg b/src/images/sidebar/light/network.svg deleted file mode 100644 index 69cad68..0000000 --- a/src/images/sidebar/light/network.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/images/sidebar/light/power.svg b/src/images/sidebar/light/power.svg deleted file mode 100644 index c2dcea9..0000000 --- a/src/images/sidebar/light/power.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/src/images/sidebar/light/wallpaper.svg b/src/images/sidebar/light/wallpaper.svg deleted file mode 100644 index 092f227..0000000 --- a/src/images/sidebar/light/wallpaper.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/qml/Application/Main.qml b/src/qml/Application/Main.qml deleted file mode 100644 index 480c6e8..0000000 --- a/src/qml/Application/Main.qml +++ /dev/null @@ -1,70 +0,0 @@ -// SPDX-FileCopyrightText: 2026 Reion Wong -// SPDX-License-Identifier: GPL-3.0-or-later - -import QtQuick 2.4 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.3 - -import Cutefish.Settings 1.0 -import FishUI 1.0 as FishUI -import "../" - -ItemPage { - id: control - headerTitle: qsTr("Application") - - Scrollable { - anchors.fill: parent - contentHeight: layout.implicitHeight - - ColumnLayout { - id: layout - anchors.fill: parent - spacing: Metrics.sectionLabelSpacing - - SectionLabel { - text: qsTr("Default application") - } - - RoundedItem { - GridLayout { - columns: 2 - columnSpacing: Metrics.formColumnSpacing - rowSpacing: Metrics.formRowSpacing - - FishUI.Label { - text: qsTr("Web browser") - } - - FishUI.ComboBox { - Layout.fillWidth: true - } - - FishUI.Label { - text: qsTr("File manager") - } - - FishUI.ComboBox { - Layout.fillWidth: true - } - - FishUI.Label { - text: qsTr("Email") - } - - FishUI.ComboBox { - Layout.fillWidth: true - } - - FishUI.Label { - text: qsTr("Terminal emulator") - } - - FishUI.ComboBox { - Layout.fillWidth: true - } - } - } - } - } -} diff --git a/src/qml/SideBar.qml b/src/qml/SideBar.qml index bb6185f..7bd9135 100644 --- a/src/qml/SideBar.qml +++ b/src/qml/SideBar.qml @@ -385,15 +385,6 @@ Item { keywords: qsTr("web browser, email client, terminal") } -// ListElement { -// title: qsTr("Application") -// name: "application" -// page: "qrc:/qml/Application/Main.qml" -// iconSource: "accounts.svg" -// iconColor: "#DA7C43" -// category: qsTr("System") -// } - ListElement { title: qsTr("Battery") name: "battery" diff --git a/src/qml/Update/Main.qml b/src/qml/Update/Main.qml deleted file mode 100644 index f6f6d95..0000000 --- a/src/qml/Update/Main.qml +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-FileCopyrightText: 2026 Reion Wong -// SPDX-License-Identifier: GPL-3.0-or-later - -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -import Cutefish.Settings 1.0 -import FishUI 1.0 as FishUI -import "../" - -ItemPage { - // headerTitle: qsTr("Update") - - Scrollable { - anchors.fill: parent - contentHeight: layout.implicitHeight - - ColumnLayout { - id: layout - anchors.fill: parent - spacing: Metrics.sectionSpacing - } - } -} diff --git a/src/resources.qrc b/src/resources.qrc index 8955ed1..0c6d725 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -48,16 +48,6 @@ images/sidebar/dark/language.svg images/sidebar/dark/network.svg images/sidebar/dark/wallpaper.svg - images/sidebar/light/about.svg - images/sidebar/light/accounts.svg - images/sidebar/light/appearance.svg - images/sidebar/light/battery.svg - images/sidebar/light/bluetooth.svg - images/sidebar/light/display.svg - images/sidebar/light/dock.svg - images/sidebar/light/language.svg - images/sidebar/light/network.svg - images/sidebar/light/wallpaper.svg qml/RoundedItem.qml images/powersave.svg images/balanced.svg @@ -74,7 +64,6 @@ qml/Battery/BatterySection.qml qml/Battery/HistoryGraph.qml qml/Dock/Main.qml - images/sidebar/light/power.svg images/sidebar/dark/power.svg qml/WLAN/Main.qml qml/Wired/Main.qml @@ -87,7 +76,6 @@ qml/StandardButton.qml qml/Hotspot/Main.qml qml/Network/Main.qml - qml/Application/Main.qml qml/Cursor/Main.qml qml/Keyboard/Main.qml qml/Keyboard/InputMethodRow.qml @@ -102,7 +90,6 @@ images/light/world.svg images/dark/world.svg images/sidebar/dark/datetime.svg - qml/Update/Main.qml qml/Touchpad/Main.qml qml/Touchscreen/Main.qml qml/Shortcuts/Main.qml diff --git a/src/timezonedata.h b/src/timezonedata.h deleted file mode 100644 index 314a302..0000000 --- a/src/timezonedata.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef TIMEZONEDATA_H -#define TIMEZONEDATA_H - -#endif // TIMEZONEDATA_H