← Back to branch summary

~dpniel/ubuntu-calendar-app/uitk-1.3

« back to all changes in this revision

Viewing changes to TimeLineBaseComponent.qml

  • Committer: Dan Chapman
  • Date: 2016-01-22 09:47:31 UTC
  • Revision ID: dpniel@ubuntu.com-20160122094731-15pzkmfrxn29m6dk
Update Calendar to Ubuntu.Components 1.3

All imports have been changed to reflect newer uitk,
also switched all ListItems to use the new ListItem & ListItemLayouts

Show diffs side-by-side

added added

removed removed

Lines of Context:
TimeLineBaseComponent.qml
16
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
17
 */
18
18
 
19
 
import QtQuick 2.3
 
19
import QtQuick 2.4
20
20
import QtQuick.Layouts 1.1
21
 
import Ubuntu.Components 1.1
 
21
import Ubuntu.Components 1.3
22
22
import Ubuntu.Components.Popups 1.0
23
23
import QtOrganizer 5.0
24
24
 
112
112
    }
113
113
 
114
114
    Timer{
115
 
       interval: 200; running: true; repeat: false
116
 
       onTriggered: {
117
 
           mainModel = modelComponent.createObject();
118
 
           activityLoader.running = Qt.binding( function (){ return mainModel.isLoading;});
119
 
       }
 
115
        interval: 200; running: true; repeat: false
 
116
        onTriggered: {
 
117
            mainModel = modelComponent.createObject();
 
118
            activityLoader.running = Qt.binding( function (){ return mainModel.isLoading;});
 
119
        }
120
120
    }
121
121
 
122
122
    Component {
177
177
                id: timeLineView
178
178
                objectName: "timelineview"
179
179
 
 
180
 
180
181
                height: parent.height
181
182
                width: parent.width - units.gu(6)
182
183
 
242
243
                                objectName: "mouseArea"
243
244
                                anchors.fill: parent
244
245
 
245
 
                                 function modifyEventForDrag(drag) {
 
246
                                function modifyEventForDrag(drag) {
246
247
                                    var event = drag.source.event;
247
248
                                    var diff = event.endDateTime.getTime() - event.startDateTime.getTime();
248
249
 
252
253
                                    event.startDateTime = startDate;
253
254
                                    event.endDateTime = endDate;
254
255
 
255
 
                                     return event;
 
256
                                    return event;
256
257
                                }
257
258
 
258
259
                                onDropped: {