kvi_shortcuts: replace shortcuts

* replace Ctrl+Shift+U -> Alt+U (registered usermenu)
* replace Ctrl+Shift+E -> Alt+E (Emoticons controlbox)

resolves #1879

4 files changed, 14 insertions, 15 deletions

diff --git a/src/kvilib/config/kvi_shortcuts.h b/src/kvilib/config/kvi_shortcuts.h
index fc70c2012..330ba58dc 100644
--- a/src/kvilib/config/kvi_shortcuts.h
+++ b/src/kvilib/config/kvi_shortcuts.h
@@ -80,7 +80,6 @@
 * \def KVI_SHORTCUTS_INPUT_NEXT_CHAR_SELECT Move the selection to the right
 * \def KVI_SHORTCUTS_INPUT_NEXT_WORD Move to the end of the next word
 * \def KVI_SHORTCUTS_INPUT_NEXT_WORD_SELECT Select up to the end of the next word
-* \def KVI_SHORTCUTS_INPUT_UNDERLINE Insert Underline control character
 * \def KVI_SHORTCUTS_INPUT_PASTE Paste the clipboard contents (same as middle mouse click)
 * \def KVI_SHORTCUTS_INPUT_PLAINTEXT Insert the 'non-crypt' (plain text) KVIrc control character used to disable encryption of the current text line
 * \def KVI_SHORTCUTS_INPUT_PREV_CHAR Move the cursor to the left
@@ -161,7 +160,8 @@
 #define KVI_SHORTCUTS_INPUT_COMMANDLINE "Ctrl+Y"               // Ctrl+Y
 #define KVI_SHORTCUTS_INPUT_UNDO QKeySequence::Undo            // Ctrl+Z
 
-#define KVI_SHORTCUTS_INPUT_ICON "Ctrl+Alt+E"                  // Ctrl+Alt+E
+#define KVI_SHORTCUTS_INPUT_ICON "Alt+E"                       // Alt+E
+#define KVI_SHORTCUTS_USERS "Alt+U"                            // Alt+U
 
 #define KVI_SHORTCUTS_AWAY "Ctrl+Shift+A"                      // Ctrl+Shift+A
 #define KVI_SHORTCUTS_EDITORS_TOOLBAR "Ctrl+Shift+B"           // Ctrl+Shift+B
@@ -178,7 +178,6 @@
 #define KVI_SHORTCUTS_EDITORS_RAW "Ctrl+Shift+R"               // Ctrl+Shift+R
 #define KVI_SHORTCUTS_EDITORS_TESTER "Ctrl+Shift+S"            // Ctrl+Shift+S
 #define KVI_SHORTCUTS_THEME "Ctrl+Shift+T"                     // Ctrl+Shift+T
-#define KVI_SHORTCUTS_USERS "Ctrl+Shift+U"                     // Ctrl+Shift+U
 #define KVI_SHORTCUTS_EXEC "Ctrl+Shift+X"                      // Ctrl+Shift+X
 #define KVI_SHORTCUTS_INPUT_REDO QKeySequence::Redo            // Ctrl+Shift+Z
 
@@ -280,7 +279,8 @@
 		[b]Ctrl+"-":[/b] Decrease font size[br]
 		[b]Ctrl+0:[/b] Restore default font (and font size)[br]
 
-		[b]Ctrl+Alt+E:[/b] Open [i]Insert icon[/i] dialog[br]
+		[b]Alt+E:[/b] Open [i]Insert icon[/i] dialog[br]
+		[b]Alt+U:[/b] Open [i]Registered users[/i] dialog[br]
 
 		[b]Ctrl+Shift+A:[/b] Go away/back[br]
 		[b]Ctrl+Shift+B:[/b] Open [i]Manage Toolbars[/i] dialog[br]
@@ -297,7 +297,6 @@
 		[b]Ctrl+Shift+R:[/b] Open Raw events editor[br]
 		[b]Ctrl+Shift+S:[/b] Open Script tester[br]
 		[b]Ctrl+Shift+T:[/b] Open [i]Theme Options[/i] dialog[br]
-		[b]Ctrl+Shift+U:[/b] Open [i]Registered users[/i] dialog[br]
 		[b]Ctrl+Shift+X:[/b] Open [i]Execute Script[/i] dialog[br]
 		[b]Ctrl+Shift+Z:[/b] Redo last action[br]
 
diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp
index a2eddb5cd..46f598fd5 100644
--- a/src/kvirc/ui/KviInput.cpp
+++ b/src/kvirc/ui/KviInput.cpp
@@ -107,7 +107,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 	{
 		is1.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::History)));
 		m_pHistoryButton->setIcon(is1);
