mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweak things to allow switching between small and large toolbar icons

Browse Source 
Change-Id: Ife4da4c6f4acc3b3f9fde18cdfc09635cf9b6776
This commit is contained in:
Caolán McNamara 2014-06-10 12:32:03 +01:00
parent ae4da7d36b
commit 0dc13e9c06
12 changed files with 270 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbaccess/inc/dbaccess_helpid.hrc
View File

@ -126,12 +126,6 @@
#define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME" #define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"
#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME" #define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"
#define HID_DLGIDX_NEWINDEX "DBACCESS_HID_DLGIDX_NEWINDEX"
#define HID_DLGIDX_DROPINDEX "DBACCESS_HID_DLGIDX_DROPINDEX"
#define HID_DLGIDX_RENAMEINDEX "DBACCESS_HID_DLGIDX_RENAMEINDEX"
#define HID_DLGIDX_SAVEINDEX "DBACCESS_HID_DLGIDX_SAVEINDEX"
#define HID_DLGIDX_RESETINDEX "DBACCESS_HID_DLGIDX_RESETINDEX"
#define HID_DLGIDX_INDEXLIST "DBACCESS_HID_DLGIDX_INDEXLIST"
#define UID_DLGINDEX_INDEXDETAILS_BACK "DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK" #define UID_DLGINDEX_INDEXDETAILS_BACK "DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK"
#define UID_DLGINDEX_INDEXDETAILS_MAIN "DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN" #define UID_DLGINDEX_INDEXDETAILS_MAIN "DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN"
#define HID_DLGINDEX_INDEXDETAILS_FIELD "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD" #define HID_DLGINDEX_INDEXDETAILS_FIELD "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"
@ -249,7 +243,6 @@
#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE" #define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE"
#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE" #define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE"
#define HID_INDEX_DIALOG_ACTION_TB "DBACCESS_HID_INDEX_DIALOG_ACTION_TB"
#define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD" #define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD"

75
dbaccess/source/ui/dlg/indexdialog.cxx
View File

