Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configurable screen split #8

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
theme.conf.user
*~
*.bak
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion Components/Clock.qml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Components/Input.qml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Components/LoginForm.qml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Components/SessionButton.qml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Components/SystemButtons.qml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Components/UserList.qml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -194,4 +194,4 @@ Item {
]
}

}
}
4 changes: 2 additions & 2 deletions Components/VirtualKeyboard.qml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -25,4 +25,4 @@ InputPanel {
property bool activated: false
active: activated && Qt.inputMethod.visible
visible: active
}
}
2 changes: 1 addition & 1 deletion Main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <PATH-TO-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.

Expand Down
2 changes: 1 addition & 1 deletion metadata.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion theme.conf
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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.
Expand Down