From 0264fbebcdcf4752723fdc6f8c28845c74265216 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Fri, 26 Dec 2014 17:51:10 +0100 Subject: [PATCH] Small adjustments in the settings dialog. --- app/qml/SettingsGeneralTab.qml | 4 ++++ app/qml/SettingsTerminalTab.qml | 32 ++++++++++++++++---------------- app/qml/SettingsWindow.qml | 4 ++-- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app/qml/SettingsGeneralTab.qml b/app/qml/SettingsGeneralTab.qml index 66b9721..9e0f55c 100644 --- a/app/qml/SettingsGeneralTab.qml +++ b/app/qml/SettingsGeneralTab.qml @@ -81,6 +81,10 @@ Tab{ currentIndex = -1; // Unselect the profile. } } + Item { + // Spacing + Layout.fillHeight: true + } Button{ Layout.fillWidth: true text: qsTr("Import") diff --git a/app/qml/SettingsTerminalTab.qml b/app/qml/SettingsTerminalTab.qml index e3649cd..83f338d 100644 --- a/app/qml/SettingsTerminalTab.qml +++ b/app/qml/SettingsTerminalTab.qml @@ -28,7 +28,7 @@ Tab{ GroupBox{ property var rasterization: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")][appSettings.rasterization] title: qsTr("Font" + "(" + rasterization + ")") - Layout.fillWidth: true + anchors { left: parent.left; right: parent.right } GridLayout{ anchors.fill: parent columns: 2 @@ -101,9 +101,23 @@ Tab{ } GroupBox{ title: qsTr("Colors") - Layout.fillWidth: true + anchors { left: parent.left; right: parent.right } ColumnLayout{ anchors.fill: parent + ColumnLayout{ + Layout.fillWidth: true + CheckableSlider{ + name: qsTr("Chroma Color") + onNewValue: appSettings.chromaColor = newValue + value: appSettings.chromaColor + } + CheckableSlider{ + name: qsTr("Saturation Color") + onNewValue: appSettings.saturationColor = newValue + value: appSettings.saturationColor + enabled: appSettings.chromaColor !== 0 + } + } RowLayout{ Layout.fillWidth: true ColorButton{ @@ -121,20 +135,6 @@ Tab{ button_color: appSettings._backgroundColor } } - ColumnLayout{ - Layout.fillWidth: true - CheckableSlider{ - name: qsTr("Chroma Color") - onNewValue: appSettings.chromaColor = newValue - value: appSettings.chromaColor - } - CheckableSlider{ - name: qsTr("Saturation Color") - onNewValue: appSettings.saturationColor = newValue - value: appSettings.saturationColor - enabled: appSettings.chromaColor !== 0 - } - } } } } diff --git a/app/qml/SettingsWindow.qml b/app/qml/SettingsWindow.qml index 9f4653f..cb93959 100644 --- a/app/qml/SettingsWindow.qml +++ b/app/qml/SettingsWindow.qml @@ -27,8 +27,8 @@ import QtQuick.Dialogs 1.1 Window { id: settings_window title: qsTr("Settings") - width: 640 - height: 440 + width: 560 + height: 360 property int tabmargins: 15