Testing your memory skills: changed all the hotkeys again;

Avoided all the keys that collides with special characters under windows and most of the keys used by kde wm
Re-updated documentations

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3576 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 34 insertions, 63 deletions

diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 7f951ea79..4910e6775 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -47,24 +47,6 @@
 
 #include <QObject>
 
-// Ctrl+Alt+S : Servers dialog
-// Ctrl+Alt+I : Identity dialog
-// Ctrl+Alt+O : General options
-// Ctrl+Alt+T : Theme options
-// Ctrl+Alt+J : Join Channels
-// Ctrl+Alt+N : New irc context
-// Ctrl+Alt+H : Show help index
-// Ctrl+Alt+M : Manage Script Addons
-// Ctrl+Alt+F : Manage Themes
-// Ctrl+Alt+U : Edit regusers
-// Ctrl+S : Execute script
-// Ctrl+Q : Action editor
-// Ctrl+A : Alias editor
-// Ctrl+E : Event editor
-// Ctrl+P : Popup editor
-// Ctrl+Y : Raw event editor
-// Ctrl+T : Customize toolbars
-
 void register_core_actions(KviActionManager * m)
 {
 	m->registerAction(new KviConnectAction(m)); // this as parent will destroy it on exit!
@@ -115,7 +97,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_servers.png",
 		KVI_SMALLICON_SERVER,
 		0,
-		"Ctrl+Alt+S");
+		"Ctrl+S");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_MANAGEADDONS,
@@ -126,7 +108,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_addons.png",
 		KVI_SMALLICON_ADDONS,
 		0,
-		"Ctrl+Alt+M");
+		QString());
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_EDITREGUSERS,
@@ -137,7 +119,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_regusers.png",
 		KVI_SMALLICON_REGUSERS,
 		0,
-		"Ctrl+Alt+U");
+		"Ctrl+Shift+U");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_IDENTITYOPTIONS,
@@ -148,7 +130,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_identity.png",
 		KVI_SMALLICON_WHO,
 		0,
-		"Ctrl+Alt+I");
+		"Ctrl+Shift+I");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_SOCKETSPY,
@@ -192,7 +174,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_settings.png",
 		KVI_SMALLICON_OPTIONS,
 		0,
-		"Ctrl+Alt+O");
+		"Ctrl+Shift+O");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_THEMEOPTIONS,
@@ -203,7 +185,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_themeoptions.png",
 		KVI_SMALLICON_THEMEOPTIONS,
 		0,
-		"Ctrl+Alt+T");
+		"Ctrl+Shift+T");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_MANAGETHEMES,
@@ -214,7 +196,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_theme.png",
 		KVI_SMALLICON_THEME,
 		0,
-		"Ctrl+Alt+F");
+		QString());
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_TOOLBAREDITOR,
@@ -225,7 +207,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_toolbareditor.png",
 		KVI_SMALLICON_TOOLBAR,
 		0,
-		"Ctrl+T");
+		QString());
 
 
 	SCRIPT_ACTION(
@@ -237,7 +219,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_channels.png",
 		KVI_SMALLICON_CHANNEL,
 		KviKvsAction::NeedsConnection | KviKvsAction::NeedsContext,
-		"Ctrl+Alt+J");
+		"Ctrl+J");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_ACTIONEDITOR,
@@ -248,7 +230,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_actioneditor.png",
 		KVI_SMALLICON_SCRIPTACTION,
 		0,
-		"Ctrl+Q");
+		"Ctrl+Shift+Q");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_ALIASEDITOR,
@@ -259,7 +241,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_aliaseditor.png",
 		KVI_SMALLICON_ALIAS,
 		0,
-		"Ctrl+Alt+A");
+		"Ctrl+Shift+L");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_EVENTEDITOR,
@@ -270,7 +252,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_eventeditor.png",
 		KVI_SMALLICON_EVENT,
 		0,
-		"Ctrl+E");
+		"Ctrl+Shift+E");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_POPUPEDITOR,
@@ -281,7 +263,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_popupeditor.png",
 		KVI_SMALLICON_POPUP,
 		0,
-		"Ctrl+P");
+		"Ctrl+Shift+P");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_RAWEDITOR,
@@ -292,7 +274,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_raweditor.png",
 		KVI_SMALLICON_RAWEVENT,
 		0,
-		"Ctrl+Y");
+		"Ctrl+Shift+R");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_CODETESTER,
@@ -303,7 +285,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_codetester.png",
 		KVI_SMALLICON_BOMB,
 		0,
-		"Ctrl+Alt+C");
+		"Ctrl+Shift+S");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_EXECUTEKVS,
@@ -314,18 +296,18 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_folder.png",
 		KVI_SMALLICON_FOLDER,
 		0,
-		"Ctrl+S");
+		"Ctrl+Shift+X");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_HELPINDEX,
-		"help",
+		"help -m",
 		__tr2qs("Help Index"),
 		__tr2qs("Shows the documentation index"),
 		KviActionManager::categoryGeneric(),
 		"kvi_bigicon_help.png",
 		KVI_SMALLICON_HELP,
 		0,
-		"Ctrl+Alt+H");
+		"F1");
 
 	SCRIPT_ACTION(
 		KVI_COREACTION_KVIRCMAILINGLIST,
@@ -418,7 +400,7 @@ void register_core_actions(KviActionManager * m)
 		"kvi_bigicon_newirccontext.png",
 		KVI_SMALLICON_CONSOLE,
 		0,
-		"Ctrl+Alt+N");
+		"Ctrl+N");
 
 	SLOT_ACTION(
 		KVI_COREACTION_QUITKVIRC,
@@ -538,7 +520,7 @@ KviConnectAction::KviConnectAction(QObject * pParent)
 	KVI_BIGICON_CONNECTED,
 	KVI_SMALLICON_NONE, // no small icon for now
 	NeedsContext | NeedsConnection,
-	QString("Ctrl+Alt+C"))
+	QString("Ctrl+Shift+C"))
 {
 }
 
