diff --git a/.gitignore b/.gitignore index da933cf..1a4f6cc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ .Trash-* .nfs* *.tar.gz +build-tar.gz.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e1cc3a..13fa581 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,3 +14,14 @@ - Update few colors - Fix look-and-feel (Window theme apply now automatically) - Update readme + +#### Version 1.4 - 30 March 2018 +- Update readme (new one-line sed command for Papirus iconpack colors change) +- Kvantum : Update slidercursor-disabled control svg +- Kvantum : Update dial control svg +- Kvantum : reduct tooltip delay 250 to 180 +- Plasma theme : Update button.svg +- SDDM : Textbox, PasswordBox and Button colors no longer appear with the default white theme. Colors schemes are now directly integrated into the SDDM theme. This requires a slight visual change. +- SDDM : New icons, they are now directly integrated into the SDDM theme. + + diff --git a/INFO/screenshots/preview.4.png b/INFO/screenshots/preview.4.png index 1240cb3..0a0d5e3 100644 Binary files a/INFO/screenshots/preview.4.png and b/INFO/screenshots/preview.4.png differ diff --git a/INFO/screenshots/preview.4.xcf b/INFO/screenshots/preview.4.xcf new file mode 100644 index 0000000..398f0fd Binary files /dev/null and b/INFO/screenshots/preview.4.xcf differ diff --git a/INFO/screenshots/thumbs/mini.preview.4.png b/INFO/screenshots/thumbs/mini.preview.4.png index c069fae..df95107 100644 Binary files a/INFO/screenshots/thumbs/mini.preview.4.png and b/INFO/screenshots/thumbs/mini.preview.4.png differ diff --git a/Kvantum/Darkine/Darkine.kvconfig b/Kvantum/Darkine/Darkine.kvconfig index dfd5321..aed4e0f 100644 --- a/Kvantum/Darkine/Darkine.kvconfig +++ b/Kvantum/Darkine/Darkine.kvconfig @@ -13,7 +13,7 @@ spread_progressbar=true composite=true menu_shadow_depth=5 tooltip_shadow_depth=2 -splitter_width=4 +splitter_width=7 scroll_width=9 scroll_arrows=false scroll_min_extent=60 @@ -60,7 +60,7 @@ opaque=kaffeine,kmplayer,subtitlecomposer,kdenlive,vlc,smplayer,smplayer2,avidem reduce_window_opacity=0 respect_DE=true scrollable_menu=false -submenu_delay=250 +submenu_delay=180 [GeneralColors] window.color=#1d1d1d @@ -89,7 +89,7 @@ transparent_dolphin_view=false transparent_pcmanfm_sidepane=true blur_translucent=false transparent_menutitle=true -respect_darkness=false +respect_darkness=true kcapacitybar_as_progressbar=true force_size_grip=true iconless_pushbutton=true diff --git a/Kvantum/Darkine/Darkine.svg b/Kvantum/Darkine/Darkine.svg index 87041d4..752bae1 100644 --- a/Kvantum/Darkine/Darkine.svg +++ b/Kvantum/Darkine/Darkine.svg @@ -38,9 +38,9 @@ inkscape:window-height="737" id="namedview984" showgrid="false" - inkscape:zoom="5.787825" - inkscape:cx="406.71551" - inkscape:cy="363.9634" + inkscape:zoom="2.0463052" + inkscape:cx="97.993055" + inkscape:cy="161.27088" inkscape:window-x="1920" inkscape:window-y="0" inkscape:window-maximized="0" @@ -679,11 +679,11 @@ y="730" rx="22.5" ry="22.5" - style="fill:#cfd8dc;fill-rule:evenodd;stroke:none;fill-opacity:1;opacity:0.1" /> + style="fill:#5e5f5e;fill-rule:evenodd;stroke:none;fill-opacity:1;opacity:0.1" /> + style="fill:#ffffff;fill-opacity:0.39200003;fill-rule:evenodd;stroke:none;opacity:0.5"> + id="g189" + style=""> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#282828;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#404040;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> *Command execution take ~2 min with a Intel quad core

Darkine-KDE changecolor

1. The main color : #00bcd4 | 2. The backend color : #0096aa | 3. The logo color : #00424A

