[Libreoffice-commits] core.git: basctl/inc basctl/source

[Caolán McNamara]

 basctl/inc/basidesh.hrc             |    5 +++--
 basctl/source/basicide/baside2b.cxx |    5 ++++-
 basctl/source/basicide/basidesh.src |   20 ++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 74ead0785f7a08709cf6da6c24a936001b1a7d9c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 12 11:51:06 2016 +0100

    de-src solo image button
    
    Change-Id: I82a613c8f371d8f585c53b2625e7dbed8ea0b703

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 24444c6..7f21dc6c 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -27,7 +27,7 @@
 #define RID_POPUP_BRKPROPS              ( RID_BASICIDE_START + 11 )
 #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_DOCUMENT                ( RID_BASICIDE_START + 22 )
 #define RID_IMG_MODLIB                  ( RID_BASICIDE_START + 24 )
@@ -103,7 +103,8 @@
 #define RID_STR_SHAREMACROS             ( RID_BASICIDE_START + 75 )
 #define RID_STR_SHAREDIALOGS            ( RID_BASICIDE_START + 76 )
 #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_FILENAME                ( RID_BASICIDE_START + 81 )
 #define RID_STR_APPENDLIBS              ( RID_BASICIDE_START + 82 )
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index ea89aac..d02782e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1563,7 +1563,7 @@ WatchWindow::WatchWindow (Layout* pParent)
     : DockingWindow(pParent)
     , aWatchStr(IDEResId( RID_STR_REMOVEWATCH))
     , 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 |
                                                           WB_HASLINES | WB_HSCROLL | WB_TABSTOP |
                                                           WB_HASLINESATROOT | WB_HASBUTTONSATROOT))
@@ -1584,6 +1584,9 @@ WatchWindow::WatchWindow (Layout* pParent)
     aRemoveWatchButton->Disable();
     aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
     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() );
     aSz.Width() += 6;
     aSz.Height() += 6;
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index a9d08c3..8a21b54 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -285,16 +285,6 @@ String RID_STR_SEARCHALLMODULES
 {
     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
 {
@@ -486,6 +476,16 @@ Image RID_IMG_DIALOG
 {
     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
 {
     Text [ en-US ] = "Do you want to overwrite the XX macro?" ;