Merge lp:~kill-animals/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences into lp:ubuntu-terminal-app

[Kill Animals]

    Configs.qml - Added a drop down list where you can choose from 5 fonts. I chose the fonts based on what I understand will be included in the default image. These will need to be tested though.

    Terminal.qml - I actually unwittingly fixed a bug here, as Ubuntu Mono was not being initially registered. The changes i made were making sure the onConfigChanged registered new fonts, and that the font family being used is being grabbed from the database, which I added an entry.

    JsConfig.qml - I added a DB entry for the fontStyle.

    TerminalDisplay.cpp - I copied the setVTFont function, and added a version where you can feed it parameters for setting a QFont, which needs a string and an integer.

    TerminalDisplay.h - Popey smells of elderberries, and Micheal Hall is a hamster.

    Configs.qml - Added a drop down list where you can choose from 5 fonts. I chose the fonts based on what I understand will be included in the default image. These will need to be tested though.

    Terminal.qml - I actually unwittingly fixed a bug here, as Ubuntu Mono was not being initially registered. The changes i made were making sure the onConfigChanged registered new fonts, and that the font family being used is being grabbed from the database, which I added an entry.

    JsConfig.qml - I added a DB entry for the fontStyle.

    TerminalDisplay.cpp - I copied the setVTFont function, and added a version where you can feed it parameters for setting a QFont, which needs a string and an integer.

    TerminalDisplay.h - Popey smells of elderberries, and Micheal Hall is a hamster.

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

PASSED: Continuous integration, rev:150
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/103/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/485
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/47

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/103/rebuild

review: Approve (continuous-integration)

[lp:~kill-animals/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences]

151. By Kill Animals on 2014-09-23

Removed a Debug Message.

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

PASSED: Continuous integration, rev:151
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/104/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/489
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/489/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/48

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/104/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Quick question: in the Ubuntu philosophy of making opionionated decisions
and having a default that works rather than overwhelming users with
multiple settings, would it not make sense to just set the font to Ubuntu
mono?

Cheers,
David.

On Tue, Sep 23, 2014 at 3:26 PM, Ubuntu Phone Apps Jenkins Bot <
<email address hidden>> wrote:

> Review: Approve continuous-integration
>
> PASSED: Continuous integration, rev:151
> http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/104/
> Executed test runs:
> SUCCESS:
> http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/489
> deb:
> http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/489/artifact/work/output/*zip*/output.zip
> SUCCESS:
> http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/48
>
> Click here to trigger a rebuild:
> http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/104/rebuild
>
> --
>
> https://code.launchpad.net/~akiva/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences/+merge/235621
> Your team Ubuntu Terminal Developers is requested to review the proposed
> merge of
> lp:~akiva/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences
> into lp:ubuntu-terminal-app.
>

[Kill Animals (kill-animals)]

> Quick question: in the Ubuntu philosophy of making opionionated decisions
> and having a default that works rather than overwhelming users with
> multiple settings, would it not make sense to just set the font to Ubuntu
> mono?
>
> Cheers,
> David.
>

The immediate issue unfortunately is that Ubuntu Mono does not exactly *work* at this time, and neither does Monospace for that matter. Thus this work around was created.

For my part though on the question of design; When it comes to a Terminal Emulator, I think leaving features, and flexibility within it will be a driver for attracting super users away from android, and perhaps even IOS, to bask in the glory of a Terminal Emulator with kde-like flexibility. It is something that is perhaps the coolest thing you can demo on an ubuntu-touch right now, with the old terminal functionality, and I look forward to showing it off to my friends.

Otherwise though; if this were not a Terminal, I would be in agreement.

[Filippo Scognamiglio (flscogna)]

Sorry for the intrusion but I'd like to share my two cents on this merge proposal.

First of all I agree with David that we should not overwhelm the users with settings but I also think that font selection might be worthy (on the desktop they are mandatory on the phone maybe not).

Anyway I really think the implementation might use some work. Before we were using a Q_PROPERTY to set the font. Why are you making setVTFont Q_INVOKABLE and calling it directly instead of using the previous mechanism?

Moreover storing the selected font as an index is not wise when we take into account future updates since we will be forced to add new fonts only at the end of the list. I suggest to store the font.family string in the db and then compute the index.

review: Needs Fixing

[Kill Animals (kill-animals)]

> Sorry for the intrusion but I'd like to share my two cents on this merge
> proposal.
>
> First of all I agree with David that we should not overwhelm the users with
> settings but I also think that font selection might be worthy (on the desktop
> they are mandatory on the phone maybe not).
>
> Anyway I really think the implementation might use some work. Before we were
> using a Q_PROPERTY to set the font. Why are you making setVTFont Q_INVOKABLE
> and calling it directly instead of using the previous mechanism?
>
> Moreover storing the selected font as an index is not wise when we take into
> account future updates since we will be forced to add new fonts only at the
> end of the list. I suggest to store the font.family string in the db and then
> compute the index.

No no; Intrude !

> First of all I agree with David that we should not overwhelm the users with
> settings but I also think that font selection might be worthy (on the desktop
> they are mandatory on the phone maybe not).

We could put an "Advanced Options" selection at the bottom; what do you think about that?

> Anyway I really think the implementation might use some work. Before we were
> using a Q_PROPERTY to set the font. Why are you making setVTFont Q_INVOKABLE
> and calling it directly instead of using the previous mechanism?

Uhm, I copied the mechanism that was being used for setting the font size, which was done by someone else. Q_INVOKABLE (Although I initially researched it, and wondered why it was not being utilized for this) is not used for the font. I do not know why, but needless to say; it is not in my merge at all. Could you please clarify your comments? Perhaps point to the code you are speaking of?

> Moreover storing the selected font as an index is not wise when we take into
> account future updates since we will be forced to add new fonts only at the
> end of the list. I suggest to store the font.family string in the db and then
> compute the index.

Oh I see what you mean. I do not think that actually will cause anything to break though. The font is not being read as an index; the font is being read as a string. The font is being written as an index, and that write is only triggered on an index change.

ergo

The user will have to physically select the font to something else.
When he physically selects the font, the index will be corrected at that point, updating to the current list.
After the index is changed, the model[index] returns the font selected to the database.
This triggers the configChanged
The configChanged triggers a read to the database, which returns the appropriate string.

[Filippo Scognamiglio (flscogna)]

Sorry for the previous fast comment, but I wanted to write that before launch! :D

> We could put an "Advanced Options" selection at the bottom; what do you think about that?

