From fe7cfccbac4e4241c56847a42263e8d50d9ba5c0 Mon Sep 17 00:00:00 2001 From: cutefishd Date: Sat, 20 Mar 2021 16:45:15 +0800 Subject: [PATCH] Add debian files --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 27 +++++++++++++++++++++++++++ debian/copyright | 3 +++ debian/rules | 9 +++++++++ debian/source/format | 1 + src/background.cpp | 2 +- src/qml/AppearancePage.qml | 1 + src/qml/IconCheckBox.qml | 2 +- src/qml/SideBar.qml | 18 +++++++++--------- src/qml/main.qml | 6 +++--- 11 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8c549ab --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +cutefish-settings (0.1) UNRELEASED; urgency=low + + * Initial release (CutefishOS) + + -- CutefishOS Thu, 16 Oct 2014 17:22:15 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..28250e9 --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: cutefish-settings +Section: devel +Priority: optional +Maintainer: CutefishOS +Build-Depends: cmake, + debhelper (>= 9), + extra-cmake-modules, + libfreetype6-dev, + libfontconfig1-dev, + libkf5networkmanagerqt-dev, + libkf5coreaddons-dev, + modemmanager-qt-dev, + qtbase5-dev, + qtdeclarative5-dev, + qtquickcontrols2-5-dev, + qttools5-dev, + qttools5-dev-tools +Standards-Version: 4.5.0 +Homepage: https://github.com/cutefishos/terminal + +Package: cutefish-settings +Architecture: any +Depends: qml-module-qtquick-controls2, + qml-module-qtquick2, + ${misc:Depends}, + ${shlibs:Depends} +Description: CutefishOS Settings diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..716fe64 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,3 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: calamares +Source: diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ab2f7c3 --- /dev/null +++ b/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +export QT_SELECT=5 + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- -DEMBED_TRANSLATIONS=ON -DBUILD_TESTING=ON diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/src/background.cpp b/src/background.cpp index 37ceaf2..453386a 100644 --- a/src/background.cpp +++ b/src/background.cpp @@ -4,7 +4,7 @@ static QVariantList getBackgroundPaths() { QVariantList list; - QDirIterator it("/usr/share/backgrounds", QStringList() << "*.jpg" << "*.png", QDir::Files, QDirIterator::Subdirectories); + QDirIterator it("/usr/share/wallpapers/cutefishos", QStringList() << "*.jpg" << "*.png", QDir::Files, QDirIterator::Subdirectories); while (it.hasNext()) { QString bg = it.next(); list.append(QVariant(bg)); diff --git a/src/qml/AppearancePage.qml b/src/qml/AppearancePage.qml index b9a54bc..78a496b 100644 --- a/src/qml/AppearancePage.qml +++ b/src/qml/AppearancePage.qml @@ -41,6 +41,7 @@ ItemPage { Scrollable { anchors.fill: parent + anchors.bottomMargin: Meui.Units.smallSpacing contentHeight: layout.implicitHeight ColumnLayout { diff --git a/src/qml/IconCheckBox.qml b/src/qml/IconCheckBox.qml index 1956fec..8918ba1 100644 --- a/src/qml/IconCheckBox.qml +++ b/src/qml/IconCheckBox.qml @@ -12,7 +12,7 @@ Item { property alias text: label.text property bool checked: false - property var iconSize: 128 + property var iconSize: 120 signal clicked diff --git a/src/qml/SideBar.qml b/src/qml/SideBar.qml index b0a6bdb..3d3a23b 100644 --- a/src/qml/SideBar.qml +++ b/src/qml/SideBar.qml @@ -5,7 +5,7 @@ import QtGraphicalEffects 1.0 import MeuiKit 1.0 as Meui Item { - implicitWidth: 260 + implicitWidth: 230 property int itemRadiusV: 8 @@ -100,10 +100,7 @@ Item { } ColumnLayout { - anchors { - fill: parent - margins: Meui.Units.largeSpacing - } + anchors.fill: parent ListView { id: listView @@ -113,6 +110,9 @@ Item { model: listModel spacing: Meui.Units.smallSpacing * 1.5 + leftMargin: Meui.Units.largeSpacing + rightMargin: Meui.Units.largeSpacing + topMargin: Meui.Units.smallSpacing * 1.5 ScrollBar.vertical: ScrollBar {} @@ -120,15 +120,15 @@ Item { highlightMoveDuration: 0 highlightResizeDuration : 0 highlight: Rectangle { - radius: Meui.Theme.bigRadius + radius: Meui.Theme.mediumRadius color: Meui.Theme.highlightColor smooth: true } delegate: Item { id: item - implicitWidth: listView.width - implicitHeight: 48 + width: ListView.view.width - ListView.view.leftMargin - ListView.view.rightMargin + height: 43 property bool isCurrent: listView.currentIndex === index @@ -143,7 +143,7 @@ Item { onClicked: listView.currentIndex = index } - radius: Meui.Theme.bigRadius + radius: Meui.Theme.mediumRadius color: isCurrent ? "transparent" : mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r, Meui.Theme.textColor.g, Meui.Theme.textColor.b, diff --git a/src/qml/main.qml b/src/qml/main.qml index 4b40944..b5022fb 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -9,8 +9,8 @@ Meui.Window { id: rootWindow title: qsTr("Settings") visible: true - width: 1000 - height: 650 + width: 900 + height: 610 minimumWidth: 900 minimumHeight: 600 @@ -38,7 +38,7 @@ Meui.Window { Label { text: rootWindow.title - leftPadding: Meui.Units.largeSpacing * 2 + Meui.Units.smallSpacing + leftPadding: Meui.Units.largeSpacing + Meui.Units.smallSpacing font.pointSize: parent.height / 3 Layout.preferredWidth: sideBar.width Layout.alignment: Qt.AlignBottom