Embedding: remove AUTO feature, remove STATUS from embedding dialog

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

diff --git a/src/frontends/qt4/GuiEmbeddedFiles.cpp b/src/frontends/qt4/GuiEmbeddedFiles.cpp
index 60a3cbc7f411faed53367d1685b45419ce0a37d1..0698e7da8ba02ee16ae10a6707f16b3e424116fd 100644 (file)
--- a/src/frontends/qt4/GuiEmbeddedFiles.cpp
+++ b/src/frontends/qt4/GuiEmbeddedFiles.cpp
@@ -104,7 +104,6 @@ void GuiEmbeddedFilesDialog::updateView()
        //
        bool enabled = files.enabled();
        enableCB->setChecked(enabled);
-       statusGB->setEnabled(enabled);
        fullpathLE->setEnabled(enabled);
 }
 
@@ -169,18 +168,6 @@ void GuiEmbeddedFilesDialog::set_embedding_status(bool embed)
 }
 
 
-void GuiEmbeddedFilesDialog::on_embeddedRB_clicked()
-{
-       set_embedding_status(true);
-}
-
-
-void GuiEmbeddedFilesDialog::on_externalRB_clicked()
-{
-       set_embedding_status(false);
-}
-
-
 } // namespace frontend
 } // namespace lyx
 

diff --git a/src/frontends/qt4/GuiEmbeddedFiles.h b/src/frontends/qt4/GuiEmbeddedFiles.h
index fbb990e78d1f1e93c5ba3e28f1c11cc041adbca2..3d98d8f4857f3cf4d786583d27b1553988332002 100644 (file)
--- a/src/frontends/qt4/GuiEmbeddedFiles.h
+++ b/src/frontends/qt4/GuiEmbeddedFiles.h
@@ -37,9 +37,6 @@ public Q_SLOTS:
        ///
        void on_enableCB_toggled(bool enable);
        ///
-       void on_embeddedRB_clicked();
-       void on_externalRB_clicked();
-       ///
        void on_addPB_clicked();
        //
        void on_extractPB_clicked();

diff --git a/src/frontends/qt4/ui/EmbeddedFilesUi.ui b/src/frontends/qt4/ui/EmbeddedFilesUi.ui
index 9c0bb8d5fa87e168bc5ad65fb74cf0e3d5d0286c..bcf320acc858f9b841f04a5db67b695205d325ff 100644 (file)
--- a/src/frontends/qt4/ui/EmbeddedFilesUi.ui
+++ b/src/frontends/qt4/ui/EmbeddedFilesUi.ui
@@ -8,7 +8,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>100</width>
+    <width>145</width>
     <height>390</height>
    </rect>
   </property>
@@ -52,54 +52,6 @@
    <item>
     <widget class="QLineEdit" name="fullpathLE" />
    </item>
-   <item>
-    <widget class="QGroupBox" name="statusGB" >
-     <property name="title" >
-      <string>Status</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QRadioButton" name="autoRB" >
-        <property name="toolTip" >
-         <string>Automatic inclusion</string>
-        </property>
-        <property name="text" >
-         <string>Automatic</string>
-        </property>
-        <property name="autoExclusive" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="embeddedRB" >
-        <property name="text" >
-         <string>Embedded</string>
-        </property>
-        <property name="autoExclusive" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="externalRB" >
-        <property name="text" >
-         <string>External</string>
-        </property>
-        <property name="autoExclusive" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <layout class="QHBoxLayout" >
      <property name="margin" >
@@ -146,6 +98,25 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QToolButton" name="updatePB" >
+       <property name="toolTip" >
+        <string>Update selected file with external files</string>
+       </property>
+       <property name="text" >
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset>../../../../lib/images/copy.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>