Yeah, that might be the sweet spot; Anyway might be interesting to have the opinion of a UX expert (I'm definitely not).

>Uhm, I copied the mechanism that was being used for setting the font size, which was done by >someone else. Q_INVOKABLE (Although I initially researched it, and wondered why it was not being >utilized for this) is not used for the font. I do not know why, but needless to say; it is not in >my merge at all. Could you please clarify your comments? Perhaps point to the code you are >speaking of?

Q_INVOKABLE are functions that can be called from the QtQuick side. In this case you are directly calling setVTFont(const QString& s, int n) from QML:

Terminal.qml:236 font.family: kterm.setVTFont(jsConf.getFontStyle(), kterm.font.pointSize);

What you are doing it is calling the invokable function setVTFont(font, size), grab the return type (void) and assign that to the property font.family. That might even work but it is extremely convoluted.
The solution I propose is to get rid of the overloaded setVTFont(font, size) and using property assignments as you are doing here.

Terminal.qml:88 kterm.font.pointSize = jsConf.getFontSize();
Terminal.qml:89 kterm.colorScheme = jsConf.getColorScheme();
Terminal.qml:90 kterm.font.family = jsConf.getFontStyle();

The property will then trigger the setVTFont(font) function, preserving the plugin interface.
I really hope that's clear enough (I still have issues explaining non trivial concepts in english).

>Oh I see what you mean. I do not think that actually will cause anything to break though. The >font is not being read as an index; the font is being read as a string. The font is being >written as an index, and that write is only triggered on an index change.

Forget that, I'm an idiot. You was suggesting you to do exactly what you did! Sorry :)

I just noticed the changes to TerminalDisply.h... Awesome! :D

[Kill Animals (kill-animals)]

> you are doing it is calling the invokable function

This is what I don't get though, and trust me; I WAS CONFUSED
There is no Q_INVOKABLE for setVTFont's class.
It's invoked... SOMEHOW! but for the life of me I could not figure out where or how it was done.

The Q_INVOKABLE macro only appears in two places:
http://i.imgur.com/QAVVlDo.jpg

Also (I Think)
font.family: kterm.setVTFont(jsConf.getFontStyle(), kterm.font.pointSize);
Is initiated in the constructor; changing it on the fly if I recall, does not work; you require some signal handles which are in the configs scope.

To everything else; sounds fine though.

T

[Filippo Scognamiglio (flscogna)]

>There is no Q_INVOKABLE for setVTFont's class.

I believe that it works anyway because setVTFont is declared as a public
slot and not a public method. (some reminiscences in by brain).

>Also (I Think)
>font.family: kterm.setVTFont(jsConf.
>getFontStyle(), kterm.font.pointSize);
>Is initiated in the constructor; changing it on the fly if I recall, does
not work; you require some signal handles which are in the configs scope.

That's true but as a side effect. Writing "font.family: kterm.setVTFont()",
is read as: set to font.family what is returned by the function
kterm.setVTFont().
This is not what happens. The function kterm.setVTFont() doesn't return
anything but sets the font itself. If you want to call it this way the
proper place to put it is in Component.onCompleted.

What's wrong with "font.family: jsConf.getFontStyle()" ?

2014-09-24 14:50 GMT+02:00 Akiva <email address hidden>:

> > you are doing it is calling the invokable function
>
> This is what I don't get though, and trust me; I WAS CONFUSED
> There is no Q_INVOKABLE for setVTFont's class.
> It's invoked... SOMEHOW! but for the life of me I could not figure out
> where or how it was done.
>
> The Q_INVOKABLE macro only appears in two places:
> http://i.imgur.com/QAVVlDo.jpg
>
> Also (I Think)
> font.family: kterm.setVTFont(jsConf.getFontStyle(), kterm.font.pointSize);
> Is initiated in the constructor; changing it on the fly if I recall, does
> not work; you require some signal handles which are in the configs scope.
>
> To everything else; sounds fine though.
>
>
> T
> --
>
> https://code.launchpad.net/~akiva/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences/+merge/235621
> You are reviewing the proposed merge of
> lp:~akiva/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences
> into lp:ubuntu-terminal-app.
>

[Kill Animals (kill-animals)]

> I believe that it works anyway because setVTFont is declared as a public
slot and not a public method. (some reminiscences in by brain).

Good golly! I wish someone told me it was that easy... Bloody macros uglying up my code

> That's true but as a side effect. Writing "font.family: kterm.setVTFont()",
is read as: set to font.family what is returned by the function
kterm.setVTFont().

Oh yah thats true; I am not setting a property; I am sending a signal. Good point; I'll move it on over to onCompleted.

> What's wrong with "font.family: jsConf.getFontStyle()" ?

Doesn't work ; its the same as "font.family: "Ubuntu Mono"" which also was not working...

[Kill Animals (kill-animals)]

So you made me question myself, and so I downloaded the branch, took out the font.family and removed

                        font.family: kterm.setVTFont(jsConf.getFontStyle(), kterm.font.pointSize);
                        font.pointSize: jsConf.getFontSize() //units.gu(1.5)

To no consequence that I could see. Everything still worked fine; even after starting and stopping the app. Perhaps this is only important if you have nothing to start with. I don't know how to test this though.

Perhaps though these should just be removed if they arent doing anything.

[Filippo Scognamiglio (flscogna)]

Sorry for the late response.

> Perhaps though these should just be removed if they arent doing anything.

Agreed, since those are set only on construction we should simply put everything in Component.onComplete (where they should work in theory).

We still need to remove the overloaded setVTFont(font, size) since I think that's unnecessary code duplicatoin and might be replaced by something like that in Component.onCompleted:

Component.onCompleted: {
    kterm.font.pointSize: jsConf.getFontSize()
    kterm.font.family: jsConf.getFontStyle()
    //Something else
}

>Doesn't work ; its the same as "font.family: "Ubuntu Mono"" which also was not working...

This is surely a problem with how we are initializing the plugin. It is something that might be worth checking in the future, but if we can force them from Component.onCompleted the pedantic me would be happy enough :)

