Merge lp:~mzanetti/reminders-app/cleanup-toolbars into lp:reminders-app

[Michael Zanetti]

cleanup and align toolbars.

Search is now always in the same place on every page.
Accounts is moved to be a separate tab

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

PASSED: Continuous integration, rev:358
http://91.189.93.70:8080/job/reminders-app-ci/683/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2179
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/285
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/104

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/683/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Why did you keep the accounts action button in the notebooks page (and related code)?

review: Needs Fixing

[lp:~mzanetti/reminders-app/cleanup-toolbars]

359. By Michael Zanetti on 2015-02-28

drop all account buttons

[Michael Zanetti (mzanetti)]

> Why did you keep the accounts action button in the notebooks page (and related
> code)?

Good catch! Because the Actions in RemindersPage and NotebooksPage were invisible, I missed them. Thanks.

I still would keep the openAccountsPage() in reminders.qml because when there is no account set up, I want to push the AccountsPage to the stack, so the user can't switch to the other tabs.

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

PASSED: Continuous integration, rev:359
http://91.189.93.70:8080/job/reminders-app-ci/688/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2186
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/290
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/109

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/688/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

> I still would keep the openAccountsPage() in reminders.qml because when there
> is no account set up, I want to push the AccountsPage to the stack, so the
> user can't switch to the other tabs.

Makes sense, but then you can drop the showBackButton property. If the AccountsPage is used only when there isn't any account set up, then the backButton is always hide (and you can simply hide it, and simplify the code about the backButton in the AccountPage).

review: Needs Fixing

[lp:~mzanetti/reminders-app/cleanup-toolbars]

360. By Michael Zanetti on 2015-03-01

drop some old code

[Michael Zanetti (mzanetti)]

> > I still would keep the openAccountsPage() in reminders.qml because when
> there
> > is no account set up, I want to push the AccountsPage to the stack, so the
> > user can't switch to the other tabs.
>
> Makes sense, but then you can drop the showBackButton property. If the
> AccountsPage is used only when there isn't any account set up, then the
> backButton is always hide (and you can simply hide it, and simplify the code
> about the backButton in the AccountPage).

Thanks! fixed.

[Riccardo Padovani (rpadovani)]

Now looks perfect, thanks :-)

review: Approve

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2015-03-01 17:30:43 +0000
+++ src/app/qml/reminders.qml	2015-03-01 22:11:53 +0000
@@ -104,7 +104,7 @@
             accountPage.destroy(100)
         }
         var component = Qt.createComponent(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
-        accountPage = component.createObject(root, { accounts: accounts, isChangingAccount: isChangingAccount, unauthorizedAccounts: unauthorizedAccounts });
+        accountPage = component.createObject(root, { accounts: accounts, unauthorizedAccounts: unauthorizedAccounts });
         accountPage.accountSelected.connect(function(username, handle) { accountService.startAuthentication(username, handle); pagestack.pop(); root.accountPage = null });
         pagestack.push(accountPage);
     }
@@ -542,6 +542,18 @@
                     onOpenSearch: root.openSearch();
                 }
             }
+            Tab {
+                title: i18n.tr("Accounts")
+
+                page: AccountSelectorPage {
+                    accounts: accounts
+                    unauthorizedAccounts: true
+                    onAccountSelected: {
+                        accountService.startAuthentication(username, handle)
+                        rootTabs.selectedTabIndex = 0;
+                    }
+                }
+            }
         }
     }
 

=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml	2014-12-09 22:43:00 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml	2015-03-01 22:11:53 +0000
@@ -29,7 +29,6 @@
     title: i18n.tr("Select account")
 
     property alias accounts: optionSelector.model
-    property bool isChangingAccount
     property bool unauthorizedAccounts
 
     signal accountSelected(string username, var handle)
@@ -100,9 +99,6 @@
      }
 
      head.backAction: Action {
-         visible: isChangingAccount
-         iconName: "back"
-         text: i18n.tr("Back")
-         onTriggered: { pagestack.pop(); }
+         visible: false
      }
 }

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2015-02-28 01:43:49 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2015-03-01 22:11:53 +0000
@@ -58,27 +58,6 @@
                 }
             }
         }
-
-        ToolbarButton {
-            action: Action {
-                text: i18n.tr("Refresh")
-                iconName: "reload"
-                onTriggered: {
-                    NotesStore.refreshNotebooks();
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
-                text: i18n.tr("Accounts")
-                iconName: "contacts-app-symbolic"
-                visible: allAccounts.count > 1
-                onTriggered: {
-                    openAccountPage(true);
-                }
-            }
-        }
     }
 
     Notebooks {

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2015-03-01 17:15:48 +0000
+++ src/app/qml/ui/NotesPage.qml	2015-03-01 22:11:53 +0000
@@ -71,16 +71,6 @@
 
         ToolbarButton {
             action: Action {
-                text: i18n.tr("Search")
-                iconName: "search"
-                onTriggered: {
-                    root.openSearch();
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
                 iconSource: "../images/sorting.svg"
                 text: i18n.tr("Sorting")
                 onTriggered: {
@@ -97,10 +87,10 @@
 
         ToolbarButton {
             action: Action {
-                text: i18n.tr("Accounts")
-                iconName: "contacts-app-symbolic"
+                text: i18n.tr("Search")
+                iconName: "search"
                 onTriggered: {
-                    openAccountPage(true);
+                    root.openSearch();
                 }
             }
         }

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2015-03-01 17:30:43 +0000
+++ src/app/qml/ui/RemindersPage.qml	2015-03-01 22:11:53 +0000
@@ -40,17 +40,6 @@
                 }
             }
         }
-
-        ToolbarButton {
-            action: Action {
-                text: i18n.tr("Accounts")
-                iconName: "contacts-app-symbolic"
-                visible: allAccounts.count > 1
-                onTriggered: {
-                    openAccountPage(true);
-                }
-            }
-        }
     }
 
     Notes {

=== modified file 'src/app/qml/ui/TagsPage.qml'
--- src/app/qml/ui/TagsPage.qml	2015-03-01 17:30:43 +0000
+++ src/app/qml/ui/TagsPage.qml	2015-03-01 22:11:53 +0000
@@ -55,28 +55,6 @@
                 }
             }
         }
-
-        ToolbarButton {
-            action: Action {
-                text: i18n.tr("Refresh")
-                iconName: "reload"
-                onTriggered: {
-                    NotesStore.refreshNotes();
-                    tags.refresh();
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
-                text: i18n.tr("Accounts")
-                iconName: "contacts-app-symbolic"
-                visible: accounts.count > 1
-                onTriggered: {
-                    openAccountPage(true);
-                }
-            }
-        }
     }
 
     Tags {