@ -177,14 +177,38 @@ namespace dbaui
,m_xContext(_rxContext) ,m_xContext(_rxContext)
{ {
get(m_pActions, "ACTIONS"); get(m_pActions, "ACTIONS");
mnNewCmdId = m_pActions->GetItemId(INDEX_NEW_CMD);
mnDropCmdId = m_pActions->GetItemId(INDEX_DROP_CMD);
mnRenameCmdId = m_pActions->GetItemId(INDEX_RENAME_CMD);
mnSaveCmdId = m_pActions->GetItemId(INDEX_SAVE_CMD);
mnResetCmdId = m_pActions->GetItemId(INDEX_RESET_CMD);
maScNewCmdImg = m_pActions->GetItemImage(mnNewCmdId);
maScDropCmdImg = m_pActions->GetItemImage(mnDropCmdId);
maScRenameCmdImg = m_pActions->GetItemImage(mnRenameCmdId);
maScSaveCmdImg = m_pActions->GetItemImage(mnSaveCmdId);
maScResetCmdImg = m_pActions->GetItemImage(mnResetCmdId);
maLcNewCmdImg = get<FixedImage>("image1")->GetImage();
maLcDropCmdImg = get<FixedImage>("image2")->GetImage();
maLcRenameCmdImg = get<FixedImage>("image3")->GetImage();
maLcSaveCmdImg = get<FixedImage>("image4")->GetImage();
maLcResetCmdImg = get<FixedImage>("image5")->GetImage();
get(m_pIndexList, "INDEX_LIST"); get(m_pIndexList, "INDEX_LIST");
Size aSize(LogicToPixel(Size(70, 97), MAP_APPFONT));
m_pIndexList->set_width_request(aSize.Width());
m_pIndexList->set_height_request(aSize.Height());
get(m_pIndexDetails, "INDEX_DETAILS"); get(m_pIndexDetails, "INDEX_DETAILS");
get(m_pDescriptionLabel, "DESC_LABEL"); get(m_pDescriptionLabel, "DESC_LABEL");
get(m_pDescription, "DESCRIPTION"); get(m_pDescription, "DESCRIPTION");
get(m_pUnique, "UNIQUE"); get(m_pUnique, "UNIQUE");
get(m_pFieldsLabel, "FIELDS_LABEL"); get(m_pFieldsLabel, "FIELDS_LABEL");
get(m_pFields, "FIELDS"); get(m_pFields, "FIELDS");
get(m_pClose, "CLOSE"); aSize = LogicToPixel(Size(128, 61), MAP_APPFONT);
m_pFields->set_width_request(aSize.Width());
m_pFields->set_height_request(aSize.Height());
get(m_pClose, "close");
m_pActions->SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexAction)); m_pActions->SetSelectHdl(LINK(this, DbaIndexDialog, OnIndexAction));
@ -242,7 +266,7 @@ namespace dbaui
void DbaIndexDialog::updateToolbox() void DbaIndexDialog::updateToolbox()
{ {
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_NEW_CMD), !m_pIndexList->IsEditingActive()); m_pActions->EnableItem(mnNewCmdId, !m_pIndexList->IsEditingActive());
SvTreeListEntry* pSelected = m_pIndexList->FirstSelected(); SvTreeListEntry* pSelected = m_pIndexList->FirstSelected();
bool bSelectedAnything = NULL != pSelected; bool bSelectedAnything = NULL != pSelected;
@ -251,17 +275,17 @@ namespace dbaui
{ {
// is the current entry modified? // is the current entry modified?
Indexes::const_iterator aSelectedPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData()); Indexes::const_iterator aSelectedPos = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData());
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_SAVE_CMD), aSelectedPos->isModified() || aSelectedPos->isNew()); m_pActions->EnableItem(mnSaveCmdId, aSelectedPos->isModified() || aSelectedPos->isNew());
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RESET_CMD), aSelectedPos->isModified() || aSelectedPos->isNew()); m_pActions->EnableItem(mnResetCmdId, aSelectedPos->isModified() || aSelectedPos->isNew());
bSelectedAnything = bSelectedAnything && !aSelectedPos->bPrimaryKey; bSelectedAnything = bSelectedAnything && !aSelectedPos->bPrimaryKey;
} }
else else
{ {
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_SAVE_CMD), false); m_pActions->EnableItem(mnSaveCmdId, false);
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RESET_CMD), false); m_pActions->EnableItem(mnResetCmdId, false);
} }
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_DROP_CMD), bSelectedAnything); m_pActions->EnableItem(mnDropCmdId, bSelectedAnything);
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RENAME_CMD), bSelectedAnything); m_pActions->EnableItem(mnRenameCmdId, bSelectedAnything);
} }
void DbaIndexDialog::fillIndexList() void DbaIndexDialog::fillIndexList()
@ -508,17 +532,16 @@ namespace dbaui
IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ ) IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ )
{ {
const OUString sClicked(m_pActions->GetItemCommand(m_pActions->GetCurItemId())); sal_uInt16 nClicked = m_pActions->GetCurItemId();
if (nClicked == mnNewCmdId)
if(sClicked == INDEX_NEW_CMD)
OnNewIndex(); OnNewIndex();
else if(sClicked == INDEX_DROP_CMD) else if (nClicked == mnDropCmdId)
OnDropIndex(); OnDropIndex();
else if(sClicked == INDEX_RENAME_CMD) else if (nClicked == mnRenameCmdId)
OnRenameIndex(); OnRenameIndex();
else if(sClicked == INDEX_SAVE_CMD) else if (nClicked == mnSaveCmdId)
OnSaveIndex(); OnSaveIndex();
else if(sClicked == INDEX_RESET_CMD) else if (nClicked == mnResetCmdId)
OnResetIndex(); OnResetIndex();
return 0L; return 0L;
@ -804,16 +827,28 @@ namespace dbaui
checkImageList(); checkImageList();
} }
} }
ImageList DbaIndexDialog::getImageList(sal_Int16 _eBitmapSet) const
void DbaIndexDialog::setImageList(sal_Int16 _eBitmapSet)
{ {
sal_Int16 nN = IMG_INDEX_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
{ {
nN = IMG_INDEX_DLG_LC; m_pActions->SetItemImage(mnNewCmdId, maLcNewCmdImg);
m_pActions->SetItemImage(mnDropCmdId, maLcDropCmdImg);
m_pActions->SetItemImage(mnRenameCmdId, maLcRenameCmdImg);
m_pActions->SetItemImage(mnSaveCmdId, maLcSaveCmdImg);
m_pActions->SetItemImage(mnResetCmdId, maLcResetCmdImg);
}
else
{
m_pActions->SetItemImage(mnNewCmdId, maScNewCmdImg);
m_pActions->SetItemImage(mnDropCmdId, maScDropCmdImg);
m_pActions->SetItemImage(mnRenameCmdId, maScRenameCmdImg);
m_pActions->SetItemImage(mnSaveCmdId, maScSaveCmdImg);
m_pActions->SetItemImage(mnResetCmdId, maScResetCmdImg);
} }
return ImageList(ModuleRes(nN));
} }
void DbaIndexDialog::resizeControls(const Size& _rDiff)
void DbaIndexDialog::resizeControls(const Size&)
{ {
} }

