Spaces menu for math dialog

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 14bc906fc9030cadf94789ffa7d16623b8a9d346..551fefadfdbc0f6a9049d2c5a9c81a651629acce 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-14  John Levon  <levon@movementarian.org>
+
+       * ui/QMathDialog.ui:
+       * QMathDialog.h:
+       * QMathDialog.C: add spaces menu
+ 
 2002-09-13  John Levon  <levon@movementarian.org>
 
        * Menubar_pimpl.C:

diff --git a/src/frontends/qt2/QMathDialog.C b/src/frontends/qt2/QMathDialog.C
index d5cc8fe70f1d695c693568d6637bdcde329b7300..87784fb294cd19144dc0f1224d5e37c62dc5373e 100644 (file)
--- a/src/frontends/qt2/QMathDialog.C
+++ b/src/frontends/qt2/QMathDialog.C
@@ -9,6 +9,7 @@
 #include <config.h>
 
 #include "support/filetools.h"
+#include "gettext.h"
 #include "debug.h"
  
 #include "QMathDialog.h"
@@ -20,10 +21,13 @@
 #include <qapplication.h>
 #include <qwidgetstack.h>
 #include <qcombobox.h>
+#include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qpixmap.h>
 #include <qscrollview.h>
 #include <qlayout.h>
+#include <qpopupmenu.h>
+#include <qcursor.h>
  
 using std::min;
 using std::max;
@@ -96,6 +100,15 @@ QMathDialog::QMathDialog(QMath * form)
        panel_initialised[0] = true;
  
        connect(symbolsWS, SIGNAL(aboutToShow(int)), this, SLOT(showingPanel(int)));
+ 
+       space_menu_ = new QPopupMenu(spacePB);
+       space_menu_->insertItem(_("Thin space   \\,"), 1); 
+       space_menu_->insertItem(_("Medium space \\:"), 2); 
+       space_menu_->insertItem(_("Thick space  \\;"), 3); 
+       space_menu_->insertItem(_("Quadratin space      \\quad"), 4); 
+       space_menu_->insertItem(_("Double quadratin space       \\qquad"), 5); 
+       space_menu_->insertItem(_("Negative space       \\!"), 6);
+       connect(space_menu_, SIGNAL(activated(int)), this, SLOT(insertSpace(int)));
 }
 
 
@@ -134,6 +147,21 @@ void QMathDialog::addPanel(int num)
 }
 
  
+void QMathDialog::insertSpace(int id)
+{
+       string str;
+       switch (id) {
+               case 1: str = ","; break;
+               case 2: str = ":"; break;
+               case 3: str = ";"; break;
+               case 4: str = "quad"; break;
+               case 5: str = "qquad"; break;
+               case 6: str = "!"; break;
+       }
+       form_->insert_symbol(str);
+}
+
+ 
 void QMathDialog::symbol_clicked(string str)
 {
        form_->insert_symbol(str);
@@ -183,6 +211,7 @@ void QMathDialog::matrixClicked()
  
 void QMathDialog::spaceClicked()
 {
+       space_menu_->exec(QCursor::pos());
 }
 
  

diff --git a/src/frontends/qt2/QMathDialog.h b/src/frontends/qt2/QMathDialog.h
index c19b7413c03c7068bd25deb1a207f409ab9ff6a7..c20b5cb6018dd51ac031d1312bfb7150d522854a 100644 (file)
--- a/src/frontends/qt2/QMathDialog.h
+++ b/src/frontends/qt2/QMathDialog.h
@@ -17,6 +17,7 @@
 
 class QMath;
 class IconPalette;
+class QPopupMenu;
 
 class QMathDialog : public QMathDialogBase
 {
@@ -37,6 +38,7 @@ public slots:
        virtual void subscriptClicked();
        virtual void superscriptClicked();
        void symbol_clicked(string str);
+       void insertSpace(int id);
 
        /// about to show a symbol panel
        void showingPanel(int);
@@ -53,6 +55,9 @@ private:
  
        /// owning form
        QMath * form_;
+
+       /// menu on click of space
+       QPopupMenu * space_menu_;
 };
 
 #endif // QMATHDIALOG_H

diff --git a/src/frontends/qt2/TODO b/src/frontends/qt2/TODO
index c235a7514a84bc7d639cc5adf0a931d87dba3140..74dfb4670410dca71e52a8b6ae2bdf6d77ee8c31 100644 (file)
--- a/src/frontends/qt2/TODO
+++ b/src/frontends/qt2/TODO
@@ -27,7 +27,6 @@ QGraphics
  
 QLImage
 
-       - get jpeg etc. to work
        - get mono/color to work
        - get bgcolor and clipping to work 
 

diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index cbb2dd1d2e1b3b6af0bd1a3d3dad2c3c4bec029d..b34843476d4507bcf74a8b23ba19fdebffddb1d6 100644 (file)
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -135,7 +135,7 @@ qfont_loader::font_info const * qfont_loader::getfontinfo(LyXFont const & f)
        if (fi) {
                return fi;
        } else {
-               fi = new font_info(f); 
+               fi = new font_info(f);
                fontinfo_[f.family()][f.series()][f.realShape()][f.size()].reset(fi);
                return fi;
        }

diff --git a/src/frontends/qt2/ui/QMathDialog.ui b/src/frontends/qt2/ui/QMathDialog.ui
index 0d37c6ead0cc5c501ac326e5e415517ee6a059e3..6319dd60b099907893f3df5be230d65d305600fd 100644 (file)
--- a/src/frontends/qt2/ui/QMathDialog.ui
+++ b/src/frontends/qt2/ui/QMathDialog.ui
@@ -216,7 +216,7 @@
                                     </property>
                                     <property>
                                         <name>toolTip</name>
-                                        <string>Show spacing dialog</string>
+                                        <string>Insert spacing</string>
                                     </property>
                                 </widget>
                                 <widget row="0"  column="0" >