Ubuntu Calendar App

Merge lp:~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure into lp:ubuntu-calendar-app

  1. filesRestructure
  2. Merge into trunk
Proposed by Mihir Soni
Status: Work in progress
Proposed branch: lp:~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure
Merge into: lp:ubuntu-calendar-app
Diff against target: 780 lines (+123/-224)
28 files modified
CMakeLists.txt (+3/-2)
Scroller.qml (+0/-147)
app/CMakeLists.txt (+21/-0)
app/EventActions.qml (+4/-2)
app/calendar.qml (+13/-9)
app/components/CMakeLists.txt (+6/-0)
app/components/DayHeaderBackground.qml (+3/-2)
app/events/CMakeLists.txt (+6/-0)
app/events/NewEvent.qml (+1/-0)
app/images/CMakeLists.txt (+6/-0)
app/timelineComponents/AllDayEventComponent.qml (+6/-6)
app/timelineComponents/CMakeLists.txt (+6/-0)
app/timelineComponents/TimeLineBackground.qml (+1/-0)
app/timelineComponents/TimeLineBase.qml (+5/-3)
app/timelineComponents/TimeLineBaseComponent.qml (+4/-2)
app/timelineComponents/TimeLineHeader.qml (+3/-1)
app/timelineComponents/TimeLineHeaderComponent.qml (+4/-2)
app/views/AgendaView.qml (+4/-2)
app/views/CMakeLists.txt (+6/-0)
app/views/DayView.qml (+6/-2)
app/views/MonthComponent.qml (+4/-4)
app/views/MonthView.qml (+3/-2)
app/views/WeekView.qml (+4/-2)
app/views/YearView.qml (+2/-1)
calendar-app.in (+0/-3)
calendarTests.qml (+0/-30)
tests/autopilot/calendar_app/tests/__init__.py (+1/-1)
tests/unittests/tst_date.qml (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Nekhelesh Ramananthan Needs Fixing
Review via email: mp+234365@code.launchpad.net

Commit message

Restructure of files.

Description of the change

Restructure of files.

1.Please suggest if any changes are required.
2.I have done bifurcation based on my understanding and files that are being used in project.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:443
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/786/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/291/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/344/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:445
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/787/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/292
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/292/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/345

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:446
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/788/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/293/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/293/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/346

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

On an brief look and testing, I feel that we can organize it even more by moving the following into a folder called "app",

- components
- events
- images
- timelineComponents
- views
- js
- calendar.qml
- calendar-app@30.png
- calendar-app@30.png

The following files are not required and can be removed,

- calendarTests.qml
- Scroller.qml
- calendar-app.in

This obviously will require further fixes in the cmake files. But we can get zbenjamin's help on that.

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

FAILED: Continuous integration, rev:447
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/790/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/312/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/348/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:449
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/792/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/319/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/350/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:452
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/932/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1067/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/490/console

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

review: Needs Fixing (continuous-integration)
Reply
lp:~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure updated
453. By Mihir Soni

Moved Recurrence.js to event directory

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

FAILED: Continuous integration, rev:453
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/933/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1069/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/491/console

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

review: Needs Fixing (continuous-integration)
Reply
lp:~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure updated
454. By Mihir Soni

added proper reference to autopilot & added new reference to new files

455. By Mihir Soni

merge with trunk

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

FAILED: Continuous integration, rev:455
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/934/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1072/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/492/console

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

review: Needs Fixing (continuous-integration)
Reply
lp:~ubuntu-calendar-dev/ubuntu-calendar-app/filesRestructure updated
456. By Mihir Soni

reverted pot changes in cmake

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

FAILED: Continuous integration, rev:456
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/936/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1075/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/494/console

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

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

456. By Mihir Soni

reverted pot changes in cmake

455. By Mihir Soni

merge with trunk

454. By Mihir Soni

added proper reference to autopilot & added new reference to new files

453. By Mihir Soni

Moved Recurrence.js to event directory

452. By Mihir Soni

merged mzanetti cmake patch

451. By Mihir Soni

resolved merge issue

450. By Mihir Soni

Merge from trunk

449. By Nekhelesh Ramananthan

reverted manifest file change

448. By Nekhelesh Ramananthan

Some small cmake fixes

447. By Mihir Soni

Moved everything under app directory

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-09-25 21:34:16 +0000
+++ CMakeLists.txt 2014-10-20 19:18:23 +0000
@@ -14,7 +14,7 @@
14set(APPLICATION_FILE "${PROJECT_NAME}_${APP_NAME}.application")14set(APPLICATION_FILE "${PROJECT_NAME}_${APP_NAME}.application")
15set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")15set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
16set(MAIN_QML calendar.qml)16set(MAIN_QML calendar.qml)
17set(ICON_FILE calendar-app@30.png)17set(ICON_FILE "calendar-app@30.png")
18set(AUTOPILOT_DIR calendar_app)18set(AUTOPILOT_DIR calendar_app)
19set(APP_HARDCODE calendar-app)19set(APP_HARDCODE calendar-app)
20set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")20set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
@@ -60,7 +60,7 @@
60file(GLOB RESOURCE_FILES60file(GLOB RESOURCE_FILES
61 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}61 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
62 *.png *.svg)62 *.png *.svg)
63install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})63install(FILES ${SRC_FILES} ${RESOURCE_FILES} "app/${ICON_FILE}" DESTINATION ${DATA_DIR})
6464
65configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)65configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
6666
@@ -81,3 +81,4 @@
81add_subdirectory(click)81add_subdirectory(click)
82add_subdirectory(po)82add_subdirectory(po)
83add_subdirectory(tests)83add_subdirectory(tests)
84add_subdirectory(app)
8485
=== removed file 'Scroller.qml'
--- Scroller.qml 2014-09-20 10:45:35 +0000
+++ Scroller.qml 1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
1/*
2 * Copyright (C) 2013-2014 Canonical Ltd
3 *
4 * This file is part of Ubuntu Calendar App
5 *
6 * Ubuntu Calendar App is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 3 as
8 * published by the Free Software Foundation.
9 *
10 * Ubuntu Calendar App is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18
19import QtQuick 2.3
20import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 1.0 as ListItems
22
23Item {
24 id: root
25 property int min: 0
26 property int max: 10
27 property variant value: model.get(listView.currentIndex) !== undefined ? model.get(listView.currentIndex).modelData : ""
28 property alias model: listView.model
29 property alias labelText: label.text
30 property alias currentIndex: listView.currentIndex
31
32 ListModel {
33 id: defaultModel
34 }
35
36 Component.onCompleted: {
37 var oldIndex = currentIndex
38 for (var i = 0; i < (max+1)-min; ++i) {
39 defaultModel.append({modelData: root.min + i})
40 }
41 listView.highlightMoveDuration = 0
42 currentIndex = oldIndex
43 listView.highlightMoveDuration = 300
44 }
45
46 onMinChanged: {
47 if (defaultModel.get(0) === undefined) {
48 return;
49 }
50
51 var oldMin = defaultModel.get(0).modelData
52
53 while (oldMin > min) {
54 defaultModel.insert(0, {modelData: --oldMin })
55 }
56 while (oldMin < min) {
57 defaultModel.remove(0)
58 ++oldMin
59 }
60 }
61
62 onMaxChanged: {
63 if (defaultModel.get(defaultModel.count - 1) === undefined) {
64 return;
65 }
66
67 var oldMax = defaultModel.get(defaultModel.count - 1).modelData
68
69 while (max < oldMax) {
70 defaultModel.remove(defaultModel.count - 1);
71 --oldMax;
72 }
73 while (max > oldMax) {
74 defaultModel.insert(defaultModel.count, {modelData: ++oldMax})
75 }
76 }
77
78 Item {
79 id: labelRect
80 anchors {
81 left: parent.left
82 top: parent.top
83 right: parent.right
84 }
85 height: units.gu(5)
86
87 Label {
88 id: label
89 anchors.centerIn: parent
90 }
91 ListItems.Divider {
92 anchors {
93 left: parent.left
94 bottom: parent.bottom
95 right: parent.right
96 }
97 }
98 }
99
100 PathView {
101 id: listView
102 model: defaultModel
103 anchors.fill: parent
104 anchors.topMargin: labelRect.height
105 pathItemCount: listView.height / highlightItem.height + 1
106 preferredHighlightBegin: 0.5
107 preferredHighlightEnd: 0.5
108 clip: true
109
110 delegate: ListItems.Standard {
111 width: parent.width
112 highlightWhenPressed: false
113 Label {
114 anchors.centerIn: parent
115 text: modelData
116 }
117 onClicked: listView.currentIndex = index
118 }
119 property int contentHeight: pathItemCount * highlightItem.height
120 path: Path {
121 startX: listView.width / 2; startY: -(listView.contentHeight - listView.height) / 2
122 PathLine { x: listView.width / 2; y: listView.height + (listView.contentHeight - listView.height) / 2 }
123 }
124 highlight: Rectangle {
125 width: parent.width
126 height: units.gu(6)
127 property color baseColor: "#dd4814"
128 gradient: Gradient {
129 GradientStop {
130 position: 0.00;
131 color: Qt.lighter(baseColor, 1.3);
132 }
133 GradientStop {
134 position: 1.0;
135 color: baseColor;
136 }
137 }
138 }
139 ListItems.Divider {
140 anchors {
141 left: parent.left
142 bottom: parent.bottom
143 right: parent.right
144 }
145 }
146 }
147}
1480
=== added directory 'app'
=== added file 'app/CMakeLists.txt'
--- app/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ app/CMakeLists.txt 2014-10-20 19:18:23 +0000
@@ -0,0 +1,21 @@
1if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
2 file(GLOB QML_JS_FILES *.qml *.js *.png)
3 add_custom_target(ubuntu-calendar-apps_QMlFiles ALL SOURCES ${QML_JS_FILES})
4endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
5
6if(CLICK_MODE)
7 set(ICON ${ICON})
8 install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
9endif(CLICK_MODE)
10
11# substitute variables in the desktop file
12
13install(FILES ${CMAKE_BINARY_DIR}/${DESKTOP_FILE}
14 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
15install(FILES ${MAIN_QML} DESTINATION ${MAIN_QML})
16
17add_subdirectory(events)
18add_subdirectory(components)
19add_subdirectory(timelineComponents)
20add_subdirectory(views)
21add_subdirectory(images)
022
=== renamed file 'EventActions.qml' => 'app/EventActions.qml'
--- EventActions.qml 2014-09-19 08:52:19 +0000
+++ app/EventActions.qml 2014-10-20 19:18:23 +0000
@@ -18,6 +18,8 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import "components"
22import "views"
2123
22Item {24Item {
23 id: actionPool25 id: actionPool
@@ -32,7 +34,7 @@
32 iconName: "new-event"34 iconName: "new-event"
33 text: i18n.tr("New Event")35 text: i18n.tr("New Event")
34 onTriggered: {36 onTriggered: {
35 pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"date":tabs.currentDay,"model":eventModel});37 pageStack.push(Qt.resolvedUrl("events/NewEvent.qml"),{"date":tabs.currentDay,"model":eventModel});
36 }38 }
37 }39 }
3840
@@ -41,7 +43,7 @@
41 iconName: "new-event"43 iconName: "new-event"
42 text: i18n.tr("Calendars")44 text: i18n.tr("Calendars")
43 onTriggered: {45 onTriggered: {
44 pageStack.push(Qt.resolvedUrl("CalendarChoicePopup.qml"),{"model":eventModel});46 pageStack.push(Qt.resolvedUrl("views/CalendarChoicePopup.qml"),{"model":eventModel});
45 pageStack.currentPage.collectionUpdated.connect(eventModel.delayedApplyFilter);47 pageStack.currentPage.collectionUpdated.connect(eventModel.delayedApplyFilter);
46 }48 }
47 }49 }
4850
=== renamed file 'calendar-app@30.png' => 'app/calendar-app@30.png'
=== renamed file 'calendar.qml' => 'app/calendar.qml'
--- calendar.qml 2014-09-19 08:11:17 +0000
+++ app/calendar.qml 2014-10-20 19:18:23 +0000
@@ -20,8 +20,11 @@
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import QtOrganizer 5.021import QtOrganizer 5.0
22import Ubuntu.SyncMonitor 0.122import Ubuntu.SyncMonitor 0.1
2323import "components"
24import "dateExt.js" as DateExt24import "views"
25
26import "components/dateExt.js" as DateExt
27
2528
26MainView {29MainView {
27 id: mainView30 id: mainView
@@ -180,7 +183,7 @@
180 eventModel.onItemsFetched.connect( function(id,fetchedItems) {183 eventModel.onItemsFetched.connect( function(id,fetchedItems) {
181 if( requestId === id && fetchedItems.length > 0 ) {184 if( requestId === id && fetchedItems.length > 0 ) {
182 var event = fetchedItems[0];185 var event = fetchedItems[0];
183 pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event,"model": eventModel});186 pageStack.push(Qt.resolvedUrl("../events/EventDetails.qml"),{"event":event,"model": eventModel});
184 }187 }
185 });188 });
186 requestId = eventModel.fetchItems([args.values.eventid]);189 requestId = eventModel.fetchItems([args.values.eventid]);
@@ -223,7 +226,7 @@
223 endDate = new Date(endTime);226 endDate = new Date(endTime);
224 }227 }
225 }228 }
226 //pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"startDate": startDate, "endDate": endDate, //"model":eventModel});229 //pageStack.push(Qt.resolvedUrl("events/NewEvent.qml"),{"startDate": startDate, "endDate": endDate, //"model":eventModel});
227 }230 }
228231
229 // This function calculate the difference between --endtime and --starttime and choose the better view232 // This function calculate the difference between --endtime and --starttime and choose the better view
@@ -296,6 +299,7 @@
296299
297 EventActions {300 EventActions {
298 id: commonHeaderActions301 id: commonHeaderActions
302
299 }303 }
300304
301 Keys.onTabPressed: {305 Keys.onTabPressed: {
@@ -327,7 +331,7 @@
327 page: Loader{331 page: Loader{
328 id: yearViewLoader332 id: yearViewLoader
329 objectName: "yearViewLoader"333 objectName: "yearViewLoader"
330 source: tabs.selectedTab == yearTab ? Qt.resolvedUrl("YearView.qml"):""334 source: tabs.selectedTab == yearTab ? Qt.resolvedUrl("views/YearView.qml"):""
331 onLoaded: {335 onLoaded: {
332 item.currentYear = tabs.currentDay.getFullYear();336 item.currentYear = tabs.currentDay.getFullYear();
333 }337 }
@@ -361,7 +365,7 @@
361 page: Loader{365 page: Loader{
362 id: monthViewLoader366 id: monthViewLoader
363 objectName: "monthViewLoader"367 objectName: "monthViewLoader"
364 source: tabs.selectedTab == monthTab ? Qt.resolvedUrl("MonthView.qml"):""368 source: tabs.selectedTab == monthTab ? Qt.resolvedUrl("views/MonthView.qml"):""
365 onLoaded: {369 onLoaded: {
366 item.currentMonth = tabs.currentDay.midnight();370 item.currentMonth = tabs.currentDay.midnight();
367 }371 }
@@ -389,7 +393,7 @@
389 page: Loader{393 page: Loader{
390 id: weekViewLoader394 id: weekViewLoader
391 objectName: "weekViewLoader"395 objectName: "weekViewLoader"
392 source: tabs.selectedTab == weekTab ? Qt.resolvedUrl("WeekView.qml"):""396 source: tabs.selectedTab == weekTab ? Qt.resolvedUrl("views/WeekView.qml"):""
393 onLoaded: {397 onLoaded: {
394 item.isCurrentPage= Qt.binding(function() { return tabs.selectedTab == weekTab })398 item.isCurrentPage= Qt.binding(function() { return tabs.selectedTab == weekTab })
395 item.dayStart = tabs.currentDay;399 item.dayStart = tabs.currentDay;
@@ -422,7 +426,7 @@
422 page: Loader{426 page: Loader{
423 id: dayViewLoader427 id: dayViewLoader
424 objectName: "dayViewLoader"428 objectName: "dayViewLoader"
425 source: tabs.selectedTab == dayTab ? Qt.resolvedUrl("DayView.qml"):""429 source: tabs.selectedTab == dayTab ? Qt.resolvedUrl("views/DayView.qml"):""
426 onLoaded: {430 onLoaded: {
427 item.isCurrentPage= Qt.binding(function() { return tabs.selectedTab == dayTab })431 item.isCurrentPage= Qt.binding(function() { return tabs.selectedTab == dayTab })
428 item.currentDay = tabs.currentDay;432 item.currentDay = tabs.currentDay;
@@ -450,7 +454,7 @@
450 page: Loader {454 page: Loader {
451 id: agendaViewLoader455 id: agendaViewLoader
452 objectName: "agendaViewLoader"456 objectName: "agendaViewLoader"
453 source: tabs.selectedTab == agendaTab ? Qt.resolvedUrl("AgendaView.qml"):""457 source: tabs.selectedTab == agendaTab ? Qt.resolvedUrl("views/AgendaView.qml"):""
454458
455 onLoaded: {459 onLoaded: {
456 item.currentDay = tabs.currentDay;460 item.currentDay = tabs.currentDay;
457461
=== added directory 'app/components'
=== added file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ app/components/CMakeLists.txt 2014-10-20 19:18:23 +0000
@@ -0,0 +1,6 @@
1file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
2
3# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-calendar-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
5
6install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CALENDAR_APP_DIR}/components)
07
=== renamed file 'ColorPickerDialog.qml' => 'app/components/ColorPickerDialog.qml'
=== renamed file 'DayHeaderBackground.qml' => 'app/components/DayHeaderBackground.qml'
--- DayHeaderBackground.qml 2014-09-20 10:45:35 +0000
+++ app/components/DayHeaderBackground.qml 2014-10-20 19:18:23 +0000
@@ -16,13 +16,14 @@
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 "../images"
1920
20Item {21Item {
21 width: parent.width22 width: parent.width
22 height:parent.height23 height:parent.height
23 BorderImage {24 BorderImage {
24 id: separator25 id: separator
25 source: "PageHeaderBaseDividerLight.png"26 source: "../images/PageHeaderBaseDividerLight.png"
26 width: parent.width;27 width: parent.width;
27 height: parent.height28 height: parent.height
28 }29 }
@@ -33,6 +34,6 @@
33 left: parent.left34 left: parent.left
34 right: parent.right35 right: parent.right
35 }36 }
36 source: "PageHeaderBaseDividerBottom.png"37 source: "../images/PageHeaderBaseDividerBottom.png"
37 }38 }
38}39}
3940
=== renamed file 'EventBubble.qml' => 'app/components/EventBubble.qml'
=== renamed file 'EventListModel.qml' => 'app/components/EventListModel.qml'
=== renamed file 'HeaderDateComponent.qml' => 'app/components/HeaderDateComponent.qml'
=== renamed file 'PathViewBase.qml' => 'app/components/PathViewBase.qml'
=== renamed file 'ViewType.js' => 'app/components/ViewType.js'
=== renamed file 'colorUtils.js' => 'app/components/colorUtils.js'
=== renamed file 'dateExt.js' => 'app/components/dateExt.js'
=== added directory 'app/events'
=== added file 'app/events/CMakeLists.txt'
--- app/events/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ app/events/CMakeLists.txt 2014-10-20 19:18:23 +0000
@@ -0,0 +1,6 @@
1file(GLOB EVENTS_QML_JS_FILES *.qml *.js)
2
3# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-calendar-app_events_QMlFiles ALL SOURCES ${EVENTS_QML_JS_FILES})
5
6install(FILES ${EVENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CALENDAR_APP_DIR}/events)
07
=== renamed file 'ContactChoicePopup.qml' => 'app/events/ContactChoicePopup.qml'
=== renamed file 'Defines.js' => 'app/events/Defines.js'
=== renamed file 'DeleteConfirmationDialog.qml' => 'app/events/DeleteConfirmationDialog.qml'
=== renamed file 'EditEventConfirmationDialog.qml' => 'app/events/EditEventConfirmationDialog.qml'
=== renamed file 'EventDetails.qml' => 'app/events/EventDetails.qml'
=== renamed file 'EventReminder.qml' => 'app/events/EventReminder.qml'
=== renamed file 'EventRepetition.qml' => 'app/events/EventRepetition.qml'
=== renamed file 'EventUtils.qml' => 'app/events/EventUtils.qml'
=== renamed file 'KeyboardRectangle.qml' => 'app/events/KeyboardRectangle.qml'
=== renamed file 'LimitLabelDefines.qml' => 'app/events/LimitLabelDefines.qml'
=== renamed file 'NewEvent.qml' => 'app/events/NewEvent.qml'
--- NewEvent.qml 2014-10-20 15:24:00 +0000
+++ app/events/NewEvent.qml 2014-10-20 19:18:23 +0000
@@ -24,6 +24,7 @@
24import Ubuntu.Components.Themes.Ambiance 1.024import Ubuntu.Components.Themes.Ambiance 1.0
25import Ubuntu.Components.Pickers 1.025import Ubuntu.Components.Pickers 1.0
26import QtOrganizer 5.026import QtOrganizer 5.0
27import "../components"
27import "Defines.js" as Defines28import "Defines.js" as Defines
2829
29Page {30Page {
3031
=== renamed file 'NewEventEntryField.qml' => 'app/events/NewEventEntryField.qml'
=== renamed file 'Recurrence.js' => 'app/events/Recurrence.js'
=== renamed file 'RecurrenceLabelDefines.qml' => 'app/events/RecurrenceLabelDefines.qml'
=== renamed file 'RemindersModel.qml' => 'app/events/RemindersModel.qml'
=== renamed file 'ScrollAnimation.qml' => 'app/events/ScrollAnimation.qml'
=== added directory 'app/images'
=== added file 'app/images/CMakeLists.txt'
--- app/images/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ app/images/CMakeLists.txt 2014-10-20 19:18:23 +0000
@@ -0,0 +1,6 @@
1file(GLOB IMAGES_FILES *.png *.jpg *.svg)
2
3# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-calendar-app_images_QMlFiles ALL SOURCES ${IMAGES_FILES})
5
6install(FILES ${IMAGES_FILES} DESTINATION ${UBUNTU-CALENDAR_APP_DIR}/images)
07
=== renamed file 'PageHeaderBaseDividerBottom@18.png' => 'app/images/PageHeaderBaseDividerBottom@18.png'
=== renamed file 'PageHeaderBaseDividerLight@18.png' => 'app/images/PageHeaderBaseDividerLight@18.png'
=== added directory 'app/timelineComponents'
=== renamed file 'AllDayEventComponent.qml' => 'app/timelineComponents/AllDayEventComponent.qml'
--- AllDayEventComponent.qml 2014-10-20 15:20:21 +0000
+++ app/timelineComponents/AllDayEventComponent.qml 2014-10-20 19:18:23 +0000
@@ -19,8 +19,8 @@
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
2121
22import "dateExt.js" as DateExt22import "../components/dateExt.js" as DateExt
23import "ViewType.js" as ViewType23import "../components/ViewType.js" as ViewType
2424
25Item {25Item {
26 id: root26 id: root
@@ -85,7 +85,7 @@
85 if( allDayButton.events.length > 1 ) {85 if( allDayButton.events.length > 1 ) {
86 PopupUtils.open(popoverComponent, root,{"events": allDayButton.events})86 PopupUtils.open(popoverComponent, root,{"events": allDayButton.events})
87 } else {87 } else {
88 pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":allDayButton.events[0],"model": root.model});88 pageStack.push(Qt.resolvedUrl("../events/EventDetails.qml"),{"event":allDayLabel.events[0],"model": root.model});
89 }89 }
90 }90 }
91 }91 }
@@ -111,8 +111,8 @@
111 text = i18n.tr("%1 ev.").arg(events.length)111 text = i18n.tr("%1 ev.").arg(events.length)
112 } else {112 } else {
113 if( events.length > 1) {113 if( events.length > 1) {
114 // TRANSLATORS: the argument refers to the number of all day events114 // TRANSLATORS: the argument refers to the number of all day events
115 text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)115 text = i18n.tr("%1 all day event", "%1 all day events", events.length).arg(events.length)
116 } else {116 } else {
117 text = events[0].displayLabel;117 text = events[0].displayLabel;
118 }118 }
@@ -155,7 +155,7 @@
155 anchors.fill: parent155 anchors.fill: parent
156 onClicked: {156 onClicked: {
157 popover.hide();157 popover.hide();
158 pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":modelData,"model": root.model});158 pageStack.push(Qt.resolvedUrl("../events/EventDetails.qml"),{"event":modelData,"model": root.model});
159 }159 }
160 }160 }
161 }161 }
162162
=== added file 'app/timelineComponents/CMakeLists.txt'
--- app/timelineComponents/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ app/timelineComponents/CMakeLists.txt 2014-10-20 19:18:23 +0000
@@ -0,0 +1,6 @@
1file(GLOB TIMELINE_COMPONENTS_QML_JS_FILES *.qml *.js)
2
3# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-calendar-app_timeline_components_QMlFiles ALL SOURCES ${TIMELINE_COMPONENTS_QML_JS_FILES})
5
6install(FILES ${TIMELINE_COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CALENDAR_APP_DIR}/timelineComponents)
07
=== renamed file 'EventLayoutHelper.js' => 'app/timelineComponents/EventLayoutHelper.js'
=== renamed file 'TimeLineBackground.qml' => 'app/timelineComponents/TimeLineBackground.qml'
--- TimeLineBackground.qml 2014-10-04 02:19:01 +0000
+++ app/timelineComponents/TimeLineBackground.qml 2014-10-20 19:18:23 +0000
@@ -18,6 +18,7 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import "../components"
2122
22Column {23Column {
23 width: parent.width24 width: parent.width
2425
=== renamed file 'TimeLineBase.qml' => 'app/timelineComponents/TimeLineBase.qml'
--- TimeLineBase.qml 2014-10-03 03:24:29 +0000
+++ app/timelineComponents/TimeLineBase.qml 2014-10-20 19:18:23 +0000
@@ -17,7 +17,9 @@
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
20import "dateExt.js" as DateExt20import "../components"
21import "../components/dateExt.js" as DateExt
22
2123
22Item {24Item {
23 id: bubbleOverLay25 id: bubbleOverLay
@@ -34,7 +36,7 @@
34 var selectedDate = new Date(day);36 var selectedDate = new Date(day);
35 var hour = parseInt(mouseY / hourHeight);37 var hour = parseInt(mouseY / hourHeight);
36 selectedDate.setHours(hour)38 selectedDate.setHours(hour)
37 pageStack.push(Qt.resolvedUrl("NewEvent.qml"), {"date":selectedDate, "model":eventModel});39 pageStack.push(Qt.resolvedUrl("..events/NewEvent.qml"), {"date":selectedDate, "model":eventModel});
38 }40 }
39 }41 }
4042
@@ -54,7 +56,7 @@
54 }56 }
5557
56 function showEventDetails(event) {58 function showEventDetails(event) {
57 pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":model});59 pageStack.push(Qt.resolvedUrl("../events/EventDetails.qml"), {"event":event,"model":model});
58 }60 }
5961
60 WorkerScript {62 WorkerScript {
6163
=== renamed file 'TimeLineBaseComponent.qml' => 'app/timelineComponents/TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml 2014-10-04 02:19:01 +0000
+++ app/timelineComponents/TimeLineBaseComponent.qml 2014-10-20 19:18:23 +0000
@@ -21,8 +21,10 @@
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
23import QtOrganizer 5.023import QtOrganizer 5.0
24import "dateExt.js" as DateExt24import "../components"
25import "ViewType.js" as ViewType25import "../components/dateExt.js" as DateExt
26import "../components/ViewType.js" as ViewType
27
2628
27Item {29Item {
28 id: root30 id: root
2931
=== renamed file 'TimeLineHeader.qml' => 'app/timelineComponents/TimeLineHeader.qml'
--- TimeLineHeader.qml 2014-10-03 04:15:55 +0000
+++ app/timelineComponents/TimeLineHeader.qml 2014-10-20 19:18:23 +0000
@@ -18,7 +18,9 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import "ViewType.js" as ViewType21import "../components"
22import "../components/dateExt.js" as DateExt
23import "../components/ViewType.js" as ViewType
2224
23PathViewBase {25PathViewBase {
24 id: header26 id: header
2527
=== renamed file 'TimeLineHeaderComponent.qml' => 'app/timelineComponents/TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml 2014-10-03 04:15:55 +0000
+++ app/timelineComponents/TimeLineHeaderComponent.qml 2014-10-20 19:18:23 +0000
@@ -18,8 +18,10 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import "dateExt.js" as DateExt21import "../components"
22import "ViewType.js" as ViewType22import "../components/dateExt.js" as DateExt
23import "../components/ViewType.js" as ViewType
24
2325
24Row{26Row{
25 id: header27 id: header
2628
=== renamed file 'TimeSeparator.qml' => 'app/timelineComponents/TimeSeparator.qml'
=== added directory 'app/views'
=== renamed file 'AgendaView.qml' => 'app/views/AgendaView.qml'
--- AgendaView.qml 2014-09-20 14:08:18 +0000
+++ app/views/AgendaView.qml 2014-10-20 19:18:23 +0000
@@ -19,7 +19,9 @@
19import QtQuick 2.319import QtQuick 2.3
20import QtOrganizer 5.020import QtOrganizer 5.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
22import "dateExt.js" as DateExt22import "../components"
23import "../components/dateExt.js" as DateExt
24
2325
24Page{26Page{
25 id: root27 id: root
@@ -278,7 +280,7 @@
278 id: mouseArea280 id: mouseArea
279 anchors.fill: parent281 anchors.fill: parent
280 onClicked: {282 onClicked: {
281 pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":eventListModel});283 pageStack.push(Qt.resolvedUrl("../events/EventDetails.qml"), {"event":event,"model":eventListModel});
282 }284 }
283 }285 }
284 }286 }
285287
=== added file 'app/views/CMakeLists.txt'
--- app/views/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ app/views/CMakeLists.txt 2014-10-20 19:18:23 +0000
@@ -0,0 +1,6 @@
1file(GLOB VIEWS_QML_JS_FILES *.qml *.js)
2
3# make the files visible in the qtcreator tree
4add_custom_target(ubuntu-calendar-app_views_QMlFiles ALL SOURCES ${VIEWS_QML_JS_FILES})
5
6install(FILES ${VIEWS_QML_JS_FILES} DESTINATION ${UBUNTU-CALENDAR_APP_DIR}/views)
07
=== renamed file 'CalendarChoicePopup.qml' => 'app/views/CalendarChoicePopup.qml'
=== renamed file 'DayView.qml' => 'app/views/DayView.qml'
--- DayView.qml 2014-10-20 13:55:14 +0000
+++ app/views/DayView.qml 2014-10-20 19:18:23 +0000
@@ -18,8 +18,12 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import "dateExt.js" as DateExt21import "../timelineComponents"
22import "ViewType.js" as ViewType22import "../components"
23import "../events"
24import "../components/dateExt.js" as DateExt
25import "../components/ViewType.js" as ViewType
26
2327
24Page{28Page{
25 id: dayViewPage29 id: dayViewPage
2630
=== renamed file 'MonthComponent.qml' => 'app/views/MonthComponent.qml'
--- MonthComponent.qml 2014-10-02 13:44:25 +0000
+++ app/views/MonthComponent.qml 2014-10-20 19:18:23 +0000
@@ -17,9 +17,9 @@
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
20import "dateExt.js" as DateExt20import "../components/dateExt.js" as DateExt
21import "colorUtils.js" as Color21import "../components/colorUtils.js" as Color
2222import "../components"
23Item{23Item{
24 id: root24 id: root
25 objectName: "MonthComponent"25 objectName: "MonthComponent"
@@ -254,7 +254,7 @@
254 selectedDate.setMonth(intern.monthStartMonth + 1)254 selectedDate.setMonth(intern.monthStartMonth + 1)
255 selectedDate.setDate(date)255 selectedDate.setDate(date)
256 selectedDate.setMinutes(60, 0, 0)256 selectedDate.setMinutes(60, 0, 0)
257 pageStack.push(Qt.resolvedUrl("NewEvent.qml"), {"date":selectedDate, "model":eventModel});257 pageStack.push(Qt.resolvedUrl("../events/NewEvent.qml"), {"date":selectedDate, "model":eventModel});
258 }258 }
259 onClicked: {259 onClicked: {
260 var selectedDate = new Date(intern.monthStartYear,260 var selectedDate = new Date(intern.monthStartYear,
261261
=== renamed file 'MonthView.qml' => 'app/views/MonthView.qml'
--- MonthView.qml 2014-10-02 13:44:25 +0000
+++ app/views/MonthView.qml 2014-10-20 19:18:23 +0000
@@ -17,8 +17,9 @@
17 */17 */
18import QtQuick 2.318import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
20import "dateExt.js" as DateExt20import "../components"
21import "colorUtils.js" as Color21import "../components/dateExt.js" as DateExt
22import "../components/colorUtils.js" as Color
2223
23Page {24Page {
24 id: monthViewPage25 id: monthViewPage
2526
=== renamed file 'ViewHeader.qml' => 'app/views/ViewHeader.qml'
=== renamed file 'WeekView.qml' => 'app/views/WeekView.qml'
--- WeekView.qml 2014-09-21 09:39:21 +0000
+++ app/views/WeekView.qml 2014-10-20 19:18:23 +0000
@@ -18,8 +18,10 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import "dateExt.js" as DateExt21import "../components"
22import "ViewType.js" as ViewType22import "../timelineComponents"
23import "../components/dateExt.js" as DateExt
24import "../components/ViewType.js" as ViewType
2325
24Page{26Page{
25 id: weekViewPage27 id: weekViewPage
2628
=== renamed file 'YearView.qml' => 'app/views/YearView.qml'
--- YearView.qml 2014-10-02 13:44:25 +0000
+++ app/views/YearView.qml 2014-10-20 19:18:23 +0000
@@ -18,8 +18,9 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import "../components"
2122
22import "dateExt.js" as DateExt23import "../components/dateExt.js" as DateExt
23Page {24Page {
24 id: yearViewPage25 id: yearViewPage
25 objectName: "yearViewPage"26 objectName: "yearViewPage"
2627
=== removed file 'calendar-app.in'
--- calendar-app.in 2014-04-16 17:10:31 +0000
+++ calendar-app.in 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1#!/bin/sh
2export QT_SELECT=qt5
3exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@
40
=== removed file 'calendarTests.qml'
--- calendarTests.qml 2014-09-20 10:45:35 +0000
+++ calendarTests.qml 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
1/*
2 * Copyright (C) 2013-2014 Canonical Ltd
3 *
4 * This file is part of Ubuntu Calendar App
5 *
6 * Ubuntu Calendar App is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 3 as
8 * published by the Free Software Foundation.
9 *
10 * Ubuntu Calendar App is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18import QtQuick 2.3
19import Ubuntu.Components 1.1
20
21MainView {
22 width: units.gu(20)
23 height: units.gu(20)
24 Button {
25 anchors.fill: parent
26 anchors.margins: units.gu(5)
27 text: "Close"
28 onClicked: Qt.quit()
29 }
30}
310
=== added directory 'js'
=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py 2014-09-30 00:38:14 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py 2014-10-20 19:18:23 +0000
@@ -44,7 +44,7 @@
44 """44 """
4545
46 local_location = os.path.dirname(os.path.dirname(os.getcwd()))46 local_location = os.path.dirname(os.path.dirname(os.getcwd()))
47 local_location_qml = os.path.join(local_location, 'calendar.qml')47 local_location_qml = os.path.join(local_location+'/app', 'calendar.qml')
48 installed_location_qml = "/usr/share/calendar-app/calendar.qml"48 installed_location_qml = "/usr/share/calendar-app/calendar.qml"
4949
50 def get_launcher_and_type(self):50 def get_launcher_and_type(self):
5151
=== modified file 'tests/unittests/tst_date.qml'
--- tests/unittests/tst_date.qml 2014-08-18 16:48:54 +0000
+++ tests/unittests/tst_date.qml 2014-10-20 19:18:23 +0000
@@ -17,7 +17,7 @@
17 */17 */
18import QtQuick 2.018import QtQuick 2.0
19import QtTest 1.019import QtTest 1.0
20import "../../dateExt.js" as DATE20import "../../components/dateExt.js" as DATE
2121
22TestCase{22TestCase{
23 name: "Date tests"23 name: "Date tests"

Subscribers

People subscribed via source and target branches

to status/vote changes: