Merge pull request #213 from Swordfish90/unstable

Mege latest changes for final version.
Swordfish90 · Jan 24, 2015 · 6446f1d · 6446f1d
2 parents 40eb51e + 01f391d
commit 6446f1d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -4,14 +4,14 @@
 cool-retro-term is a terminal emulator which mimics the look and feel of the old cathode tube screens.
 It has been designed to be eye-candy, customizable, and reasonably lightweight.
 
-It uses the QML port of qtermwidget (Konsole) developed by me: https://github.com/Swordfish90/qmltermwidget
+It uses the QML port of qtermwidget (Konsole) developed by me: https://github.com/Swordfish90/qmltermwidget .
 
-This terminal emulator requires Qt 5.2 or higher to run.
+This terminal emulator works under Linux and OSX and requires Qt 5.2 or higher.
 
 ##Screenshots
-![Image](<http://i.imgur.com/NUfvnlu.png>)
-![Image](<http://i.imgur.com/4LpfLF8.png>)
-![Image](<http://i.imgur.com/MMmM6Ht.png>)
+![Image](<http://i.imgur.com/I6wq1cC.png>)
+![Image](<http://i.imgur.com/12EqlpL.png>)
+![Image](<http://i.imgur.com/Lx0acQz.jpg>)
 
 ##Get cool-retro-term
 You can either build cool-retro-term yourself (see below) or walk the easy way and install one of these packages:
@@ -33,6 +33,8 @@ A word of warning: USE flags and keywords are to be added to portage's configura
 
 Ubuntu users of 14.04 LTS (Trusty) can use [this PPA](https://launchpad.net/~bugs-launchpad-net-falkensweb)
 
+OSX users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases
+
 ##Build instructions (Linux)
 
 ##Dependencies

diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml
@@ -24,7 +24,7 @@ import QtQuick.Controls 1.0
 import "utils.js" as Utils
 
 QtObject{
-    property string version: "1.0.0 RC1"
+    property string version: "1.0.0"
 
     // STATIC CONSTANTS ////////////////////////////////////////////////////////
 
@@ -89,7 +89,7 @@ QtObject{
 
     property bool lowResolutionFont: false
 
-    property var fontNames: ["HERMIT", "COMMODORE_PET", "COMMODORE_PET"]
+    property var fontNames: ["TERMINUS_SCALED", "COMMODORE_PET", "COMMODORE_PET"]
     property var fontlist: fontManager.item.fontlist
 
     signal terminalFontChanged(string fontSource, int pixelSize, int lineSpacing, real screenScaling, real fontWidth)

diff --git a/app/qml/SettingsPerformanceTab.qml b/app/qml/SettingsPerformanceTab.qml
@@ -36,22 +36,25 @@ Tab{
                 anchors.fill: parent
                 rows: 2
                 columns: 3
-                CheckBox{
-                    property int fps: checked ? slider.value : 0
-                    onFpsChanged: appSettings.fps = fps
-                    checked: appSettings.fps !== 0
-                    text: qsTr("Effects FPS")
-                }
+                Label{text: qsTr("Effects FPS")}
                 Slider{
-                    id: slider
                     Layout.fillWidth: true
+                    id: fpsSlider
+                    onValueChanged: {
+                        if (enabled) {
+                            appSettings.fps = value !== 60 ? value + 1 : 0;
+                        }
+                    }
                     stepSize: 1
-                    maximumValue: 60
-                    minimumValue: 1
-                    enabled: appSettings.fps !== 0
-                    value: appSettings.fps !== 0 ? appSettings.fps : 24
+                    enabled: false
+                    Component.onCompleted: {
+                        minimumValue = 0;
+                        maximumValue = 60;
+                        value = appSettings.fps !== 0 ? appSettings.fps - 1 : 60;
+                        enabled = true;
+                    }
                 }
-                SizedLabel { text: slider.value }
+                SizedLabel{text: appSettings.fps !== 0 ? appSettings.fps : qsTr("Max")}
                 Label{text: qsTr("Texture Quality")}
                 Slider{
                     Layout.fillWidth: true