on xenial help sign in
9 files changed+229−226
since splitsnapshots
unifiedsplit
README.md+3−3 clickable.json−158 clickable.yaml+153 po/km.po+11−14 po/ur.po+31−28 qml/Greeter/GreeterPrompt.qml+3−3 qml/Greeter/PromptList.qml+16−19 qml/Launcher/Launcher.qml+6−1 qml/Panel/Indicators/IndicatorItem.qml+6
README.md+3−3
@@ -22,10 +22,10 @@ Now, clone this repository to your computer: `git clone https://github.com/ubpor
2222
2323Move into this directory: `cd unity8`
2424
25−Now you can use the full suite of tools provided by this repository's [clickable.json](clickable.json). For example:
25+Now you can use the full suite of tools provided by this repository's [clickable.yaml](clickable.yaml). For example:
2626
2727* `clickable ide qtcreator` will open QtCreator with this repository open as a project. You can edit and build the project this way, but running the tests will be a bit difficult.
28−* `clickable build-libs --debug` will build Lomiri in the same environment as it would receive in Ubuntu Touch.
29−* `clickable test-libs` will run the entire Lomiri test suite. This test suite includes graphical tests (which are run on a virtual, invisible desktop) and non-graphical unit tests. These tests make sure Lomiri functions as prescribed and prevents new bugs from being added. You should run them before you create a PR on this repository. This command takes about 7 minutes on an Intel i7-8550U, so plan your time accordingly and use the next two options to reduce the number of times you need to run the whole test suite...
28+* `clickable build --libs --verbose` will build Lomiri in the same environment as it would receive in Ubuntu Touch.
29+* `clickable test --libs` will run the entire Lomiri test suite. This test suite includes graphical tests (which are run on a virtual, invisible desktop) and non-graphical unit tests. These tests make sure Lomiri functions as prescribed and prevents new bugs from being added. You should run them before you create a PR on this repository. This command takes about 7 minutes on an Intel i7-8550U, so plan your time accordingly and use the next two options to reduce the number of times you need to run the whole test suite...
3030* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make tryShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow trying out some Lomiri components in a mock environment. You can use this to try out your changes to Lomiri as you develop.
3131* `clickable ide 'cd build/x86_64-linux-gnu/unity8/ && make xvfbtestShell'` and similar commands that replace the `Shell` with another test target defined in [tests/qmltests/CMakeLists.txt](tests/qmltests/CMakeLists.txt) allow running a single TestCase. You can remove the `xvfb` part of the make target to run the test case graphically, which might help you see what is causing the test to fail.
clickable.jsondeleted−158
@@ -1,158 +0,0 @@
1−{
2− "builder": "custom",
3− "build": "echo Run \\'clickable build-libs --debug\\' to build && false",
4− "restrict_arch": "amd64",
5− "libraries": {
6− "unity8": {
7− "builder": "cmake",
8− "src_dir": "${ROOT}",
9− "test": "make xvfballtests -j${NUM_PROCS}",
10− "dependencies_host": [
11− "android-headers",
12− "cmake",
13− "cmake-extras",
14− "dbus-test-runner",
15− "debhelper",
16− "dh-apparmor",
17− "doxyqml",
18− "g++:native",
19− "gdb",
20− "graphviz",
21− "gsettings-ubuntu-schemas",
22− "libandroid-properties-dev",
23− "libconnectivity-qt1-dev",
24− "libevdev-dev",
25− "libgeonames-dev",
26− "libgl1-mesa-dev",
27− "libgl1-mesa-dri",
28− "libgles2-mesa-dev",
29− "libglib2.0-dev",
30− "libgnome-desktop-3-12",
31− "libgnome-desktop-3-dev",
32− "libgsettings-qt-dev",
33− "libhardware-dev",
34− "liblightdm-qt5-3-dev",
35− "libpam0g-dev",
36− "libpulse-dev",
37− "libqmenumodel-dev",
38− "libqt5sql5-sqlite",
39− "libqt5svg5-dev",
40− "libqt5xmlpatterns5-dev",
41− "libqtdbusmock1-dev",
42− "libqtdbustest1-dev",
43− "libsystemsettings-dev",
44− "libubuntu-app-launch2-dev",
45− "libubuntu-download-manager-common-dev",
46− "libubuntugestures5-dev",
47− "libubuntugestures5-private-dev",
48− "libudev-dev",
49− "libudm-common-dev",
50− "libunity-api-dev",
51− "libusermetricsoutput1-dev",
52− "libx11-dev",
53− "libxcb1-dev",
54− "libxi-dev",
55− "pkg-config",
56− "python3-all:any",
57− "python3-setuptools:native",
58− "qml-module-qt-labs-folderlistmodel",
59− "qml-module-qt-labs-settings",
60− "qml-module-qtmultimedia",
61− "qml-module-qtqml-statemachine",
62− "qml-module-qtquick-layouts",
63− "qml-module-qtquick-xmllistmodel",
64− "qml-module-qtquick2",
65− "qml-module-qtsysteminfo",
66− "qml-module-qttest",
67− "qml-module-ubuntu-components",
68− "qml-module-ubuntu-layouts",
69− "qml-module-ubuntu-settings-components",
70− "qml-module-ubuntu-test",
71− "qtbase5-dev",
72− "qtbase5-dev-tools",
73− "qtbase5-private-dev",
74− "qtdbustest-runner",
75− "qtdeclarative5-dev",
76− "qtdeclarative5-dev-tools",
77− "qtdeclarative5-private-dev",
78− "qtdeclarative5-ubuntu-content1",
79− "ttf-ubuntu-font-family",
80− "ubports-wallpapers",
81− "xvfb"
82− ]
83− }
84− },
85− "dependencies_target": [
86− "android-headers",
87− "cmake",
88− "cmake-extras",
89− "dbus-test-runner",
90− "debhelper",
91− "dh-apparmor",
92− "doxyqml",
93− "g++:native",
94− "gdb",
95− "graphviz",
96− "gsettings-ubuntu-schemas",
97− "libandroid-properties-dev",
98− "libconnectivity-qt1-dev",
99− "libevdev-dev",
100− "libgeonames-dev",
101− "libgl1-mesa-dev",
102− "libgl1-mesa-dri",
103− "libgles2-mesa-dev",
104− "libglib2.0-dev",
105− "libgnome-desktop-3-12",
106− "libgnome-desktop-3-dev",
107− "libgsettings-qt-dev",
108− "libhardware-dev",
109− "liblightdm-qt5-3-dev",
110− "libpam0g-dev",
111− "libpulse-dev",
112− "libqmenumodel-dev",
113− "libqt5sql5-sqlite",
114− "libqt5svg5-dev",
115− "libqt5xmlpatterns5-dev",
116− "libqtdbusmock1-dev",
117− "libqtdbustest1-dev",
118− "libsystemsettings-dev",
119− "libubuntu-app-launch2-dev",
120− "libubuntu-download-manager-common-dev",
121− "libubuntugestures5-dev",
122− "libubuntugestures5-private-dev",
123− "libudev-dev",
124− "libudm-common-dev",
125− "libunity-api-dev",
126− "libusermetricsoutput1-dev",
127− "libx11-dev",
128− "libxcb1-dev",
129− "libxi-dev",
130− "pkg-config",
131− "python3-all:any",
132− "python3-setuptools:native",
133− "qml-module-qt-labs-folderlistmodel",
134− "qml-module-qt-labs-settings",
135− "qml-module-qtmultimedia",
136− "qml-module-qtqml-statemachine",
137− "qml-module-qtquick-layouts",
138− "qml-module-qtquick-xmllistmodel",
139− "qml-module-qtquick2",
140− "qml-module-qtsysteminfo",
141− "qml-module-qttest",
142− "qml-module-ubuntu-components",
143− "qml-module-ubuntu-layouts",
144− "qml-module-ubuntu-settings-components",
145− "qml-module-ubuntu-test",
146− "qtbase5-dev",
147− "qtbase5-dev-tools",
148− "qtbase5-private-dev",
149− "qtdbustest-runner",
150− "qtdeclarative5-dev",
151− "qtdeclarative5-dev-tools",
152− "qtdeclarative5-private-dev",
153− "qtdeclarative5-ubuntu-content1",
154− "ttf-ubuntu-font-family",
155− "ubports-wallpapers",
156− "xvfb"
157− ]
158− }
clickable.yamlnew file+153
@@ -0,0 +1,153 @@
1+clickable_minimum_required: '7'
2+builder: custom
3+build: echo Run \'clickable build --libs --verbose\' to build && false
4+restrict_arch: amd64
5+libraries:
6+ unity8:
7+ builder: cmake
8+ src_dir: "${ROOT}"
9+ test: make xvfballtests -j${NUM_PROCS}
10+ dependencies_host:
11+ - android-headers
12+ - cmake
13+ - cmake-extras
14+ - dbus-test-runner
15+ - debhelper
16+ - dh-apparmor
17+ - doxyqml
18+ - g++:native
19+ - gdb
20+ - graphviz
21+ - gsettings-ubuntu-schemas
22+ - libandroid-properties-dev
23+ - libconnectivity-qt1-dev
24+ - libevdev-dev
25+ - libgeonames-dev
26+ - libgl1-mesa-dev
27+ - libgl1-mesa-dri
28+ - libgles2-mesa-dev
29+ - libglib2.0-dev
30+ - libgnome-desktop-3-12
31+ - libgnome-desktop-3-dev
32+ - libgsettings-qt-dev
33+ - libhardware-dev
34+ - liblightdm-qt5-3-dev
35+ - libpam0g-dev
36+ - libpulse-dev
37+ - libqmenumodel-dev
38+ - libqt5sql5-sqlite
39+ - libqt5svg5-dev
40+ - libqt5xmlpatterns5-dev
41+ - libqtdbusmock1-dev
42+ - libqtdbustest1-dev
43+ - libsystemsettings-dev
44+ - libubuntu-app-launch2-dev
45+ - libubuntu-download-manager-common-dev
46+ - libubuntugestures5-dev
47+ - libubuntugestures5-private-dev
48+ - libudev-dev
49+ - libudm-common-dev
50+ - libunity-api-dev
51+ - libusermetricsoutput1-dev
52+ - libx11-dev
53+ - libxcb1-dev
54+ - libxi-dev
55+ - pkg-config
56+ - python3-all:any
57+ - python3-setuptools:native
58+ - qml-module-qt-labs-folderlistmodel
59+ - qml-module-qt-labs-settings
60+ - qml-module-qtmultimedia
61+ - qml-module-qtqml-statemachine
62+ - qml-module-qtquick-layouts
63+ - qml-module-qtquick-xmllistmodel
64+ - qml-module-qtquick2
65+ - qml-module-qtsysteminfo
66+ - qml-module-qttest
67+ - qml-module-ubuntu-components
68+ - qml-module-ubuntu-layouts
69+ - qml-module-ubuntu-settings-components
70+ - qml-module-ubuntu-test
71+ - qtbase5-dev
72+ - qtbase5-dev-tools
73+ - qtbase5-private-dev
74+ - qtdbustest-runner
75+ - qtdeclarative5-dev
76+ - qtdeclarative5-dev-tools
77+ - qtdeclarative5-private-dev
78+ - qtdeclarative5-ubuntu-content1
79+ - ttf-ubuntu-font-family
80+ - ubports-wallpapers
81+ - xvfb
82+dependencies_target:
83+ - android-headers
84+ - cmake
85+ - cmake-extras
86+ - dbus-test-runner
87+ - debhelper
88+ - dh-apparmor
89+ - doxyqml
90+ - g++:native
91+ - gdb
92+ - graphviz
93+ - gsettings-ubuntu-schemas
94+ - libandroid-properties-dev
95+ - libconnectivity-qt1-dev
96+ - libevdev-dev
97+ - libgeonames-dev
98+ - libgl1-mesa-dev
99+ - libgl1-mesa-dri
100+ - libgles2-mesa-dev
101+ - libglib2.0-dev
102+ - libgnome-desktop-3-12
103+ - libgnome-desktop-3-dev
104+ - libgsettings-qt-dev
105+ - libhardware-dev
106+ - liblightdm-qt5-3-dev
107+ - libpam0g-dev
108+ - libpulse-dev
109+ - libqmenumodel-dev
110+ - libqt5sql5-sqlite
111+ - libqt5svg5-dev
112+ - libqt5xmlpatterns5-dev
113+ - libqtdbusmock1-dev
114+ - libqtdbustest1-dev
115+ - libsystemsettings-dev
116+ - libubuntu-app-launch2-dev
117+ - libubuntu-download-manager-common-dev
118+ - libubuntugestures5-dev
119+ - libubuntugestures5-private-dev
120+ - libudev-dev
121+ - libudm-common-dev
122+ - libunity-api-dev
123+ - libusermetricsoutput1-dev
124+ - libx11-dev
125+ - libxcb1-dev
126+ - libxi-dev
127+ - pkg-config
128+ - python3-all:any
129+ - python3-setuptools:native
130+ - qml-module-qt-labs-folderlistmodel
131+ - qml-module-qt-labs-settings
132+ - qml-module-qtmultimedia
133+ - qml-module-qtqml-statemachine
134+ - qml-module-qtquick-layouts
135+ - qml-module-qtquick-xmllistmodel
136+ - qml-module-qtquick2
137+ - qml-module-qtsysteminfo
138+ - qml-module-qttest
139+ - qml-module-ubuntu-components
140+ - qml-module-ubuntu-layouts
141+ - qml-module-ubuntu-settings-components
142+ - qml-module-ubuntu-test
143+ - qtbase5-dev
144+ - qtbase5-dev-tools
145+ - qtbase5-private-dev
146+ - qtdbustest-runner
147+ - qtdeclarative5-dev
148+ - qtdeclarative5-dev-tools
149+ - qtdeclarative5-private-dev
150+ - qtdeclarative5-ubuntu-content1
151+ - ttf-ubuntu-font-family
152+ - ubports-wallpapers
153+ - xvfb
po/km.po+11−14
@@ -8,16 +8,17 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: \n"
1010"POT-Creation-Date: 2021-01-29 11:42-0600\n"
11−"PO-Revision-Date: 2014-08-20 02:48+0000\n"
12−"Last-Translator: Sophea Sok <sksophea@gmail.com>\n"
13−"Language-Team: Khmer <km@li.org>\n"
14−"Language: \n"
11+"PO-Revision-Date: 2022-03-14 13:38+0000\n"
12+"Last-Translator: ប៉ុកណូ រ៉ូយ៉ាល់ <poknoroyal@outlook.com>\n"
13+"Language-Team: Central Khmer <https://translate.ubports.com/projects/ubports/"
14+"lomiri/km/>\n"
15+"Language: km\n"
1516"MIME-Version: 1.0\n"
1617"Content-Type: text/plain; charset=UTF-8\n"
1718"Content-Transfer-Encoding: 8bit\n"
1819"Plural-Forms: nplurals=1; plural=0;\n"
20+"X-Generator: Weblate 3.11.3\n"
1921"X-Launchpad-Export-Date: 2016-11-23 06:35+0000\n"
20−"X-Generator: Launchpad (build 18269)\n"
2122
2223#: plugins/LightDM/Greeter.cpp:199
2324msgid "Password: "
@@ -25,7 +26,7 @@ msgstr "ពាក្យសម្ងាត់៖ "
2526
2627#: plugins/LightDM/Greeter.cpp:214
2728msgid "Username"
28−msgstr ""
29+msgstr "អត្ថនាម"
2930
3031#: plugins/LightDM/Greeter.cpp:258
3132msgid "Failed to authenticate"
@@ -375,7 +376,7 @@ msgstr ""
375376
376377#: qml/Greeter/CoverPage.qml:127
377378msgid "Unlock"
378−msgstr "ដោះ​សោ"
379+msgstr "ដោះសោ"
379380
380381#: qml/Greeter/DelayedLockscreen.qml:43
381382msgid "Device Locked"
@@ -523,11 +524,8 @@ msgid "Call back"
523524msgstr "ហៅ​មកវិញ"
524525
525526#: qml/Panel/PanelMenuPage.qml:92
526−#, fuzzy
527−#| msgctxt "Button: Go back one page in the Wizard"
528−#| msgid "Back"
529527msgid "Back"
530−msgstr "ថយក្រោយ"
528+msgstr "បកក្រោយ"
531529
532530#: qml/Stage/SideStage.qml:76
533531msgid "Drag using 3 fingers any application from one window to the other"
@@ -592,9 +590,8 @@ msgid "What's new"
592590msgstr ""
593591
594592#: qml/Wizard/Pages/11-changelog.qml:74
595−#, fuzzy
596593msgid "Loading..."
597−msgstr "កំពុង​និយាយ..."
594+msgstr "កំពុងផ្ទុក…"
598595
599596#: qml/Wizard/Pages/20-keyboard.qml:31
600597msgid "Select Keyboard"
@@ -606,7 +603,7 @@ msgstr ""
606603
607604#: qml/Wizard/Pages/20-keyboard.qml:93
608605msgid "Keyboard layout"
609−msgstr ""
606+msgstr "ប្លង់ក្ដារចុច"
610607
611608#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:214
612609#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/79-system-update.qml:144
po/ur.po+31−28
@@ -8,99 +8,100 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: \n"
1010"POT-Creation-Date: 2021-01-29 11:42-0600\n"
11−"PO-Revision-Date: 2015-05-05 03:12+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13−"Language-Team: Urdu <ur@li.org>\n"
11+"PO-Revision-Date: 2022-02-11 14:14+0000\n"
12+"Last-Translator: Muhammad <alimuhammad42620@gmail.com>\n"
13+"Language-Team: Urdu <https://translate.ubports.com/projects/ubports/lomiri/"
14+"ur/>\n"
1415"Language: ur\n"
1516"MIME-Version: 1.0\n"
1617"Content-Type: text/plain; charset=UTF-8\n"
1718"Content-Transfer-Encoding: 8bit\n"
1819"Plural-Forms: nplurals=2; plural=n != 1;\n"
20+"X-Generator: Weblate 3.11.3\n"
1921"X-Launchpad-Export-Date: 2016-11-23 06:36+0000\n"
20−"X-Generator: Launchpad (build 18269)\n"
2122
2223#: plugins/LightDM/Greeter.cpp:199
2324msgid "Password: "
24−msgstr ""
25+msgstr "پاسورڈ "
2526
2627#: plugins/LightDM/Greeter.cpp:214
2728msgid "Username"
28−msgstr ""
29+msgstr "یوزر نیم"
2930
3031#: plugins/LightDM/Greeter.cpp:258
3132msgid "Failed to authenticate"
32−msgstr ""
33+msgstr "تصدیق میں ناکامی"
3334
3435#: plugins/LightDM/Greeter.cpp:260
3536msgid "Invalid password, please try again"
36−msgstr ""
37+msgstr "پاسورڈ غلط ھے، دوبارا کوشش کریں"
3738
3839#: plugins/LightDM/Greeter.cpp:270
3940msgid "Log In"
40−msgstr ""
41+msgstr "لاگ ان کریں"
4142
4243#: plugins/LightDM/Greeter.cpp:270
4344msgid "Retry"
44−msgstr ""
45+msgstr "دوبارا کوشش کریں"
4546
4647#: plugins/LightDM/UsersModel.cpp:157
4748msgid "Login"
48−msgstr ""
49+msgstr "لاگ ان کریں"
4950
5051#: plugins/LightDM/UsersModel.cpp:165
5152msgid "Guest Session"
52−msgstr ""
53+msgstr "مہمان سیشن"
5354
5455#: plugins/Unity/Launcher/launcheritem.cpp:48
5556#: plugins/Unity/Launcher/launcheritem.cpp:122
5657msgid "Pin shortcut"
57−msgstr ""
58+msgstr "شورت کٹ پن کیجیے"
5859
5960#: plugins/Unity/Launcher/launcheritem.cpp:54
6061msgid "Quit"
61−msgstr ""
62+msgstr "چھوڑیں"
6263
6364#: plugins/Unity/Launcher/launcheritem.cpp:122
6465msgid "Unpin shortcut"
65−msgstr ""
66+msgstr "شورت کٹ انپن کیجیے"
6667
6768#: qml/Components/Dialogs.qml:176
6869msgctxt "Title: Lock/Log out dialog"
6970msgid "Log out"
70−msgstr ""
71+msgstr "لاگ آؤٹ کیجیے"
7172
7273#: qml/Components/Dialogs.qml:177
7374msgid "Are you sure you want to log out?"
74−msgstr ""
75+msgstr "کیا آپ لاگ آؤٹ کرنا چاہتے ہیں؟"
7576
7677#: qml/Components/Dialogs.qml:180
7778msgctxt "Button: Lock the system"
7879msgid "Lock"
79−msgstr ""
80+msgstr "بند"
8081
8182#: qml/Components/Dialogs.qml:191
8283msgctxt "Button: Log out from the system"
8384msgid "Log Out"
84−msgstr ""
85+msgstr "لاگ آؤٹ"
8586
8687#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:284
8788#: qml/Greeter/NarrowView.qml:215 qml/Wizard/Pages/passcode-confirm.qml:32
8889#: qml/Wizard/Pages/passcode-set.qml:32
8990msgid "Cancel"
90−msgstr ""
91+msgstr "نہیں"
9192
9293#: qml/Components/Dialogs.qml:211
9394msgctxt "Title: Reboot dialog"
9495msgid "Reboot"
95−msgstr ""
96+msgstr "ریبوٹ"
9697
9798#: qml/Components/Dialogs.qml:212
9899msgid "Are you sure you want to reboot?"
99−msgstr ""
100+msgstr "کیا آپ ریبوٹ کرنا چاہتے ہیں؟"
100101
101102#: qml/Components/Dialogs.qml:215
102103msgid "No"
103−msgstr ""
104+msgstr "نہیں"
104105
105106#: qml/Components/Dialogs.qml:223
106107msgid "Yes"
@@ -116,20 +117,22 @@ msgid ""
116117"Are you sure you would like\n"
117118"to power off?"
118119msgstr ""
120+"کیا آپ موبائل کو\n"
121+" بند کرنا چاہتے ہیں؟"
119122
120123#: qml/Components/Dialogs.qml:248
121124msgctxt "Button: Power off the system"
122125msgid "Power off"
123−msgstr ""
126+msgstr "بند"
124127
125128#: qml/Components/Dialogs.qml:263
126129msgctxt "Button: Restart the system"
127130msgid "Restart"
128−msgstr ""
131+msgstr "ریسارٹ"
129132
130133#: qml/Components/Dialogs.qml:276
131134msgid "Screenshot"
132−msgstr ""
135+msgstr "سکرین کی تصویر"
133136
134137#: qml/Components/KeyboardShortcutsOverlay.qml:41
135138msgid "Keyboard Shortcuts"
@@ -521,7 +524,7 @@ msgstr ""
521524
522525#: qml/Panel/PanelMenuPage.qml:92
523526msgid "Back"
524−msgstr ""
527+msgstr "پیچھے"
525528
526529#: qml/Stage/SideStage.qml:76
527530msgid "Drag using 3 fingers any application from one window to the other"
@@ -777,7 +780,7 @@ msgstr ""
777780
778781#: qml/Wizard/Pages/sim.qml:59
779782msgid "Restart"
780−msgstr ""
783+msgstr "دوباره شروع"
781784
782785#: qml/Wizard/Pages/sim.qml:78
783786msgid "You won’t be able to make calls or use text messaging without a SIM."
qml/Greeter/GreeterPrompt.qml+3−3
@@ -25,7 +25,7 @@ FocusScope {
2525 focus: true
2626
2727 property bool isPrompt
28− property bool isAlphanumeric
28+ property bool isPinPrompt
2929 property string text
3030 property bool isSecret
3131 property bool interactive: true
@@ -115,12 +115,12 @@ FocusScope {
115115 },
116116 State {
117117 name: "PinPrompt"
118− when: root.isPrompt && !root.isAlphanumeric && root.isSecret
118+ when: root.isPinPrompt
119119 PropertyChanges { target: loader; source: "PinPrompt.qml" }
120120 },
121121 State {
122122 name: "TextPrompt"
123− when: root.isPrompt
123+ when: !root.isPinPrompt
124124 PropertyChanges { target: loader; source: "TextPrompt.qml" }
125125 }
126126 ]
qml/Greeter/PromptList.qml+16−19
@@ -67,10 +67,14 @@ FocusScope {
6767
6868 readonly property bool isLabel: model.type == LightDMService.prompts.Message ||
6969 model.type == LightDMService.prompts.Error
70− readonly property var modelData: model
70+ readonly property var modelText: model.text
71+ readonly property var modelType: model.type
72+ readonly property var modelIndex: model.index
7173
7274 sourceComponent: isLabel ? infoLabel : greeterPrompt
7375
76+ active: root.visible
77+
7478 onLoaded: {
7579 for (var i = 0; i < repeater.count; i++) {
7680 var item = repeater.itemAt(i);
@@ -81,12 +85,6 @@ FocusScope {
8185 }
8286 loader.item.opacity = 1;
8387 }
84−
85− Binding {
86− target: loader.item
87− property: "model"
88− value: loader.modelData
89− }
9088 }
9189 }
9290 }
@@ -95,19 +93,18 @@ FocusScope {
9593 id: infoLabel
9694
9795 FadingLabel {
98− objectName: "infoLabel" + model.index
96+ objectName: "infoLabel" + modelIndex
9997 width: root.width
10098
101− property var model
10299 readonly property bool isPrompt: false
103100
104− color: model.type === LightDMService.prompts.Message ? theme.palette.normal.raisedSecondaryText
101+ color: modelType === LightDMService.prompts.Message ? theme.palette.normal.raisedSecondaryText
105102 : theme.palette.normal.negative
106103 fontSize: "small"
107104 textFormat: Text.PlainText
108− text: model.text
105+ text: modelText
109106
110− visible: model.type === LightDMService.prompts.Message
107+ visible: modelType === LightDMService.prompts.Message
111108
112109 Behavior on opacity { UbuntuNumberAnimation {} }
113110 opacity: 0
@@ -118,23 +115,23 @@ FocusScope {
118115 id: greeterPrompt
119116
120117 GreeterPrompt {
121− objectName: "greeterPrompt" + model.index
118+ objectName: "greeterPrompt" + modelIndex
122119 width: root.width
123120
124− property var model
121+ property bool isAlphanumeric: modelText !== "" || root.alphanumeric
125122
126123 interactive: root.interactive
127− isAlphanumeric: model.text !== "" || root.alphanumeric
128− isPrompt: model.type !== LightDMService.prompts.Button
129− isSecret: model.type === LightDMService.prompts.Secret
124+ isPrompt: modelType !== LightDMService.prompts.Button
125+ isSecret: modelType === LightDMService.prompts.Secret
126+ isPinPrompt: isPrompt && !isAlphanumeric && isSecret
130127 loginError: root.loginError
131128 hasKeyboard: root.hasKeyboard
132− text: model.text ? model.text : (isAlphanumeric ? i18n.tr("Passphrase") : i18n.tr("Passcode"))
129+ text: modelText ? modelText : (isAlphanumeric ? i18n.tr("Passphrase") : i18n.tr("Passcode"))
133130
134131 onClicked: root.clicked()
135132 onAccepted: {
136133 // If there is another GreeterPrompt, focus it.
137− for (var i = model.index + 1; i < repeater.count; i++) {
134+ for (var i = modelIndex + 1; i < repeater.count; i++) {
138135 var item = repeater.itemAt(i).item;
139136 if (item.isPrompt) {
140137 item.forceActiveFocus();
qml/Launcher/Launcher.qml+6−1
@@ -427,7 +427,7 @@ FocusScope {
427427 Connections {
428428 target: panel.dismissTimer
429429 onTriggered: {
430− if (root.autohideEnabled && !root.lockedVisible) {
430+ if (root.state !== "drawer" && root.autohideEnabled && !root.lockedVisible) {
431431 if (!edgeBarrier.containsMouse && !panel.preventHiding) {
432432 root.state = ""
433433 } else {
@@ -609,6 +609,11 @@ FocusScope {
609609 anchors.rightMargin: 0
610610 focus: false
611611 }
612+ PropertyChanges {
613+ target: root
614+ restoreEntryValues: false
615+ autohideEnabled: false
616+ }
612617 },
613618 State {
614619 name: "drawer"
qml/Panel/Indicators/IndicatorItem.qml+6
@@ -117,6 +117,12 @@ IndicatorDelegate {
117117 source: modelData
118118 color: root.color
119119 Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
120+
121+ // Workaround indicators getting stretched/squished when (un)plugging external/virtual monitor
122+ onHeightChanged: {
123+ source = ""
124+ source = modelData
125+ }
120126 }
121127 }
122128 }