Merge pull request #16 from KamaleiZestri/master

Qt5 -> Qt6 Compatability

.gitignore

@@ -1 +1 @@
-slice/theme.conf.user
+theme.conf.user

Main.qml

@@ -1,12 +1,15 @@
 import QtQuick 2.7
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import SddmComponents 2.0
 
+import "slice"
+
 Rectangle
 {
     id: root
     color: colors.background
     property variant geometry: screenModel.geometry(screenModel.primary)
+    //property bool virtualkeyboard: bool(config.virtualkeyboard)
 
     state: "stateUsers"
     states:
@@ -198,12 +201,24 @@ Rectangle
             id: pageUsers
             width: areaMain.width
             height: areaMain.height
+            y: inputPanel.visible && inputPanel.y != areaMain.height + areaBottom.height ? -150 : 0
 
             Behavior on x { NumberAnimation { duration: 150 } }
+            Behavior on y { NumberAnimation { duration: 150 } }
 
             onLockNav: areaTop.enabled = false
             onUnlockNav: areaTop.enabled = true
         }
+
+        Loader {
+            id: inputPanel
+            source: "slice/VirtualKeyboard.qml"
+            width: areaMain.width
+            y: areaMain.height - 350 - areaBottom.height
+            Behavior on y { NumberAnimation { duration: 150 } }
+            //visible: virtualkeyboard
+            visible: false
+        }
     }
 
     Item

README.md

