From fabd5d2057d25290bc9cc997142ebac940031b9b Mon Sep 17 00:00:00 2001 From: John Levon Date: Tue, 17 Dec 2002 20:37:13 +0000 Subject: [PATCH] The big Qt toqstr/fromqstr patch. This kind of wrapping will be needed anyway, and it's an improvement on what we had. Please give it a run. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5846 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/Alert_pimpl.C | 25 +-- src/frontends/qt2/BulletsModule.C | 24 +- src/frontends/qt2/ChangeLog | 10 + src/frontends/qt2/FileDialog.C | 10 +- src/frontends/qt2/FileDialog_private.C | 15 +- src/frontends/qt2/Menubar_pimpl.C | 2 +- src/frontends/qt2/QAbout.C | 14 +- src/frontends/qt2/QBibitem.C | 14 +- src/frontends/qt2/QBibtex.C | 18 +- src/frontends/qt2/QBibtexDialog.C | 24 +- src/frontends/qt2/QCharacter.C | 18 +- src/frontends/qt2/QCitation.C | 12 +- src/frontends/qt2/QCitationDialog.C | 16 +- src/frontends/qt2/QCommandBuffer.C | 34 +-- src/frontends/qt2/QContentPane.C | 3 +- src/frontends/qt2/QDelimiterDialog.C | 14 +- src/frontends/qt2/QDocument.C | 103 +++++---- src/frontends/qt2/QDocumentDialog.C | 65 +++--- src/frontends/qt2/QERT.C | 4 +- src/frontends/qt2/QError.C | 6 +- src/frontends/qt2/QExternal.C | 16 +- src/frontends/qt2/QExternalDialog.C | 10 +- src/frontends/qt2/QFloat.C | 4 +- src/frontends/qt2/QGraphics.C | 102 ++++----- src/frontends/qt2/QGraphicsDialog.C | 9 +- src/frontends/qt2/QInclude.C | 16 +- src/frontends/qt2/QIndex.C | 8 +- src/frontends/qt2/QIndexDialog.C | 4 +- src/frontends/qt2/QLImage.C | 3 +- src/frontends/qt2/QLPainter.C | 7 +- src/frontends/qt2/QLPopupMenu.C | 5 +- src/frontends/qt2/QLPrintDialog.C | 10 +- src/frontends/qt2/QLog.C | 14 +- src/frontends/qt2/QLyXKeySym.C | 15 +- src/frontends/qt2/QMathDialog.C | 62 +++--- src/frontends/qt2/QMathMatrixDialog.C | 6 +- src/frontends/qt2/QMinipage.C | 10 +- src/frontends/qt2/QParagraph.C | 27 +-- src/frontends/qt2/QPreamble.C | 8 +- src/frontends/qt2/QPreambleDialog.C | 12 +- src/frontends/qt2/QPrefs.C | 206 +++++++++--------- src/frontends/qt2/QPrefsDialog.C | 118 +++++----- src/frontends/qt2/QPrint.C | 14 +- src/frontends/qt2/QRef.C | 34 +-- src/frontends/qt2/QSearch.C | 4 +- src/frontends/qt2/QSearchDialog.C | 30 ++- src/frontends/qt2/QSendto.C | 10 +- src/frontends/qt2/QSendtoDialog.C | 2 +- src/frontends/qt2/QShowFile.C | 8 +- src/frontends/qt2/QSpellchecker.C | 16 +- src/frontends/qt2/QSpellcheckerDialog.C | 2 +- src/frontends/qt2/QTabular.C | 22 +- src/frontends/qt2/QTabularCreate.C | 4 +- src/frontends/qt2/QTabularCreateDialog.C | 2 +- src/frontends/qt2/QTabularDialog.C | 3 +- src/frontends/qt2/QTexinfo.C | 6 +- src/frontends/qt2/QTexinfoDialog.C | 3 +- src/frontends/qt2/QThesaurus.C | 8 +- src/frontends/qt2/QThesaurusDialog.C | 11 +- src/frontends/qt2/QToc.C | 19 +- src/frontends/qt2/QTocDialog.C | 3 +- src/frontends/qt2/QURL.C | 16 +- src/frontends/qt2/QVCLog.C | 10 +- src/frontends/qt2/QWorkArea.C | 7 +- src/frontends/qt2/QWrap.C | 10 +- src/frontends/qt2/Qt2BC.C | 3 +- src/frontends/qt2/QtView.C | 18 +- src/frontends/qt2/QtView.h | 5 +- src/frontends/qt2/README | 42 +--- src/frontends/qt2/Toolbar_pimpl.C | 17 +- src/frontends/qt2/Toolbar_pimpl.h | 4 +- src/frontends/qt2/iconpalette.C | 3 +- src/frontends/qt2/lengthcombo.C | 4 +- src/frontends/qt2/lyx_gui.C | 6 +- src/frontends/qt2/qfont_loader.C | 48 ++-- src/frontends/qt2/qt_helpers.C | 46 +++- src/frontends/qt2/qt_helpers.h | 42 ++++ src/frontends/qt2/ui/BiblioModuleBase.ui | 2 +- src/frontends/qt2/ui/BulletsModuleBase.ui | 2 +- src/frontends/qt2/ui/ClassModuleBase.ui | 2 +- src/frontends/qt2/ui/LanguageModuleBase.ui | 2 +- src/frontends/qt2/ui/Makefile.am | 2 +- src/frontends/qt2/ui/MarginsModuleBase.ui | 2 +- src/frontends/qt2/ui/NumberingModuleBase.ui | 2 +- src/frontends/qt2/ui/PackagesModuleBase.ui | 2 +- src/frontends/qt2/ui/PaperModuleBase.ui | 2 +- src/frontends/qt2/ui/PreambleModuleBase.ui | 2 +- src/frontends/qt2/ui/QAboutDialog.ui | 2 +- src/frontends/qt2/ui/QAskForTextDialog.ui | 2 +- src/frontends/qt2/ui/QBibitemDialog.ui | 2 +- src/frontends/qt2/ui/QBibtexDialog.ui | 2 +- src/frontends/qt2/ui/QCharacterDialog.ui | 2 +- src/frontends/qt2/ui/QCitationDialog.ui | 2 +- src/frontends/qt2/ui/QDelimiterDialog.ui | 2 +- src/frontends/qt2/ui/QDocumentDialog.ui | 2 +- src/frontends/qt2/ui/QERTDialog.ui | 2 +- src/frontends/qt2/ui/QErrorDialog.ui | 2 +- src/frontends/qt2/ui/QExternalDialog.ui | 2 +- src/frontends/qt2/ui/QFloatDialog.ui | 2 +- src/frontends/qt2/ui/QGraphicsDialog.ui | 2 +- src/frontends/qt2/ui/QIncludeDialog.ui | 2 +- src/frontends/qt2/ui/QIndexDialog.ui | 2 +- src/frontends/qt2/ui/QLogDialog.ui | 2 +- src/frontends/qt2/ui/QMathDialog.ui | 2 +- src/frontends/qt2/ui/QMathMatrixDialog.ui | 2 +- src/frontends/qt2/ui/QMinipageDialog.ui | 2 +- src/frontends/qt2/ui/QParagraphDialog.ui | 2 +- src/frontends/qt2/ui/QPreambleDialog.ui | 2 +- src/frontends/qt2/ui/QPrefAsciiModule.ui | 2 +- src/frontends/qt2/ui/QPrefColorsModule.ui | 2 +- src/frontends/qt2/ui/QPrefConvertersModule.ui | 2 +- src/frontends/qt2/ui/QPrefDateModule.ui | 2 +- src/frontends/qt2/ui/QPrefDisplayModule.ui | 2 +- .../qt2/ui/QPrefFileformatsModule.ui | 2 +- src/frontends/qt2/ui/QPrefKeyboardModule.ui | 2 +- src/frontends/qt2/ui/QPrefLanguageModule.ui | 2 +- src/frontends/qt2/ui/QPrefLatexModule.ui | 2 +- src/frontends/qt2/ui/QPrefPathsModule.ui | 2 +- src/frontends/qt2/ui/QPrefPrinterModule.ui | 2 +- .../qt2/ui/QPrefScreenFontsModule.ui | 2 +- .../qt2/ui/QPrefSpellcheckerModule.ui | 2 +- src/frontends/qt2/ui/QPrefUIModule.ui | 2 +- src/frontends/qt2/ui/QPrefsDialog.ui | 2 +- src/frontends/qt2/ui/QPrintDialog.ui | 2 +- src/frontends/qt2/ui/QRefDialog.ui | 2 +- src/frontends/qt2/ui/QSearchDialog.ui | 2 +- src/frontends/qt2/ui/QSendtoDialog.ui | 2 +- src/frontends/qt2/ui/QShowFileDialog.ui | 2 +- src/frontends/qt2/ui/QSpellcheckerDialog.ui | 2 +- src/frontends/qt2/ui/QTabularCreateDialog.ui | 2 +- src/frontends/qt2/ui/QTabularDialog.ui | 2 +- src/frontends/qt2/ui/QTexinfoDialog.ui | 2 +- src/frontends/qt2/ui/QThesaurusDialog.ui | 2 +- src/frontends/qt2/ui/QTocDialog.ui | 2 +- src/frontends/qt2/ui/QURLDialog.ui | 2 +- src/frontends/qt2/ui/QVCLogDialog.ui | 2 +- src/frontends/qt2/ui/QWrapDialog.ui | 2 +- 137 files changed, 916 insertions(+), 789 deletions(-) diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C index 553bc0b0c5..62d8b11b4d 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -18,11 +18,10 @@ #include #include #include "ui/QAskForTextDialog.h" +#include "qt_helpers.h" #include -#include - #include "Alert.h" #include "Alert_pimpl.h" @@ -36,21 +35,21 @@ using std::make_pair; void alert_pimpl(string const & s1, string const & s2, string const & s3) { QMessageBox::warning(0, "LyX", - (s1 + '\n' + '\n' + s2 + '\n' + s3).c_str()); + toqstr(s1 + '\n' + '\n' + s2 + '\n' + s3)); } bool askQuestion_pimpl(string const & s1, string const & s2, string const & s3) { - return !(QMessageBox::information(0, "LyX", (s1 + '\n' + s2 + '\n' + s3).c_str(), - _("&Yes"), _("&No"), 0, 1)); + return !(QMessageBox::information(0, "LyX", toqstr(s1 + '\n' + s2 + '\n' + s3), + qt_("&Yes"), qt_("&No"), 0, 1)); } int askConfirmation_pimpl(string const & s1, string const & s2, string const & s3) { - return (QMessageBox::information(0, "LyX", (s1 + '\n' + s2 + '\n' + s3).c_str(), - _("&Yes"), _("&No"), _("&Cancel"), 0, 2)) + 1; + return (QMessageBox::information(0, "LyX", toqstr(s1 + '\n' + s2 + '\n' + s3), + qt_("&Yes"), qt_("&No"), qt_("&Cancel"), 0, 2)) + 1; } @@ -58,23 +57,23 @@ pair const askForText_pimpl(string const & msg, string const & dflt) { #if USE_BOOST_FORMAT - boost::format fmt(_("LyX: %1$s")); + boost::format fmt(qt_("LyX: %1$s")); fmt % msg; string const title = fmt.str(); #else - string const title = _("LyX: ") + msg; + string const title = qt_("LyX: ") + msg; #endif - QAskForTextDialog d(0, title.c_str(), true); + QAskForTextDialog d(0, toqstr(title), true); // less than ideal ! - d.askLA->setText(('&' + msg).c_str()); - d.askLE->setText(dflt.c_str()); + d.askLA->setText(toqstr('&' + msg)); + d.askLE->setText(toqstr(dflt)); d.askLE->setFocus(); int ret = d.exec(); d.hide(); if (ret) - return make_pair(true, d.askLE->text().latin1()); + return make_pair(true, fromqstr(d.askLE->text())); else return make_pair(false, string()); } diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C index de9708bb83..4d7d7fcb90 100644 --- a/src/frontends/qt2/BulletsModule.C +++ b/src/frontends/qt2/BulletsModule.C @@ -9,7 +9,7 @@ */ #include -#include "gettext.h" +#include "qt_helpers.h" #ifdef __GNUG__ #pragma implementation @@ -73,22 +73,22 @@ BulletsModule::BulletsModule(QWidget * parent, char const * name, WFlags fl) // insert pixmaps string bmfile; bmfile = LibFileSearch("images", "standard", "xpm"); - standard_->insertItem(QPixmap(bmfile.c_str())); + standard_->insertItem(QPixmap(toqstr(bmfile))); bmfile = LibFileSearch("images", "amssymb", "xpm"); - maths_->insertItem(QPixmap(bmfile.c_str())); + maths_->insertItem(QPixmap(toqstr(bmfile))); bmfile = LibFileSearch("images", "psnfss1", "xpm"); - ding1_->insertItem(QPixmap(bmfile.c_str())); + ding1_->insertItem(QPixmap(toqstr(bmfile))); bmfile = LibFileSearch("images", "psnfss2", "xpm"); - ding2_->insertItem(QPixmap(bmfile.c_str())); + ding2_->insertItem(QPixmap(toqstr(bmfile))); bmfile = LibFileSearch("images", "psnfss3", "xpm"); - ding3_->insertItem(QPixmap(bmfile.c_str())); + ding3_->insertItem(QPixmap(toqstr(bmfile))); bmfile = LibFileSearch("images", "psnfss4", "xpm"); - ding4_->insertItem(QPixmap(bmfile.c_str())); + ding4_->insertItem(QPixmap(toqstr(bmfile))); connect(standard_, SIGNAL(selected(int, int)), this, SLOT(standard(int, int))); @@ -181,8 +181,8 @@ void BulletsModule::setBullet(int font, int character) void BulletsModule::setBullet(string text) { - activeitem_->setPixmap(0,QPixmap()); - activeitem_->setText(0,text.c_str()); + activeitem_->setPixmap(0, QPixmap()); + activeitem_->setText(0, toqstr(text)); activebullet_->setText(text); } @@ -256,13 +256,13 @@ void BulletsModule::setCustom() { bool ok = FALSE; QString text = QInputDialog::getText( - _( "Bullets" ), - _( "Enter a custom bullet" ), + qt_( "Bullets" ), + qt_( "Enter a custom bullet" ), QLineEdit::Normal, QString::null, &ok, this ); activeitem_->setPixmap(0,QPixmap()); activeitem_->setText(0,text); - activebullet_->setText(text.latin1()); + activebullet_->setText(fromqstr(text)); activebullet_->setFont(-1); } diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 060bd01bb3..4fe6f744ce 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,13 @@ +2002-12-17 John Levon + + * qt_helpers.h: + * qt_helpers.C: add fromqstr/toqstr/qt_ for converting + using locale from/to QString + + * all files: use the above + + * QDocumentDialog.C: fix margins properly + 2002-12-17 Alfredo Braunstein * QCommandBuffer.C: added up.xpm and down.xpm to the command buffer diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C index 040039d8ff..90f358615f 100644 --- a/src/frontends/qt2/FileDialog.C +++ b/src/frontends/qt2/FileDialog.C @@ -19,7 +19,7 @@ #include "frontends/FileDialog.h" #include "FileDialog_private.h" #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include @@ -57,7 +57,7 @@ FileDialog::Result const FileDialog::save(string const & path, { string filter(mask); if (mask.empty()) - filter = _("All files (*)"); + filter = qt_("All files (*)"); LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2); lyxerr[Debug::GUI] << "Select with path \"" << path @@ -67,7 +67,7 @@ FileDialog::Result const FileDialog::save(string const & path, dlg.setMode(QFileDialog::AnyFile); if (!suggested.empty()) - dlg.setSelection(suggested.c_str()); + dlg.setSelection(toqstr(suggested)); FileDialog::Result result; lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl; @@ -87,7 +87,7 @@ FileDialog::Result const FileDialog::open(string const & path, { string filter(mask); if (mask.empty()) - filter = _("*|All files"); + filter = qt_("*|All files"); LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2); lyxerr[Debug::GUI] << "Select with path \"" << path @@ -95,7 +95,7 @@ FileDialog::Result const FileDialog::open(string const & path, << "\", suggested \"" << suggested << endl; if (!suggested.empty()) - dlg.setSelection(suggested.c_str()); + dlg.setSelection(toqstr(suggested)); FileDialog::Result result; lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl; diff --git a/src/frontends/qt2/FileDialog_private.C b/src/frontends/qt2/FileDialog_private.C index 79f417a17b..63d33df247 100644 --- a/src/frontends/qt2/FileDialog_private.C +++ b/src/frontends/qt2/FileDialog_private.C @@ -19,6 +19,7 @@ #include "funcrequest.h" #include "lyxfunc.h" #include "FileDialog_private.h" +#include "qt_helpers.h" #include "support/lstrings.h" @@ -48,17 +49,17 @@ string const getLabel(string const & str) { LyXFileDialog::LyXFileDialog(string const & p, string const & m, string const & t, FileDialog::Button const & b1, FileDialog::Button const & b2) - : QFileDialog(p.c_str(), m.c_str(), - qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), t.c_str(), true), + : QFileDialog(toqstr(p), toqstr(m), + qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), toqstr(t), true), b1_(0), b2_(0) { - setCaption(t.c_str()); + setCaption(toqstr(t)); if (!b1.first.empty()) { b1_dir_ = b1.second; b1_ = new QToolButton(this); connect(b1_, SIGNAL(clicked()), this, SLOT(buttonClicked())); - b1_->setText(getLabel(b1.first).c_str()); + b1_->setText(toqstr(getLabel(b1.first))); addToolButton(b1_, true); } @@ -66,7 +67,7 @@ LyXFileDialog::LyXFileDialog(string const & p, string const & m, b2_dir_ = b2.second; b2_ = new QToolButton(this); connect(b2_, SIGNAL(clicked()), this, SLOT(buttonClicked())); - b2_->setText(getLabel(b2.first).c_str()); + b2_->setText(toqstr(getLabel(b2.first))); addToolButton(b2_); } } @@ -75,7 +76,7 @@ LyXFileDialog::LyXFileDialog(string const & p, string const & m, void LyXFileDialog::buttonClicked() { if (sender() == b1_) - setDir(b1_dir_.c_str()); + setDir(toqstr(b1_dir_)); else if (sender() == b2_) - setDir(b2_dir_.c_str()); + setDir(toqstr(b2_dir_)); } diff --git a/src/frontends/qt2/Menubar_pimpl.C b/src/frontends/qt2/Menubar_pimpl.C index b4c70ced49..4995019edd 100644 --- a/src/frontends/qt2/Menubar_pimpl.C +++ b/src/frontends/qt2/Menubar_pimpl.C @@ -23,7 +23,7 @@ #include "FloatList.h" #include "support/lstrings.h" #include "support/LAssert.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "QtView.h" diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C index 3684c53aac..74d517b112 100644 --- a/src/frontends/qt2/QAbout.C +++ b/src/frontends/qt2/QAbout.C @@ -17,7 +17,7 @@ #include "support/lstrings.h" #include "Lsstream.h" #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "LyXView.h" #include "ButtonControllerBase.h" #include "ControlAboutlyx.h" @@ -36,7 +36,7 @@ typedef Qt2CB > base_class; QAbout::QAbout() - : base_class(_("About LyX")) + : base_class(qt_("About LyX")) { } @@ -47,13 +47,13 @@ void QAbout::build_dialog() connect(dialog_.get()->closePB, SIGNAL(clicked()), this, SLOT(slotClose())); - dialog_->copyright->setText(controller().getCopyright().c_str()); + dialog_->copyright->setText(toqstr(controller().getCopyright())); dialog_->copyright->append("\n"); - dialog_->copyright->append(controller().getLicense().c_str()); + dialog_->copyright->append(toqstr(controller().getLicense())); dialog_->copyright->append("\n"); - dialog_->copyright->append(controller().getDisclaimer().c_str()); + dialog_->copyright->append(toqstr(controller().getDisclaimer())); - dialog_->versionLA->setText(controller().getVersion().c_str()); + dialog_->versionLA->setText(toqstr(controller().getVersion())); // The code below should depend on a autoconf test. (Lgb) #if 1 @@ -100,7 +100,7 @@ void QAbout::build_dialog() } #endif - dialog_->creditsTV->setText(out.str().c_str()); + dialog_->creditsTV->setText(toqstr(out.str())); // try to resize to a good size dialog_->copyright->hide(); diff --git a/src/frontends/qt2/QBibitem.C b/src/frontends/qt2/QBibitem.C index b901c83540..a00bf2bfaf 100644 --- a/src/frontends/qt2/QBibitem.C +++ b/src/frontends/qt2/QBibitem.C @@ -17,7 +17,7 @@ #include "support/lstrings.h" #include "ControlBibitem.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include @@ -31,7 +31,7 @@ typedef Qt2CB > base_class; QBibitem::QBibitem() - : base_class(_("Bibliography Item")) + : base_class(qt_("Bibliography Item")) { } @@ -49,19 +49,19 @@ void QBibitem::build_dialog() void QBibitem::update_contents() { - dialog_->keyED->setText(controller().params().getContents().c_str()); - dialog_->labelED->setText(controller().params().getOptions().c_str()); + dialog_->keyED->setText(toqstr(controller().params().getContents())); + dialog_->labelED->setText(toqstr(controller().params().getOptions())); } void QBibitem::apply() { - controller().params().setContents(dialog_->keyED->text().latin1()); - controller().params().setOptions(dialog_->labelED->text().latin1()); + controller().params().setContents(fromqstr(dialog_->keyED->text())); + controller().params().setOptions(fromqstr(dialog_->labelED->text())); } bool QBibitem::isValid() { - return !string(dialog_->keyED->text().latin1()).empty(); + return !dialog_->keyED->text().isEmpty(); } diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index c7baee4225..496fdaee48 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -18,7 +18,7 @@ #include "support/lstrings.h" #include "ControlBibtex.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "support/filetools.h" // ChangeExtension @@ -40,7 +40,7 @@ typedef Qt2CB > base_class; QBibtex::QBibtex() - : base_class(_("BibTeX")) + : base_class(qt_("BibTeX")) { } @@ -72,11 +72,11 @@ void QBibtex::update_contents() bibs = split(bibs, bib, ','); bib = trim(bib); if (!bib.empty()) - dialog_->databaseLB->insertItem(bib.c_str()); + dialog_->databaseLB->insertItem(toqstr(bib)); } string bibtotoc = "bibtotoc"; - string bibstyle(controller().params().getOptions().c_str()); + string bibstyle(toqstr(controller().params().getOptions())); // bibtotoc exists? if (prefixIs(bibstyle, bibtotoc)) { @@ -102,11 +102,11 @@ void QBibtex::update_contents() string item(ChangeExtension(*it, "")); if (item == bibstyle) item_nr = int(it - str.begin()); - dialog_->styleCB->insertItem(item.c_str()); + dialog_->styleCB->insertItem(toqstr(item)); } if (item_nr == -1) { - dialog_->styleCB->insertItem(bibstyle.c_str()); + dialog_->styleCB->insertItem(toqstr(bibstyle)); item_nr = dialog_->styleCB->count() - 1; } @@ -116,17 +116,17 @@ void QBibtex::update_contents() void QBibtex::apply() { - string dbs(dialog_->databaseLB->text(0).latin1()); + string dbs(fromqstr(dialog_->databaseLB->text(0))); unsigned int maxCount = dialog_->databaseLB->count(); for (unsigned int i = 1; i < maxCount; i++) { dbs += ','; - dbs += dialog_->databaseLB->text(i).latin1(); + dbs += fromqstr(dialog_->databaseLB->text(i)); } controller().params().setContents(dbs); - string const bibstyle(dialog_->styleCB->currentText().latin1()); + string const bibstyle(fromqstr(dialog_->styleCB->currentText())); bool const bibtotoc(dialog_->bibtocCB->isChecked()); if (bibtotoc && (!bibstyle.empty())) { diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C index 63c3c4b79c..24ff2bba28 100644 --- a/src/frontends/qt2/QBibtexDialog.C +++ b/src/frontends/qt2/QBibtexDialog.C @@ -15,7 +15,7 @@ #endif #include "ControlBibtex.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "support/filetools.h" @@ -56,13 +56,13 @@ void QBibtexDialog::browsePressed() { QString const file = QFileDialog::getOpenFileName(QString::null, - _("BibTeX style files (*.bst)"), + qt_("BibTeX style files (*.bst)"), this, 0, - _("Select a BibTeX style")); + qt_("Select a BibTeX style")); if (!file.isNull()) { - string const filen = ChangeExtension(OnlyFilename(file.latin1()), ""); - styleCB->insertItem(filen.c_str(),0); + string const filen = ChangeExtension(OnlyFilename(fromqstr(file)), ""); + styleCB->insertItem(toqstr(filen),0); form_->changed(); } } @@ -70,17 +70,19 @@ void QBibtexDialog::browsePressed() void QBibtexDialog::browseBibPressed() { QString const file = QFileDialog::getOpenFileName(QString::null, - _("BibTeX database files (*.bib)"), this, 0, _("Select a BibTeX database to add")); + qt_("BibTeX database files (*.bib)"), this, 0, qt_("Select a BibTeX database to add")); + if (!file.isNull()) { - string const f = ChangeExtension(file.latin1(), ""); + string const f = ChangeExtension(fromqstr(file), ""); bool present = false; - for(unsigned int i = 0; i != databaseLB->count(); ++i) { - if (databaseLB->text(i).latin1() == f) - present = true; + for (unsigned int i = 0; i != databaseLB->count(); i++) { + if (fromqstr(databaseLB->text(i)) == f) + present = true; } + if (!present) { - databaseLB->insertItem(f.c_str()); + databaseLB->insertItem(toqstr(f)); form_->changed(); } } diff --git a/src/frontends/qt2/QCharacter.C b/src/frontends/qt2/QCharacter.C index b6ebdf7b1d..598f8ca366 100644 --- a/src/frontends/qt2/QCharacter.C +++ b/src/frontends/qt2/QCharacter.C @@ -20,7 +20,7 @@ #include "QCharacter.h" #include "Qt2BC.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" #include @@ -36,7 +36,7 @@ typedef Qt2CB > base_class; QCharacter::QCharacter() - : base_class(_("Character")) + : base_class(qt_("Character")) { } @@ -55,32 +55,32 @@ void QCharacter::build_dialog() for (vector::const_iterator cit = family.begin(); cit != family.end(); ++cit) { - dialog_->familyCO->insertItem(cit->first.c_str(), -1); + dialog_->familyCO->insertItem(toqstr(cit->first), -1); } for (vector::const_iterator cit = series.begin(); cit != series.end(); ++cit) { - dialog_->seriesCO->insertItem(cit->first.c_str(), -1); + dialog_->seriesCO->insertItem(toqstr(cit->first), -1); } for (vector::const_iterator cit = shape.begin(); cit != shape.end(); ++cit) { - dialog_->shapeCO->insertItem(cit->first.c_str(), -1); + dialog_->shapeCO->insertItem(toqstr(cit->first), -1); } for (vector::const_iterator cit = size.begin(); cit != size.end(); ++cit) { - dialog_->sizeCO->insertItem(cit->first.c_str(), -1); + dialog_->sizeCO->insertItem(toqstr(cit->first), -1); } for (vector::const_iterator cit = bar.begin(); cit != bar.end(); ++cit) { - dialog_->miscCO->insertItem(cit->first.c_str(), -1); + dialog_->miscCO->insertItem(toqstr(cit->first), -1); } for (vector::const_iterator cit = color.begin(); cit != color.end(); ++cit) { - dialog_->colorCO->insertItem(cit->first.c_str(), -1); + dialog_->colorCO->insertItem(toqstr(cit->first), -1); } for (vector::const_iterator cit = language.begin(); cit != language.end(); ++cit) { - dialog_->langCO->insertItem(cit->first.c_str(), -1); + dialog_->langCO->insertItem(toqstr(cit->first), -1); } bc().setOK(dialog_->okPB); diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C index 03fcd326c6..696ada36bb 100644 --- a/src/frontends/qt2/QCitation.C +++ b/src/frontends/qt2/QCitation.C @@ -29,7 +29,7 @@ #include "Qt2BC.h" #include "ControlCitation.h" #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" #include "helper_funcs.h" @@ -45,7 +45,7 @@ typedef Qt2CB > base_class; QCitation::QCitation() - : base_class(_("Citation")) + : base_class(qt_("Citation")) {} @@ -64,7 +64,7 @@ void QCitation::apply() controller().params().setCmdName(command); controller().params().setContents(getStringFromVector(citekeys)); - string const after = dialog_->textAfterED->text().latin1(); + string const after = fromqstr(dialog_->textAfterED->text()); controller().params().setOptions(after); } @@ -117,7 +117,7 @@ void QCitation::fillStyles() for (vector::const_iterator it = sty.begin(); it != sty.end(); ++it) { - dialog_->citationStyleCO->insertItem(it->c_str()); + dialog_->citationStyleCO->insertItem(toqstr(*it)); } } @@ -167,7 +167,7 @@ void QCitation::update_contents() setBibButtons(OFF); setCiteButtons(OFF); - dialog_->textAfterED->setText(controller().params().getOptions().c_str()); + dialog_->textAfterED->setText(toqstr(controller().params().getOptions())); fillStyles(); @@ -185,7 +185,7 @@ void QCitation::updateBrowser(QListBox * browser, string const key = trim(*it); // FIXME: why the .empty() test ? if (!key.empty()) - browser->insertItem(key.c_str()); + browser->insertItem(toqstr(key)); } } diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C index 282aa21f68..3483132e40 100644 --- a/src/frontends/qt2/QCitationDialog.C +++ b/src/frontends/qt2/QCitationDialog.C @@ -16,7 +16,7 @@ #include -#include "gettext.h" +#include "qt_helpers.h" #include "controllers/ControlCitation.h" #include "LyXView.h" #include "buffer.h" @@ -52,7 +52,7 @@ QCitationDialog::QCitationDialog(QCitation * form) connect(searchED, SIGNAL(returnPressed()), this, SLOT(slotNextClicked())); - textBeforeED->setText(_("Not yet supported")); + textBeforeED->setText(qt_("Not yet supported")); textBeforeED->setReadOnly(true); textBeforeED->setFocusPolicy(QWidget::NoFocus); citationStyleCO->setEnabled(false); @@ -91,7 +91,7 @@ void QCitationDialog::slotBibHighlighted(int sel) // the selected browser_bib key infoML->clear(); - infoML->setText(biblio::getInfo(theMap, form_->bibkeys[sel]).c_str()); + infoML->setText(toqstr(biblio::getInfo(theMap, form_->bibkeys[sel]))); // Highlight the selected browser_bib key in browser_cite if // present @@ -144,7 +144,7 @@ void QCitationDialog::slotCiteHighlighted(int sel) // Put into browser_info the additional info associated // with the selected browser_cite key infoML->clear(); - infoML->setText(biblio::getInfo(theMap, form_->citekeys[sel]).c_str()); + infoML->setText(toqstr(biblio::getInfo(theMap, form_->citekeys[sel]))); } } @@ -159,7 +159,7 @@ void QCitationDialog::slotAddClicked() } // Add the selected browser_bib key to browser_cite - citeLB->insertItem(form_->bibkeys[sel].c_str()); + citeLB->insertItem(toqstr(form_->bibkeys[sel])); form_->citekeys.push_back(form_->bibkeys[sel]); int const n = int(form_->citekeys.size()); @@ -207,7 +207,7 @@ void QCitationDialog::slotUpClicked() citeLB->removeItem(sel); form_->citekeys.erase(it); - citeLB->insertItem(tmp.c_str(), sel - 1); + citeLB->insertItem(toqstr(tmp), sel - 1); citeLB->setSelected(sel - 1, true); form_->citekeys.insert(it - 1, tmp); form_->setCiteButtons(QCitation::ON); @@ -231,7 +231,7 @@ void QCitationDialog::slotDownClicked() citeLB->removeItem(sel); form_->citekeys.erase(it); - citeLB->insertItem(tmp.c_str(), sel + 1); + citeLB->insertItem(toqstr(tmp), sel + 1); citeLB->setSelected(sel + 1, true); form_->citekeys.insert(it + 1, tmp); form_->setCiteButtons(QCitation::ON); @@ -260,7 +260,7 @@ void QCitationDialog::changed_adaptor() void QCitationDialog::doFind(biblio::Direction dir) { biblio::InfoMap const & theMap = form_->controller().bibkeysInfo(); - string const str = searchED->text().latin1(); + string const str = fromqstr(searchED->text()); biblio::Search const type = searchTypeCB->isChecked() ? diff --git a/src/frontends/qt2/QCommandBuffer.C b/src/frontends/qt2/QCommandBuffer.C index 7c52098879..867ed90fe9 100644 --- a/src/frontends/qt2/QCommandBuffer.C +++ b/src/frontends/qt2/QCommandBuffer.C @@ -16,7 +16,7 @@ #include "support/filetools.h" #include "controllers/ControlCommandBuffer.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "QtView.h" @@ -68,11 +68,11 @@ QCommandBuffer::QCommandBuffer(QtView * view, ControlCommandBuffer & control) { setHorizontalStretchable(true); - QPixmap qpup(LibFileSearch("images", "up", "xpm").c_str()); - QPixmap qpdown(LibFileSearch("images", "down", "xpm").c_str()); + QPixmap qpup(toqstr(LibFileSearch("images", "up", "xpm"))); + QPixmap qpdown(toqstr(LibFileSearch("images", "down", "xpm"))); - (new QToolButton(qpup, _("Previous command"), "", this, SLOT(up()), this))->show(); - (new QToolButton(qpdown, _("Next command"), "", this, SLOT(down()), this))->show(); + (new QToolButton(qpup, qt_("Previous command"), "", this, SLOT(up()), this))->show(); + (new QToolButton(qpdown, qt_("Next command"), "", this, SLOT(down()), this))->show(); edit_ = new QCommandEdit(this); edit_->setMinimumSize(edit_->sizeHint()); @@ -105,7 +105,7 @@ void QCommandBuffer::cancel() void QCommandBuffer::dispatch() { - controller_.dispatch(edit_->text().latin1()); + controller_.dispatch(fromqstr(edit_->text())); view_->centralWidget()->setFocus(); edit_->setText(""); } @@ -113,22 +113,22 @@ void QCommandBuffer::dispatch() void QCommandBuffer::complete() { - string const input = edit_->text().latin1(); + string const input = fromqstr(edit_->text()); string new_input; vector comp = controller_.completions(input, new_input); if (comp.empty() && new_input == input) { - // show_info_suffix(_("[no match]"), input); + // show_info_suffix(qt_("[no match]"), input); return; } if (comp.empty()) { - edit_->setText(new_input.c_str()); + edit_->setText(toqstr(new_input)); // show_info_suffix(("[only completion]"), new_input + ' '); return; } - edit_->setText(new_input.c_str()); + edit_->setText(toqstr(new_input)); QTempListBox * list = new QTempListBox; @@ -137,7 +137,7 @@ void QCommandBuffer::complete() vector::const_iterator cit = comp.begin(); vector::const_iterator end = comp.end(); for (; cit != end; ++cit) { - list->insertItem(cit->c_str()); + list->insertItem(toqstr(*cit)); } // width() is not big enough by a few pixels. Qt Sucks. @@ -168,26 +168,26 @@ void QCommandBuffer::complete_selected(QString const & str) void QCommandBuffer::up() { - string const input(edit_->text().latin1()); + string const input(fromqstr(edit_->text())); string const h(controller_.historyUp()); if (h.empty()) { - // show_info_suffix(_("[Beginning of history]"), input); + // show_info_suffix(qt_("[Beginning of history]"), input); } else { - edit_->setText(h.c_str()); + edit_->setText(toqstr(h)); } } void QCommandBuffer::down() { - string const input(edit_->text().latin1()); + string const input(fromqstr(edit_->text())); string const h(controller_.historyDown()); if (h.empty()) { - // show_info_suffix(_("[End of history]"), input); + // show_info_suffix(qt_("[End of history]"), input); } else { - edit_->setText(h.c_str()); + edit_->setText(toqstr(h)); } } diff --git a/src/frontends/qt2/QContentPane.C b/src/frontends/qt2/QContentPane.C index 6cf56b4202..b17cc751cc 100644 --- a/src/frontends/qt2/QContentPane.C +++ b/src/frontends/qt2/QContentPane.C @@ -19,6 +19,7 @@ #include "QWorkArea.h" #include "QLyXKeySym.h" #include "funcrequest.h" +#include "qt_helpers.h" #include #include @@ -147,7 +148,7 @@ void QContentPane::keyPressEvent(QKeyEvent * e) << " text \"" << (e->text().isEmpty() ? "none" : - e->text().latin1()) + fromqstr(e->text())) << "\", ascii \"" << e->ascii() << '"' << endl; QLyXKeySym * sym = new QLyXKeySym(); sym->set(e); diff --git a/src/frontends/qt2/QDelimiterDialog.C b/src/frontends/qt2/QDelimiterDialog.C index f9823b82ec..2f67a30bfd 100644 --- a/src/frontends/qt2/QDelimiterDialog.C +++ b/src/frontends/qt2/QDelimiterDialog.C @@ -15,7 +15,7 @@ #endif #include "support/filetools.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "QMath.h" @@ -78,18 +78,18 @@ QDelimiterDialog::QDelimiterDialog(QMath * form) : QDelimiterDialogBase(0, 0, false, 0), form_(form) { - setCaption(_("LyX: Delimiters")); + setCaption(qt_("LyX: Delimiters")); for (int i = 0; *delim[i]; ++i) { string xpm(find_xpm(delim[i])); - leftIP->add(QPixmap(xpm.c_str()), delim[i], delim[i]); - rightIP->add(QPixmap(xpm.c_str()), delim[i], delim[i]); + leftIP->add(QPixmap(toqstr(xpm)), delim[i], delim[i]); + rightIP->add(QPixmap(toqstr(xpm)), delim[i], delim[i]); } string empty_xpm(find_xpm("empty")); - leftIP->add(QPixmap(empty_xpm.c_str()), "empty", "empty"); - rightIP->add(QPixmap(empty_xpm.c_str()), "empty", "empty"); + leftIP->add(QPixmap(toqstr(empty_xpm)), "empty", "empty"); + rightIP->add(QPixmap(toqstr(empty_xpm)), "empty", "empty"); connect(leftIP, SIGNAL(button_clicked(const string &)), this, SLOT(ldelim_clicked(const string &))); connect(rightIP, SIGNAL(button_clicked(const string &)), this, SLOT(rdelim_clicked(const string &))); ldelim_clicked("("); @@ -106,7 +106,7 @@ void QDelimiterDialog::insertClicked() void QDelimiterDialog::set_label(QLabel * label, string const & str) { label->setUpdatesEnabled(false); - label->setPixmap(QPixmap(find_xpm(str).c_str())); + label->setPixmap(QPixmap(toqstr(find_xpm(str)))); label->setUpdatesEnabled(true); label->update(); } diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index fc94045f09..6339dd4cd1 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -14,7 +14,7 @@ #pragma implementation #endif -#include "gettext.h" +#include "qt_helpers.h" #include "ControlDocument.h" #include "QDocument.h" @@ -54,7 +54,7 @@ typedef Qt2CB > base_class; QDocument::QDocument() - : base_class(_("Document Settings")) + : base_class(qt_("Document Settings")) { vector const langs = frnt::getLanguageData(false); lang_ = getSecond(langs); @@ -66,8 +66,8 @@ void QDocument::build_dialog() dialog_.reset(new QDocumentDialog(this)); // biblio - dialog_->biblioModule->citeStyleCO->insertItem(_("Author-year")); - dialog_->biblioModule->citeStyleCO->insertItem(_("Numerical")); + dialog_->biblioModule->citeStyleCO->insertItem(qt_("Author-year")); + dialog_->biblioModule->citeStyleCO->insertItem(qt_("Numerical")); dialog_->biblioModule->citeStyleCO->setCurrentItem(0); // language & quotes @@ -76,15 +76,15 @@ void QDocument::build_dialog() vector::const_iterator lend = langs.end(); for (; lit != lend; ++lit) { dialog_->langModule->languageCO->insertItem( - lit->first.c_str()); + toqstr(lit->first)); } - dialog_->langModule->quoteStyleCO->insertItem(_("``text''")); - dialog_->langModule->quoteStyleCO->insertItem(_("''text''")); - dialog_->langModule->quoteStyleCO->insertItem(_(",,text``")); - dialog_->langModule->quoteStyleCO->insertItem(_(",,text''")); - dialog_->langModule->quoteStyleCO->insertItem(_("«text»")); - dialog_->langModule->quoteStyleCO->insertItem(_("»text«")); + dialog_->langModule->quoteStyleCO->insertItem(qt_("``text''")); + dialog_->langModule->quoteStyleCO->insertItem(qt_("''text''")); + dialog_->langModule->quoteStyleCO->insertItem(qt_(",,text``")); + dialog_->langModule->quoteStyleCO->insertItem(qt_(",,text''")); + dialog_->langModule->quoteStyleCO->insertItem(qt_("«text»")); + dialog_->langModule->quoteStyleCO->insertItem(qt_("»text«")); // packages char const * items[] = {"default", "auto", "latin1", "latin2", @@ -94,13 +94,13 @@ void QDocument::build_dialog() dialog_->packagesModule->encodingCO->insertStrList(items); dialog_->packagesModule->lspacingCO->insertItem( - _("Single"), Spacing::Single); + qt_("Single"), Spacing::Single); dialog_->packagesModule->lspacingCO->insertItem( - _("OneHalf"), Spacing::Onehalf); + qt_("OneHalf"), Spacing::Onehalf); dialog_->packagesModule->lspacingCO->insertItem( - _("Double"), Spacing::Double); + qt_("Double"), Spacing::Double); dialog_->packagesModule->lspacingCO->insertItem( - _("Custom"), Spacing::Other); + qt_("Custom"), Spacing::Other); for (int n = 0; tex_graphics[n][0]; ++n) { QString enc = tex_graphics[n]; @@ -108,16 +108,23 @@ void QDocument::build_dialog() } // paper - char const * sizes[] = { - _("Default") , _("Custom") , _("US letter") , _("US legal") - , _("US executive") , _("A3") , _("A4") , _("A5") - , _("B3") , _("B4") , _("B5"), 0 }; - dialog_->paperModule->papersizeCO->insertStrList(sizes); + QComboBox * cb = dialog_->paperModule->papersizeCO; + cb->insertItem(qt_("Default")); + cb->insertItem(qt_("Custom")); + cb->insertItem(qt_("US letter")); + cb->insertItem(qt_("US legal")); + cb->insertItem(qt_("US executive")); + cb->insertItem(qt_("A3")); + cb->insertItem(qt_("A4")); + cb->insertItem(qt_("A5")); + cb->insertItem(qt_("B3")); + cb->insertItem(qt_("B4")); + cb->insertItem(qt_("B5")); // layout for (LyXTextClassList::const_iterator cit = textclasslist.begin(); cit != textclasslist.end(); ++cit) { - dialog_->layoutModule->classCO->insertItem(cit->description().c_str()); + dialog_->layoutModule->classCO->insertItem(toqstr(cit->description())); } for (int n = 0; tex_fonts[n][0]; ++n) { @@ -125,21 +132,21 @@ void QDocument::build_dialog() dialog_->layoutModule->fontsCO->insertItem(font); } - dialog_->layoutModule->fontsizeCO->insertItem(_("default")); - dialog_->layoutModule->fontsizeCO->insertItem(_("10")); - dialog_->layoutModule->fontsizeCO->insertItem(_("11")); - dialog_->layoutModule->fontsizeCO->insertItem(_("12")); + dialog_->layoutModule->fontsizeCO->insertItem(qt_("default")); + dialog_->layoutModule->fontsizeCO->insertItem(qt_("10")); + dialog_->layoutModule->fontsizeCO->insertItem(qt_("11")); + dialog_->layoutModule->fontsizeCO->insertItem(qt_("12")); - dialog_->layoutModule->skipCO->insertItem(_("Smallskip")); - dialog_->layoutModule->skipCO->insertItem(_("Medskip")); - dialog_->layoutModule->skipCO->insertItem(_("Bigskip")); - dialog_->layoutModule->skipCO->insertItem(_("Length")); + dialog_->layoutModule->skipCO->insertItem(qt_("Smallskip")); + dialog_->layoutModule->skipCO->insertItem(qt_("Medskip")); + dialog_->layoutModule->skipCO->insertItem(qt_("Bigskip")); + dialog_->layoutModule->skipCO->insertItem(qt_("Length")); - dialog_->layoutModule->pagestyleCO->insertItem(_("default")); - dialog_->layoutModule->pagestyleCO->insertItem(_("empty")); - dialog_->layoutModule->pagestyleCO->insertItem(_("plain")); - dialog_->layoutModule->pagestyleCO->insertItem(_("headings")); - dialog_->layoutModule->pagestyleCO->insertItem(_("fancy")); + dialog_->layoutModule->pagestyleCO->insertItem(qt_("default")); + dialog_->layoutModule->pagestyleCO->insertItem(qt_("empty")); + dialog_->layoutModule->pagestyleCO->insertItem(qt_("plain")); + dialog_->layoutModule->pagestyleCO->insertItem(qt_("headings")); + dialog_->layoutModule->pagestyleCO->insertItem(qt_("fancy")); // margins dialog_->setMargins(0); @@ -158,7 +165,7 @@ void QDocument::apply() // preamble params.preamble = - dialog_->preambleModule->preambleMLE->text().latin1(); + fromqstr(dialog_->preambleModule->preambleMLE->text()); // biblio params.use_natbib = @@ -231,13 +238,13 @@ void QDocument::apply() } params.graphicsDriver = - dialog_->packagesModule->psdriverCO->currentText().latin1(); + fromqstr(dialog_->packagesModule->psdriverCO->currentText()); params.use_amsmath = dialog_->packagesModule->amsCB->isChecked(); params.inputenc = - dialog_->packagesModule->encodingCO->currentText().latin1(); + fromqstr(dialog_->packagesModule->encodingCO->currentText()); // layout params.textclass = @@ -246,13 +253,13 @@ void QDocument::apply() //bool succes = controller().classApply(); params.fonts = - dialog_->layoutModule->fontsCO->currentText().latin1(); + fromqstr(dialog_->layoutModule->fontsCO->currentText()); params.fontsize = - dialog_->layoutModule->fontsizeCO->currentText().latin1(); + fromqstr(dialog_->layoutModule->fontsizeCO->currentText()); params.pagestyle = - dialog_->layoutModule->pagestyleCO->currentText().latin1(); + fromqstr(dialog_->layoutModule->pagestyleCO->currentText()); if (dialog_->layoutModule->indentRB->isChecked()) params.paragraph_separation = BufferParams::PARSEP_INDENT; @@ -288,10 +295,10 @@ void QDocument::apply() } params.options = - dialog_->layoutModule->optionsLE->text().latin1(); + fromqstr(dialog_->layoutModule->optionsLE->text()); params.float_placement = - dialog_->layoutModule->floatPlacementLE->text().latin1(); + fromqstr(dialog_->layoutModule->floatPlacementLE->text()); // paper params.papersize2 = @@ -393,7 +400,7 @@ void QDocument::update_contents() } // preamble - QString preamble = params.preamble.c_str(); + QString preamble = toqstr(params.preamble); dialog_->preambleModule->preambleMLE->setText(preamble); // biblio @@ -437,7 +444,7 @@ void QDocument::update_contents() dialog_->packagesModule->encodingCO->setCurrentItem(i); } - QString text = params.graphicsDriver.c_str(); + QString text = toqstr(params.graphicsDriver); int nitem = dialog_->packagesModule->psdriverCO->count(); for (int n = 0; n < nitem ; ++n) { QString enc = tex_graphics[n]; @@ -460,14 +467,14 @@ void QDocument::update_contents() dialog_->packagesModule->lspacingCO->setCurrentItem(nitem); if (params.spacing.getSpace() == Spacing::Other) { dialog_->packagesModule->lspacingLE->setText( - tostr(params.spacing.getValue()).c_str()); + toqstr(tostr(params.spacing.getValue()))); dialog_->setLSpacing(3); } // layout for (int n = 0; nlayoutModule->classCO->count(); ++n) { if (dialog_->layoutModule->classCO->text(n) == - controller().textClass().description().c_str()) { + toqstr(controller().textClass().description())) { dialog_->layoutModule->classCO->setCurrentItem(n); break; } @@ -509,7 +516,7 @@ void QDocument::update_contents() skip = 3; string const length = params.getDefSkip().asLyXCommand(); dialog_->layoutModule->skipLengthCO->setCurrentItem(LyXLength(length).unit()); - dialog_->layoutModule->skipLE->setText(tostr(LyXLength(length).value()).c_str()); + dialog_->layoutModule->skipLE->setText(toqstr(tostr(LyXLength(length).value()))); break; } default: @@ -521,7 +528,7 @@ void QDocument::update_contents() if (!params.options.empty()) { dialog_->layoutModule->optionsLE->setText( - params.options.c_str()); + toqstr(params.options)); } else { dialog_->layoutModule->optionsLE->setText(""); } diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 323c703b07..47b3a4578e 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -9,7 +9,7 @@ */ #include -#include "gettext.h" +#include "qt_helpers.h" #include "ControlDocument.h" #include "QDocument.h" @@ -63,15 +63,15 @@ QDocumentDialog::QDocumentDialog(QDocument * form) form, SLOT(slotRestore())); moduleLB->clear(); - moduleLB->insertItem(_("Layout"), LAYOUT); - moduleLB->insertItem(_("Packages"), PACKAGES); - moduleLB->insertItem(_("Paper"), PAPER); - moduleLB->insertItem(_("Margins"), MARGINS); - moduleLB->insertItem(_("Language"), LANGUAGE); - moduleLB->insertItem(_("Bullets"), BULLETS); - moduleLB->insertItem(_("Numbering"), NUMBERING); - moduleLB->insertItem(_("Bibliography"), BIBLIOGRAPHY); - moduleLB->insertItem(_("Preamble"), PREAMBLE); + moduleLB->insertItem(qt_("Layout"), LAYOUT); + moduleLB->insertItem(qt_("Packages"), PACKAGES); + moduleLB->insertItem(qt_("Paper"), PAPER); + moduleLB->insertItem(qt_("Margins"), MARGINS); + moduleLB->insertItem(qt_("Language"), LANGUAGE); + moduleLB->insertItem(qt_("Bullets"), BULLETS); + moduleLB->insertItem(qt_("Numbering"), NUMBERING); + moduleLB->insertItem(qt_("Bibliography"), BIBLIOGRAPHY); + moduleLB->insertItem(qt_("Preamble"), PREAMBLE); moduleLB->setCurrentItem(LAYOUT); moduleLB->setMinimumSize(moduleLB->sizeHint()); @@ -255,31 +255,31 @@ void QDocumentDialog::setTitle(int item) { switch(item) { case LAYOUT: - titleL->setText(_("Document Style")); + titleL->setText(qt_("Document Style")); break; case PACKAGES: - titleL->setText(_("LaTeX Packages")); + titleL->setText(qt_("LaTeX Packages")); break; case PAPER: - titleL->setText(_("Papersize and Orientation")); + titleL->setText(qt_("Papersize and Orientation")); break; case MARGINS: - titleL->setText(_("Margins")); + titleL->setText(qt_("Margins")); break; case LANGUAGE: - titleL->setText(_("Language Settings and Quote Style")); + titleL->setText(qt_("Language Settings and Quote Style")); break; case BULLETS: - titleL->setText(_("Bullet Types")); + titleL->setText(qt_("Bullet Types")); break; case NUMBERING: - titleL->setText(_("Numbering")); + titleL->setText(qt_("Numbering")); break; case BIBLIOGRAPHY: - titleL->setText(_("Bibliography Settings")); + titleL->setText(qt_("Bibliography Settings")); break; case PREAMBLE: - titleL->setText(_("LaTeX Preamble")); + titleL->setText(qt_("LaTeX Preamble")); break; } } @@ -336,17 +336,16 @@ void QDocumentDialog::enableSkip(bool skip) void QDocumentDialog::setMargins(int papersize) { - char const * a4only[] = { - _("Small Margins"), _("Very small Margins"), - _("Very wide Margins "), 0 }; - char const * normal[] = { - _("Default"), _("Custom"), 0 }; - int olditem = marginsModule->marginCO->currentItem(); marginsModule->marginCO->clear(); - marginsModule->marginCO->insertStrList(normal); - if (papersize==6) { - marginsModule->marginCO->insertStrList(a4only); + marginsModule->marginCO->insertItem(qt_("Default")); + marginsModule->marginCO->insertItem(qt_("Custom")); + if (papersize == 6) { + marginsModule->marginCO->insertItem(qt_("Small margins")); + marginsModule->marginCO->insertItem(qt_("Very small margins")); + marginsModule->marginCO->insertItem(qt_("Very wide margins")); + } else if (olditem > 1) { + olditem = 0; } marginsModule->marginCO->setCurrentItem(olditem); setCustomMargins(olditem); @@ -409,10 +408,10 @@ void QDocumentDialog::updateFontsize(string const & items, string const & sel) for (int n=0; !token(items,'|',n).empty(); ++n) layoutModule->fontsizeCO-> - insertItem(token(items,'|',n).c_str()); + insertItem(toqstr(token(items,'|',n))); for (int n = 0; nfontsizeCO->count(); ++n) { - if (layoutModule->fontsizeCO->text(n).latin1()==sel) { + if (fromqstr(layoutModule->fontsizeCO->text(n)) == sel) { layoutModule->fontsizeCO->setCurrentItem(n); break; } @@ -427,10 +426,10 @@ void QDocumentDialog::updatePagestyle(string const & items, string const & sel) for (int n=0; !token(items,'|',n).empty(); ++n) layoutModule->pagestyleCO-> - insertItem(token(items,'|',n).c_str()); + insertItem(toqstr(token(items,'|',n))); for (int n = 0; npagestyleCO->count(); ++n) { - if (layoutModule->pagestyleCO->text(n).latin1()==sel) { + if (fromqstr(layoutModule->pagestyleCO->text(n))==sel) { layoutModule->pagestyleCO->setCurrentItem(n); break; } @@ -461,7 +460,7 @@ void QDocumentDialog::classChanged() } else { for (int n = 0; nclassCO->count(); ++n) { if (layoutModule->classCO->text(n) == - cntrl.textClass().description().c_str()) { + toqstr(cntrl.textClass().description())) { layoutModule->classCO->setCurrentItem(n); break; } diff --git a/src/frontends/qt2/QERT.C b/src/frontends/qt2/QERT.C index d52ac30cb2..f0f40f9d2d 100644 --- a/src/frontends/qt2/QERT.C +++ b/src/frontends/qt2/QERT.C @@ -15,7 +15,7 @@ #endif #include "ControlERT.h" -#include "gettext.h" +#include "qt_helpers.h" #include #include @@ -28,7 +28,7 @@ typedef Qt2CB > base_class; QERT::QERT() - : base_class(_("LaTeX ERT")) + : base_class(qt_("LaTeX ERT")) { } diff --git a/src/frontends/qt2/QError.C b/src/frontends/qt2/QError.C index 6adab2d681..2633b33bc2 100644 --- a/src/frontends/qt2/QError.C +++ b/src/frontends/qt2/QError.C @@ -15,7 +15,7 @@ #endif #include "ControlError.h" -#include "gettext.h" +#include "qt_helpers.h" #include #include @@ -28,7 +28,7 @@ typedef Qt2CB > base_class; QError::QError() - : base_class(_("LaTeX Error")) + : base_class(qt_("LaTeX Error")) { } @@ -43,5 +43,5 @@ void QError::build_dialog() void QError::update_contents() { - dialog_->errorTV->setText(controller().params().c_str()); + dialog_->errorTV->setText(toqstr(controller().params())); } diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C index 69f2a6965f..950453887a 100644 --- a/src/frontends/qt2/QExternal.C +++ b/src/frontends/qt2/QExternal.C @@ -15,7 +15,7 @@ #endif #include "ControlExternal.h" -#include "gettext.h" +#include "qt_helpers.h" #include #include @@ -32,7 +32,7 @@ typedef Qt2CB > base_class; QExternal::QExternal() - : base_class(_("External")) + : base_class(qt_("External")) { } @@ -52,7 +52,7 @@ void QExternal::build_dialog() for (std::vector::const_iterator cit = templates.begin(); cit != templates.end(); ++cit) { - dialog_->externalCO->insertItem(cit->c_str(), -1); + dialog_->externalCO->insertItem(toqstr(*cit), -1); } } @@ -61,11 +61,11 @@ void QExternal::update_contents() { InsetExternal::Params const & params = controller().params(); - dialog_->fileED->setText(params.filename.c_str()); - dialog_->paramsED->setText(params.parameters.c_str()); + dialog_->fileED->setText(toqstr(params.filename)); + dialog_->paramsED->setText(toqstr(params.parameters)); dialog_->externalCO->setCurrentItem(controller().getTemplateNumber(params.templ.lyxName)); - dialog_->externalTV->setText(params.templ.helpText.c_str()); + dialog_->externalTV->setText(toqstr(params.templ.helpText)); isValid(); } @@ -83,8 +83,8 @@ void QExternal::apply() { InsetExternal::Params & params = controller().params(); - params.filename = dialog_->fileED->text().latin1(); - params.parameters = dialog_->paramsED->text().latin1(); + params.filename = fromqstr(dialog_->fileED->text()); + params.parameters = fromqstr(dialog_->paramsED->text()); params.templ = controller().getTemplate(dialog_->externalCO->currentItem()); } diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C index 179ab0e703..47846d8692 100644 --- a/src/frontends/qt2/QExternalDialog.C +++ b/src/frontends/qt2/QExternalDialog.C @@ -14,7 +14,7 @@ #pragma implementation #endif -#include "gettext.h" +#include "qt_helpers.h" #include "ControlExternal.h" #include @@ -84,11 +84,11 @@ void QExternalDialog::browseClicked() { QString file = QFileDialog::getOpenFileName(QString::null, - _("External material (*)"), + qt_("External material (*)"), this, 0, - _("Select external material")); + qt_("Select external material")); if (!file.isNull()) { - fileED->setText(file.latin1()); + fileED->setText(file); form_->changed(); } } @@ -96,7 +96,7 @@ void QExternalDialog::browseClicked() void QExternalDialog::templateChanged() { - externalTV->setText(form_->helpText().c_str()); + externalTV->setText(toqstr(form_->helpText())); updatePB->setEnabled(!form_->controller().params().templ.automaticProduction); form_->changed(); diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C index 5b760ced4e..c8550d8a64 100644 --- a/src/frontends/qt2/QFloat.C +++ b/src/frontends/qt2/QFloat.C @@ -18,7 +18,7 @@ #include "QFloatDialog.h" #include "QFloat.h" #include "Qt2BC.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" @@ -29,7 +29,7 @@ typedef Qt2CB > base_class; QFloat::QFloat() - : base_class(_("Float Settings")) + : base_class(qt_("Float Settings")) { } diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index ffd1b1035d..e9cb24ea3b 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -25,7 +25,7 @@ #include "insets/insetgraphicsParams.h" #include "lyxrc.h" #include "lengthcombo.h" -#include "gettext.h" +#include "qt_helpers.h" #include "lengthcommon.h" #include "lyxlength.h" #include "debug.h" @@ -50,7 +50,7 @@ typedef Qt2CB > base_class; QGraphics::QGraphics() - : base_class(_("Graphics")) + : base_class(qt_("Graphics")) { } @@ -132,10 +132,10 @@ void QGraphics::update_contents() dialog_->rtYunit->clear(); for (vector::const_iterator it = bb_units.begin(); it != bb_units.end(); ++it) { - dialog_->lbXunit->insertItem((*it).c_str(), -1); - dialog_->lbYunit->insertItem((*it).c_str(), -1); - dialog_->rtXunit->insertItem((*it).c_str(), -1); - dialog_->rtYunit->insertItem((*it).c_str(), -1); + dialog_->lbXunit->insertItem(toqstr(*it), -1); + dialog_->lbYunit->insertItem(toqstr(*it), -1); + dialog_->rtXunit->insertItem(toqstr(*it), -1); + dialog_->rtYunit->insertItem(toqstr(*it), -1); } InsetGraphicsParams & igp = controller().params(); @@ -159,16 +159,16 @@ void QGraphics::update_contents() break; } - dialog_->filename->setText(igp.filename.c_str()); + dialog_->filename->setText(toqstr(igp.filename)); // set the bounding box values if (igp.bb.empty()) { string const bb = controller().readBB(igp.filename); // the values from the file always have the bigpoint-unit bp - dialog_->lbX->setText(token(bb, ' ', 0).c_str()); - dialog_->lbY->setText(token(bb, ' ', 1).c_str()); - dialog_->rtX->setText(token(bb, ' ', 2).c_str()); - dialog_->rtY->setText(token(bb, ' ', 3).c_str()); + dialog_->lbX->setText(toqstr(token(bb, ' ', 0))); + dialog_->lbY->setText(toqstr(token(bb, ' ', 1))); + dialog_->rtX->setText(toqstr(token(bb, ' ', 2))); + dialog_->rtY->setText(toqstr(token(bb, ' ', 3))); dialog_->lbXunit->setCurrentItem(0); dialog_->lbYunit->setCurrentItem(0); dialog_->rtXunit->setCurrentItem(0); @@ -182,32 +182,32 @@ void QGraphics::update_contents() string const xr(token(igp.bb, ' ', 2)); string const yr(token(igp.bb, ' ', 3)); if (isValidLength(xl, &anyLength)) { - dialog_->lbX->setText(tostr(anyLength.value()).c_str()); + dialog_->lbX->setText(toqstr(tostr(anyLength.value()))); string const unit(unit_name[anyLength.unit()]); dialog_->lbXunit->setCurrentItem(getItemNo(bb_units, unit)); } else { - dialog_->lbX->setText(xl.c_str()); + dialog_->lbX->setText(toqstr(xl)); } if (isValidLength(yl, &anyLength)) { - dialog_->lbY->setText(tostr(anyLength.value()).c_str()); + dialog_->lbY->setText(toqstr(tostr(anyLength.value()))); string const unit(unit_name[anyLength.unit()]); dialog_->lbYunit->setCurrentItem(getItemNo(bb_units, unit)); } else { - dialog_->lbY->setText(xl.c_str()); + dialog_->lbY->setText(toqstr(xl)); } if (isValidLength(xr, &anyLength)) { - dialog_->rtX->setText(tostr(anyLength.value()).c_str()); + dialog_->rtX->setText(toqstr(tostr(anyLength.value()))); string const unit(unit_name[anyLength.unit()]); dialog_->rtXunit->setCurrentItem(getItemNo(bb_units, unit)); } else { - dialog_->rtX->setText(xl.c_str()); + dialog_->rtX->setText(toqstr(xl)); } if (isValidLength(yr, &anyLength)) { - dialog_->rtY->setText(tostr(anyLength.value()).c_str()); + dialog_->rtY->setText(toqstr(tostr(anyLength.value()))); string const unit(unit_name[anyLength.unit()]); dialog_->rtYunit->setCurrentItem(getItemNo(bb_units, unit)); } else { - dialog_->rtY->setText(xl.c_str()); + dialog_->rtY->setText(toqstr(xl)); } controller().bbChanged = true; } @@ -219,7 +219,7 @@ void QGraphics::update_contents() // Update the subcaption check button and input field dialog_->subfigure->setChecked(igp.subcaption); - dialog_->subcaption->setText(igp.subcaptionText.c_str()); + dialog_->subcaption->setText(toqstr(igp.subcaptionText)); int item = 0; switch (igp.display) { @@ -233,7 +233,7 @@ void QGraphics::update_contents() dialog_->showCB->setEnabled(igp.display != grfx::NoDisplay && !readOnly()); dialog_->displayCB->setChecked(igp.display != grfx::NoDisplay); dialog_->displayscale->setEnabled(igp.display != grfx::NoDisplay && !readOnly()); - dialog_->displayscale->setText(tostr(igp.lyxscale).c_str()); + dialog_->displayscale->setText(toqstr(tostr(igp.lyxscale))); //// the output section (width/height) // set the length combo boxes @@ -241,17 +241,17 @@ void QGraphics::update_contents() // units are defined in lengthcommon.C // 1. the width (a listttype) dialog_->widthUnit->clear(); - dialog_->widthUnit->insertItem(_("Scale%")); + dialog_->widthUnit->insertItem(qt_("Scale%")); for (int i = 0; i < num_units; i++) dialog_->widthUnit->insertItem(unit_name_gui[i], -1); if (!lyx::float_equal(igp.scale, 0.0, 0.05)) { // there is a scale value > 0.05 - dialog_->width->setText(tostr(igp.scale).c_str()); + dialog_->width->setText(toqstr(tostr(igp.scale))); dialog_->widthUnit->setCurrentItem(0); } else { // no scale means default width/height - dialog_->width->setText(tostr(igp.width.value()).c_str()); + dialog_->width->setText(toqstr(tostr(igp.width.value()))); // the width cannot have a unitDefault, because // it is a "Scale%" or another user defined unit! // +1 instead of the "Scale%" option @@ -259,7 +259,7 @@ void QGraphics::update_contents() dialog_->widthUnit->setCurrentItem(unit_ + 1); } // 2. the height (a lengthgcombo type) - dialog_->height->setText(tostr(igp.height.value()).c_str()); + dialog_->height->setText(toqstr(tostr(igp.height.value()))); LyXLength::UNIT unit_ = (igp.height.value() > 0.0) ? igp.height.unit() : unitDefault; dialog_->heightUnit->setCurrentItem(unit_); @@ -271,7 +271,7 @@ void QGraphics::update_contents() dialog_->aspectratio->setChecked(igp.keepAspectRatio); - dialog_->angle->setText(tostr(igp.rotateAngle).c_str()); + dialog_->angle->setText(toqstr(tostr(igp.rotateAngle))); dialog_->origin->clear(); @@ -282,7 +282,7 @@ void QGraphics::update_contents() for (vector::const_iterator it = origin_lang.begin(); it != origin_lang.end(); ++it) - dialog_->origin->insertItem((*it).c_str(), -1); + dialog_->origin->insertItem(toqstr(*it), -1); if (!igp.rotateOrigin.empty()) dialog_->origin->setCurrentItem( @@ -291,7 +291,7 @@ void QGraphics::update_contents() dialog_->origin->setCurrentItem(0); //// latex section - dialog_->latexoptions->setText(igp.special.c_str()); + dialog_->latexoptions->setText(toqstr(igp.special)); } @@ -299,16 +299,16 @@ void QGraphics::apply() { InsetGraphicsParams & igp = controller().params(); - igp.filename = dialog_->filename->text().latin1(); + igp.filename = fromqstr(dialog_->filename->text()); // the bb section igp.bb.erase(); if (controller().bbChanged) { string bb; - string lbX(dialog_->lbX->text().latin1()); - string lbY(dialog_->lbY->text().latin1()); - string rtX(dialog_->rtX->text().latin1()); - string rtY(dialog_->rtY->text().latin1()); + string lbX(fromqstr(dialog_->lbX->text())); + string lbY(fromqstr(dialog_->lbY->text())); + string rtX(fromqstr(dialog_->rtX->text())); + string rtY(fromqstr(dialog_->rtY->text())); int bb_sum = strToInt(lbX) + strToInt(lbY) + strToInt(rtX) + strToInt(rtX); @@ -316,19 +316,19 @@ void QGraphics::apply() if (lbX.empty()) bb = "0 "; else - bb = lbX + dialog_->lbXunit->currentText().latin1() + ' '; + bb = lbX + fromqstr(dialog_->lbXunit->currentText()) + ' '; if (lbY.empty()) bb += "0 "; else - bb += (lbY + dialog_->lbYunit->currentText().latin1() + ' '); + bb += (lbY + fromqstr(dialog_->lbYunit->currentText()) + ' '); if (rtX.empty()) bb += "0 "; else - bb += (rtX + dialog_->rtXunit->currentText().latin1() + ' '); + bb += (rtX + fromqstr(dialog_->rtXunit->currentText()) + ' '); if (rtY.empty()) bb += '0'; else - bb += (rtY + dialog_->rtYunit->currentText().latin1()); + bb += (rtY + fromqstr(dialog_->rtYunit->currentText())); igp.bb = bb; } } @@ -336,7 +336,7 @@ void QGraphics::apply() igp.draft = dialog_->draftCB->isChecked(); igp.clip = dialog_->clip->isChecked(); igp.subcaption = dialog_->subfigure->isChecked(); - igp.subcaptionText = dialog_->subcaption->text().latin1(); + igp.subcaptionText = fromqstr(dialog_->subcaption->text()); switch (dialog_->showCB->currentItem()) { case 0: igp.display = grfx::DefaultDisplay; break; @@ -349,11 +349,11 @@ void QGraphics::apply() if (!dialog_->displayCB->isChecked()) igp.display = grfx::NoDisplay; - string value(dialog_->width->text().latin1()); + string value(fromqstr(dialog_->width->text())); if (dialog_->widthUnit->currentItem() > 0) { // width/height combination int const unitNo = getUnitNo(unit_name_gui, - dialog_->widthUnit->currentText().latin1()); + fromqstr(dialog_->widthUnit->currentText())); igp.width = LyXLength(value + unit_name_ltx[unitNo]); igp.scale = 0.0; } else { @@ -361,18 +361,18 @@ void QGraphics::apply() igp.scale = strToDbl(value); igp.width = LyXLength(); } - value = dialog_->height->text().latin1(); + value = fromqstr(dialog_->height->text()); int const unitNo = getUnitNo(unit_name_gui, - dialog_->heightUnit->currentText().latin1()); + fromqstr(dialog_->heightUnit->currentText())); igp.height = LyXLength(value + unit_name_ltx[unitNo]); igp.keepAspectRatio = dialog_->aspectratio->isChecked(); igp.noUnzip = dialog_->unzipCB->isChecked(); - igp.lyxscale = strToInt(dialog_->displayscale->text().latin1()); + igp.lyxscale = strToInt(fromqstr(dialog_->displayscale->text())); - igp.rotateAngle = strToDbl(dialog_->angle->text().latin1()); + igp.rotateAngle = strToDbl(fromqstr(dialog_->angle->text())); while (igp.rotateAngle < -360.0) igp.rotateAngle += 360.0; while (igp.rotateAngle > 360.0) @@ -384,20 +384,20 @@ void QGraphics::apply() QGraphics::origin_ltx[dialog_->origin->currentItem()]; // more latex options - igp.special = dialog_->latexoptions->text().latin1(); + igp.special = fromqstr(dialog_->latexoptions->text()); } void QGraphics::getBB() { - string const filename(dialog_->filename->text().latin1()); + string const filename(fromqstr(dialog_->filename->text())); if (!filename.empty()) { string const bb(controller().readBB(filename)); if (!bb.empty()) { - dialog_->lbX->setText(token(bb, ' ', 0).c_str()); - dialog_->lbY->setText(token(bb, ' ', 1).c_str()); - dialog_->rtX->setText(token(bb, ' ', 2).c_str()); - dialog_->rtY->setText(token(bb, ' ', 3).c_str()); + dialog_->lbX->setText(toqstr(token(bb, ' ', 0))); + dialog_->lbY->setText(toqstr(token(bb, ' ', 1))); + dialog_->rtX->setText(toqstr(token(bb, ' ', 2))); + dialog_->rtY->setText(toqstr(token(bb, ' ', 3))); // the default units for the bb values when reading // it from the file dialog_->lbXunit->setCurrentItem(0); @@ -412,5 +412,5 @@ void QGraphics::getBB() bool QGraphics::isValid() { - return !string(dialog_->filename->text().latin1()).empty(); + return !dialog_->filename->text().isEmpty(); } diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C index 1ff8b8038e..75c8e6e589 100644 --- a/src/frontends/qt2/QGraphicsDialog.C +++ b/src/frontends/qt2/QGraphicsDialog.C @@ -17,7 +17,7 @@ #include "ControlGraphics.h" #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "LString.h" #include @@ -91,11 +91,10 @@ void QGraphicsDialog::closeEvent(QCloseEvent * e) void QGraphicsDialog::browse_clicked() { QString file = QFileDialog::getOpenFileName( - QString::null, _("Files (*)"), - this, 0, _("Select a graphic file")); + QString::null, qt_("Files (*)"), + this, 0, qt_("Select a graphic file")); if (!file.isNull()) { - string const name = file.latin1(); - filename->setText(name.c_str()); + filename->setText(file); form_->changed(); } } diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C index dfdade3a77..2d4d8b62b1 100644 --- a/src/frontends/qt2/QInclude.C +++ b/src/frontends/qt2/QInclude.C @@ -15,7 +15,7 @@ #endif #include "ControlInclude.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "QIncludeDialog.h" @@ -32,7 +32,7 @@ typedef Qt2CB > base_class; QInclude::QInclude() - : base_class(_("Include")) + : base_class(qt_("Include")) { } @@ -54,7 +54,7 @@ void QInclude::update_contents() { InsetInclude::Params const & params = controller().params(); - dialog_->filenameED->setText(params.cparams.getContents().c_str()); + dialog_->filenameED->setText(toqstr(params.cparams.getContents())); dialog_->visiblespaceCB->setChecked(false); dialog_->visiblespaceCB->setEnabled(false); @@ -87,7 +87,7 @@ void QInclude::apply() { InsetInclude::Params & params = controller().params(); - params.cparams.setContents(dialog_->filenameED->text().latin1()); + params.cparams.setContents(fromqstr(dialog_->filenameED->text())); params.cparams.preview(dialog_->previewCB->isChecked()); int const item = dialog_->typeCO->currentItem(); @@ -116,16 +116,16 @@ void QInclude::browse() else type = ControlInclude::VERBATIM; - string const & name = controller().Browse(dialog_->filenameED->text().latin1(), type); + string const & name = controller().Browse(fromqstr(dialog_->filenameED->text()), type); if (!name.empty()) - dialog_->filenameED->setText(name.c_str()); + dialog_->filenameED->setText(toqstr(name)); } void QInclude::load() { if (isValid()) { - string const file(dialog_->filenameED->text().latin1()); + string const file(fromqstr(dialog_->filenameED->text())); slotOK(); controller().load(file); } @@ -134,5 +134,5 @@ void QInclude::load() bool QInclude::isValid() { - return !string(dialog_->filenameED->text().latin1()).empty(); + return !dialog_->filenameED->text().isEmpty(); } diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt2/QIndex.C index 1ea3871e8d..fbb4e5d875 100644 --- a/src/frontends/qt2/QIndex.C +++ b/src/frontends/qt2/QIndex.C @@ -15,7 +15,7 @@ #endif #include "ControlIndex.h" -#include "gettext.h" +#include "qt_helpers.h" #include "QIndexDialog.h" #include "QIndex.h" @@ -27,7 +27,7 @@ typedef Qt2CB > base_class; QIndex::QIndex() - : base_class(_("Index")) + : base_class(qt_("Index")) { } @@ -44,13 +44,13 @@ void QIndex::build_dialog() void QIndex::update_contents() { - dialog_->keywordED->setText(controller().params().getContents().c_str()); + dialog_->keywordED->setText(toqstr(controller().params().getContents())); } void QIndex::apply() { - controller().params().setContents(dialog_->keywordED->text().latin1()); + controller().params().setContents(fromqstr(dialog_->keywordED->text())); } diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt2/QIndexDialog.C index 7dced6a366..308f58bf04 100644 --- a/src/frontends/qt2/QIndexDialog.C +++ b/src/frontends/qt2/QIndexDialog.C @@ -14,7 +14,7 @@ #pragma implementation #endif -#include "gettext.h" +#include "qt_helpers.h" #include "QIndex.h" #include "QIndexDialog.h" @@ -33,7 +33,7 @@ QIndexDialog::QIndexDialog(QIndex * form) connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose())); - QWhatsThis::add(keywordED, _( + QWhatsThis::add(keywordED, qt_( "The format of the entry in the index.\n" "\n" "An entry can be specified as a sub-entry of\n" diff --git a/src/frontends/qt2/QLImage.C b/src/frontends/qt2/QLImage.C index 1d70b20ea6..f87184fcb6 100644 --- a/src/frontends/qt2/QLImage.C +++ b/src/frontends/qt2/QLImage.C @@ -21,6 +21,7 @@ #include "debug.h" #include "support/LAssert.h" #include "support/lyxfunctional.h" // compare_memfun +#include "qt_helpers.h" #include #include @@ -137,7 +138,7 @@ void QLImage::load(string const & filename) return; } - if (!pixmap_.load(filename.c_str())) { + if (!pixmap_.load(toqstr(filename))) { lyxerr[Debug::GRAPHICS] << "Unable to open image" << endl; finishedLoading(false); diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C index aff7c6af40..acf13a24e4 100644 --- a/src/frontends/qt2/QLPainter.C +++ b/src/frontends/qt2/QLPainter.C @@ -26,6 +26,7 @@ #include "qfont_loader.h" #include "QLPainter.h" #include "QLImage.h" +#include "qt_helpers.h" #include @@ -79,7 +80,7 @@ QPainter & QLPainter::setPen(LColor::color c, { QPen pen = qp_->pen(); - pen.setColor(lcolor.getX11Name(c).c_str()); + pen.setColor(toqstr(lcolor.getX11Name(c))); switch (ls) { case line_solid: pen.setStyle(QPen::SolidLine); break; @@ -155,7 +156,7 @@ Painter & QLPainter::fillRectangle(int x, int y, { //lyxerr << "fillRectangle " << x << ',' << y << ' ' // << w << ',' << h << endl; - qp_->fillRect(x, y, w, h, QColor(lcolor.getX11Name(col).c_str())); + qp_->fillRect(x, y, w, h, QColor(toqstr(lcolor.getX11Name(col)))); return *this; } @@ -174,7 +175,7 @@ Painter & QLPainter::fillPolygon(int const * xp, int const * yp, } setPen(col); - qp_->setBrush(lcolor.getX11Name(col).c_str()); + qp_->setBrush(toqstr(lcolor.getX11Name(col))); qp_->drawPolygon(QPointArray(np, points.get())); qp_->setBrush(Qt::NoBrush); diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C index 085717ed87..4fde1f1554 100644 --- a/src/frontends/qt2/QLPopupMenu.C +++ b/src/frontends/qt2/QLPopupMenu.C @@ -23,6 +23,7 @@ #include "QtView.h" #include "QLPopupMenu.h" +#include "qt_helpers.h" #include @@ -73,7 +74,7 @@ createMenu(QMenuData * parent, MenuItem const * item, Menubar::Pimpl * owner, bo { // FIXME: leaks ?? QLPopupMenu * pm = new QLPopupMenu(owner, item->submenuname(), is_toplevel); - int id = parent->insertItem(getLabel(*item).c_str(), pm); + int id = parent->insertItem(toqstr(getLabel(*item)), pm); return make_pair(id, pm); } @@ -128,7 +129,7 @@ void QLPopupMenu::populate(Menu * menu) owner_->view()->getLyXFunc().getStatus(m->action()); if (status.disabled() && m->optional()) continue; - insertItem(getLabel(*m).c_str(), m->action()); + insertItem(toqstr(getLabel(*m)), m->action()); setItemEnabled(m->action(), !status.disabled()); setItemChecked(m->action(), status.onoff(true)); } diff --git a/src/frontends/qt2/QLPrintDialog.C b/src/frontends/qt2/QLPrintDialog.C index 3b9d54d923..2c59c94820 100644 --- a/src/frontends/qt2/QLPrintDialog.C +++ b/src/frontends/qt2/QLPrintDialog.C @@ -15,7 +15,7 @@ #pragma implementation #endif -#include "gettext.h" +#include "qt_helpers.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -52,9 +52,9 @@ void QLPrintDialog::browseClicked() { QString file = QFileDialog::getOpenFileName(QString::null, - _("PostScript files (*.ps)"), + qt_("PostScript files (*.ps)"), this, 0, - _("Select a file to print to")); + qt_("Select a file to print to")); if (!file.isNull()) { fileED->setText(file); form_->changed(); @@ -86,8 +86,8 @@ void QLPrintDialog::printerChanged() void QLPrintDialog::pagerangeChanged() { - int const from = strToUnsignedInt(fromED->text().latin1()); - int const to = strToUnsignedInt(toED->text().latin1()); + int const from = strToUnsignedInt(fromqstr(fromED->text())); + int const to = strToUnsignedInt(fromqstr(toED->text())); if (!toED->text().isEmpty() && from > to) fromED->setText(toED->text()); diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C index 4018ef8237..2f8faefd7e 100644 --- a/src/frontends/qt2/QLog.C +++ b/src/frontends/qt2/QLog.C @@ -15,7 +15,7 @@ #endif #include "LyXView.h" -#include "gettext.h" +#include "qt_helpers.h" #include "ControlLog.h" #include "Lsstream.h" @@ -34,7 +34,7 @@ using std::getline; typedef Qt2CB > base_class; QLog::QLog() - : base_class(_("Log")) + : base_class(qt_("Log")) { } @@ -53,23 +53,23 @@ void QLog::update_contents() controller().logfile(); if (logfile.first == Buffer::buildlog) - dialog_->setCaption(_("Build log")); + dialog_->setCaption(qt_("Build log")); else - dialog_->setCaption(_("LaTeX log")); + dialog_->setCaption(qt_("LaTeX log")); dialog_->logTV->setText(""); ifstream ifstr(logfile.second.c_str()); if (!ifstr) { if (logfile.first == Buffer::buildlog) - dialog_->logTV->setText(_("No build log file found")); + dialog_->logTV->setText(qt_("No build log file found")); else - dialog_->logTV->setText(_("No LaTeX log file found")); + dialog_->logTV->setText(qt_("No LaTeX log file found")); return; } ostringstream ost; ost << ifstr.rdbuf(); - dialog_->logTV->setText(ost.str().c_str()); + dialog_->logTV->setText(toqstr(ost.str())); } diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C index ebc4a2c970..1769dda23f 100644 --- a/src/frontends/qt2/QLyXKeySym.C +++ b/src/frontends/qt2/QLyXKeySym.C @@ -18,8 +18,10 @@ #include "QLyXKeySym.h" #include "qlkey.h" #include "debug.h" +#include "qt_helpers.h" #include +#include using std::endl; @@ -39,15 +41,15 @@ void QLyXKeySym::set(QKeyEvent * ev) return; } text_ = ev->text(); - lyxerr[Debug::KEY] << "Setting key to " << key_ << ", " << text_.latin1() << endl; + lyxerr[Debug::KEY] << "Setting key to " << key_ << ", " << fromqstr(text_) << endl; } void QLyXKeySym::init(string const & symbolname) { key_ = string_to_qkey(symbolname); - text_ = symbolname.c_str(); - lyxerr[Debug::KEY] << "Init key to " << key_ << ", " << text_.latin1() << endl; + text_ = toqstr(symbolname); + lyxerr[Debug::KEY] << "Init key to " << key_ << ", " << fromqstr(text_) << endl; } @@ -74,7 +76,7 @@ string QLyXKeySym::getSymbolName() const if (sym.empty()) { lyxerr[Debug::KEY] << "sym empty in getSymbolName()" << endl; if (!text_.isEmpty()) - sym = text_.latin1(); + sym = fromqstr(text_); } lyxerr[Debug::KEY] << "getSymbolName() -> " << sym << endl; return sym; @@ -83,8 +85,9 @@ string QLyXKeySym::getSymbolName() const char QLyXKeySym::getISOEncoded() const { - lyxerr[Debug::KEY] << "getISO returning " << text_.latin1()[0] << endl; - return text_.latin1()[0]; + char const c = fromqstr(text_)[0]; + lyxerr[Debug::KEY] << "ISOEncoded returning value " << int(c) << endl; + return c; } diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C index a37b3720f8..5efc75595b 100644 --- a/src/frontends/qt2/QMathDialog.C +++ b/src/frontends/qt2/QMathDialog.C @@ -15,7 +15,7 @@ #endif #include "support/filetools.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "ControlMath.h" @@ -116,48 +116,48 @@ QMathDialog::QMathDialog(QMath * form) connect(symbolsWS, SIGNAL(aboutToShow(int)), this, SLOT(showingPanel(int))); QPopupMenu * m = new QPopupMenu(spacePB); - m->setCaption(_("LyX: Insert space")); + m->setCaption(qt_("LyX: Insert space")); m->insertTearOffHandle(); - m->insertItem(_("Thin space \\,"), 1); - m->insertItem(_("Medium space \\:"), 2); - m->insertItem(_("Thick space \\;"), 3); - m->insertItem(_("Quadratin space \\quad"), 4); - m->insertItem(_("Double quadratin space \\qquad"), 5); - m->insertItem(_("Negative space \\!"), 6); + m->insertItem(qt_("Thin space \\,"), 1); + m->insertItem(qt_("Medium space \\:"), 2); + m->insertItem(qt_("Thick space \\;"), 3); + m->insertItem(qt_("Quadratin space \\quad"), 4); + m->insertItem(qt_("Double quadratin space \\qquad"), 5); + m->insertItem(qt_("Negative space \\!"), 6); connect(m, SIGNAL(activated(int)), this, SLOT(insertSpace(int))); spacePB->setPopup(m); m = new QPopupMenu(sqrtPB); - m->setCaption(_("LyX: Insert root")); + m->setCaption(qt_("LyX: Insert root")); m->insertTearOffHandle(); - m->insertItem(_("Square root \\sqrt"), 1); - m->insertItem(_("Cube root \\root"), 2); - m->insertItem(_("Other root \\root"), 3); + m->insertItem(qt_("Square root \\sqrt"), 1); + m->insertItem(qt_("Cube root \\root"), 2); + m->insertItem(qt_("Other root \\root"), 3); connect(m, SIGNAL(activated(int)), this, SLOT(insertRoot(int))); sqrtPB->setPopup(m); m = new QPopupMenu(stylePB); - m->setCaption(_("LyX: Set math style")); + m->setCaption(qt_("LyX: Set math style")); m->insertTearOffHandle(); - m->insertItem(_("Display style \\displaystyle"), 1); - m->insertItem(_("Normal text style \\textstyle"), 2); - m->insertItem(_("Script (small) style \\scriptstyle"), 3); - m->insertItem(_("Scriptscript (smaller) style \\scriptscriptstyle"), 4); + m->insertItem(qt_("Display style \\displaystyle"), 1); + m->insertItem(qt_("Normal text style \\textstyle"), 2); + m->insertItem(qt_("Script (small) style \\scriptstyle"), 3); + m->insertItem(qt_("Scriptscript (smaller) style \\scriptscriptstyle"), 4); connect(m, SIGNAL(activated(int)), this, SLOT(insertStyle(int))); stylePB->setPopup(m); m = new QPopupMenu(fontPB); - m->setCaption(_("LyX: Set math font")); + m->setCaption(qt_("LyX: Set math font")); m->insertTearOffHandle(); - m->insertItem(_("Roman \\mathrm"), 1); - m->insertItem(_("Bold \\mathbf"), 2); - m->insertItem(_("San serif \\mathsf"), 3); - m->insertItem(_("Italic \\mathit"), 4); - m->insertItem(_("Typewriter \\mathtt"), 5); - m->insertItem(_("Blackboard \\mathbb"), 6); - m->insertItem(_("Fraktur \\mathfrak"), 7); - m->insertItem(_("Calligraphic \\mathcal"), 8); - m->insertItem(_("Normal text mode \\textrm"), 9); + m->insertItem(qt_("Roman \\mathrm"), 1); + m->insertItem(qt_("Bold \\mathbf"), 2); + m->insertItem(qt_("San serif \\mathsf"), 3); + m->insertItem(qt_("Italic \\mathit"), 4); + m->insertItem(qt_("Typewriter \\mathtt"), 5); + m->insertItem(qt_("Blackboard \\mathbb"), 6); + m->insertItem(qt_("Fraktur \\mathfrak"), 7); + m->insertItem(qt_("Calligraphic \\mathcal"), 8); + m->insertItem(qt_("Normal text mode \\textrm"), 9); connect(m, SIGNAL(activated(int)), this, SLOT(insertFont(int))); fontPB->setPopup(m); } @@ -181,7 +181,7 @@ IconPalette * QMathDialog::makePanel(QWidget * parent, char const ** entries) { IconPalette * p = new IconPalette(parent); for (int i = 0; *entries[i]; ++i) { - p->add(QPixmap(find_xpm(entries[i]).c_str()), entries[i], string("\\") + entries[i]); + p->add(QPixmap(toqstr(find_xpm(entries[i]))), entries[i], string("\\") + entries[i]); } connect(p, SIGNAL(button_clicked(const string &)), this, SLOT(symbol_clicked(const string &))); @@ -222,8 +222,8 @@ void QMathDialog::expandClicked() int const id = symbolsWS->id(symbolsWS->visibleWidget()); IconPalette * p = makePanel(0, panels[id]); string s = "LyX: "; - s += symbolsCO->text(id).latin1(); - p->setCaption(s.c_str()); + s += fromqstr(symbolsCO->text(id)); + p->setCaption(toqstr(s)); p->resize(40 * 5, p->height()); p->show(); p->setMaximumSize(p->width(), p->height()); @@ -232,7 +232,7 @@ void QMathDialog::expandClicked() void QMathDialog::functionSelected(const QString & str) { - form_->insert(str.latin1()); + form_->insert(fromqstr(str)); } diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C index 40e324155d..1e11817c8e 100644 --- a/src/frontends/qt2/QMathMatrixDialog.C +++ b/src/frontends/qt2/QMathMatrixDialog.C @@ -14,7 +14,7 @@ #pragma implementation #endif -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" @@ -37,7 +37,7 @@ QMathMatrixDialog::QMathMatrixDialog(QMath * form) : QMathMatrixDialogBase(0, 0, false, 0), form_(form) { - setCaption(_("LyX: Insert matrix")); + setCaption(qt_("LyX: Insert matrix")); table->setMinimumSize(100,100); rowsSB->setValue(2); @@ -78,7 +78,7 @@ void QMathMatrixDialog::change_adaptor() void QMathMatrixDialog::slotOK() { char const c = v_align_c[valignCO->currentItem()]; - char const * sh = halignED->text().latin1(); + string const sh = fromqstr(halignED->text()); int const nx = int(columnsSB->value()); int const ny = int(rowsSB->value()); diff --git a/src/frontends/qt2/QMinipage.C b/src/frontends/qt2/QMinipage.C index 95b996ea0a..cc77251edb 100644 --- a/src/frontends/qt2/QMinipage.C +++ b/src/frontends/qt2/QMinipage.C @@ -15,7 +15,7 @@ #endif #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" #include "LyXView.h" #include "ControlMinipage.h" @@ -33,7 +33,7 @@ typedef Qt2CB > base_class; QMinipage::QMinipage() - : base_class(_("Minipage")) + : base_class(qt_("Minipage")) { } @@ -55,9 +55,9 @@ void QMinipage::build_dialog() void QMinipage::apply() { - double const value = strToDbl(dialog_->widthED->text().latin1()); + double const value = strToDbl(fromqstr(dialog_->widthED->text())); LyXLength::UNIT unit = dialog_->unitsLC->currentLengthItem(); - if (string(dialog_->widthED->text().latin1()).empty()) + if (dialog_->widthED->text().isEmpty()) unit = LyXLength::UNIT_NONE; MinipageParams & params = controller().params(); @@ -96,7 +96,7 @@ void QMinipage::update_contents() MinipageParams const & params = controller().params(); LyXLength len(params.pageWidth); - dialog_->widthED->setText(numtostr(len.value()).c_str()); + dialog_->widthED->setText(toqstr(numtostr(len.value()))); dialog_->unitsLC->setCurrentItem(len.unit()); lyxerr << "width " << numtostr(len.value()) << " units " << len.unit() << std::endl; diff --git a/src/frontends/qt2/QParagraph.C b/src/frontends/qt2/QParagraph.C index eec863856f..e1f17a6170 100644 --- a/src/frontends/qt2/QParagraph.C +++ b/src/frontends/qt2/QParagraph.C @@ -20,7 +20,7 @@ #include "Qt2BC.h" #include "ParagraphParameters.h" #include "lyxrc.h" // to set the deafult length values -#include "gettext.h" +#include "qt_helpers.h" #include "layout.h" // LyXAlignment #include "helper_funcs.h" #include "lyxgluelength.h" @@ -46,7 +46,7 @@ typedef Qt2CB > base_class; QParagraph::QParagraph() - : base_class(_("Paragraph Layout")) + : base_class(qt_("Paragraph Layout")) {} @@ -65,8 +65,8 @@ void QParagraph::build_dialog() for (vector::const_iterator it = units_.begin(); it != units_.end(); ++it) { - dialog_->unitAbove->insertItem(it->c_str()); - dialog_->unitBelow->insertItem(it->c_str()); + dialog_->unitAbove->insertItem(toqstr(*it)); + dialog_->unitBelow->insertItem(toqstr(*it)); } // Manage the ok, apply, restore and cancel/close buttons @@ -141,8 +141,8 @@ void QParagraph::apply() VSpace const space_top = setVSpaceFromWidgets(dialog_->spacingAbove->currentItem(), - dialog_->valueAbove->text().latin1(), - dialog_->unitAbove->currentText().latin1(), + fromqstr(dialog_->valueAbove->text()), + fromqstr(dialog_->unitAbove->currentText()), dialog_->keepAbove->isChecked()); params.spaceTop(space_top); @@ -154,8 +154,8 @@ void QParagraph::apply() VSpace const space_bottom = setVSpaceFromWidgets(dialog_->spacingBelow->currentItem(), - dialog_->valueBelow->text().latin1(), - dialog_->unitBelow->currentText().latin1(), + fromqstr(dialog_->valueBelow->text()), + fromqstr(dialog_->unitBelow->currentText()), dialog_->keepBelow->isChecked()); params.spaceBottom(space_bottom); @@ -198,7 +198,7 @@ void QParagraph::apply() break; case 4: linespacing = Spacing::Other; - other = dialog_->linespacingValue->text().latin1(); + other = fromqstr(dialog_->linespacingValue->text()); break; } @@ -211,7 +211,7 @@ void QParagraph::apply() params.pagebreakTop(dialog_->pagebreakAbove->isChecked()); params.pagebreakBottom(dialog_->pagebreakBelow->isChecked()); // label width - params.labelWidthString(dialog_->labelWidth->text().latin1()); + params.labelWidthString(fromqstr(dialog_->labelWidth->text())); // indendation params.noindent(dialog_->noindent->isChecked()); @@ -281,7 +281,7 @@ void setWidgetsFromVSpace(VSpace const & space, } i += 1; } - value->setText(length.c_str()); + value->setText(toqstr(length)); unit->setCurrentItem(unit_item); break; } @@ -298,7 +298,8 @@ void QParagraph::update_contents() // label width string const & labelwidth = params.labelWidthString(); - dialog_->labelWidth->setText(labelwidth.c_str()); + dialog_->labelWidth->setText(toqstr(labelwidth)); + // _() is correct here (this is stupid though !) dialog_->labelwidthGB->setEnabled( labelwidth != _("Senseless with this layout!")); @@ -358,7 +359,7 @@ void QParagraph::update_contents() dialog_->linespacing->setCurrentItem(linespacing); if (space.getSpace() == Spacing::Other) { string const sp = tostr(space.getValue()); - dialog_->linespacingValue->setText(sp.c_str()); + dialog_->linespacingValue->setText(toqstr(sp)); dialog_->linespacingValue->setEnabled(true); } else { dialog_->linespacingValue->setText(""); diff --git a/src/frontends/qt2/QPreamble.C b/src/frontends/qt2/QPreamble.C index a0ef539102..7e098d62ba 100644 --- a/src/frontends/qt2/QPreamble.C +++ b/src/frontends/qt2/QPreamble.C @@ -14,7 +14,7 @@ #pragma implementation #endif -#include "gettext.h" +#include "qt_helpers.h" #include "LyXView.h" #include "ControlPreamble.h" @@ -29,7 +29,7 @@ typedef Qt2CB > base_class; QPreamble::QPreamble() - : base_class(_("LaTeX Preamble")) + : base_class(qt_("LaTeX Preamble")) { } @@ -46,11 +46,11 @@ void QPreamble::build_dialog() void QPreamble::update_contents() { - dialog_->preambleLE->setText(controller().params().c_str()); + dialog_->preambleLE->setText(toqstr(controller().params())); } void QPreamble::apply() { - controller().params(dialog_->preambleLE->text().latin1()); + controller().params(fromqstr(dialog_->preambleLE->text())); } diff --git a/src/frontends/qt2/QPreambleDialog.C b/src/frontends/qt2/QPreambleDialog.C index 44ffb0519c..7d4988c37c 100644 --- a/src/frontends/qt2/QPreambleDialog.C +++ b/src/frontends/qt2/QPreambleDialog.C @@ -18,7 +18,7 @@ #include "support/lyxlib.h" #include "support/forkedcall.h" #include "support/filetools.h" -#include "gettext.h" +#include "qt_helpers.h" #include "LyXView.h" #include "ControlPreamble.h" @@ -65,15 +65,15 @@ void QPreambleDialog::editClicked() string editor = GetEnv("EDITOR"); if (editor.empty()) { static string lastentry; - editor = QInputDialog::getText( - _("Enter editor program"), _("Editor"), QLineEdit::Normal, - lastentry.c_str()).latin1(); + editor = fromqstr(QInputDialog::getText( + qt_("Enter editor program"), qt_("Editor"), QLineEdit::Normal, + toqstr(lastentry))); if (editor.empty()) return; lastentry = editor; } - string const text(preambleLE->text().latin1()); + string const text(fromqstr(preambleLE->text())); string const filename(lyx::tempName("", "preamble")); std::ofstream file(filename.c_str()); @@ -109,5 +109,5 @@ void QPreambleDialog::editClicked() in.close(); lyx::unlink(filename); - preambleLE->setText(newtext.str().c_str()); + preambleLE->setText(toqstr(newtext.str())); } diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index b93330ae05..a09cac151f 100644 --- a/src/frontends/qt2/QPrefs.C +++ b/src/frontends/qt2/QPrefs.C @@ -64,7 +64,7 @@ typedef Qt2CB > base_class; QPrefs::QPrefs() - : base_class(_("LyX: Preferences")) + : base_class(qt_("LyX: Preferences")) { } @@ -88,7 +88,7 @@ void QPrefs::build_dialog() vector::const_iterator lit = langs.begin(); vector::const_iterator lend = langs.end(); for (; lit != lend; ++lit) { - langmod->defaultLanguageCO->insertItem(lit->first.c_str()); + langmod->defaultLanguageCO->insertItem(toqstr(lit->first)); } } @@ -106,15 +106,15 @@ void QPrefs::apply() rc.language_auto_end = langmod->autoEndCB->isChecked(); rc.language_use_babel = langmod->useBabelCB->isChecked(); rc.language_global_options = langmod->globalCB->isChecked(); - rc.language_package = langmod->languagePackageED->text().latin1(); - rc.language_command_begin = langmod->startCommandED->text().latin1(); - rc.language_command_end = langmod->endCommandED->text().latin1(); + rc.language_package = fromqstr(langmod->languagePackageED->text()); + rc.language_command_begin = fromqstr(langmod->startCommandED->text()); + rc.language_command_end = fromqstr(langmod->endCommandED->text()); rc.default_language = lang_[langmod->defaultLanguageCO->currentItem()]; QPrefUIModule * uimod(dialog_->uiModule); - rc.ui_file = uimod->uiFileED->text().latin1(); - rc.bind_file = uimod->bindFileED->text().latin1(); + rc.ui_file = fromqstr(uimod->uiFileED->text()); + rc.bind_file = fromqstr(uimod->bindFileED->text()); rc.cursor_follows_scrollbar = uimod->cursorFollowsCB->isChecked(); rc.wheel_jump = uimod->wheelMouseSB->value(); rc.autosave = uimod->autoSaveSB->value() * 60; @@ -126,27 +126,27 @@ void QPrefs::apply() // FIXME: can derive CB from the two EDs rc.use_kbmap = keymod->keymapCB->isChecked(); - rc.primary_kbmap = keymod->firstKeymapED->text().latin1(); - rc.secondary_kbmap = keymod->secondKeymapED->text().latin1(); + rc.primary_kbmap = fromqstr(keymod->firstKeymapED->text()); + rc.secondary_kbmap = fromqstr(keymod->secondKeymapED->text()); QPrefAsciiModule * ascmod(dialog_->asciiModule); rc.ascii_linelen = ascmod->asciiLinelengthSB->value(); - rc.ascii_roff_command = ascmod->asciiRoffED->text().latin1(); + rc.ascii_roff_command = fromqstr(ascmod->asciiRoffED->text()); QPrefDateModule * datemod(dialog_->dateModule); - rc.date_insert_format = datemod->DateED->text().latin1(); + rc.date_insert_format = fromqstr(datemod->DateED->text()); QPrefLatexModule * latexmod(dialog_->latexModule); - rc.fontenc = latexmod->latexEncodingED->text().latin1(); - rc.chktex_command = latexmod->latexChecktexED->text().latin1(); + rc.fontenc = fromqstr(latexmod->latexEncodingED->text()); + rc.chktex_command = fromqstr(latexmod->latexChecktexED->text()); rc.auto_reset_options = latexmod->latexAutoresetCB->isChecked(); - rc.view_dvi_paper_option = latexmod->latexDviPaperED->text().latin1(); + rc.view_dvi_paper_option = fromqstr(latexmod->latexDviPaperED->text()); rc.default_papersize = static_cast(latexmod->latexPaperSizeCO->currentItem()); @@ -177,13 +177,13 @@ void QPrefs::apply() QPrefPathsModule * pathsmod(dialog_->pathsModule); - rc.document_path = pathsmod->workingDirED->text().latin1(); - rc.template_path = pathsmod->templateDirED->text().latin1(); - rc.backupdir_path = pathsmod->backupDirED->text().latin1(); + rc.document_path = fromqstr(pathsmod->workingDirED->text()); + rc.template_path = fromqstr(pathsmod->templateDirED->text()); + rc.backupdir_path = fromqstr(pathsmod->backupDirED->text()); rc.use_tempdir = pathsmod->tempDirCB->isChecked(); - rc.tempdir_path = pathsmod->tempDirED->text().latin1(); + rc.tempdir_path = fromqstr(pathsmod->tempDirED->text()); // FIXME: should be a checkbox only - rc.lyxpipes = pathsmod->lyxserverDirED->text().latin1(); + rc.lyxpipes = fromqstr(pathsmod->lyxserverDirED->text()); QPrefSpellcheckerModule * spellmod(dialog_->spellcheckerModule); @@ -194,13 +194,13 @@ void QPrefs::apply() rc.isp_command = "aspell"; // FIXME: remove isp_use_alt_lang - rc.isp_alt_lang = spellmod->altLanguageED->text().latin1(); + rc.isp_alt_lang = fromqstr(spellmod->altLanguageED->text()); rc.isp_use_alt_lang = !rc.isp_alt_lang.empty(); // FIXME: remove isp_use_esc_chars - rc.isp_esc_chars = spellmod->escapeCharactersED->text().latin1(); + rc.isp_esc_chars = fromqstr(spellmod->escapeCharactersED->text()); rc.isp_use_esc_chars = !rc.isp_esc_chars.empty(); // FIXME: remove isp_use_pers_dict - rc.isp_pers_dict = spellmod->persDictionaryED->text().latin1(); + rc.isp_pers_dict = fromqstr(spellmod->persDictionaryED->text()); rc.isp_use_pers_dict = !rc.isp_pers_dict.empty(); rc.isp_accept_compound = spellmod->compoundWordCB->isChecked(); rc.isp_use_input_encoding = spellmod->inputEncodingCB->isChecked(); @@ -209,24 +209,24 @@ void QPrefs::apply() QPrefPrinterModule * printmod(dialog_->printerModule); rc.print_adapt_output = printmod->printerAdaptCB->isChecked(); - rc.print_command = printmod->printerCommandED->text().latin1(); - rc.printer = printmod->printerNameED->text().latin1(); - - rc.print_pagerange_flag = printmod->printerPageRangeED->text().latin1(); - rc.print_copies_flag = printmod->printerCopiesED->text().latin1(); - rc.print_reverse_flag = printmod->printerReverseED->text().latin1(); - rc.print_to_printer = printmod->printerToPrinterED->text().latin1(); - rc.print_file_extension = printmod->printerExtensionED->text().latin1(); - rc.print_file_extension = printmod->printerSpoolCommandED->text().latin1(); - rc.print_paper_flag = printmod->printerPaperTypeED->text().latin1(); - rc.print_evenpage_flag = printmod->printerEvenED->text().latin1(); - rc.print_oddpage_flag = printmod->printerOddED->text().latin1(); - rc.print_collcopies_flag = printmod->printerCollatedED->text().latin1(); - rc.print_landscape_flag = printmod->printerLandscapeED->text().latin1(); - rc.print_to_file = printmod->printerToFileED->text().latin1(); - rc.print_extra_options = printmod->printerExtraED->text().latin1(); - rc.print_spool_printerprefix = printmod->printerSpoolPrefixED->text().latin1(); - rc.print_paper_dimension_flag = printmod->printerPaperSizeED->text().latin1(); + rc.print_command = fromqstr(printmod->printerCommandED->text()); + rc.printer = fromqstr(printmod->printerNameED->text()); + + rc.print_pagerange_flag = fromqstr(printmod->printerPageRangeED->text()); + rc.print_copies_flag = fromqstr(printmod->printerCopiesED->text()); + rc.print_reverse_flag = fromqstr(printmod->printerReverseED->text()); + rc.print_to_printer = fromqstr(printmod->printerToPrinterED->text()); + rc.print_file_extension = fromqstr(printmod->printerExtensionED->text()); + rc.print_file_extension = fromqstr(printmod->printerSpoolCommandED->text()); + rc.print_paper_flag = fromqstr(printmod->printerPaperTypeED->text()); + rc.print_evenpage_flag = fromqstr(printmod->printerEvenED->text()); + rc.print_oddpage_flag = fromqstr(printmod->printerOddED->text()); + rc.print_collcopies_flag = fromqstr(printmod->printerCollatedED->text()); + rc.print_landscape_flag = fromqstr(printmod->printerLandscapeED->text()); + rc.print_to_file = fromqstr(printmod->printerToFileED->text()); + rc.print_extra_options = fromqstr(printmod->printerExtraED->text()); + rc.print_spool_printerprefix = fromqstr(printmod->printerSpoolPrefixED->text()); + rc.print_paper_dimension_flag = fromqstr(printmod->printerPaperSizeED->text()); QPrefScreenFontsModule * fontmod(dialog_->screenfontsModule); @@ -234,24 +234,24 @@ void QPrefs::apply() LyXRC const oldrc(rc); boost::tie(rc.roman_font_name, rc.roman_font_foundry) - = parseFontName(fontmod->screenRomanCO->currentText().latin1()); + = parseFontName(fromqstr(fontmod->screenRomanCO->currentText())); boost::tie(rc.sans_font_name, rc.sans_font_foundry) = - parseFontName(fontmod->screenSansCO->currentText().latin1()); + parseFontName(fromqstr(fontmod->screenSansCO->currentText())); boost::tie(rc.typewriter_font_name, rc.typewriter_font_foundry) = - parseFontName(fontmod->screenTypewriterCO->currentText().latin1()); + parseFontName(fromqstr(fontmod->screenTypewriterCO->currentText())); rc.zoom = fontmod->screenZoomSB->value(); rc.dpi = fontmod->screenDpiSB->value(); - rc.font_sizes[LyXFont::SIZE_TINY] = strToDbl(fontmod->screenTinyED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_SCRIPT] = strToDbl(fontmod->screenSmallestED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_FOOTNOTE] = strToDbl(fontmod->screenSmallerED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_SMALL] = strToDbl(fontmod->screenSmallED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_NORMAL] = strToDbl(fontmod->screenNormalED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_LARGE] = strToDbl(fontmod->screenLargeED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_LARGER] = strToDbl(fontmod->screenLargerED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_LARGEST] = strToDbl(fontmod->screenLargestED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_HUGE] = strToDbl(fontmod->screenHugeED->text().latin1()); - rc.font_sizes[LyXFont::SIZE_HUGER] = strToDbl(fontmod->screenHugerED->text().latin1()); + rc.font_sizes[LyXFont::SIZE_TINY] = strToDbl(fromqstr(fontmod->screenTinyED->text())); + rc.font_sizes[LyXFont::SIZE_SCRIPT] = strToDbl(fromqstr(fontmod->screenSmallestED->text())); + rc.font_sizes[LyXFont::SIZE_FOOTNOTE] = strToDbl(fromqstr(fontmod->screenSmallerED->text())); + rc.font_sizes[LyXFont::SIZE_SMALL] = strToDbl(fromqstr(fontmod->screenSmallED->text())); + rc.font_sizes[LyXFont::SIZE_NORMAL] = strToDbl(fromqstr(fontmod->screenNormalED->text())); + rc.font_sizes[LyXFont::SIZE_LARGE] = strToDbl(fromqstr(fontmod->screenLargeED->text())); + rc.font_sizes[LyXFont::SIZE_LARGER] = strToDbl(fromqstr(fontmod->screenLargerED->text())); + rc.font_sizes[LyXFont::SIZE_LARGEST] = strToDbl(fromqstr(fontmod->screenLargestED->text())); + rc.font_sizes[LyXFont::SIZE_HUGE] = strToDbl(fromqstr(fontmod->screenHugeED->text())); + rc.font_sizes[LyXFont::SIZE_HUGER] = strToDbl(fromqstr(fontmod->screenHugerED->text())); if (rc.font_sizes != oldrc.font_sizes || rc.roman_font_name != oldrc.roman_font_name @@ -311,7 +311,7 @@ void setComboxFont(QComboBox * cb, string const name = makeFontName(family, foundry); for (int i = 0; i < cb->count(); ++i) { - if (compare_no_case(cb->text(i).latin1(), name) == 0) { + if (fromqstr(cb->text(i)) == name) { cb->setCurrentItem(i); return; } @@ -320,7 +320,7 @@ void setComboxFont(QComboBox * cb, // Try matching without foundary name for (int i = cb->count() - 1; i >= 0; --i) { // We count in reverse in order to prefer the Xft foundry - pair tmp = parseFontName(cb->text(i).latin1()); + pair tmp = parseFontName(fromqstr(cb->text(i))); if (compare_no_case(tmp.first, family) == 0) { cb->setCurrentItem(i); return; @@ -343,17 +343,17 @@ void QPrefs::update_contents() langmod->autoEndCB->setChecked(rc.language_auto_end); langmod->useBabelCB->setChecked(rc.language_use_babel); langmod->globalCB->setChecked(rc.language_global_options); - langmod->languagePackageED->setText(rc.language_package.c_str()); - langmod->startCommandED->setText(rc.language_command_begin.c_str()); - langmod->endCommandED->setText(rc.language_command_end.c_str()); + langmod->languagePackageED->setText(toqstr(rc.language_package)); + langmod->startCommandED->setText(toqstr(rc.language_command_begin)); + langmod->endCommandED->setText(toqstr(rc.language_command_end)); int const pos = int(findPos(lang_, rc.default_language)); langmod->defaultLanguageCO->setCurrentItem(pos); QPrefUIModule * uimod(dialog_->uiModule); - uimod->uiFileED->setText(rc.ui_file.c_str()); - uimod->bindFileED->setText(rc.bind_file.c_str()); + uimod->uiFileED->setText(toqstr(rc.ui_file)); + uimod->bindFileED->setText(toqstr(rc.bind_file)); uimod->cursorFollowsCB->setChecked(rc.cursor_follows_scrollbar); uimod->wheelMouseSB->setValue(rc.wheel_jump); // convert to minutes @@ -376,27 +376,27 @@ void QPrefs::update_contents() keymod->secondKeymapED->setEnabled(rc.use_kbmap); keymod->secondKeymapPB->setEnabled(rc.use_kbmap); keymod->secondKeymapLA->setEnabled(rc.use_kbmap); - keymod->firstKeymapED->setText(rc.primary_kbmap.c_str()); - keymod->secondKeymapED->setText(rc.secondary_kbmap.c_str()); + keymod->firstKeymapED->setText(toqstr(rc.primary_kbmap)); + keymod->secondKeymapED->setText(toqstr(rc.secondary_kbmap)); QPrefAsciiModule * ascmod(dialog_->asciiModule); ascmod->asciiLinelengthSB->setValue(rc.ascii_linelen); - ascmod->asciiRoffED->setText(rc.ascii_roff_command.c_str()); + ascmod->asciiRoffED->setText(toqstr(rc.ascii_roff_command)); QPrefDateModule * datemod(dialog_->dateModule); - datemod->DateED->setText(rc.date_insert_format.c_str()); + datemod->DateED->setText(toqstr(rc.date_insert_format)); QPrefLatexModule * latexmod(dialog_->latexModule); - latexmod->latexEncodingED->setText(rc.fontenc.c_str()); - latexmod->latexChecktexED->setText(rc.chktex_command.c_str()); + latexmod->latexEncodingED->setText(toqstr(rc.fontenc)); + latexmod->latexChecktexED->setText(toqstr(rc.chktex_command)); latexmod->latexAutoresetCB->setChecked(rc.auto_reset_options); - latexmod->latexDviPaperED->setText(rc.view_dvi_paper_option.c_str()); + latexmod->latexDviPaperED->setText(toqstr(rc.view_dvi_paper_option)); latexmod->latexPaperSizeCO->setCurrentItem(rc.default_papersize); @@ -417,13 +417,13 @@ void QPrefs::update_contents() QPrefPathsModule * pathsmod(dialog_->pathsModule); - pathsmod->workingDirED->setText(rc.document_path.c_str()); - pathsmod->templateDirED->setText(rc.template_path.c_str()); - pathsmod->backupDirED->setText(rc.backupdir_path.c_str()); + pathsmod->workingDirED->setText(toqstr(rc.document_path)); + pathsmod->templateDirED->setText(toqstr(rc.template_path)); + pathsmod->backupDirED->setText(toqstr(rc.backupdir_path)); pathsmod->tempDirCB->setChecked(rc.use_tempdir); - pathsmod->tempDirED->setText(rc.tempdir_path.c_str()); + pathsmod->tempDirED->setText(toqstr(rc.tempdir_path)); // FIXME: should be a checkbox only - pathsmod->lyxserverDirED->setText(rc.lyxpipes.c_str()); + pathsmod->lyxserverDirED->setText(toqstr(rc.lyxpipes)); QPrefSpellcheckerModule * spellmod(dialog_->spellcheckerModule); @@ -431,11 +431,11 @@ void QPrefs::update_contents() item = (rc.isp_command == "ispell") ? 0 : 1; spellmod->spellCommandCO->setCurrentItem(item); // FIXME: remove isp_use_alt_lang - spellmod->altLanguageED->setText(rc.isp_alt_lang.c_str()); + spellmod->altLanguageED->setText(toqstr(rc.isp_alt_lang)); // FIXME: remove isp_use_esc_chars - spellmod->escapeCharactersED->setText(rc.isp_esc_chars.c_str()); + spellmod->escapeCharactersED->setText(toqstr(rc.isp_esc_chars)); // FIXME: remove isp_use_pers_dict - spellmod->persDictionaryED->setText(rc.isp_pers_dict.c_str()); + spellmod->persDictionaryED->setText(toqstr(rc.isp_pers_dict)); spellmod->compoundWordCB->setChecked(rc.isp_accept_compound); spellmod->inputEncodingCB->setChecked(rc.isp_use_input_encoding); @@ -443,24 +443,24 @@ void QPrefs::update_contents() QPrefPrinterModule * printmod(dialog_->printerModule); printmod->printerAdaptCB->setChecked(rc.print_adapt_output); - printmod->printerCommandED->setText(rc.print_command.c_str()); - printmod->printerNameED->setText(rc.printer.c_str()); - - printmod->printerPageRangeED->setText(rc.print_pagerange_flag.c_str()); - printmod->printerCopiesED->setText(rc.print_copies_flag.c_str()); - printmod->printerReverseED->setText(rc.print_reverse_flag.c_str()); - printmod->printerToPrinterED->setText(rc.print_to_printer.c_str()); - printmod->printerExtensionED->setText(rc.print_file_extension.c_str()); - printmod->printerSpoolCommandED->setText(rc.print_file_extension.c_str()); - printmod->printerPaperTypeED->setText(rc.print_paper_flag.c_str()); - printmod->printerEvenED->setText(rc.print_evenpage_flag.c_str()); - printmod->printerOddED->setText(rc.print_oddpage_flag.c_str()); - printmod->printerCollatedED->setText(rc.print_collcopies_flag.c_str()); - printmod->printerLandscapeED->setText(rc.print_landscape_flag.c_str()); - printmod->printerToFileED->setText(rc.print_to_file.c_str()); - printmod->printerExtraED->setText(rc.print_extra_options.c_str()); - printmod->printerSpoolPrefixED->setText(rc.print_spool_printerprefix.c_str()); - printmod->printerPaperSizeED->setText(rc.print_paper_dimension_flag.c_str()); + printmod->printerCommandED->setText(toqstr(rc.print_command)); + printmod->printerNameED->setText(toqstr(rc.printer)); + + printmod->printerPageRangeED->setText(toqstr(rc.print_pagerange_flag)); + printmod->printerCopiesED->setText(toqstr(rc.print_copies_flag)); + printmod->printerReverseED->setText(toqstr(rc.print_reverse_flag)); + printmod->printerToPrinterED->setText(toqstr(rc.print_to_printer)); + printmod->printerExtensionED->setText(toqstr(rc.print_file_extension)); + printmod->printerSpoolCommandED->setText(toqstr(rc.print_file_extension)); + printmod->printerPaperTypeED->setText(toqstr(rc.print_paper_flag)); + printmod->printerEvenED->setText(toqstr(rc.print_evenpage_flag)); + printmod->printerOddED->setText(toqstr(rc.print_oddpage_flag)); + printmod->printerCollatedED->setText(toqstr(rc.print_collcopies_flag)); + printmod->printerLandscapeED->setText(toqstr(rc.print_landscape_flag)); + printmod->printerToFileED->setText(toqstr(rc.print_to_file)); + printmod->printerExtraED->setText(toqstr(rc.print_extra_options)); + printmod->printerSpoolPrefixED->setText(toqstr(rc.print_spool_printerprefix)); + printmod->printerPaperSizeED->setText(toqstr(rc.print_paper_dimension_flag)); QPrefScreenFontsModule * fontmod(dialog_->screenfontsModule); @@ -478,16 +478,16 @@ void QPrefs::update_contents() fontmod->screenZoomSB->setValue(rc.zoom); fontmod->screenDpiSB->setValue(int(rc.dpi)); - fontmod->screenTinyED->setText(tostr(rc.font_sizes[LyXFont::SIZE_TINY]).c_str()); - fontmod->screenSmallestED->setText(tostr(rc.font_sizes[LyXFont::SIZE_SCRIPT]).c_str()); - fontmod->screenSmallerED->setText(tostr(rc.font_sizes[LyXFont::SIZE_FOOTNOTE]).c_str()); - fontmod->screenSmallED->setText(tostr(rc.font_sizes[LyXFont::SIZE_SMALL]).c_str()); - fontmod->screenNormalED->setText(tostr(rc.font_sizes[LyXFont::SIZE_NORMAL]).c_str()); - fontmod->screenLargeED->setText(tostr(rc.font_sizes[LyXFont::SIZE_LARGE]).c_str()); - fontmod->screenLargerED->setText(tostr(rc.font_sizes[LyXFont::SIZE_LARGER]).c_str()); - fontmod->screenLargestED->setText(tostr(rc.font_sizes[LyXFont::SIZE_LARGEST]).c_str()); - fontmod->screenHugeED->setText(tostr(rc.font_sizes[LyXFont::SIZE_HUGE]).c_str()); - fontmod->screenHugerED->setText(tostr(rc.font_sizes[LyXFont::SIZE_HUGER]).c_str()); + fontmod->screenTinyED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_TINY]))); + fontmod->screenSmallestED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_SCRIPT]))); + fontmod->screenSmallerED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_FOOTNOTE]))); + fontmod->screenSmallED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_SMALL]))); + fontmod->screenNormalED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_NORMAL]))); + fontmod->screenLargeED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_LARGE]))); + fontmod->screenLargerED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_LARGER]))); + fontmod->screenLargestED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_LARGEST]))); + fontmod->screenHugeED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_HUGE]))); + fontmod->screenHugerED->setText(toqstr(tostr(rc.font_sizes[LyXFont::SIZE_HUGER]))); formats_ = formats; diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C index 77c4dc0613..c9c835ba79 100644 --- a/src/frontends/qt2/QPrefsDialog.C +++ b/src/frontends/qt2/QPrefsDialog.C @@ -9,7 +9,7 @@ */ #include -#include "gettext.h" +#include "qt_helpers.h" #include "ControlPrefs.h" #include "QPrefs.h" @@ -38,6 +38,7 @@ #include "support/lstrings.h" #include "lyxrc.h" #include "debug.h" +#include "gettext.h" #include #include @@ -74,12 +75,12 @@ QPrefsDialog::QPrefsDialog(QPrefs * form) // OK, Qt is REALLY broken. We have to hard // code the menu structure here. - QListViewItem * lnf(new QListViewItem(prefsLV, _("Look and feel"))); + QListViewItem * lnf(new QListViewItem(prefsLV, qt_("Look and feel"))); lnf->setSelectable(false); lnf->setOpen(true); - QListViewItem * lan(new QListViewItem(prefsLV, lnf, _("Language settings"))); + QListViewItem * lan(new QListViewItem(prefsLV, lnf, qt_("Language settings"))); lan->setSelectable(false); - QListViewItem * out(new QListViewItem(prefsLV, lan, _("Outputs"))); + QListViewItem * out(new QListViewItem(prefsLV, lan, qt_("Outputs"))); out->setSelectable(false); asciiModule = new QPrefAsciiModule(prefsWS); @@ -116,42 +117,42 @@ QPrefsDialog::QPrefsDialog(QPrefs * form) // language settings - i = new QListViewItem(lan, _("Language")); + i = new QListViewItem(lan, qt_("Language")); pane_map_[i] = languageModule; - i = new QListViewItem(lan, i, _("Spellchecker")); + i = new QListViewItem(lan, i, qt_("Spellchecker")); pane_map_[i] = spellcheckerModule; // UI - i = new QListViewItem(lnf, _("User interface")); + i = new QListViewItem(lnf, qt_("User interface")); pane_map_[i] = uiModule; prefsLV->setCurrentItem(i); - i = new QListViewItem(lnf, i, _("Screen fonts")); + i = new QListViewItem(lnf, i, qt_("Screen fonts")); pane_map_[i] = screenfontsModule; - i = new QListViewItem(lnf, i, _("Colors")); + i = new QListViewItem(lnf, i, qt_("Colors")); pane_map_[i] = colorsModule; - i = new QListViewItem(lnf, i, _("Graphics")); + i = new QListViewItem(lnf, i, qt_("Graphics")); pane_map_[i] = displayModule; - i = new QListViewItem(lnf, i, _("Keyboard")); + i = new QListViewItem(lnf, i, qt_("Keyboard")); pane_map_[i] = keyboardModule; // output - i = new QListViewItem(out, _("Ascii")); + i = new QListViewItem(out, qt_("Ascii")); pane_map_[i] = asciiModule; - i = new QListViewItem(out, i, _("Date format")); + i = new QListViewItem(out, i, qt_("Date format")); pane_map_[i] = dateModule; - i = new QListViewItem(out, i, _("LaTeX")); + i = new QListViewItem(out, i, qt_("LaTeX")); pane_map_[i] = latexModule; - i = new QListViewItem(out, i, _("Printer")); + i = new QListViewItem(out, i, qt_("Printer")); pane_map_[i] = printerModule; - i = new QListViewItem(prefsLV, out, _("Paths")); + i = new QListViewItem(prefsLV, out, qt_("Paths")); pane_map_[i] = pathsModule; - i = new QListViewItem(prefsLV, i, _("Converters")); + i = new QListViewItem(prefsLV, i, qt_("Converters")); pane_map_[i] = convertersModule; - i = new QListViewItem(prefsLV, i, _("File formats")); + i = new QListViewItem(prefsLV, i, qt_("File formats")); pane_map_[i] = fileformatsModule; prefsLV->setMinimumSize(prefsLV->sizeHint()); @@ -177,7 +178,8 @@ QPrefsDialog::QPrefsDialog(QPrefs * form) colors_.push_back(lc); string const x11name(lcolor.getX11Name(lc)); string const guiname(lcolor.getGUIName(lc)); - QColorItem * ci(new QColorItem(QColor(x11name.c_str()), guiname.c_str())); + QColorItem * ci(new QColorItem(QColor(toqstr(x11name)), + toqstr(guiname))); colorsModule->lyxObjectsLB->insertItem(ci); } @@ -342,8 +344,8 @@ void QPrefsDialog::updateConverters() Formats::const_iterator cit = form_->formats_.begin(); Formats::const_iterator end = form_->formats_.end(); for (; cit != end; ++cit) { - convertmod->converterFromCO->insertItem(cit->prettyname().c_str()); - convertmod->converterToCO->insertItem(cit->prettyname().c_str()); + convertmod->converterFromCO->insertItem(toqstr(cit->prettyname())); + convertmod->converterToCO->insertItem(toqstr(cit->prettyname())); } convertmod->convertersLB->clear(); @@ -353,7 +355,7 @@ void QPrefsDialog::updateConverters() for (; ccit != cend; ++ccit) { string const name(ccit->From->prettyname() + " -> " + ccit->To->prettyname()); - convertmod->convertersLB->insertItem(name.c_str()); + convertmod->convertersLB->insertItem(toqstr(name)); } } @@ -363,8 +365,8 @@ void QPrefsDialog::switch_converter(int nr) Converter const & c(form_->converters_.get(nr)); convertersModule->converterFromCO->setCurrentItem(form_->formats_.getNumber(c.from)); convertersModule->converterToCO->setCurrentItem(form_->formats_.getNumber(c.to)); - convertersModule->converterED->setText(c.command.c_str()); - convertersModule->converterFlagED->setText(c.flags.c_str()); + convertersModule->converterED->setText(toqstr(c.command)); + convertersModule->converterFlagED->setText(toqstr(c.flags)); } @@ -389,8 +391,8 @@ void QPrefsDialog::modify_converter() { Format const & from(form_->formats_.get(convertersModule->converterFromCO->currentItem())); Format const & to(form_->formats_.get(convertersModule->converterToCO->currentItem())); - string flags(convertersModule->converterFlagED->text().latin1()); - string name(convertersModule->converterED->text().latin1()); + string flags(fromqstr(convertersModule->converterFlagED->text())); + string name(fromqstr(convertersModule->converterED->text())); Converter const * old = form_->converters_.getConverter(from.name(), to.name()); form_->converters_.add(from.name(), to.name(), name, flags); @@ -419,7 +421,7 @@ void QPrefsDialog::updateFormats() Formats::const_iterator cit = form_->formats_.begin(); Formats::const_iterator end = form_->formats_.end(); for (; cit != end; ++cit) { - formatmod->formatsLB->insertItem(cit->prettyname().c_str()); + formatmod->formatsLB->insertItem(toqstr(cit->prettyname())); } } @@ -427,11 +429,11 @@ void QPrefsDialog::updateFormats() void QPrefsDialog::switch_format(int nr) { Format const & f(form_->formats_.get(nr)); - fileformatsModule->formatED->setText(f.name().c_str()); - fileformatsModule->guiNameED->setText(f.prettyname().c_str()); - fileformatsModule->extensionED->setText(f.extension().c_str()); - fileformatsModule->shortcutED->setText(f.shortcut().c_str()); - fileformatsModule->viewerED->setText(f.viewer().c_str()); + fileformatsModule->formatED->setText(toqstr(f.name())); + fileformatsModule->guiNameED->setText(toqstr(f.prettyname())); + fileformatsModule->extensionED->setText(toqstr(f.extension())); + fileformatsModule->shortcutED->setText(toqstr(f.shortcut())); + fileformatsModule->viewerED->setText(toqstr(f.viewer())); fileformatsModule->formatRemovePB->setEnabled( !form_->converters_.formatIsUsed(f.name())); } @@ -451,13 +453,13 @@ void QPrefsDialog::modify_format() { Format const & oldformat(form_->formats_.get(fileformatsModule->formatsLB->currentItem())); string const oldpretty(oldformat.prettyname()); - string const name(fileformatsModule->formatED->text().latin1()); + string const name(fromqstr(fileformatsModule->formatED->text())); form_->formats_.erase(oldformat.name()); - string const prettyname = fileformatsModule->guiNameED->text().latin1(); - string const extension = fileformatsModule->extensionED->text().latin1(); - string const shortcut = fileformatsModule->shortcutED->text().latin1(); - string const viewer = fileformatsModule->viewerED->text().latin1(); + string const prettyname = fromqstr(fileformatsModule->guiNameED->text()); + string const extension = fromqstr(fileformatsModule->extensionED->text()); + string const shortcut = fromqstr(fileformatsModule->shortcutED->text()); + string const viewer = fromqstr(fileformatsModule->viewerED->text()); form_->formats_.add(name, extension, prettyname, shortcut); form_->formats_.sort(); @@ -501,81 +503,83 @@ void QPrefsDialog::change_color() void QPrefsDialog::select_ui() { - string file(form_->controller().browseUI(uiModule->uiFileED->text().latin1())); + string file(form_->controller().browseUI(fromqstr(uiModule->uiFileED->text()))); if (!file.empty()) - uiModule->uiFileED->setText(file.c_str()); + uiModule->uiFileED->setText(toqstr(file)); } void QPrefsDialog::select_bind() { - string file(form_->controller().browsebind(uiModule->bindFileED->text().latin1())); + string file(form_->controller().browsebind(fromqstr(uiModule->bindFileED->text()))); if (!file.empty()) - uiModule->bindFileED->setText(file.c_str()); + uiModule->bindFileED->setText(toqstr(file)); } void QPrefsDialog::select_keymap1() { - string file(form_->controller().browsekbmap(keyboardModule->firstKeymapED->text().latin1())); + string file(form_->controller().browsekbmap(fromqstr(keyboardModule->firstKeymapED->text()))); if (!file.empty()) - keyboardModule->firstKeymapED->setText(file.c_str()); + keyboardModule->firstKeymapED->setText(toqstr(file)); } void QPrefsDialog::select_keymap2() { - string file(form_->controller().browsekbmap(keyboardModule->secondKeymapED->text().latin1())); + string file(form_->controller().browsekbmap(fromqstr(keyboardModule->secondKeymapED->text()))); if (!file.empty()) - keyboardModule->secondKeymapED->setText(file.c_str()); + keyboardModule->secondKeymapED->setText(toqstr(file)); } void QPrefsDialog::select_dict() { - string file(form_->controller().browsedict(spellcheckerModule->persDictionaryED->text().latin1())); + string file(form_->controller().browsedict(fromqstr(spellcheckerModule->persDictionaryED->text()))); if (!file.empty()) - spellcheckerModule->persDictionaryED->setText(file.c_str()); + spellcheckerModule->persDictionaryED->setText(toqstr(file)); } +// NB: the _() is OK here because it gets passed back and we toqstr() them + void QPrefsDialog::select_templatedir() { - string file(form_->controller().browse(pathsModule->templateDirED->text().latin1(), _("Select a document templates directory"))); + string file(form_->controller().browse(fromqstr(pathsModule->templateDirED->text()), _("Select a document templates directory"))); if (!file.empty()) - pathsModule->templateDirED->setText(file.c_str()); + pathsModule->templateDirED->setText(toqstr(file)); } void QPrefsDialog::select_tempdir() { - string file(form_->controller().browse(pathsModule->tempDirED->text().latin1(), _("Select a temporary directory"))); + string file(form_->controller().browse(fromqstr(pathsModule->tempDirED->text()), _("Select a temporary directory"))); if (!file.empty()) - pathsModule->tempDirED->setText(file.c_str()); + pathsModule->tempDirED->setText(toqstr(file)); } void QPrefsDialog::select_backupdir() { - string file(form_->controller().browse(pathsModule->backupDirED->text().latin1(), _("Select a backups directory"))); + string file(form_->controller().browse(fromqstr(pathsModule->backupDirED->text()), _("Select a backups directory"))); if (!file.empty()) - pathsModule->backupDirED->setText(file.c_str()); + pathsModule->backupDirED->setText(toqstr(file)); } void QPrefsDialog::select_workingdir() { - string file(form_->controller().browse(pathsModule->workingDirED->text().latin1(), _("Selection a documents directory"))); + string file(form_->controller().browse(fromqstr(pathsModule->workingDirED->text()), _("Selection a documents directory"))); if (!file.empty()) - pathsModule->workingDirED->setText(file.c_str()); + pathsModule->workingDirED->setText(toqstr(file)); } void QPrefsDialog::select_lyxpipe() { - string file(form_->controller().browse(pathsModule->lyxserverDirED->text().latin1(), _("Give a filename for the LyX server pipe"))); + string file(form_->controller().browse(fromqstr(pathsModule->lyxserverDirED->text()), _("Give a filename for the LyX server pipe"))); if (!file.empty()) - pathsModule->lyxserverDirED->setText(file.c_str()); + pathsModule->lyxserverDirED->setText(toqstr(file)); } diff --git a/src/frontends/qt2/QPrint.C b/src/frontends/qt2/QPrint.C index 07f721d0f3..799de01e72 100644 --- a/src/frontends/qt2/QPrint.C +++ b/src/frontends/qt2/QPrint.C @@ -19,7 +19,7 @@ #include "PrinterParams.h" #include "ControlPrint.h" #include "support/lstrings.h" -#include "gettext.h" +#include "qt_helpers.h" #include "QPrint.h" #include "QLPrintDialog.h" @@ -36,7 +36,7 @@ typedef Qt2CB > base_class; QPrint::QPrint() - : base_class(_("Print")) + : base_class(qt_("Print")) { } @@ -55,11 +55,11 @@ void QPrint::update_contents() PrinterParams & pp = controller().params(); // only reset params if a different buffer - if (!pp.file_name.empty() && pp.file_name == dialog_->fileED->text().latin1()) + if (!pp.file_name.empty() && pp.file_name == fromqstr(dialog_->fileED->text())) return; - dialog_->printerED->setText(pp.printer_name.c_str()); - dialog_->fileED->setText(pp.file_name.c_str()); + dialog_->printerED->setText(toqstr(pp.printer_name)); + dialog_->fileED->setText(toqstr(pp.file_name)); dialog_->printerRB->setChecked(true); if (pp.target == PrinterParams::FILE) @@ -96,8 +96,8 @@ void QPrint::apply() t = PrinterParams::FILE; PrinterParams const pp(t, - dialog_->printerED->text().latin1(), - dialog_->fileED->text().latin1(), + fromqstr(dialog_->printerED->text()), + fromqstr(dialog_->fileED->text()), dialog_->allRB->isChecked(), dialog_->fromED->text().toUInt(), dialog_->toED->text().toUInt(), diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C index 5e3421a068..4fe05ac3cc 100644 --- a/src/frontends/qt2/QRef.C +++ b/src/frontends/qt2/QRef.C @@ -28,7 +28,7 @@ #include "helper_funcs.h" // getStringFromVector #include "support/lstrings.h" // frontStrip, strip -#include "gettext.h" +#include "qt_helpers.h" #include "insets/insetref.h" using std::find; @@ -42,7 +42,7 @@ typedef Qt2CB > base_class; QRef::QRef() - : base_class(_("Cross Reference")), + : base_class(qt_("Cross Reference")), sort_(false), at_ref_(false) { } @@ -67,9 +67,9 @@ void QRef::update_contents() { InsetCommandParams const & params = controller().params(); - dialog_->referenceED->setText(params.getContents().c_str()); + dialog_->referenceED->setText(toqstr(params.getContents())); - dialog_->nameED->setText(params.getOptions().c_str()); + dialog_->nameED->setText(toqstr(params.getOptions())); dialog_->nameED->setReadOnly(!nameAllowed() && !readOnly()); dialog_->typeCO->setCurrentItem(InsetRef::getType(params.getCmdName())); @@ -84,7 +84,7 @@ void QRef::update_contents() vector const buffers = controller().getBufferList(); for (vector::const_iterator it = buffers.begin(); it != buffers.end(); ++it) { - dialog_->bufferCO->insertItem(it->c_str()); + dialog_->bufferCO->insertItem(toqstr(*it)); } dialog_->bufferCO->setCurrentItem(controller().getBufferNum()); @@ -97,8 +97,8 @@ void QRef::apply() InsetCommandParams & params = controller().params(); params.setCmdName(InsetRef::getName(dialog_->typeCO->currentItem())); - params.setContents(dialog_->referenceED->text().latin1()); - params.setOptions(dialog_->nameED->text().latin1()); + params.setContents(fromqstr(dialog_->referenceED->text())); + params.setOptions(fromqstr(dialog_->nameED->text())); } @@ -118,23 +118,23 @@ bool QRef::typeAllowed() void QRef::setGoBack() { - dialog_->gotoPB->setText(_("&Go back")); + dialog_->gotoPB->setText(qt_("&Go back")); QToolTip::remove(dialog_->gotoPB); - QToolTip::add(dialog_->gotoPB, _("Go back")); + QToolTip::add(dialog_->gotoPB, qt_("Go back")); } void QRef::setGotoRef() { - dialog_->gotoPB->setText(_("&Goto")); + dialog_->gotoPB->setText(qt_("&Goto")); QToolTip::remove(dialog_->gotoPB); - QToolTip::add(dialog_->gotoPB, _("Go to reference")); + QToolTip::add(dialog_->gotoPB, qt_("Go to reference")); } void QRef::gotoRef() { - string ref(dialog_->referenceED->text().latin1()); + string ref(fromqstr(dialog_->referenceED->text())); if (at_ref_) { // go back @@ -155,20 +155,20 @@ void QRef::redoRefs() // need this because Qt will send a highlight() here for // the first item inserted - string const tmp(dialog_->referenceED->text().latin1()); + QString const tmp(dialog_->referenceED->text()); for (std::vector::const_iterator iter = refs_.begin(); iter != refs_.end(); ++iter) { if (sort_) - dialog_->refsLB->inSort(iter->c_str()); + dialog_->refsLB->inSort(toqstr(*iter)); else - dialog_->refsLB->insertItem(iter->c_str()); + dialog_->refsLB->insertItem(toqstr(*iter)); } - dialog_->referenceED->setText(tmp.c_str()); + dialog_->referenceED->setText(tmp); for (unsigned int i = 0; i < dialog_->refsLB->count(); ++i) { - if (!compare(tmp.c_str(), dialog_->refsLB->text(i).latin1())) + if (tmp != dialog_->refsLB->text(i)) dialog_->refsLB->setCurrentItem(i); } diff --git a/src/frontends/qt2/QSearch.C b/src/frontends/qt2/QSearch.C index d4ecf42e2f..81a7b53bdb 100644 --- a/src/frontends/qt2/QSearch.C +++ b/src/frontends/qt2/QSearch.C @@ -16,7 +16,7 @@ #include "LyXView.h" #include "ControlSearch.h" -#include "gettext.h" +#include "qt_helpers.h" #include "QSearch.h" #include "QSearchDialog.h" @@ -31,7 +31,7 @@ typedef Qt2CB > base_class; QSearch::QSearch() - : base_class(_("Search")) + : base_class(qt_("Search")) { } diff --git a/src/frontends/qt2/QSearchDialog.C b/src/frontends/qt2/QSearchDialog.C index 388c77667d..bc6e9fb925 100644 --- a/src/frontends/qt2/QSearchDialog.C +++ b/src/frontends/qt2/QSearchDialog.C @@ -18,6 +18,7 @@ #include "QSearchDialog.h" #include "QSearch.h" #include "debug.h" +#include "qt_helpers.h" #include #include @@ -25,6 +26,20 @@ #include #include +namespace { + +void uniqueInsert(QComboBox * box, QString const & text) +{ + for (int i = 0; i < box->count(); ++i) { + if (box->text(i) == text) + return; + } + + box->insertItem(text); +} + +}; + QSearchDialog::QSearchDialog(QSearch * form) : QSearchDialogBase(0, 0, false, 0), @@ -66,30 +81,35 @@ void QSearchDialog::findChanged() void QSearchDialog::findClicked() { - string const find(findCO->currentText().latin1()); + string const find(fromqstr(findCO->currentText())); form_->find(find, caseCB->isChecked(), wordsCB->isChecked(), backwardsCB->isChecked()); + uniqueInsert(findCO, findCO->currentText()); } void QSearchDialog::replaceClicked() { - string const find(findCO->currentText().latin1()); - string const replace(replaceCO->currentText().latin1()); + string const find(fromqstr(findCO->currentText())); + string const replace(fromqstr(replaceCO->currentText())); form_->replace(find, replace, caseCB->isChecked(), wordsCB->isChecked(), false); + uniqueInsert(findCO, findCO->currentText()); + uniqueInsert(replaceCO, replaceCO->currentText()); } void QSearchDialog::replaceallClicked() { - form_->replace(findCO->currentText().latin1(), - replaceCO->currentText().latin1(), + form_->replace(fromqstr(findCO->currentText()), + fromqstr(replaceCO->currentText()), caseCB->isChecked(), wordsCB->isChecked(), true); + uniqueInsert(findCO, findCO->currentText()); + uniqueInsert(replaceCO, replaceCO->currentText()); } diff --git a/src/frontends/qt2/QSendto.C b/src/frontends/qt2/QSendto.C index 9da6fc64f2..d2b058f4a4 100644 --- a/src/frontends/qt2/QSendto.C +++ b/src/frontends/qt2/QSendto.C @@ -25,7 +25,7 @@ #include #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "converter.h" using std::vector; @@ -34,7 +34,7 @@ typedef Qt2CB > base_class; QSendto::QSendto() - : base_class(_("Send document to command")) + : base_class(qt_("Send document to command")) { } @@ -71,10 +71,10 @@ void QSendto::update_contents() for (vector::const_iterator it = keys.begin(); it < keys.end(); ++it) { - dialog_->formatLB->insertItem(it->c_str()); + dialog_->formatLB->insertItem(toqstr(*it)); } - dialog_->commandCO->insertItem(controller().getCommand().c_str()); + dialog_->commandCO->insertItem(toqstr(controller().getCommand())); } @@ -85,7 +85,7 @@ void QSendto::apply() if (line < 0 || line > dialog_->formatLB->count()) return; - string const cmd(dialog_->commandCO->currentText().latin1()); + string const cmd(fromqstr(dialog_->commandCO->currentText())); controller().setFormat(all_formats_[line]); controller().setCommand(cmd); diff --git a/src/frontends/qt2/QSendtoDialog.C b/src/frontends/qt2/QSendtoDialog.C index 19542aad3c..4147a83f0d 100644 --- a/src/frontends/qt2/QSendtoDialog.C +++ b/src/frontends/qt2/QSendtoDialog.C @@ -16,7 +16,7 @@ #include #include "ControlSendto.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "converter.h" diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt2/QShowFile.C index 11fff4398c..9dff8fc6bc 100644 --- a/src/frontends/qt2/QShowFile.C +++ b/src/frontends/qt2/QShowFile.C @@ -15,7 +15,7 @@ #endif #include "ControlShowFile.h" -#include "gettext.h" +#include "qt_helpers.h" #include "QShowFile.h" #include "QShowFileDialog.h" @@ -28,7 +28,7 @@ typedef Qt2CB > base_class; QShowFile::QShowFile() - : base_class(_("ShowFile")) + : base_class(qt_("ShowFile")) { } @@ -43,12 +43,12 @@ void QShowFile::build_dialog() void QShowFile::update_contents() { - dialog_->setName(controller().getFileName().c_str()); + dialog_->setName(toqstr(controller().getFileName())); string contents = controller().getFileContents(); if (contents.empty()) { contents = "Error -> Cannot load file!"; } - dialog_->text->setText(contents.c_str()); + dialog_->text->setText(toqstr(contents)); } diff --git a/src/frontends/qt2/QSpellchecker.C b/src/frontends/qt2/QSpellchecker.C index 9f9f69a7fb..b533f912bd 100644 --- a/src/frontends/qt2/QSpellchecker.C +++ b/src/frontends/qt2/QSpellchecker.C @@ -18,7 +18,7 @@ #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" #include "Qt2BC.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include @@ -32,7 +32,7 @@ typedef Qt2CB > base_class; QSpellchecker::QSpellchecker() - : base_class(_("Spellchecker")) + : base_class(qt_("Spellchecker")) { } @@ -75,7 +75,7 @@ void QSpellchecker::ignore() void QSpellchecker::replace() { - controller().replace(dialog_->replaceCO->currentText().latin1()); + controller().replace(fromqstr(dialog_->replaceCO->currentText())); } @@ -102,12 +102,12 @@ void QSpellchecker::partialUpdate(int id) break; case 1: { - dialog_->wordED->setText(controller().getWord().c_str()); + dialog_->wordED->setText(toqstr(controller().getWord())); dialog_->suggestionsLB->clear(); string w; while (!(w = controller().getSuggestion()).empty()) { - dialog_->suggestionsLB->insertItem(w.c_str()); + dialog_->suggestionsLB->insertItem(toqstr(w)); } dialog_->suggestionChanged(dialog_->wordED->text()); @@ -118,9 +118,9 @@ void QSpellchecker::partialUpdate(int id) dialog_->spellcheckPB->setEnabled(true); hide(); lyxerr << controller().getMessage() << endl; - QMessageBox::information(0, _("Spellcheck complete"), - controller().getMessage().c_str(), - _("OK")); + QMessageBox::information(0, qt_("Spellcheck complete"), + toqstr(controller().getMessage()), + qt_("OK")); break; } } diff --git a/src/frontends/qt2/QSpellcheckerDialog.C b/src/frontends/qt2/QSpellcheckerDialog.C index e8fcc0e81c..b5ddbee5df 100644 --- a/src/frontends/qt2/QSpellcheckerDialog.C +++ b/src/frontends/qt2/QSpellcheckerDialog.C @@ -16,7 +16,7 @@ #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" -#include "gettext.h" +#include "qt_helpers.h" #include #include diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C index 283e33376c..40a71982d0 100644 --- a/src/frontends/qt2/QTabular.C +++ b/src/frontends/qt2/QTabular.C @@ -18,7 +18,7 @@ #include "ControlTabular.h" #include "insets/insettabular.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" #include "lyxrc.h" @@ -35,7 +35,7 @@ typedef Qt2CB > base_class; QTabular::QTabular() - : base_class(_("LyX: Edit Table")) + : base_class(qt_("LyX: Edit Table")) { } @@ -135,8 +135,8 @@ void QTabular::update_contents() int const row(tabular->row_of_cell(cell)); int const col(tabular->column_of_cell(cell)); - dialog_->tabularRowED->setText(tostr(row + 1).c_str()); - dialog_->tabularColumnED->setText(tostr(col + 1).c_str()); + dialog_->tabularRowED->setText(toqstr(tostr(row + 1))); + dialog_->tabularColumnED->setText(toqstr(tostr(col + 1))); bool const multicol(controller().isMulticolumnCell()); @@ -160,14 +160,14 @@ void QTabular::update_contents() pwidth = tabular->GetColumnPWidth(cell); } - dialog_->specialAlignmentED->setText(special.c_str()); + dialog_->specialAlignmentED->setText(toqstr(special)); bool const isReadonly = bc().bp().isReadOnly(); dialog_->specialAlignmentED->setEnabled(!isReadonly); LyXLength::UNIT default_unit = controller().metric() ? LyXLength::CM : LyXLength::IN; if (!pwidth.zero()) { - dialog_->widthED->setText(tostr(pwidth.value()).c_str()); + dialog_->widthED->setText(toqstr(tostr(pwidth.value()))); dialog_->widthUnit->setCurrentItem(pwidth.unit()); } else { dialog_->widthED->setText(""); @@ -177,11 +177,11 @@ void QTabular::update_contents() dialog_->widthUnit->setEnabled(!isReadonly); dialog_->hAlignCB->clear(); - dialog_->hAlignCB->insertItem(_("Left")); - dialog_->hAlignCB->insertItem(_("Center")); - dialog_->hAlignCB->insertItem(_("Right")); + dialog_->hAlignCB->insertItem(qt_("Left")); + dialog_->hAlignCB->insertItem(qt_("Center")); + dialog_->hAlignCB->insertItem(qt_("Right")); if (!multicol && !pwidth.zero()) - dialog_->hAlignCB->insertItem(_("Block")); + dialog_->hAlignCB->insertItem(qt_("Block")); int align = 0; switch (tabular->GetAlignment(cell)) { @@ -345,7 +345,7 @@ void QTabular::closeGUI() } // apply the special alignment - str1 = dialog_->specialAlignmentED->text().latin1(); + str1 = fromqstr(dialog_->specialAlignmentED->text()); if (controller().isMulticolumnCell()) str2 = tabular->GetAlignSpecial(cell, LyXTabular::SET_SPECIAL_MULTI); else diff --git a/src/frontends/qt2/QTabularCreate.C b/src/frontends/qt2/QTabularCreate.C index 5ada6b6c73..53b03f436f 100644 --- a/src/frontends/qt2/QTabularCreate.C +++ b/src/frontends/qt2/QTabularCreate.C @@ -18,7 +18,7 @@ #include "QTabularCreateDialog.h" #include "QTabularCreate.h" #include "Qt2BC.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include @@ -28,7 +28,7 @@ typedef Qt2CB > base_class; QTabularCreate::QTabularCreate() - : base_class(_("Insert table")) + : base_class(qt_("Insert table")) { } diff --git a/src/frontends/qt2/QTabularCreateDialog.C b/src/frontends/qt2/QTabularCreateDialog.C index 579ef07fbb..165896a12e 100644 --- a/src/frontends/qt2/QTabularCreateDialog.C +++ b/src/frontends/qt2/QTabularCreateDialog.C @@ -15,7 +15,7 @@ #pragma implementation #endif -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C index 1ec562904b..b0a9ee524a 100644 --- a/src/frontends/qt2/QTabularDialog.C +++ b/src/frontends/qt2/QTabularDialog.C @@ -23,6 +23,7 @@ #include "tabular.h" #include "lengthcombo.h" #include "qsetborder.h" +#include "qt_helpers.h" #include #include @@ -136,7 +137,7 @@ void QTabularDialog::bottomBorder_changed() void QTabularDialog::specialAlignment_changed() { - string special = specialAlignmentED->text().latin1(); + string special = fromqstr(specialAlignmentED->text()); if (form_->controller().isMulticolumnCell()) form_->controller().set(LyXTabular::SET_SPECIAL_MULTI, special); else diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C index c85deff008..9c8392c7f9 100644 --- a/src/frontends/qt2/QTexinfo.C +++ b/src/frontends/qt2/QTexinfo.C @@ -18,7 +18,7 @@ #include "QTexinfoDialog.h" #include "QTexinfo.h" #include "Qt2BC.h" -#include "gettext.h" +#include "qt_helpers.h" #include "helper_funcs.h" #include "support/lstrings.h" @@ -33,7 +33,7 @@ typedef Qt2CB > base_class; QTexinfo::QTexinfo() - : base_class(_("LaTeX Information")), warningPosted(false), activeStyle(ControlTexinfo::cls) + : base_class(qt_("LaTeX Information")), warningPosted(false), activeStyle(ControlTexinfo::cls) { } @@ -71,7 +71,7 @@ void QTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle) vector flist = getVectorFromString(str, "\n"); for (vector::const_iterator fitem = flist.begin(); fitem != flist.end(); ++fitem) { - dialog_->fileList->insertItem((*fitem).c_str()); + dialog_->fileList->insertItem(toqstr((*fitem))); } activeStyle = whichStyle; diff --git a/src/frontends/qt2/QTexinfoDialog.C b/src/frontends/qt2/QTexinfoDialog.C index 934270114d..9262748566 100644 --- a/src/frontends/qt2/QTexinfoDialog.C +++ b/src/frontends/qt2/QTexinfoDialog.C @@ -19,6 +19,7 @@ #include "ControlTexinfo.h" #include "QTexinfoDialog.h" #include "QTexinfo.h" +#include "qt_helpers.h" #include #include @@ -79,7 +80,7 @@ void QTexinfoDialog::viewClicked() // a valid entry? if (!sel.empty()) { - form_->controller().viewFile(sel.c_str()); + form_->controller().viewFile(sel); } } diff --git a/src/frontends/qt2/QThesaurus.C b/src/frontends/qt2/QThesaurus.C index 76b2578c7e..bf2a12edef 100644 --- a/src/frontends/qt2/QThesaurus.C +++ b/src/frontends/qt2/QThesaurus.C @@ -18,7 +18,7 @@ #include "QThesaurusDialog.h" #include "QThesaurus.h" #include "Qt2BC.h" -#include "gettext.h" +#include "qt_helpers.h" #include #include @@ -28,7 +28,7 @@ typedef Qt2CB > base_class; QThesaurus::QThesaurus() - : base_class(_("Thesaurus")) + : base_class(qt_("Thesaurus")) { } @@ -46,7 +46,7 @@ void QThesaurus::build_dialog() void QThesaurus::update_contents() { - dialog_->entryED->setText(controller().text().c_str()); + dialog_->entryED->setText(toqstr(controller().text())); dialog_->replaceED->setText(""); dialog_->updateLists(); } @@ -54,5 +54,5 @@ void QThesaurus::update_contents() void QThesaurus::replace() { - controller().replace(dialog_->replaceED->text().latin1()); + controller().replace(fromqstr(dialog_->replaceED->text())); } diff --git a/src/frontends/qt2/QThesaurusDialog.C b/src/frontends/qt2/QThesaurusDialog.C index a4c195f248..96c56d7dc0 100644 --- a/src/frontends/qt2/QThesaurusDialog.C +++ b/src/frontends/qt2/QThesaurusDialog.C @@ -19,6 +19,7 @@ #include "ControlThesaurus.h" #include "QThesaurusDialog.h" #include "QThesaurus.h" +#include "qt_helpers.h" #include #include @@ -66,8 +67,8 @@ void QThesaurusDialog::selectionChanged(QListViewItem * item) if (form_->readOnly()) return; - string const entry(item->text(0).latin1()); - replaceED->setText(entry.c_str()); + string const entry(fromqstr(item->text(0))); + replaceED->setText(toqstr(entry)); replacePB->setEnabled(true); form_->changed(); } @@ -89,17 +90,17 @@ void QThesaurusDialog::updateLists() meaningsLV->setUpdatesEnabled(false); - Thesaurus::Meanings meanings = form_->controller().getMeanings(entryED->text().latin1()); + Thesaurus::Meanings meanings = form_->controller().getMeanings(fromqstr(entryED->text())); for (Thesaurus::Meanings::const_iterator cit = meanings.begin(); cit != meanings.end(); ++cit) { QListViewItem * i = new QListViewItem(meaningsLV); - i->setText(0, cit->first.c_str()); + i->setText(0, toqstr(cit->first)); i->setOpen(true); for (std::vector::const_iterator cit2 = cit->second.begin(); cit2 != cit->second.end(); ++cit2) { QListViewItem * i2 = new QListViewItem(i); - i2->setText(0, cit2->c_str()); + i2->setText(0, toqstr(*cit2)); i2->setOpen(true); } } diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C index c25e578af6..63b1960cb6 100644 --- a/src/frontends/qt2/QToc.C +++ b/src/frontends/qt2/QToc.C @@ -17,7 +17,7 @@ #include #include "LyXView.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" #include "debug.h" @@ -39,7 +39,7 @@ using std::vector; typedef Qt2CB > base_class; QToc::QToc() - : base_class(_("Table of contents")), depth_(1) + : base_class(qt_("Table of contents")), depth_(1) {} @@ -61,10 +61,10 @@ void QToc::updateType() for (vector::const_iterator it = choice.begin(); it != choice.end(); ++it) { - dialog_->typeCO->insertItem(it->c_str()); + dialog_->typeCO->insertItem(toqstr(*it)); if (*it == type) { dialog_->typeCO->setCurrentItem(it - choice.begin()); - dialog_->setCaption(type.c_str()); + dialog_->setCaption(toqstr(type)); } } } @@ -79,8 +79,7 @@ void QToc::update_contents() void QToc::updateToc(int newdepth) { - char const * str = dialog_->typeCO->currentText().latin1(); - string type (str ? str : ""); + string type = fromqstr(dialog_->typeCO->currentText()); toc::Toc const & contents = controller().getContents(type); @@ -144,14 +143,14 @@ void QToc::updateToc(int newdepth) lyxerr[Debug::GUI] << "Table of contents\n" - << "Added item " << iter->str.c_str() + << "Added item " << iter->str << " at depth " << iter->depth << ", previous sibling \"" - << (last ? last->text(0).latin1() : "0") + << (last ? fromqstr(last->text(0)) : "0") << "\", parent \"" - << (parent ? parent->text(0).latin1() : "0") << '"' + << (parent ? fromqstr(parent->text(0)) : "0") << '"' << endl; - item->setText(0,iter->str.c_str()); + item->setText(0, toqstr(iter->str)); item->setOpen(iter->depth < depth_); curdepth = iter->depth; last = item; diff --git a/src/frontends/qt2/QTocDialog.C b/src/frontends/qt2/QTocDialog.C index 7c01d81548..55cecb86f4 100644 --- a/src/frontends/qt2/QTocDialog.C +++ b/src/frontends/qt2/QTocDialog.C @@ -16,6 +16,7 @@ #include "QToc.h" #include "QTocDialog.h" +#include "qt_helpers.h" #include #include @@ -49,7 +50,7 @@ void QTocDialog::depth_adaptor(int depth) void QTocDialog::select_adaptor(QListViewItem * item) { - form_->select(item->text(0).latin1()); + form_->select(fromqstr(item->text(0))); } diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C index 67b8023b90..55670f180a 100644 --- a/src/frontends/qt2/QURL.C +++ b/src/frontends/qt2/QURL.C @@ -16,7 +16,7 @@ #include "ControlUrl.h" #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "QURL.h" #include "QURLDialog.h" @@ -30,7 +30,7 @@ typedef Qt2CB > base_class; QURL::QURL() - : base_class(_("URL")) + : base_class(qt_("URL")) { } @@ -51,8 +51,8 @@ void QURL::update_contents() { InsetCommandParams const & params = controller().params(); - dialog_->urlED->setText(params.getContents().c_str()); - dialog_->nameED->setText(params.getOptions().c_str()); + dialog_->urlED->setText(toqstr(params.getContents())); + dialog_->nameED->setText(toqstr(params.getOptions())); dialog_->hyperlinkCB->setChecked(params.getCmdName() != "url"); } @@ -61,8 +61,8 @@ void QURL::apply() { InsetCommandParams & params = controller().params(); - params.setContents(dialog_->urlED->text().latin1()); - params.setOptions(dialog_->nameED->text().latin1()); + params.setContents(fromqstr(dialog_->urlED->text())); + params.setOptions(fromqstr(dialog_->nameED->text())); if (dialog_->hyperlinkCB->isChecked()) params.setCmdName("htmlurl"); @@ -73,8 +73,8 @@ void QURL::apply() bool QURL::isValid() { - string const u(dialog_->urlED->text().latin1()); - string const n(dialog_->nameED->text().latin1()); + string const u(fromqstr(dialog_->urlED->text())); + string const n(fromqstr(dialog_->nameED->text())); return !u.empty() && !n.empty(); } diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C index 6b7e376e47..cb74ef8368 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -15,7 +15,7 @@ #endif #include "Lsstream.h" -#include "gettext.h" +#include "qt_helpers.h" #include "LyXView.h" #include "ControlVCLog.h" @@ -32,7 +32,7 @@ typedef Qt2CB > base_class; QVCLog::QVCLog() - : base_class(_("VCLog")) + : base_class(qt_("VCLog")) { } @@ -48,14 +48,14 @@ void QVCLog::build_dialog() void QVCLog::update_contents() { #if USE_BOOST_FORMAT - dialog_->setCaption(boost::io::str(boost::format(_("Version control log for %1$s")) % controller().getBufferFileName()).c_str()); + dialog_->setCaption(toqstr(boost::io::str(boost::format(_("Version control log for %1$s")) % controller().getBufferFileName()))); #else - dialog_->setCaption(string(_("Version control log for ") + controller().getBufferFileName()).c_str()); + dialog_->setCaption(toqstr(string(_("Version control log for ")) + controller().getBufferFileName())); #endif dialog_->vclogTV->setText(""); ostringstream ss; controller().getVCLogFile(ss); - dialog_->vclogTV->setText(ss.str().c_str()); + dialog_->vclogTV->setText(toqstr(ss.str())); } diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C index 3c3d8197c3..ef81e78f25 100644 --- a/src/frontends/qt2/QWorkArea.C +++ b/src/frontends/qt2/QWorkArea.C @@ -23,6 +23,7 @@ #include "support/LAssert.h" #include "QWorkArea.h" +#include "qt_helpers.h" #include #include @@ -55,7 +56,7 @@ QWorkArea::QWorkArea(int, int, int, int) content_->show(); - content_->setBackgroundColor(lcolor.getX11Name(LColor::background).c_str()); + content_->setBackgroundColor(toqstr(lcolor.getX11Name(LColor::background))); QHBoxLayout * vl = new QHBoxLayout(this); vl->addWidget(content_, 5); @@ -132,7 +133,7 @@ string const QWorkArea::getClipboard() const QString str = QApplication::clipboard()->text(); if (str.isNull()) return string(); - return str.latin1(); + return fromqstr(str); } @@ -141,5 +142,5 @@ void QWorkArea::putClipboard(string const & str) const #if QT_VERSION >= 300 QApplication::clipboard()->setSelectionMode(true); #endif - QApplication::clipboard()->setText(str.c_str()); + QApplication::clipboard()->setText(toqstr(str)); } diff --git a/src/frontends/qt2/QWrap.C b/src/frontends/qt2/QWrap.C index e09deb3f77..d25736ccd8 100644 --- a/src/frontends/qt2/QWrap.C +++ b/src/frontends/qt2/QWrap.C @@ -15,7 +15,7 @@ #endif #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/lstrings.h" #include "LyXView.h" #include "ControlWrap.h" @@ -33,7 +33,7 @@ typedef Qt2CB > base_class; QWrap::QWrap() - : base_class(_("Wrap Options")) + : base_class(qt_("Wrap Options")) { } @@ -55,9 +55,9 @@ void QWrap::build_dialog() void QWrap::apply() { - double const value = strToDbl(dialog_->widthED->text().latin1()); + double const value = strToDbl(fromqstr(dialog_->widthED->text())); LyXLength::UNIT unit = dialog_->unitsLC->currentLengthItem(); - if (string(dialog_->widthED->text().latin1()).empty()) + if (dialog_->widthED->text().isEmpty()) unit = LyXLength::UNIT_NONE; WrapParams & params = controller().params(); @@ -98,7 +98,7 @@ void QWrap::update_contents() WrapParams & params = controller().params(); LyXLength len(params.pageWidth); - dialog_->widthED->setText(numtostr(len.value()).c_str()); + dialog_->widthED->setText(toqstr(numtostr(len.value()))); dialog_->unitsLC->setCurrentItem(len.unit()); int item = 0; diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C index cd152b3c4a..1a8db51c89 100644 --- a/src/frontends/qt2/Qt2BC.C +++ b/src/frontends/qt2/Qt2BC.C @@ -17,6 +17,7 @@ #include "Qt2BC.h" #include "debug.h" +#include "qt_helpers.h" #include #include @@ -51,5 +52,5 @@ void Qt2BC::setWidgetEnabled(QWidget * obj, bool enabled) void Qt2BC::setButtonLabel(QButton * obj, string const & label) { - obj->setText(label.c_str()); + obj->setText(toqstr(label)); } diff --git a/src/frontends/qt2/QtView.C b/src/frontends/qt2/QtView.C index 4496cec0ce..5a38bb5ed5 100644 --- a/src/frontends/qt2/QtView.C +++ b/src/frontends/qt2/QtView.C @@ -35,6 +35,7 @@ #include "QtView.h" #include "qfont_loader.h" #include "QCommandBuffer.h" +#include "qt_helpers.h" #include #include @@ -84,7 +85,7 @@ QtView::QtView(unsigned int width, unsigned int height) // assign an icon to main form string const iconname = LibFileSearch("images", "lyx", "xpm"); if (!iconname.empty()) - setIcon(QPixmap(iconname.c_str())); + setIcon(QPixmap(toqstr(iconname))); // make sure the buttons are disabled if needed updateToolbar(); @@ -96,9 +97,16 @@ QtView::~QtView() } +void QtView::setWindowTitle(string const & t, string const & it) +{ + setCaption(toqstr(t)); + setIconText(toqstr(it)); +} + + void QtView::message(string const & str) { - statusBar()->message(str.c_str()); + statusBar()->message(toqstr(str)); idle_timer_.stop(); idle_timer_.start(idle_timer_value); } @@ -112,13 +120,13 @@ void QtView::focus_command_widget() void QtView::update_view_state_qt() { - statusBar()->message(currentState(view().get()).c_str()); + statusBar()->message(toqstr(currentState(view().get()))); } void QtView::update_view_state() { - statusBar()->message(currentState(view().get()).c_str()); + statusBar()->message(toqstr(currentState(view().get()))); } @@ -137,7 +145,7 @@ void QtView::closeEvent(QCloseEvent *) void QtView::show(int x, int y, string const & title) { move(x, y); - setCaption(title.c_str()); + setCaption(toqstr(title)); QMainWindow::show(); } diff --git a/src/frontends/qt2/QtView.h b/src/frontends/qt2/QtView.h index 381c0b5e71..e3b184c6d6 100644 --- a/src/frontends/qt2/QtView.h +++ b/src/frontends/qt2/QtView.h @@ -73,10 +73,7 @@ private: * @param t main window title * @param it iconified (short) title */ - virtual void setWindowTitle(string const & t, string const & it) { - setCaption(t.c_str()); - setIconText(it.c_str()); - } + virtual void setWindowTitle(string const & t, string const & it); /// idle timer QTimer idle_timer_; diff --git a/src/frontends/qt2/README b/src/frontends/qt2/README index 904dfce474..0e29583945 100644 --- a/src/frontends/qt2/README +++ b/src/frontends/qt2/README @@ -54,37 +54,6 @@ PB - push button (FIXME: complete this) -Dialog Maintainer MVC conversion ----------------------------------------------- -About John Done -Bibitem John Done -Bibtex John Done -Character Edwin Done -Citation Kalle Done -Document Kalle Waiting for MVC -ERT John Done -Error John Done -External John Done -Graphics John Done -Include John Done -Index Kalle Done -Log John Done -Minipage John Done -Paragraph Edwin Waiting to be updated -Preamble John Done -Print Edwin Done -Ref Kalle Done -Search Edwin Done -Spellchecker John Done -Splash Edwin -Tabular Waiting for MVC -TabularCreate Edwin Done -Thesaurus John Done -Toc Kalle Waiting to be updated -Url Kalle Done -VCLog John Done - - Stuff to be aware of -------------------- @@ -103,3 +72,14 @@ ex. connect(list, SIGNAL(selected(QString const &)), this, SLOT(complete_selected(QString const &))); + +Qt, Unicode, and LyX +-------------------- + +LyX isn't unicoded yet. But you should follow these simple rules : + +o Use qt_() not _() in code +o Use fromqstr and toqstr NOT .latin1() / .c_str() + +Using these functions (in qt_helpers.h) will make sure we use +the right locale for converting to Qt's QString, which is unicode. diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C index 330b49cbf3..0ba415547d 100644 --- a/src/frontends/qt2/Toolbar_pimpl.C +++ b/src/frontends/qt2/Toolbar_pimpl.C @@ -22,7 +22,7 @@ #include "BufferView.h" #include "buffer.h" #include "LyXAction.h" -#include "gettext.h" +#include "qt_helpers.h" #include "support/LAssert.h" #include "support/filetools.h" @@ -66,7 +66,7 @@ QPixmap getIconPixmap(int action) if (!fullname.empty()) { lyxerr[Debug::GUI] << "Full icon name is `" << fullname << '\'' << endl; - return QPixmap(fullname.c_str()); + return QPixmap(toqstr(fullname)); } lyxerr << "Unable to find icon `" << fullname << '\'' << endl; @@ -75,7 +75,7 @@ QPixmap getIconPixmap(int action) lyxerr[Debug::GUI] << "Using default `unknown' icon" << endl; } - return QPixmap(fullname.c_str()); + return QPixmap(toqstr(fullname)); } } // namespace anon @@ -146,6 +146,7 @@ void Toolbar::Pimpl::changed_layout(string const & sel) LyXTextClass::const_iterator end = tc.end(); for (LyXTextClass::const_iterator cit = tc.begin(); cit != end; ++cit) { + // Yes, the _() is correct if (_((*cit)->name()) == sel) { owner_->getLyXFunc().dispatch(FuncRequest(LFUN_LAYOUT, (*cit)->name()), true); return; @@ -161,17 +162,17 @@ void Toolbar::Pimpl::setLayout(string const & layout) LyXTextClass const & tc = owner_->buffer()->params.getLyXTextClass(); - string const & name = _(tc[layout]->name()); + QString const & name = qt_(tc[layout]->name()); int i = 0; for (; i < combo_->count(); ++i) { - if (name == combo_->text(i).latin1()) + if (name == combo_->text(i)) break; } if (i == combo_->count()) { lyxerr << "Trying to select non existent layout type " - << name << endl; + << fromqstr(name) << endl; return; } @@ -197,7 +198,7 @@ void Toolbar::Pimpl::updateLayoutList(bool force) for (; cit != end; ++cit) { // ignore obsolete entries if ((*cit)->obsoleted_by().empty()) - combo_->insertItem(_((*cit)->name()).c_str()); + combo_->insertItem(qt_((*cit)->name())); } // needed to recalculate size hint @@ -249,7 +250,7 @@ void Toolbar::Pimpl::add(int action) default: { QToolButton * tb = new QToolButton(getIconPixmap(action), - _(lyxaction.helpText(action)).c_str(), "", + qt_(lyxaction.helpText(action)), "", proxy_.get(), SLOT(button_selected()), toolbars_.back()); map_[tb] = action; diff --git a/src/frontends/qt2/Toolbar_pimpl.h b/src/frontends/qt2/Toolbar_pimpl.h index e914fe9589..63751c172a 100644 --- a/src/frontends/qt2/Toolbar_pimpl.h +++ b/src/frontends/qt2/Toolbar_pimpl.h @@ -18,6 +18,8 @@ #include "frontends/Toolbar.h" +#include "qt_helpers.h" + #include #include #include @@ -80,7 +82,7 @@ public: public slots: void layout_selected(const QString & str) { - owner_.changed_layout(str.latin1()); + owner_.changed_layout(fromqstr(str)); } void button_selected() { diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C index 0d75810cb4..8e15746b4b 100644 --- a/src/frontends/qt2/iconpalette.C +++ b/src/frontends/qt2/iconpalette.C @@ -17,6 +17,7 @@ #include "debug.h" #include "iconpalette.h" +#include "qt_helpers.h" #include #include @@ -47,7 +48,7 @@ void IconPalette::add(QPixmap const & pixmap, string name, string tooltip) QPushButton * p = new QPushButton(this); p->setFixedSize(button_size, button_size); p->setPixmap(pixmap); - QToolTip::add(p, tooltip.c_str()); + QToolTip::add(p, toqstr(tooltip)); connect(p, SIGNAL(clicked()), this, SLOT(clicked())); buttons_.push_back(make_pair(p, name)); } diff --git a/src/frontends/qt2/lengthcombo.C b/src/frontends/qt2/lengthcombo.C index fc07f4b0d6..33f61866f5 100644 --- a/src/frontends/qt2/lengthcombo.C +++ b/src/frontends/qt2/lengthcombo.C @@ -19,7 +19,7 @@ #include #include "lengthcommon.h" -#include "gettext.h" +#include "qt_helpers.h" LengthCombo::LengthCombo(QWidget * parent, char * name) @@ -31,7 +31,7 @@ LengthCombo::LengthCombo(QWidget * parent, char * name) connect(this, SIGNAL(activated(int)), this, SLOT(has_activated(int))); - QWhatsThis::add(this, _("Choose one of the units or relative lengths")); + QWhatsThis::add(this, qt_("Choose one of the units or relative lengths")); } diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C index c64afc720f..76e82f93fe 100644 --- a/src/frontends/qt2/lyx_gui.C +++ b/src/frontends/qt2/lyx_gui.C @@ -20,7 +20,7 @@ #include "support/filetools.h" #include "support/lstrings.h" #include "debug.h" -#include "gettext.h" +#include "qt_helpers.h" #include "lyx_gui.h" #include "lyx_main.h" @@ -170,8 +170,8 @@ void lyx_gui::exit() string const lyx_gui::hexname(LColor::color col) { - QColor color(lcolor.getX11Name(col).c_str()); - return ltrim(color.name().latin1(), "#"); + QColor color(toqstr(lcolor.getX11Name(col))); + return ltrim(fromqstr(color.name()), "#"); } diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C index 83f6e168d4..3544ed44c9 100644 --- a/src/frontends/qt2/qfont_loader.C +++ b/src/frontends/qt2/qfont_loader.C @@ -16,7 +16,7 @@ #endif #include "qfont_loader.h" -#include "gettext.h" +#include "qt_helpers.h" #include "debug.h" #include "lyxrc.h" #include "BufferView.h" @@ -24,9 +24,7 @@ #include #include -#if QT_VERSION < 300 #include "support/lstrings.h" -#endif #ifdef Q_WS_X11 #include @@ -145,21 +143,25 @@ bool addFontPath() return false; } -bool isAvailable(QFont const & font, LyXFont const & f) { -#if QT_VERSION >= 300 - return font.exactMatch(); -#else + +bool isAvailable(QFont const & font, LyXFont const & f) +{ string tmp = symbolPattern(f.family()); if (tmp.empty()) return false; - else - return token(tmp, '-', 2) == - token(font.rawName().latin1(), '-', 2); -#endif + else { + bool const found(token(tmp, '-', 2) == + token(fromqstr(font.rawName()), '-', 2)); + lyxerr[Debug::FONT] << "Looking for symbol font \n\"" + << tmp << "\" and got \n\"" << fromqstr(font.rawName()) + << "\"\n match: " << found << endl; + return found; + } } } // namespace anon + qfont_loader::font_info::font_info(LyXFont const & f) : metrics(font) { @@ -167,30 +169,31 @@ qfont_loader::font_info::font_info(LyXFont const & f) string pat = symbolPattern(f.family()); if (!pat.empty()) { static bool first_time = true; - font.setRawName(pat.c_str()); + font.setRawName(toqstr(pat)); if (f.family() != LyXFont::SYMBOL_FAMILY && !isAvailable(font, f) && first_time) { first_time = false; if (addFontPath()) { - font.setRawName(pat.c_str()); + font.setRawName(toqstr(pat)); } } - } else + } else { switch (f.family()) { case LyXFont::ROMAN_FAMILY: - font.setFamily(makeFontName(lyxrc.roman_font_name, - lyxrc.roman_font_foundry).c_str()); + font.setFamily(toqstr(makeFontName(lyxrc.roman_font_name, + lyxrc.roman_font_foundry))); break; case LyXFont::SANS_FAMILY: - font.setFamily(makeFontName(lyxrc.sans_font_name, - lyxrc.sans_font_foundry).c_str()); + font.setFamily(toqstr(makeFontName(lyxrc.sans_font_name, + lyxrc.sans_font_foundry))); break; case LyXFont::TYPEWRITER_FAMILY: - font.setFamily(makeFontName(lyxrc.typewriter_font_name, - lyxrc.typewriter_font_foundry).c_str()); + font.setFamily(toqstr(makeFontName(lyxrc.typewriter_font_name, + lyxrc.typewriter_font_foundry))); break; default: break; + } } font.setPointSizeFloat(lyxrc.font_sizes[f.size()] @@ -261,5 +264,8 @@ bool qfont_loader::available(LyXFont const & f) if (!lyxrc.use_gui) return false; - return isAvailable(getfontinfo(f)->font, f); + bool const is_available(isAvailable(getfontinfo(f)->font, f)); + lyxerr[Debug::FONT] << "font_loader::available returning " + << is_available << endl; + return is_available; } diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt2/qt_helpers.C index 76a56b50f8..a67e11f9ac 100644 --- a/src/frontends/qt2/qt_helpers.C +++ b/src/frontends/qt2/qt_helpers.C @@ -15,13 +15,14 @@ #endif #include "support/lstrings.h" - +#include "gettext.h" #include "qt_helpers.h" - + #include "lengthcombo.h" #include #include +#include using std::pair; using std::make_pair; @@ -63,8 +64,8 @@ string widgetsToLength(QLineEdit const * input, LengthCombo const * combo) return string(); // don't return unit-from-choice if the input(field) contains a unit - if (isValidGlueLength(length.latin1())) - return length.latin1(); + if (isValidGlueLength(fromqstr(length))) + return fromqstr(length); LyXLength::UNIT unit = combo->currentLengthItem(); @@ -81,6 +82,41 @@ void lengthToWidgets(QLineEdit * input, LengthCombo * combo, input->setText(""); } else { combo->setCurrentItem(LyXLength(len).unit()); - input->setText(tostr(LyXLength(len).value()).c_str()); + input->setText(toqstr(tostr(LyXLength(len).value()))); } } + + +QString const toqstr(char const * str) +{ + QTextCodec * codec = QTextCodec::codecForLocale(); + + return codec->toUnicode(str); +} + + +QString const toqstr(string const & str) +{ + return toqstr(str.c_str()); +} + + +QString const qt_(char const * str) +{ + return toqstr(_(str)); +} + + +QString const qt_(string const & str) +{ + return toqstr(_(str)); +} + + +string const fromqstr(QString const & str) +{ + QTextCodec * codec = QTextCodec::codecForLocale(); + QCString tmpstr = codec->fromUnicode(str); + char const * tmpcstr = tmpstr; + return tmpcstr; +} diff --git a/src/frontends/qt2/qt_helpers.h b/src/frontends/qt2/qt_helpers.h index f9c6f7feeb..4be29e4e5f 100644 --- a/src/frontends/qt2/qt_helpers.h +++ b/src/frontends/qt2/qt_helpers.h @@ -24,6 +24,7 @@ class LengthCombo; class QLineEdit; +class QString; string makeFontName(string const & family, string const & foundry); @@ -36,4 +37,45 @@ string widgetsToLength(QLineEdit const * input, LengthCombo const * combo); void lengthToWidgets(QLineEdit * input, LengthCombo * combo, string const & len, LyXLength::UNIT default_unit); +/** + * toqstr - convert char * into unicode + * + * Use this whenever there's a user-visible string that is encoded + * for the locale (menus, dialogs etc.) + */ +QString const toqstr(char const * str); + + +/** + * toqstr - convert string into unicode + * + * Use this whenever there's a user-visible string that is encoded + * for the locale (menus, dialogs etc.) + */ +QString const toqstr(string const & str); + + +/** + * qt_ - i18nize string and convert to unicode + * + * Use this in qt2/ instead of qt_() + */ +QString const qt_(char const * str); + + +/** + * qt_ - i18nize string and convert to unicode + * + * Use this in qt2/ instead of qt_() + */ +QString const qt_(string const & str); + + +/** + * fromqstr - convert QString into std::string in locale + * + * Return the QString encoded in the locale + */ +string const fromqstr(QString const & str); + #endif // QTHELPERS_H diff --git a/src/frontends/qt2/ui/BiblioModuleBase.ui b/src/frontends/qt2/ui/BiblioModuleBase.ui index fe581b6cb1..9764f184ad 100644 --- a/src/frontends/qt2/ui/BiblioModuleBase.ui +++ b/src/frontends/qt2/ui/BiblioModuleBase.ui @@ -1,7 +1,7 @@ BiblioModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/BulletsModuleBase.ui b/src/frontends/qt2/ui/BulletsModuleBase.ui index 3e42853499..f45fab3b96 100644 --- a/src/frontends/qt2/ui/BulletsModuleBase.ui +++ b/src/frontends/qt2/ui/BulletsModuleBase.ui @@ -1,7 +1,7 @@ BulletsModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/ClassModuleBase.ui b/src/frontends/qt2/ui/ClassModuleBase.ui index ad80d503a2..c9c6f8e5fd 100644 --- a/src/frontends/qt2/ui/ClassModuleBase.ui +++ b/src/frontends/qt2/ui/ClassModuleBase.ui @@ -1,7 +1,7 @@ ClassModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt2/ui/LanguageModuleBase.ui index 19c33f3d58..3f97e65d3f 100644 --- a/src/frontends/qt2/ui/LanguageModuleBase.ui +++ b/src/frontends/qt2/ui/LanguageModuleBase.ui @@ -1,7 +1,7 @@ LanguageModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am index f60847ca17..a0eaff231a 100644 --- a/src/frontends/qt2/ui/Makefile.am +++ b/src/frontends/qt2/ui/Makefile.am @@ -21,7 +21,7 @@ nodist_libqt2ui_la_SOURCES = $(UIDIALOGS) libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES) # Use _() for localization instead of tr() or trUtf8() -UICFLAGS=-tr _ +UICFLAGS=-tr qt_ QAskForTextDialog.h: QAskForTextDialog.ui $(UIC) $(UICFLAGS) $< -o $@ diff --git a/src/frontends/qt2/ui/MarginsModuleBase.ui b/src/frontends/qt2/ui/MarginsModuleBase.ui index fe5a18f63c..53e3712ab9 100644 --- a/src/frontends/qt2/ui/MarginsModuleBase.ui +++ b/src/frontends/qt2/ui/MarginsModuleBase.ui @@ -1,7 +1,7 @@ MarginsModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/NumberingModuleBase.ui b/src/frontends/qt2/ui/NumberingModuleBase.ui index 3e2646a6fe..13906a6468 100644 --- a/src/frontends/qt2/ui/NumberingModuleBase.ui +++ b/src/frontends/qt2/ui/NumberingModuleBase.ui @@ -1,7 +1,7 @@ NumberingModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/PackagesModuleBase.ui b/src/frontends/qt2/ui/PackagesModuleBase.ui index 34fb7e8bfd..2bee6ffc40 100644 --- a/src/frontends/qt2/ui/PackagesModuleBase.ui +++ b/src/frontends/qt2/ui/PackagesModuleBase.ui @@ -1,7 +1,7 @@ PackagesModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/PaperModuleBase.ui b/src/frontends/qt2/ui/PaperModuleBase.ui index 0a1589fa39..ec01f7718c 100644 --- a/src/frontends/qt2/ui/PaperModuleBase.ui +++ b/src/frontends/qt2/ui/PaperModuleBase.ui @@ -1,7 +1,7 @@ PaperModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/PreambleModuleBase.ui b/src/frontends/qt2/ui/PreambleModuleBase.ui index 02074ba3b5..5b823da255 100644 --- a/src/frontends/qt2/ui/PreambleModuleBase.ui +++ b/src/frontends/qt2/ui/PreambleModuleBase.ui @@ -1,7 +1,7 @@ PreambleModuleBase config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QAboutDialog.ui b/src/frontends/qt2/ui/QAboutDialog.ui index fe5de696b7..bdd3b57f28 100644 --- a/src/frontends/qt2/ui/QAboutDialog.ui +++ b/src/frontends/qt2/ui/QAboutDialog.ui @@ -1,7 +1,7 @@ QAboutDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QAskForTextDialog.ui b/src/frontends/qt2/ui/QAskForTextDialog.ui index 290d65efed..3d8891b30c 100644 --- a/src/frontends/qt2/ui/QAskForTextDialog.ui +++ b/src/frontends/qt2/ui/QAskForTextDialog.ui @@ -1,7 +1,7 @@ QAskForTextDialog config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QBibitemDialog.ui b/src/frontends/qt2/ui/QBibitemDialog.ui index 1e2cd558a5..e43f29ddf3 100644 --- a/src/frontends/qt2/ui/QBibitemDialog.ui +++ b/src/frontends/qt2/ui/QBibitemDialog.ui @@ -1,7 +1,7 @@ QBibitemDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QBibtexDialog.ui b/src/frontends/qt2/ui/QBibtexDialog.ui index e961a99118..f92ea50916 100644 --- a/src/frontends/qt2/ui/QBibtexDialog.ui +++ b/src/frontends/qt2/ui/QBibtexDialog.ui @@ -1,7 +1,7 @@ QBibtexDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QCharacterDialog.ui b/src/frontends/qt2/ui/QCharacterDialog.ui index 99afb11d2c..354aedd1fd 100644 --- a/src/frontends/qt2/ui/QCharacterDialog.ui +++ b/src/frontends/qt2/ui/QCharacterDialog.ui @@ -1,7 +1,7 @@ QCharacterDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QCitationDialog.ui b/src/frontends/qt2/ui/QCitationDialog.ui index a1a2fc5738..09f5e40bcf 100644 --- a/src/frontends/qt2/ui/QCitationDialog.ui +++ b/src/frontends/qt2/ui/QCitationDialog.ui @@ -1,7 +1,7 @@ QCitationDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QDelimiterDialog.ui b/src/frontends/qt2/ui/QDelimiterDialog.ui index 5b20aac837..d39d2becfb 100644 --- a/src/frontends/qt2/ui/QDelimiterDialog.ui +++ b/src/frontends/qt2/ui/QDelimiterDialog.ui @@ -1,7 +1,7 @@ QDelimiterDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QDocumentDialog.ui b/src/frontends/qt2/ui/QDocumentDialog.ui index 116d2409fd..e6457f92d0 100644 --- a/src/frontends/qt2/ui/QDocumentDialog.ui +++ b/src/frontends/qt2/ui/QDocumentDialog.ui @@ -1,7 +1,7 @@ QDocumentDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QERTDialog.ui b/src/frontends/qt2/ui/QERTDialog.ui index e1731b5eba..3cc895c701 100644 --- a/src/frontends/qt2/ui/QERTDialog.ui +++ b/src/frontends/qt2/ui/QERTDialog.ui @@ -1,7 +1,7 @@ QERTDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QErrorDialog.ui b/src/frontends/qt2/ui/QErrorDialog.ui index d10c74967c..9bd5cb73d7 100644 --- a/src/frontends/qt2/ui/QErrorDialog.ui +++ b/src/frontends/qt2/ui/QErrorDialog.ui @@ -1,7 +1,7 @@ QErrorDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QExternalDialog.ui b/src/frontends/qt2/ui/QExternalDialog.ui index a884c14552..cf57f1241a 100644 --- a/src/frontends/qt2/ui/QExternalDialog.ui +++ b/src/frontends/qt2/ui/QExternalDialog.ui @@ -1,7 +1,7 @@ QExternalDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QFloatDialog.ui b/src/frontends/qt2/ui/QFloatDialog.ui index d47b5489a7..9734ca4956 100644 --- a/src/frontends/qt2/ui/QFloatDialog.ui +++ b/src/frontends/qt2/ui/QFloatDialog.ui @@ -1,7 +1,7 @@ QFloatDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialog.ui index b6fb8e5deb..77bb7f563f 100644 --- a/src/frontends/qt2/ui/QGraphicsDialog.ui +++ b/src/frontends/qt2/ui/QGraphicsDialog.ui @@ -1,7 +1,7 @@ QGraphicsDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QIncludeDialog.ui b/src/frontends/qt2/ui/QIncludeDialog.ui index 6eee252d93..31b572df5f 100644 --- a/src/frontends/qt2/ui/QIncludeDialog.ui +++ b/src/frontends/qt2/ui/QIncludeDialog.ui @@ -1,7 +1,7 @@ QIncludeDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QIndexDialog.ui b/src/frontends/qt2/ui/QIndexDialog.ui index 9ac4ac53a6..81e6477c72 100644 --- a/src/frontends/qt2/ui/QIndexDialog.ui +++ b/src/frontends/qt2/ui/QIndexDialog.ui @@ -1,7 +1,7 @@ QIndexDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QLogDialog.ui b/src/frontends/qt2/ui/QLogDialog.ui index d28e1a45e3..157aa1c9dc 100644 --- a/src/frontends/qt2/ui/QLogDialog.ui +++ b/src/frontends/qt2/ui/QLogDialog.ui @@ -1,7 +1,7 @@ QLogDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QMathDialog.ui b/src/frontends/qt2/ui/QMathDialog.ui index ec66f0a051..917e8a0660 100644 --- a/src/frontends/qt2/ui/QMathDialog.ui +++ b/src/frontends/qt2/ui/QMathDialog.ui @@ -1,7 +1,7 @@ QMathDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QMathMatrixDialog.ui b/src/frontends/qt2/ui/QMathMatrixDialog.ui index a5d63251da..b996a1395c 100644 --- a/src/frontends/qt2/ui/QMathMatrixDialog.ui +++ b/src/frontends/qt2/ui/QMathMatrixDialog.ui @@ -1,7 +1,7 @@ QMathMatrixDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QMinipageDialog.ui b/src/frontends/qt2/ui/QMinipageDialog.ui index 7dfce12308..8c6573a77d 100644 --- a/src/frontends/qt2/ui/QMinipageDialog.ui +++ b/src/frontends/qt2/ui/QMinipageDialog.ui @@ -1,7 +1,7 @@ QMinipageDialogBase config.h -gettext.h +qt_helpers.h vspace.h QDialog diff --git a/src/frontends/qt2/ui/QParagraphDialog.ui b/src/frontends/qt2/ui/QParagraphDialog.ui index adb733b6b8..6f52fbc0a0 100644 --- a/src/frontends/qt2/ui/QParagraphDialog.ui +++ b/src/frontends/qt2/ui/QParagraphDialog.ui @@ -1,7 +1,7 @@ QParagraphDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QPreambleDialog.ui b/src/frontends/qt2/ui/QPreambleDialog.ui index 36d4262b76..cb83d32324 100644 --- a/src/frontends/qt2/ui/QPreambleDialog.ui +++ b/src/frontends/qt2/ui/QPreambleDialog.ui @@ -1,7 +1,7 @@ QPreambleDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QPrefAsciiModule.ui b/src/frontends/qt2/ui/QPrefAsciiModule.ui index 3d33c3dfe3..7bbce2fdc5 100644 --- a/src/frontends/qt2/ui/QPrefAsciiModule.ui +++ b/src/frontends/qt2/ui/QPrefAsciiModule.ui @@ -1,7 +1,7 @@ QPrefAsciiModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefColorsModule.ui b/src/frontends/qt2/ui/QPrefColorsModule.ui index 0819da0ac4..78498b8b97 100644 --- a/src/frontends/qt2/ui/QPrefColorsModule.ui +++ b/src/frontends/qt2/ui/QPrefColorsModule.ui @@ -1,7 +1,7 @@ QPrefColorsModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefConvertersModule.ui b/src/frontends/qt2/ui/QPrefConvertersModule.ui index 7e3bf78588..341edcd3a2 100644 --- a/src/frontends/qt2/ui/QPrefConvertersModule.ui +++ b/src/frontends/qt2/ui/QPrefConvertersModule.ui @@ -1,7 +1,7 @@ QPrefConvertersModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefDateModule.ui b/src/frontends/qt2/ui/QPrefDateModule.ui index 37b0a96ee0..8583034a41 100644 --- a/src/frontends/qt2/ui/QPrefDateModule.ui +++ b/src/frontends/qt2/ui/QPrefDateModule.ui @@ -1,7 +1,7 @@ QPrefDateModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefDisplayModule.ui b/src/frontends/qt2/ui/QPrefDisplayModule.ui index 96be072247..3d8e4cfe07 100644 --- a/src/frontends/qt2/ui/QPrefDisplayModule.ui +++ b/src/frontends/qt2/ui/QPrefDisplayModule.ui @@ -1,7 +1,7 @@ QPrefDisplayModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefFileformatsModule.ui b/src/frontends/qt2/ui/QPrefFileformatsModule.ui index b081950bd0..08526caa31 100644 --- a/src/frontends/qt2/ui/QPrefFileformatsModule.ui +++ b/src/frontends/qt2/ui/QPrefFileformatsModule.ui @@ -1,7 +1,7 @@ QPrefFileformatsModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefKeyboardModule.ui b/src/frontends/qt2/ui/QPrefKeyboardModule.ui index 45d9887871..e01f3ed0ad 100644 --- a/src/frontends/qt2/ui/QPrefKeyboardModule.ui +++ b/src/frontends/qt2/ui/QPrefKeyboardModule.ui @@ -1,7 +1,7 @@ QPrefKeyboardModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefLanguageModule.ui b/src/frontends/qt2/ui/QPrefLanguageModule.ui index 282eff5593..f3de980084 100644 --- a/src/frontends/qt2/ui/QPrefLanguageModule.ui +++ b/src/frontends/qt2/ui/QPrefLanguageModule.ui @@ -1,7 +1,7 @@ QPrefLanguageModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefLatexModule.ui b/src/frontends/qt2/ui/QPrefLatexModule.ui index b141cdb540..3e3ab00aa8 100644 --- a/src/frontends/qt2/ui/QPrefLatexModule.ui +++ b/src/frontends/qt2/ui/QPrefLatexModule.ui @@ -1,7 +1,7 @@ QPrefLatexModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefPathsModule.ui b/src/frontends/qt2/ui/QPrefPathsModule.ui index 1a2af78967..2f727fd76b 100644 --- a/src/frontends/qt2/ui/QPrefPathsModule.ui +++ b/src/frontends/qt2/ui/QPrefPathsModule.ui @@ -1,7 +1,7 @@ QPrefPathsModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefPrinterModule.ui b/src/frontends/qt2/ui/QPrefPrinterModule.ui index 379b8469c9..3253fb1ae1 100644 --- a/src/frontends/qt2/ui/QPrefPrinterModule.ui +++ b/src/frontends/qt2/ui/QPrefPrinterModule.ui @@ -1,7 +1,7 @@ QPrefPrinterModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui index 0940587b4e..7fd2edd6e4 100644 --- a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui +++ b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui @@ -1,7 +1,7 @@ QPrefScreenFontsModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui b/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui index ddf38e2971..7b9e1242db 100644 --- a/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui +++ b/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui @@ -1,7 +1,7 @@ QPrefSpellcheckerModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefUIModule.ui b/src/frontends/qt2/ui/QPrefUIModule.ui index 4c6cdeb51d..9da3cc4253 100644 --- a/src/frontends/qt2/ui/QPrefUIModule.ui +++ b/src/frontends/qt2/ui/QPrefUIModule.ui @@ -1,7 +1,7 @@ QPrefUIModule config.h -gettext.h +qt_helpers.h QWidget diff --git a/src/frontends/qt2/ui/QPrefsDialog.ui b/src/frontends/qt2/ui/QPrefsDialog.ui index f6d13b14a1..9f46511f6b 100644 --- a/src/frontends/qt2/ui/QPrefsDialog.ui +++ b/src/frontends/qt2/ui/QPrefsDialog.ui @@ -1,7 +1,7 @@ QPrefsDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QPrintDialog.ui b/src/frontends/qt2/ui/QPrintDialog.ui index e93ba08090..458a84d8f5 100644 --- a/src/frontends/qt2/ui/QPrintDialog.ui +++ b/src/frontends/qt2/ui/QPrintDialog.ui @@ -1,7 +1,7 @@ QPrintDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QRefDialog.ui b/src/frontends/qt2/ui/QRefDialog.ui index ac388b5159..6d2741185b 100644 --- a/src/frontends/qt2/ui/QRefDialog.ui +++ b/src/frontends/qt2/ui/QRefDialog.ui @@ -1,7 +1,7 @@ QRefDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QSearchDialog.ui b/src/frontends/qt2/ui/QSearchDialog.ui index 56189d77c5..0190d39752 100644 --- a/src/frontends/qt2/ui/QSearchDialog.ui +++ b/src/frontends/qt2/ui/QSearchDialog.ui @@ -1,7 +1,7 @@ QSearchDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QSendtoDialog.ui b/src/frontends/qt2/ui/QSendtoDialog.ui index ba6d0f657c..1537b28b84 100644 --- a/src/frontends/qt2/ui/QSendtoDialog.ui +++ b/src/frontends/qt2/ui/QSendtoDialog.ui @@ -1,7 +1,7 @@ QSendtoDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QShowFileDialog.ui b/src/frontends/qt2/ui/QShowFileDialog.ui index a5ff96c31b..3144f195a4 100644 --- a/src/frontends/qt2/ui/QShowFileDialog.ui +++ b/src/frontends/qt2/ui/QShowFileDialog.ui @@ -1,7 +1,7 @@ QShowFileDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QSpellcheckerDialog.ui b/src/frontends/qt2/ui/QSpellcheckerDialog.ui index d9bcd90bc8..ca9351deaa 100644 --- a/src/frontends/qt2/ui/QSpellcheckerDialog.ui +++ b/src/frontends/qt2/ui/QSpellcheckerDialog.ui @@ -1,7 +1,7 @@ QSpellcheckerDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QTabularCreateDialog.ui b/src/frontends/qt2/ui/QTabularCreateDialog.ui index 79da1999ea..2f7b63b09d 100644 --- a/src/frontends/qt2/ui/QTabularCreateDialog.ui +++ b/src/frontends/qt2/ui/QTabularCreateDialog.ui @@ -1,7 +1,7 @@ QTabularCreateDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QTabularDialog.ui b/src/frontends/qt2/ui/QTabularDialog.ui index a404e8c304..3ef939529d 100644 --- a/src/frontends/qt2/ui/QTabularDialog.ui +++ b/src/frontends/qt2/ui/QTabularDialog.ui @@ -1,7 +1,7 @@ QTabularDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QTexinfoDialog.ui b/src/frontends/qt2/ui/QTexinfoDialog.ui index f770ee825b..fd865f8bd8 100644 --- a/src/frontends/qt2/ui/QTexinfoDialog.ui +++ b/src/frontends/qt2/ui/QTexinfoDialog.ui @@ -1,7 +1,7 @@ QTexinfoDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QThesaurusDialog.ui b/src/frontends/qt2/ui/QThesaurusDialog.ui index 747ce98d28..20c45acf04 100644 --- a/src/frontends/qt2/ui/QThesaurusDialog.ui +++ b/src/frontends/qt2/ui/QThesaurusDialog.ui @@ -1,7 +1,7 @@ QThesaurusDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QTocDialog.ui b/src/frontends/qt2/ui/QTocDialog.ui index 008a90af21..854aaaa962 100644 --- a/src/frontends/qt2/ui/QTocDialog.ui +++ b/src/frontends/qt2/ui/QTocDialog.ui @@ -1,7 +1,7 @@ QTocDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QURLDialog.ui b/src/frontends/qt2/ui/QURLDialog.ui index 6e75fbf2c8..82651ecac4 100644 --- a/src/frontends/qt2/ui/QURLDialog.ui +++ b/src/frontends/qt2/ui/QURLDialog.ui @@ -1,7 +1,7 @@ QURLDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QVCLogDialog.ui b/src/frontends/qt2/ui/QVCLogDialog.ui index 7eb002275b..074e1a7742 100644 --- a/src/frontends/qt2/ui/QVCLogDialog.ui +++ b/src/frontends/qt2/ui/QVCLogDialog.ui @@ -1,7 +1,7 @@ QVCLogDialogBase config.h -gettext.h +qt_helpers.h QDialog diff --git a/src/frontends/qt2/ui/QWrapDialog.ui b/src/frontends/qt2/ui/QWrapDialog.ui index d85b64957b..ddf6d1a4ce 100644 --- a/src/frontends/qt2/ui/QWrapDialog.ui +++ b/src/frontends/qt2/ui/QWrapDialog.ui @@ -1,7 +1,7 @@ QWrapDialogBase config.h -gettext.h +qt_helpers.h vspace.h QDialog -- 2.39.2