Convert RID_SYMDEFINEDIALOG to .ui

Change-Id: I03e2518c66fef4e40f95a9b68d68f9bb19a947b1
Reviewed-on: https://gerrit.libreoffice.org/8807Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

extras/source/glade/libreoffice-catalog.xml.in

@@ -254,6 +254,9 @@
     <glade-widget-class title="Show Math Symbol" name="smlo-SmShowSymbol"
                         generic-name="Show Math Symbol" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Show Math Char" name="smlo-SmShowChar"
+                        generic-name="Show Math Char" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Gallery Preview" name="svxcorelo-GalleryPreview"
                         generic-name="Gallery Preview" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
@@ -263,6 +266,9 @@
     <glade-widget-class title="Math Symbol Selection" name="smlo-SmShowSymbolSet"
                         generic-name="Math Symbol Selection" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Math Char Selection" name="svxlo-SvxShowCharSet"
+                        generic-name="Math Char Selection" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Number Preview" name="cuilo-SvxNumberPreview"
                         generic-name="Number Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>

starmath/UIConfig_smath.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
 	starmath/uiconfig/smath/ui/savedefaultsdialog \
 	starmath/uiconfig/smath/ui/smathsettings \
 	starmath/uiconfig/smath/ui/spacingdialog \
+	starmath/uiconfig/smath/ui/symdefinedialog \
 ))
 
 # vim: set noet sw=4 ts=4:

starmath/inc/dialog.hxx

@@ -375,8 +375,8 @@ class SmShowChar : public Control
     virtual void    Paint(const Rectangle&) SAL_OVERRIDE;
 
 public:
-    SmShowChar(Window *pParent, const ResId& rResId)
-    : Control(pParent, rResId)
+    SmShowChar(Window *pParent, WinBits nStyle)
+    : Control(pParent, nStyle)
     {
     }
 
@@ -388,35 +388,24 @@ public:
 
 class SmSymDefineDialog : public ModalDialog
 {
-    FixedText       aOldSymbolText;
-    ComboBox        aOldSymbols;
-    FixedText       aOldSymbolSetText;
-    ComboBox        aOldSymbolSets;
-    SvxShowCharSet  aCharsetDisplay;
-    FixedText       aSymbolText;
-    ComboBox        aSymbols;
-    FixedText       aSymbolSetText;
-    ComboBox        aSymbolSets;
-    FixedText       aFontText;
-    ListBox         aFonts;
-    FixedText       aFontsSubsetFT;
-    ListBox         aFontsSubsetLB;
-    FixedText       aStyleText;
-    FontStyleBox    aStyles;
-    FixedText       aOldSymbolName;
-    SmShowChar      aOldSymbolDisplay;
-    FixedText       aOldSymbolSetName;
-    FixedText       aSymbolName;
-    SmShowChar      aSymbolDisplay;
-    FixedText       aSymbolSetName;
-    OKButton        aOkBtn;
-    HelpButton      aHelpBtn;
-    CancelButton    aCancelBtn;
-    PushButton      aAddBtn;
-    PushButton      aChangeBtn;
-    PushButton      aDeleteBtn;
-    FixedImage      aRightArrow;
-    Image           aRightArrow_Im;
+    ComboBox*        pOldSymbols;
+    ComboBox*        pOldSymbolSets;
+    SvxShowCharSet*  pCharsetDisplay;
+    ComboBox*        pSymbols;
+    ComboBox*        pSymbolSets;
+    ListBox*         pFonts;
+    ListBox*         pFontsSubsetLB;
+    FontStyleBox*    pStyles;
+    FixedText*       pOldSymbolName;
+    SmShowChar*     pOldSymbolDisplay;
+    FixedText*       pOldSymbolSetName;
+    FixedText*       pSymbolName;
+    SmShowChar*     pSymbolDisplay;
+    FixedText*       pSymbolSetName;
+    HelpButton*      pHelpBtn;
+    PushButton*      pAddBtn;
+    PushButton*      pChangeBtn;
+    PushButton*      pDeleteBtn;
 
     SmSymbolManager     aSymbolMgrCopy,
                        &rSymbolMgr;
@@ -465,7 +454,7 @@ class SmSymDefineDialog : public ModalDialog
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
-    SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, bool bFreeRes = true);
+    SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
     ~SmSymDefineDialog();
 
     using OutputDevice::SetFont;
