Small patches to let KDE (and hopefully Gnome, but untested) build again,
and also some readonly stuff for the KDE dialogs.
Two small bugs (?) I noticed :
1) with ro documents, Insert->Cross Reference is still selectable
2) behaviour change - when entering new reference entries in the
bibliography (pressing return) there is no longer a default name of "2",
"3" etc. - the names are blank instead ... old behaviour I checked on
1.0.4 (yep that's the latest installed on these university machines ;)
thanks
john
--
"I think there is a world market for maybe five computers."
- Thomas Watson, IBM Chairman, 1943
diff -u -r1.607 ChangeLog
--- ChangeLog 2000/10/13 13:14:07 1.607
+++ ChangeLog 2000/10/13 14:24:42
@@ -1,3 +1,13 @@
+2000-10-13 John Levon <[EMAIL PROTECTED]>
+
+ * src/frontends/gnome/Makefile.am:
+ * src/frontends/kde/Makefile.am: FormCommand.C
+ disappeared from xforms
+
+ * src/frontends/kde/FormCitation.C:
+ * src/frontends/kde/FormIndex.C: read-only
+ correctness
+
2000-10-13 Angus Leeming <[EMAIL PROTECTED]>
* src/frontends/xforms/FormInset.C (showInset): fix typo.
Index: src/frontends/gnome/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- src/frontends/gnome/Makefile.am 2000/10/12 15:17:42 1.12
+++ src/frontends/gnome/Makefile.am 2000/10/13 14:24:42
@@ -10,7 +10,6 @@
../xforms/FormBase.lo \
../xforms/FormCitation.lo \
../xforms/form_citation.lo \
- ../xforms/FormCommand.lo \
../xforms/FormDocument.lo \
../xforms/form_document.lo \
../xforms/FormError.lo \
@@ -19,6 +18,7 @@
../xforms/form_graphics.lo \
../xforms/FormIndex.lo \
../xforms/form_index.lo \
+ ../xforms/FormInset.lo \
../xforms/FormParagraph.lo \
../xforms/form_paragraph.lo \
../xforms/FormPreferences.lo \
Index: src/frontends/kde/FormCitation.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/FormCitation.C,v
retrieving revision 1.4
diff -u -r1.4 FormCitation.C
--- src/frontends/kde/FormCitation.C 2000/10/13 05:57:04 1.4
+++ src/frontends/kde/FormCitation.C 2000/10/13 14:24:42
@@ -72,6 +72,14 @@
void FormCitation::updateButtons()
{
+ if (readonly) {
+ dialog_->add->setEnabled(false);
+ dialog_->remove->setEnabled(false);
+ dialog_->up->setEnabled(false);
+ dialog_->down->setEnabled(false);
+ return;
+ }
+
bool ischosenkey = !selectedChosenKey.empty();
vector<string>::const_iterator iter =
@@ -316,6 +324,9 @@
void FormCitation::select_key(const char *key)
{
+ if (readonly)
+ return;
+
vector<string>::const_iterator iter =
find(chosenkeys.begin(), chosenkeys.end(), key);
@@ -330,6 +341,9 @@
void FormCitation::highlight_key(const char *key)
{
+ if (readonly)
+ return;
+
selectedKey.erase();
selectedKey = key;
@@ -338,9 +352,6 @@
dialog_->entry->setText(keys[i].second.c_str());
dialog_->chosen->clearFocus();
dialog_->chosen->clearSelection();
- dialog_->up->setEnabled(false);
- dialog_->down->setEnabled(false);
- dialog_->remove->setEnabled(false);
selectedChosenKey.erase();
break;
}
@@ -362,7 +373,6 @@
dialog_->entry->setText(keys[i].second.c_str());
dialog_->keys->clearFocus();
dialog_->keys->clearSelection();
- dialog_->add->setEnabled(false);
selectedKey.erase();
break;
}
Index: src/frontends/kde/FormIndex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/FormIndex.C,v
retrieving revision 1.3
diff -u -r1.3 FormIndex.C
--- src/frontends/kde/FormIndex.C 2000/10/13 05:57:05 1.3
+++ src/frontends/kde/FormIndex.C 2000/10/13 14:24:42
@@ -54,7 +54,7 @@
void FormIndex::createIndex(string const & arg)
{
- // we could already be showing a URL, clear it out
+ // we could already be showing an index entry, clear it out
if (inset_)
close();
@@ -71,7 +71,7 @@
}
dialog_->setIndexText(params.getContents().c_str());
-// dialog_->setReadOnly(readonly);
+ dialog_->setReadOnly(readonly);
}
void FormIndex::apply()
@@ -93,11 +93,7 @@
void FormIndex::show()
{
if (!dialog_)
-#if 1
dialog_ = new FormIndexDialog(this, 0, _("LyX: Index"));
-#else
- dialog_ = new FormIndexDialog(this, 0, _("LyX: Index"), false);
-#endif
if (!dialog_->isVisible()) {
h_ = d_->hideBufferDependent.connect(slot(this, &FormIndex::hide));
Index: src/frontends/kde/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- src/frontends/kde/Makefile.am 2000/10/13 08:44:10 1.15
+++ src/frontends/kde/Makefile.am 2000/10/13 14:24:42
@@ -22,13 +22,13 @@
libkde_la_OBJADD = \
../xforms/FormBase.lo \
- ../xforms/FormCommand.lo \
../xforms/FormDocument.lo \
../xforms/form_document.lo \
../xforms/FormError.lo \
../xforms/form_error.lo \
../xforms/FormGraphics.lo \
../xforms/form_graphics.lo \
+ ../xforms/FormInset.lo \
../xforms/FormParagraph.lo \
../xforms/form_paragraph.lo \
../xforms/FormPreferences.lo \