@@ -4,17 +4,21 @@ Simple dark SDDM theme with many customization options.
 
 [![Theme preview (YouTube)](https://user-images.githubusercontent.com/2903496/45325970-142dd700-b55b-11e8-8396-dc6aba6282e5.png)](https://youtu.be/X6lXkBwo--s)
 
-## Installing
+## Install from KDE system settings
+
+If you're using KDE, you can install theme from `System Settings > Startup and Shutdown > Login Screen (SDDM)`. You can download this repo as zip and install with `Install From File...`, or you can find it in `Get New Login Screens...` window.
+
+## Manual install
 
 1. Install `Qt Graphical Effects` QML module
 2. Install Roboto font (optional, you can change to other font, [see below](#font-scheme))
-3. `git clone https://github.com/RadRussianRus/sddm-slice.git`
+3. `git clone https://github.com/EricKotato/sddm-slice.git`
-4. `cp -r sddm-slice/slice /usr/share/sddm/themes/slice`
+4. `cp -r sddm-slice /usr/share/sddm/themes/sddm-slice`
-5. Open `/etc/sddm.conf` and put `Current=slice` in `[Theme]` section
+5. Open `/etc/sddm.conf` and put `Current=sddm-slice` in `[Theme]` section
 
 ## Configuration
 
-Create file `theme.conf.user` in theme folder. See `slice/theme.conf` for reference. Also sample configs can be found [in wiki](https://github.com/RadRussianRus/sddm-slice/wiki#sample-configs).
+Create file `theme.conf.user` in theme folder. See `theme.conf` for reference. Also sample configs can be found [in wiki](https://github.com/EricKotato/sddm-slice/wiki#sample-configs).
 
 ### Base options
 
@@ -25,22 +29,22 @@ Create file `theme.conf.user` in theme folder. See `slice/theme.conf` for refere
 
 ### Color scheme
 
-There are many color options. In fact, too many. So now they are grouped by layers in [color scheme](https://github.com/RadRussianRus/sddm-slice/wiki/Color-Scheme). Most of them are optional, only mandatory options are from [layer 1](https://github.com/RadRussianRus/sddm-slice/wiki/Color-Scheme-Layer-1):
+There are many color options. In fact, too many. So now they are grouped by layers in [color scheme](https://github.com/EricKotato/sddm-slice/wiki/Color-Scheme). Most of them are optional, only mandatory options are from [layer 1](https://github.com/EricKotato/sddm-slice/wiki/Color-Scheme-Layer-1):
 
 * `color_bg` - background color. Defaults to `#222222`.
 * `color_main` - main color. Defaults to `#dddddd`.
 * `color_dimmed` - dimmed main color. Defaults to `#888888`.
 * `color_contrast` - color that contrasting to both main and dimmed. Defaults to `#1f1f1f`.
 
-Info about other layers can be found on wiki: [layer 2](https://github.com/RadRussianRus/sddm-slice/wiki/Color-Scheme-Layer-2), [layer 3](https://github.com/RadRussianRus/sddm-slice/wiki/Color-Scheme-Layer-3).
+Info about other layers can be found on wiki: [layer 2](https://github.com/EricKotato/sddm-slice/wiki/Color-Scheme-Layer-2), [layer 3](https://github.com/EricKotato/sddm-slice/wiki/Color-Scheme-Layer-3).
 
 ### Font scheme
 
-There are also many font options, so there is now [font scheme](https://github.com/RadRussianRus/sddm-slice/wiki/Font-Scheme) too. Most of them are optional, only mandatory option is from [layer 1](https://github.com/RadRussianRus/sddm-slice/wiki/Font-Scheme-Layer-1):
+There are also many font options, so there is now [font scheme](https://github.com/EricKotato/sddm-slice/wiki/Font-Scheme) too. Most of them are optional, only mandatory option is from [layer 1](https://github.com/EricKotato/sddm-slice/wiki/Font-Scheme-Layer-1):
 
 * `font` - overall font. Defaults to `Roboto`.
 
-Info about other layers can be found on wiki: [layer 2](https://github.com/RadRussianRus/sddm-slice/wiki/Font-Scheme-Layer-2), [layer 3](https://github.com/RadRussianRus/sddm-slice/wiki/Font-Scheme-Layer-3).
+Info about other layers can be found on wiki: [layer 2](https://github.com/EricKotato/sddm-slice/wiki/Font-Scheme-Layer-2), [layer 3](https://github.com/EricKotato/sddm-slice/wiki/Font-Scheme-Layer-3).
 
 ### Debug mode options
 

metadata.desktop

@@ -2,12 +2,12 @@
 Name=Slice
 Description=Simple SDDM theme.
 Author=RadRussianRus
-Copyright=(c) 2019, RadRussianRus
+Copyright=(c) 2020, RadRussianRus
 License=CC-BY-SA
 Type=sddm-theme
 Screenshot=screenshot.png
-Website=https://github.com/RadRussianRus/slice-sddm
+Website=https://github.com/RadRussianRus/sddm-slice
-Version=1.5
+Version=1.5.1
 MainScript=Main.qml
 TranslationsDirectory=translations
 ConfigFile=theme.conf

slice/LoopListPowerItem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 Item
 {

slice/LoopListSessionItem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import SddmComponents 2.0
 
 Item

slice/LoopListUserItem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import SddmComponents 2.0
 
 Item

slice/PagePower.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import SddmComponents 2.0
 import QtQuick.Layouts 1.3
 

slice/VirtualKeyboard.qml

@@ -0,0 +1,7 @@
+import QtQuick 2.7
+import QtQuick.VirtualKeyboard 2.1
+
+InputPanel {
+    id: inputPanel
+    width: parent.width
+}

theme.conf

@@ -7,4 +7,4 @@ color_bg=#222222
 color_main=#dddddd
 color_dimmed=#888888
 color_contrast=#1f1f1f
-manual=false
+manual=false

translations/nl.ts

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl">
+<context>
+    <name>PagePower</name>
+    <message>
+        <source>Suspend</source>
+        <translation>Pauzestand</translation>
+    </message>
+    <message>
+        <source>Hibernate</source>
+        <translation>Slaapstand</translation>
+    </message>
+    <message>
+        <source>Hybrid Sleep</source>
+        <translation>Hybride slaapstand</translation>
+    </message>
+</context>
+<context>
+    <name>PageUsers</name>
+    <message>
+        <source>Back</source>
+        <translation>Terug</translation>
+    </message>
+</context>
+</TS>