aiden
/
settings
mirror of https://github.com/cutefishos/settings
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update FishUI

Browse Source
pull/11/head
cutefishd 5 years ago
parent ddbcca7d6e
commit 9e9d5ee6c5
27 changed files with 210 additions and 210 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape Escape View File

@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_CURRENT
set(QT Core Gui Widgets Quick QuickControls2 DBus Xml Concurrent LinguistTools)
find_package(Qt5 REQUIRED ${QT})
find_package(MeuiKit REQUIRED)
find_package(FishUI REQUIRED)
find_package(Freetype REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(Libcrypt REQUIRED)
@ -59,7 +59,7 @@ target_link_libraries(${PROJECT_NAME}
Qt5::DBus
Qt5::Xml
Qt5::Concurrent
MeuiKit
FishUI
KF5::NetworkManagerQt
KF5::ModemManagerQt

10
src/qml/AboutPage.qml
Unescape Escape View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0
ItemPage {
@ -32,15 +32,15 @@ ItemPage {
text: "<b>CutefishOS</b>"
font.pointSize: 24
color: "#3385FF"
leftPadding: Meui.Units.largeSpacing * 2
rightPadding: Meui.Units.largeSpacing * 2
leftPadding: FishUI.Units.largeSpacing * 2
rightPadding: FishUI.Units.largeSpacing * 2
}
// Label {
// text: qsTr("Built on ") + about.prettyProductName
// Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
// bottomPadding: Meui.Units.largeSpacing * 2
// color: Meui.Theme.disabledTextColor
// bottomPadding: FishUI.Units.largeSpacing * 2
// color: FishUI.Theme.disabledTextColor
// }
StandardItem {

6
src/qml/AccountsPage.qml
Unescape Escape View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0
import Cutefish.Accounts 1.0
@ -36,7 +36,7 @@ ItemPage {
id: _userView
model: userModel
Layout.fillWidth: true
spacing: Meui.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
interactive: false
Layout.preferredHeight: {
@ -56,7 +56,7 @@ ItemPage {
}
Item {
height: Meui.Units.smallSpacing
height: FishUI.Units.smallSpacing
}
Button {

10
src/qml/AddUserDialog.qml
Unescape Escape View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0
import Cutefish.Accounts 1.0
@ -11,7 +11,7 @@ Dialog {
x: (parent.width - width) / 2
y: (parent.height - height) / 2
modal: true
padding: Meui.Units.largeSpacing * 2
padding: FishUI.Units.largeSpacing * 2
onRejected: clear()
@ -41,7 +41,7 @@ Dialog {
}
footer: DialogButtonBox {
padding: Meui.Units.largeSpacing * 2
padding: FishUI.Units.largeSpacing * 2
Button {
id: cancelButton
@ -68,8 +68,8 @@ Dialog {
ColumnLayout {
GridLayout {
columns: 2
columnSpacing: Meui.Units.largeSpacing
rowSpacing: Meui.Units.smallSpacing
columnSpacing: FishUI.Units.largeSpacing
rowSpacing: FishUI.Units.smallSpacing
Label {
text: qsTr("User name")

54
src/qml/AppearancePage.qml
Unescape Escape View File

@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import Cutefish.Settings 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
ItemPage {
headerTitle: qsTr("Appearance")
@ -46,39 +46,39 @@ ItemPage {
ColumnLayout {
id: layout
anchors.fill: parent
anchors.bottomMargin: Meui.Units.largeSpacing
anchors.bottomMargin: FishUI.Units.largeSpacing
Label {
text: qsTr("Theme")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.smallSpacing
}
// Light Mode and Dark Mode
RowLayout {
spacing: Meui.Units.largeSpacing * 2
spacing: FishUI.Units.largeSpacing * 2
IconCheckBox {
source: "qrc:/images/light_mode.svg"
text: qsTr("Light")
checked: !Meui.Theme.darkMode
checked: !FishUI.Theme.darkMode
onClicked: appearance.switchDarkMode(false)
}
IconCheckBox {
source: "qrc:/images/dark_mode.svg"
text: qsTr("Dark")
checked: Meui.Theme.darkMode
checked: FishUI.Theme.darkMode
onClicked: appearance.switchDarkMode(true)
}
}
Item {
height: Meui.Units.largeSpacing
height: FishUI.Units.largeSpacing
}
RowLayout {
spacing: Meui.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
Label {
id: dimsTipsLabel
@ -102,13 +102,13 @@ ItemPage {
Label {
text: qsTr("Accent color")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.smallSpacing
}
GridView {
id: accentColorView
height: itemSize + Meui.Units.largeSpacing * 2
height: itemSize + FishUI.Units.largeSpacing * 2
Layout.fillWidth: true
cellWidth: height
cellHeight: height
@ -118,19 +118,19 @@ ItemPage {
property var itemSize: 32
Component.onCompleted: {
model.append({"accentColor": String(Meui.Theme.blueColor)})
model.append({"accentColor": String(Meui.Theme.redColor)})
model.append({"accentColor": String(Meui.Theme.greenColor)})
model.append({"accentColor": String(Meui.Theme.purpleColor)})
model.append({"accentColor": String(Meui.Theme.pinkColor)})
model.append({"accentColor": String(Meui.Theme.orangeColor)})
model.append({"accentColor": String(FishUI.Theme.blueColor)})
model.append({"accentColor": String(FishUI.Theme.redColor)})
model.append({"accentColor": String(FishUI.Theme.greenColor)})
model.append({"accentColor": String(FishUI.Theme.purpleColor)})
model.append({"accentColor": String(FishUI.Theme.pinkColor)})
model.append({"accentColor": String(FishUI.Theme.orangeColor)})
}
delegate: Rectangle {
property bool checked: Qt.colorEqual(Meui.Theme.highlightColor, accentColor)
property bool checked: Qt.colorEqual(FishUI.Theme.highlightColor, accentColor)
property color currentColor: accentColor
width: accentColorView.itemSize + Meui.Units.largeSpacing
width: accentColorView.itemSize + FishUI.Units.largeSpacing
height: width
color: "transparent"
radius: width / 2
@ -167,7 +167,7 @@ ItemPage {
ColorOverlay {
anchors.fill: parent
source: parent
color: Meui.Theme.highlightedTextColor
color: FishUI.Theme.highlightedTextColor
opacity: 1
visible: true
}
@ -181,19 +181,19 @@ ItemPage {
// Font
Label {
text: qsTr("Font")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.smallSpacing
}
GridLayout {
rows: 3
columns: 2
columnSpacing: Meui.Units.largeSpacing * 2
columnSpacing: FishUI.Units.largeSpacing * 2
Label {
text: qsTr("General Font")
bottomPadding: Meui.Units.smallSpacing
bottomPadding: FishUI.Units.smallSpacing
}
ComboBox {
@ -206,7 +206,7 @@ ItemPage {
Label {
text: qsTr("Fixed Font")
bottomPadding: Meui.Units.smallSpacing
bottomPadding: FishUI.Units.smallSpacing
}
ComboBox {
@ -219,7 +219,7 @@ ItemPage {
Label {
text: qsTr("Font Size")
bottomPadding: Meui.Units.smallSpacing
bottomPadding: FishUI.Units.smallSpacing
}
TabBar {

22
src/qml/BatteryItem.qml
Unescape Escape View File

@ -2,7 +2,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtGraphicalEffects 1.0
import QtQuick.Particles 2.12
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Item {
id: control
@ -15,9 +15,9 @@ Item {
Rectangle {
id: bgRect
anchors.fill: parent
color: Qt.rgba(Meui.Theme.highlightColor.r,
Meui.Theme.highlightColor.g,
Meui.Theme.highlightColor.b, 0.5)
color: Qt.rgba(FishUI.Theme.highlightColor.r,
FishUI.Theme.highlightColor.g,
FishUI.Theme.highlightColor.b, 0.5)
radius: control.radius
layer.enabled: true
@ -39,16 +39,16 @@ Item {
anchors.top: parent.top
anchors.bottom: parent.bottom
width: control.width * (control.value / 100)
color: Meui.Theme.highlightColor
color: FishUI.Theme.highlightColor
opacity: 1
gradient: Gradient {
GradientStop { position: 0.0; color: Qt.rgba(Meui.Theme.highlightColor.r,
Meui.Theme.highlightColor.g,
Meui.Theme.highlightColor.b, 1) }
GradientStop { position: 1.0; color: Qt.rgba(Meui.Theme.highlightColor.r,
Meui.Theme.highlightColor.g,
Meui.Theme.highlightColor.b, 0.6) }
GradientStop { position: 0.0; color: Qt.rgba(FishUI.Theme.highlightColor.r,
FishUI.Theme.highlightColor.g,
FishUI.Theme.highlightColor.b, 1) }
GradientStop { position: 1.0; color: Qt.rgba(FishUI.Theme.highlightColor.r,
FishUI.Theme.highlightColor.g,
FishUI.Theme.highlightColor.b, 0.6) }
}
Behavior on width {

12
src/qml/BatteryPage.qml
Unescape Escape View File

@ -1,7 +1,7 @@
import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0
ItemPage {
@ -44,7 +44,7 @@ ItemPage {
ColumnLayout {
id: layout
anchors.fill: parent
spacing: Meui.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
// Battery Info
BatteryItem {
@ -55,7 +55,7 @@ ItemPage {
ColumnLayout {
anchors.fill: parent
anchors.leftMargin: batteryBackground.radius + Meui.Units.smallSpacing
anchors.leftMargin: batteryBackground.radius + FishUI.Units.smallSpacing
Item {
Layout.fillHeight: true
@ -99,12 +99,12 @@ ItemPage {
}
Item {
height: Meui.Units.largeSpacing
height: FishUI.Units.largeSpacing
}
Label {
text: qsTr("History")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
HistoryGraph {
@ -148,7 +148,7 @@ ItemPage {
}
Item {
height: Meui.Units.smallSpacing
height: FishUI.Units.smallSpacing
}
StandardItem {

4
src/qml/BluetoothPage.qml
Unescape Escape View File

@ -2,7 +2,7 @@ import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import Cutefish.Settings 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import org.kde.bluezqt 1.0 as BluezQt
import org.kde.plasma.private.bluetooth 1.0
@ -38,7 +38,7 @@ ItemPage {
ColumnLayout {
id: layout
anchors.fill: parent
anchors.bottomMargin: Meui.Units.largeSpacing
anchors.bottomMargin: FishUI.Units.largeSpacing
Switch {
id: bluetoothSwitch

26
src/qml/DisplayPage.qml
Unescape Escape View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import Cutefish.Settings 1.0
import Cutefish.Screen 1.0 as CS
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
ItemPage {
headerTitle: qsTr("Display")
@ -38,13 +38,13 @@ ItemPage {
Label {
text: qsTr("Brightness")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.largeSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.largeSpacing
visible: brightness.enabled
}
RowLayout {
spacing: Meui.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
visible: brightness.enabled
Image {
@ -52,7 +52,7 @@ ItemPage {
height: width
sourceSize.width: width
sourceSize.height: height
source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark" : "light") + "/display-brightness-low-symbolic.svg"
source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark" : "light") + "/display-brightness-low-symbolic.svg"
}
Slider {
@ -70,12 +70,12 @@ ItemPage {
height: width
sourceSize.width: width
sourceSize.height: height
source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark" : "light") + "/display-brightness-symbolic.svg"
source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark" : "light") + "/display-brightness-symbolic.svg"
}
}
Item {
height: Meui.Units.largeSpacing
height: FishUI.Units.largeSpacing
visible: brightness.enabled
}
@ -85,8 +85,8 @@ ItemPage {
Label {
text: qsTr("Screen")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.smallSpacing
visible: _screenView.count > 0
}
@ -118,8 +118,8 @@ ItemPage {
GridLayout {
columns: 2
columnSpacing: Meui.Units.largeSpacing
rowSpacing: Meui.Units.smallSpacing
columnSpacing: FishUI.Units.largeSpacing
rowSpacing: FishUI.Units.smallSpacing
Label {
text: qsTr("Resolution")
@ -216,8 +216,8 @@ ItemPage {
Label {
text: qsTr("Scale")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.smallSpacing
}
TabBar {

14
src/qml/DockPage.qml
Unescape Escape View File

@ -2,7 +2,7 @@ import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import Cutefish.Settings 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
ItemPage {
headerTitle: qsTr("Dock")
@ -22,12 +22,12 @@ ItemPage {
// Dock
Label {
text: qsTr("Position on screen")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.smallSpacing
}
RowLayout {
spacing: Meui.Units.largeSpacing * 2
spacing: FishUI.Units.largeSpacing * 2
IconCheckBox {
source: "qrc:/images/dock_left.svg"
@ -55,14 +55,14 @@ ItemPage {
Label {
text: qsTr("Size")
color: Meui.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing
color: FishUI.Theme.disabledTextColor
bottomPadding: FishUI.Units.smallSpacing
}
TabBar {
id: dockSizeTabbar
Layout.fillWidth: true
bottomPadding: Meui.Units.smallSpacing
bottomPadding: FishUI.Units.smallSpacing
TabButton {
text: qsTr("Small")

10
src/qml/HistoryGraph.qml
Unescape Escape View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
/**
* We need to draw a graph, all other libs are not suitable as we are basically
@ -53,10 +53,10 @@ Canvas {
height - yPadding - scaledY);
}
property bool darkMode: Meui.Theme.darkMode
property color textColor: Meui.Theme.textColor
property color bgColor: Meui.Theme.secondBackgroundColor
property color highlightColor: Meui.Theme.highlightColor
property bool darkMode: FishUI.Theme.darkMode
property color textColor: FishUI.Theme.textColor
property color bgColor: FishUI.Theme.secondBackgroundColor
property color highlightColor: FishUI.Theme.highlightColor
onDarkModeChanged: {
canvas.requestPaint()

8
src/qml/HorizontalDivider.qml
Unescape Escape View File

@ -1,10 +1,10 @@
import QtQuick 2.4
import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Item {
id: control
height: Meui.Units.largeSpacing * 2
height: FishUI.Units.largeSpacing * 2
Layout.fillWidth: true
@ -12,7 +12,7 @@ Item {
anchors.centerIn: parent
height: 1
width: control.width
color: Meui.Theme.disabledTextColor
opacity: Meui.Theme.darkMode ? 0.3 : 0.2
color: FishUI.Theme.disabledTextColor
opacity: FishUI.Theme.darkMode ? 0.3 : 0.2
}
}

14
src/qml/IconCheckBox.qml
Unescape Escape View File

@ -2,12 +2,12 @@ import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.12
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Item {
id: control
property var iconSpacing: Meui.Units.smallSpacing * 0.8
property var iconSpacing: FishUI.Units.smallSpacing * 0.8
property alias source: icon.source
property alias text: label.text
property bool checked: false
@ -31,7 +31,7 @@ Item {
height: width
color: "transparent"
border.width: 3
border.color: control.checked ? Meui.Theme.highlightColor : "transparent"
border.color: control.checked ? FishUI.Theme.highlightColor : "transparent"
Behavior on border.color {
ColorAnimation {
@ -40,13 +40,13 @@ Item {
}
}
radius: Meui.Theme.bigRadius + control.iconSpacing
radius: FishUI.Theme.bigRadius + control.iconSpacing
visible: true
Image {
id: icon
anchors.fill: parent
anchors.margins: Meui.Units.smallSpacing
anchors.margins: FishUI.Units.smallSpacing
sourceSize: Qt.size(icon.width, icon.height)
opacity: 1
@ -58,7 +58,7 @@ Item {
Rectangle {
anchors.fill: parent
radius: Meui.Theme.bigRadius
radius: FishUI.Theme.bigRadius
}
}
}
@ -86,7 +86,7 @@ Item {
Label {
id: label
color: control.checked ? Meui.Theme.highlightColor : Meui.Theme.textColor
color: control.checked ? FishUI.Theme.highlightColor : FishUI.Theme.textColor
visible: label.text
Layout.alignment: Qt.AlignHCenter
}

2
src/qml/ItemPage.qml
Unescape Escape View File

@ -1,7 +1,7 @@
import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Page {
id: page

28
src/qml/LanguagePage.qml
Unescape Escape View File

@ -1,7 +1,7 @@
import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0 as Settings
ItemPage {
@ -13,7 +13,7 @@ ItemPage {
ColumnLayout {
anchors.fill: parent
anchors.topMargin: Meui.Units.smallSpacing
anchors.topMargin: FishUI.Units.smallSpacing
ListView {
id: listView
@ -24,23 +24,23 @@ ItemPage {
model: language.languages
clip: true
topMargin: Meui.Units.largeSpacing
leftMargin: Meui.Units.largeSpacing * 2
rightMargin: Meui.Units.largeSpacing * 2
spacing: Meui.Units.largeSpacing
topMargin: FishUI.Units.largeSpacing
leftMargin: FishUI.Units.largeSpacing * 2
rightMargin: FishUI.Units.largeSpacing * 2
spacing: FishUI.Units.largeSpacing
currentIndex: language.currentLanguage
ScrollBar.vertical: ScrollBar {
bottomPadding: Meui.Theme.smallRadius
bottomPadding: FishUI.Theme.smallRadius
}
highlightFollowsCurrentItem: true
highlightMoveDuration: 0
highlightResizeDuration : 0
highlight: Rectangle {
color: Meui.Theme.highlightColor
radius: Meui.Theme.smallRadius
color: FishUI.Theme.highlightColor
radius: FishUI.Theme.smallRadius
}
delegate: MouseArea {
@ -58,16 +58,16 @@ ItemPage {
Rectangle {
anchors.fill: parent
color: isSelected ? "transparent" : item.containsMouse ? Meui.Theme.disabledTextColor : "transparent"
color: isSelected ? "transparent" : item.containsMouse ? FishUI.Theme.disabledTextColor : "transparent"
opacity: isSelected ? 1 : 0.1
radius: Meui.Theme.smallRadius
radius: FishUI.Theme.smallRadius
}
Label {
anchors.fill: parent
anchors.leftMargin: Meui.Units.smallSpacing
anchors.rightMargin: Meui.Units.smallSpacing
color: isSelected ? Meui.Theme.highlightedTextColor : Meui.Theme.textColor
anchors.leftMargin: FishUI.Units.smallSpacing
anchors.rightMargin: FishUI.Units.smallSpacing
color: isSelected ? FishUI.Theme.highlightedTextColor : FishUI.Theme.textColor
text: modelData
}
}

12
src/qml/NetworkPage.qml
Unescape Escape View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM
ItemPage {
@ -38,7 +38,7 @@ ItemPage {
RowLayout {
Label {
text: qsTr("Wired")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
Layout.fillWidth: true
}
}
@ -71,17 +71,17 @@ ItemPage {
// Wireless
ColumnLayout {
id: wirelessLayout
spacing: Meui.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
RowLayout {
spacing: Meui.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
Label {
text: qsTr("Wi-Fi")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Meui.BusyIndicator {
FishUI.BusyIndicator {
id: wlanBusyIndicator
width: wirelessSwitch.height
height: width

2
src/qml/RotationButton.qml
Unescape Escape View File

@ -1,5 +1,5 @@
import QtQuick 2.12
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.Screen 1.0 as CS
IconCheckBox {

10
src/qml/Scrollable.qml
Unescape Escape View File

@ -1,19 +1,19 @@
import QtQuick 2.4
import QtQuick.Controls 2.4
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Flickable {
id: root
flickableDirection: Flickable.VerticalFlick
clip: true
topMargin: Meui.Units.largeSpacing
leftMargin: Meui.Units.largeSpacing * 2
rightMargin: Meui.Units.largeSpacing * 2
topMargin: FishUI.Units.largeSpacing
leftMargin: FishUI.Units.largeSpacing * 2
rightMargin: FishUI.Units.largeSpacing * 2
contentWidth: width - (leftMargin + rightMargin)
ScrollBar.vertical: ScrollBar {
bottomPadding: Meui.Theme.smallRadius
bottomPadding: FishUI.Theme.smallRadius
}
}

34
src/qml/SideBar.qml
Unescape Escape View File

@ -2,7 +2,7 @@ import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Item {
implicitWidth: 230
@ -15,7 +15,7 @@ Item {
Rectangle {
anchors.fill: parent
color: Meui.Theme.secondBackgroundColor
color: FishUI.Theme.secondBackgroundColor
Behavior on color {
ColorAnimation {
@ -109,10 +109,10 @@ Item {
clip: true
model: listModel
spacing: Meui.Units.smallSpacing * 1.5
leftMargin: Meui.Units.largeSpacing
rightMargin: Meui.Units.largeSpacing
topMargin: Meui.Units.smallSpacing * 1.5
spacing: FishUI.Units.smallSpacing * 1.5
leftMargin: FishUI.Units.largeSpacing
rightMargin: FishUI.Units.largeSpacing
topMargin: FishUI.Units.smallSpacing * 1.5
ScrollBar.vertical: ScrollBar {}
@ -120,8 +120,8 @@ Item {
highlightMoveDuration: 0
highlightResizeDuration : 0
highlight: Rectangle {
radius: Meui.Theme.mediumRadius
color: Meui.Theme.highlightColor
radius: FishUI.Theme.mediumRadius
color: FishUI.Theme.highlightColor
smooth: true
}
@ -143,18 +143,18 @@ Item {
onClicked: listView.currentIndex = index
}
radius: Meui.Theme.mediumRadius
color: mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r,
Meui.Theme.textColor.g,
Meui.Theme.textColor.b,
radius: FishUI.Theme.mediumRadius
color: mouseArea.containsMouse ? Qt.rgba(FishUI.Theme.textColor.r,
FishUI.Theme.textColor.g,
FishUI.Theme.textColor.b,
0.1) : "transparent"
smooth: true
}
RowLayout {
anchors.fill: parent
anchors.leftMargin: Meui.Units.largeSpacing
spacing: Meui.Units.largeSpacing
anchors.leftMargin: FishUI.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
Image {
id: icon
@ -169,16 +169,16 @@ Item {
id: colorOverlay
anchors.fill: icon
source: icon
color: isCurrent ? Meui.Theme.highlightedTextColor : Meui.Theme.textColor
color: isCurrent ? FishUI.Theme.highlightedTextColor : FishUI.Theme.textColor
opacity: 1
visible: Meui.Theme.darkMode || isCurrent
visible: FishUI.Theme.darkMode || isCurrent
}
}
Label {
id: itemTitle
text: model.title
color: isCurrent ? Meui.Theme.highlightedTextColor : Meui.Theme.textColor
color: isCurrent ? FishUI.Theme.highlightedTextColor : FishUI.Theme.textColor
}
Item {

10
src/qml/StandardItem.qml
Unescape Escape View File

@ -1,12 +1,12 @@
import QtQuick 2.4
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Item {
id: control
height: mainLayout.implicitHeight + Meui.Theme.smallRadius * 2
height: mainLayout.implicitHeight + FishUI.Theme.smallRadius * 2
property alias key: keyLabel.text
property alias value: valueLabel.text
@ -17,7 +17,7 @@ Item {
id: background
anchors.fill: parent
color: "transparent"
radius: Meui.Theme.smallRadius
radius: FishUI.Theme.smallRadius
}
RowLayout {
@ -26,7 +26,7 @@ Item {
Label {
id: keyLabel
color: Meui.Theme.textColor
color: FishUI.Theme.textColor
}
Item {
@ -35,7 +35,7 @@ Item {
Label {
id: valueLabel
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
}
}

20
src/qml/UserPage/UserDelegateItem.qml
Unescape Escape View File

@ -6,7 +6,7 @@ import QtGraphicalEffects 1.0
import Cutefish.Settings 1.0
import Cutefish.Accounts 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import "../"
@ -81,17 +81,17 @@ Item {
Layout.alignment: Qt.AlignVCenter
text: userName
font.pointSize: 16
bottomPadding: Meui.Units.smallSpacing
leftPadding: Meui.Units.largeSpacing
bottomPadding: FishUI.Units.smallSpacing
leftPadding: FishUI.Units.largeSpacing
}
Label {
Layout.alignment: Qt.AlignVCenter
text: realName
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
visible: realName !== userName
font.pointSize: 16
bottomPadding: Meui.Units.smallSpacing
bottomPadding: FishUI.Units.smallSpacing
}
Item {
@ -100,7 +100,7 @@ Item {
Label {
text: qsTr("Currently logged")
rightPadding: Meui.Units.largeSpacing
rightPadding: FishUI.Units.largeSpacing
visible: currentUser.userId === loggedUser.userId
}
@ -116,7 +116,7 @@ Item {
width: 22
height: 22
sourceSize: Qt.size(width, height)
source: Meui.Theme.darkMode ? additionalSettings.shown ? "qrc:/images/dark/up.svg" : "qrc:/images/dark/down.svg"
source: FishUI.Theme.darkMode ? additionalSettings.shown ? "qrc:/images/dark/up.svg" : "qrc:/images/dark/down.svg"
: additionalSettings.shown ? "qrc:/images/light/up.svg" : "qrc:/images/light/down.svg"
}
}
@ -125,7 +125,7 @@ Item {
}
Item {
height: Meui.Units.largeSpacing
height: FishUI.Units.largeSpacing
}
Hideable {
@ -133,8 +133,8 @@ Item {
GridLayout {
Layout.fillWidth: true
Layout.bottomMargin: Meui.Units.smallSpacing
rowSpacing: Meui.Units.largeSpacing
Layout.bottomMargin: FishUI.Units.smallSpacing
rowSpacing: FishUI.Units.largeSpacing
columns: 2
Label {

22
src/qml/Wallpaper/BackgroundPage.qml
Unescape Escape View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtGraphicalEffects 1.0
import Cutefish.Settings 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import "../"
@ -21,8 +21,8 @@ ItemPage {
ColumnLayout {
id: layout
anchors.fill: parent
anchors.topMargin: Meui.Units.smallSpacing
spacing: Meui.Units.largeSpacing
anchors.topMargin: FishUI.Units.smallSpacing
spacing: FishUI.Units.largeSpacing
// DesktopPreview {
// Layout.alignment: Qt.AlignHCenter
@ -31,7 +31,7 @@ ItemPage {
// }
RowLayout {
spacing: Meui.Units.largeSpacing * 2
spacing: FishUI.Units.largeSpacing * 2
Label {
text: qsTr("Background type")
@ -70,7 +70,7 @@ ItemPage {
GridView {
id: _view
// spacing: Meui.Units.smallSpacing
// spacing: FishUI.Units.smallSpacing
// orientation: Qt.Horizontal
height: count * itemHeight
@ -104,15 +104,15 @@ ItemPage {
Rectangle {
anchors.fill: parent
color: "transparent"
radius: Meui.Theme.bigRadius + Meui.Units.smallSpacing / 2
radius: FishUI.Theme.bigRadius + FishUI.Units.smallSpacing / 2
border.color: Meui.Theme.highlightColor
border.color: FishUI.Theme.highlightColor
border.width: image.status == Image.Ready & isSelected ? 3 : 0
Image {
id: image
anchors.fill: parent
anchors.margins: Meui.Units.smallSpacing
anchors.margins: FishUI.Units.smallSpacing
source: "file://" + modelData
sourceSize: Qt.size(width, height)
fillMode: Image.PreserveAspectCrop
@ -137,7 +137,7 @@ ItemPage {
Rectangle {
anchors.fill: parent
radius: Meui.Theme.bigRadius
radius: FishUI.Theme.bigRadius
}
}
}
@ -169,7 +169,7 @@ ItemPage {
var extraSpacing = 0
if (availableColumns > 0) {
var allColumnSize = availableColumns * cellSize
var extraSpace = Math.max(containerSize - allColumnSize, Meui.Units.largeSpacing)
var extraSpace = Math.max(containerSize - allColumnSize, FishUI.Units.largeSpacing)
extraSpacing = extraSpace / availableColumns
}
return Math.floor(extraSpacing)
@ -207,7 +207,7 @@ ItemPage {
property bool checked: Qt.colorEqual(background.backgroundColor, bgColor)
property color currentColor: bgColor
width: _colorView.itemSize + Meui.Units.largeSpacing
width: _colorView.itemSize + FishUI.Units.largeSpacing
height: width
color: "transparent"
radius: width / 2

10
src/qml/Wallpaper/DesktopPreview.qml
Unescape Escape View File

@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import QtGraphicalEffects 1.0
Item {
@ -50,7 +50,7 @@ Item {
radius: height * 0.2
opacity: 0.5
color: Meui.Theme.backgroundColor
color: FishUI.Theme.backgroundColor
}
Rectangle {
@ -67,7 +67,7 @@ Item {
radius: height * 0.2
opacity: 0.5
color: Meui.Theme.backgroundColor
color: FishUI.Theme.backgroundColor
}
Rectangle {
@ -82,7 +82,7 @@ Item {
height: 38
radius: height * 0.3
color: Meui.Theme.backgroundColor
color: FishUI.Theme.backgroundColor
opacity: 0.7
}
@ -94,7 +94,7 @@ Item {
Rectangle {
anchors.fill: parent
radius: Meui.Theme.bigRadius
radius: FishUI.Theme.bigRadius
}
}
}

8
src/qml/WiredItem.qml
Unescape Escape View File

@ -3,7 +3,7 @@ import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM
Item {
@ -11,13 +11,13 @@ Item {
RowLayout {
anchors.fill: parent
spacing: Meui.Units.largeSpacing
spacing: FishUI.Units.largeSpacing
Image {
width: 22
height: width
sourceSize: Qt.size(width, height)
source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + "network-wired.svg"
source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + "network-wired.svg"
}
Label {
@ -36,7 +36,7 @@ Item {
ColorOverlay {
anchors.fill: parent
source: parent
color: Meui.Theme.highlightColor
color: FishUI.Theme.highlightColor
opacity: 1
visible: true
}

26
src/qml/WirelessDetailsDialog.qml
Unescape Escape View File

@ -2,7 +2,7 @@ import QtQuick 2.4
import QtQuick.Window 2.3
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM
Dialog {
@ -14,7 +14,7 @@ Dialog {
x: (parent.width - width) / 2
y: (parent.height - height) / 2
modal: true
padding: Meui.Units.largeSpacing * 2
padding: FishUI.Units.largeSpacing * 2
signal forgetBtnClicked()
@ -39,14 +39,14 @@ Dialog {
GridLayout {
id: gridLayout
columns: 2
columnSpacing: Meui.Units.largeSpacing
rowSpacing: Meui.Units.smallSpacing
columnSpacing: FishUI.Units.largeSpacing
rowSpacing: FishUI.Units.smallSpacing
Label {
id: autoJoinLabel
text: qsTr("Auto-Join")
visible: false
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Switch {
@ -60,7 +60,7 @@ Dialog {
Label {
text: qsTr("Security")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Label {
@ -71,7 +71,7 @@ Dialog {
Label {
text: qsTr("Signal")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Label {
@ -82,7 +82,7 @@ Dialog {
Label {
text: qsTr("IPv4 Address")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Label {
@ -94,7 +94,7 @@ Dialog {
Label {
font.bold: true
text: qsTr("IPv6 Address")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Label {
@ -106,7 +106,7 @@ Dialog {
Label {
font.bold: true
text: qsTr("MAC Address")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Label {
@ -118,7 +118,7 @@ Dialog {
Label {
font.bold: true
text: qsTr("Gateway")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Label {
@ -130,7 +130,7 @@ Dialog {
Label {
font.bold: true
text: qsTr("DNS")
color: Meui.Theme.disabledTextColor
color: FishUI.Theme.disabledTextColor
}
Label {
@ -142,7 +142,7 @@ Dialog {
}
footer: DialogButtonBox {
padding: Meui.Units.largeSpacing * 2
padding: FishUI.Units.largeSpacing * 2
Button {
text: qsTr("Close")

32
src/qml/WirelessItem.qml
Unescape Escape View File

@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import QtQuick.Window 2.3
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM
Item {
@ -16,10 +16,10 @@ Item {
Rectangle {
anchors.fill: parent
radius: Meui.Theme.smallRadius
color: mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r,
Meui.Theme.textColor.g,
Meui.Theme.textColor.b,
radius: FishUI.Theme.smallRadius
color: mouseArea.containsMouse ? Qt.rgba(FishUI.Theme.textColor.r,
FishUI.Theme.textColor.g,
FishUI.Theme.textColor.b,
0.1) : "transparent"
Behavior on color {
@ -55,14 +55,14 @@ Item {
RowLayout {
anchors.fill: parent
anchors.margins: Meui.Units.smallSpacing
spacing: Meui.Units.largeSpacing
anchors.margins: FishUI.Units.smallSpacing
spacing: FishUI.Units.largeSpacing
Image {
width: 22
height: width
sourceSize: Qt.size(width, height)
source: "qrc:/images/" + (Meui.Theme.darkMode ? "dark/" : "light/") + model.connectionIcon + ".svg"
source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + model.connectionIcon + ".svg"
}
Label {
@ -73,7 +73,7 @@ Item {
Layout.fillWidth: true
}
Meui.BusyIndicator {
FishUI.BusyIndicator {
id: busyIndicator
width: 22
height: width
@ -93,7 +93,7 @@ Item {
ColorOverlay {
anchors.fill: parent
source: parent
color: Meui.Theme.highlightColor
color: FishUI.Theme.highlightColor
opacity: 1
visible: true
}
@ -110,7 +110,7 @@ Item {
ColorOverlay {
anchors.fill: parent
source: parent
color: Meui.Theme.textColor
color: FishUI.Theme.textColor
opacity: 1
visible: true
}
@ -133,7 +133,7 @@ Item {
title: model.itemUniqueName
width: 300
height: mainLayout.implicitHeight + Meui.Units.largeSpacing * 2
height: mainLayout.implicitHeight + FishUI.Units.largeSpacing * 2
minimumWidth: width
minimumHeight: height
maximumHeight: height
@ -156,13 +156,13 @@ Item {
Rectangle {
anchors.fill: parent
color: Meui.Theme.backgroundColor
color: FishUI.Theme.backgroundColor
}
ColumnLayout {
id: mainLayout
anchors.fill: parent
anchors.margins: Meui.Units.largeSpacing
anchors.margins: FishUI.Units.largeSpacing
TextField {
id: passwordField
@ -182,7 +182,7 @@ Item {
}
Item {
height: Meui.Units.smallSpacing
height: FishUI.Units.smallSpacing
}
CheckBox {
@ -192,7 +192,7 @@ Item {
}
Item {
height: Meui.Units.largeSpacing
height: FishUI.Units.largeSpacing
}
RowLayout {

10
src/qml/main.qml
Unescape Escape View File

@ -3,9 +3,9 @@ import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtQuick.Window 2.3
import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui
import FishUI 1.0 as FishUI
Meui.Window {
FishUI.Window {
id: rootWindow
title: qsTr("Settings")
visible: true
@ -23,7 +23,7 @@ Meui.Window {
anchors.top: parent.top
anchors.bottom: parent.bottom
implicitWidth: sideBar.width
color: Meui.Theme.secondBackgroundColor
color: FishUI.Theme.secondBackgroundColor
Behavior on color {
ColorAnimation {
@ -38,7 +38,7 @@ Meui.Window {
Label {
text: rootWindow.title
leftPadding: Meui.Units.largeSpacing + Meui.Units.smallSpacing
leftPadding: FishUI.Units.largeSpacing + FishUI.Units.smallSpacing
font.pointSize: parent.height > 0 ? parent.height / 3 : 1
Layout.preferredWidth: sideBar.width
Layout.alignment: Qt.AlignBottom
@ -47,7 +47,7 @@ Meui.Window {
Label {
text: stackView.currentItem.headerTitle
font.pointSize: parent.height > 0 ? parent.height / 3 : 1
leftPadding: Meui.Units.largeSpacing + Meui.Units.smallSpacing
leftPadding: FishUI.Units.largeSpacing + FishUI.Units.smallSpacing
Layout.alignment: Qt.AlignBottom
}

Write Preview
Loading…
Cancel
Save