@@ -475,22 +464,22 @@ public:
 
     bool SelectOldSymbolSet(const OUString &rSymbolSetName)
     {
-        return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, false);
+        return SelectSymbolSet(*pOldSymbolSets, rSymbolSetName, false);
     }
 
     bool SelectOldSymbol(const OUString &rSymbolName)
     {
-        return SelectSymbol(aOldSymbols, rSymbolName, false);
+        return SelectSymbol(*pOldSymbols, rSymbolName, false);
     }
 
     bool SelectSymbolSet(const OUString &rSymbolSetName)
     {
-        return SelectSymbolSet(aSymbolSets, rSymbolSetName, false);
+        return SelectSymbolSet(*pSymbolSets, rSymbolSetName, false);
     }
 
     bool SelectSymbol(const OUString &rSymbolName)
     {
-        return SelectSymbol(aSymbols, rSymbolName, false);
+        return SelectSymbol(*pSymbols, rSymbolName, false);
     }
 
     bool        SelectFont(const OUString &rFontName)   { return SelectFont(rFontName, true); }

starmath/inc/helpids.h

@@ -265,7 +265,6 @@
 #define HID_SMA_SLRDBRACKETX                              "STARMATH_HID_SMA_SLRDBRACKETX"
 
 #define HID_SMA_CONTROL_SYMBOLSET_VIEW                    "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW"
-#define HID_SMA_CONTROL_FONTCHAR_VIEW                     "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW"
 
 #define HID_SMA_NOSPACE                                   "STARMATH_HID_SMA_NOSPACE"
 

starmath/inc/starmath.hrc

@@ -75,7 +75,6 @@
 #define SID_SAVE_ONLY_USED_SYMBOLS  (SID_SMA_START + 125)
 #define SID_ELEMENTSDOCKINGWINDOW   (SID_SMA_START + 126)
 
-#define RID_SYMDEFINEDIALOG         (RID_APP_START + 9)
 #define RID_PRINTUIOPTIONS          (RID_APP_START + 11)
 
 #define RID_MATH_TOOLBOX            (RID_APP_START + 50)
@@ -683,8 +682,6 @@
 #define RID_ALIGNCX_HELP                  (RID_APP_START + 4276)
 #define RID_ALIGNRX_HELP                  (RID_APP_START + 4277)
 
-#define BMP_ARROW_RIGHT     1
-
 // 342 == SCH_IF_SMAVIEWSHELL, because SFX_INTERFACE_LIB is no
 // Define but latterly an Enum
 #define HID_SMA_VIEWSHELL_DOCUMENT      (342)

starmath/source/smres.src

@@ -21,243 +21,9 @@
 #include <sfx2/tabpage.hrc>
 #include <svx/globlmn.hrc>
 #include "starmath.hrc"
-#include "dialog.hrc"
 #include "toolbox.hrc"
 #include "smcommands.h"
 
