Scrap the parameter field from External dialogs.

(John I think the layout of the Qt dialog is "sub-optimal". Sorry.

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 48a1c5abeb9a1f225335031229cd7e23100d9b63..92bb23e13542601528f4fa4ae8e2f0ab72ad6b66 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-04  Angus Leeming  <leeming@lyx.org>
+
+       * QExternal.C
+       * ui/QExternalDialogBase.ui: remove the widget to input the removed
+       InsetExternal::Params::parameters variable.
+
 2003-06-03  Angus Leeming  <leeming@lyx.org>
 
        * Dialogs.C (build): change the External dialog button policy to

diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C
index 01317f831da26ca7ff87bea6759c0adcc76511e4..e9823b2f0c1fc466543f5933d2e023de23854610 100644 (file)
--- a/src/frontends/qt2/QExternal.C
+++ b/src/frontends/qt2/QExternal.C
@@ -62,7 +62,6 @@ void QExternal::update_contents()
        InsetExternal::Params const & params = controller().params();
 
        dialog_->fileED->setText(toqstr(params.filename));
-       dialog_->paramsED->setText(toqstr(params.parameters));
 
        dialog_->externalCO->setCurrentItem(controller().getTemplateNumber(params.templ.lyxName));
        dialog_->externalTV->setText(toqstr(params.templ.helpText));
@@ -100,7 +99,6 @@ void QExternal::apply()
        InsetExternal::Params params = controller().params();
 
        params.filename = fromqstr(dialog_->fileED->text());
-       params.parameters = fromqstr(dialog_->paramsED->text());
 
        params.templ = controller().getTemplate(dialog_->externalCO->currentItem());
 

diff --git a/src/frontends/qt2/ui/QExternalDialogBase.ui b/src/frontends/qt2/ui/QExternalDialogBase.ui
index 9bd5ad1658632f128057ea3c2e50990b65ca2013..817e7db8792c95ead48de0ca4af81d3898f3583a 100644 (file)
--- a/src/frontends/qt2/ui/QExternalDialogBase.ui
+++ b/src/frontends/qt2/ui/QExternalDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>349</width>
+            <width>345</width>
             <height>514</height>
         </rect>
     </property>
@@ -34,134 +34,7 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="0"  column="1"  rowspan="1"  colspan="2" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>externalCO</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Available templates</string>
-            </property>
-        </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="3" >
-            <class>QTextView</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>externalTV</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>LaTeX error messages</string>
-            </property>
-        </widget>
-        <widget row="0"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>templateLA</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;Template:</string>
-            </property>
-            <property>
-                <name>buddy</name>
-                <cstring>externalCO</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Available templates</string>
-            </property>
-        </widget>
-        <widget row="2"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>fileED</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Filename</string>
-            </property>
-        </widget>
-        <widget row="3"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>paramsED</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Parameters</string>
-            </property>
-        </widget>
-        <widget row="3"  column="2" >
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>editPB</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;Edit file</string>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Edit the file externally</string>
-            </property>
-        </widget>
-        <widget row="2"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>fileLA</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;File:</string>
-            </property>
-            <property>
-                <name>buddy</name>
-                <cstring>fileED</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Filename</string>
-            </property>
-        </widget>
-        <widget row="2"  column="2" >
-            <class>QPushButton</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>browsePB</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;Browse...</string>
-            </property>
-        </widget>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>paramsLA</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;Parameters:</string>
-            </property>
-            <property>
-                <name>buddy</name>
-                <cstring>paramsED</cstring>
-            </property>
-            <property>
-                <name>toolTip</name>
-                <string>Parameters</string>
-            </property>
-        </widget>
-        <widget row="4"  column="0"  rowspan="1"  colspan="3" >
+        <widget row="2"  column="0"  rowspan="1"  colspan="2" >
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
@@ -379,7 +252,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="3" >
+        <widget row="0"  column="0" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -396,7 +269,7 @@
                 </property>
             </hbox>
         </widget>
-        <widget row="6"  column="0"  rowspan="1"  colspan="3" >
+        <widget row="3"  column="0"  rowspan="1"  colspan="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -483,6 +356,171 @@
                 </widget>
             </hbox>
         </widget>
+        <widget row="1"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout8</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>fileLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;File:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>fileED</cstring>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Filename</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>fileED</cstring>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Filename</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="1"  column="1" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout10</cstring>
+            </property>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>browsePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Browse...</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>editPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Edit file</string>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Edit the file externally</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+        <widget row="0"  column="0"  rowspan="1"  colspan="2" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout12</cstring>
+            </property>
+            <grid>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget row="0"  column="0" >
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout11</cstring>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>templateLA</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Template:</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>externalCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Available templates</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QComboBox</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>externalCO</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Available templates</string>
+                            </property>
+                        </widget>
+                    </hbox>
+                </widget>
+                <widget row="1"  column="0" >
+                    <class>QTextView</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>externalTV</cstring>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>LaTeX error messages</string>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
     </grid>
 </widget>
 <connections>
@@ -510,12 +548,6 @@
         <receiver>QExternalDialogBase</receiver>
         <slot>browseClicked()</slot>
     </connection>
-    <connection>
-        <sender>paramsED</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>QExternalDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
     <connection>
         <sender>displayCB</sender>
         <signal>toggled(bool)</signal>
@@ -556,7 +588,6 @@
 <tabstops>
     <tabstop>fileED</tabstop>
     <tabstop>browsePB</tabstop>
-    <tabstop>paramsED</tabstop>
     <tabstop>editPB</tabstop>
     <tabstop>externalCO</tabstop>
     <tabstop>externalTV</tabstop>

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 3a6517cb7c3d2f8c44399a72b2fb72e9e9ab088a..150de74c94781cbd892f6c6365c331ea24c680ad 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-04  Angus Leeming  <leeming@lyx.org>
+
+       * FormExternal.C
+       * forms/form_external: remove the widget to input the removed
+       InsetExternal::Params::parameters variable.
+
 2003-06-04  John Levon  <levon@movementarian.org>
 
        * FormTabular.C: fix a crash on applying changes

diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index 3155021b3ab3fadeee347ba6fc3e5ca648e771ba..0a5e0e03bc6de2cdeb57da7956af7f8b3ba9a4c9 100644 (file)
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -40,13 +40,10 @@ void FormExternal::apply()
        InsetExternal::Params params = controller().params();
 
        params.filename = fl_get_input(dialog_->input_filename);
-       params.parameters = fl_get_input(dialog_->input_parameters);
 
        int const choice = fl_get_choice(dialog_->choice_template) - 1;
        params.templ = controller().getTemplate(choice);
 
-       params.parameters = fl_get_input(dialog_->input_parameters);
-
        params.lyxscale = strToInt(getString(dialog_->input_lyxscale));
        if (params.lyxscale == 0)
                params.lyxscale = 100;
@@ -81,16 +78,13 @@ void FormExternal::build()
        fl_addto_choice(dialog_->choice_template, choice.c_str());
 
        fl_set_input_return (dialog_->input_filename,  FL_RETURN_CHANGED);
-       fl_set_input_return (dialog_->input_parameters, FL_RETURN_CHANGED);
 
        // Disable for read-only documents.
        bcview().addReadOnly(dialog_->input_filename);
        bcview().addReadOnly(dialog_->button_browse);
-       bcview().addReadOnly(dialog_->input_parameters);
 
        // Trigger an input event for cut&paste with middle mouse button.
        setPrehandler(dialog_->input_filename);
-       setPrehandler(dialog_->input_parameters);
 
        // Activate ok/apply immediately upon input.
        fl_set_input_return(dialog_->input_filename, FL_RETURN_CHANGED);
@@ -125,7 +119,6 @@ void FormExternal::update()
        InsetExternal::Params const & params = controller().params();
 
        fl_set_input(dialog_->input_filename, params.filename.c_str());
-       fl_set_input(dialog_->input_parameters, params.parameters.c_str());
 
        int ID = controller().getTemplateNumber(params.templ.lyxName);
        if (ID < 0) ID = 0;

diff --git a/src/frontends/xforms/forms/form_external.fd b/src/frontends/xforms/forms/form_external.fd
index 675dd27789294b88f717e3e472cbd7960e20611e..06da9bc2d5cb6577f2296ee267be58898bc22acd 100644 (file)
--- a/src/frontends/xforms/forms/form_external.fd
+++ b/src/frontends/xforms/forms/form_external.fd
@@ -11,7 +11,7 @@ SnapGrid: 5
 Name: form_external
 Width: 395
 Height: 375
-Number of Objects: 14
+Number of Objects: 13
 
 --------------------
 class: FL_BOX
@@ -67,24 +67,6 @@ name: button_browse
 callback: C_FormDialogView_InputCB
 argument: 0
 
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 90 230 195 25
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Parameters:|#P
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_SouthWest FL_SouthEast
-name: input_parameters
-callback: C_FormDialogView_InputCB
-argument: 0
-
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON