ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Niklas Wenzel has proposed merging lp:~nikwen/ubuntu-terminal-app/font-size-fix into lp:ubuntu-terminal-app.

Commit message:
Make font size relative to "medium" fontSize for Labels

Default font size is set to be the same as that of gnome-terminal on a Unity 7 desktop

Requested reviews:
  Stefano Verzegnassi (verzegnassi-stefano)
Related bugs:
  Bug #1532950 in Ubuntu Terminal App: "Font size too big on phone, and display too tall with devicePixelRatio"
  https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1532950

For more details, see:
https://code.launchpad.net/~nikwen/ubuntu-terminal-app/font-size-fix/+merge/285272

Make font size relative to "medium" fontSize for Labels

Default font size is set to be the same as that of gnome-terminal on a Unity 7 desktop
-- 
Your team Ubuntu Terminal Developers is subscribed to branch lp:ubuntu-terminal-app.

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2016-01-20 01:24:35 +0000
+++ po/com.ubuntu.terminal.pot	2016-02-06 16:34:02 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the  package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2016-02-06 17:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,6 +53,10 @@
 msgid "Authentication failed"
 msgstr ""
 
+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:124
+msgid "Color Scheme"
+msgstr ""
+
 #: ../src/app/qml/KeyboardBar.qml:174
 msgid "Change Keyboard"
 msgstr ""
@@ -149,39 +153,35 @@
 msgid "ENTER"
 msgstr ""
 
-#: ../src/app/qml/LayoutsPage.qml:27 ../src/app/qml/SettingsPage.qml:36
+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:42
 msgid "Layouts"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:27
+#: ../src/app/qml/SettingsPage.qml:26
 msgid "Settings"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:42
+#: ../src/app/qml/SettingsPage.qml:57
 msgid "Show Keyboard Bar"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:50
+#: ../src/app/qml/SettingsPage.qml:73
 msgid "Show Keyboard Button"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:60
+#: ../src/app/qml/SettingsPage.qml:91
 msgid "Font Size:"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:93
-msgid "Color Scheme"
-msgstr ""
-
-#: ../src/app/qml/TabsPage.qml:8
+#: ../src/app/qml/TabsPage.qml:7
 msgid "Tabs"
 msgstr ""
 
-#: ../src/app/qml/TabsPage.qml:14
+#: ../src/app/qml/TabsPage.qml:13
 msgid "New tab"
 msgstr ""
 
-#: ../src/app/qml/TerminalPage.qml:164
+#: ../src/app/qml/TerminalPage.qml:170
 msgid "Selection Mode"
 msgstr ""
 

=== modified file 'src/app/qml/TerminalComponent.qml'
--- src/app/qml/TerminalComponent.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/TerminalComponent.qml	2016-02-06 16:34:02 +0000
@@ -12,7 +12,7 @@
 
         colorScheme: settings.colorScheme
         font.family: settings.fontStyle
-        font.pointSize: settings.fontSize
+        font.pixelSize: FontUtils.sizeToPixels("medium") * settings.fontSize / 10
 
         signal sessionFinished(var session);
 

=== modified file 'src/app/qml/TerminalSettings.qml'
--- src/app/qml/TerminalSettings.qml	2015-12-19 05:14:39 +0000
+++ src/app/qml/TerminalSettings.qml	2016-02-06 16:34:02 +0000
@@ -11,9 +11,9 @@
     property alias showKeyboardBar: innerSettings.showKeyboardBar
     property alias showKeyboardButton: innerSettings.showKeyboardButton
 
-    readonly property int defaultFontSize: units.gu(0.4)
-    readonly property int minFontSize: 2
-    readonly property int maxFontSize: 32
+    readonly property int defaultFontSize: 13
+    readonly property int minFontSize: 4
+    readonly property int maxFontSize: 50
 
     property alias jsonVisibleProfiles: innerSettings.jsonVisibleProfiles