[Kill Animals (kill-animals)]

> Agreed, since those are set only on construction we should simply put everything in Component.onComplete (where they should work in theory).

Sounds good.

> We still need to remove the overloaded setVTFont(font, size) since I think that's unnecessary code duplicatoin and might be replaced by something like that in Component.onCompleted:

Component.onCompleted: {
    kterm.font.pointSize: jsConf.getFontSize()
    kterm.font.family: jsConf.getFontStyle()
    //Something else
}

I'll have to look at it. Remember; I overloaded the function on purpose because I needed a way to set the font on the fly, and to set the font, I need QFont, which requires size and family parameters. Component.onCompleted afaik will only set it initially on startup. Not when I go into settings and adjust it.
Either way, if I can eliminate the overload, i'll do it.

> This is surely a problem with how we are initializing the plugin. It is something that might be worth checking in the future, but if we can force them from Component.onCompleted the pedantic me would be happy enough :)

Yah I guess it does need to be fixed. Was font.xxxx defined in this program? If that is the case, then I can't imagine it being too difficult. Either way; worst case scenario leaves us with this small patch.

In the spirit of keeping merges small, can we patch the "Advanced Options" in a future patch?

[Kill Animals (kill-animals)]

@flippo

Okay so... good catch. I am seriously embarrassed; I did not realize that I overloaded the function for something that I was doing earlier, but took out.

Jeepers :P

Okay updating the code.

[lp:~kill-animals/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences]

152. By Kill Animals on 2014-09-26

Took out overloaded function setVtFont(string, int) -- was mistakenly left in. Thanks for pointing that out.

Took out property settings, and had them defined only on completion of the kterm component.

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

PASSED: Continuous integration, rev:152
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/106/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/564
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/564/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/50

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/106/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Before going further into a more detailed review, a few style nitpicks:

review: Needs Fixing

[Filippo Scognamiglio (flscogna)]

Very good work Akiva. Now the pedantic me is really happy! :)

[lp:~kill-animals/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences]

153. By Kill Animals on 2014-09-26

Fixed Style via David Planella's suggestions.

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

PASSED: Continuous integration, rev:153
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/108/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/568
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/568/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/52

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/108/rebuild

review: Approve (continuous-integration)

[Filippo Scognamiglio (flscogna)]

Wow, you also fixed some styling issues I introduced. Thank you Akiva!

review: Approve

[Kill Animals (kill-animals)]

Good to hear it. You can thank David for the styling though; hes pretty good with that in my experience.

[lp:~kill-animals/ubuntu-terminal-app/1349749workaround-select-font-added-to-preferences]

154. By Kill Animals on 2014-10-07

Merged with Trunk; Tested on Emulator; Took out Dejavu Sans Mono because I believe it was actually just reverting to monospace.

155. By Kill Animals on 2014-10-07

took out translations for the select font, because I do not think that the filename, which depends on the string, will change on other computers.

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

PASSED: Continuous integration, rev:154
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/114/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/750
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/58

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/114/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:155
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/115/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/751
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/751/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/59

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/115/rebuild

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2014-10-06 12:22:53 +0000
+++ po/com.ubuntu.terminal.pot	2014-10-07 11:18:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-26 08:27-0700\n"
+"POT-Creation-Date: 2014-10-07 04:16-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -52,38 +52,42 @@
 msgstr ""
 
 #: ../src/app/qml/Configs.qml:69
