Attachment #465498 for bug #611182

View | Details | Raw Unified | Return to bug 611182
Collapse All | Expand All

Lines 33-38 Rectangle { Link Here

(-)a/data/themes/elarun/Main.qml (-11 / +4 lines)
33	LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft	33	LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft
34	LayoutMirroring.childrenInherit: true	34	LayoutMirroring.childrenInherit: true
35		35
		36	property int sessionIndex: session.index
		37
36	TextConstants { id: textConstants }	38	TextConstants { id: textConstants }
37		39
38	Connections {	40	Connections {
Lines 132-138 Rectangle { Link Here
132		134
133	Keys.onPressed: {	135	Keys.onPressed: {
134	if (event.key === Qt.Key_Return \|\| event.key === Qt.Key_Enter) {	136	if (event.key === Qt.Key_Return \|\| event.key === Qt.Key_Enter) {
135	sddm.login(user_entry.text, pw_entry.text, menu_session.index)	137	sddm.login(user_entry.text, pw_entry.text, sessionIndex)
136	event.accepted = true	138	event.accepted = true
137	}	139	}
138	}	140	}
Lines 148-154 Rectangle { Link Here
148		150
149	source: "images/login_normal.png"	151	source: "images/login_normal.png"
150		152
151	onClicked: sddm.login(user_entry.text, pw_entry.text, menu_session.index)	153	onClicked: sddm.login(user_entry.text, pw_entry.text, sessionIndex)
152		154
153	KeyNavigation.backtab: pw_entry; KeyNavigation.tab: session_button	155	KeyNavigation.backtab: pw_entry; KeyNavigation.tab: session_button
154	}	156	}
Lines 213-227 Rectangle { Link Here
213	font.bold: true	215	font.bold: true
214	font.pixelSize: 12	216	font.pixelSize: 12
215	}	217	}
216
217	Menu {
218	id: menu_session
219	width: 200; height: 0
220	anchors.top: buttonRow.bottom; anchors.left: buttonRow.left
221
222	model: sessionModel
223	index: sessionModel.lastIndex
224	}
225	}	218	}
226	}	219	}
227	}	220	}

Lines 33-38 Rectangle { Link Here

(-)a/data/themes/maldives/Main.qml (-3 / +5 lines)
33	LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft	33	LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft
34	LayoutMirroring.childrenInherit: true	34	LayoutMirroring.childrenInherit: true
35		35
		36	property int sessionIndex: session.index
		37
36	TextConstants { id: textConstants }	38	TextConstants { id: textConstants }
37		39
38	Connections {	40	Connections {
Lines 121-127 Rectangle { Link Here
121		123
122	Keys.onPressed: {	124	Keys.onPressed: {
123	if (event.key === Qt.Key_Return \|\| event.key === Qt.Key_Enter) {	125	if (event.key === Qt.Key_Return \|\| event.key === Qt.Key_Enter) {
124	sddm.login(name.text, password.text, session.index)	126	sddm.login(name.text, password.text, sessionIndex)
125	event.accepted = true	127	event.accepted = true
126	}	128	}
127	}	129	}
Lines 148-154 Rectangle { Link Here
148		150
149	Keys.onPressed: {	151	Keys.onPressed: {
150	if (event.key === Qt.Key_Return \|\| event.key === Qt.Key_Enter) {	152	if (event.key === Qt.Key_Return \|\| event.key === Qt.Key_Enter) {
151	sddm.login(name.text, password.text, session.index)	153	sddm.login(name.text, password.text, sessionIndex)
152	event.accepted = true	154	event.accepted = true
153	}	155	}
154	}	156	}
Lines 237-243 Rectangle { Link Here
237	text: textConstants.login	239	text: textConstants.login
238	width: parent.btnWidth	240	width: parent.btnWidth
239		241
240	onClicked: sddm.login(name.text, password.text, session.index)	242	onClicked: sddm.login(name.text, password.text, sessionIndex)
241		243
242	KeyNavigation.backtab: layoutBox; KeyNavigation.tab: shutdownButton	244	KeyNavigation.backtab: layoutBox; KeyNavigation.tab: shutdownButton
243	}	245	}

Return to bug 611182