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
This commit is contained in:
John Levon 2003-01-04 21:42:59 +00:00
parent 9dccd39bd2
commit 7137b48f46
4 changed files with 14 additions and 4 deletions

View File

@ -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.

View File

@ -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

View File

@ -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)) {

View File

@ -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();
}