merge QTexinfo and QTexinfoDialog

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17952 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5e1571997728771aa7a205ffc84592dd9bc67d13..0d22519cea0417ac6f2585e73d49a65d78b4794f 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -73,7 +73,6 @@ libqt4_la_SOURCES = \
        QSpellchecker.C QSpellchecker.h \
        QTabular.C QTabular.h \
        QTabularCreate.C QTabularCreate.h \
-       QTexinfo.C QTexinfo.h \
        Qt2BC.C Qt2BC.h \
        checkedwidgets.C checkedwidgets.h \
        panelstack.h panelstack.C \

diff --git a/src/frontends/qt4/Makefile.dialogs b/src/frontends/qt4/Makefile.dialogs
index 83c605b945a682f951fb8b67d6252bb6f3790751..f7a83863ad544e3be91baa8d802070be27202b29 100644 (file)
--- a/src/frontends/qt4/Makefile.dialogs
+++ b/src/frontends/qt4/Makefile.dialogs
@@ -126,7 +126,7 @@ MOCFILES = \
        QDialogView.C QDialogView.h \
        QTabularCreateDialog.C QTabularCreateDialog.h \
        QTabularDialog.C QTabularDialog.h \
-       QTexinfoDialog.C QTexinfoDialog.h \
+       QTexinfo.C QTexinfo.h \
        QThesaurus.C QThesaurus.h \
        TocModel.C TocModel.h \
        TocWidget.C TocWidget.h \

diff --git a/src/frontends/qt4/QTexinfo.C b/src/frontends/qt4/QTexinfo.C
index bae5eec750e696043e01db076e521467c93e7c3b..55292093070bd1c2b19f28538d3f979b674c14e4 100644 (file)
--- a/src/frontends/qt4/QTexinfo.C
+++ b/src/frontends/qt4/QTexinfo.C
@@ -11,7 +11,6 @@
 #include <config.h>
 
 #include "QTexinfo.h"
-#include "QTexinfoDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
@@ -22,10 +21,106 @@
 #include <QPushButton>
 
 using std::string;
+using std::vector;
 
 namespace lyx {
 namespace frontend {
 
+/////////////////////////////////////////////////////////////////////
+//
+// QTexinfoDialog
+//
+/////////////////////////////////////////////////////////////////////
+
+
+QTexinfoDialog::QTexinfoDialog(QTexinfo * form)
+       : form_(form)
+{
+       setupUi(this);
+
+       connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose()));
+
+       connect(viewPB, SIGNAL(clicked()), this, SLOT(viewClicked()));
+       connect(whatStyleCO, SIGNAL(activated(const QString &)),
+               this, SLOT(enableViewPB()));
+       connect(whatStyleCO, SIGNAL(activated(int)), this, SLOT(update()));
+       connect(pathCB, SIGNAL(stateChanged(int)), this, SLOT(update()));
+       connect(rescanPB, SIGNAL(clicked()), this, SLOT(enableViewPB()));
+       connect(rescanPB, SIGNAL(clicked()), this, SLOT(rescanClicked()));
+       connect(fileListLW, SIGNAL(itemClicked(QListWidgetItem *)),
+               this, SLOT( enableViewPB() ) );
+       connect(fileListLW, SIGNAL(itemSelectionChanged()),
+               this, SLOT(enableViewPB()));
+}
+
+
+void QTexinfoDialog::change_adaptor()
+{
+       form_->changed();
+}
+
+
+void QTexinfoDialog::closeEvent(QCloseEvent * e)
+{
+       form_->slotWMHide();
+       e->accept();
+}
+
+
+void QTexinfoDialog::rescanClicked()
+{
+       // build new *Files.lst
+       rescanTexStyles();
+       form_->updateStyles();
+       enableViewPB();
+}
+
+
+void QTexinfoDialog::viewClicked()
+{
+       vector<string>::size_type const fitem = fileListLW->currentRow();
+       vector<string> const & data = form_->texdata_[form_->activeStyle];
+       string file = data[fitem];
+       if (!pathCB->isChecked())
+               file = getTexFileFromList(data[fitem],
+                       form_->controller().getFileType(form_->activeStyle));
+       form_->controller().viewFile(file);
+}
+
+
+void QTexinfoDialog::update()
+{
+       switch (whatStyleCO->currentIndex()) {
+       case 0:
+               form_->updateStyles(ControlTexinfo::cls);
+               break;
+       case 1:
+               form_->updateStyles(ControlTexinfo::sty);
+               break;
+       case 2:
+               form_->updateStyles(ControlTexinfo::bst);
+               break;
+       default:
+               break;
+       }
+
+       enableViewPB();
+}
+
+
+void QTexinfoDialog::enableViewPB()
+{
+       viewPB->setEnabled(fileListLW->currentRow() > -1);
+}
+
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// QTexinfo
+//
+/////////////////////////////////////////////////////////////////////
+
 typedef QController<ControlTexinfo, QView<QTexinfoDialog> > texinfo_base_class;
 
 QTexinfo::QTexinfo(Dialog & parent)
@@ -69,3 +164,6 @@ void QTexinfo::updateStyles()
 
 } // namespace frontend
 } // namespace lyx
+
+
+#include "QTexinfo_moc.cpp"

diff --git a/src/frontends/qt4/QTexinfo.h b/src/frontends/qt4/QTexinfo.h
index 40c14d11c1d1617bbaff8e54ff03bd6efd36076d..ee0c62b3f421aae28f496fc2002e362cc491ce41 100644 (file)
--- a/src/frontends/qt4/QTexinfo.h
+++ b/src/frontends/qt4/QTexinfo.h
@@ -13,9 +13,12 @@
 #define QTEXINFO_H
 
 #include "QDialogView.h"
