The attached patch addresses two of these tasks.
Angus Leeming wrote:
> FYI, this is a list of those things that should still be addressed before
> we can say that the port to Windows is finished:
>
> * backport the just-committed changes to the 1.3.x branch.
>
> * address those things that have broken compilation with MSVC
> (1.4.x only).
Finished the other day.
> * add configure code to pass the -DQT_DLL code to the compiler when
> compiling with mingw only when using the qt3.dll, not when linking
> statically to this library.
>
> * disable the spell checker menu/toolbar items if none of USE_[AIP]SPELL
> is defined in config.h.
>
> * disable the combox to choose the name of the ispell executatble
> (aspell, ispell, pspell) in the preferences dialog if USE_ISPELL is not
> defined.
These two are addressed by the attached patch.
> * Prevent the user from inputting a "file with spaces" in the bibtex
> external, graphics and input dialogs if lyxrc.tex_allows_spaces is false.
> Preliminary patch for Qt finished.
--
Angus
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2167
diff -u -p -r1.2167 ChangeLog
--- src/ChangeLog 2 May 2005 21:19:17 -0000 1.2167
+++ src/ChangeLog 4 May 2005 20:21:39 -0000
@@ -1,3 +1,8 @@
+2005-05-04 Angus Leeming <[EMAIL PROTECTED]>
+
+ * lyxfunc.C (getStatus): disable the spell checker dialog if
+ none of USE_[AIP]SPELL are defined.
+
2005-05-02 Angus Leeming <[EMAIL PROTECTED]>
* buffer.C: protect the #include of utime.h with a preprocessor
Index: src/lyx_cb.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_cb.C,v
retrieving revision 1.248
diff -u -p -r1.248 lyx_cb.C
--- src/lyx_cb.C 2 May 2005 13:35:29 -0000 1.248
+++ src/lyx_cb.C 4 May 2005 20:21:39 -0000
@@ -44,7 +44,7 @@
#include "support/path.h"
#include "support/systemcall.h"
-#ifdef _WIN32
+#if !defined (HAVE_FORK)
# define fork() -1
#endif
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.652
diff -u -p -r1.652 lyxfunc.C
--- src/lyxfunc.C 19 Apr 2005 09:04:24 -0000 1.652
+++ src/lyxfunc.C 4 May 2005 20:21:41 -0000
@@ -493,10 +493,14 @@ FuncStatus LyXFunc::getStatus(FuncReques
&& lyxrc.print_command != "none";
else if (name == "character" || name == "mathpanel")
enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
- else if (name == "vclog")
- enable = buf->lyxvc().inUse();
else if (name == "latexlog")
enable = IsFileReadable(buf->getLogName().second);
+#if !defined (USE_ASPELL) && !defined (USE_ISPELL) && !defined (USE_PSPELL)
+ else if (name == "spellchecker")
+ enable = false;
+#endif
+ else if (name == "vclog")
+ enable = buf->lyxvc().inUse();
break;
}
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.770
diff -u -p -r1.770 ChangeLog
--- src/frontends/qt2/ChangeLog 4 May 2005 16:42:06 -0000 1.770
+++ src/frontends/qt2/ChangeLog 4 May 2005 20:21:49 -0000
@@ -1,5 +1,8 @@
2005-05-04 Angus Leeming <[EMAIL PROTECTED]>
+ * QPrefsDialog.C (QPrefsDialog): disable the spellCommandCO if
+ USE_ISPELL is not defined.
+
* ui/Makefile.am (CLEANFILES): add *Module.h and *Dialog.h.
2005-05-02 Jürgen Spitzmüller <[EMAIL PROTECTED]>
Index: src/frontends/qt2/QPrefsDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefsDialog.C,v
retrieving revision 1.49
diff -u -p -r1.49 QPrefsDialog.C
--- src/frontends/qt2/QPrefsDialog.C 26 Apr 2005 11:12:18 -0000 1.49
+++ src/frontends/qt2/QPrefsDialog.C 4 May 2005 20:21:50 -0000
@@ -257,7 +257,11 @@ QPrefsDialog::QPrefsDialog(QPrefs * form
connect(pathsModule->tempDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(pathsModule->lyxserverDirED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(pathsModule->pathPrefixED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
+#if defined (USE_ISPELL)
connect(spellcheckerModule->spellCommandCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+#else
+ spellcheckerModule->spellCommandCO->setEnabled(false);
+#endif
connect(spellcheckerModule->altLanguageED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(spellcheckerModule->escapeCharactersED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(spellcheckerModule->persDictionaryED, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.982
diff -u -p -r1.982 ChangeLog
--- src/frontends/xforms/ChangeLog 26 Apr 2005 10:30:23 -0000 1.982
+++ src/frontends/xforms/ChangeLog 4 May 2005 20:21:59 -0000
@@ -1,3 +1,8 @@
+2005-05-04 Angus Leeming <[EMAIL PROTECTED]>
+
+ * FormPreferences.C (SpellOptions::build): disable the
+ choice_spell_command if USE_ISPELL is not defined.
+
2005-04-25 Angus Leeming <[EMAIL PROTECTED]>
* FormLog.h:
Index: src/frontends/xforms/FormPreferences.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreferences.C,v
retrieving revision 1.199
diff -u -p -r1.199 FormPreferences.C
--- src/frontends/xforms/FormPreferences.C 1 Feb 2005 22:48:23 -0000 1.199
+++ src/frontends/xforms/FormPreferences.C 4 May 2005 20:22:03 -0000
@@ -2990,6 +2990,10 @@ void FormPreferences::SpellOptions::buil
fl_set_input_return(dialog_->input_escape_chars, FL_RETURN_CHANGED);
fl_set_input_return(dialog_->input_personal_dict, FL_RETURN_CHANGED);
+#if !defined (USE_ISPELL)
+ setEnabled(dialog_->choice_spell_command, false);
+#endif
+
// set up the feedback mechanism
setPrehandler(dialog_->choice_spell_command);
setPrehandler(dialog_->check_alt_lang);
