diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9173eb0afa..020527d308 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,39 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-06 09:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/resources/blockindentl.png + * contrib/hbide/resources/blockindentr.png + + contrib/hbide/resources/bookmark.png + + contrib/hbide/resources/close3.png + * contrib/hbide/resources/curlinehilight.png + * contrib/hbide/resources/fullscreen.png + * contrib/hbide/resources/help1.png + * contrib/hbide/resources/horzruler.png + + contrib/hbide/resources/indent-less.png + + contrib/hbide/resources/indent-more.png + + contrib/hbide/resources/open3.png + + contrib/hbide/resources/save3.png + * contrib/hbide/resources/stream.png + * contrib/hbide/resources/togglelinenumber.png + * contrib/hbide/resources/view_cascaded.png + * contrib/hbide/resources/view_horzstacked.png + * contrib/hbide/resources/view_organized.png + * contrib/hbide/resources/view_tabbed.png + * contrib/hbide/resources/view_tiled.png + * contrib/hbide/resources/view_vertstacked.png + + * contrib/hbide/hbide.qrc + + Added: few more icons. + % Changed: few existing. + + * contrib/hbide/ideactions.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/ideedit.prg + + Rationalized: icon colors, now they present a professional look. + % Fixed: behavior of few MDI area toolbars actions, + went weired after the introduction of MDI concept. + 2010-08-06 15:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbpost.hbm ! Fixed to create dynlibs and executables in -fullshared mode diff --git a/harbour/contrib/hbide/hbide.qrc b/harbour/contrib/hbide/hbide.qrc index c256c8b492..1115b96173 100644 --- a/harbour/contrib/hbide/hbide.qrc +++ b/harbour/contrib/hbide/hbide.qrc @@ -4,6 +4,7 @@ resources/blockcomment.png resources/blockindentl.png resources/blockindentr.png +resources/bookmark.png resources/browser.png resources/build.png resources/builderror.png @@ -14,6 +15,7 @@ resources/clean.png resources/cleanrun.png resources/close.png +resources/close3.png resources/closeall.png resources/closeexcept.png resources/closetab.png @@ -108,6 +110,8 @@ resources/horzruler.png resources/idepreferences.png resources/increaseindent.png +resources/indent-more.png +resources/indent-less.png resources/info.png resources/infotips.png resources/insert-datetime.png @@ -135,6 +139,7 @@ resources/notepad.png resources/open.png resources/open2.png +resources/open3.png resources/panel_1.png resources/panel_2.png resources/panel_3.png @@ -163,6 +168,7 @@ resources/runscript.png resources/runnodebug.png resources/save.png +resources/save3.png resources/saveall.png resources/saveas.png resources/search.png diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index eccd6a67b6..dd4cb9e98e 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -178,9 +178,9 @@ METHOD IdeActions:loadActions() aadd( aAct, { "TB_Exit" , "E~xit" , "exit" , "" , "No", "Yes" } ) aadd( aAct, { "TB_Home" , "~Home" , "dc_home" , "" , "No", "Yes" } ) aadd( aAct, { "TB_New" , "~Source" , "new" , "" , "No", "Yes" } ) - aadd( aAct, { "TB_Open" , "~Open" , "open" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Open" , "~Open" , "open3" , "" , "No", "Yes" } ) aadd( aAct, { "TB_Save" , "~Save" , "save" , "" , "No", "Yes" } ) - aadd( aAct, { "TB_Close" , "~Close" , "close" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Close" , "~Close" , "close3" , "" , "No", "Yes" } ) aadd( aAct, { "TB_Print" , "~Print" , "print" , "" , "No", "Yes" } ) aadd( aAct, { "TB_Script" , "Run as script" , "runscript" , "" , "No", "Yes" } ) aadd( aAct, { "TB_Compile" , "Co~mpile" , "compile" , "" , "No", "Yes" } ) diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 6df77a5ee2..b3895b481e 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -152,6 +152,7 @@ CLASS IdeDocks INHERIT IdeObject METHOD stackMaximized() METHOD stackZoom( nMode ) METHOD restState( nMode ) + METHOD setButtonState( cAlias, lChecked ) ENDCLASS @@ -958,7 +959,7 @@ METHOD IdeDocks:buildMdiToolbarLeft() LOCAL aBtn, qTBar ::qMdiToolbarL := QToolBar():new() - ::qMdiToolbarL:setStyleSheet( GetStyleSheet( "qMdiToolbarLR5", ::nAnimantionMode ) ) + ::qMdiToolbarL:setStyleSheet( GetStyleSheet( "QToolBarLR5", ::nAnimantionMode ) ) ::qMdiToolbarL:setObjectName( "ToolBarL_Lines" ) ::qMdiToolbarL:setIconSize( QSize():new( 16,16 ) ) ::qMdiToolbarL:setOrientation( Qt_Vertical ) @@ -968,10 +969,10 @@ METHOD IdeDocks:buildMdiToolbarLeft() aBtn := {} #if 1 aadd( aBtn, ::buildToolButton( qTBar, { "Toggle tabbed view" , "view_tabbed" , {|| ::execEvent( "buttonViewTabbed_clicked" ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "View as arranged" , "view_organized" , {|| ::execEvent( "buttonViewOrganized_clicked" ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, { "Save layout" , "save" , {|| ::execEvent( "buttonSaveLayout_clicked" ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + aadd( aBtn, ::buildToolButton( qTBar, { "Save layout" , "save3" , {|| ::execEvent( "buttonSaveLayout_clicked" ) }, .f. } ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "View as cascaded" , "view_cascaded" , {|| ::execEvent( "buttonViewCascaded_clicked" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "View as tiled" , "view_tiled" , {|| ::execEvent( "buttonViewTiled_clicked" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "View Maximized" , "fullscreen" , {|| ::execEvent( "buttonViewMaximized_clicked" ) }, .f. } ) ) @@ -979,36 +980,36 @@ METHOD IdeDocks:buildMdiToolbarLeft() aadd( aBtn, ::buildToolButton( qTBar, { "View Horizontally Tiled" , "view_horzstacked", {|| ::execEvent( "buttonViewStackedHorz_clicked" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "View Zoom In" , "view_zoomin" , {|| ::execEvent( "buttonViewZoomedIn_clicked" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "View Zoom Out" , "view_zoomout" , {|| ::execEvent( "buttonViewZoomedOut_clicked" ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Line Numbers" , "togglelinenumber", {|| ::oEM:toggleLineNumbers() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Horizontal Ruler" , "horzruler" , {|| ::oEM:toggleHorzRuler() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Current Line Hilight", "curlinehilight" , {|| ::oEM:toggleCurrentLineHighlightMode() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Code Completion" , "help1" , {|| ::oEM:toggleCodeCompetion() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Completion Tips" , "infotips" , {|| ::oEM:toggleCompetionTips() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Zoom In" , "zoomin" , {|| ::oEM:zoom( +1 ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Zoom Out" , "zoomout" , {|| ::oEM:zoom( -1 ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) #else aadd( aBtn, ::buildToolButton( qTBar, { "Undo" , "undo" , {|| ::oEM:undo() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Redo" , "redo" , {|| ::oEM:redo() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Cut" , "cut" , {|| ::oEM:cut() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Copy" , "copy" , {|| ::oEM:copy() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Paste" , "paste" , {|| ::oEM:paste() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Select all" , "selectall" , {|| ::oEM:seletAll() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Selection mode" , "stream" , {|| ::oEM:toggleSelectionMode() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Find / Replace" , "find" , {|| ::oEM:find() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Mark" , "placeremovemark" , {|| ::oEM:setMark() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Goto Line" , "gotoline" , {|| ::oEM:goTo() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Move Current Line Up" , "movelineup" , {|| ::oEM:moveLine( -1 ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Move Current Line Down" , "movelinedown" , {|| ::oEM:moveLine( 1 ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Delete Current Line" , "deleteline" , {|| ::oEM:deleteLine() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Duplicate Current Line" , "duplicateline" , {|| ::oEM:duplicateLine() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "To Upper" , "toupper" , {|| ::oEM:convertSelection( "ToUpper" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "To Lower" , "tolower" , {|| ::oEM:convertSelection( "ToLower" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Invert Case" , "invertcase" , {|| ::oEM:convertSelection( "Invert" ) }, .f. } ) ) @@ -1051,56 +1052,55 @@ METHOD IdeDocks:buildMdiToolbar() #if 1 aadd( aBtn, ::buildToolButton( qTBar, { "Undo" , "undo" , {|| ::oEM:undo() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Redo" , "redo" , {|| ::oEM:redo() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Cut" , "cut" , {|| ::oEM:cut() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Copy" , "copy" , {|| ::oEM:copy() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Paste" , "paste" , {|| ::oEM:paste() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, { "Select all" , "selectall" , {|| ::oEM:seletAll() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, { "Selection mode" , "stream" , {|| ::oEM:toggleSelectionMode() }, .f. } ) ) + aadd( aBtn, ::buildToolButton( qTBar, { "Select all" , "selectall" , {|| ::oEM:selectAll() }, .f. } ) ) + aadd( aBtn, ::buildToolButton( qTBar, { "Selection mode" , "stream" , {|| ::oEM:toggleSelectionMode() }, .t. } ) ) ::qMdiToolbar:addWidget( sp1 ) -// aadd( aBtn, ::buildToolButton( qTBar, {} ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Find / Replace" , "find" , {|| ::oEM:find() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Mark" , "placeremovemark" , {|| ::oEM:setMark() }, .f. } ) ) + aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Mark" , "bookmark" , {|| ::oEM:setMark() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Goto Line" , "gotoline" , {|| ::oEM:goTo() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Reload Source" , "view_refresh" , {|| ::oEM:reload() }, .f. } ) ) -// aadd( aBtn, ::buildToolButton( qTBar, {} ) ) ::qMdiToolbar:addWidget( sp2 ) aadd( aBtn, ::buildToolButton( qTBar, { "Move Current Line Up" , "movelineup" , {|| ::oEM:moveLine( -1 ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Move Current Line Down" , "movelinedown" , {|| ::oEM:moveLine( 1 ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Delete Current Line" , "deleteline" , {|| ::oEM:deleteLine() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Duplicate Current Line" , "duplicateline" , {|| ::oEM:duplicateLine() }, .f. } ) ) ::qMdiToolbar:addWidget( sp3 ) -// aadd( aBtn, ::buildToolButton( qTBar, {} ) ) aadd( aBtn, ::buildToolButton( qTBar, { "To Upper" , "toupper" , {|| ::oEM:convertSelection( "ToUpper" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "To Lower" , "tolower" , {|| ::oEM:convertSelection( "ToLower" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Invert Case" , "invertcase" , {|| ::oEM:convertSelection( "Invert" ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Block Comment" , "blockcomment" , {|| ::oEM:blockComment() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Stream Comment" , "streamcomment" , {|| ::oEM:streamComment() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Indent Right" , "blockindentr" , {|| ::oEM:indent( 1 ) }, .f. } ) ) + //aadd( aBtn, ::buildToolButton( qTBar, { "Indent Right" , "indent-more" , {|| ::oEM:indent( 1 ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Indent Left" , "blockindentl" , {|| ::oEM:indent( -1 ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + //aadd( aBtn, ::buildToolButton( qTBar, { "Indent Left" , "indent-less" , {|| ::oEM:indent( -1 ) }, .f. } ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Single to Double Quotes" , "sgl2dblquote" , {|| ::oEM:convertDQuotes() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Double to Single Quotes" , "dbl2sglquote" , {|| ::oEM:convertQuotes() }, .f. } ) ) #else aadd( aBtn, ::buildToolButton( qTBar, { "Toggle tabbed view" , "view_tabbed" , {|| ::execEvent( "buttonViewTabbed_clicked" ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "View as arranged" , "view_organized" , {|| ::execEvent( "buttonViewOrganized_clicked" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "View as cascaded" , "view_cascaded" , {|| ::execEvent( "buttonViewCascaded_clicked" ) }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "View as tiled" , "view_tiled" , {|| ::execEvent( "buttonViewTiled_clicked" ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Save layout" , "save" , {|| ::execEvent( "buttonSaveLayout_clicked" ) }, .f. } ) ) ::qMdiToolbar:addWidget( sp1 ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Line Numbers" , "togglelinenumber", {|| ::oEM:toggleLineNumbers() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Horizontal Ruler" , "horzruler" , {|| ::oEM:toggleHorzRuler() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Current Line Hilight", "curlinehilight" , {|| ::oEM:toggleCurrentLineHighlightMode() }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Code Completion" , "help1" , {|| ::oEM:toggleCodeCompetion() }, .f. } ) ) aadd( aBtn, ::buildToolButton( qTBar, { "Toggle Completion Tips" , "infotips" , {|| ::oEM:toggleCompetionTips() }, .f. } ) ) ::qMdiToolbar:addWidget( sp2 ) aadd( aBtn, ::buildToolButton( qTBar, { "Zoom In" , "zoomin" , {|| ::oEM:zoom( +1 ) }, .f. } ) ) - aadd( aBtn, ::buildToolButton( qTBar, {} ) ) + ::buildToolButton( qTBar, {} ) aadd( aBtn, ::buildToolButton( qTBar, { "Zoom Out" , "zoomout" , {|| ::oEM:zoom( -1 ) }, .f. } ) ) #endif @@ -1132,6 +1132,30 @@ METHOD IdeDocks:buildToolButton( qToolbar, aBtn ) /*----------------------------------------------------------------------*/ +METHOD IdeDocks:setButtonState( cAlias, lChecked ) + LOCAL n, lOldChecked, qBtn + + cAlias := lower( cAlias ) + + IF ( n := ascan( ::aMdiToolBtns, {|q| q:objectName() == cAlias } ) ) > 0 + qBtn := ::aMdiToolBtns[ n ] + + ELSEIF ( n := ascan( ::aBtnLines, {|q| q:objectName() == cAlias } ) ) > 0 + qBtn := ::aBtnLines[ n ] + + ENDIF + + IF !empty( qBtn ) + lOldChecked := qBtn:isChecked() + IF hb_isLogical( lChecked ) + qBtn:setChecked( lChecked ) + ENDIF + ENDIF + + RETURN lOldChecked + +/*------------------------------------------------------------------------*/ + METHOD IdeDocks:buildStackedWidget() IF ::oIde:lCurEditsMdi @@ -1946,13 +1970,17 @@ METHOD IdeDocks:animateComponents( nMode ) ::oDlg:menubar():setStyleSheet( GetStyleSheet( "QMenuBar", nMode ), GetStyleSheet( "QMenuPop", nMode ) ) /* Toolbars */ - ::oMainToolbar:setStyleSheet( GetStyleSheet( "QToolBar" , nMode ) ) + ::oMainToolbar:oWidget:setStyleSheet( GetStyleSheet( "QToolBar", nMode ) ) IF ! ::oIde:lCurEditsMdi ::qTBarPanels :setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) ) ::qTBarLines :setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) ) ENDIF ::qTBarDocks :setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) ) + IF ::oIde:lCurEditsMdi + ::qMdiToolbar:setStyleSheet( GetStyleSheet( "QToolBar", nMode ) ) + ::qMdiToolbarL:setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) ) + ENDIF /* User defined toolbars */ ::oTM:setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) ) diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index 63b167922a..567ffffdeb 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -719,11 +719,14 @@ METHOD IdeEdit:dispStatusInfo() ::qEdit:hbGetSelectionInfo() nMode := ::aSelectionInfo[ 5 ] - ::oAC:getAction( "TB_SelectionMode" ):setIcon( hbide_image( iif( nMode == 3, "selectionline", "stream" ) ) ) - ::oAC:getAction( "TB_SelectionMode" ):setChecked( nMode > 1 ) + IF ::oIde:lCurEditsMdi + ::oDK:setButtonState( "stream", nMode > 1 ) + ELSE + ::oAC:getAction( "TB_SelectionMode" ):setIcon( hbide_image( iif( nMode == 3, "selectionline", "stream" ) ) ) + ::oAC:getAction( "TB_SelectionMode" ):setChecked( nMode > 1 ) + ENDIF ::oDK:setStatusText( SB_PNL_STREAM, iif( nMode == 2, "Column", iif( nMode == 3, "Line", "Stream" ) ) ) - RETURN Self /*----------------------------------------------------------------------*/ @@ -1387,7 +1390,11 @@ METHOD IdeEdit:toggleHorzRuler() /* Fired by icon */ METHOD IdeEdit:toggleSelectionMode() - ::qEdit:hbSetSelectionMode( iif( ::oAC:getAction( "TB_SelectionMode" ):isChecked(), 2, 1 ), .f. ) + IF ::oIde:lCurEditsMdi + ::qEdit:hbSetSelectionMode( iif( ::oDK:setButtonState( "stream" ), 2, 1 ), .f. ) + ELSE + ::qEdit:hbSetSelectionMode( iif( ::oAC:getAction( "TB_SelectionMode" ):isChecked(), 2, 1 ), .f. ) + ENDIF RETURN Self /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/resources/blockindentl.png b/harbour/contrib/hbide/resources/blockindentl.png index 5eeecebf8d..83965745d9 100644 Binary files a/harbour/contrib/hbide/resources/blockindentl.png and b/harbour/contrib/hbide/resources/blockindentl.png differ diff --git a/harbour/contrib/hbide/resources/blockindentr.png b/harbour/contrib/hbide/resources/blockindentr.png index b03fb7c925..f7f9da2732 100644 Binary files a/harbour/contrib/hbide/resources/blockindentr.png and b/harbour/contrib/hbide/resources/blockindentr.png differ diff --git a/harbour/contrib/hbide/resources/bookmark.png b/harbour/contrib/hbide/resources/bookmark.png new file mode 100644 index 0000000000..250f2e09ca Binary files /dev/null and b/harbour/contrib/hbide/resources/bookmark.png differ diff --git a/harbour/contrib/hbide/resources/close3.png b/harbour/contrib/hbide/resources/close3.png new file mode 100644 index 0000000000..e11c6b2fc4 Binary files /dev/null and b/harbour/contrib/hbide/resources/close3.png differ diff --git a/harbour/contrib/hbide/resources/curlinehilight.png b/harbour/contrib/hbide/resources/curlinehilight.png index cea25aa88f..7303fd8c44 100644 Binary files a/harbour/contrib/hbide/resources/curlinehilight.png and b/harbour/contrib/hbide/resources/curlinehilight.png differ diff --git a/harbour/contrib/hbide/resources/fullscreen.png b/harbour/contrib/hbide/resources/fullscreen.png index ffdabd4e97..8395cc547a 100644 Binary files a/harbour/contrib/hbide/resources/fullscreen.png and b/harbour/contrib/hbide/resources/fullscreen.png differ diff --git a/harbour/contrib/hbide/resources/help1.png b/harbour/contrib/hbide/resources/help1.png index 0b334e64b4..b9d351b85d 100644 Binary files a/harbour/contrib/hbide/resources/help1.png and b/harbour/contrib/hbide/resources/help1.png differ diff --git a/harbour/contrib/hbide/resources/horzruler.png b/harbour/contrib/hbide/resources/horzruler.png index 193a0b572a..9be43fde67 100644 Binary files a/harbour/contrib/hbide/resources/horzruler.png and b/harbour/contrib/hbide/resources/horzruler.png differ diff --git a/harbour/contrib/hbide/resources/indent-less.png b/harbour/contrib/hbide/resources/indent-less.png new file mode 100644 index 0000000000..1787a7ff48 Binary files /dev/null and b/harbour/contrib/hbide/resources/indent-less.png differ diff --git a/harbour/contrib/hbide/resources/indent-more.png b/harbour/contrib/hbide/resources/indent-more.png new file mode 100644 index 0000000000..6bad6bbacb Binary files /dev/null and b/harbour/contrib/hbide/resources/indent-more.png differ diff --git a/harbour/contrib/hbide/resources/open3.png b/harbour/contrib/hbide/resources/open3.png new file mode 100644 index 0000000000..aa248d5d7f Binary files /dev/null and b/harbour/contrib/hbide/resources/open3.png differ diff --git a/harbour/contrib/hbide/resources/save3.png b/harbour/contrib/hbide/resources/save3.png new file mode 100644 index 0000000000..e4a5ae2403 Binary files /dev/null and b/harbour/contrib/hbide/resources/save3.png differ diff --git a/harbour/contrib/hbide/resources/stream.png b/harbour/contrib/hbide/resources/stream.png index 0b2e86880e..a6a0bfafce 100644 Binary files a/harbour/contrib/hbide/resources/stream.png and b/harbour/contrib/hbide/resources/stream.png differ diff --git a/harbour/contrib/hbide/resources/togglelinenumber.png b/harbour/contrib/hbide/resources/togglelinenumber.png index cba25c3c2b..3780cbb9da 100644 Binary files a/harbour/contrib/hbide/resources/togglelinenumber.png and b/harbour/contrib/hbide/resources/togglelinenumber.png differ diff --git a/harbour/contrib/hbide/resources/view_cascaded.png b/harbour/contrib/hbide/resources/view_cascaded.png index d0e72801ae..94486a66c8 100644 Binary files a/harbour/contrib/hbide/resources/view_cascaded.png and b/harbour/contrib/hbide/resources/view_cascaded.png differ diff --git a/harbour/contrib/hbide/resources/view_horzstacked.png b/harbour/contrib/hbide/resources/view_horzstacked.png index 4df76dd4e7..a075f4572f 100644 Binary files a/harbour/contrib/hbide/resources/view_horzstacked.png and b/harbour/contrib/hbide/resources/view_horzstacked.png differ diff --git a/harbour/contrib/hbide/resources/view_organized.png b/harbour/contrib/hbide/resources/view_organized.png index d40bf31599..efdb341079 100644 Binary files a/harbour/contrib/hbide/resources/view_organized.png and b/harbour/contrib/hbide/resources/view_organized.png differ diff --git a/harbour/contrib/hbide/resources/view_tabbed.png b/harbour/contrib/hbide/resources/view_tabbed.png index 684b33d5fa..d53d217b25 100644 Binary files a/harbour/contrib/hbide/resources/view_tabbed.png and b/harbour/contrib/hbide/resources/view_tabbed.png differ diff --git a/harbour/contrib/hbide/resources/view_tiled.png b/harbour/contrib/hbide/resources/view_tiled.png index 17dd789336..144ac0bde3 100644 Binary files a/harbour/contrib/hbide/resources/view_tiled.png and b/harbour/contrib/hbide/resources/view_tiled.png differ diff --git a/harbour/contrib/hbide/resources/view_vertstacked.png b/harbour/contrib/hbide/resources/view_vertstacked.png index a4f47a99eb..f11f3a01ae 100644 Binary files a/harbour/contrib/hbide/resources/view_vertstacked.png and b/harbour/contrib/hbide/resources/view_vertstacked.png differ