git.iko.soy/unity8
on e220f83 help sign in
c73a8d3
swap
0 ahead, 10 behind
9 files changed+226−229
since splitsnapshots
unifiedsplit
README.md+3−3 clickable.json+158 clickable.yaml−153 po/km.po+14−11 po/ur.po+28−31 qml/Greeter/GreeterPrompt.qml+3−3 qml/Greeter/PromptList.qml+19−16 qml/Launcher/Launcher.qml+1−6 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.yaml](clickable.yaml). For example:
25+Now you can use the full suite of tools provided by this repository's [clickable.json](clickable.json). 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 --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...
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...
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.jsonnew file+158
@@ -0,0 +1,158 @@
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.yamldeleted−153
@@ -1,153 +0,0 @@
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+14−11
@@ -8,17 +8,16 @@ 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: 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"
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"
1615"MIME-Version: 1.0\n"
1716"Content-Type: text/plain; charset=UTF-8\n"
1817"Content-Transfer-Encoding: 8bit\n"
1918"Plural-Forms: nplurals=1; plural=0;\n"
20−"X-Generator: Weblate 3.11.3\n"
2119"X-Launchpad-Export-Date: 2016-11-23 06:35+0000\n"
20+"X-Generator: Launchpad (build 18269)\n"
2221
2322#: plugins/LightDM/Greeter.cpp:199
2423msgid "Password: "
@@ -26,7 +25,7 @@ msgstr "ពាក្យសម្ងាត់៖ "
2625
2726#: plugins/LightDM/Greeter.cpp:214
2827msgid "Username"
29−msgstr "អត្ថនាម"
28+msgstr ""
3029
3130#: plugins/LightDM/Greeter.cpp:258
3231msgid "Failed to authenticate"
@@ -376,7 +375,7 @@ msgstr ""
376375
377376#: qml/Greeter/CoverPage.qml:127
378377msgid "Unlock"
379−msgstr "ដោះសោ"
378+msgstr "ដោះ​សោ"
380379
381380#: qml/Greeter/DelayedLockscreen.qml:43
382381msgid "Device Locked"
@@ -524,8 +523,11 @@ msgid "Call back"
524523msgstr "ហៅ​មកវិញ"
525524
526525#: qml/Panel/PanelMenuPage.qml:92
526+#, fuzzy
527+#| msgctxt "Button: Go back one page in the Wizard"
528+#| msgid "Back"
527529msgid "Back"
528−msgstr "បកក្រោយ"
530+msgstr "ថយក្រោយ"
529531
530532#: qml/Stage/SideStage.qml:76
531533msgid "Drag using 3 fingers any application from one window to the other"
@@ -590,8 +592,9 @@ msgid "What's new"
590592msgstr ""
591593
592594#: qml/Wizard/Pages/11-changelog.qml:74
595+#, fuzzy
593596msgid "Loading..."
594−msgstr "កំពុងផ្ទុក…"
597+msgstr "កំពុង​និយាយ..."
595598
596599#: qml/Wizard/Pages/20-keyboard.qml:31
597600msgid "Select Keyboard"
@@ -603,7 +606,7 @@ msgstr ""
603606
604607#: qml/Wizard/Pages/20-keyboard.qml:93
605608msgid "Keyboard layout"
606−msgstr "ប្លង់ក្ដារចុច"
609+msgstr ""
607610
608611#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:214
609612#: qml/Wizard/Pages/60-account.qml:72 qml/Wizard/Pages/79-system-update.qml:144
po/ur.po+28−31
@@ -8,100 +8,99 @@ 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: 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"
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"
1514"Language: ur\n"
1615"MIME-Version: 1.0\n"
1716"Content-Type: text/plain; charset=UTF-8\n"
1817"Content-Transfer-Encoding: 8bit\n"
1918"Plural-Forms: nplurals=2; plural=n != 1;\n"
20−"X-Generator: Weblate 3.11.3\n"
2119"X-Launchpad-Export-Date: 2016-11-23 06:36+0000\n"
20+"X-Generator: Launchpad (build 18269)\n"
2221
2322#: plugins/LightDM/Greeter.cpp:199
2423msgid "Password: "
25−msgstr "پاسورڈ "
24+msgstr ""
2625
2726#: plugins/LightDM/Greeter.cpp:214
2827msgid "Username"
29−msgstr "یوزر نیم"
28+msgstr ""
3029
3130#: plugins/LightDM/Greeter.cpp:258
3231msgid "Failed to authenticate"
33−msgstr "تصدیق میں ناکامی"
32+msgstr ""
3433
3534#: plugins/LightDM/Greeter.cpp:260
3635msgid "Invalid password, please try again"
37−msgstr "پاسورڈ غلط ھے، دوبارا کوشش کریں"
36+msgstr ""
3837
3938#: plugins/LightDM/Greeter.cpp:270
4039msgid "Log In"
41−msgstr "لاگ ان کریں"
40+msgstr ""
4241
4342#: plugins/LightDM/Greeter.cpp:270
4443msgid "Retry"
45−msgstr "دوبارا کوشش کریں"
44+msgstr ""
4645
4746#: plugins/LightDM/UsersModel.cpp:157
4847msgid "Login"
49−msgstr "لاگ ان کریں"
48+msgstr ""
5049
5150#: plugins/LightDM/UsersModel.cpp:165
5251msgid "Guest Session"
53−msgstr "مہمان سیشن"
52+msgstr ""
5453
5554#: plugins/Unity/Launcher/launcheritem.cpp:48
5655#: plugins/Unity/Launcher/launcheritem.cpp:122
5756msgid "Pin shortcut"
58−msgstr "شورت کٹ پن کیجیے"
57+msgstr ""
5958
6059#: plugins/Unity/Launcher/launcheritem.cpp:54
6160msgid "Quit"
62−msgstr "چھوڑیں"
61+msgstr ""
6362
6463#: plugins/Unity/Launcher/launcheritem.cpp:122
6564msgid "Unpin shortcut"
66−msgstr "شورت کٹ انپن کیجیے"
65+msgstr ""
6766
6867#: qml/Components/Dialogs.qml:176
6968msgctxt "Title: Lock/Log out dialog"
7069msgid "Log out"
71−msgstr "لاگ آؤٹ کیجیے"
70+msgstr ""
7271
7372#: qml/Components/Dialogs.qml:177
7473msgid "Are you sure you want to log out?"
75−msgstr "کیا آپ لاگ آؤٹ کرنا چاہتے ہیں؟"
74+msgstr ""
7675
7776#: qml/Components/Dialogs.qml:180
7877msgctxt "Button: Lock the system"
7978msgid "Lock"
80−msgstr "بند"
79+msgstr ""
8180
8281#: qml/Components/Dialogs.qml:191
8382msgctxt "Button: Log out from the system"
8483msgid "Log Out"
85−msgstr "لاگ آؤٹ"
84+msgstr ""
8685
8786#: qml/Components/Dialogs.qml:199 qml/Components/Dialogs.qml:284
8887#: qml/Greeter/NarrowView.qml:215 qml/Wizard/Pages/passcode-confirm.qml:32
8988#: qml/Wizard/Pages/passcode-set.qml:32
9089msgid "Cancel"
91−msgstr "نہیں"
90+msgstr ""
9291
9392#: qml/Components/Dialogs.qml:211
9493msgctxt "Title: Reboot dialog"
9594msgid "Reboot"
96−msgstr "ریبوٹ"
95+msgstr ""
9796
9897#: qml/Components/Dialogs.qml:212
9998msgid "Are you sure you want to reboot?"
100−msgstr "کیا آپ ریبوٹ کرنا چاہتے ہیں؟"
99+msgstr ""
101100
102101#: qml/Components/Dialogs.qml:215
103102msgid "No"
104−msgstr "نہیں"
103+msgstr ""
105104
106105#: qml/Components/Dialogs.qml:223
107106msgid "Yes"
@@ -117,22 +116,20 @@ msgid ""
117116"Are you sure you would like\n"
118117"to power off?"
119118msgstr ""
120−"کیا آپ موبائل کو\n"
121−" بند کرنا چاہتے ہیں؟"
122119
123120#: qml/Components/Dialogs.qml:248
124121msgctxt "Button: Power off the system"
125122msgid "Power off"
126−msgstr "بند"
123+msgstr ""
127124
128125#: qml/Components/Dialogs.qml:263
129126msgctxt "Button: Restart the system"
130127msgid "Restart"
131−msgstr "ریسارٹ"
128+msgstr ""
132129
133130#: qml/Components/Dialogs.qml:276
134131msgid "Screenshot"
135−msgstr "سکرین کی تصویر"
132+msgstr ""
136133
137134#: qml/Components/KeyboardShortcutsOverlay.qml:41
138135msgid "Keyboard Shortcuts"
@@ -524,7 +521,7 @@ msgstr ""
524521
525522#: qml/Panel/PanelMenuPage.qml:92
526523msgid "Back"
527−msgstr "پیچھے"
524+msgstr ""
528525
529526#: qml/Stage/SideStage.qml:76
530527msgid "Drag using 3 fingers any application from one window to the other"
@@ -780,7 +777,7 @@ msgstr ""
780777
781778#: qml/Wizard/Pages/sim.qml:59
782779msgid "Restart"
783−msgstr "دوباره شروع"
780+msgstr ""
784781
785782#: qml/Wizard/Pages/sim.qml:78
786783msgid "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 isPinPrompt
28+ property bool isAlphanumeric
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.isPinPrompt
118+ when: root.isPrompt && !root.isAlphanumeric && root.isSecret
119119 PropertyChanges { target: loader; source: "PinPrompt.qml" }
120120 },
121121 State {
122122 name: "TextPrompt"
123− when: !root.isPinPrompt
123+ when: root.isPrompt
124124 PropertyChanges { target: loader; source: "TextPrompt.qml" }
125125 }
126126 ]
qml/Greeter/PromptList.qml+19−16
@@ -67,14 +67,10 @@ FocusScope {
6767
6868 readonly property bool isLabel: model.type == LightDMService.prompts.Message ||
6969 model.type == LightDMService.prompts.Error
70− readonly property var modelText: model.text
71− readonly property var modelType: model.type
72− readonly property var modelIndex: model.index
70+ readonly property var modelData: model
7371
7472 sourceComponent: isLabel ? infoLabel : greeterPrompt
7573
76− active: root.visible
77−
7874 onLoaded: {
7975 for (var i = 0; i < repeater.count; i++) {
8076 var item = repeater.itemAt(i);
@@ -85,6 +81,12 @@ FocusScope {
8581 }
8682 loader.item.opacity = 1;
8783 }
84+
85+ Binding {
86+ target: loader.item
87+ property: "model"
88+ value: loader.modelData
89+ }
8890 }
8991 }
9092 }
@@ -93,18 +95,19 @@ FocusScope {
9395 id: infoLabel
9496
9597 FadingLabel {
96− objectName: "infoLabel" + modelIndex
98+ objectName: "infoLabel" + model.index
9799 width: root.width
98100
101+ property var model
99102 readonly property bool isPrompt: false
100103
101− color: modelType === LightDMService.prompts.Message ? theme.palette.normal.raisedSecondaryText
104+ color: model.type === LightDMService.prompts.Message ? theme.palette.normal.raisedSecondaryText
102105 : theme.palette.normal.negative
103106 fontSize: "small"
104107 textFormat: Text.PlainText
105− text: modelText
108+ text: model.text
106109
107− visible: modelType === LightDMService.prompts.Message
110+ visible: model.type === LightDMService.prompts.Message
108111
109112 Behavior on opacity { UbuntuNumberAnimation {} }
110113 opacity: 0
@@ -115,23 +118,23 @@ FocusScope {
115118 id: greeterPrompt
116119
117120 GreeterPrompt {
118− objectName: "greeterPrompt" + modelIndex
121+ objectName: "greeterPrompt" + model.index
119122 width: root.width
120123
121− property bool isAlphanumeric: modelText !== "" || root.alphanumeric
124+ property var model
122125
123126 interactive: root.interactive
124− isPrompt: modelType !== LightDMService.prompts.Button
125− isSecret: modelType === LightDMService.prompts.Secret
126− isPinPrompt: isPrompt && !isAlphanumeric && isSecret
127+ isAlphanumeric: model.text !== "" || root.alphanumeric
128+ isPrompt: model.type !== LightDMService.prompts.Button
129+ isSecret: model.type === LightDMService.prompts.Secret
127130 loginError: root.loginError
128131 hasKeyboard: root.hasKeyboard
129− text: modelText ? modelText : (isAlphanumeric ? i18n.tr("Passphrase") : i18n.tr("Passcode"))
132+ text: model.text ? model.text : (isAlphanumeric ? i18n.tr("Passphrase") : i18n.tr("Passcode"))
130133
131134 onClicked: root.clicked()
132135 onAccepted: {
133136 // If there is another GreeterPrompt, focus it.
134− for (var i = modelIndex + 1; i < repeater.count; i++) {
137+ for (var i = model.index + 1; i < repeater.count; i++) {
135138 var item = repeater.itemAt(i).item;
136139 if (item.isPrompt) {
137140 item.forceActiveFocus();
qml/Launcher/Launcher.qml+1−6
@@ -427,7 +427,7 @@ FocusScope {
427427 Connections {
428428 target: panel.dismissTimer
429429 onTriggered: {
430− if (root.state !== "drawer" && root.autohideEnabled && !root.lockedVisible) {
430+ if (root.autohideEnabled && !root.lockedVisible) {
431431 if (!edgeBarrier.containsMouse && !panel.preventHiding) {
432432 root.state = ""
433433 } else {
@@ -609,11 +609,6 @@ FocusScope {
609609 anchors.rightMargin: 0
610610 focus: false
611611 }
612− PropertyChanges {
613− target: root
614− restoreEntryValues: false
615− autohideEnabled: false
616− }
617612 },
618613 State {
619614 name: "drawer"
qml/Panel/Indicators/IndicatorItem.qml−6
@@ -117,12 +117,6 @@ 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− }
126120 }
127121 }
128122 }