From b9de57aec15c80b4ad08599989c5ac45b6b5eaa6 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Mon, 14 Jul 2014 00:53:17 +0200 Subject: [PATCH] Added menu entries and shortcuts to increase and decrease font sizes. --- app/ApplicationSettings.qml | 15 +++++++++++++-- app/SettingsTerminalTab.qml | 6 +++--- app/main.qml | 22 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/app/ApplicationSettings.qml b/app/ApplicationSettings.qml index 3b4f70d..9b82257 100644 --- a/app/ApplicationSettings.qml +++ b/app/ApplicationSettings.qml @@ -107,11 +107,22 @@ Item{ onLoaded: handleFontChanged() } - property var fontlist: fontManager.item.fontlist + signal fontScalingChanged property var fontScalingList: fontManager.item.fontScalingList + property var fontScalingIndexes: [5,1,1] + + function setScalingIndex(newScaling){ + fontScalingIndexes[rasterization] = newScaling; + fontScalingChanged(); + handleFontChanged(); + } + + function getScalingIndex(){ + return fontScalingIndexes[rasterization]; + } property var fontIndexes: [0,0,0] - property var fontScalingIndexes: [5,1,1] + property var fontlist: fontManager.item.fontlist function handleFontChanged(){ if(!fontManager.item) return; diff --git a/app/SettingsTerminalTab.qml b/app/SettingsTerminalTab.qml index b25f68a..9228826 100644 --- a/app/SettingsTerminalTab.qml +++ b/app/SettingsTerminalTab.qml @@ -76,12 +76,12 @@ Tab{ value: updateIndex() onValueChanged: { if(!enabled) return; //Ugly and hacky solution. Look for a better solution. - shadersettings.fontScalingIndexes[shadersettings.rasterization] = value; - shadersettings.handleFontChanged(); + shadersettings.setScalingIndex(value); } function updateIndex(){ - value = shadersettings.fontScalingIndexes[shadersettings.rasterization]; + value = shadersettings.getScalingIndex(); } + Component.onCompleted: shadersettings.fontScalingChanged.connect(updateIndex); } Text{ text: shadersettings.fontScalingList[scalingChanger.value].toFixed(2) diff --git a/app/main.qml b/app/main.qml index c1bc791..be0a89c 100644 --- a/app/main.qml +++ b/app/main.qml @@ -69,6 +69,25 @@ ApplicationWindow{ shortcut: "Ctrl+Shift+V" onTriggered: terminal.pasteClipboard() } + Action{ + id: zoomIn + text: qsTr("&Zoom In") + shortcut: "Ctrl++" + onTriggered: { + var oldScaling = shadersettings.fontScalingIndexes[shadersettings.rasterization]; + var maxScalingIndex = shadersettings.fontScalingList.length - 1; + shadersettings.setScalingIndex(Math.min(oldScaling + 1, maxScalingIndex)); + } + } + Action{ + id: zoomOut + text: qsTr("&Zoom Out") + shortcut: "Ctrl+-" + onTriggered: { + var oldScaling = shadersettings.fontScalingIndexes[shadersettings.rasterization]; + shadersettings.setScalingIndex(Math.max(oldScaling - 1, 0)); + } + } menuBar: MenuBar { id: menubar @@ -89,6 +108,9 @@ ApplicationWindow{ title: qsTr("View") visible: shadersettings.fullscreen ? false : true MenuItem {action: fullscreenAction} + MenuSeparator{} + MenuItem {action: zoomIn} + MenuItem {action: zoomOut} } } ApplicationSettings{