-#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-
-ModalDialog RID_SYMDEFINEDIALOG
-{
-    HelpID = "starmath:ModalDialog:RID_SYMDEFINEDIALOG";
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 365 , 215 ) ;
-    Text [ en-US ] = "Edit Symbols" ;
-    FixedText 1
-    {
-        Pos = MAP_APPFONT ( 6 , 8 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "~Old symbol";
-    };
-    ComboBox 1
-    {
-        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:1";
-        Pos = MAP_APPFONT ( 59 , 6 ) ;
-        Size = MAP_APPFONT ( 80 , 100 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText 2
-    {
-        Pos = MAP_APPFONT ( 145 , 8 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "O~ld symbol set";
-    };
-    ComboBox 2
-    {
-        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:2";
-        Pos = MAP_APPFONT ( 210 , 6 ) ;
-        Size = MAP_APPFONT ( 80 , 100 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    Control 1
-    {
-        HelpID = HID_SMA_CONTROL_FONTCHAR_VIEW ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 24 ) ;
-        Size = MAP_APPFONT ( 295 , 87 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-    };
-    FixedText 9
-    {
-        Pos = MAP_APPFONT ( 6 , 118 ) ;
-        Size = MAP_APPFONT ( 71 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "~Symbol";
-    };
-    ComboBox 4
-    {
-        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:4";
-        Pos = MAP_APPFONT ( 80 , 115 ) ;
-        Size = MAP_APPFONT ( 100 , 100 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText 10
-    {
-        Left = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 133 ) ;
-        Size = MAP_APPFONT ( 71 , 8 ) ;
-        Text [ en-US ] = "Symbol s~et";
-    };
-    ComboBox 5
-    {
-        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:5";
-        Pos = MAP_APPFONT ( 80 , 130 ) ;
-        Size = MAP_APPFONT ( 100 , 100 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = TRUE ;
-    };
-    FixedText 3
-    {
-        Left = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 148 ) ;
-        Size = MAP_APPFONT ( 71 , 8 ) ;
-        Text [ en-US ] = "~Font";
-    };
-    ListBox 1
-    {
-        HelpID = "starmath:ListBox:RID_SYMDEFINEDIALOG:1";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 80 , 145 ) ;
-        Size = MAP_APPFONT ( 100 , 100 ) ;
-        TabStop = TRUE ;
-        Sort = TRUE ;
-        DropDown = TRUE ;
-    };
-    FixedText FT_FONTS_SUBSET
-    {
-        Left = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 163 ) ;
-        Size = MAP_APPFONT ( 71 , 8 ) ;
-        Text [ en-US ] = "~Subset";
-    };
-    ListBox LB_FONTS_SUBSET
-    {
-        HelpID = "starmath:ListBox:RID_SYMDEFINEDIALOG:LB_FONTS_SUBSET";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 80 , 160 ) ;
-        Size = MAP_APPFONT ( 100 , 100 ) ;
-        TabStop = TRUE ;
-        Sort = FALSE ;
-        DropDown = TRUE ;
-    };
-    FixedText 4
-    {
-        Left = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 178 ) ;
-        Size = MAP_APPFONT ( 71 , 8 ) ;
-        Text [ en-US ] = "~Typeface";
-    };
-    ComboBox 3
-    {
-        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:3";
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 80 , 175 ) ;
-        Size = MAP_APPFONT ( 100 , 100 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        Sort = FALSE ;
-    };
-    FixedText 5
-    {
-        Center = TRUE ;
-        Pos  = MAP_APPFONT ( 303 , 130 ) ;
-        Size = MAP_APPFONT ( 54 , 8 ) ;
-    };
-    Control 2
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 310 , 140 ) ;
-        Size = MAP_APPFONT ( 40 , 40 ) ;
-    };
-    FixedText 6
-    {
-        Center = TRUE ;
-        Pos  = MAP_APPFONT ( 303 , 182 ) ;
-        Size = MAP_APPFONT ( 54 , 8 ) ;
-    };
-    Image 1
-    {
-        ImageBitmap = Bitmap { File = "ar_right.bmp" ; };
-        MaskColor = IMAGE_STDBTN_COLOR ;
-    };
-    FixedImage BMP_ARROW_RIGHT
-    {
-        Pos  = MAP_APPFONT ( 252 , 142 ) ;
-        Size = MAP_APPFONT ( 36 , 36 ) ;
-
-        Fixed = Image
-        {
-            ImageBitmap = Bitmap { File = "ar_right.bmp" ; };
-            MaskColor = IMAGE_STDBTN_COLOR ;
-        };
-    };
-    FixedText 7
-    {
-        Center = TRUE ;
-        Pos  = MAP_APPFONT ( 183 , 130 ) ;
-        Size = MAP_APPFONT ( 54 , 9 ) ;
-    };
-    Control 3
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 190 , 140 ) ;
-        Size = MAP_APPFONT ( 40 , 40 ) ;
-    };
-    FixedText 8
-    {
-        Center = TRUE ;
-        Pos  = MAP_APPFONT ( 183 , 182 ) ;
-        Size = MAP_APPFONT ( 54 , 8 ) ;
-    };
-    PushButton 1
-    {
-        HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:1";
-        TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 305 , 195 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Add" ;
-    };
-    PushButton 2
-    {
-        HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:2";
-        TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 245 , 195 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Modify" ;
-    };
-    PushButton 3
-    {
-        HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:3";
-        TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 185 , 195 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Delete" ;
-    };
-    HelpButton 1
-    {
-        Pos = MAP_APPFONT ( 310 , 42 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    HelpID = "starmath:HelpButton:RID_SYMDEFINEDIALOG:1";
-    Text [ en-US ] = "~Help" ;
-    };
-    OKButton 1
-    {
-        Pos = MAP_APPFONT ( 310 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton 1
-    {
-        Pos = MAP_APPFONT ( 310 , 24 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
 WarningBox RID_NOMATHTYPEFACEWARNING
 {
     Message [ en-US ] = "The 'StarMath' font has not been installed.\nWithout this font %PRODUCTNAME Math cannot function correctly.\nPlease install this font and restart %PRODUCTNAME Math." ;