diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ce2be8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +theme.conf.user +*~ +*.bak diff --git a/CHANGELOG.md b/CHANGELOG.md index 2224928..b222e97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +2019-07-04 +---------- +- Added InterfaceWidthDivider config item to easily control width of the input area (@MarcinOrlowski) + 2019-06-14 ---------- - Added Hibernation support (@MarcinOrlowski) diff --git a/Components/Clock.qml b/Components/Clock.qml index 5a24e6e..33669fb 100644 --- a/Components/Clock.qml +++ b/Components/Clock.qml @@ -1,7 +1,7 @@ // // This file is part of Sugar Dark, a theme for the Simple Display Desktop Manager. // -// Copyright 2018 Marian Arlt +// Copyright 2018-2020 Marian Arlt // // Sugar Dark is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Components/Input.qml b/Components/Input.qml index 95bc96f..a520a32 100644 --- a/Components/Input.qml +++ b/Components/Input.qml @@ -1,7 +1,7 @@ // // This file is part of Sugar Dark, a theme for the Simple Display Desktop Manager. // -// Copyright 2018 Marian Arlt +// Copyright 2018-2020 Marian Arlt // // Sugar Dark is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Components/LoginForm.qml b/Components/LoginForm.qml index d988d20..e77a926 100644 --- a/Components/LoginForm.qml +++ b/Components/LoginForm.qml @@ -1,7 +1,7 @@ // // This file is part of Sugar Dark, a theme for the Simple Display Desktop Manager. // -// Copyright 2018 Marian Arlt +// Copyright 2018-2020 Marian Arlt // // Sugar Dark is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Components/SessionButton.qml b/Components/SessionButton.qml index 037d4c1..9f871fa 100644 --- a/Components/SessionButton.qml +++ b/Components/SessionButton.qml @@ -1,7 +1,7 @@ // // This file is part of Sugar Dark, a theme for the Simple Display Desktop Manager. // -// Copyright 2018 Marian Arlt +// Copyright 2018-2020 Marian Arlt // // Sugar Dark is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Components/SystemButtons.qml b/Components/SystemButtons.qml index defdca3..1baa9fd 100644 --- a/Components/SystemButtons.qml +++ b/Components/SystemButtons.qml @@ -1,7 +1,7 @@ // // This file is part of Sugar Dark, a theme for the Simple Display Desktop Manager. // -// Copyright 2018 Marian Arlt +// Copyright 2018-2020 Marian Arlt // // Sugar Dark is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Components/UserList.qml b/Components/UserList.qml index 1fa7170..2316e6f 100644 --- a/Components/UserList.qml +++ b/Components/UserList.qml @@ -1,7 +1,7 @@ // // This file is part of Sugar Dark, a theme for the Simple Display Desktop Manager. // -// Copyright 2018 Marian Arlt +// Copyright 2018-2020 Marian Arlt // // Sugar Dark is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -194,4 +194,4 @@ Item { ] } -} \ No newline at end of file +} diff --git a/Components/VirtualKeyboard.qml b/Components/VirtualKeyboard.qml index b983e78..387a81d 100644 --- a/Components/VirtualKeyboard.qml +++ b/Components/VirtualKeyboard.qml @@ -1,7 +1,7 @@ // // This file is part of Sugar Dark, a theme for the Simple Display Desktop Manager. // -// Copyright 2018 Marian Arlt +// Copyright 2018-2020 Marian Arlt // // Sugar Dark is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,4 +25,4 @@ InputPanel { property bool activated: false active: activated && Qt.inputMethod.visible visible: active -} \ No newline at end of file +} diff --git a/Main.qml b/Main.qml index 770f906..10145ed 100644 --- a/Main.qml +++ b/Main.qml @@ -83,7 +83,7 @@ Pane { id: form height: virtualKeyboard.state == "visible" ? parent.height - virtualKeyboard.implicitHeight : parent.height - width: parent.width / 2.5 + width: parent.width / config.InterfaceWidthDivider anchors.horizontalCenter: config.FormPosition == "center" ? parent.horizontalCenter : undefined anchors.left: config.FormPosition == "left" ? parent.left : undefined anchors.right: config.FormPosition == "right" ? parent.right : undefined diff --git a/README.md b/README.md index 4e00cc1..2575fcb 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,16 @@ In the `[Theme]` section simply add the themes name: `Current=sugar-dark`. Also ### Theming the theme -Sugar is extremely customizable by editing its included `theme.conf` file. You can change the colors and images used, the time and date formats, the appearance of the whole interface and even how it works. +Sugar is extremely customizable by either (not recommended) editing its defaults in included `theme.conf` file or by creating `threme.conf.user` in the same directory with all the custom settings in it. The latter approach would prevent your settings from being overwritten by theme updates. You can change the colors and images used, the time and date formats, the appearance of the whole interface and even how it works. And as if that wouldn't still be enough you can translate every single button and label because SDDM is still lacking behind with localization and clearly [needs your help](https://github.com/sddm/sddm/wiki/Localization)! +To test your changes invoke `sddm-greeter --test-mode --theme `. + Please read the [Sugar Wiki on Github](https://github.com/MarianArlt/sddm-sugar-light/wiki/Before-you-begin) for a detailed description of every variable available, what it does and the values it accepts. The `theme.conf` itself is also very well commented for you to get right at it. ### Legal Notice -Copyright (C) 2018 Marian Arlt. +Copyright (C) 2018-2020 Marian Arlt. Sugar Dark is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/metadata.desktop b/metadata.desktop index d549f70..9632afb 100644 --- a/metadata.desktop +++ b/metadata.desktop @@ -2,7 +2,7 @@ Name=Sugar Dark Description=The sweetest theme around; Dark! Author=Marian Arlt -Copyright=Copyright (C) 2018 Marian Arlt +Copyright=Copyright (C) 2018-2020 Marian Arlt License=GPL-3.0-or-later Type=sddm-theme Version=1.2 diff --git a/theme.conf b/theme.conf index 629479f..a1edd80 100644 --- a/theme.conf +++ b/theme.conf @@ -1,3 +1,6 @@ +; DO NOT EDIT +; To override dafaults create theme.conf.user file and put your values (and sections) there. + [General] Background="Background.jpg" @@ -61,10 +64,13 @@ ForcePasswordFocus=true ForceHideCompletePassword=false ## If you don't like to see any character at all not even while being entered set this to true. +InterfaceWidthDivider=2.5 +# Used to calculate how much of the screen width should be used by area with user interface (remaining space will be then used for the image). +# Default value is 2.5, but for ultrawide screens you may want to set it i.e. to 4 or 5 to have 1/4th or 1/5th of you screen used by inputs only. + ForceHideVirtualKeyboardButton="false" ## Do not show the button for the virtual keyboard at all. This will completely disable functionality for the virtual keyboard even if it is installed and activated in sddm.conf - ## [Translations] ## SDDM may lack proper translation for every element. Suger defaults to SDDM translations. Please help translate SDDM as much as possible for your language: https://github.com/sddm/sddm/wiki/Localization. These are in order as they appear on screen.