mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
incomplete qt3 and gtk support for Revision 15283
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15286 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
abca4c7a25
commit
c594a2f9d8
@ -152,7 +152,7 @@ Glib::ustring translateMarkup(Glib::ustring const & lyxMarkup)
|
||||
|
||||
|
||||
GAboutlyx::GAboutlyx(Dialog & parent)
|
||||
: GViewCB<ControlAboutlyx, GViewGladeB>(parent, "About LyX")
|
||||
: GViewCB<ControlAboutlyx, GViewGladeB>(parent, _("About LyX"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -29,9 +29,8 @@ using std::string;
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
// FIXME UNICODE
|
||||
GBibItem::GBibItem(Dialog & parent)
|
||||
: GViewCB<ControlCommand, GViewGladeB>(parent, lyx::to_utf8(_("Bibliography Entry Settings")), false)
|
||||
: GViewCB<ControlCommand, GViewGladeB>(parent, _("Bibliography Entry Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -37,9 +37,8 @@ using std::string;
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
// FIXME UNICODE
|
||||
GBibtex::GBibtex(Dialog & parent)
|
||||
: GViewCB<ControlBibtex, GViewGladeB>(parent, lyx::to_utf8(_("BibTeX Bibliography")), false)
|
||||
: GViewCB<ControlBibtex, GViewGladeB>(parent, _("BibTeX Bibliography"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -38,9 +38,8 @@ namespace {
|
||||
string defaultUnit("cm");
|
||||
} // namespace anon
|
||||
|
||||
// FIXME UNICODE
|
||||
GBox::GBox(Dialog & parent)
|
||||
: GViewCB<ControlBox, GViewGladeB>(parent, lyx::to_utf8(_("Box Settings")), false)
|
||||
: GViewCB<ControlBox, GViewGladeB>(parent, _("Box Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -33,9 +33,8 @@ using std::string;
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
// FIXME UNICODE
|
||||
GBranch::GBranch(Dialog & parent)
|
||||
: GViewCB<ControlBranch, GViewGladeB>(parent, lyx::to_utf8(_("Branch Settings")), false)
|
||||
: GViewCB<ControlBranch, GViewGladeB>(parent, _("Branch Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -28,9 +28,8 @@ using std::string;
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
// FIXME UNICODE
|
||||
GChanges::GChanges(Dialog & parent)
|
||||
: GViewCB<ControlChanges, GViewGladeB>(parent, lyx::to_utf8(_("Merge Changes")), false)
|
||||
: GViewCB<ControlChanges, GViewGladeB>(parent, _("Merge Changes"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -35,9 +35,8 @@ using std::string;
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
// FIXME UNICODE
|
||||
GCharacter::GCharacter(Dialog & parent)
|
||||
: GViewCB<ControlCharacter, GViewGladeB>(parent, lyx::to_utf8(_("Text Style")), false)
|
||||
: GViewCB<ControlCharacter, GViewGladeB>(parent, _("Text Style"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -67,9 +67,8 @@ bool GCitation::bib_visible(const Gtk::TreeModel::const_iterator& iter)
|
||||
styleModelColumns styleColumns;
|
||||
|
||||
|
||||
// FIXME UNICODE
|
||||
GCitation::GCitation(Dialog & parent)
|
||||
: GViewCB<ControlCitation, GViewGladeB>(parent, lyx::to_utf8(_("Citation")), false)
|
||||
: GViewCB<ControlCitation, GViewGladeB>(parent, _("Citation"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -55,9 +55,8 @@ char const * const encodings[] = { "Language Default", "LaTeX default",
|
||||
}
|
||||
|
||||
|
||||
// FIXME UNICODE
|
||||
GDocument::GDocument(Dialog & parent)
|
||||
: GViewCB<ControlDocument, GViewGladeB>(parent, lyx::to_utf8(_("Document Settings")), false),
|
||||
: GViewCB<ControlDocument, GViewGladeB>(parent, _("Document Settings"), false),
|
||||
lang_(getSecond(getLanguageData(false)))
|
||||
{}
|
||||
|
||||
|
@ -30,7 +30,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GERT::GERT(Dialog & parent)
|
||||
: GViewCB<ControlERT, GViewGladeB>(parent, lyx::to_utf8(_("TeX Settings")), false)
|
||||
: GViewCB<ControlERT, GViewGladeB>(parent, _("TeX Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -29,7 +29,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GErrorList::GErrorList(Dialog & parent)
|
||||
: GViewCB<ControlErrorList, GViewGladeB>(parent, lyx::to_utf8(_("Errors")), false)
|
||||
: GViewCB<ControlErrorList, GViewGladeB>(parent, _("Errors"), false)
|
||||
{}
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ void GErrorList::doBuild()
|
||||
|
||||
void GErrorList::update()
|
||||
{
|
||||
setTitle(controller().name());
|
||||
setTitle(lyx::from_ascii(controller().name()));
|
||||
updateContents();
|
||||
}
|
||||
|
||||
|
@ -297,7 +297,7 @@ void get_extra(external::ExtraData & data,
|
||||
|
||||
|
||||
GExternal::GExternal(Dialog & parent)
|
||||
: GViewCB<ControlExternal, GViewGladeB>(parent, lyx::to_utf8(_("External Settings")), false)
|
||||
: GViewCB<ControlExternal, GViewGladeB>(parent, _("External Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -38,7 +38,7 @@ using support::contains;
|
||||
namespace frontend {
|
||||
|
||||
GFloat::GFloat(Dialog & parent)
|
||||
: GViewCB<ControlFloat, GViewGladeB>(parent, lyx::to_utf8(_("Float Settings")), false)
|
||||
: GViewCB<ControlFloat, GViewGladeB>(parent, _("Float Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -50,7 +50,7 @@ string defaultUnit("cm");
|
||||
} // namespace anon
|
||||
|
||||
GGraphics::GGraphics(Dialog & parent)
|
||||
: GViewCB<ControlGraphics, GViewGladeB>(parent, lyx::to_utf8(_("Graphics")), false)
|
||||
: GViewCB<ControlGraphics, GViewGladeB>(parent, _("Graphics"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -31,7 +31,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GInclude::GInclude(Dialog & parent)
|
||||
: GViewCB<ControlInclude, GViewGladeB>(parent, lyx::to_utf8(_("Child Document")), false)
|
||||
: GViewCB<ControlInclude, GViewGladeB>(parent, _("Child Document"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -31,7 +31,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GLog::GLog(Dialog & parent)
|
||||
: GViewCB<ControlLog, GViewGladeB>(parent, lyx::to_utf8(_("Log Viewer")), false)
|
||||
: GViewCB<ControlLog, GViewGladeB>(parent, _("Log Viewer"), false)
|
||||
{}
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@ void GLog::doBuild()
|
||||
|
||||
void GLog::update()
|
||||
{
|
||||
string const title = controller().title();
|
||||
lyx::docstring const title = controller().title();
|
||||
|
||||
if (!title.empty())
|
||||
setTitle(title);
|
||||
|
@ -104,7 +104,7 @@ inline int indexToCol(int index)
|
||||
|
||||
|
||||
GMathDelim::GMathDelim(Dialog & parent) :
|
||||
GViewCB<ControlMath, GViewGladeB>(parent, lyx::to_utf8(_("Math Delimiters"))),
|
||||
GViewCB<ControlMath, GViewGladeB>(parent, _("Math Delimiters")),
|
||||
delimTbl_(delimTblRows, delimTblCols, xbm)
|
||||
{
|
||||
}
|
||||
|
@ -104,7 +104,7 @@ GXpmBtnTbl::XpmData xpmDown[] =
|
||||
|
||||
|
||||
GMathPanel::GMathPanel(Dialog & parent)
|
||||
: GViewCB<ControlMath, GViewGladeB>(parent, lyx::to_utf8(_("Math Panel"))),
|
||||
: GViewCB<ControlMath, GViewGladeB>(parent, _("Math Panel")),
|
||||
tableUp_(2, 5, xpmUp), tableDown_(4, 3, xpmDown)
|
||||
{
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ namespace frontend {
|
||||
|
||||
|
||||
GMathsMatrix::GMathsMatrix(Dialog & parent)
|
||||
: GViewCB<ControlMath, GViewGladeB>(parent, lyx::to_utf8(_("Math Matrix")), false)
|
||||
: GViewCB<ControlMath, GViewGladeB>(parent, _("Math Matrix"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -32,7 +32,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GNote::GNote(Dialog & parent)
|
||||
: GViewCB<ControlNote, GViewGladeB>(parent, lyx::to_utf8(_("Note Settings")), false)
|
||||
: GViewCB<ControlNote, GViewGladeB>(parent, _("Note Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -41,7 +41,7 @@ namespace {
|
||||
|
||||
|
||||
GParagraph::GParagraph(Dialog & parent)
|
||||
: GViewCB<ControlParagraph, GViewGladeB>(parent, lyx::to_utf8(_("Paragraph Settings")), false)
|
||||
: GViewCB<ControlParagraph, GViewGladeB>(parent, _("Paragraph Settings"), false)
|
||||
{}
|
||||
|
||||
void GParagraph::doBuild()
|
||||
|
@ -35,7 +35,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GPreferences::GPreferences(Dialog & parent)
|
||||
: GViewCB<ControlPrefs, GViewGladeB>(parent, lyx::to_utf8(_("Preferences")), false)
|
||||
: GViewCB<ControlPrefs, GViewGladeB>(parent, _("Preferences"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -62,7 +62,7 @@ bufferModelColumns bufferColumns;
|
||||
|
||||
|
||||
GRef::GRef(Dialog & parent)
|
||||
: GViewCB<ControlRef, GViewGladeB>(parent, lyx::to_utf8(_("Cross-reference")), false)
|
||||
: GViewCB<ControlRef, GViewGladeB>(parent, _("Cross-reference"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -33,7 +33,7 @@ typedef GViewCB<ControlSearch, GViewGladeB> base_class;
|
||||
|
||||
|
||||
GSearch::GSearch(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Find and Replace")), false)
|
||||
: base_class(parent, _("Find and Replace"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -33,7 +33,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GSendto::GSendto(Dialog & parent)
|
||||
: GViewCB<ControlSendto, GViewGladeB>(parent, lyx::to_utf8(_("Send document to command")), false)
|
||||
: GViewCB<ControlSendto, GViewGladeB>(parent, _("Send document to command"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -29,7 +29,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GShowFile::GShowFile(Dialog & parent)
|
||||
: GViewCB<ControlShowFile, GViewGladeB>(parent, lyx::to_utf8(_("Show File")), false)
|
||||
: GViewCB<ControlShowFile, GViewGladeB>(parent, _("Show File"), false)
|
||||
{}
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ void GShowFile::update()
|
||||
string const title = controller().getFileName();
|
||||
|
||||
if (!title.empty())
|
||||
setTitle(title);
|
||||
setTitle(lyx::from_utf8(title));
|
||||
|
||||
string const contents = controller().getFileContents();
|
||||
|
||||
|
@ -31,7 +31,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GSpellchecker::GSpellchecker(Dialog & parent)
|
||||
: GViewCB<ControlSpellchecker, GViewGladeB>(parent, lyx::to_utf8(_("Spellchecker")), false)
|
||||
: GViewCB<ControlSpellchecker, GViewGladeB>(parent, _("Spellchecker"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -31,7 +31,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GTableCreate::GTableCreate(Dialog & parent)
|
||||
: GViewCB<ControlTabularCreate, GViewGladeB>(parent, lyx::to_utf8(_("Insert Table")))
|
||||
: GViewCB<ControlTabularCreate, GViewGladeB>(parent, _("Insert Table"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GTabular::GTabular(Dialog & parent)
|
||||
: GViewCB<ControlTabular, GViewGladeB>(parent, lyx::to_utf8(_("Table Settings")), false)
|
||||
: GViewCB<ControlTabular, GViewGladeB>(parent, _("Table Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -34,7 +34,7 @@ namespace frontend {
|
||||
|
||||
|
||||
GTexinfo::GTexinfo(Dialog & parent)
|
||||
: GViewCB<ControlTexinfo, GViewGladeB>(parent, lyx::to_utf8(_("TeX Information")), false),
|
||||
: GViewCB<ControlTexinfo, GViewGladeB>(parent, _("TeX Information"), false),
|
||||
activeStyle(ControlTexinfo::cls)
|
||||
{}
|
||||
|
||||
|
@ -44,7 +44,7 @@ synModelColumns synColumns;
|
||||
|
||||
|
||||
GThesaurus::GThesaurus(Dialog & parent)
|
||||
: GViewCB<ControlThesaurus, GViewGladeB>(parent, lyx::to_utf8(_("Thesaurus")), false)
|
||||
: GViewCB<ControlThesaurus, GViewGladeB>(parent, _("Thesaurus"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -30,7 +30,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GToc::GToc(Dialog & parent)
|
||||
: GViewCB<ControlToc, GViewGladeB>(parent, lyx::to_utf8(_("Table of Contents")), false)
|
||||
: GViewCB<ControlToc, GViewGladeB>(parent, _("Table of Contents"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -34,7 +34,7 @@ namespace frontend {
|
||||
|
||||
|
||||
GUrl::GUrl(Dialog & parent)
|
||||
: GViewCB<ControlCommand, GViewGladeB>(parent, lyx::to_utf8(_("URL")))
|
||||
: GViewCB<ControlCommand, GViewGladeB>(parent, _("URL"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GVSpace::GVSpace(Dialog & parent)
|
||||
: GViewCB<ControlVSpace, GViewGladeB>(parent, lyx::to_utf8(_("VSpace Settings")), false)
|
||||
: GViewCB<ControlVSpace, GViewGladeB>(parent, _("VSpace Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -21,12 +21,14 @@
|
||||
#include "GViewBase.h"
|
||||
#include "support/filetools.h"
|
||||
|
||||
using lyx::docstring;
|
||||
|
||||
using std::string;
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GViewBase::GViewBase(Dialog & parent, string const & t, bool allowResize) :
|
||||
GViewBase::GViewBase(Dialog & parent, docstring const & t, bool allowResize) :
|
||||
Dialog::View(parent, t), allowResize_(allowResize)
|
||||
{
|
||||
}
|
||||
@ -115,7 +117,7 @@ void GViewBase::setRestore(Gtk::Button * restore)
|
||||
}
|
||||
|
||||
|
||||
void GViewBase::setTitle(std::string const & title)
|
||||
void GViewBase::setTitle(lyx::docstring const & title)
|
||||
{
|
||||
Dialog::View::setTitle(title);
|
||||
window()->set_title(title);
|
||||
|
@ -32,7 +32,7 @@ public:
|
||||
void setApply(Gtk::Button * apply);
|
||||
void setOK(Gtk::Button * ok);
|
||||
void setRestore(Gtk::Button * restore);
|
||||
void setTitle(std::string const &);
|
||||
void setTitle(lyx::doctring const &);
|
||||
bool readOnly() const;
|
||||
protected:
|
||||
// Build the dialog
|
||||
@ -103,12 +103,12 @@ public:
|
||||
Controller & controller();
|
||||
Controller const & controller() const;
|
||||
protected:
|
||||
GViewCB(Dialog & parent, std::string const & t, bool allowResize = false);
|
||||
GViewCB(Dialog & parent, lyx::docstring const & t, bool allowResize = false);
|
||||
};
|
||||
|
||||
|
||||
template <class Controller, class Base>
|
||||
GViewCB<Controller, Base>::GViewCB(Dialog & parent, std::string const & t,
|
||||
GViewCB<Controller, Base>::GViewCB(Dialog & parent, lyx::docstring const & t,
|
||||
bool allowResize) :
|
||||
Base(parent, t, allowResize)
|
||||
{
|
||||
|
@ -32,7 +32,7 @@ namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
GWrap::GWrap(Dialog & parent)
|
||||
: GViewCB<ControlWrap, GViewGladeB>(parent, lyx::to_utf8(_("Text Wrap Settings")), false)
|
||||
: GViewCB<ControlWrap, GViewGladeB>(parent, _("Text Wrap Settings"), false)
|
||||
{}
|
||||
|
||||
|
||||
|
@ -41,7 +41,7 @@ namespace frontend {
|
||||
typedef QController<ControlAboutlyx, QView<QAboutDialog> > base_class;
|
||||
|
||||
QAbout::QAbout(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("About LyX")))
|
||||
: base_class(parent, _("About LyX"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -28,7 +28,7 @@ typedef QController<ControlCommand, QView<QBibitemDialog> > base_class;
|
||||
|
||||
|
||||
QBibitem::QBibitem(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Bibliography Entry Settings")))
|
||||
: base_class(parent, _("Bibliography Entry Settings"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -45,7 +45,7 @@ namespace frontend {
|
||||
typedef QController<ControlBibtex, QView<QBibtexDialog> > base_class;
|
||||
|
||||
QBibtex::QBibtex(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("BibTeX Bibliography")))
|
||||
: base_class(parent, _("BibTeX Bibliography"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -48,7 +48,7 @@ namespace frontend {
|
||||
typedef QController<ControlBox, QView<QBoxDialog> > base_class;
|
||||
|
||||
QBox::QBox(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Box Settings")))
|
||||
: base_class(parent, _("Box Settings"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -33,7 +33,7 @@ typedef QController<ControlBranch, QView<QBranchDialog> > base_class;
|
||||
|
||||
|
||||
QBranch::QBranch(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Branch Settings")))
|
||||
: base_class(parent, _("Branch Settings"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -33,7 +33,7 @@ typedef QController<ControlChanges, QView<QChangesDialog> > base_class;
|
||||
|
||||
|
||||
QChanges::QChanges(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Merge Changes")))
|
||||
: base_class(parent, _("Merge Changes"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ typedef QController<ControlCharacter, QView<QCharacterDialog> > base_class;
|
||||
|
||||
|
||||
QCharacter::QCharacter(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Text Style")))
|
||||
: base_class(parent, _("Text Style"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -47,7 +47,7 @@ namespace frontend {
|
||||
typedef QController<ControlCitation, QView<QCitationDialog> > base_class;
|
||||
|
||||
QCitation::QCitation(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Citation")))
|
||||
: base_class(parent, _("Citation"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -67,7 +67,7 @@ char const * encodings[] = { "LaTeX default", "latin1", "latin2",
|
||||
|
||||
|
||||
QDocument::QDocument(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Document Settings"))),
|
||||
: base_class(parent, _("Document Settings")),
|
||||
lang_(getSecond(getLanguageData(false)))
|
||||
{}
|
||||
|
||||
|
@ -27,7 +27,7 @@ typedef QController<ControlERT, QView<QERTDialog> > base_class;
|
||||
|
||||
|
||||
QERT::QERT(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("TeX Code Settings")))
|
||||
: base_class(parent, _("TeX Code Settings"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,7 @@ namespace frontend {
|
||||
typedef QController<ControlErrorList, QView<QErrorListDialog> > base_class;
|
||||
|
||||
QErrorList::QErrorList(Dialog & parent)
|
||||
: base_class(parent, "")
|
||||
: base_class(parent, lyx::docstring())
|
||||
{}
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ void QErrorList::select(int item)
|
||||
|
||||
void QErrorList::update_contents()
|
||||
{
|
||||
setTitle(controller().name());
|
||||
setTitle(lyx::from_ascii(controller().name()));
|
||||
dialog_->errorsLB->clear();
|
||||
dialog_->descriptionTB->setText(QString());
|
||||
|
||||
|
@ -277,7 +277,7 @@ void getExtra(external::ExtraData & data,
|
||||
typedef QController<ControlExternal, QView<QExternalDialog> > base_class;
|
||||
|
||||
QExternal::QExternal(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("External Material")))
|
||||
: base_class(parent, _("External Material"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -28,7 +28,7 @@ typedef QController<ControlFloat, QView<QFloatDialog> > base_class;
|
||||
|
||||
|
||||
QFloat::QFloat(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Float Settings")))
|
||||
: base_class(parent, _("Float Settings"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -57,7 +57,7 @@ namespace frontend {
|
||||
typedef QController<ControlGraphics, QView<QGraphicsDialog> > base_class;
|
||||
|
||||
QGraphics::QGraphics(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Graphics")))
|
||||
: base_class(parent, _("Graphics"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@ typedef QController<ControlInclude, QView<QIncludeDialog> > base_class;
|
||||
|
||||
|
||||
QInclude::QInclude(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Child Document")))
|
||||
: base_class(parent, _("Child Document"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -30,7 +30,7 @@ namespace frontend {
|
||||
typedef QController<ControlCommand, QView<QIndexDialog> > base_class;
|
||||
|
||||
|
||||
QIndex::QIndex(Dialog & parent, string const & title, QString const & label)
|
||||
QIndex::QIndex(Dialog & parent, docstring const & title, QString const & label)
|
||||
: base_class(parent, title), label_(label)
|
||||
{
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ namespace frontend {
|
||||
typedef QController<ControlLog, QView<QLogDialog> > base_class;
|
||||
|
||||
QLog::QLog(Dialog & parent)
|
||||
: base_class(parent, "")
|
||||
: base_class(parent, lyx::docstring())
|
||||
{}
|
||||
|
||||
|
||||
|
@ -24,7 +24,7 @@ typedef QController<ControlMath, QView<QMathDialog> > math_base;
|
||||
|
||||
|
||||
QMath::QMath(Dialog & parent)
|
||||
: math_base(parent, lyx::to_utf8(_("Math Panel")))
|
||||
: math_base(parent, _("Math Panel"))
|
||||
{}
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ typedef QController<ControlMath, QView<QMathMatrixDialog> > matrix_base;
|
||||
|
||||
|
||||
QMathMatrix::QMathMatrix(Dialog & parent)
|
||||
: matrix_base(parent, lyx::to_utf8(_("Math Matrix")))
|
||||
: matrix_base(parent, _("Math Matrix"))
|
||||
{}
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ typedef QController<ControlMath, QView<QDelimiterDialog> > delimiter_base;
|
||||
|
||||
|
||||
QMathDelimiter::QMathDelimiter(Dialog & parent)
|
||||
: delimiter_base(parent, lyx::to_utf8(_("Math Delimiter")))
|
||||
: delimiter_base(parent, _("Math Delimiter"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -31,7 +31,7 @@ typedef QController<ControlNote, QView<QNoteDialog> > base_class;
|
||||
|
||||
|
||||
QNote::QNote(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Note Settings")))
|
||||
: base_class(parent, _("Note Settings"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -37,7 +37,7 @@ typedef QController<ControlParagraph, QView<QParagraphDialog> > base_class;
|
||||
|
||||
|
||||
QParagraph::QParagraph(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Paragraph Settings")))
|
||||
: base_class(parent, _("Paragraph Settings"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -79,7 +79,7 @@ namespace frontend {
|
||||
typedef QController<ControlPrefs, QView<QPrefsDialog> > base_class;
|
||||
|
||||
QPrefs::QPrefs(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Preferences")))
|
||||
: base_class(parent, _("Preferences"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ typedef QController<ControlPrint, QView<QLPrintDialog> > base_class;
|
||||
|
||||
|
||||
QPrint::QPrint(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Print Document")))
|
||||
: base_class(parent, _("Print Document"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ typedef QController<ControlRef, QView<QRefDialog> > base_class;
|
||||
|
||||
|
||||
QRef::QRef(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Cross-reference"))),
|
||||
: base_class(parent, _("Cross-reference")),
|
||||
sort_(false), at_ref_(false)
|
||||
{
|
||||
}
|
||||
|
@ -28,7 +28,7 @@ typedef QController<ControlSearch, QView<QSearchDialog> > base_class;
|
||||
|
||||
|
||||
QSearch::QSearch(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Find and Replace")))
|
||||
: base_class(parent, _("Find and Replace"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ typedef QController<ControlSendto, QView<QSendtoDialog> > base_class;
|
||||
|
||||
|
||||
QSendto::QSendto(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Send Document to Command")))
|
||||
: base_class(parent, _("Send Document to Command"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@ typedef QController<ControlShowFile, QView<QShowFileDialog> > base_class;
|
||||
|
||||
|
||||
QShowFile::QShowFile(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Show File")))
|
||||
: base_class(parent, _("Show File"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ typedef QController<ControlSpellchecker, QView<QSpellcheckerDialog> > base_class
|
||||
|
||||
|
||||
QSpellchecker::QSpellchecker(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Spellchecker")))
|
||||
: base_class(parent, _("Spellchecker"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -39,7 +39,7 @@ namespace frontend {
|
||||
typedef QController<ControlTabular, QView<QTabularDialog> > base_class;
|
||||
|
||||
QTabular::QTabular(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Table Settings")))
|
||||
: base_class(parent, _("Table Settings"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ typedef QController<ControlTabularCreate, QView<QTabularCreateDialog> > base_cla
|
||||
|
||||
|
||||
QTabularCreate::QTabularCreate(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Insert Table")))
|
||||
: base_class(parent, _("Insert Table"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ namespace frontend {
|
||||
typedef QController<ControlTexinfo, QView<QTexinfoDialog> > base_class;
|
||||
|
||||
QTexinfo::QTexinfo(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("TeX Information"))),
|
||||
: base_class(parent, _("TeX Information")),
|
||||
warningPosted(false), activeStyle(ControlTexinfo::cls)
|
||||
{
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ namespace frontend {
|
||||
typedef QController<ControlThesaurus, QView<QThesaurusDialog> > base_class;
|
||||
|
||||
QThesaurus::QThesaurus(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Thesaurus")))
|
||||
: base_class(parent, _("Thesaurus"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@ namespace frontend {
|
||||
typedef QController<ControlToc, QView<QTocDialog> > base_class;
|
||||
|
||||
QToc::QToc(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Table of Contents"))), depth_(1)
|
||||
: base_class(parent, _("Table of Contents")), depth_(1)
|
||||
{}
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ void QToc::updateType()
|
||||
dialog_->typeCO->insertItem(toqstr(guiname));
|
||||
if (*it == type) {
|
||||
dialog_->typeCO->setCurrentItem(it - choice.begin());
|
||||
setTitle(guiname);
|
||||
setTitle(lyx::from_ascii(guiname));
|
||||
}
|
||||
}
|
||||
type_ = type;
|
||||
|
@ -30,7 +30,7 @@ namespace frontend {
|
||||
typedef QController<ControlCommand, QView<QURLDialog> > base_class;
|
||||
|
||||
QURL::QURL(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("URL")))
|
||||
: base_class(parent, _("URL"))
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -130,7 +130,7 @@ VSpace setVSpaceFromWidgets(int spacing,
|
||||
typedef QController<ControlVSpace, QView<QVSpaceDialog> > base_class;
|
||||
|
||||
QVSpace::QVSpace(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Vertical Space Settings")))
|
||||
: base_class(parent, _("Vertical Space Settings"))
|
||||
{}
|
||||
|
||||
|
||||
|
@ -32,7 +32,7 @@ namespace frontend {
|
||||
typedef QController<ControlViewSource, QView<QViewSourceDialog> > base_class;
|
||||
|
||||
QViewSource::QViewSource(Dialog & parent)
|
||||
: base_class(parent, "")
|
||||
: base_class(parent, lyx::docstring())
|
||||
{}
|
||||
|
||||
|
||||
|
@ -36,7 +36,7 @@ namespace frontend {
|
||||
typedef QController<ControlWrap, QView<QWrapDialog> > base_class;
|
||||
|
||||
QWrap::QWrap(Dialog & parent)
|
||||
: base_class(parent, lyx::to_utf8(_("Text Wrap Settings")))
|
||||
: base_class(parent, _("Text Wrap Settings"))
|
||||
{
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user