31
dbaccess/source/ui/inc/indexdialog.hxx
View File

@ -115,18 +115,14 @@ namespace dbaui
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
/** will be called whenthe id of the image list is needed. //TO-DO, remove when all other OToolBoxHelper are converted to .ui
virtual void resizeControls(const Size&) SAL_OVERRIDE;
/** will be called when the id of the image list needs to change
@param _eBitmapSet @param _eBitmapSet
<svtools/imgdef.hxx> <svtools/imgdef.hxx>
@param _bHiContast
<TRUE/> when in high contrast mode.
*/ */
virtual ImageList getImageList(sal_Int16 _eBitmapSet) const SAL_OVERRIDE; virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
/** will be called when the controls need to be resized.
*/
virtual void resizeControls(const Size& _rDiff) SAL_OVERRIDE;
protected: protected:
void fillIndexList(); void fillIndexList();
void updateToolbox(); void updateToolbox();
@ -142,6 +138,23 @@ namespace dbaui
DECL_LINK( OnEditIndexAgain, SvTreeListEntry* ); DECL_LINK( OnEditIndexAgain, SvTreeListEntry* );
private: private:
sal_uInt16 mnNewCmdId;
sal_uInt16 mnDropCmdId;
sal_uInt16 mnRenameCmdId;
sal_uInt16 mnSaveCmdId;
sal_uInt16 mnResetCmdId;
Image maScNewCmdImg;
Image maScDropCmdImg;
Image maScRenameCmdImg;
Image maScSaveCmdImg;
Image maScResetCmdImg;
Image maLcNewCmdImg;
Image maLcDropCmdImg;
Image maLcRenameCmdImg;
Image maLcSaveCmdImg;
Image maLcResetCmdImg;
void OnNewIndex(); void OnNewIndex();
void OnDropIndex(bool _bConfirm = true); void OnDropIndex(bool _bConfirm = true);
void OnRenameIndex(); void OnRenameIndex();

5
dbaccess/source/ui/misc/ToolBoxHelper.cxx
View File

@ -29,7 +29,7 @@
namespace dbaui namespace dbaui
{ {
OToolBoxHelper::OToolBoxHelper() OToolBoxHelper::OToolBoxHelper()
: m_nSymbolsSize(-1 ) : m_nSymbolsSize(-1)
, m_pToolBox(NULL) , m_pToolBox(NULL)
{ {
@ -51,8 +51,8 @@ namespace dbaui
if ( nCurSymbolsSize != m_nSymbolsSize ) if ( nCurSymbolsSize != m_nSymbolsSize )
{ {
m_nSymbolsSize = nCurSymbolsSize; m_nSymbolsSize = nCurSymbolsSize;
setImageList(m_nSymbolsSize);
m_pToolBox->SetImageList( getImageList(m_nSymbolsSize) );
Size aTbOldSize = m_pToolBox->GetSizePixel(); Size aTbOldSize = m_pToolBox->GetSizePixel();
adjustToolBoxSize(m_pToolBox); adjustToolBoxSize(m_pToolBox);
Size aTbNewSize = m_pToolBox->GetSizePixel(); Size aTbNewSize = m_pToolBox->GetSizePixel();
@ -62,6 +62,7 @@ namespace dbaui
} }
} }
} }
IMPL_LINK(OToolBoxHelper, ConfigOptionsChanged, SvtMiscOptions*, /*_pOptions*/) IMPL_LINK(OToolBoxHelper, ConfigOptionsChanged, SvtMiscOptions*, /*_pOptions*/)
{ {
if ( m_pToolBox ) if ( m_pToolBox )

260
dbaccess/uiconfig/ui/indexdesigndialog.ui
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="IndexDesignDialog"> <object class="GtkDialog" id="IndexDesignDialog">
<property name="width_request">500</property>
<property name="height_request">300</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">5</property> <property name="border_width">6</property>
<property name="title" translatable="yes">Indexes</property> <property name="title" translatable="yes">Indexes</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child internal-child="vbox"> <child internal-child="vbox">
@ -18,13 +18,12 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child> <child>
<object class="GtkButton" id="CLOSE"> <object class="GtkButton" id="close">
<property name="label">gtk-cancel</property> <property name="label">gtk-close</property>
<property name="use_action_appearance">False</property> <property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
@ -34,13 +33,12 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="HELP"> <object class="GtkButton" id="help">
<property name="label">gtk-help</property> <property name="label">gtk-help</property>
<property name="use_action_appearance">False</property> <property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
@ -64,92 +62,175 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkToolbar" id="ACTIONS"> <object class="GtkGrid" id="grid3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkToolButton" id="ID_INDEX_NEW"> <object class="GtkToolbar" id="ACTIONS">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property> <child>
<property name="use_action_appearance">False</property> <object class="GtkToolButton" id="ID_INDEX_NEW">
<property name="action_name">.index:createNew</property> <property name="visible">True</property>
<property name="label" translatable="yes">New Index</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="valign">start</property>
<property name="icon_name">dbaccess/res/lc036.png</property> <property name="action_name">.index:createNew</property>
<property name="label" translatable="yes">New Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/sc036.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="ID_INDEX_DROP">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">.index:dropCurrent</property>
<property name="label" translatable="yes">Delete Current Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/sc037.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="ID_INDEX_RENAME">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">.index:renameCurrent</property>
<property name="label" translatable="yes">Rename Current Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/sc038.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="ID_INDEX_SAVE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">.index:saveCurrent</property>
<property name="label" translatable="yes">Save Current Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/sc039.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="ID_INDEX_RESET">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="action_name">.index:resetCurrent</property>
<property name="label" translatable="yes">Reset Current Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/sc040.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="homogeneous">True</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToolButton" id="ID_INDEX_DROP"> <object class="GtkGrid" id="grid2">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property> <property name="no_show_all">True</property>
<property name="use_action_appearance">False</property> <property name="halign">end</property>
<property name="action_name">.index:dropCurrent</property> <property name="valign">center</property>
<property name="label" translatable="yes">Delete Current Index</property> <property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="column_spacing">12</property>
<property name="icon_name">dbaccess/res/lc037.png</property> <child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/lc036.png</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="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/lc037.png</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>
<child>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/lc038.png</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="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/lc039.png</property>
</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>
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/lc040.png</property>
</object>
<packing>
<property name="left_attach">4</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">1</property>
<property name="homogeneous">True</property> <property name="top_attach">0</property>
</packing> <property name="width">1</property>
</child> <property name="height">1</property>
<child>
<object class="GtkToolButton" id="ID_INDEX_RENAME">
<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="use_action_appearance">False</property>
<property name="action_name">.index:renameCurrent</property>
<property name="label" translatable="yes">Rename Current Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/lc038.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="ID_INDEX_SAVE">
<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="use_action_appearance">False</property>
<property name="action_name">.index:saveCurrent</property>
<property name="label" translatable="yes">Save Current Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/lc039.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="ID_INDEX_RESET">
<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="use_action_appearance">False</property>
<property name="action_name">.index:resetCurrent</property>
<property name="label" translatable="yes">Reset Current Index</property>
<property name="use_underline">True</property>
<property name="icon_name">dbaccess/res/lc040.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -231,7 +312,6 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -248,6 +328,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="label" translatable="yes">Fields</property> <property name="label" translatable="yes">Fields</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">FIELDS</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -257,12 +339,13 @@
</child> </child>
<child> <child>
<object class="dbulo-DbaIndexFieldsControl" id="FIELDS"> <object class="dbulo-DbaIndexFieldsControl" id="FIELDS">
<property name="width_request">210</property>
<property name="height_request">100</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="IndexFieldsControl-selection1"/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -284,6 +367,9 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="DbaIndexList-selection1"/>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@ -309,8 +395,8 @@
</object> </object>
</child> </child>
<action-widgets> <action-widgets>
<action-widget response="0">CLOSE</action-widget> <action-widget response="0">close</action-widget>
<action-widget response="0">HELP</action-widget> <action-widget response="0">help</action-widget>
</action-widgets> </action-widgets>
</object> </object>
</interface> </interface>

9
include/dbaccess/ToolBoxHelper.hxx
View File

@ -42,16 +42,17 @@ namespace dbaui
/** will be called when the controls need to be resized. /** will be called when the controls need to be resized.
@param _rDiff @param _rDiff
Contains the difference of the old and new toolbox size. Contains the difference of the old and new toolbox size.
TO-DO: remove this when all implmentations
are converted to .ui format
*/ */
virtual void resizeControls(const Size& _rDiff) = 0; virtual void resizeControls(const Size& _rDiff) = 0;
/** will be called when the image list is needed. /** will be called when the image list needs to change
@param _eSymbolsSize @param _eSymbolsSize
<svtools/imgdef.hxx> <svtools/imgdef.hxx>
@param _bHiContast
<TRUE/> when in high contrast mode.
*/ */
virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const = 0; virtual void setImageList(sal_Int16 _eSymbolsSize) = 0;
/** only the member will be set, derived classes can overload this function and do what need to be done. /** only the member will be set, derived classes can overload this function and do what need to be done.
@param _pTB @param _pTB

4
reportdesign/source/ui/dlg/AddField.cxx
View File

@ -490,12 +490,12 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
return 0L; return 0L;
} }
ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const void OAddFieldWindow::setImageList(sal_Int16 _eBitmapSet)
{ {
sal_Int16 nN = IMG_ADDFIELD_DLG_SC; sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_ADDFIELD_DLG_LC; nN = IMG_ADDFIELD_DLG_LC;
return ImageList(ModuleRes(nN)); m_aActions.SetImageList(ImageList(ModuleRes(nN)));
} }
void OAddFieldWindow::resizeControls(const Size& _rDiff) void OAddFieldWindow::resizeControls(const Size& _rDiff)

5
reportdesign/source/ui/dlg/Condition.cxx
View File

@ -365,7 +365,6 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton )
return 0L; return 0L;
} }
void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor) void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
{ {
if ( _nCommandId == SID_ATTR_CHAR_COLOR2 ) if ( _nCommandId == SID_ATTR_CHAR_COLOR2 )
@ -376,12 +375,12 @@ void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor ); m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor );
} }
ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const void Condition::setImageList(sal_Int16 _eBitmapSet)
{ {
sal_Int16 nN = IMG_CONDFORMAT_DLG_SC; sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_CONDFORMAT_DLG_LC; nN = IMG_CONDFORMAT_DLG_LC;
return ImageList(ModuleRes(nN)); m_aActions.SetImageList(ImageList(ModuleRes(nN)));
} }
void Condition::resizeControls(const Size& _rDiff) void Condition::resizeControls(const Size& _rDiff)

4
reportdesign/source/ui/dlg/Condition.hxx
View File

@ -98,11 +98,11 @@ namespace rptui
Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ); Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController );
virtual ~Condition(); virtual ~Condition();
/** will be called when the id of the image list is needed. /** will be called when the id of the image list needs to change.
@param _eBitmapSet @param _eBitmapSet
<svtools/imgdef.hxx> <svtools/imgdef.hxx>
*/ */
virtual ImageList getImageList(sal_Int16 _eBitmapSet) const SAL_OVERRIDE; virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
/** will be called when the controls need to be resized. /** will be called when the controls need to be resized.
*/ */

5
reportdesign/source/ui/dlg/GroupsSorting.cxx
View File

@ -1404,15 +1404,14 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
} }
} }
ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const void OGroupsSortingDialog::setImageList(sal_Int16 _eBitmapSet)
{ {
sal_Int16 nN = IMG_CONDFORMAT_DLG_SC; sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_CONDFORMAT_DLG_LC; nN = IMG_CONDFORMAT_DLG_LC;
return ImageList(ModuleRes( nN )); m_aToolBox.SetImageList(ImageList(ModuleRes(nN)));
} }
void OGroupsSortingDialog::resizeControls(const Size& _rDiff) void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
{ {
// we use large images so we must change them // we use large images so we must change them

4
reportdesign/source/ui/inc/AddField.hxx
View File

@ -94,11 +94,11 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getSelectedFieldDescriptors(); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getSelectedFieldDescriptors();
/** will be called when the id of the image list is needed. /** will be called when the id of the image list needs to change.
@param _eBitmapSet @param _eBitmapSet
<svtools/imgdef.hxx> <svtools/imgdef.hxx>
*/ */
virtual ImageList getImageList(sal_Int16 _eBitmapSet) const SAL_OVERRIDE; virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
/** will be called when the controls need to be resized. /** will be called when the controls need to be resized.
*/ */

4
reportdesign/source/ui/inc/GroupsSorting.hxx
View File

@ -172,11 +172,11 @@ public:
*/ */
virtual void resizeControls(const Size& _rDiff) SAL_OVERRIDE; virtual void resizeControls(const Size& _rDiff) SAL_OVERRIDE;
/** will be called when the image list is needed. /** will be called when the image list needs to change
@param _eSymbolsSize @param _eSymbolsSize
<svtools/imgdef.hxx> <svtools/imgdef.hxx>
*/ */
virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const SAL_OVERRIDE; virtual void setImageList(sal_Int16 _eSymbolsSize) SAL_OVERRIDE;
// ImageListProvider interface // ImageListProvider interface
virtual ImageList getImageList(vcl::ImageListType) SAL_OVERRIDE; virtual ImageList getImageList(vcl::ImageListType) SAL_OVERRIDE;