-msgid "Color scheme"
-msgstr ""
-
-#: ../src/app/qml/Configs.qml:85
-msgid "Font size"
-msgstr ""
-
-#: ../src/app/qml/Configs.qml:108
-msgid "Enable effects:"
-msgstr ""
-
-#: ../src/app/qml/Configs.qml:126
+msgid "Color Scheme:"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:81
+msgid "Select Font:"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:113
+msgid "Font Size:"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:136
+msgid "Enable Effects:"
+msgstr ""
+
+#: ../src/app/qml/Configs.qml:155
 msgid "Screen color"
 msgstr ""
 
-#: ../src/app/qml/Configs.qml:139
+#: ../src/app/qml/Configs.qml:168
 msgid "Color intensity"
 msgstr ""
 
-#: ../src/app/qml/Configs.qml:167
+#: ../src/app/qml/Configs.qml:196
 msgid "Bloom"
 msgstr ""
 
-#: ../src/app/qml/Configs.qml:195
+#: ../src/app/qml/Configs.qml:224
 msgid "Curvature"
 msgstr ""
 
-#: ../src/app/qml/Configs.qml:223
+#: ../src/app/qml/Configs.qml:252
 msgid "Noise"
 msgstr ""
 
-#: ../src/app/qml/Configs.qml:251
+#: ../src/app/qml/Configs.qml:280
 msgid "Jitter"
 msgstr ""
 
 
