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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 566a79313ea1155b9ff8f72d39e274d345ba980d..dff517b2480148a8a41a9a41f1d68c227f79dc26 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-04  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
+ 
+       * QURL.C: isValid(): fix validation. 
+ 
+2002-12-21  John Levon  <levon@movementarian.org>
+
+       * FileDialog.C:
+       * QBibtex.C: fix mis-use of conversions to QString
+
 2003-01-02  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
        * QCitationDialog.C: update dialog correctly on search.

diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C
index 90f358615f3f31142273caafdeefda5988d98ebe..fc53055d5c9c1161dd283ea410778686e0bb0b68 100644 (file)
--- 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 <qapplication.h>
 
@@ -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 496fdaee48eca1c8aaa5d43793d91ef14591f851..f0a5b88dea659bf42d4c9ed5945ed9f511f7f4ee 100644 (file)
--- 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 55670f180a935d91422451e3be56f596921dfd27..a7f7deccefc22eb73ff20af336e562e9fe1abaaa 100644 (file)
--- 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();
 }