Michael Zanetti has proposed merging lp:~mzanetti/reminders-app/uitk-1.3 into lp:reminders-app.
Commit message: update to Ubuntu.Components 1.3 this allows us to use uitk's TextArea and finally enable copy/paste Requested reviews: Ubuntu Reminders app developers (reminders-app-dev) Related bugs: Bug #1392276 in Ubuntu Notes app: "TextArea does not export TextEdit's textDocument property" https://bugs.launchpad.net/reminders-app/+bug/1392276 For more details, see: https://code.launchpad.net/~mzanetti/reminders-app/uitk-1.3/+merge/265886 -- Your team Ubuntu Reminders app developers is requested to review the proposed merge of lp:~mzanetti/reminders-app/uitk-1.3 into lp:reminders-app.
=== modified file 'manifest.json.in' --- manifest.json.in 2015-07-20 20:47:01 +0000 +++ manifest.json.in 2015-07-25 01:54:44 +0000 @@ -1,6 +1,6 @@ { "description": "Ubuntu Notes app, powered by Evernote", - "framework": "ubuntu-sdk-14.10", + "framework": "ubuntu-sdk-15.04", "architecture": "@CLICK_ARCH@", "hooks": { "reminders": { === modified file 'reminders.apparmor' --- reminders.apparmor 2015-02-16 21:57:16 +0000 +++ reminders.apparmor 2015-07-25 01:54:44 +0000 @@ -10,5 +10,5 @@ "connectivity", "content_exchange_source" ], - "policy_version": 1.2 + "policy_version": 1.3 } \ No newline at end of file === modified file 'src/app/qml/components/BouncingProgressBar.qml' --- src/app/qml/components/BouncingProgressBar.qml 2014-10-07 18:03:48 +0000 +++ src/app/qml/components/BouncingProgressBar.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 Item { height: units.dp(3) === modified file 'src/app/qml/components/ConflictDelegate.qml' --- src/app/qml/components/ConflictDelegate.qml 2015-03-30 19:00:04 +0000 +++ src/app/qml/components/ConflictDelegate.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.2 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Evernote 0.1 ColumnLayout { === modified file 'src/app/qml/components/EditTagsDialog.qml' --- src/app/qml/components/EditTagsDialog.qml 2015-06-16 23:43:54 +0000 +++ src/app/qml/components/EditTagsDialog.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 import Ubuntu.Components.ListItems 1.0 import Evernote 0.1 === modified file 'src/app/qml/components/Header.qml' --- src/app/qml/components/Header.qml 2015-06-22 08:07:07 +0000 +++ src/app/qml/components/Header.qml 2015-07-25 01:54:44 +0000 @@ -1,6 +1,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Themes.Ambiance 1.1 import Evernote 0.1 === modified file 'src/app/qml/components/ListItemWithActions.qml' --- src/app/qml/components/ListItemWithActions.qml 2015-03-31 14:28:05 +0000 +++ src/app/qml/components/ListItemWithActions.qml 2015-07-25 01:54:44 +0000 @@ -16,7 +16,7 @@ import QtQuick 2.3 import QtFeedback 5.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 as ListItem Item { === modified file 'src/app/qml/components/ListItemWithActionsCheckBox.qml' --- src/app/qml/components/ListItemWithActionsCheckBox.qml 2015-03-31 12:35:28 +0000 +++ src/app/qml/components/ListItemWithActionsCheckBox.qml 2015-07-25 01:54:44 +0000 @@ -15,7 +15,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import "../Theme" AbstractButton { === modified file 'src/app/qml/components/NotebooksDelegate.qml' --- src/app/qml/components/NotebooksDelegate.qml 2015-06-11 18:55:24 +0000 +++ src/app/qml/components/NotebooksDelegate.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Evernote 0.1 === modified file 'src/app/qml/components/NotesDelegate.qml' --- src/app/qml/components/NotesDelegate.qml 2015-06-14 23:34:29 +0000 +++ src/app/qml/components/NotesDelegate.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Evernote 0.1 === modified file 'src/app/qml/components/PageWithBottomEdge.qml' --- src/app/qml/components/PageWithBottomEdge.qml 2015-02-12 22:04:50 +0000 +++ src/app/qml/components/PageWithBottomEdge.qml 2015-07-25 01:54:44 +0000 @@ -63,7 +63,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Evernote 0.1 Page { === modified file 'src/app/qml/components/PulldownListView.qml' --- src/app/qml/components/PulldownListView.qml 2014-11-06 19:11:35 +0000 +++ src/app/qml/components/PulldownListView.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 ListView { id: root === modified file 'src/app/qml/components/RemindersDelegate.qml' --- src/app/qml/components/RemindersDelegate.qml 2015-03-15 20:00:21 +0000 +++ src/app/qml/components/RemindersDelegate.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Popups 1.0 import Ubuntu.Components.Pickers 1.0 === modified file 'src/app/qml/components/ResolveConflictConfirmationDialog.qml' --- src/app/qml/components/ResolveConflictConfirmationDialog.qml 2015-03-15 20:00:21 +0000 +++ src/app/qml/components/ResolveConflictConfirmationDialog.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.2 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 Dialog { === modified file 'src/app/qml/components/RtfButton.qml' --- src/app/qml/components/RtfButton.qml 2015-04-27 17:24:33 +0000 +++ src/app/qml/components/RtfButton.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 Item { id: root === modified file 'src/app/qml/components/SortingDialog.qml' --- src/app/qml/components/SortingDialog.qml 2015-03-17 23:32:45 +0000 +++ src/app/qml/components/SortingDialog.qml 2015-07-25 01:54:44 +0000 @@ -1,5 +1,5 @@ import QtQuick 2.2 -import Ubuntu.Components 1.0 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 import Ubuntu.Components.ListItems 1.0 import reminders 1.0 === modified file 'src/app/qml/components/StatusBar.qml' --- src/app/qml/components/StatusBar.qml 2015-06-14 23:34:29 +0000 +++ src/app/qml/components/StatusBar.qml 2015-07-25 01:54:44 +0000 @@ -1,6 +1,6 @@ import QtQuick 2.3 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Evernote 0.1 Rectangle { === modified file 'src/app/qml/components/TagsDelegate.qml' --- src/app/qml/components/TagsDelegate.qml 2015-06-11 18:55:24 +0000 +++ src/app/qml/components/TagsDelegate.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Evernote 0.1 === modified file 'src/app/qml/components/ToolbarSpacer.qml' --- src/app/qml/components/ToolbarSpacer.qml 2014-09-23 12:39:27 +0000 +++ src/app/qml/components/ToolbarSpacer.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 Item { === modified file 'src/app/qml/reminders.qml' --- src/app/qml/reminders.qml 2015-06-22 10:53:02 +0000 +++ src/app/qml/reminders.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Connectivity 1.0 @@ -33,20 +33,9 @@ MainView { id: root - // objectName for functional testing purposes (autopilot-qt5) objectName: "mainView" - - // Note! applicationName needs to match the "name" field of the click manifest applicationName: "com.ubuntu.reminders" - useDeprecatedToolbar: false - - /* - This property enables the application to change orientation - when the device is rotated. The default is false. - */ - automaticOrientation: true - property bool narrowMode: root.width < units.gu(80) property var uri: undefined === modified file 'src/app/qml/ui/AccountSelectorPage.qml' --- src/app/qml/ui/AccountSelectorPage.qml 2015-05-27 22:45:53 +0000 +++ src/app/qml/ui/AccountSelectorPage.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.OnlineAccounts 0.1 import Ubuntu.OnlineAccounts.Client 0.1 === modified file 'src/app/qml/ui/EditNotePage.qml' --- src/app/qml/ui/EditNotePage.qml 2015-03-16 00:44:20 +0000 +++ src/app/qml/ui/EditNotePage.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Evernote 0.1 import "../components" @@ -28,9 +28,10 @@ signal exitEditMode(var note) - tools: ToolbarItems { + head { + visible: false locked: true - opened: false + backAction: Action {visible: false} } EditNoteView { === modified file 'src/app/qml/ui/EditNoteView.qml' --- src/app/qml/ui/EditNoteView.qml 2015-06-21 16:51:58 +0000 +++ src/app/qml/ui/EditNoteView.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Content 0.1 @@ -143,18 +143,21 @@ } } - TextEdit { + TextArea { id: noteTextArea width: flick.width - height: Math.max(flick.height - header.height, paintedHeight) +// height: Math.max(flick.height - header.height, paintedHeight + units.gu(2)) + autoSize: true + maximumLineCount: 0 focus: true wrapMode: TextEdit.Wrap textFormat: TextEdit.RichText text: root.note ? root.note.richTextContent : "" onCursorRectangleChanged: flick.ensureVisible(cursorRectangle) - selectByMouse: toolbox.charFormatExpanded - textMargin: units.gu(1) - selectionColor: UbuntuColors.blue + + style: TextAreaStyle { + background: null + } property int lastCursorPos: -1 onCursorPositionChanged: { === modified file 'src/app/qml/ui/NoteConflictPage.qml' --- src/app/qml/ui/NoteConflictPage.qml 2015-03-15 20:00:21 +0000 +++ src/app/qml/ui/NoteConflictPage.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Evernote 0.1 import "../components" === modified file 'src/app/qml/ui/NoteConflictView.qml' --- src/app/qml/ui/NoteConflictView.qml 2015-03-15 20:00:21 +0000 +++ src/app/qml/ui/NoteConflictView.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import QtQuick.Layouts 1.1 import Evernote 0.1 === modified file 'src/app/qml/ui/NotePage.qml' --- src/app/qml/ui/NotePage.qml 2015-06-17 21:22:25 +0000 +++ src/app/qml/ui/NotePage.qml 2015-07-25 01:54:44 +0000 @@ -17,19 +17,23 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Evernote 0.1 import "../components" Page { id: root - title: noteView.title property alias note: noteView.note property bool readOnly: false + head { + visible: false + locked: true + backAction: Action {visible: false} + } + signal editNote(var note) - NoteView { id: noteView anchors.fill: parent === modified file 'src/app/qml/ui/NoteView.qml' --- src/app/qml/ui/NoteView.qml 2015-06-21 16:56:53 +0000 +++ src/app/qml/ui/NoteView.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Popups 1.0 import com.canonical.Oxide 1.5 === modified file 'src/app/qml/ui/NotebooksPage.qml' --- src/app/qml/ui/NotebooksPage.qml 2015-03-15 20:00:21 +0000 +++ src/app/qml/ui/NotebooksPage.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Popups 1.0 import Evernote 0.1 @@ -38,27 +38,24 @@ } } - tools: ToolbarItems { - ToolbarButton { - action: Action { + head { + actions: [ + Action { objectName: "addNotebookButton" text: i18n.tr("Add notebook") iconName: "add" onTriggered: { contentColumn.newNotebook = true; } - } - } - - ToolbarButton { - action: Action { + }, + Action { text: i18n.tr("Search") iconName: "search" onTriggered: { root.openSearch(); } } - } + ] } Notebooks { === modified file 'src/app/qml/ui/NotesPage.qml' --- src/app/qml/ui/NotesPage.qml 2015-06-14 23:34:29 +0000 +++ src/app/qml/ui/NotesPage.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Popups 1.0 import Evernote 0.1 @@ -56,20 +56,17 @@ signal openSearch() signal editNote(var note) - tools: ToolbarItems { - ToolbarButton { - action: Action { + head { + actions: [ + Action { visible: !narrowMode text: i18n.tr("Add note") iconName: "add" onTriggered: { NotesStore.createNote(i18n.tr("Untitled"), filterNotebookGuid); } - } - } - - ToolbarButton { - action: Action { + }, + Action { iconSource: "../images/sorting.svg" text: i18n.tr("Sorting") onTriggered: { @@ -81,31 +78,23 @@ }) popup.sortOrder = notes.sortOrder; } - } - } - - ToolbarButton { - action: Action { + }, + Action { text: i18n.tr("Search") iconName: "search" onTriggered: { root.openSearch(); } - } - } - - ToolbarButton { - action: Action { + }, + Action { text: i18n.tr("Delete") iconName: "delete" visible: root.selectedNote !== null && !root.readOnly onTriggered: { NotesStore.deleteNote(root.selectedNote.guid); } - } - } - ToolbarButton { - action: Action { + }, + Action { text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder") // TODO: use this instead when the toolkit switches from using the // ubuntu-mobile-icons theme to suru: @@ -118,10 +107,8 @@ root.selectedNote.reminder = !root.selectedNote.reminder NotesStore.saveNote(root.selectedNote.guid) } - } - } - ToolbarButton { - action: Action { + }, + Action { text: i18n.tr("Edit") iconName: "edit" visible: root.selectedNote !== null && !root.readOnly @@ -130,7 +117,7 @@ root.editNote(root.selectedNote) } } - } + ] } Settings { === modified file 'src/app/qml/ui/RemindersPage.qml' --- src/app/qml/ui/RemindersPage.qml 2015-03-30 19:01:49 +0000 +++ src/app/qml/ui/RemindersPage.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Evernote 0.1 import "../components" @@ -30,16 +30,16 @@ signal openSearch(); - tools: ToolbarItems { - ToolbarButton { - action: Action { + head { + actions: [ + Action { text: i18n.tr("Search") iconName: "search" onTriggered: { root.openSearch(); } } - } + ] } Notes { === modified file 'src/app/qml/ui/SearchNotesPage.qml' --- src/app/qml/ui/SearchNotesPage.qml 2015-03-15 20:00:21 +0000 +++ src/app/qml/ui/SearchNotesPage.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Popups 1.0 import Evernote 0.1 === modified file 'src/app/qml/ui/SetReminderPage.qml' --- src/app/qml/ui/SetReminderPage.qml 2015-06-16 23:43:54 +0000 +++ src/app/qml/ui/SetReminderPage.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Evernote 0.1 import "../components" === modified file 'src/app/qml/ui/SetReminderView.qml' --- src/app/qml/ui/SetReminderView.qml 2014-12-08 10:25:48 +0000 +++ src/app/qml/ui/SetReminderView.qml 2015-07-25 01:54:44 +0000 @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.Pickers 1.0 import Evernote 0.1 import "../components" === modified file 'src/app/qml/ui/TagsPage.qml' --- src/app/qml/ui/TagsPage.qml 2015-06-17 19:33:55 +0000 +++ src/app/qml/ui/TagsPage.qml 2015-07-25 01:54:44 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.3 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Popups 1.0 import Evernote 0.1 @@ -46,16 +46,16 @@ } } - tools: ToolbarItems { - ToolbarButton { - action: Action { + head { + actions: [ + Action { text: i18n.tr("Search") iconName: "search" onTriggered: { root.openSearch(); } } - } + ] } Tags {
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp