after pressing a button reset focus in console | new function in

HeikoKoehn · HeikoKoehn · commit 22e0c3ba32b2 · 2009-03-07T14:43:20.000+01:00
LuaGlobal | shortcut for "save" in TriggerEditor set to CTRL+S
diff --git a/src/LuaGlobal.lua b/src/LuaGlobal.lua
@@ -466,3 +466,14 @@ function table.unpickle( t, tables, tcopy, pickled )
 end
 
 
+-- Replaces the given wildcard (as a number) with the given text.
+--
+-- -- Example: replaceWildcard(1, "hello") on a trigger of `^You wave (goodbye)\.$`
+function replaceWildcard(what, replacement)
+    if replacement == nil or what == nil then 
+        return 
+    end
+    selectCaptureGroup(what)
+    replace(replacement)
+end
+
diff --git a/src/TAction.cpp b/src/TAction.cpp
@@ -121,6 +121,9 @@ void TAction::execute(QStringList & list)
         QString funcName = QString("Action") + QString::number( mID ); 
         pL->call( funcName, mName );
     }
+    // move focus back to the active console / command line
+    mpHost->mpConsole->activateWindow();
+    mpHost->mpConsole->setFocus();
 }
 
 void TAction::expandToolbar( mudlet * pMainWindow, TToolBar * pT, QMenu * menu )
diff --git a/src/dlgTriggerEditor.cpp b/src/dlgTriggerEditor.cpp
@@ -265,12 +265,12 @@ dlgTriggerEditor::dlgTriggerEditor( Host * pH )
     connect( addFolderAction, SIGNAL(triggered()), this, SLOT( slot_add_new_folder()));
     
     QAction * showSearchAreaAction = new QAction(QIcon(":/icons/edit-find-user.png"), tr("Search"), this);
-    showSearchAreaAction->setShortcut(tr("Ctrl+S"));
+    //showSearchAreaAction->setShortcut(tr("Ctrl+F"));
     showSearchAreaAction->setStatusTip(tr("Show Search Results List"));
     connect( showSearchAreaAction, SIGNAL(triggered()), this, SLOT( slot_show_search_area()));
     
     QAction * saveAction = new QAction(QIcon(":/icons/document-save-as.png"), tr("Save"), this);
-    saveAction->setShortcut(tr("Ctrl+A"));
+    saveAction->setShortcut(tr("Ctrl+S"));
     saveAction->setStatusTip(tr("Save Edited Trigger, Script, Alias etc. If information has been edited, it must be saved or the changes will be lost."));
     connect( saveAction, SIGNAL(triggered()), this, SLOT( slot_save_edit() ));
     
diff --git a/src/mudlet_documentation.html b/src/mudlet_documentation.html
@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Linux)">
 	<META NAME="CREATED" CONTENT="20081028;19075200">
-	<META NAME="CHANGED" CONTENT="20090227;5330300">
+	<META NAME="CHANGED" CONTENT="20090307;1040200">
 	<STYLE TYPE="text/css">
 	<!--
 		@page { size: 21cm 29.7cm }
@@ -1870,14 +1870,18 @@ <H1 CLASS="western" STYLE="margin-top: 0cm; margin-bottom: 0cm; line-height: 150
 	</TR>
 	<TR VALIGN=TOP>
 		<TD WIDTH=360>
-			<P CLASS="western" STYLE="margin-right: 0cm; text-indent: -0.1cm; margin-top: 0cm; border: none; padding: 0cm">
-			<BR>
+			<P CLASS="western" STYLE="text-indent: -0.1cm; border: none; padding: 0cm">
+			<FONT COLOR="#008000"><FONT FACE="Bitstream Vera Sans Mono, sans-serif"><FONT SIZE=1 STYLE="font-size: 8pt">function
+			replaceWildcard(what, replacement) </FONT></FONT></FONT>
 			</P>
 		</TD>
 		<TD WIDTH=485>
-			<P CLASS="western" STYLE="margin-right: 0cm; text-indent: -0.1cm; margin-top: 0cm; border: none; padding: 0cm">
-			<BR>
-			</P>
+			<P CLASS="western" STYLE="text-indent: -0.1cm; border: none; padding: 0cm">
+			<FONT COLOR="#000000"><FONT FACE="Times New Roman, serif"><FONT SIZE=1 STYLE="font-size: 8pt">Replaces
+			the given wildcard (as a number) with the given text.</FONT></FONT></FONT></P>
+			<P CLASS="western" STYLE="text-indent: -0.1cm; border: none; padding: 0cm">
+			<FONT SIZE=1 STYLE="font-size: 8pt">Example: replaceWildcard(1,
+			&quot;hello&quot;) on a trigger of `^You wave (goodbye)\.$`</FONT></P>
 		</TD>
 	</TR>
 	<TR>

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ void TAction::execute(QStringList & list)`
`121`	`121`	`QString funcName = QString("Action") + QString::number( mID );`
`122`	`122`	`pL->call( funcName, mName );`
`123`	`123`	`}`
	`124`	`+ // move focus back to the active console / command line`
	`125`	`+ mpHost->mpConsole->activateWindow();`
	`126`	`+ mpHost->mpConsole->setFocus();`
`124`	`127`	`}`
`125`	`128`
`126`	`129`	`void TAction::expandToolbar( mudlet * pMainWindow, TToolBar * pT, QMenu * menu )`