fix Q include dialog

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 9cb60393bb6bfa09a79e4519d1b59f06bdba225b..75912fa3086bdaea4eb593aaa088ddcbdf1516b0 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-07  John Levon  <levon@movementarian.org>
+
+       * ui/QIncludeDialog.ui:
+       * QInclude.C: fix setting of combobox
+ 
 2002-11-07  John Levon  <levon@movementarian.org>
 
        * ui/QPref*: add initial prefs ui from Juergen S

diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C
index 09238f778c911886c4bfbb80bdd4df7ac17e9276..032a1016f813ef2234824a6b9f127b952f7b00f4 100644 (file)
--- a/src/frontends/qt2/QInclude.C
+++ b/src/frontends/qt2/QInclude.C
@@ -56,19 +56,25 @@ void QInclude::update_contents()
 
        dialog_->filenameED->setText(params.cparams.getContents().c_str());
 
-       string const & cmdname = params.cparams.getCmdName();
-
        dialog_->visiblespaceCB->setChecked(false);
        dialog_->visiblespaceCB->setEnabled(false);
 
-       if (cmdname == "input")
-               dialog_->typeCO->setCurrentItem(0);
-       else if (!cmdname.empty()) {
-               dialog_->typeCO->setCurrentItem(2);
-               dialog_->visiblespaceCB->setChecked(cmdname == "verbatiminput*");
-               dialog_->visiblespaceCB->setEnabled(true);
-       } else {
-               dialog_->typeCO->setCurrentItem(1);
+       switch (params.flag) {
+               case InsetInclude::INPUT:
+                       dialog_->typeCO->setCurrentItem(0);
+                       break;
+
+               case InsetInclude::INCLUDE:
+                       dialog_->typeCO->setCurrentItem(1);
+                       break;
+
+               case InsetInclude::VERBAST:
+                       dialog_->visiblespaceCB->setChecked(true);
+                       /* fall through */
+               case InsetInclude::VERB:
+                       dialog_->typeCO->setCurrentItem(2);
+                       dialog_->visiblespaceCB->setEnabled(true);
+                       break;
        }
 }
 

diff --git a/src/frontends/qt2/ui/QIncludeDialog.ui b/src/frontends/qt2/ui/QIncludeDialog.ui
index 4ae1ae7c2be215e2ed68d91de56f7ba016e4dc67..b072afe7a5e0267dbfe59cb45496551fe6846930 100644 (file)
--- a/src/frontends/qt2/ui/QIncludeDialog.ui
+++ b/src/frontends/qt2/ui/QIncludeDialog.ui
@@ -310,6 +310,12 @@
         <receiver>QIncludeDialogBase</receiver>
         <slot>browseClicked()</slot>
     </connection>
+    <connection>
+        <sender>typeCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>QIncludeDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
     <connection>
         <sender>typeCO</sender>
         <signal>activated(int)</signal>