switch to the correct window even if it's open already

8 files changed, 12 insertions, 7 deletions

diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index a9da1c6c5..f650dee97 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -52,7 +52,7 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 		g_pMainWindow->addWindow(g_pActionEditorWindow);
 	}
 
-	g_pActionEditorWindow->setFocus();
+	g_pActionEditorWindow->delayedAutoRaise();
 	return true;
 }
 
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index 9ec3cb0ac..f5451c955 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -53,7 +53,7 @@ static bool aliaseditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 		g_pMainWindow->addWindow(g_pAliasEditorWindow);
 	}
 
-	g_pAliasEditorWindow->setFocus();
+	g_pAliasEditorWindow->delayedAutoRaise();
 
 	return true;
 }
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index 94457a28e..d369436ec 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -52,7 +52,7 @@ static bool classeditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 		g_pMainWindow->addWindow(g_pClassEditorWindow);
 	}
 
-	g_pClassEditorWindow->setFocus();
+	g_pClassEditorWindow->delayedAutoRaise();
 
 	return true;
 }
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index 04c4b1600..03ff80bbf 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -52,7 +52,7 @@ static bool eventeditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 		g_pMainWindow->addWindow(g_pEventEditorWindow);
 	}
 
-	g_pEventEditorWindow->setFocus();
+	g_pEventEditorWindow->delayedAutoRaise();
 	return true;
 }
 
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 03dc93b3a..74b3ba102 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -189,6 +189,9 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 #else
 			w->textBrowser()->setSource(QUrl::fromLocalFile(f.absoluteFilePath()));
 #endif
+			HelpWindow * pHelpWindow = g_pHelpWindowList->first();
+			if (pHelpWindow)
+				pHelpWindow->delayedAutoRaise();
 			return true;
 		}
 	}
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 171d03097..714961920 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -52,7 +52,7 @@ static bool popupeditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 		g_pMainWindow->addWindow(g_pPopupEditorWindow);
 	}
 
-	g_pPopupEditorWindow->setFocus();
+	g_pPopupEditorWindow->delayedAutoRaise();
 	return true;
 }
 
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 5670771d4..f6ba854ab 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -51,7 +51,7 @@ static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 		g_pRawEditorWindow = new RawEditorWindow();
 		g_pMainWindow->addWindow(g_pRawEditorWindow);
 	}
-	g_pRawEditorWindow->setFocus();
+	g_pRawEditorWindow->delayedAutoRaise();
 	return true;
 }
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 45583d8dd..1a2ca1a68 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -631,8 +631,10 @@ void loadBanList()
 static bool url_kvs_cmd_list(KviKvsModuleCommandCall *)
 {
 	UrlDlgList * tmpitem = findFrame();
-	if(tmpitem->dlg)
+	if(tmpitem->dlg) {
+		tmpitem->dlg->delayedAutoRaise();
 		return false;
+	}
 
 	tmpitem->dlg = new UrlDialog(g_List);
 	g_pMainWindow->addWindow(tmpitem->dlg);