Merge lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi into lp:ubuntu-calendar-app

[Kunal Parmar]

Keyboard navigation implemented

Keyboard navigation implemented
Tab navigation implemented, (CTRL + TAB) to switch
In Year, Day, Week, Month View -> Left/Right arrow to go to next or previous item
In Year, Day, Week, Month View -> Up/(Down| Space) to scroll up or down
In Details View - Escape to go back, CTRL + E to Edit
In Add Event - Escape to go back

[lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi]

186. By Kunal Parmar on 2014-01-25

Edit event using key resolved

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

PASSED: Continuous integration, rev:186
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/257/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/800
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/257
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/257
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/91

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

There seems to be an odd skip in the year view. It goes January -> March then leaps to September when you press down arrow.

Also, can we add CTRL+SHIFT+TAB to go backwards to match CTRL+TAB going forwards in tabs?

[lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi]

187. By Kunal Parmar on 2014-01-30

YearView jump resolved and backtab implemented

188. By Kunal Parmar on 2014-01-30

Merge from trunk

[Kunal Parmar (pkunal-parmar)]

> There seems to be an odd skip in the year view. It goes January -> March then
> leaps to September when you press down arrow.
>
> Also, can we add CTRL+SHIFT+TAB to go backwards to match CTRL+TAB going
> forwards in tabs?

This two things I addressed, please check again if you find something missing

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

PASSED: Continuous integration, rev:188
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/264/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/865
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/264
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/264
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/98

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

review: Approve (continuous-integration)

[ybon (yohanboniface)]

So, I've set up my env, and been able to test.
Every binding anounced is working for me (including Ctrl-Shift-TAB) :)

One question I can't answer myself: til wich point we want to have key bindings? For example, does Ctrl-S for save when in edit view, Ctrl-N for New from everywhere (unless edit view) make sense? Return for saving when in a textitem? Echap to close a TimePicker?

[Kunal Parmar (pkunal-parmar)]

> So, I've set up my env, and been able to test.
> Every binding anounced is working for me (including Ctrl-Shift-TAB) :)
>
> One question I can't answer myself: til wich point we want to have key
> bindings? For example, does Ctrl-S for save when in edit view, Ctrl-N for New
> from everywhere (unless edit view) make sense? Return for saving when in a
> textitem? Echap to close a TimePicker?

In this MR I have not addressed keyboard/Mouse handling required for NewEvent.qml component,
we need to consider Tab key and shortcuts you mentioned.
We also need to make sure key and mouse is properly handled in DatePicker/TimePicker and OptionSelectors.

I think its better to handle it in another MR, once we have Date/Time picker available and integrated.

[lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi]

189. By Kunal Parmar on 2014-02-27

Merge from trunk

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

FAILED: Continuous integration, rev:189
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/297/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1530/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/297/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/297/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/131/console

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi]

190. By Kunal Parmar on 2014-02-27

Merge from trunk

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

PASSED: Continuous integration, rev:190
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/298/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1531
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/298
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/298
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/132

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

review: Approve (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi]

191. By Kunal Parmar on 2014-03-29

Merge from trunk

192. By Kunal Parmar on 2014-03-29

Merge issue resolved

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

PASSED: Continuous integration, rev:192
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/349/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1916
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/349
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/349
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/183

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

+1

Looks okay for me.

[Roman Shchekin (mrqtros)]

This line looks strange:
Keys.forwardTo: [yearView,monthView,weekView,dayView,pageStack.currentPage,tabPage]
because of using "pageStack.currentPage". Is it necessary?

[Kunal Parmar (pkunal-parmar)]

> This line looks strange:
> Keys.forwardTo:
> [yearView,monthView,weekView,dayView,pageStack.currentPage,tabPage]
> because of using "pageStack.currentPage". Is it necessary?

I agree, that should be enought, I will change

[Mihir Soni (mihirsoni)]

Works great , i just tested it.
Once you push last changes will make status approved for continuous integration.

Thank you.

review: Approve

[Mihir Soni (mihirsoni)]

> > This line looks strange:
> > Keys.forwardTo:
> > [yearView,monthView,weekView,dayView,pageStack.currentPage,tabPage]
> > because of using "pageStack.currentPage". Is it necessary?
>
> I agree, that should be enought, I will change

Could you please push this small change , then we can merge this MR.

[lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi]

193. By Kunal Parmar on 2014-04-05

Merge from Trunk

[Kunal Parmar (pkunal-parmar)]

> > This line looks strange:
> > Keys.forwardTo:
> > [yearView,monthView,weekView,dayView,pageStack.currentPage,tabPage]
> > because of using "pageStack.currentPage". Is it necessary?
>
> I agree, that should be enought, I will change

Somehow if keys are not forwarded to individual views then they are not getting key events.

I am refacroring the cal app and planning to load only one view at a time.
I will handle this properly there. as I need to change this code anyhow that time

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

PASSED: Continuous integration, rev:193
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/375/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1993
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/375
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/375
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/209

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

review: Approve (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/Key_Navi]

194. By Kunal Parmar on 2014-04-08

merge from trunk

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

