Commit 67ebf934 authored by abgr's avatar abgr
Browse files

adjusted some margins and added preview for sddm theme

parent af77b72a
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
***************************************************************************/ ***************************************************************************/
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls 1.4 as QQC import QtQuick.Controls 1.4 as QQC
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
...@@ -158,16 +157,18 @@ Rectangle { ...@@ -158,16 +157,18 @@ Rectangle {
} }
Text { Text {
// Spacer // Spacer
Layout.preferredHeight: message.Layout.minimumHeight - 2 Layout.preferredHeight: message.height
} }
GridLayout { GridLayout {
Layout.leftMargin: 8 Layout.leftMargin: 8 * container.scalingFactor
Layout.rightMargin: 8 Layout.rightMargin: 8 * container.scalingFactor
Layout.topMargin: 8 Layout.topMargin: 8 * container.scalingFactor
Layout.bottomMargin: 8 Layout.bottomMargin: 8 * container.scalingFactor
columns: 2 columns: 2
rowSpacing: 4 * container.scalingFactor
columnSpacing: 4 * container.scalingFactor
Label { QQC.Label {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: textConstants.userName text: textConstants.userName
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -175,7 +176,7 @@ Rectangle { ...@@ -175,7 +176,7 @@ Rectangle {
color: "#101010" color: "#101010"
} }
TextField { QQC.TextField {
id: user_entry id: user_entry
text: userModel.lastUser text: userModel.lastUser
Layout.fillWidth: true Layout.fillWidth: true
...@@ -196,7 +197,7 @@ Rectangle { ...@@ -196,7 +197,7 @@ Rectangle {
} }
} }
Label { QQC.Label {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: textConstants.password text: textConstants.password
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -204,7 +205,7 @@ Rectangle { ...@@ -204,7 +205,7 @@ Rectangle {
color: "#101010" color: "#101010"
} }
TextField { QQC.TextField {
id: passwd_entry id: passwd_entry
echoMode: TextInput.Password echoMode: TextInput.Password
Layout.fillWidth: true Layout.fillWidth: true
...@@ -232,9 +233,8 @@ Rectangle { ...@@ -232,9 +233,8 @@ Rectangle {
} }
} }
Text { Text {
// Layout.fillHeight: true
Layout.alignment: Qt.AlignCenter
id: message id: message
Layout.alignment: Qt.AlignCenter
text: "" text: ""
font.family: "Liberation Sans" font.family: "Liberation Sans"
font.pixelSize: 19 * container.scalingFactor font.pixelSize: 19 * container.scalingFactor
...@@ -245,13 +245,13 @@ Rectangle { ...@@ -245,13 +245,13 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
spacing: 0 spacing: 0
ToolButton { QQC.ToolButton {
id: sessionbutton id: sessionbutton
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
Layout.leftMargin: 8 Layout.leftMargin: 8 * container.scalingFactor
Layout.rightMargin: 8 Layout.rightMargin: 8 * container.scalingFactor
Layout.topMargin: 8 Layout.topMargin: 8 * container.scalingFactor
Layout.bottomMargin: 8 Layout.bottomMargin: 8 * container.scalingFactor
property int currentIndex: -1 property int currentIndex: -1
style: ButtonStyle { style: ButtonStyle {
...@@ -268,7 +268,7 @@ Rectangle { ...@@ -268,7 +268,7 @@ Rectangle {
: "button.svg" : "button.svg"
} }
label: RowLayout { label: RowLayout {
Label { QQC.Label {
Layout.fillWidth: true Layout.fillWidth: true
text: instantiator.objectAt(sessionbutton.currentIndex).text || "" text: instantiator.objectAt(sessionbutton.currentIndex).text || ""
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -306,7 +306,7 @@ Rectangle { ...@@ -306,7 +306,7 @@ Rectangle {
// Spacer // Spacer
Layout.fillWidth: true Layout.fillWidth: true
} }
ToolButton { QQC.ToolButton {
id: reboot_button id: reboot_button
// enabled: sddm.canReboot // enabled: sddm.canReboot
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -335,7 +335,7 @@ Rectangle { ...@@ -335,7 +335,7 @@ Rectangle {
} }
onClicked: sddm.reboot() onClicked: sddm.reboot()
} }
ToolButton { QQC.ToolButton {
id: suspend_button id: suspend_button
// visible: sddm.canSuspend // visible: sddm.canSuspend
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -364,7 +364,7 @@ Rectangle { ...@@ -364,7 +364,7 @@ Rectangle {
} }
onClicked: sddm.suspend() onClicked: sddm.suspend()
} }
ToolButton { QQC.ToolButton {
id: hibernate_button id: hibernate_button
// visible: sddm.canHibernate // visible: sddm.canHibernate
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -393,7 +393,7 @@ Rectangle { ...@@ -393,7 +393,7 @@ Rectangle {
} }
onClicked: sddm.hibernate() onClicked: sddm.hibernate()
} }
ToolButton { QQC.ToolButton {
id: shutdown_button id: shutdown_button
// enabled: sddm.canPowerOff // enabled: sddm.canPowerOff
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
......
This diff is collapsed.
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
***************************************************************************/ ***************************************************************************/
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls 1.4 as QQC import QtQuick.Controls 1.4 as QQC
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
...@@ -158,16 +157,18 @@ Rectangle { ...@@ -158,16 +157,18 @@ Rectangle {
} }
Text { Text {
// Spacer // Spacer
Layout.preferredHeight: message.Layout.minimumHeight - 2 Layout.preferredHeight: message.height
} }
GridLayout { GridLayout {
Layout.leftMargin: 8 Layout.leftMargin: 8 * container.scalingFactor
Layout.rightMargin: 8 Layout.rightMargin: 8 * container.scalingFactor
Layout.topMargin: 8 Layout.topMargin: 8 * container.scalingFactor
Layout.bottomMargin: 8 Layout.bottomMargin: 8 * container.scalingFactor
columns: 2 columns: 2
rowSpacing: 4 * container.scalingFactor
columnSpacing: 4 * container.scalingFactor
Label { QQC.Label {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: textConstants.userName text: textConstants.userName
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -175,7 +176,7 @@ Rectangle { ...@@ -175,7 +176,7 @@ Rectangle {
color: "#000000" color: "#000000"
} }
TextField { QQC.TextField {
id: user_entry id: user_entry
text: userModel.lastUser text: userModel.lastUser
Layout.fillWidth: true Layout.fillWidth: true
...@@ -196,7 +197,7 @@ Rectangle { ...@@ -196,7 +197,7 @@ Rectangle {
} }
} }
Label { QQC.Label {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: textConstants.password text: textConstants.password
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -204,7 +205,7 @@ Rectangle { ...@@ -204,7 +205,7 @@ Rectangle {
color: "#000000" color: "#000000"
} }
TextField { QQC.TextField {
id: passwd_entry id: passwd_entry
echoMode: TextInput.Password echoMode: TextInput.Password
Layout.fillWidth: true Layout.fillWidth: true
...@@ -232,9 +233,8 @@ Rectangle { ...@@ -232,9 +233,8 @@ Rectangle {
} }
} }
Text { Text {
// Layout.fillHeight: true
Layout.alignment: Qt.AlignCenter
id: message id: message
Layout.alignment: Qt.AlignCenter
text: "" text: ""
font.family: "Liberation Sans" font.family: "Liberation Sans"
font.pixelSize: 19 * container.scalingFactor font.pixelSize: 19 * container.scalingFactor
...@@ -245,13 +245,13 @@ Rectangle { ...@@ -245,13 +245,13 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
spacing: 0 spacing: 0
ToolButton { QQC.ToolButton {
id: sessionbutton id: sessionbutton
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
Layout.leftMargin: 8 Layout.leftMargin: 8 * container.scalingFactor
Layout.rightMargin: 8 Layout.rightMargin: 8 * container.scalingFactor
Layout.topMargin: 8 Layout.topMargin: 8 * container.scalingFactor
Layout.bottomMargin: 8 Layout.bottomMargin: 8 * container.scalingFactor
property int currentIndex: -1 property int currentIndex: -1
style: ButtonStyle { style: ButtonStyle {
...@@ -268,7 +268,7 @@ Rectangle { ...@@ -268,7 +268,7 @@ Rectangle {
: "button.svg" : "button.svg"
} }
label: RowLayout { label: RowLayout {
Label { QQC.Label {
Layout.fillWidth: true Layout.fillWidth: true
text: instantiator.objectAt(sessionbutton.currentIndex).text || "" text: instantiator.objectAt(sessionbutton.currentIndex).text || ""
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -306,7 +306,7 @@ Rectangle { ...@@ -306,7 +306,7 @@ Rectangle {
// Spacer // Spacer
Layout.fillWidth: true Layout.fillWidth: true
} }
ToolButton { QQC.ToolButton {
id: reboot_button id: reboot_button
// enabled: sddm.canReboot // enabled: sddm.canReboot
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -335,7 +335,7 @@ Rectangle { ...@@ -335,7 +335,7 @@ Rectangle {
} }
onClicked: sddm.reboot() onClicked: sddm.reboot()
} }
ToolButton { QQC.ToolButton {
id: suspend_button id: suspend_button
// visible: sddm.canSuspend // visible: sddm.canSuspend
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -364,7 +364,7 @@ Rectangle { ...@@ -364,7 +364,7 @@ Rectangle {
} }
onClicked: sddm.suspend() onClicked: sddm.suspend()
} }
ToolButton { QQC.ToolButton {
id: hibernate_button id: hibernate_button
// visible: sddm.canHibernate // visible: sddm.canHibernate
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -393,7 +393,7 @@ Rectangle { ...@@ -393,7 +393,7 @@ Rectangle {
} }
onClicked: sddm.hibernate() onClicked: sddm.hibernate()
} }
ToolButton { QQC.ToolButton {
id: shutdown_button id: shutdown_button
// enabled: sddm.canPowerOff // enabled: sddm.canPowerOff
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
......
sddm/TrelliumColorshift/preview.png

520 Bytes | W: | H:

sddm/TrelliumColorshift/preview.png

1.2 KB | W: | H:

sddm/TrelliumColorshift/preview.png
sddm/TrelliumColorshift/preview.png
sddm/TrelliumColorshift/preview.png
sddm/TrelliumColorshift/preview.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
***************************************************************************/ ***************************************************************************/
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls 1.4 as QQC import QtQuick.Controls 1.4 as QQC
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
...@@ -158,16 +157,18 @@ Rectangle { ...@@ -158,16 +157,18 @@ Rectangle {
} }
Text { Text {
// Spacer // Spacer
Layout.preferredHeight: message.Layout.minimumHeight - 2 Layout.preferredHeight: message.height
} }
GridLayout { GridLayout {
Layout.leftMargin: 8 Layout.leftMargin: 8 * container.scalingFactor
Layout.rightMargin: 8 Layout.rightMargin: 8 * container.scalingFactor
Layout.topMargin: 8 Layout.topMargin: 8 * container.scalingFactor
Layout.bottomMargin: 8 Layout.bottomMargin: 8 * container.scalingFactor
columns: 2 columns: 2
rowSpacing: 4 * container.scalingFactor
columnSpacing: 4 * container.scalingFactor
Label { QQC.Label {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: textConstants.userName text: textConstants.userName
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -175,7 +176,7 @@ Rectangle { ...@@ -175,7 +176,7 @@ Rectangle {
color: "#000000" color: "#000000"
} }
TextField { QQC.TextField {
id: user_entry id: user_entry
text: userModel.lastUser text: userModel.lastUser
Layout.fillWidth: true Layout.fillWidth: true
...@@ -196,7 +197,7 @@ Rectangle { ...@@ -196,7 +197,7 @@ Rectangle {
} }
} }
Label { QQC.Label {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: textConstants.password text: textConstants.password
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -204,7 +205,7 @@ Rectangle { ...@@ -204,7 +205,7 @@ Rectangle {
color: "#000000" color: "#000000"
} }
TextField { QQC.TextField {
id: passwd_entry id: passwd_entry
echoMode: TextInput.Password echoMode: TextInput.Password
Layout.fillWidth: true Layout.fillWidth: true
...@@ -232,9 +233,8 @@ Rectangle { ...@@ -232,9 +233,8 @@ Rectangle {
} }
} }
Text { Text {
// Layout.fillHeight: true
Layout.alignment: Qt.AlignCenter
id: message id: message
Layout.alignment: Qt.AlignCenter
text: "" text: ""
font.family: "Liberation Sans" font.family: "Liberation Sans"
font.pixelSize: 19 * container.scalingFactor font.pixelSize: 19 * container.scalingFactor
...@@ -245,13 +245,13 @@ Rectangle { ...@@ -245,13 +245,13 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
spacing: 0 spacing: 0
ToolButton { QQC.ToolButton {
id: sessionbutton id: sessionbutton
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
Layout.leftMargin: 8 Layout.leftMargin: 8 * container.scalingFactor
Layout.rightMargin: 8 Layout.rightMargin: 8 * container.scalingFactor
Layout.topMargin: 8 Layout.topMargin: 8 * container.scalingFactor
Layout.bottomMargin: 8 Layout.bottomMargin: 8 * container.scalingFactor
property int currentIndex: -1 property int currentIndex: -1
style: ButtonStyle { style: ButtonStyle {
...@@ -268,7 +268,7 @@ Rectangle { ...@@ -268,7 +268,7 @@ Rectangle {
: "button.svg" : "button.svg"
} }
label: RowLayout { label: RowLayout {
Label { QQC.Label {
Layout.fillWidth: true Layout.fillWidth: true
text: instantiator.objectAt(sessionbutton.currentIndex).text || "" text: instantiator.objectAt(sessionbutton.currentIndex).text || ""
font.family: "Liberation Sans" font.family: "Liberation Sans"
...@@ -306,7 +306,7 @@ Rectangle { ...@@ -306,7 +306,7 @@ Rectangle {
// Spacer // Spacer
Layout.fillWidth: true Layout.fillWidth: true
} }
ToolButton { QQC.ToolButton {
id: reboot_button id: reboot_button
// enabled: sddm.canReboot // enabled: sddm.canReboot
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -335,7 +335,7 @@ Rectangle { ...@@ -335,7 +335,7 @@ Rectangle {
} }
onClicked: sddm.reboot() onClicked: sddm.reboot()
} }
ToolButton { QQC.ToolButton {
id: suspend_button id: suspend_button
// visible: sddm.canSuspend // visible: sddm.canSuspend
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -364,7 +364,7 @@ Rectangle { ...@@ -364,7 +364,7 @@ Rectangle {
} }
onClicked: sddm.suspend() onClicked: sddm.suspend()
} }
ToolButton { QQC.ToolButton {
id: hibernate_button id: hibernate_button
// visible: sddm.canHibernate // visible: sddm.canHibernate
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
...@@ -393,7 +393,7 @@ Rectangle { ...@@ -393,7 +393,7 @@ Rectangle {
} }
onClicked: sddm.hibernate() onClicked: sddm.hibernate()
} }
ToolButton { QQC.ToolButton {
id: shutdown_button id: shutdown_button
// enabled: sddm.canPowerOff // enabled: sddm.canPowerOff
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
......
sddm/TrelliumColorshiftOpaque/preview.png

517 Bytes | W: | H:

sddm/TrelliumColorshiftOpaque/preview.png

1.28 KB | W: | H:

sddm/TrelliumColorshiftOpaque/preview.png
sddm/TrelliumColorshiftOpaque/preview.png
sddm/TrelliumColorshiftOpaque/preview.png
sddm/TrelliumColorshiftOpaque/preview.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
***************************************************************************/ ***************************************************************************/
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls 1.4 as QQC import QtQuick.Controls 1.4 as QQC
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
...@@ -158,16 +157,18 @@ Rectangle { ...@@ -158,16 +157,18 @@ Rectangle {
} }
Text { Text {
// Spacer // Spacer
Layout.preferredHeight: message.Layout.minimumHeight - 2 Layout.preferredHeight: message.height
} }
GridLayout { GridLayout {
Layout.leftMargin: 8 Layout.leftMargin: 8 * container.scalingFactor
Layout.rightMargin: 8 Layout.rightMargin: 8 * container.scalingFactor
Layout.topMargin: 8 Layout.topMargin: 8 * container.scalingFactor
Layout.bottomMargin: 8 Layout.bottomMargin: 8 * container.scalingFactor
columns: 2 columns: 2
rowSpacing: 4 * container.scalingFactor
columnSpacing: 4 * container.scalingFactor
Label {