Skip to content

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

drop GetImageManager use in sc and unwind ImageList 

Change-Id: Ida10f14fa74785964efdc4b6645668562297895a
üst 43b3748f
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 91 deletions
icon-themes/breeze/links.txt
Dosyayı görüntüle @ c6797f77
......@@ -1043,10 +1043,10 @@ res/sx18003.png res/minus.png
# sc
# ==============================================
sc/imglst/lc26047.png cmd/lc_dbviewfunctions.png
sc/imglst/lc26048.png cmd/lc_autosum.png
sc/imglst/lc26050.png cmd/lc_cancel.png
sc/imglst/lc26051.png cmd/lc_ok.png
sc/res/lc26047.png cmd/lc_dbviewfunctions.png
sc/res/lc26048.png cmd/lc_autosum.png
sc/res/lc26050.png cmd/lc_cancel.png
sc/res/lc26051.png cmd/lc_ok.png
sc/imglst/na010.png cmd/sc_selectobject.png
sc/imglst/na011.png cmd/lc_ok.png
sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
......@@ -1055,10 +1055,10 @@ sc/imglst/nc05.png cmd/sc_insertobject.png
sc/imglst/nc06.png cmd/sc_showannotations.png
sc/imglst/nc07.png sc/res/droplink.png
sc/imglst/nc08.png cmd/sc_gallery.png
sc/imglst/sc26047.png cmd/sc_dbviewfunctions.png
sc/imglst/sc26048.png cmd/sc_autosum.png
sc/imglst/sc26050.png cmd/sc_cancel.png
sc/imglst/sc26051.png cmd/sc_ok.png
sc/res/sc26047.png cmd/sc_dbviewfunctions.png
sc/res/sc26048.png cmd/sc_autosum.png
sc/res/sc26050.png cmd/sc_cancel.png
sc/res/sc26051.png cmd/sc_ok.png
sc/res/date.png cmd/sc_datefield.png
sc/res/dropcopy.png cmd/sc_copy.png
......
icon-themes/breeze_dark/links.txt
Dosyayı görüntüle @ c6797f77
......@@ -1039,10 +1039,10 @@ res/sx18003.png res/minus.png
# sc
# ==============================================
sc/imglst/lc26047.png cmd/lc_dbviewfunctions.png
sc/imglst/lc26048.png cmd/lc_autosum.png
sc/imglst/lc26050.png cmd/lc_cancel.png
sc/imglst/lc26051.png cmd/lc_ok.png
sc/res/lc26047.png cmd/lc_dbviewfunctions.png
sc/res/lc26048.png cmd/lc_autosum.png
sc/res/lc26050.png cmd/lc_cancel.png
sc/res/lc26051.png cmd/lc_ok.png
sc/imglst/na010.png cmd/sc_selectobject.png
sc/imglst/na011.png cmd/lc_ok.png
sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
......@@ -1051,10 +1051,10 @@ sc/imglst/nc05.png cmd/sc_insertobject.png
sc/imglst/nc06.png cmd/sc_showannotations.png
sc/imglst/nc07.png sc/res/droplink.png
sc/imglst/nc08.png cmd/sc_gallery.png
sc/imglst/sc26047.png cmd/sc_dbviewfunctions.png
sc/imglst/sc26048.png cmd/sc_autosum.png
sc/imglst/sc26050.png cmd/sc_cancel.png
sc/imglst/sc26051.png cmd/sc_ok.png
sc/res/sc26047.png cmd/sc_dbviewfunctions.png
sc/res/sc26048.png cmd/sc_autosum.png
sc/res/sc26050.png cmd/sc_cancel.png
sc/res/sc26051.png cmd/sc_ok.png
sc/res/date.png cmd/sc_datefield.png
sc/res/dropcopy.png cmd/sc_copy.png
......
icon-themes/breeze_svg/links.txt
Dosyayı görüntüle @ c6797f77
......@@ -1005,10 +1005,10 @@ res/sx18003.png res/minus.png
# sc
# ==============================================
sc/imglst/lc26047.png cmd/lc_dbviewfunctions.png
sc/imglst/lc26048.png cmd/lc_autosum.png
sc/imglst/lc26050.png cmd/lc_cancel.png
sc/imglst/lc26051.png cmd/lc_ok.png
sc/res/lc26047.png cmd/lc_dbviewfunctions.png
sc/res/lc26048.png cmd/lc_autosum.png
sc/res/lc26050.png cmd/lc_cancel.png
sc/res/lc26051.png cmd/lc_ok.png
sc/imglst/na010.png cmd/sc_selectobject.png
sc/imglst/na011.png cmd/lc_ok.png
sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
......@@ -1017,10 +1017,10 @@ sc/imglst/nc05.png cmd/sc_insertobject.png
sc/imglst/nc06.png cmd/sc_showannotations.png
sc/imglst/nc07.png sc/res/droplink.png
sc/imglst/nc08.png cmd/sc_gallery.png
sc/imglst/sc26047.png cmd/sc_dbviewfunctions.png
sc/imglst/sc26048.png cmd/sc_autosum.png
sc/imglst/sc26050.png cmd/sc_cancel.png
sc/imglst/sc26051.png cmd/sc_ok.png
sc/res/sc26047.png cmd/sc_dbviewfunctions.png
sc/res/sc26048.png cmd/sc_autosum.png
sc/res/sc26050.png cmd/sc_cancel.png
sc/res/sc26051.png cmd/sc_ok.png
sc/res/date.png cmd/sc_datefield.png
sc/res/dropcopy.png cmd/sc_copy.png
......
icon-themes/elementary/links.txt
Dosyayı görüntüle @ c6797f77
......@@ -457,10 +457,10 @@ res/sx03248.png res/odm_16_8.png
res/sx03249.png res/odp_16_8.png
res/sx03250.png res/ods_16_8.png
res/sx03256.png cmd/sc_addons.png
sc/imglst/lc26047.png cmd/lc_insertformula.png
sc/imglst/lc26048.png cmd/lc_autosum.png
sc/imglst/lc26050.png cmd/lc_cancel.png
sc/imglst/lc26051.png cmd/lc_ok.png
sc/res/lc26047.png cmd/lc_insertformula.png
sc/res/lc26048.png cmd/lc_autosum.png
sc/res/lc26050.png cmd/lc_cancel.png
sc/res/lc26051.png cmd/lc_ok.png
sc/imglst/na05.png cmd/sc_upsearch.png
sc/imglst/na06.png cmd/sc_downsearch.png
sc/imglst/nc01.png cmd/sc_inserttable.png
......@@ -468,10 +468,10 @@ sc/imglst/nc04.png cmd/sc_insertgraphic.png
sc/imglst/nc05.png cmd/sc_drawchart.png
sc/imglst/nc06.png cmd/sc_insertannotation.png
sc/imglst/nc08.png cmd/sc_insertdraw.png
sc/imglst/sc26047.png cmd/sc_insertformula.png
sc/imglst/sc26048.png cmd/sc_autosum.png
sc/imglst/sc26050.png cmd/sc_cancel.png
sc/imglst/sc26051.png cmd/sc_ok.png
sc/res/sc26047.png cmd/sc_insertformula.png
sc/res/sc26048.png cmd/sc_autosum.png
sc/res/sc26050.png cmd/sc_cancel.png
sc/res/sc26051.png cmd/sc_ok.png
sc/res/date.png cmd/sc_datefield.png
sc/res/dropcopy.png cmd/sc_copy.png
sc/res/dropurl.png cmd/sc_inserthyperlink.png
......
icon-themes/tango/links.txt
Dosyayı görüntüle @ c6797f77
......@@ -18,9 +18,9 @@ cmd/lc_advancedmode.png cmd/lc_toggleobjectrotatemode.png
res/lc05539.png cmd/lc_designerdialog.png
cmd/sc_savebasicas.png cmd/sc_saveas.png
res/lc05711.png cmd/lc_copy.png
sc/imglst/lc26050.png cmd/lc_cancel.png
sc/res/lc26050.png cmd/lc_cancel.png
sw/imglst/lc20557.png cmd/lc_cancel.png
sc/imglst/sc26050.png cmd/sc_cancel.png
sc/res/sc26050.png cmd/sc_cancel.png
sw/imglst/sc20557.png cmd/sc_cancel.png
res/sc10853.png cmd/sc_recsearch.png
res/sc05961.png cmd/sc_recsearch.png
......@@ -92,10 +92,10 @@ fpicker/res/fp014.png res/newdoc.png
sd/res/playblue_16.png avmedia/res/av02049.png
sd/res/breakplayingblue_16.png avmedia/res/av02050.png
avmedia/res/avl02053.png cmd/lc_ok.png
sc/imglst/lc26051.png cmd/lc_ok.png
sc/res/lc26051.png cmd/lc_ok.png
sw/imglst/lc20558.png cmd/lc_ok.png
avmedia/res/av02053.png cmd/sc_ok.png
sc/imglst/sc26051.png cmd/sc_ok.png
sc/res/sc26051.png cmd/sc_ok.png
sw/imglst/sc20558.png cmd/sc_ok.png
avmedia/res/avl02048.png cmd/lc_open.png
avmedia/res/av02048.png cmd/sc_open.png
......@@ -207,8 +207,8 @@ sfx2/res/symphony/sidebar-transition-small.png cmd/sc_dia.png
sfx2/res/symphony/sidebar-animation-small.png cmd/sc_customanimation.png
sw/imglst/lc20556.png cmd/lc_insertformula.png
sw/imglst/sc20556.png cmd/sc_insertformula.png
sc/imglst/lc26047.png cmd/lc_insertformula.png
sc/imglst/sc26047.png cmd/sc_insertformula.png
sc/res/lc26047.png cmd/lc_insertformula.png
sc/res/sc26047.png cmd/sc_insertformula.png
cmd/lc_exitsearch.png cmd/lc_closedoc.png
cmd/sc_exitsearch.png cmd/sc_closedoc.png
cmd/lc_leftpara.png cmd/lc_alignleft.png
......@@ -252,8 +252,8 @@ cmd/lc_openfromwriter.png cmd/lc_open.png
cmd/lc_openfromcalc.png cmd/lc_open.png
cmd/sc_openfromwriter.png cmd/sc_open.png
cmd/sc_openfromcalc.png cmd/sc_open.png
sc/imglst/lc26048.png cmd/lc_autosum.png
sc/imglst/sc26048.png cmd/sc_autosum.png
sc/res/lc26048.png cmd/lc_autosum.png
sc/res/sc26048.png cmd/sc_autosum.png
cmd/lc_fontcolor.png cmd/lc_color.png
cmd/sc_fontcolor.png cmd/sc_color.png
cmd/lc_circle.png cmd/lc_basicshapes.circle.png
......
sc/inc/sc.hrc
Dosyayı görüntüle @ c6797f77
......@@ -1026,6 +1026,11 @@
#define RID_BMP_MINUS (BMP_START + 32)
#define RID_BMP_NOTPRESSED (BMP_START + 33)
#define RID_BMP_PRESSED (BMP_START + 34)
#define RID_BMP_INPUT_FUNCTION (BMP_START + 35)
#define RID_BMP_INPUT_SUM (BMP_START + 36)
#define RID_BMP_INPUT_EQUAL (BMP_START + 37)
#define RID_BMP_INPUT_CANCEL (BMP_START + 38)
#define RID_BMP_INPUT_OK (BMP_START + 39)
#define BMP_END (BMP_START + 100)
......
sc/source/ui/app/inputwin.cxx
Dosyayı görüntüle @ c6797f77
......@@ -140,8 +140,6 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
return aInfo;
}
#define IMAGE(id) pImgMgr->SeekImage(id)
// class ScInputWindow
static VclPtr<ScTextWndBase> lcl_chooseRuntimeImpl( vcl::Window* pParent, SfxBindings* pBind )
......@@ -173,9 +171,6 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :
bIsOkCancelMode ( false ),
bInResize ( false )
{
ScModule* pScMod = SC_MOD();
SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
// #i73615# don't rely on SfxViewShell::Current while constructing the input line
// (also for GetInputHdl below)
ScTabViewShell* pViewSh = nullptr;
......@@ -191,9 +186,9 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :
// Position window, 3 buttons, input window
InsertWindow (1, aWndPos.get(), ToolBoxItemBits::NONE, 0);
InsertSeparator (1);
InsertItem (SID_INPUT_FUNCTION, IMAGE(SID_INPUT_FUNCTION), ToolBoxItemBits::NONE, 2);
InsertItem (SID_INPUT_SUM, IMAGE(SID_INPUT_SUM), ToolBoxItemBits::NONE, 3);
InsertItem (SID_INPUT_EQUAL, IMAGE(SID_INPUT_EQUAL), ToolBoxItemBits::NONE, 4);
InsertItem (SID_INPUT_FUNCTION, Image(BitmapEx(ScResId(RID_BMP_INPUT_FUNCTION))), ToolBoxItemBits::NONE, 2);
InsertItem (SID_INPUT_SUM, Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))), ToolBoxItemBits::NONE, 3);
InsertItem (SID_INPUT_EQUAL, Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))), ToolBoxItemBits::NONE, 4);
InsertSeparator (5);
InsertWindow (7, &aTextWindow, ToolBoxItemBits::NONE, 6);
......@@ -240,7 +235,6 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :
else if (pViewSh)
pViewSh->UpdateInputHandler(true); // Absolutely necessary update
pImgMgr->RegisterToolBox(this);
SetAccessibleName(ScResId(STR_ACC_TOOLBAR_FORMULA));
}
......@@ -272,8 +266,6 @@ void ScInputWindow::dispose()
}
}
SfxImageManager::GetImageManager( *SC_MOD() )->ReleaseToolBox( this );
pRuntimeWindow.disposeAndClear();
aWndPos.disposeAndClear();
......@@ -509,14 +501,12 @@ void ScInputWindow::SetOkCancelMode()
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
ScModule* pScMod = SC_MOD();
SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
if (!bIsOkCancelMode)
{
RemoveItem( 3 ); // Remove SID_INPUT_SUM and SID_INPUT_EQUAL
RemoveItem( 3 );
InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), ToolBoxItemBits::NONE, 3 );
InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), ToolBoxItemBits::NONE, 4 );
InsertItem( SID_INPUT_CANCEL, Image(BitmapEx(ScResId(RID_BMP_INPUT_CANCEL))), ToolBoxItemBits::NONE, 3 );
InsertItem( SID_INPUT_OK, Image(BitmapEx(ScResId(RID_BMP_INPUT_OK))), ToolBoxItemBits::NONE, 4 );
SetItemText ( SID_INPUT_CANCEL, aTextCancel );
SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
SetItemText ( SID_INPUT_OK, aTextOk );
......@@ -531,15 +521,13 @@ void ScInputWindow::SetSumAssignMode()
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
ScModule* pScMod = SC_MOD();
SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
if (bIsOkCancelMode)
{
// Remove SID_INPUT_CANCEL, and SID_INPUT_OK
RemoveItem( 3 );
RemoveItem( 3 );
InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), ToolBoxItemBits::NONE, 3 );
InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), ToolBoxItemBits::NONE, 4 );
InsertItem( SID_INPUT_SUM, Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))), ToolBoxItemBits::NONE, 3 );
InsertItem( SID_INPUT_EQUAL, Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))), ToolBoxItemBits::NONE, 4 );
SetItemText ( SID_INPUT_SUM, aTextSum );
SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME );
SetItemText ( SID_INPUT_EQUAL, aTextEqual );
......@@ -634,20 +622,16 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
// update item images
ScModule* pScMod = SC_MOD();
SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
// IMAGE macro uses pScMod, pImgMg
SetItemImage( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ) );
SetItemImage(SID_INPUT_FUNCTION, Image(BitmapEx(ScResId(RID_BMP_INPUT_FUNCTION))));
if ( bIsOkCancelMode )
{
SetItemImage( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ) );
SetItemImage( SID_INPUT_OK, IMAGE( SID_INPUT_OK ) );
SetItemImage(SID_INPUT_CANCEL, Image(BitmapEx(ScResId(RID_BMP_INPUT_CANCEL))));
SetItemImage(SID_INPUT_OK, Image(BitmapEx(ScResId(RID_BMP_INPUT_OK))));
}
else
{
SetItemImage( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ) );
SetItemImage( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ) );
SetItemImage(SID_INPUT_SUM, Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))));
SetItemImage(SID_INPUT_EQUAL, Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))));
}
}
......
sc/source/ui/src/toolbox.src
Dosyayı görüntüle @ c6797f77
......@@ -64,33 +64,29 @@ String SCSTR_QHELP_COLLAPSE_FORMULA
Text [ en-US ] = "Collapse Formula Bar" ;
};
// Don't use this image list for normal toolbar images. We have now our commandimagelist
// folder in icon-themes/(name of theme)/cmd. This list is now only used for special
//toolboxes that are used in floating windows.
#define DEFAULT_IDLIST \
IdList = { \
/* Eingabezeile */ \
SID_INPUT_FUNCTION; /* 26047 */ \
SID_INPUT_SUM; /* 26048 */ \
SID_INPUT_EQUAL; /* 26049 */ \
SID_INPUT_CANCEL; /* 26050 */ \
SID_INPUT_OK; /* 26051 */ \
}; \
IdCount = { \
5; \
};
ImageList RID_DEFAULTIMAGELIST_SC
Bitmap RID_BMP_INPUT_FUNCTION
{
Prefix = "sc";
DEFAULT_IDLIST
File = "sc26047.png";
};
ImageList RID_DEFAULTIMAGELIST_LC
Bitmap RID_BMP_INPUT_SUM
{
Prefix = "lc";
DEFAULT_IDLIST
File = "sc26048.png";
};
Bitmap RID_BMP_INPUT_EQUAL
{
File = "sc26049.png";
};
Bitmap RID_BMP_INPUT_CANCEL
{
File = "sc26050.png";
};
Bitmap RID_BMP_INPUT_OK
{
File = "sc26051.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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