Skip to content

C
core
Kaydet (Commit) 4bbf3557 authored tarafından Szymon Kłos's avatar Szymon Kłos Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

RID_SVXDLG_IMAP conversion to .ui 

Change-Id: I6d0ecb693177436a47d1115cdab6d5ec20254f4f
Reviewed-on: https://gerrit.libreoffice.org/10105Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 33c36fb9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 267 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 4bbf3557
......@@ -749,5 +749,8 @@
generic-name="Formula ListBox" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Statusbar" name="svxlo-StatusBar"
generic-name="Statusbar" parent="GtkStatusbar"
icon-name="widget-gtk-statusbar"/>
</glade-widget-classes>
</glade-catalog>
include/svx/imapdlg.hxx
Dosyayı görüntüle @ 4bbf3557
......@@ -82,16 +82,52 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
friend class IMapOwnData;
friend class IMapWindow;
ToolBox aTbxIMapDlg1;
FixedText aFtURL;
SvtURLBox maURLBox;
FixedText aFtText;
Edit aEdtText;
FixedText maFtTarget;
ComboBox maCbbTarget;
StatusBar aStbStatus;
ToolBox *m_pTbxIMapDlg1;
FixedText *m_pFtURL;
SvtURLBox *m_pURLBox;
FixedText *m_pFtText;
Edit *m_pEdtText;
FixedText *m_pFtTarget;
ComboBox *m_pCbbTarget;
StatusBar *m_pStbStatus;
ImageList maImageList;
sal_uInt16 mnApplyId;
sal_uInt16 mnOpenId;
sal_uInt16 mnSaveAsId;
sal_uInt16 mnSelectId;
sal_uInt16 mnRectId;
sal_uInt16 mnCircleId;
sal_uInt16 mnPolyId;
sal_uInt16 mnFreePolyId;
sal_uInt16 mnPolyEditId;
sal_uInt16 mnPolyMoveId;
sal_uInt16 mnPolyInsertId;
sal_uInt16 mnPolyDeleteId;
sal_uInt16 mnUndoId;
sal_uInt16 mnRedoId;
sal_uInt16 mnActiveId;
sal_uInt16 mnMacroId;
sal_uInt16 mnPropertyId;
Image maApplyImg;
Image maOpenImg;
Image maSaveAsImg;
Image maSelectImg;
Image maRectImg;
Image maCircleImg;
Image maPolyImg;
Image maFreePolyImg;
Image maPolyEditImg;
Image maPolyMoveImg;
Image maPolyInsertImg;
Image maPolyDeleteImg;
Image maUndoImg;
Image maRedoImg;
Image maActiveImg;
Image maMacroImg;
Image maPropertyImg;
Size aLastSize;
IMapWindow* pIMapWnd;
IMapOwnData* pOwnData;
......@@ -118,7 +154,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
public:
SvxIMapDlg( SfxBindings *pBindings, SfxChildWindow *pCW,
Window* pParent, const ResId& rResId );
Window* pParent );
virtual ~SvxIMapDlg();
void SetExecState( bool bEnable );
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 4bbf3557
......@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/fontworkgallerydialog \
svx/uiconfig/ui/fontworkspacingdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/imapdialog \
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/namespacedialog \
svx/uiconfig/ui/optgridpage \
......
svx/source/dialog/imapdlg.cxx
Dosyayı görüntüle @ 4bbf3557
This diff is collapsed.
svx/source/dialog/imapdlg.hrc
Dosyayı görüntüle @ 4bbf3557
......@@ -23,10 +23,6 @@
/******************************************************************************/
#define RID_SVXDLG_IMAP (RID_SVX_IMAPDLG_START)
#define RID_SVXCTL_IMAP (RID_SVX_IMAPDLG_START + 7)
#define TBX_IMAPDLG1 1
#define TBI_APPLY 1
#define TBI_OPEN 2
#define TBI_SAVEAS 3
......@@ -49,13 +45,6 @@
#define TBI_UNDO 40
#define TBI_REDO 41
#define FT_URL 1
#define FT_TEXT 2
#define CBB_URL 1
#define EDT_TEXT 1
#define STB_STATUS 1
#define IL_IMAPDLG 1024
/******************************************************************************/
......
svx/source/dialog/imapdlg.src
Dosyayı görüntüle @ 4bbf3557
......@@ -20,253 +20,34 @@
#include "helpid.hrc"
#include "imapdlg.hrc"
// RID_SVXDLG_IMAP ----------------------------------------------------
ModelessDialog RID_SVXDLG_IMAP
{
HelpID = "svx:ModelessDialog:RID_SVXDLG_IMAP";
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 270 , 213 ) ;
Sizeable = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
ToolBox TBX_IMAPDLG1
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 6 ) ;
HelpId = HID_IMAPDLG_TOOLBOX ;
ItemList =
{
ToolBoxItem
{
Identifier = TBI_APPLY ;
HelpId = HID_IMAPDLG_APPLY ;
Text [ en-US ] = "Apply" ;
};
ToolBoxItem
{
Identifier = TBI_OPEN ;
HelpId = HID_IMAPDLG_OPEN ;
Text [ en-US ] = "Open..." ;
};
ToolBoxItem
{
Identifier = TBI_SAVEAS ;
HelpId = HID_IMAPDLG_SAVEAS ;
Text [ en-US ] = "Save..." ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
Identifier = TBI_SELECT ;
HelpId = HID_IMAPDLG_SELECT ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
Text [ en-US ] = "Select" ;
};
ToolBoxItem
{
Identifier = TBI_RECT ;
HelpId = HID_IMAPDLG_RECT ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
Text [ en-US ] = "Rectangle" ;
};
ToolBoxItem
{
Identifier = TBI_CIRCLE ;
HelpId = HID_IMAPDLG_CIRCLE ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
Text [ en-US ] = "Ellipse" ;
};
ToolBoxItem
{
Identifier = TBI_POLY ;
HelpId = HID_IMAPDLG_POLY ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
Text [ en-US ] = "Polygon" ;
};
ToolBoxItem
{
Identifier = TBI_FREEPOLY ;
HelpId = HID_IMAPDLG_FREEPOLY ;
Text [ en-US ] = "Freeform Polygon" ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
Identifier = TBI_POLYEDIT ;
HelpId = HID_IMAPDLG_POLYEDIT ;
Text [ en-US ] = "Edit Points" ;
AutoCheck = TRUE ;
};
ToolBoxItem
{
Identifier = TBI_POLYMOVE ;
HelpId = HID_IMAPDLG_POLYMOVE ;
Text [ en-US ] = "Move Points" ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
};
ToolBoxItem
{
Identifier = TBI_POLYINSERT ;
HelpId = HID_IMAPDLG_POLYINSERT ;
Text [ en-US ] = "Insert Points" ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
};
ToolBoxItem
{
Identifier = TBI_POLYDELETE ;
HelpId = HID_IMAPDLG_POLYDELETE ;
Text [ en-US ] = "Delete Points" ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
Identifier = TBI_UNDO ;
HelpId = HID_IMAPDLG_UNDO ;
Text [ en-US ] = "Undo " ;
};
ToolBoxItem
{
Identifier = TBI_REDO ;
HelpId = HID_IMAPDLG_REDO ;
Text [ en-US ] = "Redo" ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
Identifier = TBI_ACTIVE ;
HelpId = HID_IMAPDLG_ACTIVE ;
Text [ en-US ] = "Active" ;
};
ToolBoxItem
{
Identifier = TBI_MACRO ;
HelpId = HID_IMAPDLG_MACRO ;
Text [ en-US ] = "Macro..." ;
};
ToolBoxItem
{
Identifier = TBI_PROPERTY ;
HelpId = HID_IMAPDLG_PROPERTY ;
Text [ en-US ] = "Properties..." ;
};
};
};
FixedText FT_URL
{
Pos = MAP_APPFONT ( 6 , 25 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Text [ en-US ] = "Address:" ;
};
ComboBox CBB_URL
{
HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL";
Pos = MAP_APPFONT ( 39 , 23 ) ;
Size = MAP_APPFONT ( 225 , 69 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
AutoSize = TRUE ;
AutoHScroll = TRUE ;
};
FixedText FT_TEXT
{
Pos = MAP_APPFONT ( 6 , 43 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Text [ en-US ] = "Text:" ;
};
Edit EDT_TEXT
{
HelpID = "svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT";
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 39 , 41 ) ;
Size = MAP_APPFONT ( 143 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
};
Text [ en-US ] = "ImageMap Editor" ;
FixedText RID_SVXCTL_FT_TARGET
{
Pos = MAP_APPFONT ( 188 , 43 ) ;
Size = MAP_APPFONT ( 22 , 12 ) ;
Text [ en-US ] = "Frame:" ;
};
// nur temporaer
ComboBox RID_SVXCTL_CBB_TARGET
{
HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:RID_SVXCTL_CBB_TARGET";
Border = TRUE ;
Sort = TRUE ;
Pos = MAP_APPFONT ( 213 , 41 ) ;
Size = MAP_APPFONT ( 51 , 50 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
HScroll = TRUE ;
};
#define IMAPDLG_IDLIST \
IdList = \
{ \
TBI_APPLY ; \
TBI_OPEN ; \
TBI_SAVEAS ; \
TBI_SELECT ; \
TBI_RECT ; \
TBI_CIRCLE ; \
TBI_POLY ; \
TBI_FREEPOLY ; \
TBI_POLYEDIT ; \
TBI_POLYMOVE ; \
TBI_POLYINSERT ; \
TBI_POLYDELETE ; \
TBI_UNDO ; \
TBI_REDO ; \
TBI_ACTIVE ; \
TBI_MACRO ; \
TBI_PROPERTY ; \
}; \
IdCount = { 17 ; };
ImageList IL_IMAPDLG
{
Prefix = "id";
MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
IMAPDLG_IDLIST
};
};
IdList = \
{ \
TBI_APPLY ; \
TBI_OPEN ; \
TBI_SAVEAS ; \
TBI_SELECT ; \
TBI_RECT ; \
TBI_CIRCLE ; \
TBI_POLY ; \
TBI_FREEPOLY ; \
TBI_POLYEDIT ; \
TBI_POLYMOVE ; \
TBI_POLYINSERT ; \
TBI_POLYDELETE ; \
TBI_UNDO ; \
TBI_REDO ; \
TBI_ACTIVE ; \
TBI_MACRO ; \
TBI_PROPERTY ; \
}; \
IdCount = { 17 ; };
Control RID_SVXCTL_IMAP
ImageList IL_IMAPDLG
{
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 56 ) ;
HelpId = HID_IMAPDLG_GRAPHWND ;
Prefix = "id";
MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
IMAPDLG_IDLIST
};
/******************************************************************************/
......
svx/source/dialog/imapwnd.cxx
Dosyayı görüntüle @ 4bbf3557
......@@ -55,8 +55,8 @@ using ::com::sun::star::uno::Reference;
#define TRANSCOL Color( COL_WHITE )
IMapWindow::IMapWindow( Window* pParent, const ResId& rResId, const Reference< XFrame >& rxDocumentFrame ) :
GraphCtrl( pParent, rResId ),
IMapWindow::IMapWindow( Window* pParent, WinBits nBits, const Reference< XFrame >& rxDocumentFrame ) :
GraphCtrl( pParent, nBits ),
DropTargetHelper( this ),
mxDocumentFrame( rxDocumentFrame )
{
......
svx/source/dialog/imapwnd.hxx
Dosyayı görüntüle @ 4bbf3557
......@@ -131,7 +131,7 @@ protected:
public:
IMapWindow( Window* pParent, const ResId& rResId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame );
IMapWindow( Window* pParent, WinBits nBits, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame );
virtual ~IMapWindow();
bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
......
svx/uiconfig/ui/imapdialog.ui 0 → 100644
Dosyayı görüntüle @ 4bbf3557
This diff is collapsed.
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