Skip to content

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

tweak things to allow switching between small and large toolbar icons 

Change-Id: Ife4da4c6f4acc3b3f9fde18cdfc09635cf9b6776
üst ae4da7d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 56 deletions
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ 0dc13e9c
......@@ -126,12 +126,6 @@
#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_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_MAIN "DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN"
#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_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"
......
dbaccess/source/ui/dlg/indexdialog.cxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -177,14 +177,38 @@ namespace dbaui
,m_xContext(_rxContext)
{
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");
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_pDescriptionLabel, "DESC_LABEL");
get(m_pDescription, "DESCRIPTION");
get(m_pUnique, "UNIQUE");
get(m_pFieldsLabel, "FIELDS_LABEL");
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));
......@@ -242,7 +266,7 @@ namespace dbaui
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();
bool bSelectedAnything = NULL != pSelected;
......@@ -251,17 +275,17 @@ namespace dbaui
{
// is the current entry modified?
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(m_pActions->GetItemId(INDEX_RESET_CMD), aSelectedPos->isModified() || aSelectedPos->isNew());
m_pActions->EnableItem(mnSaveCmdId, aSelectedPos->isModified() || aSelectedPos->isNew());
m_pActions->EnableItem(mnResetCmdId, aSelectedPos->isModified() || aSelectedPos->isNew());
bSelectedAnything = bSelectedAnything && !aSelectedPos->bPrimaryKey;
}
else
{
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_SAVE_CMD), false);
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RESET_CMD), false);
m_pActions->EnableItem(mnSaveCmdId, false);
m_pActions->EnableItem(mnResetCmdId, false);
}
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_DROP_CMD), bSelectedAnything);
m_pActions->EnableItem(m_pActions->GetItemId(INDEX_RENAME_CMD), bSelectedAnything);
m_pActions->EnableItem(mnDropCmdId, bSelectedAnything);
m_pActions->EnableItem(mnRenameCmdId, bSelectedAnything);
}
void DbaIndexDialog::fillIndexList()
......@@ -508,17 +532,16 @@ namespace dbaui
IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ )
{
const OUString sClicked(m_pActions->GetItemCommand(m_pActions->GetCurItemId()));
if(sClicked == INDEX_NEW_CMD)
sal_uInt16 nClicked = m_pActions->GetCurItemId();
if (nClicked == mnNewCmdId)
OnNewIndex();
else if(sClicked == INDEX_DROP_CMD)
else if (nClicked == mnDropCmdId)
OnDropIndex();
else if(sClicked == INDEX_RENAME_CMD)
else if (nClicked == mnRenameCmdId)
OnRenameIndex();
else if(sClicked == INDEX_SAVE_CMD)
else if (nClicked == mnSaveCmdId)
OnSaveIndex();
else if(sClicked == INDEX_RESET_CMD)
else if (nClicked == mnResetCmdId)
OnResetIndex();
return 0L;
......@@ -804,16 +827,28 @@ namespace dbaui
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 )
{
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&)
{
}
......
dbaccess/source/ui/inc/indexdialog.hxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -115,18 +115,14 @@ namespace dbaui
virtual void StateChanged( StateChangedType nStateChange ) 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
<svtools/imgdef.hxx>
@param _bHiContast
<TRUE/> when in high contrast mode.
*/
virtual ImageList getImageList(sal_Int16 _eBitmapSet) const SAL_OVERRIDE;
/** will be called when the controls need to be resized.
*/
virtual void resizeControls(const Size& _rDiff) SAL_OVERRIDE;
virtual void setImageList(sal_Int16 _eBitmapSet) SAL_OVERRIDE;
protected:
void fillIndexList();
void updateToolbox();
......@@ -142,6 +138,23 @@ namespace dbaui
DECL_LINK( OnEditIndexAgain, SvTreeListEntry* );
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 OnDropIndex(bool _bConfirm = true);
void OnRenameIndex();
......
dbaccess/source/ui/misc/ToolBoxHelper.cxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -29,7 +29,7 @@
namespace dbaui
{
OToolBoxHelper::OToolBoxHelper()
: m_nSymbolsSize(-1 )
: m_nSymbolsSize(-1)
, m_pToolBox(NULL)
{
......@@ -51,8 +51,8 @@ namespace dbaui
if ( nCurSymbolsSize != m_nSymbolsSize )
{
m_nSymbolsSize = nCurSymbolsSize;
setImageList(m_nSymbolsSize);
m_pToolBox->SetImageList( getImageList(m_nSymbolsSize) );
Size aTbOldSize = m_pToolBox->GetSizePixel();
adjustToolBoxSize(m_pToolBox);
Size aTbNewSize = m_pToolBox->GetSizePixel();
......@@ -62,6 +62,7 @@ namespace dbaui
}
}
}
IMPL_LINK(OToolBoxHelper, ConfigOptionsChanged, SvtMiscOptions*, /*_pOptions*/)
{
if ( m_pToolBox )
......
include/dbaccess/ToolBoxHelper.hxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -42,16 +42,17 @@ namespace dbaui
/** will be called when the controls need to be resized.
@param _rDiff
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;
/** will be called when the image list is needed.
/** will be called when the image list needs to change
@param _eSymbolsSize
<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.
@param _pTB
......
reportdesign/source/ui/dlg/AddField.cxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -490,12 +490,12 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
return 0L;
}
ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const
void OAddFieldWindow::setImageList(sal_Int16 _eBitmapSet)
{
sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_ADDFIELD_DLG_LC;
return ImageList(ModuleRes(nN));
m_aActions.SetImageList(ImageList(ModuleRes(nN)));
}
void OAddFieldWindow::resizeControls(const Size& _rDiff)
......
reportdesign/source/ui/dlg/Condition.cxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -365,7 +365,6 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton )
return 0L;
}
void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
{
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 );
}
ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const
void Condition::setImageList(sal_Int16 _eBitmapSet)
{
sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_CONDFORMAT_DLG_LC;
return ImageList(ModuleRes(nN));
m_aActions.SetImageList(ImageList(ModuleRes(nN)));
}
void Condition::resizeControls(const Size& _rDiff)
......
reportdesign/source/ui/dlg/Condition.hxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -98,11 +98,11 @@ namespace rptui
Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController );
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
<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.
*/
......
reportdesign/source/ui/dlg/GroupsSorting.cxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -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;
if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
nN = IMG_CONDFORMAT_DLG_LC;
return ImageList(ModuleRes( nN ));
m_aToolBox.SetImageList(ImageList(ModuleRes(nN)));
}
void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
{
// we use large images so we must change them
......
reportdesign/source/ui/inc/AddField.hxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -94,11 +94,11 @@ public:
::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
<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.
*/
......
reportdesign/source/ui/inc/GroupsSorting.hxx
Dosyayı görüntüle @ 0dc13e9c
......@@ -172,11 +172,11 @@ public:
*/
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
<svtools/imgdef.hxx>
*/
virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const SAL_OVERRIDE;
virtual void setImageList(sal_Int16 _eSymbolsSize) SAL_OVERRIDE;
// ImageListProvider interface
virtual ImageList getImageList(vcl::ImageListType) SAL_OVERRIDE;
......
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