Rearrange settings window.

app/qml/SettingsEffectsTab.qml

@@ -23,62 +23,92 @@ import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
 Tab{
-    GroupBox{
-        title: qsTr("Effects")
+    ColumnLayout{
         anchors.fill: parent
-        ColumnLayout{
-            anchors.fill: parent
-            spacing: 2
-            CheckableSlider{
-                name: qsTr("Bloom")
-                onNewValue: appSettings.bloom = newValue
-                value: appSettings.bloom
+        spacing: 2
+
+        GroupBox{
+            title: qsTr("Effects")
+            Layout.fillWidth: true
+
+            ColumnLayout {
+                anchors.fill: parent
+
+                CheckableSlider{
+                    name: qsTr("Bloom")
+                    onNewValue: appSettings.bloom = newValue
+                    value: appSettings.bloom
+                }
+                CheckableSlider{
+                    name: qsTr("BurnIn")
+                    onNewValue: appSettings.burnIn = newValue
+                    value: appSettings.burnIn
+                }
+                CheckableSlider{
+                    name: qsTr("Static Noise")
+                    onNewValue: appSettings.staticNoise = newValue
+                    value: appSettings.staticNoise
+                }
+                CheckableSlider{
+                    name: qsTr("Jitter")
+                    onNewValue: appSettings.jitter = newValue
+                    value: appSettings.jitter
+                }
+                CheckableSlider{
+                    name: qsTr("Glow Line")
+                    onNewValue: appSettings.glowingLine = newValue;
+                    value: appSettings.glowingLine
+                }
+                CheckableSlider{
+                    name: qsTr("Screen Curvature")
+                    onNewValue: appSettings.screenCurvature = newValue;
+                    value: appSettings.screenCurvature;
+                }
+                CheckableSlider{
+                    name: qsTr("Ambient Light")
+                    onNewValue: appSettings.ambientLight = newValue;
+                    value: appSettings.ambientLight
+                    enabled: appSettings.framesIndex !== 0
+                }
+                CheckableSlider{
+                    name: qsTr("Flickering")
+                    onNewValue: appSettings.flickering = newValue;
+                    value: appSettings.flickering;
+                }
+                CheckableSlider{
+                    name: qsTr("Horizontal Sync")
+                    onNewValue: appSettings.horizontalSync = newValue;
+                    value: appSettings.horizontalSync;
+                }
+                CheckableSlider{
+                    name: qsTr("RGB Shift")
+                    onNewValue: appSettings.rbgShift = newValue;
+                    value: appSettings.rbgShift;
+                }
             }
-            CheckableSlider{
-                name: qsTr("BurnIn")
-                onNewValue: appSettings.burnIn = newValue
-                value: appSettings.burnIn
-            }
-            CheckableSlider{
-                name: qsTr("Static Noise")
-                onNewValue: appSettings.staticNoise = newValue
-                value: appSettings.staticNoise
-            }
-            CheckableSlider{
-                name: qsTr("Jitter")
-                onNewValue: appSettings.jitter = newValue
-                value: appSettings.jitter
-            }
-            CheckableSlider{
-                name: qsTr("Glow Line")
-                onNewValue: appSettings.glowingLine = newValue;
-                value: appSettings.glowingLine
-            }
-            CheckableSlider{
-                name: qsTr("Screen Curvature")
-                onNewValue: appSettings.screenCurvature = newValue;
-                value: appSettings.screenCurvature;
-            }
-            CheckableSlider{
-                name: qsTr("Ambient Light")
-                onNewValue: appSettings.ambientLight = newValue;
-                value: appSettings.ambientLight
-                enabled: appSettings.framesIndex !== 0
-            }
-            CheckableSlider{
-                name: qsTr("Flickering")
-                onNewValue: appSettings.flickering = newValue;
-                value: appSettings.flickering;
-            }
-            CheckableSlider{
-                name: qsTr("Horizontal Sync")
-                onNewValue: appSettings.horizontalSync = newValue;
-                value: appSettings.horizontalSync;
-            }
-            CheckableSlider{
-                name: qsTr("RGB Shift")
-                onNewValue: appSettings.rbgShift = newValue;
-                value: appSettings.rbgShift;
+        }
+
+        GroupBox{
+            title: qsTr("Lights")
+            Layout.fillWidth: true
+            GridLayout{
+                anchors.fill: parent
+                columns: 2
+                Label{ text: qsTr("Brightness") }
+                SimpleSlider{
+                    onValueChanged: appSettings.brightness = value
+                    value: appSettings.brightness
+                }
+                Label{ text: qsTr("Contrast") }
+                SimpleSlider{
+                    onValueChanged: appSettings.contrast = value
+                    value: appSettings.contrast
+                }
+                Label{ text: qsTr("Opacity") }
+                SimpleSlider{
+                    onValueChanged: appSettings.windowOpacity = value
+                    value: appSettings.windowOpacity
+                }
             }
         }
     }

app/qml/SettingsScreenTab.qml

@@ -1,67 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordfish90/cool-retro-term
-*
-* This file is part of cool-retro-term.
-*
-* cool-retro-term is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*******************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.1
-
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
-        GroupBox{
-            title: qsTr("Rasterization Mode")
-            Layout.fillWidth: true
-            ComboBox {
-                id: rasterizationBox
-                property string selectedElement: model[currentIndex]
-                anchors.fill: parent
-                model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")]
-                currentIndex: appSettings.rasterization
-                onCurrentIndexChanged: {
-                    appSettings.rasterization = currentIndex
-                }
-            }
-        }
-        GroupBox{
-            title: qsTr("Lights")
-            Layout.fillWidth: true
-            GridLayout{
-                anchors.fill: parent
-                columns: 2
-                Label{ text: qsTr("Brightness") }
-                SimpleSlider{
-                    onValueChanged: appSettings.brightness = value
-                    value: appSettings.brightness
-                }
-                Label{ text: qsTr("Contrast") }
-                SimpleSlider{
-                    onValueChanged: appSettings.contrast = value
-                    value: appSettings.contrast
-                }
-                Label{ text: qsTr("Opacity") }
-                SimpleSlider{
-                    onValueChanged: appSettings.windowOpacity = value
-                    value: appSettings.windowOpacity
-                }
-            }
-        }
-    }
-}

app/qml/SettingsTerminalTab.qml

@@ -27,13 +27,26 @@ import "Components"
 Tab{
     ColumnLayout{
         anchors.fill: parent
+
         GroupBox{
-            property var rasterization: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")][appSettings.rasterization]
-            title: qsTr("Font " + "(" + rasterization + ")")
+            title: qsTr("Font")
             Layout.fillWidth: true
             GridLayout{
                 anchors.fill: parent
                 columns: 2
+                Label { text: qsTr("Rasterization") }
+                ComboBox {
+                    id: rasterizationBox
+
+                    property string selectedElement: model[currentIndex]
+
+                    Layout.fillWidth: true
+                    model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")]
+                    currentIndex: appSettings.rasterization
+                    onCurrentIndexChanged: {
+                        appSettings.rasterization = currentIndex
+                    }
+                }
                 Label{ text: qsTr("Name") }
                 ComboBox{
                     id: fontChanger

app/qml/SettingsWindow.qml

@@ -28,7 +28,7 @@ Window {
     id: settings_window
     title: qsTr("Settings")
     width: 580
-    height: 400
+    height: 500
 
     property int tabmargins: 15
 
@@ -42,12 +42,6 @@ Window {
             anchors.fill: parent
             anchors.margins: tabmargins
         }
-        SettingsScreenTab{
-            id: screenTab
-            title: qsTr("Screen")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
         SettingsTerminalTab{
             id: terminalTab
             title: qsTr("Terminal")

app/qml/resources.qrc

@@ -32,7 +32,6 @@
         <file>fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf</file>
         <file>fonts/modern-hermit/Hermit-medium.otf</file>
         <file>fonts/modern-inconsolata/Inconsolata.otf</file>
-        <file>SettingsScreenTab.qml</file>
         <file>fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf</file>
         <file>../icons/32x32/cool-retro-term.png</file>
         <file>Components/SizedLabel.qml</file>