-		KviTalToolTip::add(m_pHistoryButton, __tr2qs("Show history<br>&lt;Ctrl+PageUp&gt;"));
+		KviTalToolTip::add(m_pHistoryButton, __tr2qs("Show history Ctrl+PageUp"));
 		connect(m_pHistoryButton, SIGNAL(clicked()), this, SLOT(historyButtonClicked()));
 	}
 	else
@@ -124,7 +124,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 	QIcon is3;
 	is3.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::BigGrin)));
 	m_pIconButton->setIcon(is3);
-	KviTalToolTip::add(m_pIconButton, __tr2qs("Show icons popup<br>&lt;Ctrl+Alt+E&gt;<br>See also /help texticons"));
+	KviTalToolTip::add(m_pIconButton, __tr2qs("Show icons popup Alt+E<br>See also /help texticons"));
 	connect(m_pIconButton, SIGNAL(clicked()), this, SLOT(iconButtonClicked()));
 
 	m_pCommandlineModeButton = new QToolButton(m_pButtonContainer);
@@ -151,7 +151,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 	is2.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Terminal)), QIcon::Normal, QIcon::Off);
 	m_pMultiEditorButton->setIcon(is2);
 
-	QString szTip = __tr2qs("Multi-line editor<br>&lt;Alt+Return&gt;");
+	QString szTip = __tr2qs("Multi-line editor Alt+Return");
 	KviTalToolTip::add(m_pMultiEditorButton, szTip);
 
 	connect(m_pMultiEditorButton, SIGNAL(toggled(bool)), this, SLOT(multiLineEditorButtonToggled(bool)));
@@ -319,10 +319,10 @@ void KviInput::multiLineEditorButtonToggled(bool bOn)
 		m_pHelpLabel = new QLabel();
 		m_pHelpLabel->setContentsMargins(15, 5, 0, 0);
 
-		QString tmpHelpLabel = __tr2qs("<Ctrl+Return>; submits, <Alt+Return>; hides this editor");
+		QString tmpHelpLabel = __tr2qs("Ctrl+Return; submits contents, Alt+Return; hides this editor");
 #ifdef COMPILE_ON_MAC
-		tmpHelpLabel.replace(QString("<Ctrl+Return>;"), QString("⌘↩"));
-		tmpHelpLabel.replace(QString("<Alt+Return>;"), QString("⌥↩"));
+		tmpHelpLabel.replace(QString("Ctrl+Return;"), QString("⌘↩"));
+		tmpHelpLabel.replace(QString("Alt+Return;"), QString("⌥↩"));
 #endif
 		m_pHelpLabel->setText(tmpHelpLabel);
 		m_pLayout->addWidget(m_pHelpLabel, 0, 0, 1, 1);
@@ -405,7 +405,7 @@ void KviInput::applyOptions()
 		QIcon is1;
 		is1.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::History)));
 		m_pHistoryButton->setIcon(is1);
-		KviTalToolTip::add(m_pHistoryButton, __tr2qs("Show history<br>&lt;Ctrl+PageUp&gt;"));
+		KviTalToolTip::add(m_pHistoryButton, __tr2qs("Show history Ctrl+PageUp"));
 		connect(m_pHistoryButton, SIGNAL(clicked()), this, SLOT(historyButtonClicked()));
 	}
 	else
diff --git a/src/kvirc/ui/KviTextIconWindow.h b/src/kvirc/ui/KviTextIconWindow.h
index 585f28170..63b528321 100644
--- a/src/kvirc/ui/KviTextIconWindow.h
+++ b/src/kvirc/ui/KviTextIconWindow.h
@@ -65,12 +65,12 @@ public:
 private:
 	QWidget * m_pOwner;
 	QTableWidget * m_pTable;
-	bool m_bAltMode; // in alt mode the inserted string will contains also the Ctrl+Alt+E escape code
+	bool m_bAltMode; // in alt mode the inserted string will contains also the Alt+E escape code
 public:
 	/**
 	* \brief Shows the popup
 	* \param pOwner The owner of the widget
-	* \param bAltMode Whether to prepend the Ctrl+Alt+E escape code in the inserted string
+	* \param bAltMode Whether to prepend the Alt+E escape code in the inserted string
 	* \return void
 	*/
 	void popup(QWidget * pOwner, bool bAltMode);
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index d14868758..49dcefdb8 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -87,7 +87,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
 	m_pTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
 	mergeTip(m_pTable->viewport(), __tr2qs_ctx("This table contains the text icon associations.<br>"
-	                                           "KVIrc will use them to display the Ctrl+Alt+E escape sequences "
+	                                           "KVIrc will use them to display the Alt+E escape sequences "
 	                                           "and eventually the emoticons.", "options"));
 
 	layout()->addWidget(m_pTable, 0, 0, 1, 3);