Changeset 3503

Timestamp:

Mar 7, 2019, 7:23:19 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Improved SelectBoxStyle and SelectDrawStyle:
  • Handle Cancel of the entry field dialog correctly.
  • Mark the selected style when dialog is opened.

Location:

trunk/src/netlabs/macros

Files:

• box.e (modified) (5 diffs)
• draw.e (modified) (4 diffs)

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

@@ -124 +124 @@
             stop
          endif
-7
+
          do i = firstline to lastline
             getline LineStr, i, fileid
@@ -307 +307 @@
    Entries = Entries''Sep || '/<char>   any char'
 
-   DefaultItem = 1      -- <-- Select last selected item. For /, add last selected char or <char>
+   KeyPath = '\NEPMD\User\Format\BoxStyle'
+   OldStyle = QueryConfigKey( KeyPath)
+   rest = Entries
+   i = 0
+   DefaultItem = 1
+   do while rest <> ''
+      if i = 20 then  -- just to prevent looping forever
+         leave
+      endif
+      i = i + 1
+      parse value rest with (Sep) 2 Char 3 . (Sep) +0 rest
+      if Char = leftstr( OldStyle, 1) then
+         DefaultItem = i
+         leave
+      endif
+   enddo
    Title = 'Select a box style'  --copies( ' ', 20)
    Text = 'The selection will be saved on 'ChangeStr( '~', OK__MSG, '')'.'
@@ -328 +343 @@
    parse value Result with Button 2 Selected \0
    Selected = leftstr( Selected, 1)
-   KeyPath = '\NEPMD\User\Format\BoxStyle'
-   OldStyle = QueryConfigKey( KeyPath)
    BoxChar = ''
    Style = ''
@@ -350 +363 @@
                                atoi( 1) || atoi( 0) || atol( 0) ||
                                Text) with Button 2 BoxChar \0
-
-         Style = Selected''BoxChar
+         if Button = \1 then      -- OK
+            Style = Selected''BoxChar
+         else                     -- Cancel
+            Style = ''
+         endif
       endif
       if Style <> '' & Style <> OldStyle then
@@ -361 +377 @@
    endif
 
-; ---------------------------------------------------------------------------
-/*
-defproc SelectBoxStyle
-   getfileid startfid
-
-   -- Create a private buffer
-   bufhndl = buffer( CREATEBUF, 'selectboxstyle', MAXBUFSIZE, 1)
-
-   -- Create a tmp file
-   'xcom e /c /q .selectboxstyle'
-   if rc <> -282 then  -- sayerror( 'New file')
-      sayerror ERROR__MSG rc BAD_TMP_FILE__MSG sayerrortext( rc)
-      call buffer( FREEBUF, bufhndl)
-      return
-   endif
-   .autosave = 0
-   browse_mode = browse()     -- query current state
-   if browse_mode then
-      call browse( 0)
-   endif
-
-   insertline '1  '\179'   (CP 850, 437)', .last + 1  -- ³  thin, single line
-   insertline '2  '\186'   (CP 850, 437)', .last + 1  -- º  thin, double line
-   insertline '3  |   (ASCII)', .last + 1             -- |  ASCII chars
-   insertline '4  '\219'   (CP 850, 437)', .last + 1  -- Û  thick line
-   insertline '5  '\216'   (CP 437)', .last + 1       -- Ø  H: double, V: single line
-   insertline '6  '\215'   (CP 437)', .last + 1       -- ×  H: single, V: double line
-   insertline 'C  /'||'*  (C comment)', .last + 1
-   insertline 'P  (*  (Pascal comment)', .last + 1
-   insertline 'A  ;   (Assembler comment)', .last + 1
-   insertline 'S  .*  (Script comment)', .last + 1
-   insertline 'B      (space)', .last + 1
-   insertline 'E      (erase)', .last + 1
-   insertline 'R      (reflow)', .last + 1
-   insertline '/<char>  (any char)', .last + 1
-
-   if browse_mode then
-      call browse( 1)
-   endif  -- restore browse state
-
-   -- Fill buffer with tmp file and quit it
-   if Listbox_Buffer_From_File( startfid, bufhndl, noflines, usedsize) then
-      return
-   endif
-
-   DefaultItem = 1      -- <-- Select last selected item. For /, add last selected char or <char>
-   Title = 'Select a box style'  --copies( ' ', 20)
-   Text = 'The selection will be saved on 'ChangeStr( '~', OK__MSG, '')'.'
-   HelpId = 2050
-   DefaultButton = 1
-   Buttons = '/'OK__MSG'/'CANCEL__MSG'/'HELP__MSG
-
-   refresh
-   Result = ListBox( Title\0,         -- <-- \0 required?
-                     \0 || atol( usedsize) || atoi( 32) || atoi( bufhndl) || 3,
-                     Buttons,
-                     0, 0,      -- top, left in chars, (0,0) = center, (C,C) = cursor
-                     14, 50,    -- height, width in chars
-                     GethWndC( APP_HANDLE) || atoi( DefaultItem) ||
-                     atoi( DefaultButton) || atoi( HelpId) ||
-                     Text\0)
-   call buffer( FREEBUF, bufhndl)
-   refresh
-
-   -- Check result
-   parse value Result with Button 2 Selected \0
-   if Button = 1 then                         -- OK
-   else                                       -- Cancel
-   endif
-*/
-

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

@@ -189 +189 @@
 
 ; ---------------------------------------------------------------------------
-defc Draw_Exit
+defc draw_exit
    universal cursor_mode
    getfileid fid
@@ -590 +590 @@
    Entries = Entries''Sep || '/<char>   any char'
 
-   DefaultItem = 1      -- <-- Select last selected item. For /, add last selected char or <char>
+   KeyPath = '\NEPMD\User\Format\DrawStyle'
+   OldStyle = QueryConfigKey( KeyPath)
+   rest = Entries
+   i = 0
+   DefaultItem = 1
+   do while rest <> ''
+      if i = 20 then  -- just to prevent looping forever
+         leave
+      endif
+      i = i + 1
+      parse value rest with (Sep) 2 Char 3 . (Sep) +0 rest
+      if Char = leftstr( OldStyle, 1) then
+         DefaultItem = i
+         leave
+      endif
+   enddo
    Title = 'Select a draw style'  --copies( ' ', 20)
    Text = 'The selection will be saved on 'ChangeStr( '~', OK__MSG, '')'.'
@@ -611 +626 @@
    parse value Result with Button 2 Selected \0
    Selected = leftstr( Selected, 1)
-   KeyPath = '\NEPMD\User\Format\DrawStyle'
-   OldStyle = QueryConfigKey( KeyPath)
    BoxChar = ''
    Style = ''
@@ -633 +646 @@
                                atoi( 1) || atoi( 0) || atol( 0) ||
                                Text) with Button 2 BoxChar \0
-
-         Style = Selected''BoxChar
+         if Button = \1 then      -- OK
+            Style = Selected''BoxChar
+         else                     -- Cancel
+            Style = ''
+         endif
       endif
       if Style <> '' & Style <> OldStyle then