]> git.lyx.org Git - features.git/commitdiff
merge QBox and QBoxDialog
authorAndré Pönitz <poenitz@gmx.net>
Tue, 24 Apr 2007 10:56:22 +0000 (10:56 +0000)
committerAndré Pönitz <poenitz@gmx.net>
Tue, 24 Apr 2007 10:56:22 +0000 (10:56 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17942 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/Makefile.dialogs
src/frontends/qt4/QBox.C
src/frontends/qt4/QBox.h
src/frontends/qt4/QBoxDialog.C [deleted file]
src/frontends/qt4/QBoxDialog.h [deleted file]

index 1f7d024e9a8b062700ea8d37633175a854e944cf..944829d4d5252a634cdf83c2439fb9f4c565a21f 100644 (file)
@@ -89,7 +89,7 @@ MOCFILES = \
        QAboutDialog.C QAboutDialog.h \
        QBibitemDialog.C QBibitemDialog.h \
        QBibtexDialog.C QBibtexDialog.h \
-       QBoxDialog.C QBoxDialog.h \
+       QBox.C QBox.h \
        QBranchDialog.C QBranchDialog.h \
        QBranches.C QBranches.h \
        QChangesDialog.C QChangesDialog.h \
index ca3ecbe6d8053e0a459be7a6b432e5c88362928f..4342e8f8a5da3d197b4bfc72bd99699489e1f084 100644 (file)
 
 #include "checkedwidgets.h"
 #include "lengthcombo.h"
-#include "QBoxDialog.h"
 #include "qt_helpers.h"
 #include "Qt2BC.h"
-
 #include "lengthcommon.h"
 #include "lyxrc.h" // to set the default length values
+#include "validators.h"
 
 #include "controllers/ControlBox.h"
 #include "controllers/helper_funcs.h"
 
 #include <QPushButton>
 #include <QLineEdit>
+#include <QCloseEvent>
 
-#include <vector>
 
 using lyx::support::getStringFromVector;
 using lyx::support::isStrDbl;
 using lyx::support::subst;
 using std::string;
 
+
 namespace lyx {
 namespace frontend {
 
+//////////////////////////////////////////////////////////////////
+//
+// QBoxDialog
+//
+//////////////////////////////////////////////////////////////////
+
+QBoxDialog::QBoxDialog(QBox * form)
+       : form_(form)
+{
+       setupUi(this);
+       connect(restorePB, SIGNAL(clicked()), form, SLOT(slotRestore()));
+       connect(okPB, SIGNAL(clicked()), form, SLOT(slotOK()));
+       connect(applyPB, SIGNAL(clicked()), form, SLOT(slotApply()));
+       connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose()));
+
+       connect(widthED, SIGNAL(textChanged(const QString &)),
+               this, SLOT(change_adaptor()));
+       connect(widthUnitsLC, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)),
+               this, SLOT(change_adaptor()));
+       connect(valignCO, SIGNAL(highlighted(const QString &)),
+               this, SLOT(change_adaptor()));
+       connect(heightED, SIGNAL(textChanged(const QString &)),
+               this, SLOT(change_adaptor()));
+       connect(heightUnitsLC, SIGNAL(selectionChanged(lyx::LyXLength::UNIT) ),
+               this, SLOT(change_adaptor()));
+       connect(restorePB, SIGNAL(clicked()), this, SLOT(restoreClicked()));
+       connect(typeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(typeCO, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
+       connect(halignCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(ialignCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(innerBoxCO, SIGNAL(activated(const QString&)),
+               this, SLOT(innerBoxChanged(const QString &)));
+       connect(innerBoxCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+
+       heightED->setValidator(unsignedLengthValidator(heightED));
+       widthED->setValidator(unsignedLengthValidator(widthED));
+}
+
+
+void QBoxDialog::closeEvent(QCloseEvent * e)
+{
+       form_->slotWMHide();
+       e->accept();
+}
+
+
+void QBoxDialog::change_adaptor()
+{
+       form_->changed();
+}
+
+
+void QBoxDialog::innerBoxChanged(const QString & str)
+{
+       bool const ibox = (str != qt_("None"));
+       valignCO->setEnabled(ibox);
+       ialignCO->setEnabled(ibox);
+       halignCO->setEnabled(!ibox);
+       heightED->setEnabled(ibox);
+       heightUnitsLC->setEnabled(ibox);
+       form_->setSpecial(ibox);
+}
+
+
+void QBoxDialog::typeChanged(int index)
+{
+       bool const frameless = (index == 0);
+       if (frameless) {
+               valignCO->setEnabled(true);
+               ialignCO->setEnabled(true);
+               halignCO->setEnabled(false);
+               heightED->setEnabled(true);
+               heightUnitsLC->setEnabled(true);
+               form_->setSpecial(true);
+       }
+       int itype = innerBoxCO->currentIndex();
+       form_->setInnerType(frameless, itype);
+}
+
+
+void QBoxDialog::restoreClicked()
+{
+       form_->setInnerType(true, 2);
+       widthED->setText("100");
+       widthUnitsLC->setCurrentItem(LyXLength::PCW);
+       heightED->setText("1");
+       for (int j = 0; j < heightUnitsLC->count(); j++) {
+               if (heightUnitsLC->itemText(j) == qt_("Total Height"))
+                       heightUnitsLC->setCurrentItem(j);
+       }
+}
+
+
+//////////////////////////////////////////////////////////////////
+//
+// QBox
+//
+//////////////////////////////////////////////////////////////////
+
 typedef QController<ControlBox, QView<QBoxDialog> > box_base_class;
 
 QBox::QBox(Dialog & parent)
@@ -62,9 +161,8 @@ void QBox::build_dialog()
        // add the special units to the height choice
        // width needs different handling
        box_gui_tokens_special_length(ids_spec_, gui_names_spec_);
-       for (unsigned int i = 1; i < gui_names_spec_.size(); ++i) {
+       for (unsigned int i = 1; i < gui_names_spec_.size(); ++i) 
                dialog_->heightUnitsLC->addItem(toqstr(gui_names_spec_[i]));
-       }
 
        bcview().addReadOnly(dialog_->typeCO);
        bcview().addReadOnly(dialog_->innerBoxCO);
@@ -292,3 +390,7 @@ void QBox::setInnerType(bool frameless, int i)
 
 } // namespace frontend
 } // namespace lyx
+
+
+#include "QBox_moc.cpp"
+
index e6d2b82ed8601fa229fd17cc026bc4d50326841b..cf6bbff96760279466b00f92adc0c5c510d5356c 100644 (file)
 #ifndef QBOX_H
 #define QBOX_H
 
-#include "QBoxDialog.h"
 #include "QDialogView.h"
 
+#include "ui/BoxUi.h"
+
+#include <QCloseEvent>
+#include <QDialog>
+
 #include <vector>
 
+
 namespace lyx {
 namespace frontend {
 
 class ControlBox;
+class QBox;
+
+class QBoxDialog : public QDialog, public Ui::QBoxUi {
+       Q_OBJECT
+public:
+       QBoxDialog(QBox * form);
+protected Q_SLOTS:
+       virtual void change_adaptor();
+       virtual void innerBoxChanged(const QString &);
+       virtual void typeChanged(int);
+       virtual void restoreClicked();
+protected:
+       virtual void closeEvent(QCloseEvent * e);
+private:
+       QBox * form_;
+};
+
 
 ///
 class QBox
diff --git a/src/frontends/qt4/QBoxDialog.C b/src/frontends/qt4/QBoxDialog.C
deleted file mode 100644 (file)
index 1510455..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * \file QBoxDialog.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Jürgen Spitzmüller
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "QBoxDialog.h"
-//Added by qt3to4:
-#include <QCloseEvent>
-
-#include "lengthcombo.h"
-#include "validators.h"
-#include "QBox.h"
-#include "qt_helpers.h"
-
-#include <qlineedit.h>
-#include <qpushbutton.h>
-
-namespace lyx {
-namespace frontend {
-
-QBoxDialog::QBoxDialog(QBox * form)
-       : form_(form)
-{
-       setupUi(this);
-       connect(restorePB, SIGNAL(clicked()),
-               form, SLOT(slotRestore()));
-       connect(okPB, SIGNAL(clicked()),
-               form, SLOT(slotOK()));
-       connect(applyPB, SIGNAL(clicked()),
-               form, SLOT(slotApply()));
-       connect(closePB, SIGNAL(clicked()),
-               form, SLOT(slotClose()));
-
-    connect( widthED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( widthUnitsLC, SIGNAL( selectionChanged(lyx::LyXLength::UNIT) ), this, SLOT( change_adaptor() ) );
-    connect( valignCO, SIGNAL( highlighted(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( heightED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( heightUnitsLC, SIGNAL( selectionChanged(lyx::LyXLength::UNIT) ), this, SLOT( change_adaptor() ) );
-    connect( restorePB, SIGNAL( clicked() ), this, SLOT( restoreClicked() ) );
-    connect( typeCO, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
-    connect( typeCO, SIGNAL( activated(int) ), this, SLOT( typeChanged(int) ) );
-    connect( halignCO, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
-    connect( ialignCO, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
-    connect( innerBoxCO, SIGNAL( activated(const QString&) ), this, SLOT( innerBoxChanged(const QString &) ) );
-    connect( innerBoxCO, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
-
-       heightED->setValidator(unsignedLengthValidator(heightED));
-       widthED->setValidator(unsignedLengthValidator(widthED));
-}
-
-
-void QBoxDialog::closeEvent(QCloseEvent * e)
-{
-       form_->slotWMHide();
-       e->accept();
-}
-
-
-void QBoxDialog::change_adaptor()
-{
-       form_->changed();
-}
-
-
-void QBoxDialog::innerBoxChanged(const QString & str)
-{
-       bool ibox = (str != qt_("None"));
-       valignCO->setEnabled(ibox);
-       ialignCO->setEnabled(ibox);
-       halignCO->setEnabled(!ibox);
-       heightED->setEnabled(ibox);
-       heightUnitsLC->setEnabled(ibox);
-       form_->setSpecial(ibox);
-}
-
-
-void QBoxDialog::typeChanged(int index)
-{
-       bool frameless = (index == 0);
-       if (frameless) {
-               valignCO->setEnabled(true);
-               ialignCO->setEnabled(true);
-               halignCO->setEnabled(false);
-               heightED->setEnabled(true);
-               heightUnitsLC->setEnabled(true);
-               form_->setSpecial(true);
-       }
-       int itype = innerBoxCO->currentIndex();
-       form_->setInnerType(frameless, itype);
-}
-
-
-void QBoxDialog::restoreClicked()
-{
-       form_->setInnerType(true, 2);
-       widthED->setText("100");
-       widthUnitsLC->setCurrentItem(LyXLength::PCW);
-       heightED->setText("1");
-       for (int j = 0; j < heightUnitsLC->count(); j++) {
-               if (heightUnitsLC->itemText(j) == qt_("Total Height"))
-                       heightUnitsLC->setCurrentItem(j);
-       }
-}
-
-} // namespace frontend
-} // namespace lyx
-
-#include "QBoxDialog_moc.cpp"
diff --git a/src/frontends/qt4/QBoxDialog.h b/src/frontends/qt4/QBoxDialog.h
deleted file mode 100644 (file)
index 5deeb3e..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-/**
- * \file QBoxDialog.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Jürgen Spitzmüller
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef QBOXDIALOG_H
-#define QBOXDIALOG_H
-
-#include "ui/BoxUi.h"
-
-#include <QCloseEvent>
-#include <QDialog>
-
-namespace lyx {
-namespace frontend {
-
-class QBox;
-
-class QBoxDialog : public QDialog, public Ui::QBoxUi {
-       Q_OBJECT
-public:
-       QBoxDialog(QBox * form);
-protected Q_SLOTS:
-       virtual void change_adaptor();
-       virtual void innerBoxChanged(const QString &);
-       virtual void typeChanged(int);
-       virtual void restoreClicked();
-protected:
-       virtual void closeEvent(QCloseEvent * e);
-private:
-       QBox * form_;
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // QBOXDIALOG_H