git.iko.soy/unity8
on xenial help sign in
Merge
203e201Albert Astals
po/sl.po+4−4
compare with xenial
unifiedsplit
@@ -8,14 +8,14 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-11 14:59+0200\n"
10"POT-Creation-Date: 2014-07-11 14:59+0200\n"
11−"PO-Revision-Date: 2014-07-28 12:32+0000\n"
11+"PO-Revision-Date: 2014-08-06 06:11+0000\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-29 06:54+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-06 06:55+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17147)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -115,7 +115,7 @@ msgstr "Nedavno"
115
115
116#: qml/Dash/GenericScopeView.qml:330
116#: qml/Dash/GenericScopeView.qml:330
117msgid "See all"
117msgid "See all"
118−msgstr ""
118+msgstr "Ogled vsega"
119
119
120#: qml/Dash/Previews/PreviewActionCombo.qml:34
120#: qml/Dash/Previews/PreviewActionCombo.qml:34
121msgid "More..."
121msgid "More..."
qml/Components/EdgeDemo.qml+15−15
@@ -24,13 +24,13 @@ Item {
24 property Item greeter
24 property Item greeter
25 property Item launcher
25 property Item launcher
26 property Item indicators
26 property Item indicators
27− property Item underlay
27+ property Item stages
28
28
29 property bool launcherEnabled: true
29 property bool launcherEnabled: true
30− property bool dashEnabled: true
30+ property bool stagesEnabled: true
31 property bool panelEnabled: true
31 property bool panelEnabled: true
32 property bool panelContentEnabled: true
32 property bool panelContentEnabled: true
33− property bool running: !launcherEnabled || !dashEnabled || !panelEnabled || !panelContentEnabled
33+ property bool running: !launcherEnabled || !stagesEnabled || !panelEnabled || !panelContentEnabled
34
34
35 property bool paused: false
35 property bool paused: false
36
36
@@ -58,7 +58,7 @@ Item {
58
58
59 function stopDemo() {
59 function stopDemo() {
60 launcherEnabled = true
60 launcherEnabled = true
61− dashEnabled = true
61+ stagesEnabled = true
62 panelEnabled = true
62 panelEnabled = true
63 panelContentEnabled = true
63 panelContentEnabled = true
64 if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()
64 if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()
@@ -74,11 +74,11 @@ Item {
74 }
74 }
75
75
76 launcherEnabled = false;
76 launcherEnabled = false;
77− dashEnabled = false;
77+ stagesEnabled = false;
78 panelEnabled = false;
78 panelEnabled = false;
79 panelContentEnabled = false;
79 panelContentEnabled = false;
80
80
81− // Begin with either greeter or dash, depending on which is visible
81+ // Begin with either greeter or top, depending on which is visible
82 if (greeter && greeter.shown) {
82 if (greeter && greeter.shown) {
83 startRightEdgeDemo()
83 startRightEdgeDemo()
84 } else {
84 } else {
@@ -138,12 +138,12 @@ Item {
138
138
139 function startTopEdgeDemo() {
139 function startTopEdgeDemo() {
140 demo.panelEnabled = true;
140 demo.panelEnabled = true;
141− if (demo.dash && demo.underlay) {
141+ if (demo.stages) {
142− d.topEdgeDemo = d.overlay.createObject(demo.underlay, {
142+ d.topEdgeDemo = d.overlay.createObject(demo.stages, {
143 "edge": "top",
143 "edge": "top",
144 "title": i18n.tr("Top edge"),
144 "title": i18n.tr("Top edge"),
145 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
145 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
146− "anchors.fill": demo.underlay,
146+ "anchors.fill": demo.stages,
147 });
147 });
148 }
148 }
149 if (d.topEdgeDemo) {
149 if (d.topEdgeDemo) {
@@ -192,12 +192,12 @@ Item {
192 function startLeftEdgeDemo() {
192 function startLeftEdgeDemo() {
193 demo.panelEnabled = false;
193 demo.panelEnabled = false;
194 demo.launcherEnabled = true;
194 demo.launcherEnabled = true;
195− if (demo.underlay) {
195+ if (demo.stages) {
196− d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {
196+ d.leftEdgeDemo = d.overlay.createObject(demo.stages, {
197 "edge": "left",
197 "edge": "left",
198 "title": i18n.tr("Left edge"),
198 "title": i18n.tr("Left edge"),
199 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
199 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
200− "anchors.fill": demo.underlay,
200+ "anchors.fill": demo.stages,
201 });
201 });
202 }
202 }
203 if (d.leftEdgeDemo) {
203 if (d.leftEdgeDemo) {
@@ -220,12 +220,12 @@ Item {
220
220
221 function startFinalEdgeDemo() {
221 function startFinalEdgeDemo() {
222 demo.launcherEnabled = false;
222 demo.launcherEnabled = false;
223− if (demo.underlay) {
223+ if (demo.stages) {
224− d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
224+ d.finalEdgeDemo = d.overlay.createObject(demo.stages, {
225 "edge": "none",
225 "edge": "none",
226 "title": i18n.tr("Well done"),
226 "title": i18n.tr("Well done"),
227 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),
227 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),
228− "anchors.fill": demo.underlay,
228+ "anchors.fill": demo.stages,
229 "showSkip": false,
229 "showSkip": false,
230 });
230 });
231 }
231 }
qml/Dash/Dash.qml+8
@@ -148,6 +148,14 @@ Showable {
148 live: false
148 live: false
149 }
149 }
150
150
151+ Image {
152+ anchors.fill: parent
153+ source: parent.width > parent.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
154+ fillMode: Image.PreserveAspectCrop
155+ horizontalAlignment: Image.AlignRight
156+ verticalAlignment: Image.AlignTop
157+ }
158+
151 DashContent {
159 DashContent {
152 id: dashContent
160 id: dashContent
153
161
qml/Dash/DashApplication.qml+6
@@ -23,6 +23,12 @@ MainView {
23
23
24 useDeprecatedToolbar: false
24 useDeprecatedToolbar: false
25
25
26+ Binding {
27+ target: i18n
28+ property: "domain"
29+ value: "unity8"
30+ }
31+
26 Dash {
32 Dash {
27 anchors.fill: parent
33 anchors.fill: parent
28 }
34 }
qml/Greeter/Greeter.qml+1−1
@@ -70,7 +70,7 @@ Showable {
70 DraggingArea {
70 DraggingArea {
71 id: dragHandle
71 id: dragHandle
72 anchors.fill: parent
72 anchors.fill: parent
73− enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled
73+ enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled && greeter.shown
74 orientation: Qt.Horizontal
74 orientation: Qt.Horizontal
75 propagateComposedEvents: true
75 propagateComposedEvents: true
76
76
qml/Shell.qml+3−3
@@ -167,12 +167,12 @@ Item {
167 Binding {
167 Binding {
168 target: applicationsDisplayLoader.item
168 target: applicationsDisplayLoader.item
169 property: "interactive"
169 property: "interactive"
170− value: !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0
170+ value: edgeDemo.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0
171 }
171 }
172 Binding {
172 Binding {
173 target: applicationsDisplayLoader.item
173 target: applicationsDisplayLoader.item
174 property: "spreadEnabled"
174 property: "spreadEnabled"
175− value: greeter.fakeActiveForApp === "" // to support emergency dialer hack
175+ value: edgeDemo.stagesEnabled && greeter.fakeActiveForApp === "" // to support emergency dialer hack
176 }
176 }
177 Binding {
177 Binding {
178 target: applicationsDisplayLoader.item
178 target: applicationsDisplayLoader.item
@@ -561,7 +561,7 @@ Item {
561 greeter: greeter
561 greeter: greeter
562 launcher: launcher
562 launcher: launcher
563 indicators: panel.indicators
563 indicators: panel.indicators
564− underlay: underlay
564+ stages: stages
565 }
565 }
566
566
567 Connections {
567 Connections {
src/Dash/main.cpp+5−5
@@ -24,6 +24,7 @@
24#include <QDebug>
24#include <QDebug>
25#include <QCommandLineParser>
25#include <QCommandLineParser>
26#include <QLibrary>
26#include <QLibrary>
27+#include <libintl.h>
27
28
28#include <paths.h>
29#include <paths.h>
29#include "../MouseTouchAdaptor.h"
30#include "../MouseTouchAdaptor.h"
@@ -40,10 +41,7 @@ int main(int argc, const char *argv[])
40 "Allow the mouse to provide touch input");
41 "Allow the mouse to provide touch input");
41 parser.addOption(mousetouchOption);
42 parser.addOption(mousetouchOption);
42
43
43− QCommandLineOption testabilityOption("testability",
44+ // FIXME Remove once we drop the need of the hint
44− "Load the testability driver (Alternatively export QT_LOAD_TESTABILITY");
45− parser.addOption(testabilityOption);
46−
47 QCommandLineOption desktopFileHintOption("desktop_file_hint",
45 QCommandLineOption desktopFileHintOption("desktop_file_hint",
48 "The desktop_file_hint option for QtMir", "hint_file");
46 "The desktop_file_hint option for QtMir", "hint_file");
49 parser.addOption(desktopFileHintOption);
47 parser.addOption(desktopFileHintOption);
@@ -53,7 +51,7 @@ int main(int argc, const char *argv[])
53 parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
51 parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
54 parser.process(*application);
52 parser.process(*application);
55
53
56− if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {
54+ if (getenv("QT_LOAD_TESTABILITY")) {
57 QLibrary testLib(QLatin1String("qttestability"));
55 QLibrary testLib(QLatin1String("qttestability"));
58 if (testLib.load()) {
56 if (testLib.load()) {
59 typedef void (*TasInitialize)(void);
57 typedef void (*TasInitialize)(void);
@@ -68,6 +66,8 @@ int main(int argc, const char *argv[])
68 }
66 }
69 }
67 }
70
68
69+ bindtextdomain("unity8", translationDirectory().toUtf8().data());
70+
71 QQuickView* view = new QQuickView();
71 QQuickView* view = new QQuickView();
72 view->setResizeMode(QQuickView::SizeRootObjectToView);
72 view->setResizeMode(QQuickView::SizeRootObjectToView);
73 view->setTitle("Unity Dash");
73 view->setTitle("Unity Dash");