@@ -979,7 +961,7 @@ KviGoAwayAction::KviGoAwayAction(QObject * pParent)
 	"kvi_bigicon_nokeyboard.png",
 	KVI_SMALLICON_NOTAWAY,
 	KviKvsAction::NeedsContext | KviKvsAction::NeedsConnection,
-	"Ctrl+Alt+A")
+	"Ctrl+Shift+A")
 {
 }
 
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 05e12cf9b..626b6f3e9 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -325,8 +325,8 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId)
 		[b]PageDown[/b]: Scrolls the output window down one page[br]
 		[b]Shift+PageUp[/b]: Scrolls the output window up one line[br]
 		[b]Shift+PageDown[/b]: Scrolls the output window down one line[br]
-		[b]Ctrl+Backspace[/b]: Shows or hides the multiline editor[br]
-		[b]Ctrl+F4[/b]: Closes the current window[br]
+		[b]Alt+Enter[/b]: Shows or hides the multiline editor[br]
+		[b]Ctrl+W[/b]: Closes the current window[br]
 		[b]Alt+&lt;numeric_sequence&gt;[/b]: Inserts the character by ASCII/Unicode code
 		[example]
 			Alt+32: Inserts ASCII/Unicode character 32: ' ' (a space)
@@ -350,7 +350,6 @@ void KviFrame::installAccelerators()
 	new QShortcut(QKeySequence(Qt::Key_Right + Qt::ALT + Qt::SHIFT), this, SLOT(switchToNextWindowInContext()), 0, Qt::ApplicationShortcut);
 
 	static int accel_table[] = {
-		Qt::Key_F4 + Qt::CTRL ,     // close current window
 		Qt::Key_1 + Qt::CTRL ,       // script accels...
 		Qt::Key_2 + Qt::CTRL ,
 		Qt::Key_3 + Qt::CTRL ,
@@ -361,7 +360,6 @@ void KviFrame::installAccelerators()
 		Qt::Key_8 + Qt::CTRL ,
 		Qt::Key_9 + Qt::CTRL ,
 		Qt::Key_0 + Qt::CTRL ,
-		Qt::Key_F1 , // reserved for context sensitive help
 		Qt::Key_F2 ,
 		Qt::Key_F3 ,
 		Qt::Key_F4 ,
@@ -386,21 +384,7 @@ void KviFrame::installAccelerators()
 
 void KviFrame::accelActivated()
 {
-	int keys = (int)(((QShortcut *)sender())->key());
-	switch(keys)
-	{
-		case (Qt::Key_F4+Qt::CTRL):
-		{
-			if(g_pActiveWindow)
-				g_pActiveWindow->close();
-		}
-		break;
-		default:
-		{
-			KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(QString)(((QShortcut *)sender())->key()));
-		}
-		break;
-	};
+	KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(QString)(((QShortcut *)sender())->key()));
 }
 
 void KviFrame::executeInternalCommand(int index)
diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp
index 07eb1efc6..ace74fc3e 100644
--- a/src/kvirc/ui/kvi_input_editor.cpp
+++ b/src/kvirc/ui/kvi_input_editor.cpp
@@ -1335,6 +1335,11 @@ void KviInputEditor::keyPressEvent(QKeyEvent * e)
 					repaintWithCursorOn();
 				}
 			break;
+			case Qt::Key_J:
+			{
+				//avoid Ctrl+J from inserting a linefeed
+				break;
+			}
 			case Qt::Key_K:
 			{
 				if(!m_bReadOnly)
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index b9f5b4f44..d4be4adcc 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -114,12 +114,11 @@ void KviMenuBar::setupHelpPopup()
 	KviTalPopupMenu * help = (KviTalPopupMenu *)sender();
 	help->clear();
 
+	ACTION_POPUP_ITEM(KVI_COREACTION_HELPINDEX,help)
+
 	int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)"));
 	help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWSTATICWINDOW);
 
-	id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP)),__tr2qs("Help Browser (&Window)"));
-	help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWMDIWINDOW);
-	help->insertSeparator();
 
 	id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day"));
 	help->setItemParameter(id,KVI_INTERNALCOMMAND_TIP_OPEN);
@@ -190,11 +189,12 @@ void KviMenuBar::setupSettingsPopup()
 	// FIXME: #warning "Toggle these items on the fly ?"
 	ACTION_POPUP_ITEM(KVI_COREACTION_GENERALOPTIONS,opt)
 	ACTION_POPUP_ITEM(KVI_COREACTION_THEMEOPTIONS,opt)
+	ACTION_POPUP_ITEM(KVI_COREACTION_EDITREGUSERS,opt)
 	ACTION_POPUP_ITEM(KVI_COREACTION_MANAGETHEMES,opt)
 	ACTION_POPUP_ITEM(KVI_COREACTION_MANAGEADDONS,opt)
-	ACTION_POPUP_ITEM(KVI_COREACTION_SERVEROPTIONS,opt)
 	ACTION_POPUP_ITEM(KVI_COREACTION_TOOLBAREDITOR,opt)
-	ACTION_POPUP_ITEM(KVI_COREACTION_EDITREGUSERS,opt)
+	ACTION_POPUP_ITEM(KVI_COREACTION_SERVEROPTIONS,opt)
+	ACTION_POPUP_ITEM(KVI_COREACTION_JOINCHANNELS,opt)
 
 	opt->insertSeparator();
 	opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,SLOT(saveConfiguration()));