mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-12 11:32:21 +00:00
QURL renamed to UrlView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14256 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
1f0a608b99
commit
9f5f309ea2
@ -159,7 +159,7 @@ src/frontends/qt4/QTabular.C
|
|||||||
src/frontends/qt4/QTabularCreate.C
|
src/frontends/qt4/QTabularCreate.C
|
||||||
src/frontends/qt4/QTexinfo.C
|
src/frontends/qt4/QTexinfo.C
|
||||||
src/frontends/qt4/QThesaurus.C
|
src/frontends/qt4/QThesaurus.C
|
||||||
src/frontends/qt4/QURL.C
|
src/frontends/qt4/UrlView.C
|
||||||
src/frontends/qt4/QVSpace.C
|
src/frontends/qt4/QVSpace.C
|
||||||
src/frontends/qt4/QWrap.C
|
src/frontends/qt4/QWrap.C
|
||||||
src/frontends/qt4/Qt2BC.h
|
src/frontends/qt4/Qt2BC.h
|
||||||
|
@ -82,6 +82,7 @@
|
|||||||
#include "QTexinfo.h"
|
#include "QTexinfo.h"
|
||||||
#include "QToc.h"
|
#include "QToc.h"
|
||||||
#include "QTocDialog.h"
|
#include "QTocDialog.h"
|
||||||
|
#include "UrlView.h"
|
||||||
#include "QVSpace.h"
|
#include "QVSpace.h"
|
||||||
#include "QWrap.h"
|
#include "QWrap.h"
|
||||||
|
|
||||||
@ -91,7 +92,6 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "qt_helpers.h"
|
#include "qt_helpers.h"
|
||||||
#include "QURL.h"
|
|
||||||
|
|
||||||
#include <boost/assert.hpp>
|
#include <boost/assert.hpp>
|
||||||
|
|
||||||
@ -315,7 +315,7 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
|
|||||||
dialog->bc().bp(new OkCancelPolicy);
|
dialog->bc().bp(new OkCancelPolicy);
|
||||||
} else if (name == "url") {
|
} else if (name == "url") {
|
||||||
dialog->setController(new ControlCommand(*dialog, name));
|
dialog->setController(new ControlCommand(*dialog, name));
|
||||||
dialog->setView(new QURL(*dialog));
|
dialog->setView(new UrlView(*dialog));
|
||||||
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
|
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
|
||||||
} else if (name == "vspace") {
|
} else if (name == "vspace") {
|
||||||
dialog->setController(new ControlVSpace(*dialog));
|
dialog->setController(new ControlVSpace(*dialog));
|
||||||
|
@ -78,7 +78,6 @@ libqt4_la_SOURCES = \
|
|||||||
QTexinfo.C QTexinfo.h \
|
QTexinfo.C QTexinfo.h \
|
||||||
QThesaurus.C QThesaurus.h \
|
QThesaurus.C QThesaurus.h \
|
||||||
QToc.C QToc.h \
|
QToc.C QToc.h \
|
||||||
QURL.C QURL.h \
|
|
||||||
QVSpace.C QVSpace.h \
|
QVSpace.C QVSpace.h \
|
||||||
QWrap.C QWrap.h \
|
QWrap.C QWrap.h \
|
||||||
Qt2BC.C Qt2BC.h \
|
Qt2BC.C Qt2BC.h \
|
||||||
@ -90,4 +89,5 @@ libqt4_la_SOURCES = \
|
|||||||
qlkey.h \
|
qlkey.h \
|
||||||
qt_helpers.h qt_helpers.C \
|
qt_helpers.h qt_helpers.C \
|
||||||
qtTimeout.C qtTimeout.h \
|
qtTimeout.C qtTimeout.h \
|
||||||
|
UrlView.C UrlView.h \
|
||||||
$(MOCFILES)
|
$(MOCFILES)
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#include "QURLDialog.h"
|
#include "QURLDialog.h"
|
||||||
#include "QURL.h"
|
#include "UrlView.h"
|
||||||
|
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
@ -20,7 +20,7 @@
|
|||||||
namespace lyx {
|
namespace lyx {
|
||||||
namespace frontend {
|
namespace frontend {
|
||||||
|
|
||||||
QURLDialog::QURLDialog(QURL * form)
|
QURLDialog::QURLDialog(UrlView * form)
|
||||||
: form_(form)
|
: form_(form)
|
||||||
{
|
{
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
|
@ -20,12 +20,12 @@
|
|||||||
namespace lyx {
|
namespace lyx {
|
||||||
namespace frontend {
|
namespace frontend {
|
||||||
|
|
||||||
class QURL;
|
class UrlView;
|
||||||
|
|
||||||
class QURLDialog : public QDialog, public Ui::QURLUi {
|
class QURLDialog : public QDialog, public Ui::QURLUi {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
QURLDialog(QURL * form);
|
QURLDialog(UrlView * form);
|
||||||
~QURLDialog();
|
~QURLDialog();
|
||||||
|
|
||||||
virtual void show();
|
virtual void show();
|
||||||
@ -34,7 +34,7 @@ public slots:
|
|||||||
protected:
|
protected:
|
||||||
void closeEvent(QCloseEvent *);
|
void closeEvent(QCloseEvent *);
|
||||||
private:
|
private:
|
||||||
QURL * form_;
|
UrlView * form_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace frontend
|
} // namespace frontend
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* \file QURL.C
|
* \file UrlView.C
|
||||||
* This file is part of LyX, the document processor.
|
* This file is part of LyX, the document processor.
|
||||||
* Licence details can be found in the file COPYING.
|
* Licence details can be found in the file COPYING.
|
||||||
*
|
*
|
||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#include "QURL.h"
|
#include "UrlView.h"
|
||||||
#include "QURLDialog.h"
|
#include "QURLDialog.h"
|
||||||
#include "Qt2BC.h"
|
#include "Qt2BC.h"
|
||||||
#include "qt_helpers.h"
|
#include "qt_helpers.h"
|
||||||
@ -29,13 +29,13 @@ namespace frontend {
|
|||||||
|
|
||||||
typedef QController< ControlCommand, QView<QURLDialog> > base_class;
|
typedef QController< ControlCommand, QView<QURLDialog> > base_class;
|
||||||
|
|
||||||
QURL::QURL(Dialog & parent)
|
UrlView::UrlView(Dialog & parent)
|
||||||
: base_class(parent, _("URL"))
|
: base_class(parent, _("URL"))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void QURL::build_dialog()
|
void UrlView::build_dialog()
|
||||||
{
|
{
|
||||||
dialog_.reset(new QURLDialog(this));
|
dialog_.reset(new QURLDialog(this));
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ void QURL::build_dialog()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void QURL::update_contents()
|
void UrlView::update_contents()
|
||||||
{
|
{
|
||||||
InsetCommandParams const & params = controller().params();
|
InsetCommandParams const & params = controller().params();
|
||||||
|
|
||||||
@ -59,7 +59,7 @@ void QURL::update_contents()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void QURL::apply()
|
void UrlView::apply()
|
||||||
{
|
{
|
||||||
InsetCommandParams & params = controller().params();
|
InsetCommandParams & params = controller().params();
|
||||||
|
|
||||||
@ -73,7 +73,7 @@ void QURL::apply()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool QURL::isValid()
|
bool UrlView::isValid()
|
||||||
{
|
{
|
||||||
string const u(fromqstr(dialog_->urlED->text()));
|
string const u(fromqstr(dialog_->urlED->text()));
|
||||||
string const n(fromqstr(dialog_->nameED->text()));
|
string const n(fromqstr(dialog_->nameED->text()));
|
@ -1,6 +1,6 @@
|
|||||||
// -*- C++ -*-
|
// -*- C++ -*-
|
||||||
/**
|
/**
|
||||||
* \file QURL.h
|
* \file UrlView.h
|
||||||
* This file is part of LyX, the document processor.
|
* This file is part of LyX, the document processor.
|
||||||
* Licence details can be found in the file COPYING.
|
* Licence details can be found in the file COPYING.
|
||||||
*
|
*
|
||||||
@ -9,8 +9,8 @@
|
|||||||
* Full author contact details are available in file CREDITS.
|
* Full author contact details are available in file CREDITS.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef QURL_H
|
#ifndef QT4_URL_VIEW_H
|
||||||
#define QURL_H
|
#define QT4_URL_VIEW_H
|
||||||
|
|
||||||
#include "QDialogView.h"
|
#include "QDialogView.h"
|
||||||
|
|
||||||
@ -20,12 +20,12 @@ namespace frontend {
|
|||||||
class ControlCommand;
|
class ControlCommand;
|
||||||
class QURLDialog;
|
class QURLDialog;
|
||||||
|
|
||||||
class QURL :
|
class UrlView :
|
||||||
public QController<ControlCommand, QView<QURLDialog> >
|
public QController<ControlCommand, QView<QURLDialog> >
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
friend class QURLDialog;
|
friend class QURLDialog;
|
||||||
QURL(Dialog &);
|
UrlView(Dialog &);
|
||||||
protected:
|
protected:
|
||||||
virtual bool isValid();
|
virtual bool isValid();
|
||||||
private:
|
private:
|
||||||
@ -40,4 +40,4 @@ private:
|
|||||||
} // namespace frontend
|
} // namespace frontend
|
||||||
} // namespace lyx
|
} // namespace lyx
|
||||||
|
|
||||||
#endif // QURL_H
|
#endif // QT4_URL_VIEW_H
|
Loading…
Reference in New Issue
Block a user