lib/Makefile.am: move math icons from no-install

QMathDialog.C: set icon paths
QMathUi.ui: set icon paths to lib/images/math for visual feedback in designer

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 850c68a9ae701c0de55bcf58e60228a6f03a34b0..741819ea825ce1a5d98532b4feb16fa896c93bc5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -32,21 +32,11 @@ dist_noinst_DATA = \
        images/math/delim0.xpm \
        images/math/delim1.xpm \
        images/math/delim.xbm \
-       images/math/delim.xpm \
        images/math/dots.xbm \
-       images/math/equation.xpm \
        images/math/font.xbm \
-       images/math/font.xpm \
        images/math/frac-square.xpm \
        images/math/greek.xbm \
-       images/math/matrix.xpm \
        images/math/misc.xbm \
-       images/math/space.xpm \
-       images/math/sqrt-square.xpm \
-       images/math/style.xbm \
-       images/math/style.xpm \
-       images/math/sub.xpm \
-       images/math/super.xpm \
        images/math/varsz.xbm
 
 binddir = $(pkgdatadir)/bind
@@ -255,6 +245,16 @@ dist_images_DATA = \
 
 imagesmathdir = $(imagesdir)/math
 dist_imagesmath_DATA = \
+       images/math/style.xbm \
+       images/math/font.xpm \
+       images/math/delim.xpm \
+       images/math/equation.xpm \
+       images/math/matrix.xpm \
+       images/math/space.xpm \
+       images/math/sqrt-square.xpm \
+       images/math/style.xpm \
+       images/math/sub.xpm \
+       images/math/super.xpm \
        images/math/Bbbk.xpm \
        images/math/Finv.xpm \
        images/math/Game.xpm \

diff --git a/src/frontends/qt4/QMathDialog.C b/src/frontends/qt4/QMathDialog.C
index 1ff375596e0206b45c16b85311b16a68f5173cc3..8b6ec5ff3b86418029073f3d919b06debc313b33 100644 (file)
--- a/src/frontends/qt4/QMathDialog.C
+++ b/src/frontends/qt4/QMathDialog.C
@@ -26,9 +26,12 @@
 #include "qt_helpers.h"
 #include "controllers/ControlMath.h"
 #include "frontends/lyx_gui.h"
+#include "support/filetools.h"
 
 using std::string;
 
+using lyx::support::LibFileSearch;
+
 namespace lyx {
 namespace frontend {
 
@@ -68,6 +71,27 @@ QMathDialog::QMathDialog(QMath * form)
        connect( equationPB, SIGNAL( clicked() ), this, SLOT( equationClicked() ) );
        connect( symbolsCO, SIGNAL(activated(int)), this, SLOT(showingPanel(int)));
 
+       string icon_path = LibFileSearch("images/math", "sqrt-square", "xpm");
+       sqrtPB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "space", "xpm");
+       spacePB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "style", "xpm");
+       stylePB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "font", "xpm");
+       fontPB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "equation", "xpm");
+       equationPB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "frac-square", "xpm");
+       fracPB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "sub", "xpm");
+       subscriptPB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "super", "xpm");
+       superscriptPB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "matrix", "xpm");
+       matrixPB->setIcon(QIcon(toqstr(icon_path)));
+       icon_path = LibFileSearch("images/math", "delim", "xpm");
+       delimitersPB->setIcon(QIcon(toqstr(icon_path)));
+
        // function list
        for (int i = 0; *function_names[i]; ++i) {
                functionsLW->addItem(function_names[i]);

diff --git a/src/frontends/qt4/ui/QMathUi.ui b/src/frontends/qt4/ui/QMathUi.ui
index dfb792d54a086c2ddb877e4c53974d94f1a6a2eb..9e05e7366c6425ff347037126036cc2ba81050bd 100644 (file)
--- a/src/frontends/qt4/ui/QMathUi.ui
+++ b/src/frontends/qt4/ui/QMathUi.ui
@@ -18,7 +18,7 @@
   <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>
-  <widget class="QWidget" name="" >
+  <widget class="QWidget" name="layoutWidget" >
    <property name="geometry" >
     <rect>
      <x>10</x>
@@ -251,7 +251,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/delim.xpm</iconset>
+         <iconset>../../../../lib/images/math/delim.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -270,7 +270,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/sub.xpm</iconset>
+         <iconset>../../../../lib/images/math/sub.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -295,7 +295,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/font.xpm</iconset>
+         <iconset>../../../../lib/images/math/font.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -322,7 +322,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/equation.xpm</iconset>
+         <iconset>../../../../lib/images/math/equation.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -347,7 +347,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/space.xpm</iconset>
+         <iconset>../../../../lib/images/math/space.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -366,7 +366,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/super.xpm</iconset>
+         <iconset>../../../../lib/images/math/super.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -391,7 +391,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/style.xpm</iconset>
+         <iconset>../../../../lib/images/math/style.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -418,7 +418,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/frac-square.xpm</iconset>
+         <iconset>../../../../lib/images/math/frac-square.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -443,7 +443,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/sqrt-square.xpm</iconset>
+         <iconset>../../../../lib/images/math/sqrt-square.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -462,7 +462,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/math/matrix.xpm</iconset>
+         <iconset>../../../../lib/images/math/matrix.xpm</iconset>
         </property>
        </widget>
       </item>