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) set(QT Core Gui Widgets Quick QuickControls2 DBus Xml Concurrent LinguistTools)
find_package(Qt5 REQUIRED ${QT}) find_package(Qt5 REQUIRED ${QT})
find_package(MeuiKit REQUIRED) find_package(FishUI REQUIRED)
find_package(Freetype REQUIRED) find_package(Freetype REQUIRED)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
find_package(Libcrypt REQUIRED) find_package(Libcrypt REQUIRED)
@ -59,7 +59,7 @@ target_link_libraries(${PROJECT_NAME}
Qt5::DBus Qt5::DBus
Qt5::Xml Qt5::Xml
Qt5::Concurrent Qt5::Concurrent
MeuiKit FishUI
KF5::NetworkManagerQt KF5::NetworkManagerQt
KF5::ModemManagerQt KF5::ModemManagerQt

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

@ -1,7 +1,7 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import QtQuick.Layouts 1.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.Settings 1.0
ItemPage { ItemPage {
@ -32,15 +32,15 @@ ItemPage {
text: "<b>CutefishOS</b>" text: "<b>CutefishOS</b>"
font.pointSize: 24 font.pointSize: 24
color: "#3385FF" color: "#3385FF"
leftPadding: Meui.Units.largeSpacing * 2 leftPadding: FishUI.Units.largeSpacing * 2
rightPadding: Meui.Units.largeSpacing * 2 rightPadding: FishUI.Units.largeSpacing * 2
} }
// Label { // Label {
// text: qsTr("Built on ") + about.prettyProductName // text: qsTr("Built on ") + about.prettyProductName
// Layout.alignment: Qt.AlignTop | Qt.AlignHCenter // Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
// bottomPadding: Meui.Units.largeSpacing * 2 // bottomPadding: FishUI.Units.largeSpacing * 2
// color: Meui.Theme.disabledTextColor // color: FishUI.Theme.disabledTextColor
// } // }
StandardItem { 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 QtQuick.Layouts 1.12
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0 import Cutefish.Settings 1.0
import Cutefish.Accounts 1.0 import Cutefish.Accounts 1.0
@ -36,7 +36,7 @@ ItemPage {
id: _userView id: _userView
model: userModel model: userModel
Layout.fillWidth: true Layout.fillWidth: true
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
interactive: false interactive: false
Layout.preferredHeight: { Layout.preferredHeight: {
@ -56,7 +56,7 @@ ItemPage {
} }
Item { Item {
height: Meui.Units.smallSpacing height: FishUI.Units.smallSpacing
} }
Button { Button {

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

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

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

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

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

@ -1,7 +1,7 @@
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 2.4 import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0 import Cutefish.Settings 1.0
ItemPage { ItemPage {
@ -44,7 +44,7 @@ ItemPage {
ColumnLayout { ColumnLayout {
id: layout id: layout
anchors.fill: parent anchors.fill: parent
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
// Battery Info // Battery Info
BatteryItem { BatteryItem {
@ -55,7 +55,7 @@ ItemPage {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: batteryBackground.radius + Meui.Units.smallSpacing anchors.leftMargin: batteryBackground.radius + FishUI.Units.smallSpacing
Item { Item {
Layout.fillHeight: true Layout.fillHeight: true
@ -99,12 +99,12 @@ ItemPage {
} }
Item { Item {
height: Meui.Units.largeSpacing height: FishUI.Units.largeSpacing
} }
Label { Label {
text: qsTr("History") text: qsTr("History")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
HistoryGraph { HistoryGraph {
@ -148,7 +148,7 @@ ItemPage {
} }
Item { Item {
height: Meui.Units.smallSpacing height: FishUI.Units.smallSpacing
} }
StandardItem { 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.Controls 2.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Cutefish.Settings 1.0 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.bluezqt 1.0 as BluezQt
import org.kde.plasma.private.bluetooth 1.0 import org.kde.plasma.private.bluetooth 1.0
@ -38,7 +38,7 @@ ItemPage {
ColumnLayout { ColumnLayout {
id: layout id: layout
anchors.fill: parent anchors.fill: parent
anchors.bottomMargin: Meui.Units.largeSpacing anchors.bottomMargin: FishUI.Units.largeSpacing
Switch { Switch {
id: bluetoothSwitch 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 QtQuick.Layouts 1.3
import Cutefish.Settings 1.0 import Cutefish.Settings 1.0
import Cutefish.Screen 1.0 as CS import Cutefish.Screen 1.0 as CS
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
ItemPage { ItemPage {
headerTitle: qsTr("Display") headerTitle: qsTr("Display")
@ -38,13 +38,13 @@ ItemPage {
Label { Label {
text: qsTr("Brightness") text: qsTr("Brightness")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
bottomPadding: Meui.Units.largeSpacing bottomPadding: FishUI.Units.largeSpacing
visible: brightness.enabled visible: brightness.enabled
} }
RowLayout { RowLayout {
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
visible: brightness.enabled visible: brightness.enabled
Image { Image {
@ -52,7 +52,7 @@ ItemPage {
height: width height: width
sourceSize.width: width sourceSize.width: width
sourceSize.height: height 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 { Slider {
@ -70,12 +70,12 @@ ItemPage {
height: width height: width
sourceSize.width: width sourceSize.width: width
sourceSize.height: height 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 { Item {
height: Meui.Units.largeSpacing height: FishUI.Units.largeSpacing
visible: brightness.enabled visible: brightness.enabled
} }
@ -85,8 +85,8 @@ ItemPage {
Label { Label {
text: qsTr("Screen") text: qsTr("Screen")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing bottomPadding: FishUI.Units.smallSpacing
visible: _screenView.count > 0 visible: _screenView.count > 0
} }
@ -118,8 +118,8 @@ ItemPage {
GridLayout { GridLayout {
columns: 2 columns: 2
columnSpacing: Meui.Units.largeSpacing columnSpacing: FishUI.Units.largeSpacing
rowSpacing: Meui.Units.smallSpacing rowSpacing: FishUI.Units.smallSpacing
Label { Label {
text: qsTr("Resolution") text: qsTr("Resolution")
@ -216,8 +216,8 @@ ItemPage {
Label { Label {
text: qsTr("Scale") text: qsTr("Scale")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing bottomPadding: FishUI.Units.smallSpacing
} }
TabBar { 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.Controls 2.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import Cutefish.Settings 1.0 import Cutefish.Settings 1.0
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
ItemPage { ItemPage {
headerTitle: qsTr("Dock") headerTitle: qsTr("Dock")
@ -22,12 +22,12 @@ ItemPage {
// Dock // Dock
Label { Label {
text: qsTr("Position on screen") text: qsTr("Position on screen")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing bottomPadding: FishUI.Units.smallSpacing
} }
RowLayout { RowLayout {
spacing: Meui.Units.largeSpacing * 2 spacing: FishUI.Units.largeSpacing * 2
IconCheckBox { IconCheckBox {
source: "qrc:/images/dock_left.svg" source: "qrc:/images/dock_left.svg"
@ -55,14 +55,14 @@ ItemPage {
Label { Label {
text: qsTr("Size") text: qsTr("Size")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
bottomPadding: Meui.Units.smallSpacing bottomPadding: FishUI.Units.smallSpacing
} }
TabBar { TabBar {
id: dockSizeTabbar id: dockSizeTabbar
Layout.fillWidth: true Layout.fillWidth: true
bottomPadding: Meui.Units.smallSpacing bottomPadding: FishUI.Units.smallSpacing
TabButton { TabButton {
text: qsTr("Small") text: qsTr("Small")

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

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

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

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

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

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

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

@ -1,7 +1,7 @@
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 2.4 import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import Cutefish.Settings 1.0 as Settings import Cutefish.Settings 1.0 as Settings
ItemPage { ItemPage {
@ -13,7 +13,7 @@ ItemPage {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.topMargin: Meui.Units.smallSpacing anchors.topMargin: FishUI.Units.smallSpacing
ListView { ListView {
id: listView id: listView
@ -24,23 +24,23 @@ ItemPage {
model: language.languages model: language.languages
clip: true clip: true
topMargin: Meui.Units.largeSpacing topMargin: FishUI.Units.largeSpacing
leftMargin: Meui.Units.largeSpacing * 2 leftMargin: FishUI.Units.largeSpacing * 2
rightMargin: Meui.Units.largeSpacing * 2 rightMargin: FishUI.Units.largeSpacing * 2
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
currentIndex: language.currentLanguage currentIndex: language.currentLanguage
ScrollBar.vertical: ScrollBar { ScrollBar.vertical: ScrollBar {
bottomPadding: Meui.Theme.smallRadius bottomPadding: FishUI.Theme.smallRadius
} }
highlightFollowsCurrentItem: true highlightFollowsCurrentItem: true
highlightMoveDuration: 0 highlightMoveDuration: 0
highlightResizeDuration : 0 highlightResizeDuration : 0
highlight: Rectangle { highlight: Rectangle {
color: Meui.Theme.highlightColor color: FishUI.Theme.highlightColor
radius: Meui.Theme.smallRadius radius: FishUI.Theme.smallRadius
} }
delegate: MouseArea { delegate: MouseArea {
@ -58,16 +58,16 @@ ItemPage {
Rectangle { Rectangle {
anchors.fill: parent 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 opacity: isSelected ? 1 : 0.1
radius: Meui.Theme.smallRadius radius: FishUI.Theme.smallRadius
} }
Label { Label {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: Meui.Units.smallSpacing anchors.leftMargin: FishUI.Units.smallSpacing
anchors.rightMargin: Meui.Units.smallSpacing anchors.rightMargin: FishUI.Units.smallSpacing
color: isSelected ? Meui.Theme.highlightedTextColor : Meui.Theme.textColor color: isSelected ? FishUI.Theme.highlightedTextColor : FishUI.Theme.textColor
text: modelData 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 QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM import Cutefish.NetworkManagement 1.0 as NM
ItemPage { ItemPage {
@ -38,7 +38,7 @@ ItemPage {
RowLayout { RowLayout {
Label { Label {
text: qsTr("Wired") text: qsTr("Wired")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
@ -71,17 +71,17 @@ ItemPage {
// Wireless // Wireless
ColumnLayout { ColumnLayout {
id: wirelessLayout id: wirelessLayout
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
RowLayout { RowLayout {
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
Label { Label {
text: qsTr("Wi-Fi") text: qsTr("Wi-Fi")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Meui.BusyIndicator { FishUI.BusyIndicator {
id: wlanBusyIndicator id: wlanBusyIndicator
width: wirelessSwitch.height width: wirelessSwitch.height
height: width height: width

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

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

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

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

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

@ -1,12 +1,12 @@
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 2.4 import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
Item { Item {
id: control id: control
height: mainLayout.implicitHeight + Meui.Theme.smallRadius * 2 height: mainLayout.implicitHeight + FishUI.Theme.smallRadius * 2
property alias key: keyLabel.text property alias key: keyLabel.text
property alias value: valueLabel.text property alias value: valueLabel.text
@ -17,7 +17,7 @@ Item {
id: background id: background
anchors.fill: parent anchors.fill: parent
color: "transparent" color: "transparent"
radius: Meui.Theme.smallRadius radius: FishUI.Theme.smallRadius
} }
RowLayout { RowLayout {
@ -26,7 +26,7 @@ Item {
Label { Label {
id: keyLabel id: keyLabel
color: Meui.Theme.textColor color: FishUI.Theme.textColor
} }
Item { Item {
@ -35,7 +35,7 @@ Item {
Label { Label {
id: valueLabel 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.Settings 1.0
import Cutefish.Accounts 1.0 import Cutefish.Accounts 1.0
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import "../" import "../"
@ -81,17 +81,17 @@ Item {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: userName text: userName
font.pointSize: 16 font.pointSize: 16
bottomPadding: Meui.Units.smallSpacing bottomPadding: FishUI.Units.smallSpacing
leftPadding: Meui.Units.largeSpacing leftPadding: FishUI.Units.largeSpacing
} }
Label { Label {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
text: realName text: realName
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
visible: realName !== userName visible: realName !== userName
font.pointSize: 16 font.pointSize: 16
bottomPadding: Meui.Units.smallSpacing bottomPadding: FishUI.Units.smallSpacing
} }
Item { Item {
@ -100,7 +100,7 @@ Item {
Label { Label {
text: qsTr("Currently logged") text: qsTr("Currently logged")
rightPadding: Meui.Units.largeSpacing rightPadding: FishUI.Units.largeSpacing
visible: currentUser.userId === loggedUser.userId visible: currentUser.userId === loggedUser.userId
} }
@ -116,7 +116,7 @@ Item {
width: 22 width: 22
height: 22 height: 22
sourceSize: Qt.size(width, height) 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" : additionalSettings.shown ? "qrc:/images/light/up.svg" : "qrc:/images/light/down.svg"
} }
} }
@ -125,7 +125,7 @@ Item {
} }
Item { Item {
height: Meui.Units.largeSpacing height: FishUI.Units.largeSpacing
} }
Hideable { Hideable {
@ -133,8 +133,8 @@ Item {
GridLayout { GridLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.bottomMargin: Meui.Units.smallSpacing Layout.bottomMargin: FishUI.Units.smallSpacing
rowSpacing: Meui.Units.largeSpacing rowSpacing: FishUI.Units.largeSpacing
columns: 2 columns: 2
Label { 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 QtQuick.Layouts 1.12
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Cutefish.Settings 1.0 import Cutefish.Settings 1.0
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import "../" import "../"
@ -21,8 +21,8 @@ ItemPage {
ColumnLayout { ColumnLayout {
id: layout id: layout
anchors.fill: parent anchors.fill: parent
anchors.topMargin: Meui.Units.smallSpacing anchors.topMargin: FishUI.Units.smallSpacing
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
// DesktopPreview { // DesktopPreview {
// Layout.alignment: Qt.AlignHCenter // Layout.alignment: Qt.AlignHCenter
@ -31,7 +31,7 @@ ItemPage {
// } // }
RowLayout { RowLayout {
spacing: Meui.Units.largeSpacing * 2 spacing: FishUI.Units.largeSpacing * 2
Label { Label {
text: qsTr("Background type") text: qsTr("Background type")
@ -70,7 +70,7 @@ ItemPage {
GridView { GridView {
id: _view id: _view
// spacing: Meui.Units.smallSpacing // spacing: FishUI.Units.smallSpacing
// orientation: Qt.Horizontal // orientation: Qt.Horizontal
height: count * itemHeight height: count * itemHeight
@ -104,15 +104,15 @@ ItemPage {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: "transparent" 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 border.width: image.status == Image.Ready & isSelected ? 3 : 0
Image { Image {
id: image id: image
anchors.fill: parent anchors.fill: parent
anchors.margins: Meui.Units.smallSpacing anchors.margins: FishUI.Units.smallSpacing
source: "file://" + modelData source: "file://" + modelData
sourceSize: Qt.size(width, height) sourceSize: Qt.size(width, height)
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
@ -137,7 +137,7 @@ ItemPage {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
radius: Meui.Theme.bigRadius radius: FishUI.Theme.bigRadius
} }
} }
} }
@ -169,7 +169,7 @@ ItemPage {
var extraSpacing = 0 var extraSpacing = 0
if (availableColumns > 0) { if (availableColumns > 0) {
var allColumnSize = availableColumns * cellSize 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 extraSpacing = extraSpace / availableColumns
} }
return Math.floor(extraSpacing) return Math.floor(extraSpacing)
@ -207,7 +207,7 @@ ItemPage {
property bool checked: Qt.colorEqual(background.backgroundColor, bgColor) property bool checked: Qt.colorEqual(background.backgroundColor, bgColor)
property color currentColor: bgColor property color currentColor: bgColor
width: _colorView.itemSize + Meui.Units.largeSpacing width: _colorView.itemSize + FishUI.Units.largeSpacing
height: width height: width
color: "transparent" color: "transparent"
radius: width / 2 radius: width / 2

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

@ -1,7 +1,7 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.12
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
Item { Item {
@ -50,7 +50,7 @@ Item {
radius: height * 0.2 radius: height * 0.2
opacity: 0.5 opacity: 0.5
color: Meui.Theme.backgroundColor color: FishUI.Theme.backgroundColor
} }
Rectangle { Rectangle {
@ -67,7 +67,7 @@ Item {
radius: height * 0.2 radius: height * 0.2
opacity: 0.5 opacity: 0.5
color: Meui.Theme.backgroundColor color: FishUI.Theme.backgroundColor
} }
Rectangle { Rectangle {
@ -82,7 +82,7 @@ Item {
height: 38 height: 38
radius: height * 0.3 radius: height * 0.3
color: Meui.Theme.backgroundColor color: FishUI.Theme.backgroundColor
opacity: 0.7 opacity: 0.7
} }
@ -94,7 +94,7 @@ Item {
Rectangle { Rectangle {
anchors.fill: parent 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 QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM import Cutefish.NetworkManagement 1.0 as NM
Item { Item {
@ -11,13 +11,13 @@ Item {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
Image { Image {
width: 22 width: 22
height: width height: width
sourceSize: Qt.size(width, height) 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 { Label {
@ -36,7 +36,7 @@ Item {
ColorOverlay { ColorOverlay {
anchors.fill: parent anchors.fill: parent
source: parent source: parent
color: Meui.Theme.highlightColor color: FishUI.Theme.highlightColor
opacity: 1 opacity: 1
visible: true 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.Window 2.3
import QtQuick.Controls 2.4 import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM import Cutefish.NetworkManagement 1.0 as NM
Dialog { Dialog {
@ -14,7 +14,7 @@ Dialog {
x: (parent.width - width) / 2 x: (parent.width - width) / 2
y: (parent.height - height) / 2 y: (parent.height - height) / 2
modal: true modal: true
padding: Meui.Units.largeSpacing * 2 padding: FishUI.Units.largeSpacing * 2
signal forgetBtnClicked() signal forgetBtnClicked()
@ -39,14 +39,14 @@ Dialog {
GridLayout { GridLayout {
id: gridLayout id: gridLayout
columns: 2 columns: 2
columnSpacing: Meui.Units.largeSpacing columnSpacing: FishUI.Units.largeSpacing
rowSpacing: Meui.Units.smallSpacing rowSpacing: FishUI.Units.smallSpacing
Label { Label {
id: autoJoinLabel id: autoJoinLabel
text: qsTr("Auto-Join") text: qsTr("Auto-Join")
visible: false visible: false
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Switch { Switch {
@ -60,7 +60,7 @@ Dialog {
Label { Label {
text: qsTr("Security") text: qsTr("Security")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Label { Label {
@ -71,7 +71,7 @@ Dialog {
Label { Label {
text: qsTr("Signal") text: qsTr("Signal")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Label { Label {
@ -82,7 +82,7 @@ Dialog {
Label { Label {
text: qsTr("IPv4 Address") text: qsTr("IPv4 Address")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Label { Label {
@ -94,7 +94,7 @@ Dialog {
Label { Label {
font.bold: true font.bold: true
text: qsTr("IPv6 Address") text: qsTr("IPv6 Address")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Label { Label {
@ -106,7 +106,7 @@ Dialog {
Label { Label {
font.bold: true font.bold: true
text: qsTr("MAC Address") text: qsTr("MAC Address")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Label { Label {
@ -118,7 +118,7 @@ Dialog {
Label { Label {
font.bold: true font.bold: true
text: qsTr("Gateway") text: qsTr("Gateway")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Label { Label {
@ -130,7 +130,7 @@ Dialog {
Label { Label {
font.bold: true font.bold: true
text: qsTr("DNS") text: qsTr("DNS")
color: Meui.Theme.disabledTextColor color: FishUI.Theme.disabledTextColor
} }
Label { Label {
@ -142,7 +142,7 @@ Dialog {
} }
footer: DialogButtonBox { footer: DialogButtonBox {
padding: Meui.Units.largeSpacing * 2 padding: FishUI.Units.largeSpacing * 2
Button { Button {
text: qsTr("Close") 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 QtGraphicalEffects 1.0
import QtQuick.Window 2.3 import QtQuick.Window 2.3
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
import Cutefish.NetworkManagement 1.0 as NM import Cutefish.NetworkManagement 1.0 as NM
Item { Item {
@ -16,10 +16,10 @@ Item {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
radius: Meui.Theme.smallRadius radius: FishUI.Theme.smallRadius
color: mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r, color: mouseArea.containsMouse ? Qt.rgba(FishUI.Theme.textColor.r,
Meui.Theme.textColor.g, FishUI.Theme.textColor.g,
Meui.Theme.textColor.b, FishUI.Theme.textColor.b,
0.1) : "transparent" 0.1) : "transparent"
Behavior on color { Behavior on color {
@ -55,14 +55,14 @@ Item {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: Meui.Units.smallSpacing anchors.margins: FishUI.Units.smallSpacing
spacing: Meui.Units.largeSpacing spacing: FishUI.Units.largeSpacing
Image { Image {
width: 22 width: 22
height: width height: width
sourceSize: Qt.size(width, height) 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 { Label {
@ -73,7 +73,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Meui.BusyIndicator { FishUI.BusyIndicator {
id: busyIndicator id: busyIndicator
width: 22 width: 22
height: width height: width
@ -93,7 +93,7 @@ Item {
ColorOverlay { ColorOverlay {
anchors.fill: parent anchors.fill: parent
source: parent source: parent
color: Meui.Theme.highlightColor color: FishUI.Theme.highlightColor
opacity: 1 opacity: 1
visible: true visible: true
} }
@ -110,7 +110,7 @@ Item {
ColorOverlay { ColorOverlay {
anchors.fill: parent anchors.fill: parent
source: parent source: parent
color: Meui.Theme.textColor color: FishUI.Theme.textColor
opacity: 1 opacity: 1
visible: true visible: true
} }
@ -133,7 +133,7 @@ Item {
title: model.itemUniqueName title: model.itemUniqueName
width: 300 width: 300
height: mainLayout.implicitHeight + Meui.Units.largeSpacing * 2 height: mainLayout.implicitHeight + FishUI.Units.largeSpacing * 2
minimumWidth: width minimumWidth: width
minimumHeight: height minimumHeight: height
maximumHeight: height maximumHeight: height
@ -156,13 +156,13 @@ Item {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: Meui.Theme.backgroundColor color: FishUI.Theme.backgroundColor
} }
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
anchors.fill: parent anchors.fill: parent
anchors.margins: Meui.Units.largeSpacing anchors.margins: FishUI.Units.largeSpacing
TextField { TextField {
id: passwordField id: passwordField
@ -182,7 +182,7 @@ Item {
} }
Item { Item {
height: Meui.Units.smallSpacing height: FishUI.Units.smallSpacing
} }
CheckBox { CheckBox {
@ -192,7 +192,7 @@ Item {
} }
Item { Item {
height: Meui.Units.largeSpacing height: FishUI.Units.largeSpacing
} }
RowLayout { 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.Layouts 1.3
import QtQuick.Window 2.3 import QtQuick.Window 2.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import MeuiKit 1.0 as Meui import FishUI 1.0 as FishUI
Meui.Window { FishUI.Window {
id: rootWindow id: rootWindow
title: qsTr("Settings") title: qsTr("Settings")
visible: true visible: true
@ -23,7 +23,7 @@ Meui.Window {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
implicitWidth: sideBar.width implicitWidth: sideBar.width
color: Meui.Theme.secondBackgroundColor color: FishUI.Theme.secondBackgroundColor
Behavior on color { Behavior on color {
ColorAnimation { ColorAnimation {
@ -38,7 +38,7 @@ Meui.Window {
Label { Label {
text: rootWindow.title 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 font.pointSize: parent.height > 0 ? parent.height / 3 : 1
Layout.preferredWidth: sideBar.width Layout.preferredWidth: sideBar.width
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
@ -47,7 +47,7 @@ Meui.Window {
Label { Label {
text: stackView.currentItem.headerTitle text: stackView.currentItem.headerTitle
font.pointSize: parent.height > 0 ? parent.height / 3 : 1 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 Layout.alignment: Qt.AlignBottom
} }

Write Preview
Loading…
Cancel
Save