-#include "QTexinfoDialog.h"
 
 #include "ControlTexinfo.h"
+#include "ui/TexinfoUi.h"
+
+#include <QDialog>
+#include <QCloseEvent>
 
 #include <map>
 #include <vector>
@@ -23,6 +26,26 @@
 namespace lyx {
 namespace frontend {
 
+class QTexinfo;
+
+class QTexinfoDialog : public QDialog, public Ui::QTexinfoUi {
+       Q_OBJECT
+public:
+       QTexinfoDialog(QTexinfo * form);
+public Q_SLOTS:
+       virtual void update();
+protected Q_SLOTS:
+       virtual void change_adaptor();
+       virtual void rescanClicked();
+       virtual void viewClicked();
+       virtual void enableViewPB();
+protected:
+       virtual void closeEvent(QCloseEvent * e);
+private:
+       QTexinfo * form_;
+};
+
+
 ///
 class QTexinfo
         : public QController<ControlTexinfo, QView<QTexinfoDialog> > {

diff --git a/src/frontends/qt4/QTexinfoDialog.C b/src/frontends/qt4/QTexinfoDialog.C
deleted file mode 100644 (file)
index bfcb09c..0000000
--- a/src/frontends/qt4/QTexinfoDialog.C
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * \file QTexinfoDialog.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Edwin Leuven
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "QTexinfoDialog.h"
-#include "QTexinfo.h"
-
-#include <QCheckBox>
-#include <QListWidget>
-#include <QPushButton>
-#include <QCloseEvent>
-
-using std::vector;
-using std::string;
-
-namespace lyx {
-namespace frontend {
-
-
-QTexinfoDialog::QTexinfoDialog(QTexinfo * form)
-       :form_(form)
-{
-       setupUi(this);
-
-       connect(closePB, SIGNAL(clicked()),
-               form, SLOT(slotClose()));
-
-    connect( viewPB, SIGNAL( clicked() ), this, SLOT( viewClicked() ) );
-    connect( whatStyleCO, SIGNAL( activated(const QString&) ), this, SLOT( enableViewPB() ) );
-    connect( whatStyleCO, SIGNAL( activated(int) ), this, SLOT( update() ) );
-    connect( pathCB, SIGNAL( stateChanged(int) ), this, SLOT( update() ) );
-    connect( rescanPB, SIGNAL( clicked() ), this, SLOT( enableViewPB() ) );
-    connect( rescanPB, SIGNAL( clicked() ), this, SLOT( rescanClicked() ) );
-    connect( fileListLW, SIGNAL( itemClicked(QListWidgetItem*) ), this, SLOT( enableViewPB() ) );
-    connect( fileListLW, SIGNAL( itemSelectionChanged() ), this, SLOT( enableViewPB() ) );
-}
-
-
-void QTexinfoDialog::change_adaptor()
-{
-       form_->changed();
-}
-
-
-void QTexinfoDialog::closeEvent(QCloseEvent * e)
-{
-       form_->slotWMHide();
-       e->accept();
-}
-
-
-void QTexinfoDialog::rescanClicked()
-{
-       // build new *Files.lst
-       rescanTexStyles();
-       form_->updateStyles();
-       enableViewPB();
-}
-
-
-void QTexinfoDialog::viewClicked()
-{
-       vector<string>::size_type const fitem = fileListLW->currentRow();
-       vector<string> const & data = form_->texdata_[form_->activeStyle];
-       string file = data[fitem];
-       if (!pathCB->isChecked())
-               file = getTexFileFromList(data[fitem],
-                       form_->controller().getFileType(form_->activeStyle));
-       form_->controller().viewFile(file);
-}
-
-
-void QTexinfoDialog::update()
-{
-       switch (whatStyleCO->currentIndex()) {
-       case 0:
-               form_->updateStyles(ControlTexinfo::cls);
-               break;
-       case 1:
-               form_->updateStyles(ControlTexinfo::sty);
-               break;
-       case 2:
-               form_->updateStyles(ControlTexinfo::bst);
-               break;
-       default:
-               break;
-       }
-
-       enableViewPB();
-}
-
-
-void QTexinfoDialog::enableViewPB()
-{
-       viewPB->setEnabled(fileListLW->currentRow() > -1);
-}
-
-} // namespace frontend
-} // namespace lyx
-
-#include "QTexinfoDialog_moc.cpp"

diff --git a/src/frontends/qt4/QTexinfoDialog.h b/src/frontends/qt4/QTexinfoDialog.h
deleted file mode 100644 (file)
index 98367d0..0000000
--- a/src/frontends/qt4/QTexinfoDialog.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-/**
- * \file QTexinfoDialog.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Edwin Leuven
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef QTEXINFODIALOG_H
-#define QTEXINFODIALOG_H
-
-#include "ui/TexinfoUi.h"
-
-#include <QDialog>
-#include <QCloseEvent>
-
-namespace lyx {
-namespace frontend {
-
-class QTexinfo;
-
-class QTexinfoDialog : public QDialog, public Ui::QTexinfoUi {
-       Q_OBJECT
-public:
-       QTexinfoDialog(QTexinfo * form);
-public Q_SLOTS:
-       virtual void update();
-protected Q_SLOTS:
-       virtual void change_adaptor();
-       virtual void rescanClicked();
-       virtual void viewClicked();
-       virtual void enableViewPB();
-protected:
-       virtual void closeEvent(QCloseEvent * e);
-private:
-       QTexinfo * form_;
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // QTEXINFODIALOG_H