diff --git a/src/Emulation.cpp b/src/Emulation.cpp index e3c896752..fb2737d55 100644 --- a/src/Emulation.cpp +++ b/src/Emulation.cpp @@ -13,6 +13,7 @@ #include // Konsole +#include "KonsoleSettings.h" #include "Screen.h" #include "ScreenWindow.h" #include "keyboardtranslator/KeyboardTranslator.h" @@ -246,6 +247,10 @@ void Emulation::receiveData(const char *text, int length) const QVector chars = readString.toUcs4(); receiveChars(chars); + if (KonsoleSettings::listenForZModemTerminalCodes() == false) { + return; + } + // look for z-modem indicator //-- someone who understands more about z-modems that I do may be able to move // this check into the above for loop? diff --git a/src/settings/GeneralSettings.ui b/src/settings/GeneralSettings.ui index 5492412b2..0a6002c92 100644 --- a/src/settings/GeneralSettings.ui +++ b/src/settings/GeneralSettings.ui @@ -37,7 +37,7 @@ 6 - + @@ -53,37 +53,17 @@ - - + + - Enable the security sensitive parts of the DBus API + Notifications: - - + + - Search: - - - - - - - - 0 - 0 - - - - Match using regular expressions - - - - - - - Remove window titlebar and frame + Focus terminals when the mouse pointer is moved over them @@ -100,121 +80,21 @@ - - - - - 0 - 0 - - - - When launching Konsole re-use existing process if possible - + + - Run all Konsole windows in a single process + Search: - - - - - 0 - 0 - - - - If enabled, profile settings will be ignored - + + - Remember window size + Remove window titlebar and frame - - - - Notifications: - - - - - - - - 0 - 0 - - - - Sets whether search should stop instead of wrapping - - - No wrap - - - - - - - - 0 - 0 - - - - Show window title on the titlebar - - - - - - - Focus terminals when the mouse pointer is moved over them - - - - - - - - 0 - 0 - - - - Sets whether the search is case sensitive - - - Case sensitive - - - - - - - Process and window: - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - Highlight all matches - - - - + 0 @@ -250,7 +130,49 @@ + + + + + 0 + 0 + + + + Highlight all matches + + + + + + + + 0 + 0 + + + + Show window title on the titlebar + + + + + + + 0 + 0 + + + + Sets whether search should stop instead of wrapping + + + No wrap + + + + Qt::Orientation::Vertical @@ -266,7 +188,56 @@ - + + + + Process and window: + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + When launching Konsole re-use existing process if possible + + + Run all Konsole windows in a single process + + + + + + + + 0 + 0 + + + + If enabled, profile settings will be ignored + + + Remember window size + + + + + + + Enable the security sensitive parts of the DBus API + + + + Qt::Orientation::Vertical @@ -282,6 +253,42 @@ + + + + + 0 + 0 + + + + Sets whether the search is case sensitive + + + Case sensitive + + + + + + + + 0 + 0 + + + + Match using regular expressions + + + + + + + Listen for ZModem terminal codes + + + diff --git a/src/settings/konsole.kcfg b/src/settings/konsole.kcfg index 42fbfd01c..7fdd0bb81 100644 --- a/src/settings/konsole.kcfg +++ b/src/settings/konsole.kcfg @@ -38,6 +38,11 @@ DBus API like runCommand will be enabled false + + + Automatic send/receive files over serial connections + false +