diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/abaddon.cpp | 6 | ||||
-rw-r--r-- | src/components/chatinput.cpp | 6 | ||||
-rw-r--r-- | src/settings.cpp | 2 | ||||
-rw-r--r-- | src/settings.hpp | 3 |
4 files changed, 17 insertions, 0 deletions
diff --git a/src/abaddon.cpp b/src/abaddon.cpp index a1ed343..2fe2941 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -252,6 +252,12 @@ int Abaddon::StartGTK() { } #endif +#ifdef _WIN32 + if (m_settings.GetSettings().HideConsole) { + ShowWindow(GetConsoleWindow(), SW_HIDE); + } +#endif + // store must be checked before this can be called m_main_window->UpdateComponents(); diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index d19ac4b..28ed1ea 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -41,9 +41,15 @@ bool ChatInputText::ProcessKeyPress(GdkEventKey *event) { return true; } +#ifdef __APPLE__ + if ((event->state & GDK_MOD2_MASK) && event->keyval == GDK_KEY_v) { + return CheckHandleClipboardPaste(); + } +#else if ((event->state & GDK_CONTROL_MASK) && event->keyval == GDK_KEY_v) { return CheckHandleClipboardPaste(); } +#endif if (event->keyval == GDK_KEY_Return) { if (event->state & GDK_SHIFT_MASK) diff --git a/src/settings.cpp b/src/settings.cpp index 82401f5..0b868da 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -70,6 +70,7 @@ void SettingsManager::ReadSettings() { SMSTR("style", "unreadcolor", UnreadIndicatorColor); SMBOOL("notifications", "enabled", NotificationsEnabled); SMBOOL("notifications", "playsound", NotificationsPlaySound); + SMBOOL("windows", "hideconsole", HideConsole); #ifdef WITH_KEYCHAIN keychain::Error error {}; @@ -153,6 +154,7 @@ void SettingsManager::Close() { SMSTR("style", "unreadcolor", UnreadIndicatorColor); SMBOOL("notifications", "enabled", NotificationsEnabled); SMBOOL("notifications", "playsound", NotificationsPlaySound); + SMBOOL("windows", "hideconsole", HideConsole); #ifdef WITH_KEYCHAIN keychain::Error error {}; diff --git a/src/settings.hpp b/src/settings.hpp index 53f3423..40cb1d3 100644 --- a/src/settings.hpp +++ b/src/settings.hpp @@ -52,6 +52,9 @@ public: bool NotificationsEnabled { true }; #endif bool NotificationsPlaySound { true }; + + // [windows] + bool HideConsole { false }; }; SettingsManager(const std::string &filename); |