PASSED: Continuous integration, rev:194
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/377/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2009
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/377
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/377
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/211

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good.

Thanks you Kunal.

review: Approve

=== modified file 'DayView.qml'
--- DayView.qml	2014-03-26 14:39:17 +0000
+++ DayView.qml	2014-04-08 08:59:31 +0000
@@ -11,6 +11,8 @@
     property var currentDay: new Date()
     property bool isCurrentPage: false
 
+    Keys.forwardTo: [dayViewPath]
+
     Column {
         id: column
         anchors.top: parent.top
 
=== modified file 'EventDetails.qml'
--- EventDetails.qml	2014-04-05 06:31:50 +0000
+++ EventDetails.qml	2014-04-08 08:59:31 +0000
@@ -95,8 +95,17 @@
         }
     }
 
+    Keys.onEscapePressed: {
+        pageStack.pop();
+    }
+
+    Keys.onPressed: {
+        if ((event.key === Qt.Key_E) && ( event.modifiers & Qt.ControlModifier)) {
+            pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"event": root.event});
+        }
+    }
+
     tools: ToolbarItems {
-
         ToolbarButton {
             action:Action {
                 text: i18n.tr("Delete");
@@ -214,28 +223,31 @@
                 font.bold: true
             }
             //Guest Entery Model starts
-            ListView {
-                id:contactList
+            Column{
+                id: contactList
                 spacing: units.gu(1)
                 width: parent.width
-                height: units.gu((contactModel.count*4.5)+3)
                 clip: true
-                model: ListModel {
+                ListModel {
                     id: contactModel
                 }
-                delegate: Row{
-                    spacing: units.gu(1)
-                    CheckBox{
-                     checked: participationStatus
-                     enabled: false
-                    }
-                    Label {
-                        text:name
-                        anchors.verticalCenter:  parent.verticalCenter
-                        color: detailColor
+                Repeater{
+                    model: contactModel
+                    delegate: Row{
+                        spacing: units.gu(1)
+                        CheckBox{
+                            checked: participationStatus
+                            enabled: false
+                        }
+                        Label {
+                            text:name
+                            anchors.verticalCenter:  parent.verticalCenter
+                            color: detailColor
+                        }
                     }
                 }
             }
+
             //Guest Entries ends
             ThinDivider{}
             property int recurranceAreaMaxWidth: Math.max( recurrentHeader.headerWidth, reminderHeader.headerWidth) //Dynamic Height
 
=== modified file 'MonthView.qml'
--- MonthView.qml	2014-03-22 03:09:07 +0000
+++ MonthView.qml	2014-04-08 08:59:31 +0000
@@ -11,6 +11,8 @@
 
     signal dateSelected(var date);
 
+    Keys.forwardTo: [monthViewPath]
+
     PathViewBase{
         id: monthViewPath
 
 
=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-04-05 04:49:47 +0000
+++ NewEvent.qml	2014-04-08 08:59:31 +0000
@@ -177,6 +177,10 @@
 
     title: isEdit ? i18n.tr("Edit Event"):i18n.tr("New Event")
 
+    Keys.onEscapePressed: {
+        pageStack.pop();
+    }
+
     tools: ToolbarItems {
         //keeping toolbar always open
         opened: true
 
=== modified file 'PathViewBase.qml'
--- PathViewBase.qml	2013-12-14 02:44:09 +0000
+++ PathViewBase.qml	2014-04-08 08:59:31 +0000
@@ -9,6 +9,9 @@
     signal nextItemHighlighted();
     signal previousItemHighlighted();
 
+    signal scrollUp();
+    signal scrollDown();
+
     preferredHighlightBegin: 0.5
     preferredHighlightEnd: 0.5
 
@@ -31,8 +34,29 @@
         return 1;
     }
 
+    Keys.onLeftPressed:{
+        root.decrementCurrentIndex();
+    }
+
+    Keys.onRightPressed:{
+        root.incrementCurrentIndex();
+    }
+
+    Keys.onSpacePressed: {
+        root.scrollDown();
+    }
+
+    Keys.onDownPressed: {
+        root.scrollDown();
+    }
+
+    Keys.onUpPressed: {
+        root.scrollUp();
+    }
+
     onCurrentIndexChanged: {
         var diff = currentIndex - intern.previousIndex
+        if(diff == 0) return;
 
         if (intern.previousIndex === count - 1 && currentIndex === 0) diff = 1
         if (intern.previousIndex === 0 && currentIndex === count - 1) diff = -1
 
=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-04-05 04:49:47 +0000
+++ TimeLineBaseComponent.qml	2014-04-08 08:59:31 +0000
@@ -15,13 +15,43 @@
 
     property int type: ViewType.ViewTypeWeek
 
+    //visible hour
+    property int scrollHour;
+
     function scrollToCurrentTime() {
         //scroll to current time
         var currentTime = new Date();
         //TODO: if current time is early morning should we show time from 9 am ?
-        var hour = currentTime.getHours();
-
-        timeLineView.contentY = hour * units.gu(10);
+        scrollHour = currentTime.getHours();
+
+        timeLineView.contentY = scrollHour * units.gu(10);
+        if(timeLineView.contentY >= timeLineView.contentHeight - timeLineView.height) {
+            timeLineView.contentY = timeLineView.contentHeight - timeLineView.height
+        }
+    }
+
+    Connections{
+        target: parent
+        onScrollUp:{
+            scrollHour--;
+            if( scrollHour < 0) {
+                scrollHour =0;
+            }
+            scrollToHour();
+        }
+
+        onScrollDown:{
+            scrollHour++;
+            var visibleHour = root.height / units.gu(10);
+            if( scrollHour > (25 -visibleHour)) {
+                scrollHour = 25 - visibleHour;
+            }
+            scrollToHour();
+        }
+    }
+
+    function scrollToHour() {
+        timeLineView.contentY = scrollHour * units.gu(10);
         if(timeLineView.contentY >= timeLineView.contentHeight - timeLineView.height) {
             timeLineView.contentY = timeLineView.contentHeight - timeLineView.height
         }
 
=== modified file 'WeekView.qml'
--- WeekView.qml	2014-04-05 04:57:34 +0000
+++ WeekView.qml	2014-04-08 08:59:31 +0000
@@ -19,6 +19,8 @@
     anchors.topMargin: units.gu(1.5)
     spacing: units.gu(1)
 
+    Keys.forwardTo: [weekViewPath]
+
     ViewHeader{
         id: viewHeader
         month: dayStart.getMonth()
@@ -65,7 +67,6 @@
 
         delegate: TimeLineBaseComponent {
             id: timeLineView
-
             type: ViewType.ViewTypeWeek
 
             width: parent.width
 
=== modified file 'YearView.qml'
--- YearView.qml	2014-04-04 02:14:33 +0000
+++ YearView.qml	2014-04-08 08:59:31 +0000
@@ -25,6 +25,7 @@
         clip: true
         focus: index == root.currentIndex
 
+        property int scrollMonth: 0;
         property bool isCurrentItem: index == root.currentIndex
         property int year: (root.currentYear + root.indexType(index))
 
@@ -39,6 +40,38 @@
         cellHeight: cellWidth * 1.4
 
         model: 12 /* months in a year */
+
+        onYearChanged : {
+            scrollMonth=0;
+            yearView.positionViewAtIndex(scrollMonth,GridView.Beginning);
+        }
+
+        //scroll in case content height changed
+        onHeightChanged: {
+            scrollMonth=0;
+            yearView.positionViewAtIndex(scrollMonth,GridView.Beginning);
+        }
+
+        Connections{
+            target: root
+            onScrollUp:{
+                scrollMonth -= 2;
+                if(scrollMonth < 0) {
+                    scrollMonth = 0;
+                }
+                yearView.positionViewAtIndex(scrollMonth,GridView.Beginning);
+            }
+
+            onScrollDown:{
+                scrollMonth += 2;
+                var visibleMonths = yearView.height / cellHeight;
+                if( scrollMonth >= (11 - visibleMonths)) {
+                    scrollMonth = (11 - visibleMonths);
+                }
+                yearView.positionViewAtIndex(scrollMonth,GridView.Beginning);
+            }
+        }
+
         delegate: Item {
             width: yearView.cellWidth
             height: yearView.cellHeight
 
=== modified file 'calendar.qml'
--- calendar.qml	2014-04-05 06:34:47 +0000
+++ calendar.qml	2014-04-08 08:59:31 +0000
@@ -52,6 +52,8 @@
 
     width: units.gu(100)
     height: units.gu(80)
+    focus: true
+    Keys.forwardTo: [yearView,monthView,weekView,dayView,pageStack.currentPage,tabPage]
 
     headerColor: "#266249"
     backgroundColor: "#478158"
@@ -184,9 +186,7 @@
             // This is for wait that the app is load when newEvent is invoked by argument
             Timer {
                 id: timer
-                interval: 200;
-                running: false;
-                repeat: false
+                interval: 200; running: false; repeat: false
                 onTriggered: {
                     tabPage.newEvent();
                 }
@@ -224,6 +224,28 @@
                 }
             }
 
+            Keys.onTabPressed: {
+                if( event.modifiers & Qt.ControlModifier) {
+                    var currentTab = tabs.selectedTabIndex;
+                    currentTab ++;
+                    if( currentTab >= tabs.tabChildren.length){
+                        currentTab = 0;
+                    }
+                    tabs.selectedTabIndex = currentTab;
+                }
+            }
+
+            Keys.onBacktabPressed: {
+                if( event.modifiers & Qt.ControlModifier) {
+                    var currentTab = tabs.selectedTabIndex;
+                    currentTab --;
+                    if( currentTab < 0){
+                        currentTab = tabs.tabChildren.length -1;
+                    }
+                    tabs.selectedTabIndex = currentTab;
+                }
+            }
+
             Tabs{
                 id: tabs
 
@@ -275,7 +297,6 @@
                             id: weekView
                             anchors.fill: parent
                             isCurrentPage: tabs.selectedTab == weekTab
-
                             onDayStartChanged: {
                                 tabPage.currentDay = dayStart;
                             }