[Chinese-commits] [fqterm] 47/76: askDialog should have a default value

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit a9e44fc4977fba913b5a8aef468cb0b765b1053d
Author: Iru Cai <mytbk920423 at gmail.com>
Date:   Wed Jun 25 00:54:58 2014 +0800

    askDialog should have a default value
---
 src/fqterm/fqterm_scriptengine.cpp | 10 +++++++++-
 src/fqterm/fqterm_scriptengine.h   |  3 ++-
 src/ui/defineescape.cpp            |  7 ++++++-
 src/ui/defineescape.h              |  3 ++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/fqterm/fqterm_scriptengine.cpp b/src/fqterm/fqterm_scriptengine.cpp
index c42dba2..15f4ee1 100644
--- a/src/fqterm/fqterm_scriptengine.cpp
+++ b/src/fqterm/fqterm_scriptengine.cpp
@@ -522,11 +522,14 @@ bool FQTermScriptEngine::isAutoReply() {
         article.exec();
     }
 
-    QString FQTermScriptEngine::askDialog(const QString& title, const QString& question)
+    QString FQTermScriptEngine::askDialog(const QString& title,
+                                          const QString& question,
+                                          const QString& defText)
     {
         QString ans;
         DefineEscapeDialog dlg(ans, window_);
         dlg.setTitleAndText(title, question);
+        dlg.setEditText(defText);
         if (dlg.exec()==1){
             return ans;
         }else{
@@ -537,3 +540,8 @@ bool FQTermScriptEngine::isAutoReply() {
 } // namespace FQTerm
 
 #include "fqterm_scriptengine.moc"
+
+
+
+
+
diff --git a/src/fqterm/fqterm_scriptengine.h b/src/fqterm/fqterm_scriptengine.h
index 9e7277f..2b7337f 100644
--- a/src/fqterm/fqterm_scriptengine.h
+++ b/src/fqterm/fqterm_scriptengine.h
@@ -55,7 +55,8 @@ public slots: //script apis
   //ui functions.
   void msgBox(const QString& msg);
   bool yesnoBox(const QString& msg);
-  QString askDialog(const QString& title, const QString& question);
+  QString askDialog(const QString& title, const QString& question,
+                    const QString& defText);
   
   //bbs ui functions
   int caretX();
diff --git a/src/ui/defineescape.cpp b/src/ui/defineescape.cpp
index 26474e1..fea042d 100644
--- a/src/ui/defineescape.cpp
+++ b/src/ui/defineescape.cpp
@@ -52,7 +52,12 @@ void DefineEscapeDialog::onCancel()
         ui_.lblEscape->setText(text);
         this->setWindowTitle(title);
     }
-    
+
+    void DefineEscapeDialog::setEditText(const QString &text)
+    {
+        ui_.edtEscape->setText(text);
+    }
+        
 } //namespace FQTerm
 
 #include "defineescape.moc"
diff --git a/src/ui/defineescape.h b/src/ui/defineescape.h
index c102840..78b97d2 100644
--- a/src/ui/defineescape.h
+++ b/src/ui/defineescape.h
@@ -31,7 +31,8 @@ public:
   DefineEscapeDialog(QString& strEsc, QWidget *parent_ = 0, Qt::WFlags fl = 0);
   ~DefineEscapeDialog();
   void setTitleAndText(const QString &title, const QString &text);
-  
+  void setEditText(const QString &text);
+    
 protected slots:
   void onOK();
   void onCancel();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git