Release-1.2.17-20020728

3 files changed, 26 insertions, 15 deletions

diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 58580b2..84f9f08 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -309,12 +309,13 @@ void Wizard::refreshCaption()
 
 void Wizard::about()
 {
-  QMessageBox::about(this, "DoxyWizard",
-                      "<qt><center>A tool to create and edit configuration files "
-                      "that can be read by doxygen.</center><p>"
-                      "<center>Written by Dimitri van Heesch</center><p>"
-                      "<center>(c) 2000-2002</center></qt>"
-                    );
+  QCString text(4096);
+  text.sprintf( "<qt><center>A tool to create and edit configuration files "
+                "that can be read by doxygen version %s.</center><p>"
+                "<center>Written by Dimitri van Heesch</center><p>"
+                "<center>(c) 2000-2002</center></qt>",versionString
+              );
+  QMessageBox::about(this, "DoxyWizard",text);
 }
 
 //----------------------------------------------------------------------
diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp
index 43d994d..33ecf2f 100644
--- a/addon/doxywizard/inputbool.cpp
+++ b/addon/doxywizard/inputbool.cpp
@@ -15,23 +15,31 @@
 #include "inputbool.h"
 #include "pagewidget.h"
 #include <qwindowsstyle.h>
+#include <qlayout.h>
 
 InputBool::InputBool( const QString & text, PageWidget * parent, bool &flag )
-  : QCheckBox( text, parent->getLayout() ), state(flag)
+  : /*QCheckBox( text, parent->getLayout() )*/ QWidget(parent->getLayout()), state(flag)
 {
+  QBoxLayout *layout = new QHBoxLayout(this);
+  cb = new QCheckBox(text,this);
+  layout->addWidget(cb);
+  layout->addStretch(10);
+
   QWindowsStyle *winStyle = new QWindowsStyle();
-  setChecked( flag );
-  setStyle( winStyle );
-  setMinimumSize( sizeHint() );
+  cb->setChecked( flag );
+  cb->setStyle( winStyle );
+  cb->setMinimumSize( sizeHint() );
 
-  connect( this, SIGNAL(toggled(bool)), SLOT(setState(bool)) );
+  connect( cb, SIGNAL(toggled(bool)), SLOT(setState(bool)) );
 
   parent->addWidget(this);
+
+  layout->activate();
 }
 
 void InputBool::init()
 {
-  setChecked(state);
+  cb->setChecked(state);
 }
 
 void InputBool::setState( bool s )
@@ -39,7 +47,7 @@ void InputBool::setState( bool s )
   if (state!=s) 
   {
     emit changed();
-    emit toggle(text(),s);
+    emit toggle(cb->text(),s);
   }
   state=s;
 }
diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h
index ab9728f..ca4520c 100644
--- a/addon/doxywizard/inputbool.h
+++ b/addon/doxywizard/inputbool.h
@@ -15,13 +15,14 @@
 #ifndef _INPUTBOOL_H
 #define _INPUTBOOL_H
 
+#include <qwidget.h>
 #include <qcheckbox.h>
 
 #include "input.h"
 
 class PageWidget;
 
-class InputBool : public QCheckBox, public IInput
+class InputBool : public QWidget, /*QCheckBox,*/ public IInput
 {
   Q_OBJECT
 
@@ -29,7 +30,7 @@ class InputBool : public QCheckBox, public IInput
     InputBool( const QString &text, PageWidget *parent, bool &flag );
     ~InputBool(){};
     void init();
-    void setEnabled(bool b) { QCheckBox::setEnabled(b); }
+    void setEnabled(bool b) { cb->setEnabled(b); }
     QObject *qobject() { return this; }
     bool getState() const { return state; }
 
@@ -42,6 +43,7 @@ class InputBool : public QCheckBox, public IInput
 
   private:
     bool &state;
+    QCheckBox *cb;
 
 };