On Fri, Mar 07, 2003 at 04:52:09PM +0100, Jean-Marc Lasgouttes wrote:
>
> I would like to release LyX 1.3.1 next monday. While all the available
> patches are not in yet, I think it is necessary to find a good stopping
> time (as we say in probability theory) and release what we have.
I want to port the following patch to 1.3.1cvs (the patch is against HEAD).
It add 'hspell' option to the list of spell-checkers (hspell is a
spell-checker for Hebrew).
Is it OK ?
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.426
diff -u -p -r1.426 ChangeLog
--- ChangeLog 7 Mar 2003 14:08:08 -0000 1.426
+++ ChangeLog 7 Mar 2003 16:45:59 -0000
@@ -1,3 +1,8 @@
+2003-03-07 Dekel Tsur <[EMAIL PROTECTED]>
+
+ * QPrefs.C:
+ QPrefSpellcheckerModule.ui: Add 'hspell' option.
+
2003-03-07 Angus Leeming <[EMAIL PROTECTED]>
* Dialogs.C:
@@ -83,6 +88,7 @@
* Dialogs3.C: add label dialog.
+>>>>>>> 1.426
2003-03-03 Dekel Tsur <[EMAIL PROTECTED]>
* qfont_loader.C (available): Rewrite as the old version did not
Index: QPrefs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefs.C,v
retrieving revision 1.25
diff -u -p -r1.25 QPrefs.C
--- QPrefs.C 25 Feb 2003 13:35:26 -0000 1.25
+++ QPrefs.C 7 Mar 2003 16:46:00 -0000
@@ -186,10 +186,7 @@ void QPrefs::apply()
QPrefSpellcheckerModule * spellmod(dialog_->spellcheckerModule);
- if (spellmod->spellCommandCO->currentItem() == 0)
- rc.isp_command = "ispell";
- else
- rc.isp_command = "aspell";
+ rc.isp_command = fromqstr(spellmod->spellCommandCO->currentText());
// FIXME: remove isp_use_alt_lang
rc.isp_alt_lang = fromqstr(spellmod->altLanguageED->text());
@@ -448,8 +445,13 @@ void QPrefs::update_contents()
QPrefSpellcheckerModule * spellmod(dialog_->spellcheckerModule);
- item = (rc.isp_command == "ispell") ? 0 : 1;
- spellmod->spellCommandCO->setCurrentItem(item);
+ QString const tmp = qt_(rc.isp_command);
+ for (int i = 0; i < spellmod->spellCommandCO->count(); ++i) {
+ if (spellmod->spellCommandCO->text(i) == tmp) {
+ spellmod->spellCommandCO->setCurrentItem(i);
+ break;
+ }
+ }
// FIXME: remove isp_use_alt_lang
spellmod->altLanguageED->setText(toqstr(rc.isp_alt_lang));
// FIXME: remove isp_use_esc_chars
Index: ui/QPrefSpellcheckerModule.ui
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ui/QPrefSpellcheckerModule.ui,v
retrieving revision 1.5
diff -u -p -r1.5 QPrefSpellcheckerModule.ui
--- ui/QPrefSpellcheckerModule.ui 17 Feb 2003 00:38:40 -0000 1.5
+++ ui/QPrefSpellcheckerModule.ui 7 Mar 2003 16:46:00 -0000
@@ -193,6 +193,12 @@
<string>aspell</string>
</property>
</item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>hspell</string>
+ </property>
+ </item>
<property stdset="1">
<name>name</name>
<cstring>spellCommandCO</cstring>
