1
=== modified file 'launcher/Launcher.qml'
2
--- launcher/Launcher.qml	2011-12-11 22:26:34 +0000
3
+++ launcher/Launcher.qml	2011-12-21 22:46:24 +0000
4
@@ -16,7 +16,7 @@
5
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
6
17
 */
17
 */
7
18
18
9
19
import QtQuick 1.0
19
import QtQuick 1.1
10
20
import Unity2d 1.0 /* required for drag’n’drop handling */
20
import Unity2d 1.0 /* required for drag’n’drop handling */
11
21
21
12
22
LauncherDropItem {
22
LauncherDropItem {
13
@@ -24,6 +24,8 @@
14
24
24
15
25
    Accessible.name: "root"
25
    Accessible.name: "root"
16
26
    focus: true
26
    focus: true
17
27
    LayoutMirroring.enabled: isRightToLeft()
18
28
    LayoutMirroring.childrenInherit: true
19
27
29
20
28
    function clamp(x, min, max) {
30
    function clamp(x, min, max) {
21
29
        return Math.max(Math.min(x, max), min)
31
        return Math.max(Math.min(x, max), min)
22
@@ -47,6 +49,24 @@
23
47
        main.positionViewAtBeginning()
49
        main.positionViewAtBeginning()
24
48
    }
50
    }
25
49
51
26
52
    function isRightToLeft() {
27
53
        return Qt.application.layoutDirection == Qt.RightToLeft
28
54
    }
29
55
30
56
    function switchLeftRightKeys(key) {
31
57
        if (isRightToLeft()) {
32
58
            switch (key) {
33
59
            case Qt.Key_Right:
34
60
                return Qt.Key_Left
35
61
            case Qt.Key_Left:
36
62
                return Qt.Key_Right
37
63
            default:
38
64
                return key
39
65
            }
40
66
        }
41
67
        return key
42
68
    }
43
69
44
50
    Item {
70
    Item {
45
51
        anchors.fill: parent
71
        anchors.fill: parent
46
52
        clip: true
72
        clip: true
47
53
73
48
=== modified file 'launcher/LauncherList.qml'
49
--- launcher/LauncherList.qml	2011-12-21 09:52:15 +0000
50
+++ launcher/LauncherList.qml	2011-12-21 22:46:24 +0000
51
@@ -187,13 +187,14 @@
52
187
        }
187
        }
53
188
188
54
189
        Keys.onPressed: {
189
        Keys.onPressed: {
56
190
            if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter || event.key == Qt.Key_Space) {
190
            var key = switchLeftRightKeys(event.key)
57
191
            if (key == Qt.Key_Return || key == Qt.Key_Enter || key == Qt.Key_Space) {
58
191
                item.menu.hide()
192
                item.menu.hide()
59
192
                item.activate()
193
                item.activate()
60
193
                event.accepted = true
194
                event.accepted = true
61
194
            }
195
            }
64
195
            else if (event.key == Qt.Key_Right ||
196
            else if (key == Qt.Key_Right ||
65
196
                    (event.key == Qt.Key_F10 && (event.modifiers & Qt.ShiftModifier))) {
197
                    (key == Qt.Key_F10 && (event.modifiers & Qt.ShiftModifier))) {
66
197
                /* Show the menu first, then unfold it. Doing things in this
198
                /* Show the menu first, then unfold it. Doing things in this
67
198
                   order is required because at the moment the code path that
199
                   order is required because at the moment the code path that
68
199
                   adjusts the position of the menu in case it goes offscreen
200
                   adjusts the position of the menu in case it goes offscreen
69
@@ -204,7 +205,7 @@
70
204
                item.menu.setFocus()
205
                item.menu.setFocus()
71
205
                event.accepted = true
206
                event.accepted = true
72
206
            }
207
            }
74
207
            else if (event.key == Qt.Key_Left) {
208
            else if (key == Qt.Key_Left) {
75
208
                item.menu.hide()
209
                item.menu.hide()
76
209
                event.accepted = true
210
                event.accepted = true
77
210
            }
211
            }
78
211
212
79
=== modified file 'libunity-2d-private/src/edgehitdetector.cpp'
80
--- libunity-2d-private/src/edgehitdetector.cpp	2011-11-29 11:46:34 +0000
81
+++ libunity-2d-private/src/edgehitdetector.cpp	2011-12-21 22:46:24 +0000
82
@@ -58,7 +58,7 @@
83
58
    if (QApplication::isLeftToRight()) {
58
    if (QApplication::isLeftToRight()) {
84
59
        m_mouseArea->setGeometry(rect.left(), rect.top(), 1, rect.height());
59
        m_mouseArea->setGeometry(rect.left(), rect.top(), 1, rect.height());
85
60
    } else {
60
    } else {
87
61
        m_mouseArea->setGeometry(rect.right() - 1, rect.top(), 1, rect.height());
61
        m_mouseArea->setGeometry(rect.right(), rect.top(), 1, rect.height());
88
62
    }
62
    }
89
63
}
63
}
90
64
64
91
65
65
92
=== modified file 'libunity-2d-private/src/focuspath.cpp'
93
--- libunity-2d-private/src/focuspath.cpp	2011-11-21 18:57:43 +0000
94
+++ libunity-2d-private/src/focuspath.cpp	2011-12-21 22:46:24 +0000
95
@@ -22,6 +22,7 @@
96
22
#include <QtCore/qmath.h>
22
#include <QtCore/qmath.h>
97
23
#include <QEvent>
23
#include <QEvent>
98
24
#include <QKeyEvent>
24
#include <QKeyEvent>
99
25
#include <QApplication>
100
25
26
101
26
/*!
27
/*!
102
27
    \qmlclass FocusPath
28
    \qmlclass FocusPath
103
@@ -297,12 +298,25 @@
104
297
        switch(event->type()) {
298
        switch(event->type()) {
105
298
            case QEvent::KeyPress: {
299
            case QEvent::KeyPress: {
106
299
                int nextFocus = m_currentIndex;
300
                int nextFocus = m_currentIndex;
107
301
                Flow flow = m_flow;
108
302
                if (QApplication::isRightToLeft()) {
109
303
                    switch (m_flow) {
110
304
                        case FocusPath::LeftToRight:
111
305
                            flow = FocusPath::RightToLeft;
112
306
                            break;
113
307
                        case FocusPath::RightToLeft:
114
308
                            flow = FocusPath::LeftToRight;
115
309
                            break;
116
310
                        default:
117
311
                            break;
118
312
                    }
119
313
                }
120
300
314
121
301
                QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
315
                QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
122
302
                switch(keyEvent->key()) {
316
                switch(keyEvent->key()) {
123
303
                    case Qt::Key_Right:
317
                    case Qt::Key_Right:
124
304
                        if ((m_direction & FocusPath::Horizontal) == FocusPath::Horizontal) {
318
                        if ((m_direction & FocusPath::Horizontal) == FocusPath::Horizontal) {
126
305
                            switch(m_flow) {
319
                            switch(flow) {
127
306
                                case FocusPath::LeftToRight:
320
                                case FocusPath::LeftToRight:
128
307
                                    nextFocus += 1;
321
                                    nextFocus += 1;
129
308
                                    break;
322
                                    break;
130
@@ -319,7 +333,7 @@
131
319
                        break;
333
                        break;
132
320
                    case Qt::Key_Left:
334
                    case Qt::Key_Left:
133
321
                        if ((m_direction & FocusPath::Horizontal) == FocusPath::Horizontal) {
335
                        if ((m_direction & FocusPath::Horizontal) == FocusPath::Horizontal) {
135
322
                            switch(m_flow) {
336
                            switch(flow) {
136
323
                                case FocusPath::LeftToRight:
337
                                case FocusPath::LeftToRight:
137
324
                                    nextFocus -= 1;
338
                                    nextFocus -= 1;
138
325
                                    break;
339
                                    break;
139
@@ -336,14 +350,14 @@
140
336
                        break;
350
                        break;
141
337
                    case Qt::Key_Up:
351
                    case Qt::Key_Up:
142
338
                        if (((m_direction & FocusPath::Vertical) == FocusPath::Vertical) && (m_columns >= 0)) {
352
                        if (((m_direction & FocusPath::Vertical) == FocusPath::Vertical) && (m_columns >= 0)) {
144
339
                            nextFocus = (m_flow == FocusPath::TopToBottom) ? nextFocus - 1 : nextFocus - m_columns;
353
                            nextFocus = (flow == FocusPath::TopToBottom) ? nextFocus - 1 : nextFocus - m_columns;
145
340
                        } else {
354
                        } else {
146
341
                            nextFocus = -1;
355
                            nextFocus = -1;
147
342
                        }
356
                        }
148
343
                        break;
357
                        break;
149
344
                    case Qt::Key_Down:
358
                    case Qt::Key_Down:
150
345
                        if (((m_direction & FocusPath::Vertical) == FocusPath::Vertical) && (m_columns >= 0)) {
359
                        if (((m_direction & FocusPath::Vertical) == FocusPath::Vertical) && (m_columns >= 0)) {
152
346
                            nextFocus = (m_flow == FocusPath::TopToBottom) ? nextFocus + 1 : nextFocus + m_columns;
360
                            nextFocus = (flow == FocusPath::TopToBottom) ? nextFocus + 1 : nextFocus + m_columns;
153
347
                        } else {
361
                        } else {
154
348
                            nextFocus = -1;
362
                            nextFocus = -1;
155
349
                        }
363
                        }
156
350
364
157
=== modified file 'libunity-2d-private/src/launchermenu.cpp'
158
--- libunity-2d-private/src/launchermenu.cpp	2011-12-05 06:49:40 +0000
159
+++ libunity-2d-private/src/launchermenu.cpp	2011-12-21 22:46:24 +0000
160
@@ -331,7 +331,9 @@
161
331
LauncherContextualMenu::keyPressEvent(QKeyEvent* event)
331
LauncherContextualMenu::keyPressEvent(QKeyEvent* event)
162
332
{
332
{
163
333
    int key = event->key();
333
    int key = event->key();
165
334
    if (key == Qt::Key_Left || key == Qt::Key_Escape) {
334
    bool rtl = layoutDirection() == Qt::RightToLeft;
166
335
    if (!rtl && key == Qt::Key_Left || 
167
336
         rtl && key == Qt::Key_Right || key == Qt::Key_Escape) {
168
335
        Q_EMIT dismissedByKeyEvent();
337
        Q_EMIT dismissedByKeyEvent();
169
336
        hide();
338
        hide();
170
337
        event->accept();
339
        event->accept();
171
338
340
172
=== modified file 'panel/applets/appname/appnameapplet.cpp'
173
--- panel/applets/appname/appnameapplet.cpp	2011-12-02 06:41:22 +0000
174
+++ panel/applets/appname/appnameapplet.cpp	2011-12-21 22:46:24 +0000
175
@@ -111,8 +111,10 @@
176
111
        } else {
111
        } else {
177
112
            pix = m_normalPix;
112
            pix = m_normalPix;
178
113
        }
113
        }
179
114
        bool rtl = layoutDirection() == Qt::RightToLeft;
180
114
        int posX;
115
        int posX;
182
115
        if (m_buttonType == PanelStyle::CloseWindowButton) {
116
        if (!rtl && m_buttonType == PanelStyle::CloseWindowButton ||
183
117
             rtl && m_buttonType != PanelStyle::CloseWindowButton) {
184
116
            posX = width() - pix.width();
118
            posX = width() - pix.width();
185
117
        } else {
119
        } else {
186
118
            posX = 0;
120
            posX = 0;
187
119
121
188
=== modified file 'places/GridViewWithSpacing.qml'
189
--- places/GridViewWithSpacing.qml	2011-08-23 15:00:31 +0000
190
+++ places/GridViewWithSpacing.qml	2011-12-21 22:46:24 +0000
191
@@ -25,6 +25,8 @@
192
25
    property int rows: 2
25
    property int rows: 2
193
26
26
194
27
    function delegateX(column) {
27
    function delegateX(column) {
195
28
        if (isRightToLeft())
196
29
            column = columns - 1 - column
197
28
        return column * horizontalSpacing / columns
30
        return column * horizontalSpacing / columns
198
29
    }
31
    }
199
30
    function delegateY(row) {
32
    function delegateY(row) {
200
31
33
201
=== modified file 'places/LensBar.qml'
202
--- places/LensBar.qml	2011-12-14 22:46:59 +0000
203
+++ places/LensBar.qml	2011-12-21 22:46:24 +0000
204
@@ -74,7 +74,7 @@
205
74
        }
74
        }
206
75
75
207
76
        function handleKeyPress(key) {
76
        function handleKeyPress(key) {
209
77
            switch (key) {
77
            switch (switchLeftRightKeys(key)) {
210
78
            case Qt.Key_Right:
78
            case Qt.Key_Right:
211
79
                return selectChild(currentIndex+1)
79
                return selectChild(currentIndex+1)
212
80
            case Qt.Key_Left:
80
            case Qt.Key_Left:
213
81
81
214
=== modified file 'places/MultiRangeSelectionBar.qml'
215
--- places/MultiRangeSelectionBar.qml	2011-08-25 10:46:14 +0000
216
+++ places/MultiRangeSelectionBar.qml	2011-12-21 22:46:24 +0000
217
@@ -16,7 +16,7 @@
218
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
219
17
 */
17
 */
220
18
18
222
19
import QtQuick 1.0
19
import QtQuick 1.1
223
20
20
224
21
Item {
21
Item {
225
22
    id: multiRangeSelectionBar
22
    id: multiRangeSelectionBar
226
@@ -26,7 +26,7 @@
227
26
    property int leftPos: 0
26
    property int leftPos: 0
228
27
    property int rightPos: 100
27
    property int rightPos: 100
229
28
28
231
29
    x: leftPos
29
    x: !isRightToLeft() ? leftPos : parent.width - rightPos
232
30
    width: rightPos - leftPos
30
    width: rightPos - leftPos
233
31
    height: childrenRect.height
31
    height: childrenRect.height
234
32
32
235
@@ -38,6 +38,7 @@
236
38
        height: sourceSize.height
38
        height: sourceSize.height
237
39
        anchors.left: parent.left
39
        anchors.left: parent.left
238
40
        anchors.top: parent.top
40
        anchors.top: parent.top
239
41
        mirror: isRightToLeft()
240
41
    }
42
    }
241
42
43
242
43
    Image {
44
    Image {
243
@@ -59,6 +60,7 @@
244
59
        height: sourceSize.height
60
        height: sourceSize.height
245
60
        anchors.top: parent.top
61
        anchors.top: parent.top
246
61
        anchors.right: parent.right
62
        anchors.right: parent.right
247
63
        mirror: isRightToLeft()
248
62
    }
64
    }
249
63
65
250
64
}
66
}
251
65
67
252
=== modified file 'places/RatingStars.qml'
253
--- places/RatingStars.qml	2011-11-14 10:45:33 +0000
254
+++ places/RatingStars.qml	2011-12-21 22:46:24 +0000
255
@@ -50,7 +50,7 @@
256
50
50
257
51
    Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
51
    Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
258
52
    function handleKeyPress(key) {
52
    function handleKeyPress(key) {
260
53
        switch (key) {
53
        switch (switchLeftRightKeys(key)) {
261
54
        case Qt.Key_Right:
54
        case Qt.Key_Right:
262
55
            incrementRating()
55
            incrementRating()
263
56
            return true
56
            return true
264
@@ -64,6 +64,9 @@
265
64
    Row {
64
    Row {
266
65
        id: stars
65
        id: stars
267
66
66
268
67
        // Required for right-to-left mirroring
269
68
        anchors.left: parent.left
270
69
271
67
        Repeater {
70
        Repeater {
272
68
            model: size
71
            model: size
273
69
            Star {
72
            Star {
274
@@ -98,6 +101,8 @@
275
98
101
276
99
            /* What unit is the mouse over? This is the integer part of the rating (plus one)*/
102
            /* What unit is the mouse over? This is the integer part of the rating (plus one)*/
277
100
            var rating = (posX - posXOverUnit) / unitWidth + 1
103
            var rating = (posX - posXOverUnit) / unitWidth + 1
278
104
            if (isRightToLeft())
279
105
                rating = size + 1 - rating
280
101
106
281
102
            return clamp( rating, 0, size )
107
            return clamp( rating, 0, size )
282
103
        }
108
        }
283
104
109
284
=== modified file 'places/dash.qml'
285
--- places/dash.qml	2011-12-19 10:44:26 +0000
286
+++ places/dash.qml	2011-12-21 22:46:24 +0000
287
@@ -33,6 +33,20 @@
288
33
        return Qt.application.layoutDirection == Qt.RightToLeft
33
        return Qt.application.layoutDirection == Qt.RightToLeft
289
34
    }
34
    }
290
35
35
291
36
    function switchLeftRightKeys(key) {
292
37
        if (isRightToLeft()) {
293
38
            switch (key) {
294
39
            case Qt.Key_Right:
295
40
                return Qt.Key_Left
296
41
            case Qt.Key_Left:
297
42
                return Qt.Key_Right
298
43
            default:
299
44
                return key
300
45
            }
301
46
        }
302
47
        return key
303
48
    }
304
49
        
305
36
    Binding {
50
    Binding {
306
37
        target: dashView
51
        target: dashView
307
38
        property: "expanded"
52
        property: "expanded"
Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2011-11-14	Needs Fixing on 2011-11-17
Review via email: mp+82151@code.launchpad.net