=== modified file 'src/app/qml/Configs.qml'
--- src/app/qml/Configs.qml	2014-10-06 12:22:53 +0000
+++ src/app/qml/Configs.qml	2014-10-07 11:18:20 +0000
@@ -5,8 +5,8 @@
 
 Item {
     id: mparent
-    JsConfig{id: jsConf }
-    ColorDialog{
+    JsConfig {id: jsConf }
+    ColorDialog {
         id: colorDialog
         selectedColor: jsConf.getScreenColor();
         onSelectedColorChanged: {
@@ -66,7 +66,7 @@
                 }
             }
 
-            text: i18n.tr("Color scheme") + ":"
+            text: i18n.tr("Color Scheme:")
             onSelectedIndexChanged: {
                 if(colorSchemeLoaded) {
                     var val = model[selectedIndex];
@@ -76,16 +76,44 @@
             }
         }
 
+        ListItem.ItemSelector {
+            id: selectFont
+            text: i18n.tr("Select Font:")
+            width: parent.width
+            function getIndex() {
+                var i = 0;
+                while (jsConf.getFontStyle() !== model[i]) {
+                    i += 1;
+                    if (i > model.length) {
+                        return 0
+                    }
+                }
+                return i
+            }
+
+            selectedIndex: getIndex()
+            model: [
+                "Droid Sans Mono",
+                "Liberation Mono",
+                "Monospace",
+                "Ubuntu Mono"
+            ]
+            onSelectedIndexChanged: {
+                jsConf.setFontStyle(model[selectedIndex]);
+                configChanged(true);
+            }
+        }
+
         Label {
             anchors {
                 left: parent.left
                 leftMargin: units.gu(2)
             }
 
-            text: i18n.tr("Font size") + ":"
+            text: i18n.tr("Font Size:")
         }
 
-        Slider{
+        Slider {
             id: slFont
             objectName: "slFont"
             anchors {
@@ -105,7 +133,7 @@
         ListItem.ThinDivider { }
 
         ListItem.Standard {
-            text: i18n.tr("Enable effects:")
+            text: i18n.tr("Enable Effects:")
             control: Switch {
                 id: effectsEnableSwitch
                 onCheckedChanged: {
@@ -113,6 +141,7 @@
                 }
             }
         }
+
         Column {
             id: effectsColumn
             width: parent.width
 
=== modified file 'src/app/qml/Terminal.qml'
--- src/app/qml/Terminal.qml	2014-09-20 10:54:37 +0000
+++ src/app/qml/Terminal.qml	2014-10-07 11:18:20 +0000
@@ -8,7 +8,7 @@
     id: mparent
     anchors.fill: parent
 
-    function hideFocus(){
+    function hideFocus() {
         kterm.focus = false;
     }
 
@@ -22,8 +22,8 @@
 
     //property int  headerHeight:  units.gu(10);
 
-    function showExtraPanel(i){
-        switch (i){
+    function showExtraPanel(i) {
+        switch (i) {
             case 1:
                 kbCtrl.visible = true;
                 kbFn.visible   = false;
@@ -87,6 +87,7 @@
         onConfigChanged: {
             kterm.font.pointSize = jsConf.getFontSize();
             kterm.colorScheme = jsConf.getColorScheme();
+            kterm.font.family = jsConf.getFontStyle();
         }
     }
 
@@ -95,7 +96,7 @@
         onActiveChanged: hideFocus();
     }
 
-    JsConfig{id: jsConf }
+    JsConfig {id: jsConf }
 
 
     Column {
@@ -121,7 +122,7 @@
             objectName: "kbCtrl"
             visible: false
             width: parent.width
-            anchors{
+            anchors {
                 left: parent.left
                 leftMargin: units.gu(3)
             }
@@ -137,7 +138,7 @@
             objectName: "kbFn"
             visible: false
             width: parent.width
-            anchors{
+            anchors {
                 left: parent.left
                 leftMargin: units.gu(0.5)
             }
@@ -154,7 +155,7 @@
             objectName: "kbScrl"
             visible: false
             width: parent.width
-            anchors{
+            anchors {
                 left: parent.left
                 leftMargin: units.gu(1)
             }
@@ -220,7 +221,7 @@
                     }
                 }
 
-                Item{
+                Item {
                     id: ktermContainer
                     anchors.fill: parent
 
@@ -232,10 +233,7 @@
                         /// FONT SIZE = 24 (FINE FOR GNEXUS)
                         /// FONT SIZE = 12 (FINE FOR DESKTOP)
                         //////////////////////////////////////
-                        font.family: "Ubuntu Mono"
-                        font.pointSize: jsConf.getFontSize() //units.gu(1.5)
 
-                        colorScheme: jsConf.getColorScheme() //"DarkPastels"
                         width:  parent.width
                         height: Qt.inputMethod.visible ? parent.height - Qt.inputMethod.keyboardRectangle.height : parent.height
 
@@ -250,13 +248,17 @@
                         }
 
                         Component.onCompleted: {
+                            kterm.font.pointSize = jsConf.getFontSize();
+                            kterm.colorScheme = jsConf.getColorScheme();
+                            kterm.font.family = jsConf.getFontStyle();
+
                             // Change directory to $HOME
                             ksession.sendText("cd $HOME;clear;\n");
                         }
                     }
                 }
 
-                Loader{
+                Loader {
                     id: graphicalTerminal
                     z: 1.1
                     active: true
@@ -267,7 +269,7 @@
                         updateGraphicalParams();
                     }
 
-                    function updateGraphicalParams(){
+                    function updateGraphicalParams() {
                         active = jsConf.getEffectsEnabled();
                         item.bloom = jsConf.getBloom();
                         item.noise_strength = jsConf.getNoiseStrenght() * 0.8;
 
=== modified file 'src/app/qml/config/JsConfig.qml'
--- src/app/qml/config/JsConfig.qml	2014-09-20 10:54:37 +0000
+++ src/app/qml/config/JsConfig.qml	2014-10-07 11:18:20 +0000
@@ -33,6 +33,15 @@
         setSetting("fontSize", Math.round(size).toString() );
     }
 
+    //FontStyle
+    function getFontStyle(){
+        return getSetting("fontStyle", "Ubuntu Mono")
+    }
+
+    function setFontStyle(style){
+        setSetting("fontStyle", style)
+    }
+
     //Effects global switch
     function getEffectsEnabled(){
         return getSetting("effectsEnabled", "true") === "true";