Fixed bugs discovered while testing

ctriantaf · Sep 11, 2013 · c69a5e8 · c69a5e8
1 parent a24c298
commit c69a5e8
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 82 deletions.
diff --git a/CNotes.desktop b/CNotes.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=CNotes
-Comment=My project description
+Comment=Simple app for taking notes
 Exec=/usr/bin/qmlscene $@ /usr/share/CNotes/CNotes.qml
 Icon=./CNotes.png
 Terminal=false

diff --git a/CNotes.qml b/CNotes.qml
@@ -1,13 +1,11 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import QtMultimedia 5.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Layouts 0.1
 import U1db 1.0 as U1db
 import DirParser 1.0
-import "Storage.js" as Storage
 import "showdown.js" as Showdown
 import "components"
 import "view"
@@ -126,36 +124,6 @@ MainView {
         }
     }
 
-//    function loadNotes() {
-//        allNotes = Storage.fetchNotes('false')
-//        idCount = 0
-//        for (var i = 0; i < allNotes.length; i++) {
-//            var noteId = allNotes[i]
-//            mainView.notes.append({id:noteId, title:Storage.getTitle(noteId), body:Storage.getBody(noteId),
-//                                     category:Storage.getCategory(noteId), tag:Storage.getTags(noteId), archive:'false', view:"main"})
-
-//            if (noteId > idCount)
-//                idCount = noteId
-//        }
-
-//    }
-
-//    function loadArchiveNotes() {
-//        archiveNotes = Storage.fetchNotes('true')
-//        for (var i = 0; i < archiveNotes.length; i++) {
-//            var noteId = archiveNotes[i]
-//            archivesModel.append({id:noteId, title:Storage.getTitle(noteId), body:Storage.getBody(noteId),
-//                                     category:Storage.getCategory(noteId), tag:Storage.getTags(noteId), archive:'true', view:"archive"})
-//        }
-//    }
-
-//    function loadCategories() {
-//        var cat = Storage.fetchAllCategories()
-//        for (var i = 0; i < cat.length; i++) {
-//            categoriesModel.append({categoryName: cat[i]})
-//        }
-//    }
-
     function containTag(t) {
         for (var i = 0; i < tagsModel.count; i++) {
             if (t === tagsModel.get(i).tag) {

diff --git a/U1Backend.qml b/U1Backend.qml
@@ -26,7 +26,7 @@ Item {
         }
     }
 
-    function replaceNote(pos, doc, title, body, category, tag, archive, view) {
+    function replaceNote(pos, doc, title, body, category, tag, archive, view, links) {
         pos = parseInt(pos)
         var values = getValues(doc)
 
@@ -36,6 +36,7 @@ Item {
         values["notes"][pos].category = category
         values["notes"][pos].archive = archive
         values["notes"][pos].view = view
+        values["notes"][pos].links = links
 
         setValues(values, doc)
 

diff --git a/components/ImagesTab.qml b/components/ImagesTab.qml
@@ -61,7 +61,11 @@ Tab {
                     source: location
                 }
 
-                onPressAndHold: PopupUtils.open(imagePopoverComponent)
+                onPressAndHold: {
+                    if (mainView.mode !== "view") {
+                        PopupUtils.open(imagePopoverComponent)
+                    }
+                }
             }
         }
     }
@@ -95,17 +99,7 @@ Tab {
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
-                        if (imageTitle.text.length == 0) {
-                            imageTitle.focus = true
-                            return
-                        }
-
-                        if (!dirParser.dirExists(path)) {
-                            dirParser.createDirectory(path)
-                        }
-
-                        camera.imageCapture.captureToLocation(path + imageTitle.text)
-                        location = '../pictures/' + mainView.id + '/' + imageTitle.text
+                        captureImage()
                     }
                 }
             }
@@ -120,6 +114,11 @@ Tab {
                 placeholderText: i18n.tr("Give title")
             }
 
+            Label {
+                id: messageLabel
+                visible: false
+            }
+
             Row {
                 spacing: units.gu(1)
                 Button {
@@ -143,6 +142,22 @@ Tab {
                     }
                 }
             }
+
+            function captureImage() {
+                if (imageTitle.text.length == 0) {
+                    imageTitle.focus = true
+                    messageLabel.text = i18n.tr("You need to add a title")
+                    messageLabel.visible = true
+                    return
+                }
+
+                if (!dirParser.dirExists(path)) {
+                    dirParser.createDirectory(path)
+                }
+
+                camera.imageCapture.captureToLocation(path + imageTitle.text)
+                location = '../pictures/' + mainView.id + '/' + imageTitle.text
+            }
         }
     }
 
