Merge lp:~mhall119/ubuntu-terminal-app/konsole-and-settings into lp:ubuntu-terminal-app

[Michael Hall]

Include the Konsole plugin and settings page

Includes all of Dmitry's work to include the Konsole plugin and settings page

[Michael Hall (mhall119)]

self-approving the branch, but it's mostly all Dmitry's code

review: Approve

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

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-04-04 11:05:43 +0000
+++ .bzrignore	2013-05-01 01:33:24 +0000
@@ -1,6 +1,6 @@
 *.qmlproject.user
 
 debian/files
-debian/app-template/
+debian/ubuntu-terminal-app/
 debian/*.debhelper.log
 debian/*.substvars

=== added file 'Configs.qml'
--- Configs.qml	1970-01-01 00:00:00 +0000
+++ Configs.qml	2013-05-01 01:33:24 +0000
@@ -0,0 +1,79 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "config"
+
+Page {
+    JsConfig{id: jsConf }
+
+    property bool configChanged: false;
+    property int  headerHeight:  units.gu(10);
+
+    width: units.gu(50)
+    height: units.gu(75)
+
+    Component.onCompleted: {
+        liSchemes.values = kterm.availableColorSchemes();
+        liSchemes.selectedIndex = liSchemes.setValue(jsConf.getColorSheme());
+
+        slFont.value = jsConf.getFontSize();
+    }
+
+    Column {
+        anchors {
+            fill: parent
+            top: parent.top
+            topMargin: headerHeight
+        }
+        spacing:  units.gu(1)
+
+        ListItem.ValueSelector {
+            id: liSchemes
+            width: parent.width
+
+            function setValue(val) {
+                for (var k in values) {
+                    var v = values[k];
+                    if(v == val) return k;
+                }
+            }
+
+            text: i18n.tr("Color scheme") + ":"
+            onSelectedIndexChanged: {
+                var val = values[selectedIndex];
+                kterm.scheme = val;
+                jsConf.setColorScheme(val);
+            }
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+            }
+
+            text: i18n.tr("Font size") + ":"
+        }
+
+        Slider{
+            id: slFont
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            minimumValue: 8;
+            maximumValue: 32;
+            onValueChanged: {
+                kterm.font.pointSize = value
+                jsConf.setFontSize(value);
+            }
+        }
+
+        ListItem.ThinDivider { }
+
+    }
+
+
+}

=== added directory 'config'
=== added file 'config/DbEngine.qml'
--- config/DbEngine.qml	1970-01-01 00:00:00 +0000
+++ config/DbEngine.qml	2013-05-01 01:33:24 +0000
@@ -0,0 +1,59 @@
+import QtQuick 2.0
+import QtQuick.LocalStorage 2.0
+
+//Database Helper Functions
+Item{
+    id:dbEngine;
+
+    Component.onCompleted: {
+     initialize();
+    }
+
+    function initialize() {
+
+        var db = getDatabase();
+
+        db.transaction( function(tx) {
+                            tx.executeSql('CREATE TABLE IF NOT EXISTS config(item TEXT UNIQUE, value TEXT)');
+                        });
+    }
+
+    function getDatabase() {
+
+        var db = LocalStorage.openDatabaseSync("UbuntuTerminalDB", "1.0", "Terminal Database", 1000000);
+
+        return db;
+    }
+
+    function setConfig( item, value ) {
+
+        var db  = getDatabase();
+        var res = 0;
+
+        db.transaction(function(tx) {
+                            var rs = tx.executeSql('INSERT OR REPLACE INTO config VALUES (?,?);', [item, value]);
+                            //console.log(rs.rowsAffected)
+                            res = rs.rowsAffected > 0;
+                        });
+
+        return res;
+    }
+
+    function getConfig( item ) {
+        var db  = getDatabase();
+        var res = "";
+
+        db.transaction(function(tx) {
+                            var rs = tx.executeSql('SELECT value FROM config WHERE item=?;', [item]);
+                            if (rs.rows.length > 0) {
+                                res = rs.rows.item(0).value;
+                            } else {
+                                res = "UNKNOWN";
+                            }
+                        });
+
+        return res
+    }
+
+
+}

=== added file 'config/JsConfig.qml'
--- config/JsConfig.qml	1970-01-01 00:00:00 +0000
+++ config/JsConfig.qml	2013-05-01 01:33:24 +0000
@@ -0,0 +1,30 @@
+import QtQuick 2.0
+import QtQuick.LocalStorage 2.0
+
+Item{
+    DbEngine{id: dbEngine}
+
+    //ColorSchemes
+    function getColorSheme(){
+        var res = dbEngine.getConfig("colorScheme");
+        if( res === "UNKNOWN" ) return "DarkPastels";
+        return res;
+    }
+
+    function setColorScheme(scheme){
+        dbEngine.setConfig("colorScheme",scheme);
+    }
+
+
+    //FontSize
+    function getFontSize(){
+        var res = dbEngine.getConfig("fontSize");
+        if( res === "UNKNOWN" ) return "12";
+        return res;
+    }
+
+    function setFontSize(size){
+        dbEngine.setConfig("fontSize",size);
+    }
+
+}

=== modified file 'debian/ubuntu-terminal-app.install'
--- debian/ubuntu-terminal-app.install	2013-04-11 21:26:07 +0000
+++ debian/ubuntu-terminal-app.install	2013-05-01 01:33:24 +0000
@@ -2,3 +2,4 @@
 ubuntu-terminal-app.desktop usr/share/applications/
 *.qml usr/share/ubuntu-terminal-app/
 *.png usr/share/ubuntu-terminal-app/
+config usr/share/ubuntu-terminal-app/

=== modified file 'terminal.qmlproject'
--- terminal.qmlproject	2013-02-12 16:28:19 +0000
+++ terminal.qmlproject	2013-05-01 01:33:24 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "terminal.qml"
+    mainFile: "ubuntu-terminal-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {

=== modified file 'ubuntu-terminal-app.qml'
--- ubuntu-terminal-app.qml	2013-04-11 21:26:07 +0000
+++ ubuntu-terminal-app.qml	2013-05-01 01:33:24 +0000
@@ -1,11 +1,8 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import org.kde.konsole 0.1
+import "config"
 
-/*!
-    \brief MainView with Tabs element.
-           First Tab has a single Label and
-           second Tab has a single ToolbarAction.
-*/
 
 MainView {
     // objectName for functional testing purposes (autopilot-qt5)
@@ -14,59 +11,65 @@
     
     width: units.gu(50)
     height: units.gu(75)
-    
+
+    JsConfig{id: jsConf }
+
     Tabs {
         id: tabs
         anchors.fill: parent
         
-        // First tab begins here
         Tab {
             objectName: "Tab1"
-            
             title: i18n.tr("Terminal")
-            
-            // Tab content begins here
             page: Page {
-                Column {
-                    anchors.centerIn: parent
-                    Label {
-                        text: i18n.tr("Swipe from right to left to change tab.")
+                Flickable {
+                    id: flickable
+                    anchors.fill: parent
+                    contentHeight: kterm.height
+                    contentWidth: kterm.width
+                    clip: true
+
+                    KTerminal {
+                        id: kterm
+
+                        //////////////////////////////////////
+                        /// FONT SIZE = 24 (FINE FOR GNEXUS)
+                        /// FONT SIZE = 12 (FINE FOR DESKTOP)
+                        //////////////////////////////////////
+                        font.family: "Ubuntu Mono"
+                        font.pointSize: jsConf.getFontSize() //units.gu(1.5)
+
+                        lines: 160
+                        columns: 80
+                        scheme: jsConf.getColorSheme() //"DarkPastels"
+                        // THIS IS NOT CORRECT; USE UNITS.GU() INSTEAD
+                        width:  1600  //units.gu(120)
+                        height: 1400  //units.gu(60)
+
+                        session: KSession {
+                            id: ksession
+                        }
                     }
-                }
+
+                }
+
+                Scrollbar {
+                    flickableItem: flickable
+                    align: Qt.AlignTrailing
+                }
+                Scrollbar {
+                    flickableItem: flickable
+                    align: Qt.AlignBottom
+                }
+
             }
         }
-        
-        // Second tab begins here
+
         Tab {
             objectName: "Tab2"
-            
-            title: i18n.tr("Optional Screen")
-            page: Page {
-                anchors.margins: units.gu(2)
-                
-                tools: ToolbarActions {
-                    Action {
-                        objectName: "action"
-                        
-                        iconSource: Qt.resolvedUrl("avatar.png")
-                        text: i18n.tr("Tap me!")
-                        
-                        onTriggered: {
-                            label.text = i18n.tr("Toolbar tapped")
-                        }
-                    }
-                }
-                
-                Column {
-                    anchors.centerIn: parent
-                    Label {
-                        id: label
-                        objectName: "label"
-                        
-                        text: i18n.tr("Swipe from bottom to up to reveal the toolbar.")
-                    }
-                }
-            }
+            title: i18n.tr("Settings")
+            page: Configs { id: pgConf }
         }
+
     }
 }