Skip to content

C
core
Kaydet (Commit) 26fdfce8 authored tarafından Palenik Mihály's avatar Palenik Mihály Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert RID_SYMDEFINEDIALOG to .ui 

Change-Id: I03e2518c66fef4e40f95a9b68d68f9bb19a947b1
Reviewed-on: https://gerrit.libreoffice.org/8807Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 1e3c7b85
Hide whitespace changes
Inline Side-by-side
Showing with 764 additions and 475 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 26fdfce8
...@@ -254,6 +254,9 @@ ...@@ -254,6 +254,9 @@
<glade-widget-class title="Show Math Symbol" name="smlo-SmShowSymbol" <glade-widget-class title="Show Math Symbol" name="smlo-SmShowSymbol"
generic-name="Show Math Symbol" parent="GtkDrawingArea" generic-name="Show Math Symbol" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> 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" <glade-widget-class title="Gallery Preview" name="svxcorelo-GalleryPreview"
generic-name="Gallery Preview" parent="GtkDrawingArea" generic-name="Gallery Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>
...@@ -263,6 +266,9 @@ ...@@ -263,6 +266,9 @@
<glade-widget-class title="Math Symbol Selection" name="smlo-SmShowSymbolSet" <glade-widget-class title="Math Symbol Selection" name="smlo-SmShowSymbolSet"
generic-name="Math Symbol Selection" parent="GtkDrawingArea" generic-name="Math Symbol Selection" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> 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" <glade-widget-class title="Number Preview" name="cuilo-SvxNumberPreview"
generic-name="Number Preview Window" parent="GtkDrawingArea" generic-name="Number Preview Window" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>
......
starmath/UIConfig_smath.mk
Dosyayı görüntüle @ 26fdfce8
...@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\ ...@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/savedefaultsdialog \ starmath/uiconfig/smath/ui/savedefaultsdialog \
starmath/uiconfig/smath/ui/smathsettings \ starmath/uiconfig/smath/ui/smathsettings \
starmath/uiconfig/smath/ui/spacingdialog \ starmath/uiconfig/smath/ui/spacingdialog \
starmath/uiconfig/smath/ui/symdefinedialog \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
starmath/inc/dialog.hxx
Dosyayı görüntüle @ 26fdfce8
...@@ -375,8 +375,8 @@ class SmShowChar : public Control ...@@ -375,8 +375,8 @@ class SmShowChar : public Control
virtual void Paint(const Rectangle&) SAL_OVERRIDE; virtual void Paint(const Rectangle&) SAL_OVERRIDE;
public: public:
SmShowChar(Window *pParent, const ResId& rResId) SmShowChar(Window *pParent, WinBits nStyle)
: Control(pParent, rResId) : Control(pParent, nStyle)
{ {
} }
...@@ -388,35 +388,24 @@ public: ...@@ -388,35 +388,24 @@ public:
class SmSymDefineDialog : public ModalDialog class SmSymDefineDialog : public ModalDialog
{ {
FixedText aOldSymbolText; ComboBox* pOldSymbols;
ComboBox aOldSymbols; ComboBox* pOldSymbolSets;
FixedText aOldSymbolSetText; SvxShowCharSet* pCharsetDisplay;
ComboBox aOldSymbolSets; ComboBox* pSymbols;
SvxShowCharSet aCharsetDisplay; ComboBox* pSymbolSets;
FixedText aSymbolText; ListBox* pFonts;
ComboBox aSymbols; ListBox* pFontsSubsetLB;
FixedText aSymbolSetText; FontStyleBox* pStyles;
ComboBox aSymbolSets; FixedText* pOldSymbolName;
FixedText aFontText; SmShowChar* pOldSymbolDisplay;
ListBox aFonts; FixedText* pOldSymbolSetName;
FixedText aFontsSubsetFT; FixedText* pSymbolName;
ListBox aFontsSubsetLB; SmShowChar* pSymbolDisplay;
FixedText aStyleText; FixedText* pSymbolSetName;
FontStyleBox aStyles; HelpButton* pHelpBtn;
FixedText aOldSymbolName; PushButton* pAddBtn;
SmShowChar aOldSymbolDisplay; PushButton* pChangeBtn;
FixedText aOldSymbolSetName; PushButton* pDeleteBtn;
FixedText aSymbolName;
SmShowChar aSymbolDisplay;
FixedText aSymbolSetName;
OKButton aOkBtn;
HelpButton aHelpBtn;
CancelButton aCancelBtn;
PushButton aAddBtn;
PushButton aChangeBtn;
PushButton aDeleteBtn;
FixedImage aRightArrow;
Image aRightArrow_Im;
SmSymbolManager aSymbolMgrCopy, SmSymbolManager aSymbolMgrCopy,
&rSymbolMgr; &rSymbolMgr;
...@@ -465,7 +454,7 @@ class SmSymDefineDialog : public ModalDialog ...@@ -465,7 +454,7 @@ class SmSymDefineDialog : public ModalDialog
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
public: public:
SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, bool bFreeRes = true); SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
~SmSymDefineDialog(); ~SmSymDefineDialog();
using OutputDevice::SetFont; using OutputDevice::SetFont;
...@@ -475,22 +464,22 @@ public: ...@@ -475,22 +464,22 @@ public:
bool SelectOldSymbolSet(const OUString &rSymbolSetName) bool SelectOldSymbolSet(const OUString &rSymbolSetName)
{ {
return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, false); return SelectSymbolSet(*pOldSymbolSets, rSymbolSetName, false);
} }
bool SelectOldSymbol(const OUString &rSymbolName) bool SelectOldSymbol(const OUString &rSymbolName)
{ {
return SelectSymbol(aOldSymbols, rSymbolName, false); return SelectSymbol(*pOldSymbols, rSymbolName, false);
} }
bool SelectSymbolSet(const OUString &rSymbolSetName) bool SelectSymbolSet(const OUString &rSymbolSetName)
{ {
return SelectSymbolSet(aSymbolSets, rSymbolSetName, false); return SelectSymbolSet(*pSymbolSets, rSymbolSetName, false);
} }
bool SelectSymbol(const OUString &rSymbolName) bool SelectSymbol(const OUString &rSymbolName)
{ {
return SelectSymbol(aSymbols, rSymbolName, false); return SelectSymbol(*pSymbols, rSymbolName, false);
} }
bool SelectFont(const OUString &rFontName) { return SelectFont(rFontName, true); } bool SelectFont(const OUString &rFontName) { return SelectFont(rFontName, true); }
......
starmath/inc/helpids.h
Dosyayı görüntüle @ 26fdfce8
...@@ -265,7 +265,6 @@ ...@@ -265,7 +265,6 @@
#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX" #define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX"
#define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW" #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" #define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE"
......
starmath/inc/starmath.hrc
Dosyayı görüntüle @ 26fdfce8
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
#define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125) #define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125)
#define SID_ELEMENTSDOCKINGWINDOW (SID_SMA_START + 126) #define SID_ELEMENTSDOCKINGWINDOW (SID_SMA_START + 126)
#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
#define RID_PRINTUIOPTIONS (RID_APP_START + 11) #define RID_PRINTUIOPTIONS (RID_APP_START + 11)
#define RID_MATH_TOOLBOX (RID_APP_START + 50) #define RID_MATH_TOOLBOX (RID_APP_START + 50)
...@@ -683,8 +682,6 @@ ...@@ -683,8 +682,6 @@
#define RID_ALIGNCX_HELP (RID_APP_START + 4276) #define RID_ALIGNCX_HELP (RID_APP_START + 4276)
#define RID_ALIGNRX_HELP (RID_APP_START + 4277) #define RID_ALIGNRX_HELP (RID_APP_START + 4277)
#define BMP_ARROW_RIGHT 1
// 342 == SCH_IF_SMAVIEWSHELL, because SFX_INTERFACE_LIB is no // 342 == SCH_IF_SMAVIEWSHELL, because SFX_INTERFACE_LIB is no
// Define but latterly an Enum // Define but latterly an Enum
#define HID_SMA_VIEWSHELL_DOCUMENT (342) #define HID_SMA_VIEWSHELL_DOCUMENT (342)
......
starmath/source/dialog.cxx
Dosyayı görüntüle @ 26fdfce8
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "dialog.hxx" #include "dialog.hxx"
#include "starmath.hrc" #include "starmath.hrc"
#include "config.hxx" #include "config.hxx"
#include "dialog.hrc"
#include "smmod.hxx" #include "smmod.hxx"
#include "symbol.hxx" #include "symbol.hxx"
#include "view.hxx" #include "view.hxx"
...@@ -1564,7 +1563,16 @@ const SmSym * SmSymbolDialog::GetSymbol() const ...@@ -1564,7 +1563,16 @@ const SmSym * SmSymbolDialog::GetSymbol() const
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowChar(Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
return new SmShowChar(pParent, nWinStyle);
}
void SmShowChar::Paint(const Rectangle &rRect) void SmShowChar::Paint(const Rectangle &rRect)
{ {
...@@ -1613,7 +1621,7 @@ void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font &rFont ) ...@@ -1613,7 +1621,7 @@ void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font &rFont )
void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText) void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText)
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(&rComboBox == &aOldSymbols || &rComboBox == &aSymbols, OSL_ENSURE(&rComboBox == pOldSymbols || &rComboBox == pSymbols,
"Sm : wrong ComboBox"); "Sm : wrong ComboBox");
#endif #endif
...@@ -1621,7 +1629,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText) ...@@ -1621,7 +1629,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText)
if (bDeleteText) if (bDeleteText)
rComboBox.SetText(OUString()); rComboBox.SetText(OUString());
ComboBox &rBox = &rComboBox == &aOldSymbols ? aOldSymbolSets : aSymbolSets; ComboBox &rBox = &rComboBox == pOldSymbols ? *pOldSymbolSets : *pSymbolSets;
SymbolPtrVec_t aSymSet( aSymbolMgrCopy.GetSymbolSet( rBox.GetText() ) ); SymbolPtrVec_t aSymSet( aSymbolMgrCopy.GetSymbolSet( rBox.GetText() ) );
for (size_t i = 0; i < aSymSet.size(); ++i) for (size_t i = 0; i < aSymSet.size(); ++i)
rComboBox.InsertEntry( aSymSet[i]->GetName() ); rComboBox.InsertEntry( aSymSet[i]->GetName() );
...@@ -1631,7 +1639,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText) ...@@ -1631,7 +1639,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText)
void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText) void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText)
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(&rComboBox == &aOldSymbolSets || &rComboBox == &aSymbolSets, OSL_ENSURE(&rComboBox == pOldSymbolSets || &rComboBox == pSymbolSets,
"Sm : falsche ComboBox"); "Sm : falsche ComboBox");
#endif #endif
...@@ -1648,9 +1656,9 @@ void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText) ...@@ -1648,9 +1656,9 @@ void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText)
void SmSymDefineDialog::FillFonts(bool bDelete) void SmSymDefineDialog::FillFonts(bool bDelete)
{ {
aFonts.Clear(); pFonts->Clear();
if (bDelete) if (bDelete)
aFonts.SetNoSelection(); pFonts->SetNoSelection();
// Include all fonts of FontList into the font list. // Include all fonts of FontList into the font list.
// If there are duplicates, only include one entry of each font since the style will be // If there are duplicates, only include one entry of each font since the style will be
...@@ -1659,29 +1667,29 @@ void SmSymDefineDialog::FillFonts(bool bDelete) ...@@ -1659,29 +1667,29 @@ void SmSymDefineDialog::FillFonts(bool bDelete)
{ {
sal_uInt16 nCount = pFontList->GetFontNameCount(); sal_uInt16 nCount = pFontList->GetFontNameCount();
for (sal_uInt16 i = 0; i < nCount; i++) for (sal_uInt16 i = 0; i < nCount; i++)
aFonts.InsertEntry( pFontList->GetFontName(i).GetName() ); pFonts->InsertEntry( pFontList->GetFontName(i).GetName() );
} }
} }
void SmSymDefineDialog::FillStyles(bool bDeleteText) void SmSymDefineDialog::FillStyles(bool bDeleteText)
{ {
aStyles.Clear(); pStyles->Clear();
if (bDeleteText) if (bDeleteText)
aStyles.SetText(OUString()); pStyles->SetText(OUString());
OUString aText (aFonts.GetSelectEntry()); OUString aText (pFonts->GetSelectEntry());
if (!aText.isEmpty()) if (!aText.isEmpty())
{ {
// use own StyleNames // use own StyleNames
const SmFontStyles &rStyles = GetFontStyles(); const SmFontStyles &rStyles = GetFontStyles();
for (sal_uInt16 i = 0; i < rStyles.GetCount(); i++) for (sal_uInt16 i = 0; i < rStyles.GetCount(); i++)
aStyles.InsertEntry( rStyles.GetStyleName(i) ); pStyles->InsertEntry( rStyles.GetStyleName(i) );
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(aStyles.GetEntryCount() > 0, "Sm : no styles available"); OSL_ENSURE(pStyles->GetEntryCount() > 0, "Sm : no styles available");
#endif #endif
aStyles.SetText( aStyles.GetEntry(0) ); pStyles->SetText( pStyles->GetEntry(0) );
} }
} }
...@@ -1689,7 +1697,7 @@ void SmSymDefineDialog::FillStyles(bool bDeleteText) ...@@ -1689,7 +1697,7 @@ void SmSymDefineDialog::FillStyles(bool bDeleteText)
SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox) SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox)
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(&rComboBox == &aOldSymbols || &rComboBox == &aSymbols, OSL_ENSURE(&rComboBox == pOldSymbols || &rComboBox == pSymbols,
"Sm : wrong combobox"); "Sm : wrong combobox");
#endif #endif
return aSymbolMgrCopy.GetSymbolByName(rComboBox.GetText()); return aSymbolMgrCopy.GetSymbolByName(rComboBox.GetText());
...@@ -1700,9 +1708,9 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, EMPTYARG pComboBox ...@@ -1700,9 +1708,9 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, EMPTYARG pComboBox
{ {
(void) pComboBox; (void) pComboBox;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(pComboBox == &aOldSymbols, "Sm : wrong argument"); OSL_ENSURE(pComboBox == pOldSymbols, "Sm : wrong argument");
#endif #endif
SelectSymbol(aOldSymbols, aOldSymbols.GetText(), false); SelectSymbol(*pOldSymbols, pOldSymbols->GetText(), false);
return 0; return 0;
} }
...@@ -1711,9 +1719,9 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, EMPTYARG pCombo ...@@ -1711,9 +1719,9 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, EMPTYARG pCombo
{ {
(void) pComboBox; (void) pComboBox;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(pComboBox == &aOldSymbolSets, "Sm : wrong argument"); OSL_ENSURE(pComboBox == pOldSymbolSets, "Sm : wrong argument");
#endif #endif
SelectSymbolSet(aOldSymbolSets, aOldSymbolSets.GetText(), false); SelectSymbolSet(*pOldSymbolSets, pOldSymbolSets->GetText(), false);
return 0; return 0;
} }
...@@ -1723,19 +1731,19 @@ IMPL_LINK( SmSymDefineDialog, ModifyHdl, ComboBox *, pComboBox ) ...@@ -1723,19 +1731,19 @@ IMPL_LINK( SmSymDefineDialog, ModifyHdl, ComboBox *, pComboBox )
// remember cursor position for later restoring of it // remember cursor position for later restoring of it
Selection aSelection (pComboBox->GetSelection()); Selection aSelection (pComboBox->GetSelection());
if (pComboBox == &aSymbols) if (pComboBox == pSymbols)
SelectSymbol(aSymbols, aSymbols.GetText(), false); SelectSymbol(*pSymbols, pSymbols->GetText(), false);
else if (pComboBox == &aSymbolSets) else if (pComboBox == pSymbolSets)
SelectSymbolSet(aSymbolSets, aSymbolSets.GetText(), false); SelectSymbolSet(*pSymbolSets, pSymbolSets->GetText(), false);
else if (pComboBox == &aOldSymbols) else if (pComboBox == pOldSymbols)
// allow only names from the list // allow only names from the list
SelectSymbol(aOldSymbols, aOldSymbols.GetText(), true); SelectSymbol(*pOldSymbols, pOldSymbols->GetText(), true);
else if (pComboBox == &aOldSymbolSets) else if (pComboBox == pOldSymbolSets)
// allow only names from the list // allow only names from the list
SelectSymbolSet(aOldSymbolSets, aOldSymbolSets.GetText(), true); SelectSymbolSet(*pOldSymbolSets, pOldSymbolSets->GetText(), true);
else if (pComboBox == &aStyles) else if (pComboBox == pStyles)
// allow only names from the list (that's the case here anyway) // allow only names from the list (that's the case here anyway)
SelectStyle(aStyles.GetText(), true); SelectStyle(pStyles->GetText(), true);
else else
SAL_WARN("starmath", "wrong combobox argument"); SAL_WARN("starmath", "wrong combobox argument");
...@@ -1751,10 +1759,10 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox ) ...@@ -1751,10 +1759,10 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox )
{ {
(void) pListBox; (void) pListBox;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(pListBox == &aFonts, "Sm : wrong argument"); OSL_ENSURE(pListBox == pFonts, "Sm : wrong argument");
#endif #endif
SelectFont(aFonts.GetSelectEntry()); SelectFont(pFonts->GetSelectEntry());
return 0; return 0;
} }
...@@ -1762,13 +1770,13 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox ) ...@@ -1762,13 +1770,13 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox )
IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox ) IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox )
{ {
(void) pListBox; (void) pListBox;
sal_Int32 nPos = aFontsSubsetLB.GetSelectEntryPos(); sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos();
if (LISTBOX_ENTRY_NOTFOUND != nPos) if (LISTBOX_ENTRY_NOTFOUND != nPos)
{ {
const Subset* pSubset = reinterpret_cast<const Subset*> (aFontsSubsetLB.GetEntryData( nPos )); const Subset* pSubset = reinterpret_cast<const Subset*> (pFontsSubsetLB->GetEntryData( nPos ));
if (pSubset) if (pSubset)
{ {
aCharsetDisplay.SelectCharacter( pSubset->GetRangeMin() ); pCharsetDisplay->SelectCharacter( pSubset->GetRangeMin() );
} }
} }
return 0; return 0;
...@@ -1779,17 +1787,17 @@ IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox ) ...@@ -1779,17 +1787,17 @@ IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox )
{ {
(void) pComboBox; (void) pComboBox;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(pComboBox == &aStyles, "Sm : falsches Argument"); OSL_ENSURE(pComboBox == pStyles, "Sm : falsches Argument");
#endif #endif
SelectStyle(aStyles.GetText()); SelectStyle(pStyles->GetText());
return 0; return 0;
} }
IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl) IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
{ {
sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter(); sal_UCS4 cChar = pCharsetDisplay->GetSelectCharacter();
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE( pSubsetMap, "SubsetMap missing" ); OSL_ENSURE( pSubsetMap, "SubsetMap missing" );
...@@ -1798,12 +1806,12 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl) ...@@ -1798,12 +1806,12 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
{ {
const Subset* pSubset = pSubsetMap->GetSubsetByUnicode( cChar ); const Subset* pSubset = pSubsetMap->GetSubsetByUnicode( cChar );
if (pSubset) if (pSubset)
aFontsSubsetLB.SelectEntry( pSubset->GetName() ); pFontsSubsetLB->SelectEntry( pSubset->GetName() );
else else
aFontsSubsetLB.SetNoSelection(); pFontsSubsetLB->SetNoSelection();
} }
aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() ); pSymbolDisplay->SetSymbol( cChar, pCharsetDisplay->GetFont() );
UpdateButtons(); UpdateButtons();
...@@ -1812,8 +1820,8 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl) ...@@ -1812,8 +1820,8 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
const OUString aPattern( (aHex.getLength() > 4) ? OUString("Ux000000") : OUString("Ux0000") ); const OUString aPattern( (aHex.getLength() > 4) ? OUString("Ux000000") : OUString("Ux0000") );
OUString aUnicodePos( aPattern.copy( 0, aPattern.getLength() - aHex.getLength() ) ); OUString aUnicodePos( aPattern.copy( 0, aPattern.getLength() - aHex.getLength() ) );
aUnicodePos += aHex; aUnicodePos += aHex;
aSymbols.SetText( aUnicodePos ); pSymbols->SetText( aUnicodePos );
aSymbolName.SetText( aUnicodePos ); pSymbolName->SetText( aUnicodePos );
return 0; return 0;
} }
...@@ -1823,26 +1831,26 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton ) ...@@ -1823,26 +1831,26 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
{ {
(void) pButton; (void) pButton;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(pButton == &aAddBtn, "Sm : wrong argument"); OSL_ENSURE(pButton == pAddBtn, "Sm : wrong argument");
OSL_ENSURE(aAddBtn.IsEnabled(), "Sm : requirements met ??"); OSL_ENSURE(pAddBtn->IsEnabled(), "Sm : requirements met ??");
#endif #endif
// add symbol // add symbol
const SmSym aNewSymbol( aSymbols.GetText(), aCharsetDisplay.GetFont(), const SmSym aNewSymbol( pSymbols->GetText(), pCharsetDisplay->GetFont(),
aCharsetDisplay.GetSelectCharacter(), aSymbolSets.GetText() ); pCharsetDisplay->GetSelectCharacter(), pSymbolSets->GetText() );
//OSL_ENSURE( aSymbolMgrCopy.GetSymbolByName(aTmpSymbolName) == NULL, "symbol already exists" ); //OSL_ENSURE( aSymbolMgrCopy.GetSymbolByName(aTmpSymbolName) == NULL, "symbol already exists" );
aSymbolMgrCopy.AddOrReplaceSymbol( aNewSymbol ); aSymbolMgrCopy.AddOrReplaceSymbol( aNewSymbol );
// update display of new symbol // update display of new symbol
aSymbolDisplay.SetSymbol( &aNewSymbol ); pSymbolDisplay->SetSymbol( &aNewSymbol );
aSymbolName.SetText( aNewSymbol.GetName() ); pSymbolName->SetText( aNewSymbol.GetName() );
aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() ); pSymbolSetName->SetText( aNewSymbol.GetSymbolSetName() );
// update list box entries // update list box entries
FillSymbolSets(aOldSymbolSets, false); FillSymbolSets(*pOldSymbolSets, false);
FillSymbolSets(aSymbolSets, false); FillSymbolSets(*pSymbolSets, false);
FillSymbols(aOldSymbols ,false); FillSymbols(*pOldSymbols ,false);
FillSymbols(aSymbols ,false); FillSymbols(*pSymbols ,false);
UpdateButtons(); UpdateButtons();
...@@ -1854,20 +1862,20 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton ) ...@@ -1854,20 +1862,20 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
{ {
(void) pButton; (void) pButton;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(pButton == &aChangeBtn, "Sm : wrong argument"); OSL_ENSURE(pButton == pChangeBtn, "Sm : wrong argument");
OSL_ENSURE(aChangeBtn.IsEnabled(), "Sm : requirements met ??"); OSL_ENSURE(pChangeBtn->IsEnabled(), "Sm : requirements met ??");
#endif #endif
// get new Sybol to use // get new Sybol to use
//! get font from symbol-disp lay since charset-display does not keep //! get font from symbol-disp lay since charset-display does not keep
//! the bold attribut. //! the bold attribut.
const SmSym aNewSymbol( aSymbols.GetText(), aCharsetDisplay.GetFont(), const SmSym aNewSymbol( pSymbols->GetText(), pCharsetDisplay->GetFont(),
aCharsetDisplay.GetSelectCharacter(), aSymbolSets.GetText() ); pCharsetDisplay->GetSelectCharacter(), pSymbolSets->GetText() );
// remove old symbol if the name was changed then add new one // remove old symbol if the name was changed then add new one
const bool bNameChanged = aOldSymbols.GetText() != aSymbols.GetText(); const bool bNameChanged = pOldSymbols->GetText() != pSymbols->GetText();
if (bNameChanged) if (bNameChanged)
aSymbolMgrCopy.RemoveSymbol( aOldSymbols.GetText() ); aSymbolMgrCopy.RemoveSymbol( pOldSymbols->GetText() );
aSymbolMgrCopy.AddOrReplaceSymbol( aNewSymbol, true ); aSymbolMgrCopy.AddOrReplaceSymbol( aNewSymbol, true );
// clear display for original symbol if necessary // clear display for original symbol if necessary
...@@ -1875,15 +1883,15 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton ) ...@@ -1875,15 +1883,15 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
SetOrigSymbol(NULL, OUString()); SetOrigSymbol(NULL, OUString());
// update display of new symbol // update display of new symbol
aSymbolDisplay.SetSymbol( &aNewSymbol ); pSymbolDisplay->SetSymbol( &aNewSymbol );
aSymbolName.SetText( aNewSymbol.GetName() ); pSymbolName->SetText( aNewSymbol.GetName() );
aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() ); pSymbolSetName->SetText( aNewSymbol.GetSymbolSetName() );
// update list box entries // update list box entries
FillSymbolSets(aOldSymbolSets, false); FillSymbolSets(*pOldSymbolSets, false);
FillSymbolSets(aSymbolSets, false); FillSymbolSets(*pSymbolSets, false);
FillSymbols(aOldSymbols ,false); FillSymbols(*pOldSymbols ,false);
FillSymbols(aSymbols ,false); FillSymbols(*pSymbols ,false);
UpdateButtons(); UpdateButtons();
...@@ -1895,8 +1903,8 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton ) ...@@ -1895,8 +1903,8 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton )
{ {
(void) pButton; (void) pButton;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(pButton == &aDeleteBtn, "Sm : wrong argument"); OSL_ENSURE(pButton == pDeleteBtn, "Sm : wrong argument");
OSL_ENSURE(aDeleteBtn.IsEnabled(), "Sm : requirements met ??"); OSL_ENSURE(pDeleteBtn->IsEnabled(), "Sm : requirements met ??");
#endif #endif
if (pOrigSymbol) if (pOrigSymbol)
...@@ -1907,10 +1915,10 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton ) ...@@ -1907,10 +1915,10 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton )
SetOrigSymbol(NULL, OUString()); SetOrigSymbol(NULL, OUString());
// update list box entries // update list box entries
FillSymbolSets(aOldSymbolSets, false); FillSymbolSets(*pOldSymbolSets, false);
FillSymbolSets(aSymbolSets, false); FillSymbolSets(*pSymbolSets, false);
FillSymbols(aOldSymbols ,false); FillSymbols(*pOldSymbols ,false);
FillSymbols(aSymbols ,false); FillSymbols(*pSymbols ,false);
} }
UpdateButtons(); UpdateButtons();
...@@ -1924,21 +1932,21 @@ void SmSymDefineDialog::UpdateButtons() ...@@ -1924,21 +1932,21 @@ void SmSymDefineDialog::UpdateButtons()
bool bAdd = false, bool bAdd = false,
bChange = false, bChange = false,
bDelete = false; bDelete = false;
OUString aTmpSymbolName (aSymbols.GetText()), OUString aTmpSymbolName (pSymbols->GetText()),
aTmpSymbolSetName (aSymbolSets.GetText()); aTmpSymbolSetName (pSymbolSets->GetText());
if (aTmpSymbolName.getLength() > 0 && aTmpSymbolSetName.getLength() > 0) if (aTmpSymbolName.getLength() > 0 && aTmpSymbolSetName.getLength() > 0)
{ {
// are all settings equal? // are all settings equal?
//! (Font-, Style- und SymbolSet name comparison is not case sensitive) //! (Font-, Style- und SymbolSet name comparison is not case sensitive)
bool bEqual = pOrigSymbol bool bEqual = pOrigSymbol
&& aTmpSymbolSetName.equalsIgnoreAsciiCase(aOldSymbolSetName.GetText()) && aTmpSymbolSetName.equalsIgnoreAsciiCase(pOldSymbolSetName->GetText())
&& aTmpSymbolName.equals(pOrigSymbol->GetName()) && aTmpSymbolName.equals(pOrigSymbol->GetName())
&& aFonts.GetSelectEntry().equalsIgnoreAsciiCase( && pFonts->GetSelectEntry().equalsIgnoreAsciiCase(
pOrigSymbol->GetFace().GetName()) pOrigSymbol->GetFace().GetName())
&& aStyles.GetText().equalsIgnoreAsciiCase( && pStyles->GetText().equalsIgnoreAsciiCase(
GetFontStyles().GetStyleName(pOrigSymbol->GetFace())) GetFontStyles().GetStyleName(pOrigSymbol->GetFace()))
&& aCharsetDisplay.GetSelectCharacter() == pOrigSymbol->GetCharacter(); && pCharsetDisplay->GetSelectCharacter() == pOrigSymbol->GetCharacter();
// only add it if there isn't already a symbol with the same name // only add it if there isn't already a symbol with the same name
bAdd = aSymbolMgrCopy.GetSymbolByName(aTmpSymbolName) == NULL; bAdd = aSymbolMgrCopy.GetSymbolByName(aTmpSymbolName) == NULL;
...@@ -1950,9 +1958,9 @@ void SmSymDefineDialog::UpdateButtons() ...@@ -1950,9 +1958,9 @@ void SmSymDefineDialog::UpdateButtons()
bChange = pOrigSymbol && !bEqual; bChange = pOrigSymbol && !bEqual;
} }
aAddBtn .Enable(bAdd); pAddBtn ->Enable(bAdd);
aChangeBtn.Enable(bChange); pChangeBtn->Enable(bChange);
aDeleteBtn.Enable(bDelete); pDeleteBtn->Enable(bDelete);
} }
IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ) IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
...@@ -1961,51 +1969,38 @@ IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ ...@@ -1961,51 +1969,38 @@ IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/
Help* pHelp = Application::GetHelp(); Help* pHelp = Application::GetHelp();
if( pHelp ) if( pHelp )
{ {
pHelp->Start( OUString( "HID_SMA_SYMDEFINEDIALOG" ), &aHelpBtn ); pHelp->Start( OUString( "HID_SMA_SYMDEFINEDIALOG" ), pHelpBtn );
} }
return 0; return 0;
} }
SmSymDefineDialog::SmSymDefineDialog(Window * pParent, SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
OutputDevice *pFntListDevice, SmSymbolManager &rMgr, bool bFreeRes) : OutputDevice *pFntListDevice, SmSymbolManager &rMgr) :
ModalDialog (pParent, SmResId(RID_SYMDEFINEDIALOG)), ModalDialog (pParent, "EditSymbols", "modules/smath/ui/symdefinedialog.ui"),
aOldSymbolText (this, SmResId(1)),
aOldSymbols (this, SmResId(1)),
aOldSymbolSetText (this, SmResId(2)),
aOldSymbolSets (this, SmResId(2)),
aCharsetDisplay (this, SmResId(1)),
aSymbolText (this, SmResId(9)),
aSymbols (this, SmResId(4)),
aSymbolSetText (this, SmResId(10)),
aSymbolSets (this, SmResId(5)),
aFontText (this, SmResId(3)),
aFonts (this, SmResId(1)),
aFontsSubsetFT (this, SmResId( FT_FONTS_SUBSET )),
aFontsSubsetLB (this, SmResId( LB_FONTS_SUBSET )),
aStyleText (this, SmResId(4)),
aStyles (this, SmResId(3)),
aOldSymbolName (this, SmResId(7)),
aOldSymbolDisplay (this, SmResId(3)),
aOldSymbolSetName (this, SmResId(8)),
aSymbolName (this, SmResId(5)),
aSymbolDisplay (this, SmResId(2)),
aSymbolSetName (this, SmResId(6)),
aOkBtn (this, SmResId(1)),
aHelpBtn (this, SmResId(1)),
aCancelBtn (this, SmResId(1)),
aAddBtn (this, SmResId(1)),
aChangeBtn (this, SmResId(2)),
aDeleteBtn (this, SmResId(3)),
aRightArrow (this, SmResId(1)),
aRightArrow_Im (SmResId(1)),
rSymbolMgr (rMgr), rSymbolMgr (rMgr),
pSubsetMap (NULL), pSubsetMap (NULL),
pFontList (NULL) pFontList (NULL)
{ {
if (bFreeRes) get(pOldSymbols, "oldSymbols");
FreeResource(); get(pOldSymbolSets, "oldSymbolSets");
get(pCharsetDisplay, "charsetDisplay");
aHelpBtn.SetClickHdl(LINK(this, SmSymDefineDialog, HelpButtonClickHdl)); get(pSymbols, "symbols");
get(pSymbolSets, "symbolSets");
get(pFonts, "fonts");
get(pFontsSubsetLB, "fontsSubsetLB");
get(pStyles, "styles");
get(pOldSymbolName, "oldSymbolName");
get(pOldSymbolDisplay, "oldSymbolDisplay");
get(pOldSymbolSetName, "oldSymbolSetName");
get(pSymbolName, "symbolName");
get(pSymbolDisplay, "symbolDisplay");
get(pSymbolSetName, "symbolSetName");
get(pHelpBtn, "help");
get(pAddBtn, "add");
get(pChangeBtn, "modify");
get(pDeleteBtn, "delete");
pHelpBtn->SetClickHdl(LINK(this, SmSymDefineDialog, HelpButtonClickHdl));
pFontList = new FontList( pFntListDevice ); pFontList = new FontList( pFntListDevice );
...@@ -2013,35 +2008,35 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent, ...@@ -2013,35 +2008,35 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
// auto completion is troublesome since that symbols character also gets automatically selected in the // auto completion is troublesome since that symbols character also gets automatically selected in the
// display and if the user previously selected a character to define/redefine that one this is bad // display and if the user previously selected a character to define/redefine that one this is bad
aOldSymbols.EnableAutocomplete( false, true ); pOldSymbols->EnableAutocomplete( false, true );
aSymbols .EnableAutocomplete( false, true ); pSymbols->EnableAutocomplete( false, true );
FillFonts(); FillFonts();
if (aFonts.GetEntryCount() > 0) if (pFonts->GetEntryCount() > 0)
SelectFont(aFonts.GetEntry(0)); SelectFont(pFonts->GetEntry(0));
InitColor_Impl(); InitColor_Impl();
SetSymbolSetManager(rSymbolMgr); SetSymbolSetManager(rSymbolMgr);
aOldSymbols .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolChangeHdl)); pOldSymbols ->SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolChangeHdl));
aOldSymbolSets .SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolSetChangeHdl)); pOldSymbolSets ->SetSelectHdl(LINK(this, SmSymDefineDialog, OldSymbolSetChangeHdl));
aSymbolSets .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); pSymbolSets ->SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aOldSymbolSets .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); pOldSymbolSets ->SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aSymbols .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); pSymbols ->SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aOldSymbols .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); pOldSymbols ->SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aStyles .SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl)); pStyles ->SetModifyHdl(LINK(this, SmSymDefineDialog, ModifyHdl));
aFonts .SetSelectHdl(LINK(this, SmSymDefineDialog, FontChangeHdl)); pFonts ->SetSelectHdl(LINK(this, SmSymDefineDialog, FontChangeHdl));
aFontsSubsetLB .SetSelectHdl(LINK(this, SmSymDefineDialog, SubsetChangeHdl)); pFontsSubsetLB ->SetSelectHdl(LINK(this, SmSymDefineDialog, SubsetChangeHdl));
aStyles .SetSelectHdl(LINK(this, SmSymDefineDialog, StyleChangeHdl)); pStyles ->SetSelectHdl(LINK(this, SmSymDefineDialog, StyleChangeHdl));
aAddBtn .SetClickHdl (LINK(this, SmSymDefineDialog, AddClickHdl)); pAddBtn ->SetClickHdl (LINK(this, SmSymDefineDialog, AddClickHdl));
aChangeBtn .SetClickHdl (LINK(this, SmSymDefineDialog, ChangeClickHdl)); pChangeBtn ->SetClickHdl (LINK(this, SmSymDefineDialog, ChangeClickHdl));
aDeleteBtn .SetClickHdl (LINK(this, SmSymDefineDialog, DeleteClickHdl)); pDeleteBtn ->SetClickHdl (LINK(this, SmSymDefineDialog, DeleteClickHdl));
aCharsetDisplay.SetHighlightHdl( LINK( this, SmSymDefineDialog, CharHighlightHdl ) ); pCharsetDisplay ->SetHighlightHdl( LINK( this, SmSymDefineDialog, CharHighlightHdl ) );
// preview like controls should have a 2D look // preview like controls should have a 2D look
aOldSymbolDisplay.SetBorderStyle( WINDOW_BORDER_MONO ); pOldSymbolDisplay->SetBorderStyle( WINDOW_BORDER_MONO );
aSymbolDisplay .SetBorderStyle( WINDOW_BORDER_MONO ); pSymbolDisplay ->SetBorderStyle( WINDOW_BORDER_MONO );
} }
...@@ -2069,15 +2064,12 @@ void SmSymDefineDialog::InitColor_Impl() ...@@ -2069,15 +2064,12 @@ void SmSymDefineDialog::InitColor_Impl()
Color aTmpColor( nBgCol ); Color aTmpColor( nBgCol );
Wallpaper aWall( aTmpColor ); Wallpaper aWall( aTmpColor );
Color aTxtColor( nTxtCol ); Color aTxtColor( nTxtCol );
aCharsetDisplay .SetBackground( aWall ); pCharsetDisplay ->SetBackground( aWall );
aCharsetDisplay .SetTextColor( aTxtColor ); pCharsetDisplay ->SetTextColor( aTxtColor );
aOldSymbolDisplay.SetBackground( aWall ); pOldSymbolDisplay->SetBackground( aWall );
aOldSymbolDisplay.SetTextColor( aTxtColor ); pOldSymbolDisplay->SetTextColor( aTxtColor );
aSymbolDisplay .SetBackground( aWall ); pSymbolDisplay ->SetBackground( aWall );
aSymbolDisplay .SetTextColor( aTxtColor ); pSymbolDisplay ->SetTextColor( aTxtColor );
const Image &rArrowRight = aRightArrow_Im;
aRightArrow.SetImage( rArrowRight );
} }
...@@ -2111,18 +2103,18 @@ void SmSymDefineDialog::SetSymbolSetManager(const SmSymbolManager &rMgr) ...@@ -2111,18 +2103,18 @@ void SmSymDefineDialog::SetSymbolSetManager(const SmSymbolManager &rMgr)
// we can check later on if anything has been changed // we can check later on if anything has been changed
aSymbolMgrCopy.SetModified(false); aSymbolMgrCopy.SetModified(false);
FillSymbolSets(aOldSymbolSets); FillSymbolSets(*pOldSymbolSets);
if (aOldSymbolSets.GetEntryCount() > 0) if (pOldSymbolSets->GetEntryCount() > 0)
SelectSymbolSet(aOldSymbolSets.GetEntry(0)); SelectSymbolSet(pOldSymbolSets->GetEntry(0));
FillSymbolSets(aSymbolSets); FillSymbolSets(*pSymbolSets);
if (aSymbolSets.GetEntryCount() > 0) if (pSymbolSets->GetEntryCount() > 0)
SelectSymbolSet(aSymbolSets.GetEntry(0)); SelectSymbolSet(pSymbolSets->GetEntry(0));
FillSymbols(aOldSymbols); FillSymbols(*pOldSymbols);
if (aOldSymbols.GetEntryCount() > 0) if (pOldSymbols->GetEntryCount() > 0)
SelectSymbol(aOldSymbols.GetEntry(0)); SelectSymbol(pOldSymbols->GetEntry(0));
FillSymbols(aSymbols); FillSymbols(*pSymbols);
if (aSymbols.GetEntryCount() > 0) if (pSymbols->GetEntryCount() > 0)
SelectSymbol(aSymbols.GetEntry(0)); SelectSymbol(pSymbols->GetEntry(0));
UpdateButtons(); UpdateButtons();
} }
...@@ -2132,7 +2124,7 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox, ...@@ -2132,7 +2124,7 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
const OUString &rSymbolSetName, bool bDeleteText) const OUString &rSymbolSetName, bool bDeleteText)
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(&rComboBox == &aOldSymbolSets || &rComboBox == &aSymbolSets, OSL_ENSURE(&rComboBox == pOldSymbolSets || &rComboBox == pSymbolSets,
"Sm : wrong ComboBox"); "Sm : wrong ComboBox");
#endif #endif
...@@ -2154,23 +2146,23 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox, ...@@ -2154,23 +2146,23 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
else if (bDeleteText) else if (bDeleteText)
rComboBox.SetText(OUString()); rComboBox.SetText(OUString());
bool bIsOld = &rComboBox == &aOldSymbolSets; bool bIsOld = &rComboBox == pOldSymbolSets;
// setting the SymbolSet name at the associated display // setting the SymbolSet name at the associated display
FixedText &rFT = bIsOld ? aOldSymbolSetName : aSymbolSetName; FixedText &rFT = bIsOld ? *pOldSymbolSetName : *pSymbolSetName;
rFT.SetText(rComboBox.GetText()); rFT.SetText(rComboBox.GetText());
// set the symbol name which belongs to the SymbolSet at the associated combobox // set the symbol name which belongs to the SymbolSet at the associated combobox
ComboBox &rCB = bIsOld ? aOldSymbols : aSymbols; ComboBox &rCB = bIsOld ? *pOldSymbols : *pSymbols;
FillSymbols(rCB, false); FillSymbols(rCB, false);
// display a valid respectively no symbol when changing the SymbolSets // display a valid respectively no symbol when changing the SymbolSets
if (bIsOld) if (bIsOld)
{ {
OUString aTmpOldSymbolName; OUString aTmpOldSymbolName;
if (aOldSymbols.GetEntryCount() > 0) if (pOldSymbols->GetEntryCount() > 0)
aTmpOldSymbolName = aOldSymbols.GetEntry(0); aTmpOldSymbolName = pOldSymbols->GetEntry(0);
SelectSymbol(aOldSymbols, aTmpOldSymbolName, true); SelectSymbol(*pOldSymbols, aTmpOldSymbolName, true);
} }
UpdateButtons(); UpdateButtons();
...@@ -2195,15 +2187,15 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol, ...@@ -2195,15 +2187,15 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol,
aSymName = pSymbol->GetName(); aSymName = pSymbol->GetName();
aSymSetName = rSymbolSetName; aSymSetName = rSymbolSetName;
aOldSymbolDisplay.SetSymbol( pSymbol ); pOldSymbolDisplay->SetSymbol( pSymbol );
} }
else else
{ // delete displayed symbols { // delete displayed symbols
aOldSymbolDisplay.SetText(OUString()); pOldSymbolDisplay->SetText(OUString());
aOldSymbolDisplay.Invalidate(); pOldSymbolDisplay->Invalidate();
} }
aOldSymbolName .SetText(aSymName); pOldSymbolName->SetText(aSymName);
aOldSymbolSetName.SetText(aSymSetName); pOldSymbolSetName->SetText(aSymSetName);
} }
...@@ -2211,7 +2203,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, ...@@ -2211,7 +2203,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
const OUString &rSymbolName, bool bDeleteText) const OUString &rSymbolName, bool bDeleteText)
{ {
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(&rComboBox == &aOldSymbols || &rComboBox == &aSymbols, OSL_ENSURE(&rComboBox == pOldSymbols || &rComboBox == pSymbols,
"Sm : wrong ComboBox"); "Sm : wrong ComboBox");
#endif #endif
...@@ -2223,7 +2215,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, ...@@ -2223,7 +2215,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
bool bRet = false; bool bRet = false;
sal_Int32 nPos = rComboBox.GetEntryPos(aNormName); sal_Int32 nPos = rComboBox.GetEntryPos(aNormName);
bool bIsOld = &rComboBox == &aOldSymbols; bool bIsOld = &rComboBox == pOldSymbols;
if (nPos != COMBOBOX_ENTRY_NOTFOUND) if (nPos != COMBOBOX_ENTRY_NOTFOUND)
{ {
...@@ -2231,7 +2223,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, ...@@ -2231,7 +2223,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
if (!bIsOld) if (!bIsOld)
{ {
const SmSym *pSymbol = GetSymbol(aSymbols); const SmSym *pSymbol = GetSymbol(*pSymbols);
if (pSymbol) if (pSymbol)
{ {
// choose font and style accordingly // choose font and style accordingly
...@@ -2242,15 +2234,15 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, ...@@ -2242,15 +2234,15 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
// Since setting the Font via the Style name of the SymbolFonts doesn't // Since setting the Font via the Style name of the SymbolFonts doesn't
// work really well (e.g. it can be empty even though the font itself is // work really well (e.g. it can be empty even though the font itself is
// bold or italic) we're manually setting the Font with respect to the Symbol // bold or italic) we're manually setting the Font with respect to the Symbol
aCharsetDisplay.SetFont(rFont); pCharsetDisplay->SetFont(rFont);
aSymbolDisplay.SetFont(rFont); pSymbolDisplay->SetFont(rFont);
// select associated character // select associated character
SelectChar(pSymbol->GetCharacter()); SelectChar(pSymbol->GetCharacter());
// since SelectChar will also set the unicode point as text in the // since SelectChar will also set the unicode point as text in the
// symbols box, we have to set the symbol name again to get that one displayed // symbols box, we have to set the symbol name again to get that one displayed
aSymbols.SetText( pSymbol->GetName() ); pSymbols->SetText( pSymbol->GetName() );
} }
} }
...@@ -2267,12 +2259,12 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, ...@@ -2267,12 +2259,12 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
if (nPos != COMBOBOX_ENTRY_NOTFOUND) if (nPos != COMBOBOX_ENTRY_NOTFOUND)
{ {
pOldSymbol = aSymbolMgrCopy.GetSymbolByName(aNormName); pOldSymbol = aSymbolMgrCopy.GetSymbolByName(aNormName);
aTmpOldSymbolSetName = aOldSymbolSets.GetText(); aTmpOldSymbolSetName = pOldSymbolSets->GetText();
} }
SetOrigSymbol(pOldSymbol, aTmpOldSymbolSetName); SetOrigSymbol(pOldSymbol, aTmpOldSymbolSetName);
} }
else else
aSymbolName.SetText(rComboBox.GetText()); pSymbolName->SetText(rComboBox.GetText());
UpdateButtons(); UpdateButtons();
...@@ -2288,54 +2280,54 @@ void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyl ...@@ -2288,54 +2280,54 @@ void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyl
aFI = pFontList->Get(rFontName, WEIGHT_NORMAL, ITALIC_NONE); aFI = pFontList->Get(rFontName, WEIGHT_NORMAL, ITALIC_NONE);
SetFontStyle(rStyleName, aFI); SetFontStyle(rStyleName, aFI);
aCharsetDisplay.SetFont(aFI); pCharsetDisplay->SetFont(aFI);
aSymbolDisplay.SetFont(aFI); pSymbolDisplay->SetFont(aFI);
// update subset listbox for new font's unicode subsets // update subset listbox for new font's unicode subsets
FontCharMap aFontCharMap; FontCharMap aFontCharMap;
aCharsetDisplay.GetFontCharMap( aFontCharMap ); pCharsetDisplay->GetFontCharMap( aFontCharMap );
if (pSubsetMap) if (pSubsetMap)
delete pSubsetMap; delete pSubsetMap;
pSubsetMap = new SubsetMap( &aFontCharMap ); pSubsetMap = new SubsetMap( &aFontCharMap );
aFontsSubsetLB.Clear(); pFontsSubsetLB->Clear();
bool bFirst = true; bool bFirst = true;
const Subset* pSubset; const Subset* pSubset;
while( NULL != (pSubset = pSubsetMap->GetNextSubset( bFirst )) ) while( NULL != (pSubset = pSubsetMap->GetNextSubset( bFirst )) )
{ {
sal_uInt16 nPos = aFontsSubsetLB.InsertEntry( pSubset->GetName()); sal_uInt16 nPos = pFontsSubsetLB->InsertEntry( pSubset->GetName());
aFontsSubsetLB.SetEntryData( nPos, (void *) pSubset ); pFontsSubsetLB->SetEntryData( nPos, (void *) pSubset );
// subset must live at least as long as the selected font !!! // subset must live at least as long as the selected font !!!
if( bFirst ) if( bFirst )
aFontsSubsetLB.SelectEntryPos( nPos ); pFontsSubsetLB->SelectEntryPos( nPos );
bFirst = false; bFirst = false;
} }
if( bFirst ) if( bFirst )
aFontsSubsetLB.SetNoSelection(); pFontsSubsetLB->SetNoSelection();
aFontsSubsetLB.Enable( !bFirst ); pFontsSubsetLB->Enable( !bFirst );
} }
bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont) bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont)
{ {
bool bRet = false; bool bRet = false;
sal_Int32 nPos = aFonts.GetEntryPos(rFontName); sal_Int32 nPos = pFonts->GetEntryPos(rFontName);
if (nPos != LISTBOX_ENTRY_NOTFOUND) if (nPos != LISTBOX_ENTRY_NOTFOUND)
{ {
aFonts.SelectEntryPos(nPos); pFonts->SelectEntryPos(nPos);
if (aStyles.GetEntryCount() > 0) if (pStyles->GetEntryCount() > 0)
SelectStyle(aStyles.GetEntry(0)); SelectStyle(pStyles->GetEntry(0));
if (bApplyFont) if (bApplyFont)
{ {
SetFont(aFonts.GetSelectEntry(), aStyles.GetText()); SetFont(pFonts->GetSelectEntry(), pStyles->GetText());
bRet = true; bRet = true;
aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() ); pSymbolDisplay->SetSymbol( pCharsetDisplay->GetSelectCharacter(), pCharsetDisplay->GetFont() );
} }
bRet = true; bRet = true;
} }
else else
aFonts.SetNoSelection(); pFonts->SetNoSelection();
FillStyles(); FillStyles();
UpdateButtons(); UpdateButtons();
...@@ -2347,25 +2339,25 @@ bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont) ...@@ -2347,25 +2339,25 @@ bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont)
bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont) bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont)
{ {
bool bRet = false; bool bRet = false;
sal_Int32 nPos = aStyles.GetEntryPos(rStyleName); sal_Int32 nPos = pStyles->GetEntryPos(rStyleName);
// if the style is not available take the first available one (if existent) // if the style is not available take the first available one (if existent)
if (nPos == COMBOBOX_ENTRY_NOTFOUND && aStyles.GetEntryCount() > 0) if (nPos == COMBOBOX_ENTRY_NOTFOUND && pStyles->GetEntryCount() > 0)
nPos = 0; nPos = 0;
if (nPos != COMBOBOX_ENTRY_NOTFOUND) if (nPos != COMBOBOX_ENTRY_NOTFOUND)
{ {
aStyles.SetText(aStyles.GetEntry(nPos)); pStyles->SetText(pStyles->GetEntry(nPos));
if (bApplyFont) if (bApplyFont)
{ {
SetFont(aFonts.GetSelectEntry(), aStyles.GetText()); SetFont(pFonts->GetSelectEntry(), pStyles->GetText());
bRet = true; bRet = true;
aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() ); pSymbolDisplay->SetSymbol( pCharsetDisplay->GetSelectCharacter(), pCharsetDisplay->GetFont() );
} }
bRet = true; bRet = true;
} }
else else
aStyles.SetText(OUString()); pStyles->SetText(OUString());
UpdateButtons(); UpdateButtons();
...@@ -2375,8 +2367,8 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont) ...@@ -2375,8 +2367,8 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont)
void SmSymDefineDialog::SelectChar(sal_Unicode cChar) void SmSymDefineDialog::SelectChar(sal_Unicode cChar)
{ {
aCharsetDisplay.SelectCharacter( cChar ); pCharsetDisplay->SelectCharacter( cChar );
aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() ); pSymbolDisplay->SetSymbol( cChar, pCharsetDisplay->GetFont() );
UpdateButtons(); UpdateButtons();
} }
......
starmath/source/smres.src
Dosyayı görüntüle @ 26fdfce8
...@@ -21,243 +21,9 @@ ...@@ -21,243 +21,9 @@
#include <sfx2/tabpage.hrc> #include <sfx2/tabpage.hrc>
#include <svx/globlmn.hrc> #include <svx/globlmn.hrc>
#include "starmath.hrc" #include "starmath.hrc"
#include "dialog.hrc"
#include "toolbox.hrc" #include "toolbox.hrc"
#include "smcommands.h" #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 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." ; 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." ;
......
starmath/uiconfig/smath/ui/symdefinedialog.ui 0 → 100644
Dosyayı görüntüle @ 26fdfce8
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="EditSymbols">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Edit Symbols</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="oldSymbolText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="yalign">0.49000000953674316</property>
<property name="label" translatable="yes">_Old symbol</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">oldSymbols</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="oldSymbolSetText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.56000000238418579</property>
<property name="label" translatable="yes">O_ld symbol set</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">oldSymbolSets</property>
<property name="ellipsize">start</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="oldSymbols">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="oldSymbolSets">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry1">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="svxlo-SvxShowCharSet" id="charsetDisplay">
<property name="width_request">400</property>
<property name="height_request">250</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">end</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">24</property>
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="symbolText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Symbol</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">symbols</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="symbolSetText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="yalign">0.51999998092651367</property>
<property name="label" translatable="yes">Symbol s_et</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">symbolSets</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="fontText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Font</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fonts</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="styleText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Typeface</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">styles</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="fontsSubsetFT">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Subset</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fontsSubsetLB</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="fonts">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="fontsSubsetLB">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svtlo-FontStyleBox" id="styles">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="symbols">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry2">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="symbolSets">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry3">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkLabel" id="oldSymbolName">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="yalign">0.49000000953674316</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="smlo-SmShowChar" id="oldSymbolDisplay">
<property name="width_request">60</property>
<property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="oldSymbolSetName">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="symbolName">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.50999999046325684</property>
<property name="yalign">0.49000000953674316</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="smlo-SmShowChar" id="symbolDisplay">
<property name="width_request">60</property>
<property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="symbolSetName">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<property name="label">gtk-delete</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">half</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="modify">
<property name="label" translatable="yes">_Modify</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="add">
<property name="label">gtk-add</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkImage" id="rightArrow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">starmath/res/ar_right.png</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="image_position">bottom</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment