Skip to content

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

RID_SVX_XFORMS_TABPAGES conversion to .ui 

Change-Id: I0f3647e95b2150eb8753aa333eeb492fee76bd2a
Reviewed-on: https://gerrit.libreoffice.org/10192Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f021524a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 75 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 713735fc
......@@ -752,5 +752,8 @@
<glade-widget-class title="Statusbar" name="svxlo-StatusBar"
generic-name="Statusbar" parent="GtkStatusbar"
icon-name="widget-gtk-statusbar"/>
<glade-widget-class title="DataTreeListBox" name="svxlo-DataTreeListBox"
generic-name="DataTreeListBox" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/>
</glade-widget-classes>
</glade-catalog>
include/svx/fmresids.hrc
Dosyayı görüntüle @ 713735fc
......@@ -26,6 +26,7 @@
// ImageList-Id's -----------------------------------------------------------
#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0)
#define RID_SVXIMGLIST_XFORMS_TBX (RID_FORMS_START + 1)
// Image-Id's -----------------------------------------------------------
#define RID_SVXIMG_FORM SID_FM_CONFIG
......@@ -63,7 +64,6 @@
#define RID_SVX_FMEXPLORER (RID_FORMS_START + 6)
#define RID_SVXWIN_DATANAVIGATOR (RID_FORMS_START + 19)
#define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)
// Toolbars ------------------------------------------------------------
#define RID_SVXTBX_FORM_NAVIGATION (RID_FORMS_START + 1)
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 713735fc
......@@ -56,6 +56,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/sidebartextpanel \
svx/uiconfig/ui/textcontrolchardialog \
svx/uiconfig/ui/textcontrolparadialog \
svx/uiconfig/ui/xformspage \
))
# vim: set noet sw=4 ts=4:
svx/source/form/datanavi.cxx
Dosyayı görüntüle @ 713735fc
This diff is collapsed.
svx/source/form/datanavi.src
Dosyayı görüntüle @ 713735fc
......@@ -24,63 +24,6 @@
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
TabPage RID_SVX_XFORMS_TABPAGES
{
HelpID = "svx:TabPage:RID_SVX_XFORMS_TABPAGES";
Hide = TRUE ;
DialogControl = TRUE;
Size = MAP_APPFONT ( 63 , 100 ) ;
ToolBox TB_ITEMS
{
HelpId = HID_XFORMS_TOOLBOX ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
ItemList =
{
ToolBoxItem
{
Identifier = TBI_ITEM_ADD ;
HelpId = HID_XFORMS_TOOLBOX_ITEM_ADD ;
Text [ en-US ] = "Add Item" ;
};
ToolBoxItem
{
Identifier = TBI_ITEM_ADD_ELEMENT ;
HelpId = HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT ;
Text [ en-US ] = "Add Element" ;
};
ToolBoxItem
{
Identifier = TBI_ITEM_ADD_ATTRIBUTE ;
HelpId = HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE ;
Text [ en-US ] = "Add Attribute" ;
};
ToolBoxItem
{
Identifier = TBI_ITEM_EDIT ;
HelpId = HID_XFORMS_TOOLBOX_ITEM_EDIT ;
Text [ en-US ] = "Edit" ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
Identifier = TBI_ITEM_REMOVE ;
HelpId = HID_XFORMS_TOOLBOX_ITEM_REMOVE ;
Text [ en-US ] = "Delete" ;
};
};
};
Control LB_ITEMS
{
HelpId = HID_XFORMS_ITEMS_LIST ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 63 , 100 ) ;
Border = TRUE ;
TabStop = TRUE;
};
#define IMG_LST \
IdList = \
{ \
......@@ -92,14 +35,13 @@ IdList = \
}; \
IdCount = { 5 ; } ;
ImageList IL_TBX_BMPS
{
Prefix = "tb";
MASKCOLOR
IMG_LST
};
#undef IMG_LST
ImageList RID_SVXIMGLIST_XFORMS_TBX
{
Prefix = "tb";
MASKCOLOR
IMG_LST
};
#undef IMG_LST
Window RID_SVXWIN_DATANAVIGATOR
{
......
svx/source/inc/datanavi.hrc
Dosyayı görüntüle @ 713735fc
......@@ -21,9 +21,6 @@
#define _SVX_DATANAVI_HRC
// class XFormsInstancePage
// Controls
#define TB_ITEMS 10
#define LB_ITEMS 11
// Menu items
#define MID_INSERT_CONTROL 100
......@@ -35,9 +32,6 @@
#define TBI_ITEM_EDIT 13
#define TBI_ITEM_REMOVE 14
// ImageLists
#define IL_TBX_BMPS 20
// ImageIndexes
#define IID_ITEM_ADD 1
#define IID_ITEM_ADD_ELEMENT 2
......
svx/source/inc/datanavi.hxx
Dosyayı görüntüle @ 713735fc
......@@ -117,12 +117,17 @@ namespace svxform
private:
XFormsPage* m_pXFormsPage;
DataGroupType m_eGroup;
sal_uInt16 m_nAddId;
sal_uInt16 m_nAddElementId;
sal_uInt16 m_nAddAttributeId;
sal_uInt16 m_nEditId;
sal_uInt16 m_nRemoveId;
protected:
using SvTreeListBox::ExecuteDrop;
public:
DataTreeListBox( XFormsPage* pPage, DataGroupType _eGroup, const ResId& rResId );
DataTreeListBox( Window* pParent, WinBits nBits );
virtual ~DataTreeListBox();
virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE;
......@@ -131,6 +136,13 @@ namespace svxform
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
void SetGroup(DataGroupType _eGroup);
void SetXFormsPage(XFormsPage* _pPage);
void SetToolBoxItemIds(sal_uInt16 _nAddId,
sal_uInt16 _nAddElementId,
sal_uInt16 _nAddAttributeId,
sal_uInt16 _nEditId,
sal_uInt16 _nRemoveId);
void DeleteAndClear();
void RemoveEntry( SvTreeListEntry* _pEntry );
};
......@@ -237,8 +249,13 @@ namespace svxform
MethodString m_aMethodString;
ReplaceString m_aReplaceString;
ToolBox m_aToolBox;
DataTreeListBox m_aItemList;
ToolBox *m_pToolBox;
DataTreeListBox *m_pItemList;
sal_uInt16 m_nAddId;
sal_uInt16 m_nAddElementId;
sal_uInt16 m_nAddAttributeId;
sal_uInt16 m_nEditId;
sal_uInt16 m_nRemoveId;
XFormsUIHelper1_ref m_xUIHelper;
......@@ -284,7 +301,7 @@ namespace svxform
bool DoMenuAction( sal_uInt16 _nMenuID );
void EnableMenuItems( Menu* _pMenu );
inline SvTreeListEntry* GetSelectedItem() const { return m_aItemList.FirstSelected(); }
inline SvTreeListEntry* GetSelectedItem() const { return m_pItemList->FirstSelected(); }
inline const OUString& GetInstanceName() const { return m_sInstanceName; }
inline const OUString& GetInstanceURL() const { return m_sInstanceURL; }
inline bool GetLinkOnce() const { return m_bLinkOnce; }
......
svx/uiconfig/ui/xformspage.ui 0 → 100644
Dosyayı görüntüle @ 713735fc
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="XFormsPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<child>
<object class="GtkToolButton" id="TBI_ITEM_ADD">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">TBI_ITEM_ADD</property>
<property name="label" translatable="yes">Add Item</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="TBI_ITEM_ADD_ELEMENT">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">TBI_ITEM_ADD_ELEMENT</property>
<property name="label" translatable="yes">Add Element</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="TBI_ITEM_ADD_ATTRIBUTE">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">TBI_ITEM_ADD_ATTRIBUTE</property>
<property name="label" translatable="yes">Add Attribute</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="TBI_ITEM_EDIT">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">TBI_ITEM_EDIT</property>
<property name="label" translatable="yes">Edit</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="TBI_ITEM_REMOVE">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">TBI_ITEM_REMOVE</property>
<property name="label" translatable="yes">Delete</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</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-DataTreeListBox" id="items:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</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