anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge QAbout and QAboutDialog

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17943 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-04-24 11:32:09 +00:00
parent 97fe710a4f
commit e9b92c06a3
5 changed files with 20 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/Makefile.dialogs
View File

@ -86,7 +86,7 @@ MOCFILES = \
InsertTableWidget.C InsertTableWidget.h \
lengthcombo.C lengthcombo.h \
panelstack.C panelstack.h \
QAboutDialog.C QAboutDialog.h \
QAbout.C QAbout.h \
QBibitemDialog.C QBibitemDialog.h \
QBibtexDialog.C QBibtexDialog.h \
QBox.C QBox.h \

8
src/frontends/qt4/QAbout.C
View File

@ -11,7 +11,6 @@
#include <config.h>
#include "QAbout.h"
#include "QAboutDialog.h"
#include "Qt2BC.h"
#include "qt_helpers.h"
@ -38,10 +37,11 @@ using std::string;
namespace lyx {
namespace frontend {
typedef QController<ControlAboutlyx, QView<QAboutDialog> > about_base_class;
typedef QController<ControlAboutlyx, QView<QAboutDialog> > AboutBase;
QAbout::QAbout(Dialog & parent)
: about_base_class(parent, _("About LyX"))
: AboutBase(parent, _("About LyX"))
{
}
@ -120,3 +120,5 @@ void QAbout::build_dialog()
} // namespace frontend
} // namespace lyx
#include "QAbout_moc.cpp"

15
src/frontends/qt4/QAbout.h
View File

@ -13,13 +13,26 @@
#define FORMABOUT_H
#include "QDialogView.h"
#include "QAboutDialog.h"
#include "ui/AboutUi.h"
#include <QDialog>
namespace lyx {
namespace frontend {
class ControlAboutlyx;
class QAboutDialog : public QDialog, public Ui::QAboutUi {
Q_OBJECT
public:
QAboutDialog(QWidget * parent = 0)
: QDialog(parent)
{
setupUi(this);
connect(closePB, SIGNAL(clicked()), this, SLOT(reject()));
}
};
class QAbout
: public QController<ControlAboutlyx, QView<QAboutDialog> >
{

34
src/frontends/qt4/QAboutDialog.C
View File

@ -1,34 +0,0 @@
/**
* \file QAboutDialog.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Kalle Dalheimer
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "QAboutDialog.h"
namespace lyx {
namespace frontend {
QAboutDialog::QAboutDialog(QWidget * /*parent*/, char const * /*name*/,
bool /*modal*/, Qt::WFlags /*fl*/)
{
setupUi(this);
connect( closePB, SIGNAL( clicked() ),
this, SLOT( reject() ) );
}
QAboutDialog::~QAboutDialog()
{}
} // namespace frontend
} // namespace lyx
#include "QAboutDialog_moc.cpp"

32
src/frontends/qt4/QAboutDialog.h
View File

@ -1,32 +0,0 @@
// -*- C++ -*-
/**
* \file QAboutDialog.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Kalle Dalheimer
*
* Full author contact details are available in file CREDITS.
*/
#ifndef QABOUTDIALOG_H
#define QABOUTDIALOG_H
#include "ui/AboutUi.h"
#include <QDialog>
namespace lyx {
namespace frontend {
class QAboutDialog : public QDialog, public Ui::QAboutUi {
Q_OBJECT
public:
QAboutDialog(QWidget * parent = 0, const char * name = 0,
bool modal = FALSE, Qt::WFlags fl = 0);
~QAboutDialog();
};
} // namespace frontend
} // namespace lyx
#endif // QABOUTDIALOG_H