Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37038639
en ru br
Репозитории ALT

Группа :: Графические оболочки/KDE
Пакет: sddm

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: alt-sddm-visual-fixes.patch
Скачать


diff --git a/components/2.0/PasswordConnections.qml b/components/2.0/PasswordConnections.qml
index 86afbcd..2a2602b 100644
--- a/components/2.0/PasswordConnections.qml
+++ b/components/2.0/PasswordConnections.qml
@@ -62,6 +62,7 @@ Item {
 
         onCancel: {
             sddm.cancelPamConv()
+            renewalDialogTimer.stop()
         }
 
         onError: {
@@ -101,8 +102,7 @@ Item {
                    err_msg != "Authentication token manipulation error")
                    txtMsg.text += "\n" + err_msg
             }
-            renewalDialog.visible = false
-            clearPwd()
+            renewalDialogTimer.start()
         }
 
         // show messages from pam conversation (for expired passwords)
@@ -118,4 +118,13 @@ Item {
                                requestProp.findRepeatPwdMessage())
         }
     }
+
+    Timer {
+        id: renewalDialogTimer
+        interval: 10000
+        onTriggered: {
+            renewalDialog.visible = false
+            clearPwd()
+        }
+    }
 }
diff --git a/components/2.0/PasswordRenewal.qml b/components/2.0/PasswordRenewal.qml
index 72c4890..907c2d2 100644
--- a/components/2.0/PasswordRenewal.qml
+++ b/components/2.0/PasswordRenewal.qml
@@ -41,12 +41,12 @@ FocusScope {
     property alias prompt2: prompt2Txt.text
 
     // dialog window
-    property int dialogHeight: 180
+    property int dialogHeight: infosHeight+180
     property int margins: 8
 
     // infos text area with pam messages
     property int infosWidth: 520
-    property int infosHeight: 10
+    property int infosHeight: 150
 
     property color promptColor: "black"
     property color infosColor: "red"
@@ -153,27 +153,6 @@ FocusScope {
             anchors.fill: parent
             columns: 2
 
-            Item {
-                width: infosWidth
-                height: infosHeight+36
-                Layout.columnSpan: 2
-                Layout.minimumWidth: infosWidth
-                Layout.margins: margins
-
-                // show info/error from pam conv()
-                TextArea {
-                    id: infoarea
-                    anchors.fill: parent
-                    viewport.implicitHeight: infosHeight
-                    backgroundVisible: false
-                    activeFocusOnPress: false
-                    readOnly: true
-                    textColor: infosColor
-                    frameVisible: false
-                    verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                }
-            }
-
             // shows message (prompt) from pam conv()
             Text {
                 id: prompt1Txt
@@ -271,6 +250,27 @@ FocusScope {
                     onClicked: validatePwds()
                 }
             }
+
+            Item {
+                width: infosWidth
+                height: infosHeight+36
+                Layout.columnSpan: 2
+                Layout.minimumWidth: infosWidth
+                Layout.margins: margins
+
+                // show info/error from pam conv()
+                TextArea {
+                    id: infoarea
+                    anchors.fill: parent
+                    viewport.implicitHeight: infosHeight
+                    backgroundVisible: false
+                    activeFocusOnPress: false
+                    readOnly: true
+                    textColor: infosColor
+                    frameVisible: false
+                    verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+                }
+            }
         }
     }
 }
diff --git a/data/themes/elarun/Main.qml b/data/themes/elarun/Main.qml
index 252f769..7654bd0 100644
--- a/data/themes/elarun/Main.qml
+++ b/data/themes/elarun/Main.qml
@@ -65,12 +65,12 @@ Rectangle {
         PasswordRenewal {
             id: renewal
             anchors.horizontalCenter: rectangle.horizontalCenter
-            anchors.top: rectangle.bottom
+            anchors.top: rectangle.top
             anchors.topMargin: 32
             visible: false
             radius: 8
             color: "#22888888"
-            infosColor: "lightcoral"
+            //infosColor: "lightcoral"
         }
 
         Rectangle {
@@ -77,7 +77,7 @@ Rectangle {
             id: rectangle
             width: 416; height: 262
             color: "#00000000"
-            enabled: !renewal.visible
+            visible: !renewal.visible
 
             anchors.centerIn: parent
 
diff --git a/data/themes/maldives/Main.qml b/data/themes/maldives/Main.qml
index d3652fa..e6afe68 100644
--- a/data/themes/maldives/Main.qml
+++ b/data/themes/maldives/Main.qml
@@ -96,7 +96,7 @@ Rectangle {
             anchors.centerIn: parent
             width: Math.max(320, mainColumn.implicitWidth + 50)
             height: Math.max(320, mainColumn.implicitHeight + 50)
-            enabled: !renewal.visible
+            visible: !renewal.visible
 
             source: "rectangle.png"
 
diff --git a/src/greeter/theme/Main.qml b/src/greeter/theme/Main.qml
index ab81f76..2764ba3 100644
--- a/src/greeter/theme/Main.qml
+++ b/src/greeter/theme/Main.qml
@@ -125,11 +125,11 @@ Rectangle {
                 PasswordRenewal {
                     id: renewal
                     anchors.horizontalCenter: parent.horizontalCenter
-                    anchors.bottom: usersContainer.top
+                    anchors.top: usersContainer.top
                     visible: false
                     color: "#22888888"
                     promptColor: "white"
-                    infosColor: "lightcoral"
+                    //infosColor: "lightcoral"
                 }
 
                 Item {
@@ -137,7 +137,7 @@ Rectangle {
                     id: usersContainer
                     width: parent.width; height: 300
                     anchors.verticalCenter: parent.verticalCenter
-                    enabled: !renewal.visible
+                    visible: !renewal.visible
 
                     ImageButton {
                         id: prevUser
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin