Skip to content

C
core
Kaydet (Commit) 38cbb4c7 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert datanavigator sport to .ui 

Change-Id: I14f9f8d8df9fc8246e7fc8c0b6762ca51dad67d9
üst 221c21b4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 179 deletions
include/svx/dialogs.hrc
Dosyayı görüntüle @ 38cbb4c7
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
#define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289)
#define RID_SVXIL_FRAME (RID_SVX_START + 65) #define RID_SVXIL_FRAME (RID_SVX_START + 65)
#define RID_SVXIL_DATANAVI (RID_SVX_START + 66)
#define RID_SVXFLOAT_3D (RID_SVX_START + 209) #define RID_SVXFLOAT_3D (RID_SVX_START + 209)
......
include/svx/fmresids.hrc
Dosyayı görüntüle @ 38cbb4c7
...@@ -63,8 +63,6 @@ ...@@ -63,8 +63,6 @@
// Dialog-Id's ----------------------------------------------------------- // Dialog-Id's -----------------------------------------------------------
#define RID_SVX_FMEXPLORER (RID_FORMS_START + 6) #define RID_SVX_FMEXPLORER (RID_FORMS_START + 6)
#define RID_SVXWIN_DATANAVIGATOR (RID_FORMS_START + 19)
// Toolbars ------------------------------------------------------------ // Toolbars ------------------------------------------------------------
#define RID_SVXTBX_FORM_NAVIGATION (RID_FORMS_START + 1) #define RID_SVXTBX_FORM_NAVIGATION (RID_FORMS_START + 1)
#define RID_SVXTBX_FORM_FILTER (RID_FORMS_START + 2) #define RID_SVXTBX_FORM_FILTER (RID_FORMS_START + 2)
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 38cbb4c7
...@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ ...@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/chineseconversiondialog \ svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/chinesedictionary \ svx/uiconfig/ui/chinesedictionary \
svx/uiconfig/ui/compressgraphicdialog \ svx/uiconfig/ui/compressgraphicdialog \
svx/uiconfig/ui/datanavigator \
svx/uiconfig/ui/deleteheaderdialog \ svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \ svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/docrecoverybrokendialog \ svx/uiconfig/ui/docrecoverybrokendialog \
......
svx/inc/fmhelp.hrc
Dosyayı görüntüle @ 38cbb4c7
...@@ -36,24 +36,12 @@ ...@@ -36,24 +36,12 @@
#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS" #define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS"
#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME" #define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME"
#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW" #define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW"
#define HID_DATA_NAVIGATOR_WIN "SVX_HID_DATA_NAVIGATOR_WIN"
#define HID_MN_XFORMS_MODELS_ADD "SVX_HID_MN_XFORMS_MODELS_ADD"
#define HID_MN_XFORMS_MODELS_EDIT "SVX_HID_MN_XFORMS_MODELS_EDIT"
#define HID_MN_XFORMS_MODELS_REMOVE "SVX_HID_MN_XFORMS_MODELS_REMOVE"
#define HID_MN_XFORMS_INSTANCES_ADD "SVX_HID_MN_XFORMS_INSTANCES_ADD"
#define HID_MN_XFORMS_INSTANCES_EDIT "SVX_HID_MN_XFORMS_INSTANCES_EDIT"
#define HID_MN_XFORMS_INSTANCES_REMOVE "SVX_HID_MN_XFORMS_INSTANCES_REMOVE"
#define HID_MN_XFORMS_SHOW_DETAILS "SVX_HID_MN_XFORMS_SHOW_DETAILS"
#define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD" #define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD"
#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" #define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT"
#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" #define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE"
#define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT" #define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT"
#define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE" #define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE"
#define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST"
#define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN"
#define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN"
#define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL" #define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL"
#define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL"
#define HID_FM_DELETEROWS "SVX_HID_FM_DELETEROWS" #define HID_FM_DELETEROWS "SVX_HID_FM_DELETEROWS"
#define HID_FM_INSERTCOL "SVX_HID_FM_INSERTCOL" #define HID_FM_INSERTCOL "SVX_HID_FM_INSERTCOL"
#define HID_FM_CHANGECOL "SVX_HID_FM_CHANGECOL" #define HID_FM_CHANGECOL "SVX_HID_FM_CHANGECOL"
......
svx/source/form/datanavi.cxx
Dosyayı görüntüle @ 38cbb4c7
This diff is collapsed.
svx/source/form/datanavi.src
Dosyayı görüntüle @ 38cbb4c7
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "datanavi.hrc" #include "datanavi.hrc"
#include "globlmn.hrc" #include "globlmn.hrc"
#include "svx/dialogs.hrc"
#include "svx/fmresids.hrc" #include "svx/fmresids.hrc"
#include "fmhelp.hrc" #include "fmhelp.hrc"
...@@ -43,138 +44,20 @@ ImageList RID_SVXIMGLIST_XFORMS_TBX ...@@ -43,138 +44,20 @@ ImageList RID_SVXIMGLIST_XFORMS_TBX
}; };
#undef IMG_LST #undef IMG_LST
Window RID_SVXWIN_DATANAVIGATOR ImageList RID_SVXIL_DATANAVI
{ {
OutputSize = TRUE ; Prefix = "da";
Hide = TRUE ; MASKCOLOR
SVLook = TRUE ; IdList =
DialogControl = TRUE ;
HelpId = HID_DATA_NAVIGATOR_WIN ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 300 , 400 ) ;
ListBox LB_MODELS
{
HelpId = HID_XFORMS_MODELS_LIST ;
Pos = MAP_APPFONT ( 3 , 4 ) ;
Size = MAP_APPFONT ( 63 , 45 ) ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
MenuButton MB_MODELS
{
HelpId = HID_XFORMS_MODELS_MENUBTN ;
Pos = MAP_APPFONT ( 69 , 3 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Models";
ButtonMenu = Menu
{
ItemList =
{
MenuItem
{
Identifier = MID_MODELS_ADD ;
HelpId = HID_MN_XFORMS_MODELS_ADD ;
Text [ en-US ] = "~Add..." ;
};
MenuItem
{
Identifier = MID_MODELS_EDIT ;
HelpId = HID_MN_XFORMS_MODELS_EDIT ;
Text [ en-US ] = "~Edit..." ;
};
MenuItem
{
Identifier = MID_MODELS_REMOVE ;
HelpId = HID_MN_XFORMS_MODELS_REMOVE ;
Text [ en-US ] = "~Remove" ;
};
};
};
};
TabControl TC_ITEMS
{
HelpId = HID_XFORMS_TAB_CONTROL ;
Pos = MAP_APPFONT ( 3, 20 ) ;
TabStop = TRUE;
PageList =
{
PageItem
{
Identifier = TID_INSTANCE ;
Text [ en-US ] = "Instance";
};
PageItem
{
Identifier = TID_SUBMISSION ;
Text [ en-US ] = "Submissions";
};
PageItem
{
Identifier = TID_BINDINGS ;
Text [ en-US ] = "Bindings";
};
};
};
MenuButton MB_INSTANCES
{
HelpId = HID_XFORMS_INSTANCES_MENUBTN ;
Pos = MAP_APPFONT ( 69 , 133 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Instances";
ButtonMenu = Menu
{
ItemList =
{
MenuItem
{
Identifier = MID_INSTANCES_ADD ;
HelpId = HID_MN_XFORMS_INSTANCES_ADD ;
Text [ en-US ] = "~Add..." ;
};
MenuItem
{
Identifier = MID_INSTANCES_EDIT ;
HelpId = HID_MN_XFORMS_INSTANCES_EDIT ;
Text [ en-US ] = "~Edit..." ;
};
MenuItem
{
Identifier = MID_INSTANCES_REMOVE ;
HelpId = HID_MN_XFORMS_INSTANCES_REMOVE ;
Text [ en-US ] = "~Remove" ;
};
MenuItem
{
Separator = TRUE;
};
MenuItem
{
Identifier = MID_SHOW_DETAILS ;
HelpId = HID_MN_XFORMS_SHOW_DETAILS ;
Text [ en-US ] = "~Show Details" ;
};
};
};
};
#define IMG_LST2 \
IdList = \
{ \
IID_GROUP_CLOSED ; \
IID_GROUP_OPEN ; \
IID_ELEMENT ; \
IID_ATTRIBUTE ; \
IID_TEXT ; \
IID_OTHER ; \
}; \
IdCount = { 6 ; } ;
ImageList IL_ITEM_BMPS
{ {
Prefix = "da"; IID_GROUP_CLOSED ;
MASKCOLOR IID_GROUP_OPEN ;
IMG_LST2 IID_ELEMENT ;
IID_ATTRIBUTE ;
IID_TEXT ;
IID_OTHER ;
}; };
IdCount = { 6 ; } ;
}; };
QueryBox RID_QRY_REMOVE_MODEL QueryBox RID_QRY_REMOVE_MODEL
......
svx/source/inc/datanavi.hrc
Dosyayı görüntüle @ 38cbb4c7
...@@ -39,30 +39,6 @@ ...@@ -39,30 +39,6 @@
#define IID_ITEM_EDIT 4 #define IID_ITEM_EDIT 4
#define IID_ITEM_REMOVE 5 #define IID_ITEM_REMOVE 5
// class DataNavigatorWindow
// Controls
#define LB_MODELS 10
#define MB_MODELS 11
#define TC_ITEMS 12
#define MB_INSTANCES 13
// MenuItems
#define MID_MODELS_ADD 10
#define MID_MODELS_EDIT 11
#define MID_MODELS_REMOVE 12
#define MID_INSTANCES_ADD 20
#define MID_INSTANCES_EDIT 21
#define MID_INSTANCES_REMOVE 22
#define MID_SHOW_DETAILS 30
// TabPage Ids
#define TID_SUBMISSION 10
#define TID_BINDINGS 11
#define TID_INSTANCE 12
// ImageLists
#define IL_ITEM_BMPS 30
// ImageIndexes // ImageIndexes
#define IID_GROUP_CLOSED 1 #define IID_GROUP_CLOSED 1
#define IID_GROUP_OPEN 2 #define IID_GROUP_OPEN 2
......
svx/source/inc/datanavi.hxx
Dosyayı görüntüle @ 38cbb4c7
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX #ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
#define INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX #define INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
#include <vcl/builder.hxx>
#include <vcl/dialog.hxx> #include <vcl/dialog.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
#include <sfx2/childwin.hxx> #include <sfx2/childwin.hxx>
#include <sfx2/ctrlitem.hxx> #include <sfx2/ctrlitem.hxx>
#include <svx/dialmgr.hxx> #include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <svx/fmresids.hrc> #include <svx/fmresids.hrc>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
...@@ -322,27 +324,21 @@ namespace svxform ...@@ -322,27 +324,21 @@ namespace svxform
typedef std::vector< XFormsPage* > PageList; typedef std::vector< XFormsPage* > PageList;
typedef ::rtl::Reference < DataListener > DataListener_ref; typedef ::rtl::Reference < DataListener > DataListener_ref;
class DataNavigatorWindow : public Window class DataNavigatorWindow : public Window, public VclBuilderContainer
{ {
private: private:
ListBox* m_pModelsBox;
ListBox m_aModelsBox; MenuButton* m_pModelBtn;
MenuButton m_aModelBtn; TabControl* m_pTabCtrl;
TabControl m_aTabCtrl; MenuButton* m_pInstanceBtn;
MenuButton m_aInstanceBtn;
XFormsPage* m_pInstPage; XFormsPage* m_pInstPage;
XFormsPage* m_pSubmissionPage; XFormsPage* m_pSubmissionPage;
XFormsPage* m_pBindingPage; XFormsPage* m_pBindingPage;
long m_nMinWidth;
long m_nMinHeight;
long m_nBorderHeight;
sal_Int32 m_nLastSelectedPos; sal_Int32 m_nLastSelectedPos;
bool m_bShowDetails; bool m_bShowDetails;
bool m_bIsNotifyDisabled; bool m_bIsNotifyDisabled;
Size m_a2Size;
Size m_a3Size;
ImageList m_aItemImageList; ImageList m_aItemImageList;
PageList m_aPageList; PageList m_aPageList;
ContainerList m_aContainerList; ContainerList m_aContainerList;
...@@ -367,10 +363,13 @@ namespace svxform ...@@ -367,10 +363,13 @@ namespace svxform
void InitPages(); void InitPages();
void CreateInstancePage( const PropertyValue_seq& _xPropSeq ); void CreateInstancePage( const PropertyValue_seq& _xPropSeq );
bool HasFirstInstancePage() const; bool HasFirstInstancePage() const;
sal_uInt16 GetNewPageId() const; sal_uInt16 GetNewPageId() const;
bool IsAdditionalPage(sal_uInt16 nPageId) const;
protected: protected:
virtual void Resize() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
public: public:
DataNavigatorWindow( Window* pParent, SfxBindings* pBindings ); DataNavigatorWindow( Window* pParent, SfxBindings* pBindings );
......
svx/uiconfig/ui/datanavigator.ui 0 → 100644
Dosyayı görüntüle @ 38cbb4c7
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="DataNavigator">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="GtkBox" id="box1">
<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">0</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkComboBoxText" id="modelslist">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</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="GtkButton" id="modelsbutton:modelsmenu">
<property name="label" translatable="yes">_Models</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
</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">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="instance">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Instance</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="submissions">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Submissions</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="bindings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Bindings</property>
</object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="instances:instancesmenu">
<property name="label" translatable="yes">_Instances</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="use_underline">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="position">0</property>
</packing>
</child>
</object>
<object class="GtkMenu" id="instancesmenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="instancesadd">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Add...</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="instancesedit">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Edit...</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="instancesremove">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Remove...</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="instancesdetails">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Show Details</property>
<property name="use_underline">True</property>
</object>
</child>
</object>
<object class="GtkMenu" id="modelsmenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="modelsadd">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Add...</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="modelsedit">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Edit...</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="modelsremove">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Remove</property>
<property name="use_underline">True</property>
</object>
</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