Merge lp:~verzegnassi-stefano/logviewer/logviewer into lp:logviewer

[Michael Zanetti]

Maintenance update (by Stefano Verzegnassi)

* Update to latest UITK components
* Rework build system to allow building with the Ubuntu SDK

By Stefano Verzegnassi
    * Fixed icon path
    * Removed TextArea frame spacing
    * Use latest version of QML components
    * Removed usage of deprecated components (e.g. Ubuntu.Components.ListItems.*)
    * Added .pot template
    * General code refactor. Only 'autoscroll' is currently missing.
    * Text size now uses FontUtils (i.e. does not depend on screen density anymore)
    * Refactored CMake project. Now it can be built with the latest Ubuntu IDE.

[lp:~verzegnassi-stefano/logviewer/logviewer]

12. By Stefano Verzegnassi on 2016-06-20

Restore proper values in the .desktop file

13. By Stefano Verzegnassi on 2016-06-20

No chance to get the informations about the internal flickable of a UITK TextArea.
Revert to the 'old' QML TextEdit, apply some style and re-introduce the autoscroll.

14. By Stefano Verzegnassi on 2016-06-20

Updated .pot

[Victor Tuson Palau (vtuson)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-25 11:10:28 +0000
+++ CMakeLists.txt	2016-06-20 17:01:33 +0000
@@ -1,56 +1,76 @@
 project(logviewer C CXX)
 cmake_minimum_required(VERSION 2.8.9)
 
-set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
+# Do not remove this line, its required for the correct functionality of the Ubuntu-SDK
+set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 find_package(Qt5Core)
 find_package(Qt5Qml)
 find_package(Qt5Quick)
-#find_package(ubuntu-sdk-libs)
+# find_package(ubuntu-sdk-libs)
 
-#automatically create moc files
+# Automatically create moc files
 set(CMAKE_AUTOMOC ON)
 
-# components PATH
+# Components PATH
 execute_process(
     COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
     OUTPUT_VARIABLE ARCH_TRIPLET
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
+
 set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
 
 option(INSTALL_TESTS "Install the tests on make install" on)
 
 set(APP_NAME          logviewer)
-set(LOGVIEWER_DIR     "app")
-set(MAIN_QML          "logviewer.qml")
-set(ICON              "icon.png")
+set(APP_ID            "com.ubuntu.developer.vtuson.logviewer")
+set(LOGVIEWER_DIR     "share/qml/logviewer")
+set(MAIN_QML          "Main.qml")
+set(ICON              "${LOGVIEWER_DIR}/graphics/logviewer.png")
 
-#set install paths
+# Set install paths
 set(CMAKE_INSTALL_PREFIX /)
 set(DATA_DIR /)
 set(DESKTOP_DIR ${DATA_DIR})
-
-set(EXEC "qmlscene $@ ${LOGVIEWER_DIR}/${MAIN_QML}")
-
-install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
-install(FILES "Logviewer.json" ${ICON} DESTINATION ${DATA_DIR})
+set(DESKTOP_FILE_NAME "logviewer.desktop")
+
+set(EXEC "qmlscene %U ${LOGVIEWER_DIR}/${MAIN_QML}")
+
+# This command figures out the target architecture for use in the manifest file
+execute_process(
+  COMMAND dpkg-architecture -qDEB_HOST_ARCH
+  OUTPUT_VARIABLE CLICK_ARCH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
+        DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+install(DIRECTORY "app/graphics" DESTINATION ${LOGVIEWER_DIR})
+install(FILES "logviewer.apparmor" DESTINATION ${DATA_DIR})
 
 add_subdirectory(app)
 add_subdirectory(backend)
+add_subdirectory(po)
 
 add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
                     COMMAND ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
-                    DEPENDS logviewerbackend logviewerbackend-qmldir
-                    WORKING_DIRECTORY ./app)
-
-add_custom_target("check" /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
-                    DEPENDS logviewerbackend logviewerbackend-qmldir
-                    WORKING_DIRECTORY ./app)
-
-add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/logviewer.qml
-                    DEPENDS logviewerbackend logviewerbackend-qmldir
-                    WORKING_DIRECTORY ./app)
+                    DEPENDS Logviewerbackend Logviewerbackend-qmldir
+                    WORKING_DIRECTORY ./app)
+
+add_custom_target("check"
+                    COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/backend/tests/unit -import ${CMAKE_BINARY_DIR}/backend
+                    COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
+                    DEPENDS Logviewerbackend Logviewerbackend-qmldir
+                    WORKING_DIRECTORY ./app)
+
+add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/Main.qml
+                    DEPENDS Logviewerbackend Logviewerbackend-qmldir
+                    WORKING_DIRECTORY ./app)
+
+# No op custom target for all not compiled files, so they show up in the QtCreator project tree
+add_custom_target("logviewer_ClickFiles" ALL SOURCES "logviewer.apparmor" "manifest.json.in")
 

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2014-08-25 11:10:28 +0000
+++ app/CMakeLists.txt	2016-06-20 17:01:33 +0000
@@ -1,13 +1,12 @@
 file(GLOB QML_JS_FILES *.qml *.js)
 
-# make the files visible on qtcreator
+# Make the files visible on qtcreator
 add_custom_target(logviewer_QMlFiles ALL SOURCES ${QML_JS_FILES})
 
-#substitute variables in the desktop file
-set(DESKTOP_FILE "Logviewer.desktop")
-configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
+# Substitute variables in the desktop file
+configure_file(${DESKTOP_FILE_NAME}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME}.in)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DESKTOP_DIR})
 install(FILES ${QML_JS_FILES} DESTINATION ${LOGVIEWER_DIR})
 
 add_subdirectory(ui)

=== renamed file 'app/logviewer.qml' => 'app/Main.qml'
--- app/logviewer.qml	2014-08-25 11:10:28 +0000
+++ app/Main.qml	2016-06-20 17:01:33 +0000
@@ -1,17 +1,14 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import "ui"
-import "./libs/logviewer.js" as LogViewLib
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Qt.labs.settings 1.0
 import Logviewer 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Qt.labs.settings 1.0
-
-
 
 MainView {
+    id: mainView
+
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "mainView"
-    id:mainView
+
     // Note! applicationName needs to match the "name" field of the click manifest
     applicationName: "com.ubuntu.developer.vtuson.logviewer"
 
@@ -20,206 +17,90 @@
      when the device is rotated. The default is false.
     */
     //automaticOrientation: true
+    anchorToKeyboard: true
 
     width: units.gu(100)
     height: units.gu(75)
 
-    useDeprecatedToolbar: false
-    anchorToKeyboard: true
+    Component.onCompleted: {
+        pStack.push(Qt.resolvedUrl("ui/MainPage.qml"))
+    }
 
     Settings { //This will also save the settings as soon as this patch gets merged into the UI Toolkit trunk repo: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1354321
         id: preferences
         property string dir: "/home/phablet/.cache/upstart/"
         property string filter: "*.log"
         property int buffer: 8000
-        property int fontSize: 24
+        property int dpFontSize: 10
         property string username: "Guest"
     }
 
+    ListModel {
+        id:logsList
+        property bool loading: false
+    }
+
+    LogViewer {
+        id:logs
+        logDir: preferences.dir
+        logFilter: preferences.filter
+
+        onLogListChanged: {
+            logsList.loading = true
+
+            //this signal indicates that the directory files where loaded
+            console.log("logs are: " + logs.logList)
+
+            //clear any old list
+            logsList.clear()
+
+            var tmplogs= logs.logList;
+            var alogs = {}
+            alogs = tmplogs.split("\n")
+            var itemtmp= {}
+            for (var logitem in alogs){
+                if(alogs[logitem].trim()!== "") {
+                    itemtmp["iLogPath"] =alogs[logitem]
+                    logsList.append(itemtmp)
+                }
+            }
+
+            logsList.loading = false
+        }
+
+        Component.onCompleted: {
+            logs.loadLogs()
+        }
+    }
+
     PageStack {
         id: pStack
-
-        Component.onCompleted: push(page0)
-
-        PrefPage {
-            id:msettings
-            onCancelChanges: {
-                loadStandardSettings()
-                pStack.pop()
-            }
-            onApplyChanges: {
-                preferences.fontSize=msettings.fontSize
-                preferences.buffer=msettings.bufferSize
-                preferences.dir=msettings.directory
-                logs.logDir=msettings.directory
-                logs.logFilter=msettings.filter
-                preferences.username =msettings.username
-                preferences.filter=msettings.filter
-                pStack.pop()
-                logs.loadLogs()
-            }
-
-
-            Component.onCompleted:loadStandardSettings()
-
-            function loadStandardSettings(){
-                msettings.fontSize=preferences.fontSize
-                msettings.bufferSize=preferences.buffer
-                msettings.directory=preferences.dir
-                msettings.filter=preferences.filter
-                msettings.username=preferences.username
-            }
-        }
-
-        AboutPage {
-            id: aboutPage
-        }
-
-        Page {
-            id: page0
-            title: i18n.tr("Ubuntu Logs")
-            visible: false
-            ListModel {  id:logsList  }
-
-            head.actions: [
-                Action {
-                    text: i18n.tr("Reload")
-                    onTriggered: {
-                        emptyLabel.text = ""
-                        logsList.clear()
-                        logs.loadLogs()
-                    }
-                    iconName: "reload"
-                },
-                Action {
-                    text: i18n.tr("Settings")
-                    onTriggered: pStack.push(msettings)
-                    iconName: "settings"
-                },
-                Action {
-                    text: i18n.tr("About")
-                    onTriggered: pStack.push(aboutPage)
-                    iconName: "info"
-                }
-            ]
-
-            Component{
-                id:logDelegate
-
-                ListItem.Empty {
-                    id:logItemDelegate
-                    property var pageDelegate
-                    Label{
-                        id:labelDelegate
-                        text:iLogPath.slice(iLogPath.lastIndexOf("/")+1,iLogPath.length)
-                        anchors.left: parent.left
-                        anchors.leftMargin: units.gu(2)
-                        anchors.verticalCenter: parent.verticalCenter
-                        fontSize: "large"
-                        elide: Text.ElideLeft
-                        width:logsListView.width -chevron.width -units.gu(4)
-
-                    }
-                    Icon {
-                        id:chevron
-                        width: units.gu(2)
-                        anchors.right: parent.right
-                        anchors.rightMargin: units.gu(2)
-                        height: width
-                        name: "chevron"
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked:{
-
-                            console.log("creating page")
-
-                            //remove the file extension if any
-                            var lastpos = iLogPath.lastIndexOf(".")
-                            if (lastpos ===-1) lastpos=iLogPath.length
-
-                            //remove path
-                            var startpos = iLogPath.lastIndexOf("/")
-
-                            //iname is now the title page
-                            var iname= iLogPath.slice(startpos+1,lastpos)
-                            console.log("in page creation, title is " +iname + "\nfile is " +preferences.dir+iLogPath)
-                            //create page
-                            pageDelegate=createLog(preferences.dir+iLogPath,iname,preferences.buffer)
-                            pageDelegate.fontsize=preferences.fontSize
-                            pageDelegate.filter=preferences.filter
-                            pageDelegate.username=preferences.username
-                            console.log("page loaded")
-
-//                            Should be: => Error in createLog()
-//                            qml: creating page
-//                            qml: in page creation, title is application-click-com.ubuntu.developer.nikwen.logviewer.logviewer_Logviewer_0.1file is /home/phablet/.cache/upstart/application-click-com.ubuntu.developer.nikwen.logviewer.logviewer_Logviewer_0.1.log
-//                            readlog called
-//                            filed opened succesfully  "/home/phablet/.cache/upstart/application-click-com.ubuntu.developer.nikwen.logviewer.logviewer_Logviewer_0.1.log"
-//                            seek of file was  true
-//                            qml: page loaded
-                        }
-                    }
-
-                }
-            }
-            ListView {
-                id: logsListView
-                clip: true
-                anchors.fill: parent
-                model: logsList
-                delegate: logDelegate
-                focus: true
-            }
-
-            Label {
-                property string textToShow: i18n.tr("No logs found for the set filter") //Don't show text while (re)loading
-                id: emptyLabel
-                anchors.centerIn: parent
-                visible: logsListView.model.count === 0
-            }
-
-            LogViewer {
-                id:logs
-                logDir: preferences.dir
-                logFilter:preferences.filter
-
-                onLogListChanged: {
-                    //this signal indicates that the directory files where loaded
-                    console.log("logs are: " + logs.logList)
-
-                    //clear any old list
-                    logsList.clear()
-
-                    var tmplogs= logs.logList;
-                    var alogs = {}
-                    alogs = tmplogs.split("\n")
-                    var itemtmp= {}
-                    for (var logitem in alogs){
-                        if(alogs[logitem].trim()!== "") {
-                            itemtmp["iLogPath"] =alogs[logitem]
-                            logsList.append(itemtmp)
-                        }
-                    }
-
-                    emptyLabel.text = emptyLabel.textToShow
-
-                }
-
-                Component.onCompleted: {
-                    logs.loadLogs()
-                }
-            }
-
-
-        }
     }
-    function createLog(path,name,buffer){
-        var ilog =LogViewLib.addLog(pStack,path,name,buffer)
-        pStack.push(ilog)
-        return ilog
+
+    function showSettings() {
+        var prop = {
+            dpFontSize: preferences.dpFontSize,
+            bufferSize: preferences.buffer,
+            directory: preferences.dir,
+            filter: preferences.filter,
+            username: preferences.username
+        }
+
+        var slot_applyChanges = function(msettings) {
+            console.log("Save changes...")
+            preferences.dpFontSize = msettings.dpFontSize
+            preferences.buffer = msettings.bufferSize
+            preferences.dir = msettings.directory
+            logs.logDir = msettings.directory
+            logs.logFilter = msettings.filter
+            preferences.username = msettings.username
+            preferences.filter = msettings.filter
+            logs.loadLogs()
+        }
+
+        var settingPage = pStack.push(Qt.resolvedUrl("ui/PrefPage.qml"), prop)
+
+        settingPage.applyChanges.connect(function() { slot_applyChanges(settingPage) })
     }
 }
 

=== removed file 'app/graphics/[e-mail]'
Binary files app/graphics/[e-mail]	2014-01-07 19:49:28 +0000 and app/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== renamed file 'icon.png' => 'app/graphics/logviewer.png'
=== removed file 'app/logls.txt'
=== renamed file 'app/Logviewer.desktop.in' => 'app/logviewer.desktop.in'
--- app/Logviewer.desktop.in	2014-08-25 11:10:28 +0000
+++ app/logviewer.desktop.in	2016-06-20 17:01:33 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Logviewer
-Comment=Logviewer for Ubuntu Touch
+_Comment=Logviewer for Ubuntu Touch
 Exec=@EXEC@
 Icon=@ICON@
 Terminal=false

=== modified file 'app/ui/AboutPage.qml'
--- app/ui/AboutPage.qml	2014-08-25 11:10:28 +0000
+++ app/ui/AboutPage.qml	2016-06-20 17:01:33 +0000
@@ -1,30 +1,41 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Layouts 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Page {
     id: aboutPage
-    title: i18n.tr("About")
-    visible:false
-
-    Flickable {
-        id: flickable
-        anchors.fill: parent
+
+    header: PageHeader {
+        title: i18n.tr("About")
+    }
+
+    ScrollView {
+        id: scrollView
+        anchors {
+            top: aboutPage.header.bottom
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+
         clip: true
 
-        contentHeight: aboutColumn.height + 2 * aboutColumn.marginTop //doubled marginTop to get the same margin at the bottom
-
         Column {
             id: aboutColumn
             spacing: units.gu(2)
-            width: parent.width
-            property real marginTop: units.gu(3)
-            y: marginTop
-
-            Label {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: i18n.tr("<b>Logviewer</b>")
-                fontSize: "x-large"
+            width: scrollView.width
+
+            // TODO: Qt 5.6 added 'topPadding' property.
+            Item { width: 1; height: units.gu(3) /* top margin */ }
+
+            Label {
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: i18n.tr("Logviewer")
+                textSize: Label.XLarge
+            }
+
+            Label {
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: i18n.tr("Version %1").arg("0.9")
             }
 
             UbuntuShape {
@@ -33,16 +44,16 @@
                 width: Math.min(parent.width, maxWidth)/2
                 height: Math.min(parent.width, maxWidth)/2
                 image: Image {
-                    source: "../../icon.png"
+                    source: "../graphics/logviewer.png"
                     smooth: true
                     fillMode: Image.PreserveAspectFit
-
                 }
             }
 
             Label {
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: i18n.tr("<b>Authors:</b>")
+                text: i18n.tr("Authors:")
+                font.weight: Font.DemiBold
             }
 
             Label {
@@ -54,7 +65,8 @@
 
             Label {
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: i18n.tr("<b>Source code:</b>")
+                text: i18n.tr("Source code:")
+                font.weight: Font.DemiBold
             }
 
             Label {
@@ -65,13 +77,8 @@
 
             Label {
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: i18n.tr("Version: <b>0.8</b>")
-            }
-
-            Label {
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.bold: true;
-                text: "2014"
+                font.weight: Font.DemiBold
+                text: "2014-2016"
             }
         }
     }

=== modified file 'app/ui/LogPage.qml'
--- app/ui/LogPage.qml	2014-08-25 11:10:28 +0000
+++ app/ui/LogPage.qml	2016-06-20 17:01:33 +0000
@@ -1,22 +1,21 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Logviewer 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+
 import "../libs/pastebin.js" as PasteBin
 
-
 Page {
     id: logPage
     property string logname
     property alias path: mLogViewer.filePath
     property string username
     property alias filter: mLogViewer.logFilter
-    property bool readingLog : true
+    property bool readingLog: true
     property bool autoscroll: true
     property alias buffer: mLogViewer.logBuffer
     property bool doselection: false
-    property alias fontsize: logText.font.pointSize
+    property alias fontSize: logText.font.pixelSize
     property int maxTitle: 14
     property int iconSize: units.gu(4)
     property bool logDie: false
@@ -24,94 +23,102 @@
     property bool dialogError: false
     property string dialogText
 
-    title: logname.length > maxTitle? ".."+logname.slice(logname.length-maxTitle-1,logname.length) :
-                                     logname
+    header: PageHeader {
+        title: logname.length > maxTitle
+               ? ".."+logname.slice(logname.length-maxTitle-1,logname.length)
+               : logname
+
+        leadingActionBar.actions: Action {
+            text: i18n.tr("Back")
+            iconName: "back"
+            onTriggered: {
+                if (readingLog) {
+                    // Page gets closed by mLogViewer.onLogStopped slot,
+                    // after we have cleaned all the threads.
+                    logDie = true;
+                    mLogViewer.stopLog()
+                } else {
+                    pageStack.pop()
+                }
+            }
+        }
+
+        trailingActionBar.actions: [
+            Action {
+                id: pauseaction
+                text: readingLog ? i18n.tr("Pause") : i18n.tr("Start")
+                onTriggered: {
+                    readingLog ? mLogViewer.stopLog() : mLogViewer.openLog()
+                    readingLog = !readingLog
+                    console.log("Action is " + pauseaction.text)
+                }
+                iconName: readingLog ? "media-playback-pause" : "media-playback-start"
+            },
+            Action {
+                text: i18n.tr("Clear")
+                onTriggered: mLogViewer.clearLog()
+                iconName: "edit-clear"
+            },
+            Action {
+                text: doselection? i18n.tr("Copy") : i18n.tr("Select")
+                onTriggered: {
+                    if (doselection) {
+                        Clipboard.push(logText.selectedText)
+                        logText.select(0,0)
+
+                    }
+                    doselection =!doselection
+                }
+                iconName: doselection ? "browser-tabs" : "edit"
+            },
+            Action {
+                text: i18n.tr("PasteBin")
+                iconName: "external-link"
+                onTriggered: {
+                    __popover=PopupUtils.open(progress)
+                    var uploadText = logText.selectedText
+
+                    if (uploadText === "") {
+                        console.log("Text to upload is empty. Pasting the whole text...")
+                        uploadText = logText.text
+                    }
+
+                    PasteBin.post(i18n.tr("From file ")+ path + ":\n" + uploadText, username,
+                                  function on_success(url) {
+                                      console.log("url is "+url)
+                                      Clipboard.push(url)
+                                      logText.select(0,0)
+                                      PopupUtils.close(__popover)
+                                      __popover=null
+                                      logPage.dialogError = false;
+                                      logPage.dialogText = "<a href=\""+url+"\">"+url+"</a>"
+                                      PopupUtils.open(resultsD)
+                                  },
+                                  function on_failure(why ){
+                                      console.log("error is " + why)
+                                      logText.select(0,0)
+                                      PopupUtils.close(__popover)
+                                      __popover=null
+                                      logPage.dialogError = true;
+                                      PopupUtils.open(resultsD)
+                                  })
+                }
+            }
+        ]
+    }
+
     visible: false
 
     LogViewer {
         id: mLogViewer
+        onLogStopped: if (logDie) pageStack.pop()
         onLogTextChanged: {
-            if(autoscroll) flickArea.contentY= logText.height-logPage.height
-        }
-        onLogStopped: {
-            if(logDie) logPage.destroy()
+            if(autoscroll) flickArea.contentY= logText.height-scrollView.height
         }
     }
+
     ListModel {  id:logsList  }
 
-    Connections {
-        target: head.backAction
-        onTriggered: {
-            toolbar.pageStack.pop()
-            logDie=true
-            mLogViewer.stopLog()
-        }
-    }
-
-    head.actions: [
-        Action {
-            id: pauseaction
-            text: readingLog ? i18n.tr("Pause") : i18n.tr("Start")
-            onTriggered: {
-                if (readingLog){
-                    mLogViewer.stopLog()
-                } else {
-                    mLogViewer.openLog()
-                }
-                readingLog = !readingLog
-                console.log("Action is " + pauseaction.text)
-            }
-            iconName: readingLog ? "media-playback-pause" : "media-playback-start"
-        },
-        Action {
-            text: i18n.tr("Clear")
-            onTriggered: mLogViewer.clearLog()
-            iconName: "clear"
-        },
-        Action {
-            text: doselection? i18n.tr("Copy") : i18n.tr("Select")
-            onTriggered: {
-                if (doselection) {
-                    Clipboard.push(logText.selectedText)
-                    logText.select(0,0)
-
-                }
-                doselection =!doselection
-            }
-            iconName: doselection ? "browser-tabs" : "edit"
-        },
-        Action {
-            text: i18n.tr("PasteBin")
-            onTriggered: {
-                __popover=PopupUtils.open(progress)
-                var uploadText = logText.selectedText
-                if (uploadText === "") uploadText = logText.text
-                PasteBin.post(i18n.tr("From file ")+ path+ ":\n" + uploadText, username,
-                              function on_success(url){
-                                  console.log("url is "+url)
-                                  Clipboard.push(url)
-                                  logText.select(0,0)
-                                  PopupUtils.close(__popover)
-                                  __popover=null
-                                  logPage.dialogError = false;
-                                  logPage.dialogText = "<a href=\""+url+"\">"+url+"</a>"
-                                  PopupUtils.open(resultsD)
-                              },
-                              function on_failure(why){
-                                  console.log("error is " + why)
-                                  logText.select(0,0)
-                                  PopupUtils.close(__popover)
-                                  __popover=null
-                                  logPage.dialogError = true;
-                                  PopupUtils.open(resultsD)
-                              })
-                doselection =!doselection
-
-            }
-            iconName: "keyboard-caps-disabled"
-        }
-    ]
-
     Component {
         id: progress
         Popover {
@@ -119,19 +126,15 @@
             autoClose: false
             anchors.centerIn: parent
 
-            ActivityIndicator {
-                id: spinner_pastebin
-                running: true
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.leftMargin: units.gu(1)
-                anchors.left: parent.left
-
-            }
-            ListItem.Standard {
-                anchors.verticalCenter: parent.verticalCenter
-                text: i18n.tr("Sending to Pastebin..")
-                anchors.left: spinner_pastebin.right
-                anchors.leftMargin: units.gu(1)
+            ListItemLayout {
+                anchors.verticalCenter: parent.verticalCenter
+
+                title.text: i18n.tr("Sending to Pastebin..")
+
+                ActivityIndicator {
+                    running: true
+                    SlotsLayout.position: SlotsLayout.Leading
+                }
             }
         }
     }
@@ -153,43 +156,50 @@
             }
 
             Button {
-                text: "OK"
+                text: i18n.tr("OK")
                 onClicked: PopupUtils.close(dialogue)
             }
-
-        }
-    }
-
-
-    Flickable {
-        id: flickArea
-        anchors.fill: parent
-        contentWidth: logText.width; contentHeight: logText.height
-        flickableDirection: Flickable.VerticalFlick
-        clip: true
-        onFlickStarted: autoscroll =false;
-        onFlickEnded:{
-            console.log("contenty is " + flickArea.contentY)
-            console.log("log text is "+ logText.height + " and page is " + logPage.height)
-            if (flickArea.contentY > logText.height-logPage.height*2) autoscroll=true
-
-        }
-        TextEdit {
-            id: logText
-            wrapMode: TextEdit.Wrap
-            width: logPage.width
-            text: mLogViewer.logText
-            readOnly: true
-            font.pointSize: 12
-            selectByMouse: doselection
-            mouseSelectionMode: TextEdit.SelectWords
-
-        }
-
-    }
-    Scrollbar {
-        flickableItem: flickArea
-        align: Qt.AlignTrailing
-    }
+        }
+    }
+
+    ScrollView {
+        id: scrollView
+        anchors {
+            top: logPage.header.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+
+        Flickable {
+            id: flickArea
+            anchors.fill: parent
+            contentWidth: logText.width; contentHeight: logText.height
+            flickableDirection: Flickable.VerticalFlick
+            clip: true
+            onFlickStarted: autoscroll =false;
+            onFlickEnded:{
+                console.log("contenty is " + flickArea.contentY)
+                console.log("log text is "+ logText.height + " and scrollview is " + scrollView.height)
+                if (flickArea.contentY > logText.height-scrollView.height*2) autoscroll=true
+            }
+
+            TextEdit {
+                id: logText
+                wrapMode: TextEdit.Wrap
+                width: scrollView.width
+                text: mLogViewer.logText
+                readOnly: true
+                font.pointSize: 12
+                selectByMouse: doselection
+                mouseSelectionMode: TextEdit.SelectWords
+                persistentSelection: true
+                color: theme.palette.normal.fieldText
+                selectedTextColor: theme.palette.selected.selectionText
+                selectionColor: theme.palette.selected.selection
+            }
+        }
+    }
+
     Component.onCompleted: mLogViewer.openLog()
 }

=== added file 'app/ui/MainPage.qml'
--- app/ui/MainPage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/MainPage.qml	2016-06-20 17:01:33 +0000
@@ -0,0 +1,107 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Page {
+    id: mainPage
+
+    header: PageHeader {
+        title: i18n.tr("Ubuntu Logs")
+        flickable: scrollView.flickableItem
+
+        trailingActionBar.actions: [
+            Action {
+                text: i18n.tr("Reload")
+                onTriggered: logs.loadLogs()
+                iconName: "reload"
+            },
+            Action {
+                text: i18n.tr("Settings")
+                onTriggered: mainView.showSettings()
+                iconName: "settings"
+            },
+            Action {
+                text: i18n.tr("About")
+                onTriggered: pStack.push(Qt.resolvedUrl("AboutPage.qml"))
+                iconName: "info"
+            }
+        ]
+    }
+
+    ScrollView {
+        id: scrollView
+        anchors.fill: parent
+
+        ListView {
+            id: logsListView
+            anchors.fill: parent
+            model: logsList
+            delegate: logDelegate
+            focus: true
+
+            Label {
+                id: emptyLabel
+                anchors.centerIn: parent
+                text: i18n.tr("No logs found for the set filter")
+                visible: logsListView.count === 0 && !logsList.loading
+            }
+        }
+    }
+
+    Component{
+        id:logDelegate
+
+        ListItem {
+            id:logItemDelegate
+            property var pageDelegate
+
+            onClicked:{
+                console.log("creating page")
+
+                //remove the file extension if any
+                var lastpos = iLogPath.lastIndexOf(".")
+                if (lastpos ===-1) lastpos=iLogPath.length
+
+                //remove path
+                var startpos = iLogPath.lastIndexOf("/")
+
+                //iname is now the title page
+                var iname= iLogPath.slice(startpos+1,lastpos)
+                console.log("in page creation, title is " +iname + "\nfile is " +preferences.dir+iLogPath)
+
+                //create page
+                var pref = {
+                    logname: iname,
+                    path: preferences.dir + iLogPath,
+                    buffer: preferences.buffer,
+                    fontSize: FontUtils.sizeToPixels("medium") * preferences.dpFontSize / 10,
+                    filter: preferences.filter,
+                    username: preferences.username
+                }
+
+                pageStack.push(Qt.resolvedUrl("LogPage.qml"), pref)
+
+                console.log("page loaded")
+
+//                            Should be: => Error in createLog()
+//                            qml: creating page
+//                            qml: in page creation, title is application-click-com.ubuntu.developer.nikwen.logviewer.logviewer_Logviewer_0.1file is /home/phablet/.cache/upstart/application-click-com.ubuntu.developer.nikwen.logviewer.logviewer_Logviewer_0.1.log
+//                            readlog called
+//                            filed opened succesfully  "/home/phablet/.cache/upstart/application-click-com.ubuntu.developer.nikwen.logviewer.logviewer_Logviewer_0.1.log"
+//                            seek of file was  true
+//                            qml: page loaded
+            }
+
+            ListItemLayout {
+                anchors.centerIn: parent
+
+                title.text:iLogPath.slice(iLogPath.lastIndexOf("/")+1,iLogPath.length)
+
+                Icon {
+                    width: units.gu(2); height: width
+                    name: "go-next"
+                    SlotsLayout.position: SlotsLayout.Last
+                }
+            }
+        }
+    }
+}

=== modified file 'app/ui/PrefPage.qml'
--- app/ui/PrefPage.qml	2014-08-25 11:10:28 +0000
+++ app/ui/PrefPage.qml	2016-06-20 17:01:33 +0000
@@ -1,101 +1,106 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Pickers 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
-
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Page {
-    id:settingPage
-    title:"Settings"
-    visible: false
+    id: settingPage
+
     property alias bufferSize: bufferslider.value
-    property alias directory:dirPath.text
-    property alias filter:filterText.text
-    property alias fontSize:fontslider.value
-    property alias username:userText.text
+    property alias directory: dirPath.text
+    property alias filter: filterText.text
+    property alias dpFontSize: fontslider.value
+    property alias username: userText.text
 
     signal applyChanges
     signal cancelChanges
 
-    head.backAction: Action {
-        id: cancelAction
-        text: i18n.tr("Cancel")
-        iconName: "close"
-        onTriggered: cancelChanges()
-    }
-
-    head.actions: [
-        Action {
-            id: applyAction
+    header: PageHeader {
+        title: i18n.tr("Settings")
+        flickable: scrollView.flickableItem
+
+        leadingActionBar.actions: Action {
+            text: i18n.tr("Cancel")
+            iconName: "close"
+            onTriggered: {
+                settingPage.cancelChanges()
+                pageStack.pop()
+            }
+        }
+
+        trailingActionBar.actions: Action {
             text: i18n.tr("Apply")
             iconName: "ok"
-            onTriggered: applyChanges()
+            onTriggered: {
+                settingPage.applyChanges()
+                pageStack.pop()
+            }
         }
-    ]
+    }
 
-    Flickable {
+    ScrollView {
+        id: scrollView
         anchors.fill: parent
-        contentHeight: column.height
 
         Column {
             id: column
-            anchors {
-                right: parent.right
-                left: parent.left
-                rightMargin: units.gu(2)
-                leftMargin: anchors.rightMargin
-            }
-            height: childrenRect.height
-
-            property real mSpacing: units.gu(2)
-
-            ListItem.Empty {
+            width: scrollView.width
+
+            property int mSpacing: units.gu(1)
+
+            ListItem {
                 height: dirlabel.height + dirPath.height + 2 * column.mSpacing
                 Label {
                     id: dirlabel
                     text: i18n.tr("Directory:")
-                    fontSize: "medium"
-                    anchors.top: parent.top
-                    anchors.topMargin: column.mSpacing
+                    anchors {
+                        top: parent.top; topMargin: column.mSpacing
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
                 TextField {
                     id: dirPath
                     width: parent.width
                     anchors.top: dirlabel.bottom
+                    anchors {
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
-
             }
 
-            ListItem.Empty {
+            ListItem {
                 height: filterlabel.height + filterText.height + 2 * column.mSpacing
                 Label {
                     id: filterlabel
                     text: i18n.tr("Filter:")
-                    fontSize: "medium"
-                    anchors.top: parent.top
-                    anchors.topMargin: column.mSpacing
-
+                    anchors {
+                        top: parent.top; topMargin: column.mSpacing
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
                 TextField {
                     id: filterText
                     width: parent.width
                     anchors.top: filterlabel.bottom
-
+                    anchors {
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
-
             }
 
-            ListItem.Empty {
+            ListItem {
                 height: bufferlabel.height + bufferslider.height + column.mSpacing
                 Label {
                     id:bufferlabel
                     text: i18n.tr("Buffer:")
-                    fontSize: "medium"
-                    anchors.top: parent.top
-                    anchors.topMargin: column.mSpacing
-
+                    anchors {
+                        top: parent.top; topMargin: column.mSpacing
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
-
                 Slider {
                     id:bufferslider
                     function formatValue(v) { return v.toFixed(0) }
@@ -105,54 +110,62 @@
                     live: true
                     width: parent.width
                     anchors.top: bufferlabel.bottom
+                    anchors {
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
-
             }
 
-            ListItem.Empty {
+            ListItem {
                 height: fontlabel.height + fontslider.height + column.mSpacing
                 Label {
                     id:fontlabel
                     text: i18n.tr("Font Size:")
-                    fontSize: "medium"
-                    anchors.top: parent.top
-                    anchors.topMargin: column.mSpacing
-
+                    anchors {
+                        top: parent.top; topMargin: column.mSpacing
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
-
                 Slider {
                     id:fontslider
                     function formatValue(v) { return v.toFixed(0) }
-                    minimumValue: 8
-                    maximumValue: 38
-                    value: 24
+                    minimumValue: 4
+                    maximumValue: 24
+                    value: 10
                     live: true
                     width: parent.width
                     anchors.top: fontlabel.bottom
+                    anchors {
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
-
             }
 
-            ListItem.Empty {
+            ListItem {
                 height: userlabel.height + userText.height + 2 * column.mSpacing
-                divider.visible: false //No divider at the end of the list
                 Label {
                     id:userlabel
                     text: i18n.tr("Pastebin user:")
-                    fontSize: "medium"
-                    anchors.top: parent.top
-                    anchors.topMargin: column.mSpacing
-
+                    anchors {
+                        top: parent.top; topMargin: column.mSpacing
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
                 TextField {
                     id:userText
                     maximumLength: 30
                     width: parent.width
                     anchors.top: userlabel.bottom
-
+                    anchors {
+                        left: parent.left; leftMargin: units.gu(1)
+                        right: parent.right; rightMargin: units.gu(1)
+                    }
                 }
             }
-
         }
     }
 }

=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2014-08-25 11:10:28 +0000
+++ backend/CMakeLists.txt	2016-06-20 17:01:33 +0000
@@ -9,6 +9,9 @@
     modules/Logviewer/logviewer.cpp
 )
 
+# Make the unit test files visible on qtcreator
+add_custom_target(Logviewerbackend_UNITTEST_QML_FILES ALL SOURCES "tests/unit/tst_mytype.qml")
+
 add_library(Logviewerbackend MODULE
     ${Logviewerbackend_SRCS}
 )

=== modified file 'backend/tests/unit/tst_mytype.qml'
--- backend/tests/unit/tst_mytype.qml	2014-08-25 11:10:28 +0000
+++ backend/tests/unit/tst_mytype.qml	2016-06-20 17:01:33 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Logviewer 1.0
 
 // See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html

=== renamed file 'Logviewer.json' => 'logviewer.apparmor'
--- Logviewer.json	2014-08-25 11:10:28 +0000
+++ logviewer.apparmor	2016-06-20 17:01:33 +0000
@@ -2,9 +2,9 @@
     "policy_groups": [
         "networking"
     ],
-    "policy_version": 1.2,
+    "policy_version": 1.3,
     "read_path": [
         "/var/log/",
         "/home/phablet/.cache/"
     ]
-}
\ No newline at end of file
+}

=== renamed file 'manifest.json' => 'manifest.json.in'
--- manifest.json	2014-08-25 11:10:28 +0000
+++ manifest.json.in	2016-06-20 17:01:33 +0000
@@ -1,15 +1,17 @@
 {
-    "architecture": "armhf",
+    "name": "@APP_ID@",
     "description": "Logviewer app for Ubuntu touch",
-    "framework": "ubuntu-sdk-14.10-dev2",
+    "architecture": "@CLICK_ARCH@",
+    "title": "Logviewer",
     "hooks": {
-        "Logviewer": {
-            "apparmor": "Logviewer.json",
-            "desktop": "Logviewer.desktop"
+        "logviewer": {
+            "apparmor": "logviewer.apparmor",
+            "desktop":  "logviewer.desktop"
         }
     },
+    "version": "0.9",
     "maintainer": "Victor Palau <[e-mail]>",
-    "name": "com.ubuntu.developer.vtuson.logviewer",
-    "title": "Logviewer",
-    "version": "0.8"
-}
\ No newline at end of file
+    "framework" : "ubuntu-sdk-15.04.4"
+}
+
+

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2016-06-20 17:01:33 +0000
@@ -0,0 +1,63 @@
+include(FindGettext)
+
+# Find the translation tools
+find_program(INTLTOOL_MERGE intltool-merge)
+if(NOT INTLTOOL_MERGE)
+ message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
+endif()
+
+find_program(INTLTOOL_EXTRACT intltool-extract)
+if(NOT INTLTOOL_EXTRACT)
+ message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
+endif()
+
+if(NOT CMAKE_INSTALL_LOCALEDIR)
+ set(CMAKE_INSTALL_LOCALEDIR "share/locale")
+endif()
+
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${APP_ID})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+file(GLOB_RECURSE I18N_SRC_FILES
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/*.qml 
+ ${CMAKE_SOURCE_DIR}/*.js 
+ ${CMAKE_SOURCE_DIR}/*.cpp 
+ ${CMAKE_SOURCE_DIR}/*.h
+)
+list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME}.in.h)
+list(SORT I18N_SRC_FILES)
+
+add_custom_target(${POT_FILE} ALL
+ COMMENT "Generating translation template"
+ # Extract the translatable messages from the desktop file 
+ COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+ --srcdir=${CMAKE_BINARY_DIR}/app ${DESKTOP_FILE_NAME}.in
+ # Update the translation file
+ COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+ --from-code=UTF-8
+ --c++ --qt --add-comments=TRANSLATORS
+ --keyword=tr --keyword=tr:1,2 --keyword=N_
+ --package-name='${PROJECT}'
+ -D ${CMAKE_CURRENT_SOURCE_DIR} ${I18N_SRC_FILES}
+ # Copy the up2date translation file to the source directory
+ COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+foreach(PO_FILE ${PO_FILES})
+ get_filename_component(LANG ${PO_FILE} NAME_WE)
+ gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+ set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+ DESTINATION ${INSTALL_DIR}
+ RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)
+
+add_custom_target(${DESKTOP_FILE_NAME} ALL
+    COMMENT "Merging translations into ${DESKTOP_FILE_NAME}"
+    COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${CMAKE_BINARY_DIR}/app/${DESKTOP_FILE_NAME}.in ${CMAKE_BINARY_DIR}/app/${DESKTOP_FILE_NAME} > /dev/null
+)
+

=== added file 'po/com.ubuntu.developer.vtuson.logviewer.pot'
--- po/com.ubuntu.developer.vtuson.logviewer.pot	1970-01-01 00:00:00 +0000
+++ po/com.ubuntu.developer.vtuson.logviewer.pot	2016-06-20 17:01:33 +0000
@@ -0,0 +1,143 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-20 19:00+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../app/ui/AboutPage.qml:8 ../app/ui/MainPage.qml:23
+msgid "About"
+msgstr ""
+
+#: ../app/ui/AboutPage.qml:32
+msgid "Logviewer"
+msgstr ""
+
+#: ../app/ui/AboutPage.qml:38
+#, qt-format
+msgid "Version %1"
+msgstr ""
+
+#: ../app/ui/AboutPage.qml:55
+msgid "Authors:"
+msgstr ""
+
+#: ../app/ui/AboutPage.qml:68
+msgid "Source code:"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:32
+msgid "Back"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:49
+msgid "Pause"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:49
+msgid "Start"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:58
+msgid "Clear"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:63
+msgid "Copy"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:63
+msgid "Select"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:75
+msgid "PasteBin"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:86
+msgid "From file "
+msgstr ""
+
+#: ../app/ui/LogPage.qml:132
+msgid "Sending to Pastebin.."
+msgstr ""
+
+#: ../app/ui/LogPage.qml:146
+msgid "Pastebin Error"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:146
+msgid "Pastebin Successful"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:152
+msgid "Error ocurred uploading to Pastebin"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:153
+msgid "<br>(Copied to clipboard)"
+msgstr ""
+
+#: ../app/ui/LogPage.qml:159
+msgid "OK"
+msgstr ""
+
+#: ../app/ui/MainPage.qml:8
+msgid "Ubuntu Logs"
+msgstr ""
+
+#: ../app/ui/MainPage.qml:13
+msgid "Reload"
+msgstr ""
+
+#: ../app/ui/MainPage.qml:18 ../app/ui/PrefPage.qml:17
+msgid "Settings"
+msgstr ""
+
+#: ../app/ui/MainPage.qml:44
+msgid "No logs found for the set filter"
+msgstr ""
+
+#: ../app/ui/PrefPage.qml:21
+msgid "Cancel"
+msgstr ""
+
+#: ../app/ui/PrefPage.qml:30
+msgid "Apply"
+msgstr ""
+
+#: ../app/ui/PrefPage.qml:53
+msgid "Directory:"
+msgstr ""
+
+#: ../app/ui/PrefPage.qml:75
+msgid "Filter:"
+msgstr ""
+
+#: ../app/ui/PrefPage.qml:97
+msgid "Buffer:"
+msgstr ""
+
+#: ../app/ui/PrefPage.qml:124
+msgid "Font Size:"
+msgstr ""
+
+#: ../app/ui/PrefPage.qml:151
+msgid "Pastebin user:"
+msgstr ""
+
+#: /tmp/logviewer-build/po/logviewer.desktop.in.h:1
+msgid "Logviewer for Ubuntu Touch"
+msgstr ""