Ubuntu Calendar App

Merge lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app

  1. Uitk1_3_and_font_fix
  2. Merge into trunk
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 726
Merged at revision: 747
Proposed branch: lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix
Merge into: lp:ubuntu-calendar-app
Diff against target: 890 lines (+85/-102)
39 files modified
AgendaView.qml (+1/-2)
AllDayEventComponent.qml (+1/-1)
CalendarChoicePopup.qml (+1/-1)
CalendarListButtonDelegate.qml (+1/-1)
ColorPickerDialog.qml (+1/-1)
ContactChoicePopup.qml (+1/-1)
DayView.qml (+2/-3)
Defines.js (+1/-1)
DeleteConfirmationDialog.qml (+1/-1)
EditEventConfirmationDialog.qml (+1/-1)
EventActions.qml (+4/-2)
EventBubble.qml (+1/-1)
EventDetails.qml (+2/-2)
EventReminder.qml (+1/-1)
EventRepetition.qml (+1/-1)
EventUtils.qml (+1/-1)
HeaderDateComponent.qml (+1/-1)
MonthComponent.qml (+2/-2)
MonthComponentDateDelegate.qml (+1/-1)
MonthView.qml (+2/-3)
NewEvent.qml (+1/-1)
NewEventEntryField.qml (+1/-1)
OnlineAccountsHelper.qml (+1/-1)
RecurrenceLabelDefines.qml (+1/-1)
Scroller.qml (+1/-1)
Settings.qml (+2/-2)
TimeLineBackground.qml (+1/-1)
TimeLineBase.qml (+1/-1)
TimeLineBaseComponent.qml (+1/-1)
TimeLineHeader.qml (+1/-1)
TimeLineHeaderComponent.qml (+1/-1)
TimeLineTimeScale.qml (+1/-1)
ViewHeader.qml (+2/-2)
WeekView.qml (+2/-3)
YearView.qml (+2/-3)
YearViewDelegate.qml (+1/-1)
calendar.qml (+1/-3)
calendarTests.qml (+1/-1)
po/com.ubuntu.calendar.pot (+36/-48)
To merge this branch: bzr merge lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Renato Araujo Oliveira Filho (community) Needs Information
Dan Chapman ξƒΏ Approve
Review via email: mp+284365@code.launchpad.net

Commit message

Build upon lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 by reducing the font size in headers.

Description of the change

Build upon lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 by reducing the font size in headers.

To post a comment you must log in.
Revision history for this message
Dan Chapman ξƒΏ (dpniel) wrote :

LGTM :-)

review: Approve
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Hey guys. The new event bottom is not visible on the header anymore with this branch. Is that intentional? How do I create new events?

review: Needs Information
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:725
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/201/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/487/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/201/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:726
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/212/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/498/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/212/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Hey guys I have a new branch based on this one that contains update to qtquick 2.4 and use the new page header API:

https://code.launchpad.net/~renatofilho/ubuntu-calendar-app/sdk-1-3/+merge/284454

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AgendaView.qml'
--- AgendaView.qml 2015-07-11 02:18:03 +0000
+++ AgendaView.qml 2016-01-29 09:35:25 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtOrganizer 5.020import QtOrganizer 5.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
23import "dateExt.js" as DateExt23import "dateExt.js" as DateExt
2424
@@ -57,7 +57,6 @@
5757
58 head.actions: [58 head.actions: [
59 calendarTodayAction,59 calendarTodayAction,
60 commonHeaderActions.newEventAction,
61 commonHeaderActions.showCalendarAction,60 commonHeaderActions.showCalendarAction,
62 commonHeaderActions.reloadAction,61 commonHeaderActions.reloadAction,
63 commonHeaderActions.syncCalendarAction,62 commonHeaderActions.syncCalendarAction,
6463
=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml 2015-08-07 06:20:23 +0000
+++ AllDayEventComponent.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import QtOrganizer 5.021import QtOrganizer 5.0
2222
2323
=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml 2015-05-28 13:56:12 +0000
+++ CalendarChoicePopup.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
22import QtOrganizer 5.022import QtOrganizer 5.0
2323
=== modified file 'CalendarListButtonDelegate.qml'
--- CalendarListButtonDelegate.qml 2015-05-28 13:58:30 +0000
+++ CalendarListButtonDelegate.qml 2016-01-29 09:35:25 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItem19import Ubuntu.Components.ListItems 1.0 as ListItem
2020
21ListItem.Standard {21ListItem.Standard {
2222
=== modified file 'ColorPickerDialog.qml'
--- ColorPickerDialog.qml 2015-04-14 19:52:04 +0000
+++ ColorPickerDialog.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
2121
22Dialog {22Dialog {
2323
=== modified file 'ContactChoicePopup.qml'
--- ContactChoicePopup.qml 2015-05-14 03:36:22 +0000
+++ ContactChoicePopup.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.0
22import Ubuntu.Components.Themes.Ambiance 1.022import Ubuntu.Components.Themes.Ambiance 1.0
2323
=== modified file 'DayView.qml'
--- DayView.qml 2015-11-23 07:15:20 +0000
+++ DayView.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import "dateExt.js" as DateExt21import "dateExt.js" as DateExt
22import "ViewType.js" as ViewType22import "ViewType.js" as ViewType
2323
@@ -46,7 +46,6 @@
46 head {46 head {
47 actions: [47 actions: [
48 calendarTodayAction,48 calendarTodayAction,
49 commonHeaderActions.newEventAction,
50 commonHeaderActions.showCalendarAction,49 commonHeaderActions.showCalendarAction,
51 commonHeaderActions.reloadAction,50 commonHeaderActions.reloadAction,
52 commonHeaderActions.syncCalendarAction,51 commonHeaderActions.syncCalendarAction,
@@ -56,7 +55,7 @@
56 contents: Label {55 contents: Label {
57 id:monthYear56 id:monthYear
58 objectName:"monthYearLabel"57 objectName:"monthYearLabel"
59 fontSize: "x-large"58 fontSize: "large"
60 text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))59 text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
61 font.capitalization: Font.Capitalize60 font.capitalization: Font.Capitalize
62 }61 }
6362
=== modified file 'Defines.js'
--- Defines.js 2014-10-22 14:03:01 +0000
+++ Defines.js 2016-01-29 09:35:25 +0000
@@ -44,7 +44,7 @@
44function getWeekLabels(){44function getWeekLabels(){
45 var object = Qt.createQmlObject('\45 var object = Qt.createQmlObject('\
46 import QtQuick 2.3;\46 import QtQuick 2.3;\
47 import Ubuntu.Components 1.1;\47 import Ubuntu.Components 1.3;\
48 QtObject {\48 QtObject {\
49 property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\49 property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
50 Qt.locale().dayName(1,Locale.NarrowFormat),\50 Qt.locale().dayName(1,Locale.NarrowFormat),\
5151
=== modified file 'DeleteConfirmationDialog.qml'
--- DeleteConfirmationDialog.qml 2014-10-14 17:20:13 +0000
+++ DeleteConfirmationDialog.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
2121
22Dialog {22Dialog {
2323
=== modified file 'EditEventConfirmationDialog.qml'
--- EditEventConfirmationDialog.qml 2014-10-14 17:20:13 +0000
+++ EditEventConfirmationDialog.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
2121
22Dialog {22Dialog {
2323
=== modified file 'EventActions.qml'
--- EventActions.qml 2015-07-11 02:18:03 +0000
+++ EventActions.qml 2016-01-29 09:35:25 +0000
@@ -17,13 +17,15 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.SyncMonitor 0.121import Ubuntu.SyncMonitor 0.1
2222
23Item {23Item {
24 id: actionPool24 id: actionPool
2525
26 property alias newEventAction: _newEventAction26 //removing till following bug is resolved
27 //https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178
28 //property alias newEventAction: _newEventAction
27 property alias showCalendarAction: _showCalendarAction29 property alias showCalendarAction: _showCalendarAction
28 property alias syncCalendarAction: _syncCalendarAction30 property alias syncCalendarAction: _syncCalendarAction
29 property alias settingsAction: _settingsAction31 property alias settingsAction: _settingsAction
3032
=== modified file 'EventBubble.qml'
--- EventBubble.qml 2015-11-29 03:17:30 +0000
+++ EventBubble.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import QtOrganizer 5.021import QtOrganizer 5.0
2222
23Item{23Item{
2424
=== modified file 'EventDetails.qml'
--- EventDetails.qml 2015-08-03 04:47:59 +0000
+++ EventDetails.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.0 as ListItem20import Ubuntu.Components.ListItems 1.0 as ListItem
21import Ubuntu.Components.Themes.Ambiance 1.021import Ubuntu.Components.Themes.Ambiance 1.0
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
@@ -271,7 +271,7 @@
271 Label{271 Label{
272 id: titleLabel272 id: titleLabel
273 objectName: "titleLabel"273 objectName: "titleLabel"
274 fontSize: "x-large"274 fontSize: "large"
275 width: parent.width275 width: parent.width
276 wrapMode: Text.WordWrap276 wrapMode: Text.WordWrap
277 color: "white"277 color: "white"
278278
=== modified file 'EventReminder.qml'
--- EventReminder.qml 2015-07-12 03:39:07 +0000
+++ EventReminder.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23Page{23Page{
2424
=== modified file 'EventRepetition.qml'
--- EventRepetition.qml 2015-07-11 11:33:00 +0000
+++ EventRepetition.qml 2016-01-29 09:35:25 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtOrganizer 5.020import QtOrganizer 5.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
23import Ubuntu.Components.Pickers 1.023import Ubuntu.Components.Pickers 1.0
24import QtOrganizer 5.024import QtOrganizer 5.0
2525
=== modified file 'EventUtils.qml'
--- EventUtils.qml 2014-10-04 04:37:34 +0000
+++ EventUtils.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import QtOrganizer 5.021import QtOrganizer 5.0
22import "Defines.js" as Defines22import "Defines.js" as Defines
23import "Recurrence.js" as Recurrence23import "Recurrence.js" as Recurrence
2424
=== modified file 'HeaderDateComponent.qml'
--- HeaderDateComponent.qml 2015-05-14 13:03:02 +0000
+++ HeaderDateComponent.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22Item {22Item {
23 id: root23 id: root
2424
=== modified file 'MonthComponent.qml'
--- MonthComponent.qml 2015-11-23 07:15:20 +0000
+++ MonthComponent.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import "dateExt.js" as DateExt20import "dateExt.js" as DateExt
21import "colorUtils.js" as Color21import "colorUtils.js" as Color
2222
@@ -35,7 +35,7 @@
3535
36 property string dayLabelFontSize: "medium"36 property string dayLabelFontSize: "medium"
37 property string dateLabelFontSize: "large"37 property string dateLabelFontSize: "large"
38 property string monthLabelFontSize: "x-large"38 property string monthLabelFontSize: "large"
39 property string yearLabelFontSize: "large"39 property string yearLabelFontSize: "large"
4040
41 property alias dayLabelDelegate : dayLabelRepeater.delegate41 property alias dayLabelDelegate : dayLabelRepeater.delegate
4242
=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml 2015-09-05 05:30:23 +0000
+++ MonthComponentDateDelegate.qml 2016-01-29 09:35:25 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.0
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
33
4Item{4Item{
5 id: dateRootItem5 id: dateRootItem
66
=== modified file 'MonthView.qml'
--- MonthView.qml 2015-11-23 07:15:20 +0000
+++ MonthView.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import "dateExt.js" as DateExt20import "dateExt.js" as DateExt
21import "colorUtils.js" as Color21import "colorUtils.js" as Color
2222
@@ -45,7 +45,6 @@
45 head {45 head {
46 actions: [46 actions: [
47 calendarTodayAction,47 calendarTodayAction,
48 commonHeaderActions.newEventAction,
49 commonHeaderActions.showCalendarAction,48 commonHeaderActions.showCalendarAction,
50 commonHeaderActions.reloadAction,49 commonHeaderActions.reloadAction,
51 commonHeaderActions.syncCalendarAction,50 commonHeaderActions.syncCalendarAction,
@@ -54,7 +53,7 @@
5453
55 contents: Label {54 contents: Label {
56 objectName:"monthYearLabel"55 objectName:"monthYearLabel"
57 fontSize: "x-large"56 fontSize: "large"
58 // TRANSLATORS: this is a time formatting string,57 // TRANSLATORS: this is a time formatting string,
59 // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.58 // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
60 // It's used in the header of the month and week views59 // It's used in the header of the month and week views
6160
=== modified file 'NewEvent.qml'
--- NewEvent.qml 2015-08-24 05:08:46 +0000
+++ NewEvent.qml 2016-01-29 09:35:25 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtOrganizer 5.020import QtOrganizer 5.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
23import Ubuntu.Components.ListItems 1.0 as ListItem23import Ubuntu.Components.ListItems 1.0 as ListItem
24import Ubuntu.Components.Themes.Ambiance 1.024import Ubuntu.Components.Themes.Ambiance 1.0
2525
=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml 2015-02-17 05:53:42 +0000
+++ NewEventEntryField.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22Label {22Label {
23 id: root23 id: root
2424
=== modified file 'OnlineAccountsHelper.qml'
--- OnlineAccountsHelper.qml 2015-03-28 11:31:47 +0000
+++ OnlineAccountsHelper.qml 2016-01-29 09:35:25 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.2
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import Ubuntu.OnlineAccounts 0.119import Ubuntu.OnlineAccounts 0.1
20import Ubuntu.OnlineAccounts.Client 0.120import Ubuntu.OnlineAccounts.Client 0.1
2121
2222
=== modified file 'RecurrenceLabelDefines.qml'
--- RecurrenceLabelDefines.qml 2014-10-17 05:42:34 +0000
+++ RecurrenceLabelDefines.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22QtObject {22QtObject {
23 property var recurrenceLabel:[i18n.tr("Once"),23 property var recurrenceLabel:[i18n.tr("Once"),
2424
=== modified file 'Scroller.qml'
--- Scroller.qml 2014-09-20 10:45:35 +0000
+++ Scroller.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItems21import Ubuntu.Components.ListItems 1.0 as ListItems
2222
23Item {23Item {
2424
=== modified file 'Settings.qml'
--- Settings.qml 2015-11-23 07:15:20 +0000
+++ Settings.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
@@ -25,9 +25,9 @@
25 objectName: "settings"25 objectName: "settings"
2626
27 visible: false27 visible: false
28 title: i18n.tr("Settings")
2928
30 head {29 head {
30 title: i18n.tr("Settings")
31 backAction: Action {31 backAction: Action {
32 text: i18n.tr("Back")32 text: i18n.tr("Back")
33 iconName: "back"33 iconName: "back"
3434
=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml 2014-11-29 05:15:13 +0000
+++ TimeLineBackground.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22Column {22Column {
23 width: parent.width23 width: parent.width
2424
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml 2015-08-20 12:27:59 +0000
+++ TimeLineBase.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import QtOrganizer 5.020import QtOrganizer 5.0
2121
22import "dateExt.js" as DateExt22import "dateExt.js" as DateExt
2323
=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml 2015-10-31 18:47:23 +0000
+++ TimeLineBaseComponent.qml 2016-01-29 09:35:25 +0000
@@ -18,7 +18,7 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.121import Ubuntu.Components 1.3
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
23import QtOrganizer 5.023import QtOrganizer 5.0
2424
2525
=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml 2015-09-05 05:30:23 +0000
+++ TimeLineHeader.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import QtQuick.Layouts 1.121import QtQuick.Layouts 1.1
2222
23import "ViewType.js" as ViewType23import "ViewType.js" as ViewType
2424
=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml 2015-09-05 05:30:23 +0000
+++ TimeLineHeaderComponent.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import "dateExt.js" as DateExt21import "dateExt.js" as DateExt
22import "ViewType.js" as ViewType22import "ViewType.js" as ViewType
2323
2424
=== modified file 'TimeLineTimeScale.qml'
--- TimeLineTimeScale.qml 2014-12-11 20:29:27 +0000
+++ TimeLineTimeScale.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22Flickable{22Flickable{
23 id: timeFlickble23 id: timeFlickble
2424
=== modified file 'ViewHeader.qml'
--- ViewHeader.qml 2014-11-29 09:40:53 +0000
+++ ViewHeader.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
2020
21Item{21Item{
22 id: header22 id: header
@@ -26,7 +26,7 @@
26 property int month;26 property int month;
27 property int year;27 property int year;
2828
29 property string monthLabelFontSize: "x-large"29 property string monthLabelFontSize: "large"
30 property string yearLabelFontSize: "large"30 property string yearLabelFontSize: "large"
3131
32 Label{32 Label{
3333
=== modified file 'WeekView.qml'
--- WeekView.qml 2015-10-28 02:12:50 +0000
+++ WeekView.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import "dateExt.js" as DateExt21import "dateExt.js" as DateExt
22import "ViewType.js" as ViewType22import "ViewType.js" as ViewType
2323
@@ -50,7 +50,6 @@
50 head {50 head {
51 actions: [51 actions: [
52 calendarTodayAction,52 calendarTodayAction,
53 commonHeaderActions.newEventAction,
54 commonHeaderActions.showCalendarAction,53 commonHeaderActions.showCalendarAction,
55 commonHeaderActions.reloadAction,54 commonHeaderActions.reloadAction,
56 commonHeaderActions.syncCalendarAction,55 commonHeaderActions.syncCalendarAction,
@@ -60,7 +59,7 @@
60 contents: Label {59 contents: Label {
61 id:monthYear60 id:monthYear
62 objectName:"monthYearLabel"61 objectName:"monthYearLabel"
63 fontSize: "x-large"62 fontSize: "large"
64 text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))63 text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))
65 font.capitalization: Font.Capitalize64 font.capitalization: Font.Capitalize
66 }65 }
6766
=== modified file 'YearView.qml'
--- YearView.qml 2015-11-23 07:15:20 +0000
+++ YearView.qml 2016-01-29 09:35:25 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22import "dateExt.js" as DateExt22import "dateExt.js" as DateExt
23Page {23Page {
@@ -48,7 +48,6 @@
48 head {48 head {
49 actions: [49 actions: [
50 calendarTodayAction,50 calendarTodayAction,
51 commonHeaderActions.newEventAction,
52 commonHeaderActions.showCalendarAction,51 commonHeaderActions.showCalendarAction,
53 commonHeaderActions.reloadAction,52 commonHeaderActions.reloadAction,
54 commonHeaderActions.syncCalendarAction,53 commonHeaderActions.syncCalendarAction,
@@ -57,7 +56,7 @@
57 contents: Label {56 contents: Label {
58 id:year57 id:year
59 objectName:"yearLabel"58 objectName:"yearLabel"
60 fontSize: "x-large"59 fontSize: "large"
61 text: i18n.tr("Year %1").arg(currentYear)60 text: i18n.tr("Year %1").arg(currentYear)
62 }61 }
63 }62 }
6463
=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml 2015-11-23 07:15:20 +0000
+++ YearViewDelegate.qml 2016-01-29 09:35:25 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.0
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
33
4GridView{4GridView{
5 id: yearView5 id: yearView
66
=== modified file 'calendar.qml'
--- calendar.qml 2015-11-23 07:15:20 +0000
+++ calendar.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import QtOrganizer 5.021import QtOrganizer 5.0
22import Qt.labs.settings 1.022import Qt.labs.settings 1.0
@@ -27,8 +27,6 @@
2727
28 property bool displayWeekNumber: false;28 property bool displayWeekNumber: false;
2929
30 useDeprecatedToolbar: false
31
32 // Work-around until this branch lands:30 // Work-around until this branch lands:
33 // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/21249631 // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
34 //property bool windowActive: typeof window != 'undefined'32 //property bool windowActive: typeof window != 'undefined'
3533
=== modified file 'calendarTests.qml'
--- calendarTests.qml 2014-09-20 10:45:35 +0000
+++ calendarTests.qml 2016-01-29 09:35:25 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
2020
21MainView {21MainView {
22 width: units.gu(20)22 width: units.gu(20)
2323
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2015-11-23 07:15:20 +0000
+++ po/com.ubuntu.calendar.pot 2016-01-29 09:35:25 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-11-23 15:14+0800\n"11"POT-Creation-Date: 2015-11-01 10:45+0900\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"
@@ -19,25 +19,25 @@
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:3921#: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:39
22#: ../WeekView.qml:44 ../YearView.qml:4222#: ../WeekView.qml:44 ../YearView.qml:36
23msgid "Today"23msgid "Today"
24msgstr ""24msgstr ""
2525
26#: ../AgendaView.qml:9326#: ../AgendaView.qml:92
27msgid "No upcoming events"27msgid "No upcoming events"
28msgstr ""28msgstr ""
2929
30#: ../AgendaView.qml:9630#: ../AgendaView.qml:95
31msgid "You have no calendars enabled"31msgid "You have no calendars enabled"
32msgstr ""32msgstr ""
3333
34#: ../AgendaView.qml:10634#: ../AgendaView.qml:105
35msgid "Enable calendars"35msgid "Enable calendars"
36msgstr ""36msgstr ""
3737
38#. TRANSLATORS: the first argument (%1) refers to a start time for an event,38#. TRANSLATORS: the first argument (%1) refers to a start time for an event,
39#. while the second one (%2) refers to the end time39#. while the second one (%2) refers to the end time
40#: ../AgendaView.qml:169 ../EventBubble.qml:13340#: ../AgendaView.qml:168 ../EventBubble.qml:133
41#, qt-format41#, qt-format
42msgid "%1 - %2"42msgid "%1 - %2"
43msgstr ""43msgstr ""
@@ -46,34 +46,34 @@
46#. on a given day. "Ev." is short form for "Events".46#. on a given day. "Ev." is short form for "Events".
47#. Please keep the translation of "Ev." to 3 characters only, as the week view47#. Please keep the translation of "Ev." to 3 characters only, as the week view
48#. where it's shown has limited space48#. where it's shown has limited space
49#: ../AllDayEventComponent.qml:12649#: ../AllDayEventComponent.qml:123
50#, qt-format50#, qt-format
51msgid "%1 ev."51msgid "%1 ev."
52msgstr ""52msgstr ""
5353
54#. TRANSLATORS: the argument refers to the number of all day events54#. TRANSLATORS: the argument refers to the number of all day events
55#: ../AllDayEventComponent.qml:13055#: ../AllDayEventComponent.qml:127
56#, qt-format56#, qt-format
57msgid "%1 all day event"57msgid "%1 all day event"
58msgid_plural "%1 all day events"58msgid_plural "%1 all day events"
59msgstr[0] ""59msgstr[0] ""
60msgstr[1] ""60msgstr[1] ""
6161
62#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:6162#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
63msgid "Calendars"63msgid "Calendars"
64msgstr ""64msgstr ""
6565
66#: ../CalendarChoicePopup.qml:37 ../Settings.qml:3266#: ../CalendarChoicePopup.qml:37
67msgid "Back"67msgid "Back"
68msgstr ""68msgstr ""
6969
70#. TRANSLATORS: Please translate this string to 15 characters only.70#. TRANSLATORS: Please translate this string to 15 characters only.
71#. Currently ,there is no way we can increase width of action menu currently.71#. Currently ,there is no way we can increase width of action menu currently.
72#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:3772#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
73msgid "Sync"73msgid "Sync"
74msgstr ""74msgstr ""
7575
76#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:3776#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
77msgid "Syncing"77msgid "Syncing"
78msgstr ""78msgstr ""
7979
@@ -101,7 +101,7 @@
101#. TRANSLATORS: this is a time formatting string,101#. TRANSLATORS: this is a time formatting string,
102#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.102#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
103#. It's used in the header of the month and week views103#. It's used in the header of the month and week views
104#: ../DayView.qml:60 ../MonthView.qml:61 ../WeekView.qml:64104#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
105msgid "MMMM yyyy"105msgid "MMMM yyyy"
106msgstr ""106msgstr ""
107107
@@ -136,7 +136,7 @@
136msgid "Delete"136msgid "Delete"
137msgstr ""137msgstr ""
138138
139#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325139#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324
140msgid "Edit Event"140msgid "Edit Event"
141msgstr ""141msgstr ""
142142
@@ -154,14 +154,10 @@
154msgid "Edit this"154msgid "Edit this"
155msgstr ""155msgstr ""
156156
157#: ../EventActions.qml:51 ../NewEvent.qml:325157#: ../EventActions.qml:50 ../NewEvent.qml:324
158msgid "New Event"158msgid "New Event"
159msgstr ""159msgstr ""
160160
161#: ../EventActions.qml:72 ../Settings.qml:28
162msgid "Settings"
163msgstr ""
164
165#. TRANSLATORS: the first argument (%1) refers to a time for an event,161#. TRANSLATORS: the first argument (%1) refers to a time for an event,
166#. while the second one (%2) refers to title of event162#. while the second one (%2) refers to title of event
167#: ../EventBubble.qml:144 ../EventBubble.qml:149163#: ../EventBubble.qml:144 ../EventBubble.qml:149
@@ -169,7 +165,7 @@
169msgid "%1 <b>%2</b>"165msgid "%1 <b>%2</b>"
170msgstr ""166msgstr ""
171167
172#: ../EventDetails.qml:43 ../NewEvent.qml:436168#: ../EventDetails.qml:43 ../NewEvent.qml:435
173msgid "Event Details"169msgid "Event Details"
174msgstr ""170msgstr ""
175171
@@ -193,11 +189,11 @@
193msgid "Edit"189msgid "Edit"
194msgstr ""190msgstr ""
195191
196#: ../EventDetails.qml:354 ../NewEvent.qml:538192#: ../EventDetails.qml:354 ../NewEvent.qml:537
197msgid "Guests"193msgid "Guests"
198msgstr ""194msgstr ""
199195
200#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:635196#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:634
201msgid "Reminder"197msgid "Reminder"
202msgstr ""198msgstr ""
203199
@@ -220,7 +216,7 @@
220#. TRANSLATORS: this refers to how often a recurrent event repeats216#. TRANSLATORS: this refers to how often a recurrent event repeats
221#. and it is shown as the header of the option selector to choose217#. and it is shown as the header of the option selector to choose
222#. its repetition218#. its repetition
223#: ../EventRepetition.qml:242 ../NewEvent.qml:619219#: ../EventRepetition.qml:242 ../NewEvent.qml:618
224msgid "Repeats"220msgid "Repeats"
225msgstr ""221msgstr ""
226222
@@ -263,10 +259,6 @@
263msgid "After Date"259msgid "After Date"
264msgstr ""260msgstr ""
265261
266#: ../MonthComponent.qml:260
267msgid "Wk"
268msgstr ""
269
270#: ../NewEvent.qml:84262#: ../NewEvent.qml:84
271msgid "Save"263msgid "Save"
272msgstr ""264msgstr ""
@@ -275,43 +267,43 @@
275msgid "End time can't be before start time"267msgid "End time can't be before start time"
276msgstr ""268msgstr ""
277269
278#: ../NewEvent.qml:335270#: ../NewEvent.qml:334
279msgid "Error"271msgid "Error"
280msgstr ""272msgstr ""
281273
282#: ../NewEvent.qml:337274#: ../NewEvent.qml:336
283msgid "OK"275msgid "OK"
284msgstr ""276msgstr ""
285277
286#: ../NewEvent.qml:390278#: ../NewEvent.qml:389
287msgid "From"279msgid "From"
288msgstr ""280msgstr ""
289281
290#: ../NewEvent.qml:403282#: ../NewEvent.qml:402
291msgid "To"283msgid "To"
292msgstr ""284msgstr ""
293285
294#: ../NewEvent.qml:420286#: ../NewEvent.qml:419
295msgid "All day event"287msgid "All day event"
296msgstr ""288msgstr ""
297289
298#: ../NewEvent.qml:449290#: ../NewEvent.qml:448
299msgid "Event Name"291msgid "Event Name"
300msgstr ""292msgstr ""
301293
302#: ../NewEvent.qml:467294#: ../NewEvent.qml:466
303msgid "Description"295msgid "Description"
304msgstr ""296msgstr ""
305297
306#: ../NewEvent.qml:485298#: ../NewEvent.qml:484
307msgid "Location"299msgid "Location"
308msgstr ""300msgstr ""
309301
310#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1302#: ../NewEvent.qml:499 com.ubuntu.calendar_calendar.desktop.in.in.h:1
311msgid "Calendar"303msgid "Calendar"
312msgstr ""304msgstr ""
313305
314#: ../NewEvent.qml:542306#: ../NewEvent.qml:541
315msgid "Add Guest"307msgid "Add Guest"
316msgstr ""308msgstr ""
317309
@@ -398,10 +390,6 @@
398msgid "2 weeks"390msgid "2 weeks"
399msgstr ""391msgstr ""
400392
401#: ../Settings.qml:60
402msgid "Show week numbers"
403msgstr ""
404
405#: ../TimeLineBase.qml:73393#: ../TimeLineBase.qml:73
406msgid "Untitled"394msgid "Untitled"
407msgstr ""395msgstr ""
@@ -416,35 +404,35 @@
416msgid "All Day"404msgid "All Day"
417msgstr ""405msgstr ""
418406
419#: ../YearView.qml:61407#: ../YearView.qml:54
420#, qt-format408#, qt-format
421msgid "Year %1"409msgid "Year %1"
422msgstr ""410msgstr ""
423411
424#: ../calendar.qml:47412#: ../calendar.qml:45
425msgid ""413msgid ""
426"Calendar app accept four arguments: --starttime, --endtime, --newevent and --"414"Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
427"eventid. They will be managed by system. See the source for a full comment "415"eventid. They will be managed by system. See the source for a full comment "
428"about them"416"about them"
429msgstr ""417msgstr ""
430418
431#: ../calendar.qml:455419#: ../calendar.qml:354
432msgid "Year"420msgid "Year"
433msgstr ""421msgstr ""
434422
435#: ../calendar.qml:462423#: ../calendar.qml:388
436msgid "Month"424msgid "Month"
437msgstr ""425msgstr ""
438426
439#: ../calendar.qml:469427#: ../calendar.qml:421
440msgid "Week"428msgid "Week"
441msgstr ""429msgstr ""
442430
443#: ../calendar.qml:476431#: ../calendar.qml:459
444msgid "Day"432msgid "Day"
445msgstr ""433msgstr ""
446434
447#: ../calendar.qml:483435#: ../calendar.qml:491
448msgid "Agenda"436msgid "Agenda"
449msgstr ""437msgstr ""
450438

Subscribers

People subscribed via source and target branches

to status/vote changes: