KDE patch from John

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1119 a592a061-630c-0410-9148-cb99ea01b6c8

ChangeLog

@@ -1,3 +1,13 @@
+2000-10-13  John Levon  <moz@compsoc.man.ac.uk>
+
+	* 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  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* src/support/lyxfunctional.h (void_class_fun_t): fix name of
@@ -11,7 +21,6 @@
 	returns added, const versions of back_inseter_fun and compare_fun
 	added.	
 
-
 2000-10-13  Angus Leeming <a.leeming@ic.ac.uk>
 
 	* src/frontends/xforms/FormInset.C (showInset): fix typo.

src/frontends/gnome/Makefile.am

@@ -10,7 +10,6 @@ libgnome_la_OBJADD = \
         ../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 @@ libgnome_la_OBJADD = \
 	../xforms/form_graphics.lo \
 	../xforms/FormIndex.lo \
 	../xforms/form_index.lo \
+	../xforms/FormInset.lo \
 	../xforms/FormParagraph.lo \
 	../xforms/form_paragraph.lo \
 	../xforms/FormPreferences.lo \

src/frontends/kde/FormCitation.C

@@ -72,6 +72,14 @@ void FormCitation::createCitation(string const & arg)
 
 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::down()
  
 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::select_key(const char *key)
  
 void FormCitation::highlight_key(const char *key)
 {
+	if (readonly)
+		return;
+
 	selectedKey.erase();
 	selectedKey = key;
 
@@ -338,9 +352,6 @@ void FormCitation::highlight_key(const char *key)
 			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 @@ void FormCitation::highlight_chosen(const char *key)
 				dialog_->entry->setText(keys[i].second.c_str());
 			dialog_->keys->clearFocus();
 			dialog_->keys->clearSelection();
-			dialog_->add->setEnabled(false);
 			selectedKey.erase();
 			break;
 		}

src/frontends/kde/FormIndex.C

@@ -54,7 +54,7 @@ void FormIndex::showIndex(InsetCommand * const inset)
  
 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 @@ void FormIndex::update(bool switched)
 	}
 
 	dialog_->setIndexText(params.getContents().c_str());
-//	dialog_->setReadOnly(readonly);
+	dialog_->setReadOnly(readonly);
 }
  
 void FormIndex::apply()
@@ -93,11 +93,7 @@ void FormIndex::apply()
 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));

src/frontends/kde/Makefile.am

@@ -22,13 +22,13 @@ DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 
 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 \