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

de-src solo image button

Browse Source 
Change-Id: I82a613c8f371d8f585c53b2625e7dbed8ea0b703
This commit is contained in:
Caolán McNamara
2016-10-12 11:51:06 +01:00
parent 637587fc8f
commit 74ead0785f
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
basctl/inc/basidesh.hrc
View File

@@ -27,7 +27,7 @@
#define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 ) #define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 )
#define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 ) #define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 )
#define RID_IMGBTN_REMOVEWATCH ( RID_BASICIDE_START + 8 ) #define RID_IMG_REMOVEWATCH ( RID_BASICIDE_START + 8 )
#define RID_IMG_INSTALLATION ( RID_BASICIDE_START + 20 ) #define RID_IMG_INSTALLATION ( RID_BASICIDE_START + 20 )
#define RID_IMG_DOCUMENT ( RID_BASICIDE_START + 22 ) #define RID_IMG_DOCUMENT ( RID_BASICIDE_START + 22 )
#define RID_IMG_MODLIB ( RID_BASICIDE_START + 24 ) #define RID_IMG_MODLIB ( RID_BASICIDE_START + 24 )
@@ -103,7 +103,8 @@
#define RID_STR_SHAREMACROS ( RID_BASICIDE_START + 75 ) #define RID_STR_SHAREMACROS ( RID_BASICIDE_START + 75 )
#define RID_STR_SHAREDIALOGS ( RID_BASICIDE_START + 76 ) #define RID_STR_SHAREDIALOGS ( RID_BASICIDE_START + 76 )
#define RID_STR_SHAREMACROSDIALOGS ( RID_BASICIDE_START + 77 ) #define RID_STR_SHAREMACROSDIALOGS ( RID_BASICIDE_START + 77 )
//free slots //free slot
#define RID_STR_REMOVEWATCHTIP ( RID_BASICIDE_START + 79 )
#define RID_STR_QUERYREPLACEMACRO ( RID_BASICIDE_START + 80 ) #define RID_STR_QUERYREPLACEMACRO ( RID_BASICIDE_START + 80 )
#define RID_STR_FILENAME ( RID_BASICIDE_START + 81 ) #define RID_STR_FILENAME ( RID_BASICIDE_START + 81 )
#define RID_STR_APPENDLIBS ( RID_BASICIDE_START + 82 ) #define RID_STR_APPENDLIBS ( RID_BASICIDE_START + 82 )

5
basctl/source/basicide/baside2b.cxx
View File

@@ -1563,7 +1563,7 @@ WatchWindow::WatchWindow (Layout* pParent)
: DockingWindow(pParent) : DockingWindow(pParent)
, aWatchStr(IDEResId( RID_STR_REMOVEWATCH)) , aWatchStr(IDEResId( RID_STR_REMOVEWATCH))
, aXEdit(VclPtr<ExtendedEdit>::Create(this, WB_BORDER | WB_3DLOOK)) , aXEdit(VclPtr<ExtendedEdit>::Create(this, WB_BORDER | WB_3DLOOK))
, aRemoveWatchButton(VclPtr<ImageButton>::Create(this, IDEResId(RID_IMGBTN_REMOVEWATCH))) , aRemoveWatchButton(VclPtr<ImageButton>::Create(this, WB_SMALLSTYLE))
, aTreeListBox(VclPtr<WatchTreeListBox>::Create(this, WB_BORDER | WB_3DLOOK | WB_HASBUTTONS | , aTreeListBox(VclPtr<WatchTreeListBox>::Create(this, WB_BORDER | WB_3DLOOK | WB_HASBUTTONS |
WB_HASLINES | WB_HSCROLL | WB_TABSTOP | WB_HASLINES | WB_HSCROLL | WB_TABSTOP |
WB_HASLINESATROOT | WB_HASBUTTONSATROOT)) WB_HASLINESATROOT | WB_HASBUTTONSATROOT))
@@ -1584,6 +1584,9 @@ WatchWindow::WatchWindow (Layout* pParent)
aRemoveWatchButton->Disable(); aRemoveWatchButton->Disable();
aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) ); aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
aRemoveWatchButton->SetPosPixel( Point( nTextLen + aXEdit->GetSizePixel().Width() + 4, 2 ) ); aRemoveWatchButton->SetPosPixel( Point( nTextLen + aXEdit->GetSizePixel().Width() + 4, 2 ) );
aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH);
aRemoveWatchButton->SetModeImage(Image(IDEResId(RID_IMG_REMOVEWATCH)));
aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP));
Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() ); Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() );
aSz.Width() += 6; aSz.Width() += 6;
aSz.Height() += 6; aSz.Height() += 6;

20
basctl/source/basicide/basidesh.src
View File

@@ -285,16 +285,6 @@ String RID_STR_SEARCHALLMODULES
{ {
Text [ en-US ] = "Do you want to replace the text in all active modules?" ; Text [ en-US ] = "Do you want to replace the text in all active modules?" ;
}; };
ImageButton RID_IMGBTN_REMOVEWATCH
{
HelpId = HID_BASICIDE_REMOVEWATCH ;
SmallStyle = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap { File = "baswatr.png" ; };
};
QuickHelpText [ en-US ] = "Remove Watch" ;
};
String RID_STR_REMOVEWATCH String RID_STR_REMOVEWATCH
{ {
@@ -486,6 +476,16 @@ Image RID_IMG_DIALOG
{ {
ImageBitmap = Bitmap { File = "im30823.png"; }; ImageBitmap = Bitmap { File = "im30823.png"; };
}; };
Image RID_IMG_REMOVEWATCH
{
ImageBitmap = Bitmap { File = "baswatr.png" ; };
};
String RID_STR_REMOVEWATCHTIP
{
Text [ en-US ] = "Remove Watch" ;
};
String RID_STR_QUERYREPLACEMACRO String RID_STR_QUERYREPLACEMACRO
{ {
Text [ en-US ] = "Do you want to overwrite the XX macro?" ; Text [ en-US ] = "Do you want to overwrite the XX macro?" ;