+ ## License GNU GPL v3 diff --git a/plasma/desktoptheme/Darkine/widgets/button.svg b/plasma/desktoptheme/Darkine/widgets/button.svg index 1c65490..e2db6ee 100644 --- a/plasma/desktoptheme/Darkine/widgets/button.svg +++ b/plasma/desktoptheme/Darkine/widgets/button.svg @@ -36,14 +36,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1344" - inkscape:window-height="617" + inkscape:window-height="897" id="namedview158" showgrid="false" - inkscape:zoom="9.2623218" - inkscape:cx="133.65527" - inkscape:cy="7.2363217" - inkscape:window-x="204" - inkscape:window-y="376" + inkscape:zoom="3.2747253" + inkscape:cx="121.278" + inkscape:cy="31.557136" + inkscape:window-x="2152" + inkscape:window-y="64" inkscape:window-maximized="0" inkscape:current-layer="layer1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="m 10.988232,1017.0953 v 29.8972 h 29.897141 v -29.8972 z" + style="color:#000000;fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9342863" /> + transform="matrix(0.93428636,0,0,0.93428636,-38.528959,998.40957)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1773" + d="M 53,52 V 20 h -5 v 32 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> + + transform="matrix(0.93428636,0,0,0.93428636,-38.528959,999.34387)" + style="stroke:none"> - - - + inkscape:connector-curvature="0" + id="path1791" + d="M 85,51 H 53 v 3 h 32 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> + + + + + + + transform="matrix(0.93428636,0,0,0.93428636,4.4481944,998.40957)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1797" + d="M 7,55 H 4 C 2.5,55 2,54.5 2,53 v -1 h 5 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.46200001" /> + id="g615" + style="color:#000000;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-transform:none;stroke-width:0.86400002"> + inkscape:connector-curvature="0" + id="path1799" + d="M 7,59 H 0 v -7 h 2 v 1 c 0,1.5 0.5,2 2,2 h 3 z" + style="fill:url(#radialGradient11030)" /> + + + + + + + + + - - - - - - + d="m 128.7083,1046.9925 v -29.8972 H 98.811134 v 29.8972 z" + style="text-indent:0;fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9342863" + inkscape:label="#pressed-center" /> + transform="matrix(0.93428636,0,0,0.93428636,49.293944,998.40957)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1588" + d="M 53,52 V 20 h -5 v 32 z" + style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> + + transform="matrix(0.93428636,0,0,0.93428636,49.293944,999.34387)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1594" + d="M 85,51 H 53 v 3 h 32 z" + style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> + + transform="matrix(0.93428636,0,0,0.93428636,49.293944,993.73817)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1600" + d="M 53,25 H 85 V 19 H 53 Z" + style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke-width:0.88800001" /> + + + + + + - - - + id="focused-top" + transform="matrix(0.93428636,0,0,0.93428636,5.3825144,993.73817)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1620" + d="m 53.0001,25 h 32 v -6 h -32 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.88800001" /> + - - - + id="focused-bottom" + transform="matrix(0.93428636,0,0,0.93428636,5.3825144,999.34387)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1626" + d="M 85,51 H 53 v 2 h 32 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transform="matrix(0.93428636,0,0,0.93428636,92.271144,998.40957)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path2228" + d="M 7,55 H 4 C 2.5,55 2,54.5 2,53 v -1 h 5 z" + style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke-width:0.46200001" /> + + + + + transform="matrix(0.93428636,0,0,0.93428636,92.271144,998.40957)" + style="stroke:none;stroke-width:0.46200001"> + inkscape:connector-curvature="0" + id="path2236" + d="M 7,14 H 4 c -1.5,0 -2,0.5 -2,2 v 4 h 5 z" + style="fill:#323232;fill-opacity:1;fill-rule:evenodd" /> + + + + + transform="matrix(-1,0,0,1,227.51945,-4.7946986e-7)" + xlink:href="#pressed-left" /> + transform="matrix(-1,0,0,1,227.51945,-4.7946986e-7)" + xlink:href="#pressed-bottomleft" /> - - - - - - - - + + + + + + + + d="m 141.78837,1017.0953 v 29.8972 h 29.89714 v -29.8972 z" + style="color:#000000;fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9342863" /> + id="hover-left" + transform="matrix(0.93428636,0,0,0.93428636,92.271184,998.40957)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1773-8" + d="M 53,52 V 20 h -5 v 32 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> + inkscape:connector-curvature="0" + id="path1775-7" + d="m 46,20 v 32 h 2 V 20 Z" + style="color:#000000;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-transform:none;fill:url(#linearGradient11026);stroke-width:1.26300001" /> + id="hover-bottom" + transform="matrix(0.93428636,0,0,0.93428636,92.271184,999.34387)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1791-2" + d="M 85,51 H 53 v 3 h 32 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> + inkscape:connector-curvature="0" + id="path1793-0" + d="M 53,58 H 85 V 54 H 53 Z" + style="color:#000000;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-transform:none;fill:url(#linearGradient4020);stroke-width:1.403" /> + + + + inkscape:connector-curvature="0" + id="path5125-7" + d="M 53,25 H 85 V 19 H 53 Z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.88800001" /> + + id="hover-bottomleft" + transform="matrix(0.93428636,0,0,0.93428636,135.24834,998.40957)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1797-2" + d="M 7,55 H 4 C 2.5,55 2,54.5 2,53 v -1 h 5 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.46200001" /> + + + + + + + - - + inkscape:connector-curvature="0" + id="path5119-61" + d="M 7,14 H 4 c -1.5,0 -2,0.5 -2,2 v 4 h 5 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd" /> + + + + + id="hover-topright" + transform="matrix(-0.93428776,0,0,0.93428307,178.22553,998.40967)" + style="stroke:none;stroke-width:0.46200001" + inkscape:label="#hover-topright"> - - + inkscape:connector-curvature="0" + id="path5119-6-7" + d="M 7,14 H 4 c -1.5,0 -2,0.5 -2,2 v 4 h 5 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd" /> + + + + + id="hover-right" + transform="matrix(-0.93436324,0,0,-0.93436324,221.20545,1065.6822)" + style="stroke:none"> + inkscape:connector-curvature="0" + id="path1773-8-0" + d="M 53,52 V 20 h -5 v 32 z" + style="fill:#2e2e2e;fill-opacity:1;fill-rule:evenodd;stroke-width:0.51200002" /> - - + inkscape:connector-curvature="0" + id="path1775-7-6" + d="m 46,20 v 32 h 2 V 20 Z" + style="color:#000000;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-transform:none;fill:url(#linearGradient4018);stroke-width:1.26300001" /> + + + + + + + - diff --git a/sddm/themes/Darkine/Background.qml b/sddm/themes/Darkine/Background.qml index bddbf5d..f6d2422 100644 --- a/sddm/themes/Darkine/Background.qml +++ b/sddm/themes/Darkine/Background.qml @@ -28,6 +28,7 @@ FocusScope { Rectangle { id: sceneColorBackground + color: "#ff0000" anchors.fill: parent } diff --git a/sddm/themes/Darkine/Background.qmlc b/sddm/themes/Darkine/Background.qmlc index cfd764f..62f9d9d 100644 Binary files a/sddm/themes/Darkine/Background.qmlc and b/sddm/themes/Darkine/Background.qmlc differ diff --git a/sddm/themes/Darkine/KeyboardButton.qmlc b/sddm/themes/Darkine/KeyboardButton.qmlc index 6c5b282..28f7c0d 100644 Binary files a/sddm/themes/Darkine/KeyboardButton.qmlc and b/sddm/themes/Darkine/KeyboardButton.qmlc differ diff --git a/sddm/themes/Darkine/Login.qml b/sddm/themes/Darkine/Login.qml index 5ea0711..590feca 100644 --- a/sddm/themes/Darkine/Login.qml +++ b/sddm/themes/Darkine/Login.qml @@ -3,6 +3,9 @@ import "components" import QtQuick 2.0 import QtQuick.Layouts 1.2 +import QtQuick.Controls 1.4 //ROKIN : for label +import QtQuick.Controls.Styles 1.4 //ROKIN : for style textbox,button,label + import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents @@ -43,6 +46,21 @@ SessionManagementScreen { id: userNameInput Layout.fillWidth: true + //ROKIN (https://doc.qt.io/qt-5/qml-qtquick-controls-styles-textfieldstyle.html) + style: TextFieldStyle { + textColor: "#5e5f5e" + selectedTextColor: "#2e2f2f" // The highlighted text color + selectionColor: "#8f86ba" // The text highlight color + placeholderTextColor:"#5e5f5e" // When the text field is empty + background: Rectangle { + color: "#1a1a1a" + radius: 2 + border.color: "#1a1a1a" + border.width: 1 + //implicitWidth: 100 + //implicitHeight: 24 + } + } text: lastUserName visible: showUsernamePrompt focus: showUsernamePrompt && !lastUserName //if there's a username prompt it gets focus first, otherwise password does @@ -53,6 +71,21 @@ SessionManagementScreen { id: passwordBox Layout.fillWidth: true + //ROKIN (https://doc.qt.io/qt-5/qml-qtquick-controls-styles-textfieldstyle.html) + style: TextFieldStyle { + textColor: "#5e5f5e" + selectedTextColor: "#2e2f2f" // The highlighted text color + selectionColor: "#8f86ba" // The text highlight color + placeholderTextColor:"#5e5f5e" // When the text field is empty + background: Rectangle { + color: "#1a1a1a" + radius: 2 + border.color: "#1a1a1a" + border.width: 1 + //implicitWidth: 100 + //implicitHeight: 24 + } + } placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password") focus: !showUsernamePrompt || lastUserName echoMode: TextInput.Password @@ -67,11 +100,11 @@ SessionManagementScreen { //if empty and left or right is pressed change selection in user switch //this cannot be in keys.onLeftPressed as then it doesn't reach the password box Keys.onPressed: { - if (event.key == Qt.Key_Left && !text) { + if (event.key === Qt.Key_Left && !text) { userList.decrementCurrentIndex(); event.accepted = true } - if (event.key == Qt.Key_Right && !text) { + if (event.key === Qt.Key_Right && !text) { userList.incrementCurrentIndex(); event.accepted = true } @@ -89,8 +122,42 @@ SessionManagementScreen { id: loginButton Layout.fillWidth: true + //ROKIN (https://doc.qt.io/qt-5/qml-qtquick-controls-styles-buttonstyle.html) + style: ButtonStyle { + background: Rectangle { + border.width: control.activeFocus ? 2 : 1 + border.color: "#1a1a1a" + radius: 2 + gradient: Gradient { + GradientStop { position: 0 ; color: control.pressed ? "#282828" : "#292929" } + GradientStop { position: 1 ; color: control.pressed ? "#212121" : "#212121" } + } + //implicitWidth: 100 + implicitHeight: 25 + } + label: Component{ + id:labelLogin + Row{ + anchors.left: parent.left + anchors.leftMargin: (parent.width - (textlogin.width + image.width))/2 + anchors.top: parent.top + anchors.topMargin: 2 + spacing: 0 + Image{ id:image ;source: control.iconSource} + Label{ + id:textlogin + height: 25 + width:100 + horizontalAlignment:Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + color: "#5e5f5e" + text: control.text + } + } + } + } text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Login") onClicked: startLogin(); - } + } //=> END PlasmaComponents.Button } diff --git a/sddm/themes/Darkine/Login.qmlc b/sddm/themes/Darkine/Login.qmlc index 934bcb3..e35afe0 100644 Binary files a/sddm/themes/Darkine/Login.qmlc and b/sddm/themes/Darkine/Login.qmlc differ diff --git a/sddm/themes/Darkine/Main.qml b/sddm/themes/Darkine/Main.qml index 71fcd44..c651b74 100644 --- a/sddm/themes/Darkine/Main.qml +++ b/sddm/themes/Darkine/Main.qml @@ -71,7 +71,6 @@ PlasmaCore.ColorScope { right: parent.right } height: root.height - focus: true //StackView is an implicit focus scope, so we need to give this focus so the item inside will have it Timer { @@ -95,7 +94,7 @@ PlasmaCore.ColorScope { || !userListModel.hasOwnProperty("disableAvatarsThreshold")) return (userList.y + mainStack.y) > 0 - if ( userListModel.count == 0 ) return false + if ( userListModel.count === 0 ) return false return userListModel.count <= userListModel.disableAvatarsThreshold && (userList.y + mainStack.y) > 0 } @@ -114,28 +113,32 @@ PlasmaCore.ColorScope { actionItems: [ ActionButton { - iconSource: "system-suspend" + //iconSource: "system-suspend" + iconSource: "/usr/share/sddm/themes/Darkine/components/artwork/suspend.svgz" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Suspend") onClicked: sddm.suspend() enabled: sddm.canSuspend visible: !inputPanel.keyboardActive }, ActionButton { - iconSource: "system-reboot" + //iconSource: "system-reboot" + iconSource: "/usr/share/sddm/themes/Darkine/components/artwork/reboot.svgz" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Restart") onClicked: sddm.reboot() enabled: sddm.canReboot visible: !inputPanel.keyboardActive }, ActionButton { - iconSource: "system-shutdown" + //iconSource: "system-shutdown" + iconSource: "/usr/share/sddm/themes/Darkine/components/artwork/shutdown.svgz" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Shutdown") onClicked: sddm.powerOff() enabled: sddm.canPowerOff visible: !inputPanel.keyboardActive }, ActionButton { - iconSource: "system-search" + //iconSource: "system-search" + iconSource: "/usr/share/sddm/themes/Darkine/components/artwork/switch-user.svgz" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Different User") onClicked: mainStack.push(userPromptComponent) enabled: true diff --git a/sddm/themes/Darkine/Main.qmlc b/sddm/themes/Darkine/Main.qmlc index bc475a1..c8ee6e8 100644 Binary files a/sddm/themes/Darkine/Main.qmlc and b/sddm/themes/Darkine/Main.qmlc differ diff --git a/sddm/themes/Darkine/SessionButton.qmlc b/sddm/themes/Darkine/SessionButton.qmlc index edda1a2..dff0810 100644 Binary files a/sddm/themes/Darkine/SessionButton.qmlc and b/sddm/themes/Darkine/SessionButton.qmlc differ diff --git a/sddm/themes/Darkine/components/ActionButton.qmlc b/sddm/themes/Darkine/components/ActionButton.qmlc index 732ff29..14124b4 100644 Binary files a/sddm/themes/Darkine/components/ActionButton.qmlc and b/sddm/themes/Darkine/components/ActionButton.qmlc differ diff --git a/sddm/themes/Darkine/components/Battery.qmlc b/sddm/themes/Darkine/components/Battery.qmlc index 676a17f..790eb71 100644 Binary files a/sddm/themes/Darkine/components/Battery.qmlc and b/sddm/themes/Darkine/components/Battery.qmlc differ diff --git a/sddm/themes/Darkine/components/Clock.qml b/sddm/themes/Darkine/components/Clock.qml index 395f2bd..d0cce2c 100644 --- a/sddm/themes/Darkine/components/Clock.qml +++ b/sddm/themes/Darkine/components/Clock.qml @@ -25,12 +25,14 @@ import org.kde.plasma.components 2.0 ColumnLayout { Label { + color: "#878787" text: Qt.formatTime(timeSource.data["Local"]["DateTime"]) font.pointSize: 32 //Mockup says this, I'm not sure what to do? Layout.alignment: Qt.AlignHCenter renderType: Text.QtRendering } Label { + color: "#878787" text: Qt.formatDate(timeSource.data["Local"]["DateTime"], Qt.DefaultLocaleLongDate) font.pointSize: 18 Layout.alignment: Qt.AlignHCenter diff --git a/sddm/themes/Darkine/components/Clock.qmlc b/sddm/themes/Darkine/components/Clock.qmlc index e90ac5e..84c2b55 100644 Binary files a/sddm/themes/Darkine/components/Clock.qmlc and b/sddm/themes/Darkine/components/Clock.qmlc differ diff --git a/sddm/themes/Darkine/components/SessionManagementScreen.qmlc b/sddm/themes/Darkine/components/SessionManagementScreen.qmlc index ab8ed6f..498fb8d 100644 Binary files a/sddm/themes/Darkine/components/SessionManagementScreen.qmlc and b/sddm/themes/Darkine/components/SessionManagementScreen.qmlc differ diff --git a/sddm/themes/Darkine/components/UserDelegate.qml b/sddm/themes/Darkine/components/UserDelegate.qml index a9d9e12..da5ba1a 100644 --- a/sddm/themes/Darkine/components/UserDelegate.qml +++ b/sddm/themes/Darkine/components/UserDelegate.qml @@ -85,7 +85,7 @@ Item { live: false } - property var colorBorder: PlasmaCore.ColorScope.textColor + property color colorBorder: "#5e5f5e" //draw a circle with an antialised border //innerRadius = size of the inner circle with contents diff --git a/sddm/themes/Darkine/components/UserDelegate.qmlc b/sddm/themes/Darkine/components/UserDelegate.qmlc index f7b7609..ef1143a 100644 Binary files a/sddm/themes/Darkine/components/UserDelegate.qmlc and b/sddm/themes/Darkine/components/UserDelegate.qmlc differ diff --git a/sddm/themes/Darkine/components/UserList.qmlc b/sddm/themes/Darkine/components/UserList.qmlc index 7a1bb1f..4a935eb 100644 Binary files a/sddm/themes/Darkine/components/UserList.qmlc and b/sddm/themes/Darkine/components/UserList.qmlc differ diff --git a/sddm/themes/Darkine/components/artwork/logout_primary.svgz b/sddm/themes/Darkine/components/artwork/logout_primary.svgz deleted file mode 100644 index 6a9423f..0000000 Binary files a/sddm/themes/Darkine/components/artwork/logout_primary.svgz and /dev/null differ diff --git a/sddm/themes/Darkine/components/artwork/reboot.svgz b/sddm/themes/Darkine/components/artwork/reboot.svgz new file mode 100644 index 0000000..1e9d08d Binary files /dev/null and b/sddm/themes/Darkine/components/artwork/reboot.svgz differ diff --git a/sddm/themes/Darkine/components/artwork/restart_primary.svgz b/sddm/themes/Darkine/components/artwork/restart_primary.svgz deleted file mode 100644 index e2312bd..0000000 Binary files a/sddm/themes/Darkine/components/artwork/restart_primary.svgz and /dev/null differ diff --git a/sddm/themes/Darkine/components/artwork/shutdown.svgz b/sddm/themes/Darkine/components/artwork/shutdown.svgz new file mode 100644 index 0000000..67fc600 Binary files /dev/null and b/sddm/themes/Darkine/components/artwork/shutdown.svgz differ diff --git a/sddm/themes/Darkine/components/artwork/shutdown_primary.svgz b/sddm/themes/Darkine/components/artwork/shutdown_primary.svgz deleted file mode 100644 index 1c60152..0000000 Binary files a/sddm/themes/Darkine/components/artwork/shutdown_primary.svgz and /dev/null differ diff --git a/sddm/themes/Darkine/components/artwork/suspend.svgz b/sddm/themes/Darkine/components/artwork/suspend.svgz new file mode 100644 index 0000000..c33641e Binary files /dev/null and b/sddm/themes/Darkine/components/artwork/suspend.svgz differ diff --git a/sddm/themes/Darkine/components/artwork/switch-user.svgz b/sddm/themes/Darkine/components/artwork/switch-user.svgz new file mode 100644 index 0000000..5fa4654 Binary files /dev/null and b/sddm/themes/Darkine/components/artwork/switch-user.svgz differ diff --git a/sddm/themes/Darkine/metadata.desktop b/sddm/themes/Darkine/metadata.desktop index e8fb5e6..cae16c7 100644 --- a/sddm/themes/Darkine/metadata.desktop +++ b/sddm/themes/Darkine/metadata.desktop @@ -12,5 +12,5 @@ MainScript=Main.qml ConfigFile=theme.conf TranslationsDirectory=translations Email= -Theme-Id=darkine +Theme-Id=Darkine Theme-API=2.0 diff --git a/sddm/themes/Darkine/preview.png b/sddm/themes/Darkine/preview.png index 2cd62a3..0a0d5e3 100644 Binary files a/sddm/themes/Darkine/preview.png and b/sddm/themes/Darkine/preview.png differ diff --git a/sddm/themes/Darkine/theme.conf.user b/sddm/themes/Darkine/theme.conf.user new file mode 100644 index 0000000..2b27a40 --- /dev/null +++ b/sddm/themes/Darkine/theme.conf.user @@ -0,0 +1,4 @@ +[General] +type=color +color=#1d1d1d +background=