@@ -171,7 +186,7 @@ Tab {
 
                 onClicked: {
                     var loc = imagesView.model.get(imagesView.currentIndex).location
-                    dirParser.remove(loc.substring(1))
+                    dirParser.remove(loc)
                     imagesView.model.remove(imagesView.currentIndex)
                     PopupUtils.close(imagePopover)
                 }

diff --git a/components/LinksTab.qml b/components/LinksTab.qml
@@ -1,9 +1,7 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import "../Storage.js" as Storage
 
 Tab {
     title: i18n.tr("Links")
@@ -67,7 +65,11 @@ Tab {
                     Qt.openUrlExternally(link)
                 }
 
-                onPressAndHold: PopupUtils.open(linkPopoverComponent)
+                onPressAndHold: {
+                    if (mainView.mode !== "view") {
+                        PopupUtils.open(linkPopoverComponent)
+                    }
+                }
             }
         }
     }

diff --git a/components/NoteItem.qml b/components/NoteItem.qml
@@ -1,9 +1,7 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Popups 0.1
-import "../Storage.js" as Storage
 import "../view"
 
 Subtitled {

diff --git a/components/NoteViewRow.qml b/components/NoteViewRow.qml
@@ -1,10 +1,8 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../pages"
 import "../view"
-import "../Storage.js" as Storage
 
 Row {
     id: notesViewRow

diff --git a/pages/CategoriesPage.qml b/pages/CategoriesPage.qml
@@ -1,9 +1,7 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
-import "../Storage.js" as Storage
 import "../images"
 
 Page {

diff --git a/pages/CreateNotePage.qml b/pages/CreateNotePage.qml
@@ -2,8 +2,6 @@ import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
-import QtQuick.LocalStorage 2.0
-import "../Storage.js" as Storage
 import "../components"
 
 Tabs {

diff --git a/pages/EditNotePage.qml b/pages/EditNotePage.qml
@@ -2,9 +2,7 @@ import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
-import QtQuick.LocalStorage 2.0
 import "../Storage.js" as Storage
-import "../components"
 
 Tabs {
     Tab {
@@ -26,12 +24,6 @@ Tabs {
                         iconSource: Qt.resolvedUrl("../images/select.svg")
 
                         onTriggered: {
-                            // TODO fix it!
-//                            Storage.setNote(inputTitleEdit.text, inputBodyEdit.text, categoriesSelectorEdit.values[categoriesSelectorEdit.selectedIndex], tag, 'false', 'main')
-//                            mainView.notes.get(mainView.position).title = inputTitleEdit.text
-//                            mainView.notes.get(mainView.position).body = inputBodyEdit.text
-//                            mainView.notes.get(mainView.position).category = categoriesSelectorEdit.values[categoriesSelectorEdit.selectedIndex]
-//                            mainView.notes.get(mainView.position).tag = tag
 
                             var doc
                             var archive
@@ -46,20 +38,27 @@ Tabs {
 
                             mainView.backend.replaceNote(mainView.id, doc, inputTitleEdit.text, inputBodyEdit.text,
                                                          categoriesSelectorEdit.values[categoriesSelectorEdit.selectedIndex],
-                                                         tag, archive, 'main')
-
-//                            mainView.tag = tag
-//                            if (mainView.showArchive) {
-//                                mainView.notesListView.model = mainView.database.getDoc("archive").notes
-//                            }
-//                            else {
-//                                mainView.notesListView.model = mainView.database.getDoc("notes").notes
-//                            }
+                                                         tag, archive, 'main', mainView.getLinksForStorage())
 
                             pageStack.push(mainConditionalPage)
                         }
                     }
                 }
+
+                back: ToolbarButton {
+                    action: Action {
+                        id: back
+                        objectName: "back"
+
+                        iconSource: Qt.resolvedUrl("../images/back.svg")
+                        text: i18n.tr("Back")
+
+                        onTriggered: {
+                            mainView.mode = "view"
+                            pageStack.pop()
+                        }
+                    }
+                }
             }
 
             Flickable {

diff --git a/pages/MainPage.qml b/pages/MainPage.qml
@@ -1,11 +1,8 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Layouts 0.1
-import "../Storage.js" as Storage
 import "../components"
 import "../view"
-//import "U1Backend.qml" as U1Backend
 
 Page {
 

diff --git a/view/NoteView.qml b/view/NoteView.qml
@@ -1,9 +1,7 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Layouts 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import "../Storage.js" as Storage
 import "../components"
 import "../view"
 import "../pages"
@@ -45,6 +43,7 @@ Tabs {
                         text: i18n.tr("Edit")
 
                         onTriggered: {
+                            mainView.mode = "edit"
                             pageStack.push(Qt.resolvedUrl("../pages/EditNotePage.qml"))
                         }
                     }

diff --git a/view/NotesListView.qml b/view/NotesListView.qml
@@ -1,10 +1,8 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
 import DirParser 1.0
-import "../Storage.js" as Storage
 import "../components"
 import "../pages"