* src/frontends/qt4/GuiGraphics.{cpp,h}:

* src/frontends/qt4/ui/GraphicsUi.ui:
	- now that we have a context menu to edit graphics, remove the Edit button
	  from the dialog, as discussed in this thread:
	  http://marc.info/?l=lyx-devel&m=118344997913166&w=2

The same should be done for other insets that have an edit function.

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

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index a7398a17b71992dc254acd76f610ae8f80ccf297..107813006f28a8378633b12c98666fd63f93392b 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -282,15 +282,8 @@ void GuiGraphics::on_getPB_clicked()
 }
 
 
-void GuiGraphics::on_editPB_clicked()
-{
-       editGraphics();
-}
-
-
 void GuiGraphics::on_filename_textChanged(const QString & filename)
 {
-       editPB->setDisabled(filename.isEmpty());
        EmbeddedFile file = EmbeddedFile(fromqstr(filename), fromqstr(bufferFilepath()));
 }
 
@@ -570,9 +563,6 @@ void GuiGraphics::updateContents()
        else
                origin->setCurrentIndex(0);
 
-       // disable edit button when no filename is present
-       editPB->setDisabled(filename->text().isEmpty());
-
        //// latex section
        latexoptions->setText(toqstr(igp.special));
 }
@@ -788,15 +778,6 @@ bool GuiGraphics::isFilenameValid(string const & fname) const
 }
 
 
-void GuiGraphics::editGraphics()
-{
-       applyView();
-       string const lfun =
-               InsetGraphicsMailer::params2string(params_, buffer());
-       dispatch(FuncRequest(LFUN_GRAPHICS_EDIT, lfun));
-}
-
-
 namespace {
 
 char const * const bb_units[] = { "bp", "cm", "mm", "in" };

diff --git a/src/frontends/qt4/GuiGraphics.h b/src/frontends/qt4/GuiGraphics.h
index 2e8e2235e00b14d6dc23180c510a6b404442ec8e..0e7cb946d4c7ee1194b6b9b07769e738a6bd0e65 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.h
+++ b/src/frontends/qt4/GuiGraphics.h
@@ -45,7 +45,6 @@ private Q_SLOTS:
        void change_bb();
        void on_browsePB_clicked();
        void on_getPB_clicked();
-       void on_editPB_clicked();
        void on_filename_textChanged(const QString &);
        void on_scaleCB_toggled(bool);
        void on_WidthCB_toggled(bool);
@@ -81,8 +80,6 @@ private:
        bool bbChanged;
        /// test if file exist
        bool isFilenameValid(std::string const & fname) const;
-       /// edit file
-       void editGraphics();
 
 private:
        ///

diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui
index a921de4423b7b7b5145b4808379ac5bb2dea16dd..2a441685167e0247e3f1e7482f9e4d237c678e32 100644 (file)
--- a/src/frontends/qt4/ui/GraphicsUi.ui
+++ b/src/frontends/qt4/ui/GraphicsUi.ui
@@ -56,19 +56,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="3" >
-        <widget class="QPushButton" name="editPB" >
-         <property name="text" >
-          <string>&amp;Edit</string>
-         </property>
-         <property name="autoDefault" >
-          <bool>false</bool>
-         </property>
-         <property name="default" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="2" >
         <widget class="QPushButton" name="browsePB" >
          <property name="toolTip" >
@@ -751,7 +738,6 @@
   <tabstop>TabWidget</tabstop>
   <tabstop>filename</tabstop>
   <tabstop>browsePB</tabstop>
-  <tabstop>editPB</tabstop>
   <tabstop>scaleCB</tabstop>
   <tabstop>Scale</tabstop>
   <tabstop>WidthCB</tabstop>