Changeset 3667

Timestamp:

Oct 15, 2019, 10:11:41 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Cosmetic changes.

File:

• trunk/src/netlabs/macros/toolbar.e (modified) (12 diffs)

trunk/src/netlabs/macros/toolbar.e ¶

@@ -216 +216 @@
         'SayHint' Prompt
       elseif arg( 1) = 'H' then
-         if words( Help) = 1 & isnum( Help) then
+         if words( Help) = 1 & IsNum( Help) then
             'helpmenu' Help
          else
-            call winmessagebox( Title,
+            call WinMessageBox( Title,
                                 Prompt''Help,
                                 MB_OK + MB_INFORMATION + MB_MOVEABLE)
@@ -307 +307 @@
          tb = ''
       endif
-      parse value entrybox( SAVEBAR__MSG,
+      parse value EntryBox( SAVEBAR__MSG,
                             '/'SAVE__MSG'/'Cancel__MSG'/'Help__MSG'/',
                             tb,
                             '', 200,
-                            atoi( 1) || atoi( 7010) || gethwndc( APP_HANDLE) ||
+                            atoi( 1) || atoi( 7010) || GethWndC( APP_HANDLE) ||
                             SAVEBAR_PROMPT__MSG) with button 2 BarName \0
       if button <> \1 then
@@ -515 +515 @@
    if wp then
       fSave = 0
-      BarName = delword( BarName, wp, 1)
+      BarName = strip( delword( BarName, wp, 1))
    endif
    if BarName = '' then  -- List all toolbars
@@ -547 +547 @@
       if .last > 2 then
          getfileid fileid
-         call sort( 2, .last, 1, 40, fileid, 'I')
+         call Sort( 2, .last, 1, 40, fileid, 'I')
       endif
       -- Append name for standard toolbar as last
@@ -568 +568 @@
       -- entry length extends E's max. line length.
       -- It also quits the current file and activates startfid.
-      if listbox_buffer_from_file( startfid,
+      if ListBox_Buffer_From_File( startfid,
                                    bufhndl,
                                    noflines,
@@ -646 +646 @@
       --Setup = \1'8'\1'32'\1'32'\1'8.Helv'\1'16777216'\1'16777216'\1  -- internal default if no entry in EPM.INI
       Setup = \1'56'\1'26'\1'26'\1'9.WarpSans'\1'16777216'\1'16777216'\1  -- new default if no entry in EPM.INI
+      -- See CONFIG.E:"defc SaveColor"
+      -- ValList = .textcolor .markcolor vdesktopcolor vmessagecolor vstatuscolor vmodifiedstatuscolor
+      --         = 16 * 16 * 16 * 16 * 16 * 16 = 16777216
       call setprofile( app_hini, 'UCMenu', 'ConfigInfo', Setup)
    endif
@@ -664 +667 @@
    call windowmessage( 0, getpminfo(EPMINFO_EDITFRAME),
                        5921,
-                       put_in_buffer( Setup), 0)
+                       Put_In_Buffer( Setup), 0)
    return
 
@@ -750 +753 @@
                          atoi( DefaultButton)  ||
                          atoi( 0000)           ||  -- help id
-                         gethwndc( APP_HANDLE) ||
+                         GethWndC( APP_HANDLE) ||
                          Text) with Button 2 NewValue \0
    NewValue = strip(NewValue)
@@ -860 +863 @@
    if wpos then
       fQuiet = 1
-      BarFile = delword( BarFile, wpos, 1)
+      BarFile = strip( delword( BarFile, wpos, 1))
    endif
 
@@ -867 +870 @@
    if wpos then
       fMakeActive = 0
-      BarFile = delword( BarFile, wpos, 1)
+      BarFile = strip( delword( BarFile, wpos, 1))
    endif
 
@@ -1083 +1086 @@
 
 defc delete_toolbar
-   call list_toolbars( DELETE_TOOLBAR__MSG, SELECT_TOOLBAR__MSG, 7001, 5919)
+   call List_Toolbars( DELETE_TOOLBAR__MSG, SELECT_TOOLBAR__MSG, 7001, 5919)
 
 ; ---------------------------------------------------------------------------
@@ -1141 +1144 @@
    Title = 'Select a toolbar'
    Text = 'Current toolbar: 'toolbar_loaded
-   parse value listbox( Title''copies( ' ', 20),
+   parse value ListBox( Title''copies( ' ', 20),
                         \0 || atol( usedsize) || atoi( 32) || atoi( bufhndl),
                         '/'OK__MSG'/'CANCEL__MSG,