Mercurial > hg > forks > UniversalIndentGUI

changeset 749:65171b865963

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A first step toward reducing compile dependencies. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1026 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Sat, 02 Oct 2010 12:15:20 +0000
parents 8fa147439b3c
children a884b5861e93
files src/AboutDialog.cpp src/AboutDialog.h
diffstat 2 files changed, 25 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/AboutDialog.cpp	Sat Oct 02 12:07:15 2010 +0000
+++ b/src/AboutDialog.cpp	Sat Oct 02 12:15:20 2010 +0000
@@ -18,9 +18,15 @@
  ***************************************************************************/
 
 #include "AboutDialog.h"
-
+#include "ui_AboutDialog.h"
 #include "UiGuiVersion.h"
 
+#include <QUrl>
+#include <QDesktopServices>
+#include <QScrollBar>
+#include <QTimer>
+
+#include <QLocale>
 /*!
     \class AboutDialog
     \brief Displays a dialog window with information about UniversalIndentGUI
@@ -32,16 +38,17 @@
  */
 AboutDialog::AboutDialog(QWidget *parent, Qt::WindowFlags flags) : QDialog(parent, flags) {
     this->parent = parent;
-    setupUi(this);
+    dialogForm = new Ui::AboutDialog();
+    dialogForm->setupUi(this);
 
-    authorTextBrowser->setOpenExternalLinks( true );
-    creditsTextBrowser->setOpenExternalLinks( true );
+    dialogForm->authorTextBrowser->setOpenExternalLinks( true );
+    dialogForm->creditsTextBrowser->setOpenExternalLinks( true );
 
-    QString versionString = versionTextBrowser->toHtml();
+    QString versionString = dialogForm->versionTextBrowser->toHtml();
     versionString = versionString.arg(PROGRAM_VERSION_STRING).arg( UiGuiVersion::getBuildRevision() ).arg( UiGuiVersion::getBuildDate() );
-    versionTextBrowser->setHtml(versionString);
+    dialogForm->versionTextBrowser->setHtml(versionString);
 
-    creditsTextBrowser->setHtml("<html><head></head><body>"
+    dialogForm->creditsTextBrowser->setHtml("<html><head></head><body>"
         "<pre> </br></pre>"
         "<h3 align='center'>Thanks go out to</h3>"
         "<p align='center'><a href=\"http://www.csie.nctu.edu.tw/~chtai/\"><b>Nelson Tai</b></a> for Chinese translation, good ideas and always fast answers.</p></br>"
@@ -94,11 +101,11 @@
  */
 void AboutDialog::changeEvent(QEvent *event) {
     if (event->type() == QEvent::LanguageChange) {
-        retranslateUi(this);
+        dialogForm->retranslateUi(this);
 
-        QString versionString = versionTextBrowser->toHtml();
+        QString versionString = dialogForm->versionTextBrowser->toHtml();
         versionString = versionString.arg(PROGRAM_VERSION_STRING).arg( UiGuiVersion::getBuildRevision() ).arg( UiGuiVersion::getBuildDate() );
-        versionTextBrowser->setHtml(versionString);
+        dialogForm->versionTextBrowser->setHtml(versionString);
     }
     else {
         QWidget::changeEvent(event);
@@ -121,7 +128,7 @@
     Also changes the scroll direction and speed when reaching the start or end.
  */
 void AboutDialog::scroll() {
-    QScrollBar *scrollBar = creditsTextBrowser->verticalScrollBar();
+    QScrollBar *scrollBar = dialogForm->creditsTextBrowser->verticalScrollBar();
     scrollBar->setValue( scrollBar->value()+scrollDirection );
 
     if ( scrollBar->value() == scrollBar->maximum() ) {
@@ -139,7 +146,7 @@
         timer->start(scrollSpeed);
     }
 
-    creditsTextBrowser->update();
+    dialogForm->creditsTextBrowser->update();
 }
 
 
--- a/src/AboutDialog.h	Sat Oct 02 12:07:15 2010 +0000
+++ b/src/AboutDialog.h	Sat Oct 02 12:15:20 2010 +0000
@@ -21,16 +21,12 @@
 #define ABOUTDIALOG_H
 
 #include <QDialog>
-#include <QUrl>
-#include <QDesktopServices>
-#include <QScrollBar>
-#include <QTimer>
-#include "ui_AboutDialog.h"
 
-#include <QLocale>
+namespace Ui {
+	class AboutDialog;
+}
 
-
-class AboutDialog : public QDialog, private Ui::AboutDialog
+class AboutDialog : public QDialog
 {
     Q_OBJECT
 
@@ -47,6 +43,8 @@
 private:
     void changeEvent(QEvent *event);
 
+	Ui::AboutDialog* dialogForm;
+
     QString gplText;
     QString textBrowserSavedContent;
     int scrollDirection;