From fb724ec38b886ba9d7591239a2197812fef4eeb2 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 8 Jun 2023 15:46:14 +0200 Subject: [PATCH] Terminal: New keyboard lock icon Change-Id: Ie3964d599fb15def190c51dd33351fa0224cacfc Reviewed-by: Marcus Tillmanns --- src/plugins/terminal/images/keyboardlock.png | Bin 0 -> 180 bytes .../terminal/images/keyboardlock@2x.png | Bin 0 -> 333 bytes src/plugins/terminal/terminal.qrc | 2 + src/plugins/terminal/terminalicons.h | 7 ++++ src/plugins/terminal/terminalpane.cpp | 4 +- src/tools/icons/qtcreatoricons.svg | 36 ++++++++++++++++++ 6 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/plugins/terminal/images/keyboardlock.png create mode 100644 src/plugins/terminal/images/keyboardlock@2x.png diff --git a/src/plugins/terminal/images/keyboardlock.png b/src/plugins/terminal/images/keyboardlock.png new file mode 100644 index 0000000000000000000000000000000000000000..167f10a56b4b257f6b4be8bf9db0ce4dfb3cb0de GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqRC~HOhDb=V9^4q(%)sDq z(4J`mmzvS}(oYpHZyZTkA#zMehH3R@J%)xk+jp+Yiu2!D`;STHdg!yq*(+9k+^9e4 zA$vvtq$6gcolqdkr911BAi2z?xEB+u}sd(Cy`g#SBE i@6-zoJ^k08f#Ls8vn6d?rq0y|Imgr0&t;ucLK6U4cSV!{ literal 0 HcmV?d00001 diff --git a/src/plugins/terminal/images/keyboardlock@2x.png b/src/plugins/terminal/images/keyboardlock@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a095404451142daa01bd73a3218c14ff788bb5d5 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2A5lKEvd$ACoJs;?L#&WB#S|hh+|X z7+aT7@585zIa(K1?dokTW_{|qU>V;t)hiP0Y#Q>VSNYZ4WHxM2h`MzwyKM1RrCAG4 zHtH}%ExXEgN$%%~LWb|@i{bSJhLm>VA20{?#I7#?{~7$9XeU z=H4`zYiiqg!XQevHBslx*8?FDc^#J=#qWz7K0C0KtN7XK#QG=~+ikYF*}o32d@r~B m__4EVq|V+H{`UK0-6h_=NfVSB7N!J(!pYOs&t;ucLK6V{DU1XF literal 0 HcmV?d00001 diff --git a/src/plugins/terminal/terminal.qrc b/src/plugins/terminal/terminal.qrc index 63c28169dfd..60981bc2f91 100644 --- a/src/plugins/terminal/terminal.qrc +++ b/src/plugins/terminal/terminal.qrc @@ -1,5 +1,7 @@ + images/keyboardlock.png + images/keyboardlock@2x.png images/settingscategory_terminal.png images/settingscategory_terminal@2x.png images/terminal.png diff --git a/src/plugins/terminal/terminalicons.h b/src/plugins/terminal/terminalicons.h index ca503f50f96..911bf904863 100644 --- a/src/plugins/terminal/terminalicons.h +++ b/src/plugins/terminal/terminalicons.h @@ -15,4 +15,11 @@ static Utils::Icon CLOSE_TERMINAL_ICON( {{":/terminal/images/terminal.png", Utils::Theme::IconsBaseColor}, {":/utils/images/iconoverlay_close_small.png", Utils::Theme::IconsStopToolBarColor}}); +static Utils::Icon LOCK_KEYBOARD_ICON( + {{":/terminal/images/keyboardlock.png", Utils::Theme::IconsBaseColor}, + {":/codemodel/images/private.png", Utils::Theme::IconsBaseColor}}); + +static Utils::Icon UNLOCK_KEYBOARD_ICON( + {{":/terminal/images/keyboardlock.png", Utils::Theme::IconsBaseColor}}); + } // namespace Terminal diff --git a/src/plugins/terminal/terminalpane.cpp b/src/plugins/terminal/terminalpane.cpp index f77c9bf5f27..df3a37ee37c 100644 --- a/src/plugins/terminal/terminalpane.cpp +++ b/src/plugins/terminal/terminalpane.cpp @@ -247,10 +247,10 @@ void TerminalPane::initActions() auto updateLockKeyboard = [this](bool locked) { TerminalSettings::instance().lockKeyboard.setValue(locked); if (locked) { - lockKeyboard.setIcon(Icons::LOCKED_TOOLBAR.icon()); + lockKeyboard.setIcon(LOCK_KEYBOARD_ICON.icon()); lockKeyboard.setToolTip(Tr::tr("Keyboard shortcuts will be send to the Terminal")); } else { - lockKeyboard.setIcon(Icons::UNLOCKED_TOOLBAR.icon()); + lockKeyboard.setIcon(UNLOCK_KEYBOARD_ICON.icon()); lockKeyboard.setToolTip(Tr::tr("Keyboard shortcuts will be send to Qt Creator")); } }; diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 2c162eaa351..13a4fe5b918 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3604,6 +3604,42 @@ id="use3673" transform="matrix(-1,0,0,1,2258,0)" /> + + + + + +