Skip to content

Commit 35082b3

Browse files
committed
Terminal: AA, frames
- Use the internal hack to draw frames using real lines, instead of font. - AntiAlias support - as config - Simplify the settings internally. Now bell is properly configuratble. - New version of KodoTerm. Fixes some alignment issues.
1 parent bf5f348 commit 35082b3

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ else()
5959

6060
CPMAddPackage("gh:diegoiast/qmdilib#39f491d76a2d0a11965fdffe4411c9a9d2dcac00")
6161
CPMAddPackage("gh:diegoiast/qutepart-cpp#c4ea0c251320c41bf7ab3868ecc29f270a90606f")
62-
CPMAddPackage("gh:diegoiast/command-palette-widget#28d9a0cf654334e6aa88369d7922bc1cfe683f1f")
62+
CPMAddPackage("gh:diegoiast/command-palette-widget#69eb447b61c9d042394a1404c71a0d0b54ac28c0")
6363
CPMAddPackage("gh:diegoiast/KodoTerm#9d016815076a451ad639fa021d46602585e91247")
6464
CPMAddPackage("gh:palacaze/image-viewer#125ea784f93327b471cd9b6b156285e40e70280a")
6565
CPMAddPackage("gh:dridk/QJsonModel#f5fa5988c0ee52fff39a42973c964d5480951f86")

src/plugins/Terminal/TerminalPlugin.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ TerminalPlugin::TerminalPlugin() {
103103
.build());
104104
// -> end hack
105105

106+
config.configItems.push_back(qmdiConfigItem::Builder()
107+
.setDisplayName(tr("Enable anti aliased painting"))
108+
.setKey(Config::AntiAliasKey)
109+
.setType(qmdiConfigItem::Bool)
110+
.setDefaultValue(true)
111+
.build());
106112
config.configItems.push_back(qmdiConfigItem::Builder()
107113
.setDisplayName(tr("Triple click selects whole line"))
108114
.setKey(Config::TrippleClickClickKey)
@@ -196,15 +202,7 @@ void TerminalPlugin::on_client_unmerged(qmdiHost *) { delete terminalDock; }
196202
void TerminalPlugin::loadConfig(QSettings &settings) {
197203

198204
IPlugin::loadConfig(settings);
199-
consoleConfig.setDefaults();
200-
consoleConfig.font = getConfig().getFont();
201-
consoleConfig.tripleClickSelectsLine = getConfig().getTrippleClickClick();
202-
consoleConfig.copyOnSelect = getConfig().getCopyOnSelect();
203-
consoleConfig.pasteOnMiddleClick = getConfig().getPasteOnMiddleClick();
204-
consoleConfig.audibleBell = getConfig().getAudioBell();
205-
consoleConfig.visualBell = getConfig().getVisualBell();
206-
consoleConfig.theme = TerminalTheme::loadTheme(getConfig().getThemeFile());
207-
console->setConfig(consoleConfig);
205+
configurationHasBeenModified();
208206
}
209207

210208
void TerminalPlugin::configurationHasBeenModified() {
@@ -221,7 +219,10 @@ void TerminalPlugin::configurationHasBeenModified() {
221219
consoleConfig.tripleClickSelectsLine = getConfig().getTrippleClickClick();
222220
consoleConfig.copyOnSelect = getConfig().getCopyOnSelect();
223221
consoleConfig.pasteOnMiddleClick = getConfig().getPasteOnMiddleClick();
222+
consoleConfig.textAntialiasing = getConfig().getAntiAlias();
223+
consoleConfig.visualBell = getConfig().getVisualBell();
224224
consoleConfig.theme = TerminalTheme::loadTheme(getConfig().getThemeFile());
225+
consoleConfig.customBoxDrawing = true;
225226
console->setConfig(consoleConfig);
226227
}
227228

src/plugins/Terminal/TerminalPlugin.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class TerminalPlugin : public IPlugin {
2727
CONFIG_DEFINE(PasteOnMiddleClick, bool)
2828
CONFIG_DEFINE(AudioBell, bool)
2929
CONFIG_DEFINE(VisualBell, bool)
30+
CONFIG_DEFINE(AntiAlias, bool)
3031
qmdiPluginConfig *config;
3132
};
3233
Config &getConfig() {

0 commit comments

Comments
 (0)