From f8e7fec3d4403185fe8d7559677a08e4be46c394 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Sun, 18 Mar 2007 03:42:40 +0000
Subject: [PATCH] small cleanup of the include dialog: "Include" was for good
 reason the default method but not the first item in the dropdown list.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17467 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/QInclude.C       | 16 ++++++++--------
 src/frontends/qt4/QIncludeDialog.C | 11 ++++++-----
 src/frontends/qt4/ui/QIncludeUi.ui | 14 +++++---------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/frontends/qt4/QInclude.C b/src/frontends/qt4/QInclude.C
index 62a0fac901..c820f33b4a 100644
--- a/src/frontends/qt4/QInclude.C
+++ b/src/frontends/qt4/QInclude.C
@@ -79,13 +79,13 @@ void QInclude::update_contents()
 	    cmdname != "verbatiminput*")
 		cmdname = "input";
 
-	if (cmdname == "input") {
+	if (cmdname == "include") {
 		dialog_->typeCO->setCurrentIndex(0);
-		dialog_->previewCB->setEnabled(true);
-		dialog_->previewCB->setChecked(params.preview());
 
-	} else if (cmdname == "include") {
+	} else if (cmdname == "input") {
 		dialog_->typeCO->setCurrentIndex(1);
+		dialog_->previewCB->setEnabled(true);
+		dialog_->previewCB->setChecked(params.preview());
 
 	} else if (cmdname == "verbatiminput*") {
 		dialog_->typeCO->setCurrentIndex(2);
@@ -108,9 +108,9 @@ void QInclude::apply()
 
 	int const item = dialog_->typeCO->currentIndex();
 	if (item == 0)
-		params.setCmdName("input");
-	else if (item == 1)
 		params.setCmdName("include");
+	else if (item == 1)
+		params.setCmdName("input");
 	else {
 		if (dialog_->visiblespaceCB->isChecked())
 			params.setCmdName("verbatiminput*");
@@ -127,9 +127,9 @@ void QInclude::browse()
 
 	int const item = dialog_->typeCO->currentIndex();
 	if (item == 0)
-		type = ControlInclude::INPUT;
-	else if (item == 1)
 		type = ControlInclude::INCLUDE;
+	else if (item == 1)
+		type = ControlInclude::INPUT;
 	else
 		type = ControlInclude::VERBATIM;
 
diff --git a/src/frontends/qt4/QIncludeDialog.C b/src/frontends/qt4/QIncludeDialog.C
index 379af0fee5..13ccb5834f 100644
--- a/src/frontends/qt4/QIncludeDialog.C
+++ b/src/frontends/qt4/QIncludeDialog.C
@@ -68,19 +68,20 @@ void QIncludeDialog::closeEvent(QCloseEvent * e)
 void QIncludeDialog::typeChanged(int v)
 {
 	switch (v) {
+		//case Include
 		case 0:
 			visiblespaceCB->setEnabled(false);
 			visiblespaceCB->setChecked(false);
-			previewCB->setEnabled(true);
+			previewCB->setEnabled(false);
+			previewCB->setChecked(false);
 			break;
-
+		//case Input
 		case 1:
 			visiblespaceCB->setEnabled(false);
 			visiblespaceCB->setChecked(false);
-			previewCB->setEnabled(false);
-			previewCB->setChecked(false);
+			previewCB->setEnabled(true);
 			break;
-
+		//case Verbatim
 		default:
 			visiblespaceCB->setEnabled(true);
 			previewCB->setEnabled(false);
diff --git a/src/frontends/qt4/ui/QIncludeUi.ui b/src/frontends/qt4/ui/QIncludeUi.ui
index d05cb2d0e4..704c8b5b18 100644
--- a/src/frontends/qt4/ui/QIncludeUi.ui
+++ b/src/frontends/qt4/ui/QIncludeUi.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>QIncludeUi</class>
  <widget class="QDialog" name="QIncludeUi" >
   <property name="geometry" >
@@ -114,12 +111,12 @@
     <widget class="QComboBox" name="typeCO" >
      <item>
       <property name="text" >
-       <string>Input</string>
+       <string>Include</string>
       </property>
      </item>
      <item>
       <property name="text" >
-       <string>Include</string>
+       <string>Input</string>
       </property>
      </item>
      <item>
@@ -207,10 +204,6 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <tabstops>
   <tabstop>filenameED</tabstop>
   <tabstop>browsePB</tabstop>
@@ -221,6 +214,9 @@
   <tabstop>okPB</tabstop>
   <tabstop>closePB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>
-- 
2.39.5