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

[Olivier Tilloy]

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.

[Günter Schwann (schwann)]

lgtm

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

=== 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 @@
             }
         }
 
-        ListItem.Header { text: i18n.tr("Location") }
+        ListItem.Header { text: i18n.tr("Location & People") }
         ListItem.Empty {
             highlightWhenPressed: false
             TextField {
@@ -148,7 +148,6 @@
             }
         }
 
-        ListItem.Header { text: i18n.tr("People") }
         ListItem.Empty {
             highlightWhenPressed: false
             TextField {

=== 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 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical Ltd. 
+# Copyright (C) YEAR Canonical Ltd.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: calendar-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-12 17:24+0200\n"
+"POT-Creation-Date: 2013-08-30 10:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,7 +17,14 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../DiaryView.qml:54
+#. TRANSLATORS: this is a time formatting string,
+#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+#: ../DayView.qml:29 ../TimeLineBackground.qml:22 ../TimeLineView.qml:103
+#: ../WeekView.qml:27
+msgid "HH"
+msgstr ""
+
+#: ../DiaryView.qml:43
 msgid "(+) New Event"
 msgstr ""
 
@@ -29,54 +36,92 @@
 msgid "Edit"
 msgstr ""
 
-#: ../EventDetails.qml:150 ../NewEvent.qml:112
+#: ../EventDetails.qml:150
 msgid "People"
 msgstr ""
 
-#: ../NewEvent.qml:20
+#: ../NewEvent.qml:23
 msgid "Create event"
 msgstr ""
 
-#: ../NewEvent.qml:25
+#: ../NewEvent.qml:29
 msgid "Add event name"
 msgstr ""
 
-#: ../NewEvent.qml:99
-msgid "Location"
-msgstr ""
-
-#: ../NewEvent.qml:104
+#: ../NewEvent.qml:102
+msgid "to"
+msgstr ""
+
+#: ../NewEvent.qml:137
+msgid "Location & People"
+msgstr ""
+
+#: ../NewEvent.qml:143
 msgid "Add Location"
 msgstr ""
 
-#: ../NewEvent.qml:117
+#: ../NewEvent.qml:156
 msgid "Invite People"
 msgstr ""
 
-#: ../NewEvent.qml:128
+#: ../NewEvent.qml:168
+msgid "Error"
+msgstr ""
+
+#: ../NewEvent.qml:171
+msgid "Ok"
+msgstr ""
+
+#: ../NewEvent.qml:177
 msgid "Save"
 msgstr ""
 
-#. TRANSLATORS: this is a time formatting string,
-#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-#: ../TimeLineView.qml:147
-msgid "HH:mm"
-msgstr ""
-
-#: ../calendar.qml:31
-msgid "To-do"
-msgstr ""
-
-#: ../calendar.qml:36
+#: ../NewEvent.qml:205
+msgid "End time can't be before start time"
+msgstr ""
+
+#: ../TimePicker.qml:23
+msgid "Time"
+msgstr ""
+
+#: ../TimePicker.qml:49
+msgid "Hour"
+msgstr ""
+
+#: ../TimePicker.qml:63
+msgid "Minute"
+msgstr ""
+
+#: ../TimePicker.qml:73
+msgid "Cancel"
+msgstr ""
+
+#: ../TimePicker.qml:82
+msgid "OK"
+msgstr ""
+
+#: ../calendar.qml:52
 msgid "New Event"
 msgstr ""
 
-#: ../calendar.qml:41 ../calendar.qml:48
-msgid "Timeline"
-msgstr ""
-
-#: ../calendar.qml:45
-msgid "Diary"
+#: ../calendar.qml:60
+msgid "Today"
+msgstr ""
+
+#: ../calendar.qml:72
+msgid "Year"
+msgstr ""
+
+#: ../calendar.qml:93
+msgid "Month"
+msgstr ""
+
+#: ../calendar.qml:116
+msgid "Week"
+msgstr ""
+
+#: ../calendar.qml:132
+msgid "Day"
 msgstr ""
 
 #: ../.build/calendar-app.desktop.js:1