diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project index 59cbc43c6..3106818c5 100644 --- a/comp/src/gb.form/.project +++ b/comp/src/gb.form/.project @@ -1,6 +1,6 @@ # Gambas Project File 3.0 Title=More controls for graphical components -Startup=FTestFileView +Startup=FTestTableView Icon=.hidden/icon.png Version=3.16.90 VersionFile=1 diff --git a/comp/src/gb.form/.src/Stock.class b/comp/src/gb.form/.src/Stock.class index 00ed642a3..ca9cae278 100644 --- a/comp/src/gb.form/.src/Stock.class +++ b/comp/src/gb.form/.src/Stock.class @@ -460,6 +460,8 @@ Static Private Sub LoadIcon(sTemplate As String, sFile As String, iSize As Integ For Each sFile In Split(sFile, ";") + If Not sFile Then Break + If Left(sFile) = "[" Then iPos = InStr(sFile, "]") If iPos Then diff --git a/comp/src/gb.form/map/icon.map b/comp/src/gb.form/map/icon.map index 7698fc662..495ddb2cf 100644 --- a/comp/src/gb.form/map/icon.map +++ b/comp/src/gb.form/map/icon.map @@ -14,13 +14,13 @@ apply actions/dialog-apply;actions/dialog-ok-apply archive $(mime)/package-x-generic;apps/utilities-file-archiver attach status/mail-attachment;actions/mail-attachment android $(mime)/application-vnd.android.package-archive -audio $(mime)/audio-x-generic +audio $(mime)/audio-x-generic;;preferences/preferences-desktop-sound;apps/preferences-desktop-sound average # battery devices/battery bicycle # brightness # blue [breeze*]actions/colors-chromablue -bluetooth preferences/preferences-system-bluetooth;apps/bluetooth +bluetooth preferences/preferences-system-bluetooth;apps/preferences-system-bluetooth;apps/bluetooth blur # book [-breeze*]actions/address-book-new;apps/accessories-dictionary bookmark places/bookmarks;actions/bookmark-new;places/user-bookmarks @@ -42,11 +42,11 @@ column-after actions/edit-table-insert-column-right column-before actions/edit-table-insert-column-left column-remove actions/edit-table-delete-column clear actions/edit-clear-locationbar-rtl;actions/edit-clear -clock apps/clock;actions/chronometer +clock apps/clock;actions/chronometer;;preferences/preferences-system-time;apps/preferences-system-time clone actions/edit-clone;actions/edit-duplicate close actions/window-close cloud status/weather-cloudy -color [-breeze*]actions/color-picker-grey;[breeze*]apps/preferences-desktop-color;categories/applications-graphics +color [-breeze*]actions/color-picker-grey;[breeze*]apps/preferences-desktop-color;categories/applications-graphics;;preferences/preferences-desktop-color;apps/preferences-desktop-color color-picker actions/color-picker component categories/applications-utilities;apps/nepomuk computer devices/computer @@ -62,7 +62,7 @@ csv $(mime)/text-csv cut actions/edit-cut database [breeze*]places/network-server-database;apps/office-database delete actions/edit-delete -desktop places/user-desktop +desktop places/user-desktop;;preferences/preferences-desktop-theme;apps/preferences-desktop-theme;preferences/preferences-theme;apps/preferences-theme;preferences/preferences-desktop-theme-global;apps/preferences-desktop-theme-global;preferences/preferences-desktop;apps/preferences-desktop development categories/applications-development difference # directory places/folder @@ -86,12 +86,12 @@ emote-laugh emotes/face-laugh emote-raspberry emotes/face-raspberry emote-plain emotes/face-plain emote-sad emotes/face-sad -emote-happy emotes/face-smile +emote-happy emotes/face-smile;;preferences/preferences-desktop-emoticons;apps/preferences-desktop-emoticons emote-surprise emotes/face-surprise emote-uncertain emotes/face-uncertain emote-wink emotes/face-wink end actions/media-skip-forward -energy apps/utilities-energy-monitor +energy apps/utilities-energy-monitor;;preferences/preferences-system-power;apps/preferences-system-power;preferences/preferences-system-power-management;apps/preferences-system-power-management erase actions/draw-eraser error status/dialog-error exclusive # @@ -101,8 +101,8 @@ file [-breeze*]actions/document-new;$(mime)/empty;$(mime)/app file-manager [-breeze*]apps/toolbar/system-file-manager;apps/system-file-manager fill actions/color-fill;tools/color-fill filter actions/view-filter -find actions/edit-find -firewall apps/firewall;apps/config-firewall;preferences/preferences-security-firewall;status/firewall-applet +find actions/edit-find;;preferences/preferences-system-search;apps/preferences-system-search;preferences/preferences-desktop-search;apps/preferences-desktop-search +firewall apps/firewall;apps/config-firewall;preferences/preferences-security-firewall;apps/preferences-security-firewall;status/firewall-applet;;status/security-high first actions/go-first flag actions/flag-red flip-h actions/object-flip-horizontal @@ -118,12 +118,12 @@ folder-recent places/folder-recent;actions/folder-open-recent folder-remote places/folder-remote folder-root places/folder-root folder-video places/folder-video;places/folder-videos -font [-breeze*]actions/format-text-superscript;apps/preferences-desktop-font +font [-breeze*]actions/format-text-superscript;preferences/preferences-desktop-font;apps/preferences-desktop-font;preferences/preferences-desktop-font-installer;apps/preferences-desktop-font-installer formula actions/formula forward actions/media-seek-forward fullscreen actions/view-fullscreen gambas # -game categories/applications-games;apps/preferences-desktop-gaming;devices/input-gaming;devices/joystick +game categories/applications-games;devices/input-gaming;devices/joystick;;preferences/preferences-desktop-gaming;apps/preferences-desktop-gaming gamma # gnu # green [breeze*]actions/colors-chromagreen @@ -134,7 +134,7 @@ halt actions/process-stop house places/poi-building harddisk devices/drive-harddisk harddisk-root devices/drive-harddisk-root -hardware devices/audio-card +hardware devices/audio-card;;apps/hwinfo headset devices/audio-headset help apps/system-help;categories/system-help;apps/help-browser home actions/go-home @@ -142,10 +142,10 @@ html $(mime)/text-html hibernate apps/system-hibernate;apps/system-suspend-hibernate;actions/system-hibernate;actions/system-suspend-hibernate hue # identity apps/user-info;preferences/preferences-desktop-user;apps/preferences-desktop-user -image $(mime)/image-x-generic +image $(mime)/image-x-generic;;preferences/preferences-desktop-wallpaper;apps/preferences-desktop-wallpaper;preferences/preferences-wallpaper;apps/preferences-wallpaper important emblems/emblem-important indent actions/format-indent-more -info status/dialog-information +info status/dialog-information;;apps/help-info;apps/ktip inheritance actions/code-class insert-image actions/insert-image insert-link actions/insert-link @@ -161,22 +161,22 @@ js $(mime)/application-javascript json $(mime)/application-json jump actions/go-jump key [breeze*]$(mime)/application-pgp-keys;apps/password-manager;apps/keyring-manager;actions/pgp-keys -keyboard preferences/preferences-desktop-keyboard;apps/preferences-desktop-keyboard;devices/input-keyboard +keyboard devices/input-keyboard;preferences/preferences-desktop-keyboard;apps/preferences-desktop-keyboard lamp actions/help-hint -language [-breeze*]actions/im-google-talk;apps/preferences-desktop-locale +language [-breeze*]actions/im-google-talk;preferences/preferences-desktop-locale;apps/preferences-desktop-locale last actions/go-last layout actions/document-page-setup left actions/go-previous library $(mime)/application-x-sharedlib lightness # link emblems/emblem-symbolic-link -linux # -lock actions/object-locked;status/object-locked +linux #;;preferences/preferences-system-linux;apps/preferences-system-linux +lock actions/object-locked;status/object-locked;;preferences/preferences-desktop-user-password;apps/preferences-desktop-user-password lock-screen apps/system-lock-screen;actions/system-lock-screen logout apps/system-log-out;actions/system-log-out lower actions/object-ordre-lower love actions/love -mail apps/evolution-mail;actions/mail-mark-unread +mail apps/evolution-mail;actions/mail-mark-unread;;preferences/preferences-mail;apps/preferences-mail make actions/arrow-down make-all actions/arrow-down-double marker places/poi-marker @@ -187,12 +187,12 @@ menu apps/alacarte;apps/kmenuedit;actions/application-menu microphone devices/audio-input-microphone modified emblems/vcs-locally-modified;emblems/emblem-csv-modified monitor apps/utilities-system-monitor -mouse devices/input-mouse +mouse devices/input-mouse;preferences/preferences-desktop-mouse;apps/preferences-desktop-mouse mount actions/media-mount move actions/transform-move -multimedia categories/applications-multimedia +multimedia categories/applications-multimedia;;preferences/preferences-desktop-multimedia;apps/preferences-desktop-multimedia muted status/audio-volume-muted -network status/network-connect;places/network-workgroup;devices/network-wired +network status/network-connect;places/network-workgroup;devices/network-wired;;preferences/preferences-system-network;apps/preferences-system-network new actions/document-new new-appointment actions/appointment-new new-dir actions/folder-new @@ -201,7 +201,7 @@ new-tab actions/tab-new new-tag actions/tag-new new-window actions/window-new next actions/go-next-view -notification actions/notifications +notification actions/notifications;;preferences/preferences-desktop-notifications;apps/preferences-desktop-notifications;preferences/preferences-desktop-notification;apps/preferences-desktop-notification;preferences/preferences-desktop-notification-bell;apps/preferences-desktop-notification-bell office $(mime)/x-office-document office-calc $(mime)/x-office-spreadsheet office-draw $(mime)/x-office-drawing @@ -210,8 +210,8 @@ ok actions/dialog-ok opacity [breeze]actions/edit-opacity open actions/document-open open-recent actions/document-open-recent -options actions/configure;categories/preferences-system -package apps/system-software-install;apps/preferences-desktop-default-applications +options actions/configure;categories/preferences-system;;preferences/preferences-system;apps/preferences-system +package apps/system-software-install;apps/preferences-desktop-default-applications;preferences/preferences-desktop-default-applications page actions/view-pages-single;actions/page-simple page-two actions/view-pages-facing paste actions/edit-paste @@ -219,17 +219,17 @@ pause actions/media-playback-pause pda devices/pda pdf $(mime)/application-pdf pen actions/draw-freehand -people [breeze*]actions/user-group-new;apps/system-users +people [breeze*]actions/user-group-new;preferences/system-users;apps/system-users;preferences/preferences-system-users;apps/preferences-system-users percent actions/format-number-percent -phone [-breeze*]devices/smartphone;devices/phone +phone [-breeze*]devices/smartphone;devices/phone;;preferences/preferences-kde-connect pin actions/pin;actions/view-pin play actions/media-playback-start plane places/poi-airport -plugin [breeze*]preferences/preferences-plugin;[breeze*]apps/preferences-plugin;categories/applications-puzzles;apps/preferences-system-sharing +plugin preferences/preferences-plugin;apps/preferences-plugin;categories/applications-puzzles;apps/preferences-system-sharing preview actions/document-print-preview previous actions/go-previous-view print actions/document-print -printer devices/printer +printer devices/printer;;preferences/preferences-devices-printer;apps/preferences/preferences-devices-printer program $(mime)/application-x-executable properties actions/document-properties question status/dialog-question;actions/svn-status @@ -260,22 +260,23 @@ rss actions/rss;apps/akregator saturation # save actions/document-save save-as actions/document-save-as -scanner [breeze*]devices/scanner;devices/scanner +scanner [breeze*]devices/scanner;devices/scanner;;preferences/preferences-devices-scanner;apps/preferences/preferences-devices-scanner science categories/applications-science -screen devices/video-display +screen devices/video-display;preferences/preferences-desktop-display;apps/preferences-desktop-display script $(mime)/text-x-script security status/security-medium select actions/select-rectangular select-all actions/edit-select-all server [breeze*!16]places/server-database;places/network-server -share actions/document-share;actions/send-to -shortcut apps/accessories-character-map +share actions/document-share;actions/send-to;preferences/preferences-system-network-sharing;apps/preferences-system-network-sharing;preferences/preferences-system-sharing +shortcut apps/accessories-character-map;preferences/preferences-desktop-keyboard-shortcut;apps/preferences-desktop-keyboard-shortcut shuffle actions/media-playlist-shuffle shutdown apps/system-shutdown;actions/system-shutdown sort-ascent actions/view-sort-ascending;actions/view-sort sort-descent actions/view-sort-descending +speaker [breeze*]apps/kmix;devices/audio-speakers;;apps/kmix spell-check actions/tools-check-spelling -star [breeze*]actions/draw-star;status/starred +star [breeze*]actions/draw-star;status/starred;;preferences/preferences-desktop-default-applications;apps/preferences-desktop-default-applications start actions/media-skip-backward statistics actions/view-statistics stop actions/media-playback-stop @@ -285,7 +286,7 @@ suspend apps/system-suspend;actions/system-suspend system devices/computer switch-user apps/system-switch-user;actions/system-switch-user table [breeze*]actions/table -tablet devices/input-tablet +tablet devices/input-tablet;;preferences/preferences-desktop-tablet;apps/preferences-desktop-tablet tag actions/tag terminal apps/utilities-terminal text $(mime)/text-x-generic;$(mime)/text-plain @@ -324,8 +325,9 @@ union # unlock actions/object-unlocked unselect actions/edit-select-none up actions/go-up +update apps/system-software-update upload [breeze*]actions/cloud-upload -user [breeze*]actions/user-identity;stock/stock_person;status/avatar-default +user [breeze*]actions/user-identity;stock/stock_person;status/avatar-default;;preferences/preferences-desktop-user;apps/preferences-desktop-user user-group [-breeze*]actions/user-group-new;apps/system-users vector $(mime)/image-x-svg+xml;$(mime)/x-office-drawing video $(mime)/video-x-generic @@ -343,7 +345,7 @@ warning status/dialog-warning watch [breeze*]actions/visibility;actions/view-visible webcam devices/camera-web wifi devices/network-wireless -window actions/window +window actions/window;;preferences/preferences-system-windows;apps/preferences-system-windows windows $(mime)/application-x-ms-dos-executable wizard actions/tools-wizard worship places/poi-place-of-worship