[Chinese-commits] [fqterm] 14/76: article dialog: use config files

[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 4180e32a27f38cc7c0480fb0d6aeffe9705b2870
Author: Iru Cai <mytbk920423 at gmail.com>
Date:   Sat May 3 11:11:41 2014 +0800

    article dialog: use config files
---
 src/fqterm/fqterm_scriptengine.cpp | 20 ++++++++++++++++----
 src/fqterm/fqterm_window.h         |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/fqterm/fqterm_scriptengine.cpp b/src/fqterm/fqterm_scriptengine.cpp
index 36c1ebe..f529bac 100644
--- a/src/fqterm/fqterm_scriptengine.cpp
+++ b/src/fqterm/fqterm_scriptengine.cpp
@@ -499,11 +499,23 @@ bool FQTermScriptEngine::isAutoReply() {
 
     void FQTermScriptEngine::artDialog(const QString &content) 
     {
-        articleDialog article(NULL, NULL, 0);
-        
-        article.resize(QSize(300, 500));
-        article.move(20,20);
+        FQTermConfig *config_ = window_->getConfig();
+        articleDialog article(config_, window_, 0);
+
+        QByteArray dlgSize =
+            config_->getItemValue("global", "articledialog").toLatin1();
         
+        if (!dlgSize.isEmpty()) {
+            int x, y, cx, cy;
+            const char *dsize = dlgSize.constData();
+            sscanf(dsize, "%d %d %d %d", &x, &y, &cx, &cy);
+            article.resize(QSize(cx, cy));
+            article.move(QPoint(x, y));
+        } else {
+            article.resize(QSize(300, 500));
+            article.move(20,20);
+        }
+
         article.articleText_ = content;
 
         article.ui_.textBrowser->setPlainText(article.articleText_);
diff --git a/src/fqterm/fqterm_window.h b/src/fqterm/fqterm_window.h
index 011bf86..d01b9e9 100644
--- a/src/fqterm/fqterm_window.h
+++ b/src/fqterm/fqterm_window.h
@@ -118,6 +118,8 @@ class FQTermWindow : public QMainWindow,
 
   FQTermSession * getSession() const { return session_; }
   FQTermScreen * getScreen() const {return screen_;}
+  FQTermConfig * getConfig() const { return config_; }
+        
   QPoint getUrlStartPoint() const { return urlStartPoint_; }
   QPoint getUrlEndPoint() const { return urlEndPoint_; }
 

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