Jean-Marc Lasgouttes wrote:
> Angus> I see that bugzilla comes up with five bugs in the 1.3.x
> Angus> series: http://tinyurl.com/7aghm
>
> Some of these would be very easy to fix.
Well, here's a fix to bug 1272
http://bugzilla.lyx.org/show_bug.cgi?id=1272
I can confirm that the change to the controller doesn't break the XForms
interface.
--
Angus
Index: src/frontends/qt2/QExternalDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QExternalDialog.C,v
retrieving revision 1.9.2.3
diff -u -p -r1.9.2.3 QExternalDialog.C
--- src/frontends/qt2/QExternalDialog.C 7 Dec 2004 10:49:10 -0000 1.9.2.3
+++ src/frontends/qt2/QExternalDialog.C 23 May 2005 15:47:47 -0000
@@ -15,7 +15,6 @@
#include <qwidget.h>
#include <qpushbutton.h>
-#include <qfiledialog.h>
#include <qcombobox.h>
#include <qtextview.h>
#include <qlineedit.h>
@@ -80,15 +79,10 @@ void QExternalDialog::updateClicked()
void QExternalDialog::browseClicked()
{
- QString file =
- QFileDialog::getOpenFileName(QString::null,
- qt_("External material (*)"),
- this, 0,
- qt_("Select external material"));
- if (!file.isNull()) {
- fileED->setText(file);
- form_->changed();
- }
+ string const str =
+ form_->controller().Browse(fromqstr(fileED->text()));
+ fileED->setText(toqstr(str));
+ form_->changed();
}
Index: src/frontends/controllers/ControlExternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlExternal.C,v
retrieving revision 1.32.2.2
diff -u -p -r1.32.2.2 ControlExternal.C
--- src/frontends/controllers/ControlExternal.C 23 May 2005 15:01:10 -0000 1.32.2.2
+++ src/frontends/controllers/ControlExternal.C 23 May 2005 15:47:48 -0000
@@ -144,9 +144,6 @@ string const ControlExternal::Browse(str
if (pattern.empty())
pattern = "*";
- // FIXME: a temporary hack until the FileDialog interface is updated
- pattern += '|';
-
std::pair<string, string> dir1(N_("Documents|#o#O"),
string(lyxrc.document_path));
Index: src/frontends/qt2/QExternalDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QExternalDialog.C,v
retrieving revision 1.9.2.3
diff -u -p -r1.9.2.3 QExternalDialog.C
--- src/frontends/qt2/QExternalDialog.C 7 Dec 2004 10:49:10 -0000 1.9.2.3
+++ src/frontends/qt2/QExternalDialog.C 23 May 2005 15:47:47 -0000
@@ -15,7 +15,6 @@
#include <qwidget.h>
#include <qpushbutton.h>
-#include <qfiledialog.h>
#include <qcombobox.h>
#include <qtextview.h>
#include <qlineedit.h>
@@ -80,15 +79,10 @@ void QExternalDialog::updateClicked()
void QExternalDialog::browseClicked()
{
- QString file =
- QFileDialog::getOpenFileName(QString::null,
- qt_("External material (*)"),
- this, 0,
- qt_("Select external material"));
- if (!file.isNull()) {
- fileED->setText(file);
- form_->changed();
- }
+ string const str =
+ form_->controller().Browse(fromqstr(fileED->text()));
+ fileED->setText(toqstr(str));
+ form_->changed();
}
Index: src/frontends/controllers/ControlExternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlExternal.C,v
retrieving revision 1.32.2.2
diff -u -p -r1.32.2.2 ControlExternal.C
--- src/frontends/controllers/ControlExternal.C 23 May 2005 15:01:10 -0000 1.32.2.2
+++ src/frontends/controllers/ControlExternal.C 23 May 2005 15:47:48 -0000
@@ -144,9 +144,6 @@ string const ControlExternal::Browse(str
if (pattern.empty())
pattern = "*";
- // FIXME: a temporary hack until the FileDialog interface is updated
- pattern += '|';
-
std::pair<string, string> dir1(N_("Documents|#o#O"),
string(lyxrc.document_path));
