From 7137b48f46ecce77480539c757e3b62154c2e577 Mon Sep 17 00:00:00 2001 From: John Levon Date: Sat, 4 Jan 2003 21:42:59 +0000 Subject: [PATCH] Juergen's URL patch, a couple of other fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5903 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 9 +++++++++ src/frontends/qt2/FileDialog.C | 5 +++-- src/frontends/qt2/QBibtex.C | 2 +- src/frontends/qt2/QURL.C | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 566a79313e..dff517b248 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,12 @@ +2003-01-04 Juergen Spitzmueller + + * QURL.C: isValid(): fix validation. + +2002-12-21 John Levon + + * FileDialog.C: + * QBibtex.C: fix mis-use of conversions to QString + 2003-01-02 Juergen Spitzmueller * QCitationDialog.C: update dialog correctly on search. diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C index 90f358615f..fc53055d5c 100644 --- a/src/frontends/qt2/FileDialog.C +++ b/src/frontends/qt2/FileDialog.C @@ -20,6 +20,7 @@ #include "FileDialog_private.h" #include "debug.h" #include "qt_helpers.h" +#include "gettext.h" #include @@ -57,7 +58,7 @@ FileDialog::Result const FileDialog::save(string const & path, { string filter(mask); if (mask.empty()) - filter = qt_("All files (*)"); + filter = _("All files (*)"); LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2); lyxerr[Debug::GUI] << "Select with path \"" << path @@ -87,7 +88,7 @@ FileDialog::Result const FileDialog::open(string const & path, { string filter(mask); if (mask.empty()) - filter = qt_("*|All files"); + filter = _("*|All files"); LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2); lyxerr[Debug::GUI] << "Select with path \"" << path diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index 496fdaee48..f0a5b88dea 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -76,7 +76,7 @@ void QBibtex::update_contents() } string bibtotoc = "bibtotoc"; - string bibstyle(toqstr(controller().params().getOptions())); + string bibstyle(controller().params().getOptions()); // bibtotoc exists? if (prefixIs(bibstyle, bibtotoc)) { diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C index 55670f180a..a7f7deccef 100644 --- a/src/frontends/qt2/QURL.C +++ b/src/frontends/qt2/QURL.C @@ -76,5 +76,5 @@ bool QURL::isValid() string const u(fromqstr(dialog_->urlED->text())); string const n(fromqstr(dialog_->nameED->text())); - return !u.empty() && !n.empty(); + return !u.empty() || !n.empty(); } -- 2.39.2