From 363b4d377ddcca066d45d1dca6bee29edfd23ed6 Mon Sep 17 00:00:00 2001 From: gambas Date: Mon, 18 May 2020 13:25:11 +0200 Subject: [PATCH] New stock icons. [GB.FORM] * NEW: New stock icons. --- comp/src/gb.form/.src/Stock.class | 5 ++--- comp/src/gb.form/map/icon.map | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/comp/src/gb.form/.src/Stock.class b/comp/src/gb.form/.src/Stock.class index f860bab03..eed51cb4d 100644 --- a/comp/src/gb.form/.src/Stock.class +++ b/comp/src/gb.form/.src/Stock.class @@ -9,7 +9,6 @@ Static Property Read Icons As String[] Static Property Read Sizes As String[] Static Private $bInit As Boolean -Static Private $bDarkTheme As Boolean = False 'Static Private $sTheme As String Static Private $aIconPath As String[] Static Private $cIconMap As Collection @@ -396,7 +395,7 @@ Static Private Sub DoLoadIcon(sPath As String, iSize As Integer, iRealSize As In If sExt = ".png" Then Try hImage = Image.Load(sDir &/ sFullName) If Not Error Then - If $bDarkTheme Then hImage.Invert(Color.Background, Color.Foreground) + 'If Application.DarkTheme Then hImage.Invert(Color.Background, Color.Foreground) hPict = hImage.Stretch(iRealSize, iRealSize).Picture Goto RETURN_PICT Endif @@ -744,7 +743,7 @@ Static Private Function PictureFromSvg(hSvg As SvgImage, iSize As Integer) As Pi hSvg.Paint() Paint.End - If $bDarkTheme Then hImage.Invert(Color.Background, Color.Foreground) + 'If $bDarkTheme Then hImage.Invert(Color.Background, Color.Foreground) Return hImage.Picture diff --git a/comp/src/gb.form/map/icon.map b/comp/src/gb.form/map/icon.map index 3aa12cc12..995a7029a 100644 --- a/comp/src/gb.form/map/icon.map +++ b/comp/src/gb.form/map/icon.map @@ -43,15 +43,22 @@ database [breeze*]places/network-server-database;apps/office-data delete actions/edit-delete desktop places/user-desktop development categories/applications-development +difference # directory places/folder disconnect actions/network-disconnect down actions/go-down download [elementary]actions/media-import-audio-cd;emblems/emblem-downloads;actions/edit-download;actions/download +draw-circle actions/draw-circle +draw-line actions/draw-line +draw-path actions/draw-path +draw-rectangle actions/draw-rectangle +draw-text actions/draw-text edit actions/document-edit;apps/accessories-text-editor eject actions/media-eject end actions/media-skip-forward erase actions/draw-eraser error status/dialog-error +exclusive # exec [breeze*]actions/run-build;actions/system-run file [-breeze*]actions/document-new;$(mime)/empty;$(mime)/application-x-zerosize file-manager [-breeze*]apps/toolbar/system-file-manager;apps/system-file-manager @@ -90,6 +97,7 @@ insert-image actions/insert-image insert-link actions/insert-link insert-text actions/insert-text internet [-breeze*]places/folder-html;categories/applications-internet +intersection # js $(mime)/application-javascript jump actions/go-jump keyboard preferences/preferences-desktop-keyboard;apps/preferences-desktop-keyboard @@ -201,6 +209,7 @@ transparency # trash [breeze*!16]places/user-trash;places/user-trash undo actions/edit-undo unindent actions/format-indent-less +union # unlock actions/object-unlocked unselect actions/edit-select-none up actions/go-up