pull/28/head
reionwong 5 years ago
parent 89a9c7f54e
commit eefb1ce768

@ -27,6 +27,7 @@ int main(int argc, char *argv[])
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
Application app(argc, argv);
app.setWindowIcon(QIcon::fromTheme("cutefish-settings"));
return 0;

@ -105,6 +105,18 @@ ItemPage {
value: about.internalStorage
}
}
Item {
height: FishUI.Units.smallSpacing
}
// StandardButton {
// Layout.fillWidth: true
// text: qsTr("System Update")
// onClicked: {
// rootWindow.stackView.push(Qt.resolvedUrl("qrc:/qml/Update/Main.qml"))
// }
// }
}
}
}

@ -352,7 +352,6 @@ ItemPage {
}
if (appearance.devicePixelRatio !== value) {
rootWindow.showPassiveNotification(qsTr("Need to log in again to take effect"), "short")
appearance.setDevicePixelRatio(value)
}
}

@ -222,9 +222,9 @@ Item {
Layout.preferredHeight: rootWindow.header.height
leftPadding: FishUI.Units.largeSpacing + FishUI.Units.smallSpacing
rightPadding: FishUI.Units.largeSpacing + FishUI.Units.smallSpacing
topPadding: FishUI.Units.largeSpacing
topPadding: FishUI.Units.smallSpacing
bottomPadding: 0
font.pointSize: 15
font.pointSize: 13
}
ListView {

@ -30,6 +30,8 @@ Button {
property color pressedColor: FishUI.Theme.darkMode ? Qt.lighter(backgroundColor, 1.1)
: Qt.darker(backgroundColor, 1.2)
scale: 1
background: Rectangle {
radius: FishUI.Theme.mediumRadius
color: control.pressed ? control.pressedColor : control.hovered ? control.hoveredColor : control.backgroundColor

@ -0,0 +1,41 @@
/*
* Copyright (C) 2021 CutefishOS Team.
*
* Author: revenmartin <revenmartin@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtGraphicalEffects 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: FishUI.Units.largeSpacing * 2
}
}
}

@ -34,6 +34,8 @@ FishUI.Window {
minimumWidth: 900
minimumHeight: 600
property alias stackView: _stackView
background.opacity: FishUI.Theme.darkMode ? 0.7 : 0.5
header.height: 40
contentTopMargin: 0
@ -62,7 +64,7 @@ FishUI.Window {
}
StackView {
id: stackView
id: _stackView
Layout.fillWidth: true
Layout.fillHeight: true
initialItem: Qt.resolvedUrl(sideBar.model.get(0).page)
@ -74,7 +76,8 @@ FishUI.Window {
}
function switchPageFromIndex(index) {
stackView.push(Qt.resolvedUrl(sideBar.model.get(index).page))
_stackView.pop()
_stackView.push(Qt.resolvedUrl(sideBar.model.get(index).page))
}
function switchPageFromName(pageName) {

@ -115,5 +115,6 @@
<file>images/light/world.svg</file>
<file>images/dark/world.svg</file>
<file>images/sidebar/dark/datetime.svg</file>
<file>qml/Update/Main.qml</file>
</qresource>
</RCC>

Loading…
Cancel
Save