Ubuntu Calendar App

Merge lp:~osomon/ubuntu-calendar-app/reduce-newevent-popup-height into lp:ubuntu-calendar-app

  1. reduce-newevent-popup-height
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 95
Merged at revision: 94
Proposed branch: lp:~osomon/ubuntu-calendar-app/reduce-newevent-popup-height
Merge into: lp:ubuntu-calendar-app
Diff against target: 176 lines (+76/-32)
2 files modified
NewEvent.qml (+1/-2)
po/calendar-app.pot (+75/-30)
To merge this branch: bzr merge lp:~osomon/ubuntu-calendar-app/reduce-newevent-popup-height
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Günter Schwann (community) Approve
Ubuntu Calendar Developers Pending
Review via email: mp+183090@code.launchpad.net

Commit message

Reduce the height of the "new event" popup so that the OSK doesn’t partially hide the save button.

This is a temporary measure until we get a design decision on how to properly address the issue.

To post a comment you must log in.
Revision history for this message
Günter Schwann (schwann) wrote :

lgtm

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:95
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/25/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/25

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/25/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NewEvent.qml'
--- NewEvent.qml 2013-08-20 14:32:27 +0000
+++ NewEvent.qml 2013-08-30 08:28:30 +0000
@@ -134,7 +134,7 @@
134 }134 }
135 }135 }
136136
137 ListItem.Header { text: i18n.tr("Location") }137 ListItem.Header { text: i18n.tr("Location & People") }
138 ListItem.Empty {138 ListItem.Empty {
139 highlightWhenPressed: false139 highlightWhenPressed: false
140 TextField {140 TextField {
@@ -148,7 +148,6 @@
148 }148 }
149 }149 }
150150
151 ListItem.Header { text: i18n.tr("People") }
152 ListItem.Empty {151 ListItem.Empty {
153 highlightWhenPressed: false152 highlightWhenPressed: false
154 TextField {153 TextField {
155154
=== modified file 'po/calendar-app.pot'
--- po/calendar-app.pot 2013-06-12 18:18:46 +0000
+++ po/calendar-app.pot 2013-08-30 08:28:30 +0000
@@ -1,5 +1,5 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical Ltd. 2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the PACKAGE package.3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: calendar-app\n"9"Project-Id-Version: calendar-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-06-12 17:24+0200\n"11"POT-Creation-Date: 2013-08-30 10:23+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,14 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../DiaryView.qml:5420#. TRANSLATORS: this is a time formatting string,
21#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
22#: ../DayView.qml:29 ../TimeLineBackground.qml:22 ../TimeLineView.qml:103
23#: ../WeekView.qml:27
24msgid "HH"
25msgstr ""
26
27#: ../DiaryView.qml:43
21msgid "(+) New Event"28msgid "(+) New Event"
22msgstr ""29msgstr ""
2330
@@ -29,54 +36,92 @@
29msgid "Edit"36msgid "Edit"
30msgstr ""37msgstr ""
3138
32#: ../EventDetails.qml:150 ../NewEvent.qml:11239#: ../EventDetails.qml:150
33msgid "People"40msgid "People"
34msgstr ""41msgstr ""
3542
36#: ../NewEvent.qml:2043#: ../NewEvent.qml:23
37msgid "Create event"44msgid "Create event"
38msgstr ""45msgstr ""
3946
40#: ../NewEvent.qml:2547#: ../NewEvent.qml:29
41msgid "Add event name"48msgid "Add event name"
42msgstr ""49msgstr ""
4350
44#: ../NewEvent.qml:9951#: ../NewEvent.qml:102
45msgid "Location"52msgid "to"
46msgstr ""53msgstr ""
4754
48#: ../NewEvent.qml:10455#: ../NewEvent.qml:137
56msgid "Location & People"
57msgstr ""
58
59#: ../NewEvent.qml:143
49msgid "Add Location"60msgid "Add Location"
50msgstr ""61msgstr ""
5162
52#: ../NewEvent.qml:11763#: ../NewEvent.qml:156
53msgid "Invite People"64msgid "Invite People"
54msgstr ""65msgstr ""
5566
56#: ../NewEvent.qml:12867#: ../NewEvent.qml:168
68msgid "Error"
69msgstr ""
70
71#: ../NewEvent.qml:171
72msgid "Ok"
73msgstr ""
74
75#: ../NewEvent.qml:177
57msgid "Save"76msgid "Save"
58msgstr ""77msgstr ""
5978
60#. TRANSLATORS: this is a time formatting string,79#: ../NewEvent.qml:205
61#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions80msgid "End time can't be before start time"
62#: ../TimeLineView.qml:14781msgstr ""
63msgid "HH:mm"82
64msgstr ""83#: ../TimePicker.qml:23
6584msgid "Time"
66#: ../calendar.qml:3185msgstr ""
67msgid "To-do"86
68msgstr ""87#: ../TimePicker.qml:49
6988msgid "Hour"
70#: ../calendar.qml:3689msgstr ""
90
91#: ../TimePicker.qml:63
92msgid "Minute"
93msgstr ""
94
95#: ../TimePicker.qml:73
96msgid "Cancel"
97msgstr ""
98
99#: ../TimePicker.qml:82
100msgid "OK"
101msgstr ""
102
103#: ../calendar.qml:52
71msgid "New Event"104msgid "New Event"
72msgstr ""105msgstr ""
73106
74#: ../calendar.qml:41 ../calendar.qml:48107#: ../calendar.qml:60
75msgid "Timeline"108msgid "Today"
76msgstr ""109msgstr ""
77110
78#: ../calendar.qml:45111#: ../calendar.qml:72
79msgid "Diary"112msgid "Year"
113msgstr ""
114
115#: ../calendar.qml:93
116msgid "Month"
117msgstr ""
118
119#: ../calendar.qml:116
120msgid "Week"
121msgstr ""
122
123#: ../calendar.qml:132
124msgid "Day"
80msgstr ""125msgstr ""
81126
82#: ../.build/calendar-app.desktop.js:1127#: ../.build/calendar-app.desktop.js:1

Subscribers

People subscribed via source and target branches

to status/vote changes: