Merge pull request 'Remove Aerial-style desktop selector, make "Log in" button invisible' (#4) from bugfix/3-remove-desktop-selector-and-login into master
Reviewed-on: #4
This commit is contained in:
		| @@ -113,6 +113,7 @@ SessionManagementScreen { | ||||
|  | ||||
|         PlasmaComponents3.Button { | ||||
|             id: loginButton | ||||
|             visible: false | ||||
|             Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In") | ||||
|             Layout.preferredHeight: passwordBox.implicitHeight | ||||
|             Layout.preferredWidth: text.length == 0 ? loginButton.Layout.preferredHeight : -1 | ||||
|   | ||||
							
								
								
									
										109
									
								
								Main.qml
									
									
									
									
									
								
							
							
						
						
									
										109
									
								
								Main.qml
									
									
									
									
									
								
							| @@ -799,115 +799,6 @@ Rectangle { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     // Top Bar | ||||
|     Rectangle { | ||||
|         id: actionBar | ||||
|         width: parent.width | ||||
|         height: parent.height * 0.04 | ||||
|         anchors.top: parent.top; | ||||
|         anchors.horizontalCenter: parent.horizontalCenter | ||||
|         color: "transparent" | ||||
|         visible: config.showTopBar != "false" | ||||
|  | ||||
|         Row { | ||||
|             id: row_left | ||||
|             anchors.left: parent.left | ||||
|             anchors.margins: 5 | ||||
|             height: parent.height | ||||
|             spacing: 10 | ||||
|  | ||||
|             ComboBox { | ||||
|                 id: session | ||||
|                 width: 145 | ||||
|                 height: 20 | ||||
|                 anchors.verticalCenter: parent.verticalCenter | ||||
|                 color: "transparent" | ||||
|                 arrowColor: "transparent" | ||||
|                 textColor: "#505050" | ||||
|                 borderColor: "transparent" | ||||
|                 hoverColor: "#5692c4" | ||||
|  | ||||
|                 model: sessionModel | ||||
|                 index: sessionModel.lastIndex | ||||
|  | ||||
|                 KeyNavigation.backtab: shutdown_button | ||||
|                 KeyNavigation.tab: password_input_box | ||||
|             } | ||||
|  | ||||
|             ComboBox { | ||||
|                 id: language | ||||
|  | ||||
|                 model: keyboard.layouts | ||||
|                 index: keyboard.currentLayout | ||||
|                 width: 50 | ||||
|                 height: 20 | ||||
|                 anchors.verticalCenter: parent.verticalCenter | ||||
|                 color: "transparent" | ||||
|                 arrowColor: "transparent" | ||||
|                 textColor: "white" | ||||
|                 borderColor: "transparent" | ||||
|                 hoverColor: "#5692c4" | ||||
|  | ||||
|                 onValueChanged: keyboard.currentLayout = id | ||||
|  | ||||
|                 Connections { | ||||
|                     target: keyboard | ||||
|  | ||||
|                     onCurrentLayoutChanged: combo.index = keyboard.currentLayout | ||||
|                 } | ||||
|  | ||||
|                 rowDelegate: Rectangle { | ||||
|                     color: "transparent" | ||||
|  | ||||
|                     Text { | ||||
|                         anchors.margins: 4 | ||||
|                         anchors.top: parent.top | ||||
|                         anchors.bottom: parent.bottom | ||||
|  | ||||
|                         verticalAlignment: Text.AlignVCenter | ||||
|  | ||||
|                         text: modelItem ? modelItem.modelData.shortName : "zz" | ||||
|                         font.family: textFont.name | ||||
|                         font.pixelSize: 14 | ||||
|                         //color: "white" | ||||
|                         color: "#505050" | ||||
|                     } | ||||
|                 } | ||||
|                 KeyNavigation.backtab: session | ||||
|                 KeyNavigation.tab: username_input_box | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         Row { | ||||
|             id: row_right | ||||
|             height: parent.height | ||||
|             anchors.right: parent.right | ||||
|             anchors.margins: 5 | ||||
|             spacing: 10 | ||||
|  | ||||
|             ImageButton { | ||||
|                 id: reboot_button | ||||
|                 height: parent.height | ||||
|                 source: "components/resources/reboot.svg" | ||||
|  | ||||
|                 visible: sddm.canReboot | ||||
|                 onClicked: sddm.reboot() | ||||
|                 KeyNavigation.backtab: login_button | ||||
|                 KeyNavigation.tab: shutdown_button | ||||
|             } | ||||
|  | ||||
|             ImageButton { | ||||
|                 id: shutdown_button | ||||
|                 height: parent.height | ||||
|                 source: "components/resources/shutdown.svg" | ||||
|                 visible: sddm.canPowerOff | ||||
|                 onClicked: sddm.powerOff() | ||||
|                 KeyNavigation.backtab: reboot_button | ||||
|                 KeyNavigation.tab: session | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     Component.onCompleted: { | ||||
|         // Set Focus | ||||
|         /* if (username_input_box.text == "") */ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user