Fresh IDE . Check-in [dc5d5f622f]
Not logged in

This repository is a mirror!

The original is located on: https://fresh.flatassembler.net/fossil/repo/fresh
If you want to follow the project, please update your remote-url

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Replacing the visual components icons with .png and future migrating from .ico format. Not finished.
Timelines: family | ancestors | descendants | both | newskin
Files: files | file ages | folders
SHA1:dc5d5f622f687a72b443b23ce174b0c1e13cf43d
User & Date: johnfound 2017-10-25 09:03:38
Context
2017-10-25
10:45
The vlc icons as png. Optimized and fixed the loading in the component palette. check-in: 9347588a48 user: johnfound tags: newskin
09:03
Replacing the visual components icons with .png and future migrating from .ico format. Not finished. check-in: dc5d5f622f user: johnfound tags: newskin
2017-10-23
17:29
The menu and toolbar icon sizes changeable by the options dialog. check-in: 1962027aaa user: johnfound tags: newskin
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Name change from IDE/components/asmedit.ico to IDE/components/asmedit.png.

cannot compute difference between binary files

Changes to IDE/components/asmedit.vcl.

cannot compute difference between binary files

Name change from IDE/components/btnedit.ico to IDE/components/btnedit.png.

cannot compute difference between binary files

Name change from IDE/components/Button.ico to IDE/components/button.png.

cannot compute difference between binary files

Name change from IDE/components/Button.vcl to IDE/components/button.vcl.

cannot compute difference between binary files

Name change from IDE/components/ButtonEdit.vcl to IDE/components/buttonedit.vcl.

cannot compute difference between binary files

Name change from IDE/components/Checkbox.ico to IDE/components/checkbox.png.

cannot compute difference between binary files

Name change from IDE/components/Combobox.ico to IDE/components/combobox.png.

cannot compute difference between binary files

Name change from IDE/components/COMCTL32.vcl to IDE/components/comctl32.vcl.

cannot compute difference between binary files

Name change from IDE/components/Edit.ico to IDE/components/edit.png.

cannot compute difference between binary files

Name change from IDE/components/EDIT.VCL to IDE/components/edit.vcl.

cannot compute difference between binary files

Name change from IDE/components/FORM.ICO to IDE/components/form.png.

cannot compute difference between binary files

Name change from IDE/components/Form.vcl to IDE/components/form.vcl.

cannot compute difference between binary files

Name change from IDE/components/Groupbox.ico to IDE/components/groupbox.png.

cannot compute difference between binary files

Name change from IDE/components/hscrollbar.ico to IDE/components/hscrollbar.png.

cannot compute difference between binary files

Name change from IDE/components/IMAGE.ICO to IDE/components/image.png.

cannot compute difference between binary files

Name change from IDE/components/LABEL.ICO to IDE/components/label.png.

cannot compute difference between binary files

Name change from IDE/components/LISTBOX.ICO to IDE/components/listbox.png.

cannot compute difference between binary files

Name change from IDE/components/LISTBOX.VCL to IDE/components/listbox.vcl.

cannot compute difference between binary files

Name change from IDE/components/LISTVIEW.ICO to IDE/components/listview.png.

cannot compute difference between binary files

Name change from IDE/components/monthview.ico to IDE/components/monthview.png.

cannot compute difference between binary files

Name change from IDE/components/progress.ico to IDE/components/progress.png.

cannot compute difference between binary files

Name change from IDE/components/RADIOBTN.ICO to IDE/components/radiobtn.png.

cannot compute difference between binary files

Changes to IDE/components/scrollbar.vcl.

cannot compute difference between binary files

Name change from IDE/components/SHAPE.ICO to IDE/components/shape.png.

cannot compute difference between binary files

Name change from IDE/components/SIZEBOX.ICO to IDE/components/sizebox.png.

cannot compute difference between binary files

Name change from IDE/components/SLIDER.ICO to IDE/components/slider.png.

cannot compute difference between binary files

Name change from IDE/components/SOURCE/SizerClassDTL.asm to IDE/components/source/SizerClassDTL.asm.

Name change from IDE/components/SOURCE/ADD.BAT to IDE/components/source/add.bat.

Name change from IDE/components/SOURCE/asmedit.asm to IDE/components/source/asmedit.asm.

1
2
3
4


5
6
7
8
9
10
11
..
27
28
29
30
31
32
33
34
include '%finc%/win32/win32a.inc'
include '..\..\..\source\designtime.inc'
include 'winconst.inc'
include '..\..\..\include\libs\asmedit\asmedit.inc'



DesignTimeInfo                                     \
\ ; AsmEdit control.
        'ASMEDIT',                                    \
        'AsmEdit control',                            \
        'Fresh',                                     \
        'AsmEdit',                                    \
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'asmedit.ico'




>
>







 







|
1
2
3
4
5
6
7
8
9
10
11
12
13
..
29
30
31
32
33
34
35
36
include '%finc%/win32/win32a.inc'
include '..\..\..\source\designtime.inc'
include 'winconst.inc'
include '..\..\..\include\libs\asmedit\asmedit.inc'

format binary as 'vcl'

DesignTimeInfo                                     \
\ ; AsmEdit control.
        'ASMEDIT',                                    \
        'AsmEdit control',                            \
        'Fresh',                                     \
        'AsmEdit',                                    \
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'asmedit.png'

Added IDE/components/source/build.















>
>
>
>
>
>
>
1
2
3
4
5
6
7
#!/usr/bin/sh

for i in *.asm; do
  env finc="../../../include" lib="../../../freshlib" fasm "$i"
done

mv *.vcl ../

Name change from IDE/components/SOURCE/BUTTON.ASM to IDE/components/source/button.asm.

2
3
4
5
6
7
8


9
10
11
12
13
14
15
...
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
...
129
130
131
132
133
134
135
136
;
; One file may contains description of more than one control.
; Look at 'DesignTimeInfo' macro definition.
;
; This file must be compiled with FASM compiler to get binary
; file. It will be compiled as .COM file. This is not executable
; file. Don't start it.



include '..\..\..\source\designtime.inc'
include 'winconst.inc'


DesignTimeInfo                                     \
                                                   \       ; 1. BUTTON CONTROL
................................................................................
        $00000000,                                 \            ; This is StyleExMaskOr
        $0000000f,                                 \            ; This is SubtypeMask
        <                                          \
           BS_RADIOBUTTON, 'Standard Radiobutton', \
           BS_AUTORADIOBUTTON, 'Auto Radiobutton'  \
        >,                                         \            ; This is SubtypeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'radiobtn.ico',                            \            ; Image for the icon.
\
\ ; Groupbox control.
\
        'BUTTON',                                  \
        'Group box control',                       \
        'Standard',                                \
        'Group box',                               \
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00010000,                                 \            ; This is StyleExMaskOr
        $0000000f,                                 \            ; This is SubtypeMask
        <BS_GROUPBOX, 'Regular group box'>,        \  ; This is SubtypeRange
        NONE,                                      \            ; Library file NONE, because it's standard component.
        'GroupBox.ico'                                          ; Image for the icon.







>
>







 







|







 







|
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
...
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
...
131
132
133
134
135
136
137
138
;
; One file may contains description of more than one control.
; Look at 'DesignTimeInfo' macro definition.
;
; This file must be compiled with FASM compiler to get binary
; file. It will be compiled as .COM file. This is not executable
; file. Don't start it.

format binary as "vcl"

include '..\..\..\source\designtime.inc'
include 'winconst.inc'


DesignTimeInfo                                     \
                                                   \       ; 1. BUTTON CONTROL
................................................................................
        $00000000,                                 \            ; This is StyleExMaskOr
        $0000000f,                                 \            ; This is SubtypeMask
        <                                          \
           BS_RADIOBUTTON, 'Standard Radiobutton', \
           BS_AUTORADIOBUTTON, 'Auto Radiobutton'  \
        >,                                         \            ; This is SubtypeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'radiobtn.png',                            \            ; Image for the icon.
\
\ ; Groupbox control.
\
        'BUTTON',                                  \
        'Group box control',                       \
        'Standard',                                \
        'Group box',                               \
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00010000,                                 \            ; This is StyleExMaskOr
        $0000000f,                                 \            ; This is SubtypeMask
        <BS_GROUPBOX, 'Regular group box'>,        \  ; This is SubtypeRange
        NONE,                                      \            ; Library file NONE, because it's standard component.
        'GroupBox.png'                                          ; Image for the icon.

Name change from IDE/components/SOURCE/ButtonEdit.asm to IDE/components/source/buttonedit.asm.

1
2
3
4

5
6
7
8
9
10
11
..
31
32
33
34
35
36
37
38
include '%finc%/win32/win32a.inc'
include '..\..\..\source\designtime.inc'
;include 'winconst.inc'
;include '..\..\..\source\AsmEdit\AsmEdit.inc'


DesignTimeInfo                                     \
                                                   \       ; 1. TButtonEdit control
        'TButtonEdit',                             \
        'Edit control with button inside',         \
        'Fresh',                                   \
        'Edit',                                    \
................................................................................
        ES_MULTILINE,                              \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'btnedit.ico'




>







 







|
1
2
3
4
5
6
7
8
9
10
11
12
..
32
33
34
35
36
37
38
39
include '%finc%/win32/win32a.inc'
include '..\..\..\source\designtime.inc'
;include 'winconst.inc'
;include '..\..\..\source\AsmEdit\AsmEdit.inc'
format binary as "vcl"

DesignTimeInfo                                     \
                                                   \       ; 1. TButtonEdit control
        'TButtonEdit',                             \
        'Edit control with button inside',         \
        'Fresh',                                   \
        'Edit',                                    \
................................................................................
        ES_MULTILINE,                              \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'btnedit.png'

Name change from IDE/components/SOURCE/COMCTL32.ASM to IDE/components/source/comctl32.asm.

1
2
3

4
5
6
7
8
9
10
..
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
..
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
...
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
...
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
...
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
...
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
...
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
...
235
236
237
238
239
240
241
242
include '%finc%\win32\win32a.inc'
include '..\..\..\source\designtime.inc'



DesignTimeInfo                                                \
                                                              \         ; 1. Control starts here
        'SysTreeView32',                                      \
        'TreeView Control',                                   \
        'Common',                                             \
        'TreeView',                                           \
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'treeview.ico',                                       \
                                                              \         ; 1. Control starts here
        'SysListView32',                                      \
        'ListView Control',                                   \
        'Common',                                             \
        'ListView',                                           \
        WS_CHILD or LVS_REPORT or LVS_EDITLABELS,             \         ; default style
        WS_EX_CLIENTEDGE,                                     \         ; default ex style
................................................................................
        <                                                     \
          LVS_ICON             ,"Each item appears as a full-sized icon with a label below it.",\
          LVS_REPORT           ,"Each item appears on its own line with information arranged in columns. The leftmost column is always left justified, and contains the small icon and label.",\
          LVS_SMALLICON        ,"Each item appears as a small icon with the label to the right of it.",\
          LVS_LIST             ,"Each item appears as a small icon with a label to the right of it. Items are arranged in columns and cannot be dragged to any arbitrary location by the user." \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'listview.ico',\
                                                              \         ; 1. Control starts here
        'SysMonthCal32',                                      \
        'MonthView Control',                                  \
        'Common',                                             \
        'MonthView',                                          \
        WS_VISIBLE or WS_CHILD or WS_BORDER,                  \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD or WS_VISIBLE,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'monthview.ico',\
                                                              \         ; 1. Control starts here
        'ToolbarWindow32',                                    \
        'Toolbar Control',                                    \
        'Common',                                             \
        'Toolbar',                                            \
        WS_CHILD or TBSTYLE_TOOLTIPS or CCS_ADJUSTABLE,       \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'toolbar.ico',\
                                                              \         ; 1. Control starts here
        'msctls_statusbar32',                                 \
        'Status Bar Control',                                 \
        'Common',                                             \
        'Status',                                             \
        WS_CHILD,                                             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'statusbar.ico',                                      \
                                                              \         ; 1. Control starts here
        'SysTabControl32',                                    \
        'Tab Control',                                        \
        'Common',                                             \
        'Tab',                                                \
        WS_CHILD,                                             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'tabctl.ico',                                         \
                                                              \         ; 1. Control starts here
        'msctls_trackbar32',                                  \
        'Slider Control',                                     \
        'Common',                                             \
        'Slider',                                             \
        WS_CHILD,                                             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $1f      ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'slider.ico',                                         \
\
\
        'msctls_progress32',                                  \
        'Progressbar Control',                                \
        'Common',                                             \
        'Progressbar',                                        \
        WS_CHILD,                                             \         ; default style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'progress.ico'



>







 







|







 







|







 







|







 







|







 







|







 







|







 







|







 







|
1
2
3
4
5
6
7
8
9
10
11
..
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
..
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
...
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
...
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
...
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
...
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
...
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
...
236
237
238
239
240
241
242
243
include '%finc%\win32\win32a.inc'
include '..\..\..\source\designtime.inc'

format binary as "vcl"

DesignTimeInfo                                                \
                                                              \         ; 1. Control starts here
        'SysTreeView32',                                      \
        'TreeView Control',                                   \
        'Common',                                             \
        'TreeView',                                           \
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'treeview.png',                                       \
                                                              \         ; 1. Control starts here
        'SysListView32',                                      \
        'ListView Control',                                   \
        'Common',                                             \
        'ListView',                                           \
        WS_CHILD or LVS_REPORT or LVS_EDITLABELS,             \         ; default style
        WS_EX_CLIENTEDGE,                                     \         ; default ex style
................................................................................
        <                                                     \
          LVS_ICON             ,"Each item appears as a full-sized icon with a label below it.",\
          LVS_REPORT           ,"Each item appears on its own line with information arranged in columns. The leftmost column is always left justified, and contains the small icon and label.",\
          LVS_SMALLICON        ,"Each item appears as a small icon with the label to the right of it.",\
          LVS_LIST             ,"Each item appears as a small icon with a label to the right of it. Items are arranged in columns and cannot be dragged to any arbitrary location by the user." \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'listview.png',\
                                                              \         ; 1. Control starts here
        'SysMonthCal32',                                      \
        'MonthView Control',                                  \
        'Common',                                             \
        'MonthView',                                          \
        WS_VISIBLE or WS_CHILD or WS_BORDER,                  \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD or WS_VISIBLE,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'monthview.png',\
                                                              \         ; 1. Control starts here
        'ToolbarWindow32',                                    \
        'Toolbar Control',                                    \
        'Common',                                             \
        'Toolbar',                                            \
        WS_CHILD or TBSTYLE_TOOLTIPS or CCS_ADJUSTABLE,       \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'toolbar.png',\
                                                              \         ; 1. Control starts here
        'msctls_statusbar32',                                 \
        'Status Bar Control',                                 \
        'Common',                                             \
        'Status',                                             \
        WS_CHILD,                                             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'statusbar.png',                                      \
                                                              \         ; 1. Control starts here
        'SysTabControl32',                                    \
        'Tab Control',                                        \
        'Common',                                             \
        'Tab',                                                \
        WS_CHILD,                                             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'tabctl.png',                                         \
                                                              \         ; 1. Control starts here
        'msctls_trackbar32',                                  \
        'Slider Control',                                     \
        'Common',                                             \
        'Slider',                                             \
        WS_CHILD,                                             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $1f      ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'slider.png',                                         \
\
\
        'msctls_progress32',                                  \
        'Progressbar Control',                                \
        'Common',                                             \
        'Progressbar',                                        \
        WS_CHILD,                                             \         ; default style
................................................................................
        $00000000,                                            \         ; This is StyleMaskAnd
        WS_CHILD ,                                            \         ; This is StyleMaskOr
        $00000000,                                            \         ; This is StyleExMaskAnd
        $00000000,                                            \         ; This is StyleExMaskOr
        $0       ,                                            \         ; This is SubtypeMask
        NONE,                                                 \
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'progress.png'

Name change from IDE/components/SOURCE/EDIT.ASM to IDE/components/source/edit.asm.

1
2
3

4
5
6
7
8
9
10
..
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
..
63
64
65
66
67
68
69
70
include '..\..\..\source\designtime.inc'
include 'winconst.inc'



DesignTimeInfo                                     \
                                                   \       ; 1. Edit control
        'EDIT',                                    \
        'Edit control',                            \
        'Standard',                                \
        'Edit',                                    \
................................................................................
        ES_MULTILINE,                              \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'Edit.ico',                                \         ; Image for icon
        \ ; 2.Textbox control (edit with style es_multiline)
        'EDIT',                                    \
        'Textbox control',                            \
        'Standard',                                \
        'Textbox',                                    \
        WS_VISIBLE or WS_CHILD or ES_LEFT or ES_MULTILINE or ES_AUTOHSCROLL or ES_AUTOVSCROLL, \       ; default style
        WS_EX_CLIENTEDGE,                                          \       ; default ex style
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD or ES_MULTILINE,                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'Textbox.ico'



>







 







|







 







|
1
2
3
4
5
6
7
8
9
10
11
..
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
..
64
65
66
67
68
69
70
71
include '..\..\..\source\designtime.inc'
include 'winconst.inc'

format binary as "vcl"

DesignTimeInfo                                     \
                                                   \       ; 1. Edit control
        'EDIT',                                    \
        'Edit control',                            \
        'Standard',                                \
        'Edit',                                    \
................................................................................
        ES_MULTILINE,                              \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'Edit.png',                                \         ; Image for icon
        \ ; 2.Textbox control (edit with style es_multiline)
        'EDIT',                                    \
        'Textbox control',                            \
        'Standard',                                \
        'Textbox',                                    \
        WS_VISIBLE or WS_CHILD or ES_LEFT or ES_MULTILINE or ES_AUTOHSCROLL or ES_AUTOVSCROLL, \       ; default style
        WS_EX_CLIENTEDGE,                                          \       ; default ex style
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD or ES_MULTILINE,                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \         ; Library file NULL, because it's standard component.
        'Textbox.png'

Name change from IDE/components/SOURCE/FORM.ASM to IDE/components/source/form.asm.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30


; This file contains design-time information for TForm control.
;
; This file must be compiled with FASM compiler to get binary
; file. It will be compiled as .COM file. This is not executable
; file. Don't start it.

include '..\..\..\source\designtime.inc'
include '..\win32\win32a.inc'


DesignTimeInfo					   \
						   \	   ; 1. TForm control
	'TForm',				   \
	'Form control', 			   \
	'Standard',				   \
	'Form', 				   \
	WS_VISIBLE or WS_BORDER or WS_CHILD,	   \	   ; default style
	$00010000,				   \	   ; default ex style
	128, 64,				   \
	NONE,					   \	   ; style names
	NONE,					   \	   ; style Ex names
\
	$00000000,				   \		; This is StyleMaskAnd
	$00000000,				   \		; This is StyleMaskOr
	$00000000,				   \		; This is StyleExMaskAnd
	$00010000,				   \		; This is StyleExMaskOr
	$00000000,				   \		; This is SubtypeMask
	NONE,					   \		; This is SubtipeRange
	NONE,					   \		; Library file NULL, because it's standard component.
	'form.ico'						; Image for icon







|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
; This file contains design-time information for TForm control.
;
; This file must be compiled with FASM compiler to get binary
; file. It will be compiled as .COM file. This is not executable
; file. Don't start it.

format binary as "vcl"

include '..\..\..\source\designtime.inc'
include 'winconst.inc'


DesignTimeInfo                                     \
                                                   \       ; 1. TForm control
        'TForm',                                   \
        'Form control',                            \
        'Standard',                                \
        'Form',                                    \
        WS_VISIBLE or WS_BORDER or WS_CHILD,       \       ; default style
        $00010000,                                 \       ; default ex style
        128, 64,                                   \
        NONE,                                      \       ; style names
        NONE,                                      \       ; style Ex names
\
        $00000000,                                 \            ; This is StyleMaskAnd
        $00000000,                                 \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00010000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \            ; This is SubtipeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'form.png'                                              ; Image for icon

Name change from IDE/components/SOURCE/LISTBOX.ASM to IDE/components/source/listbox.asm.

1
2
3

4
5
6
7
8
9
10
..
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
..
68
69
70
71
72
73
74
75
include '..\..\..\source\designtime.inc'
include 'winconst.inc'



DesignTimeInfo                                     \
                                                   \
        'LISTBOX',                                 \
        'Listbox control',                         \
        'Standard',                                \
        'Listbox',                                 \
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'listbox.ico',                             \            ; Image for icon
\
\  ; ComboBox class
\
        'COMBOBOX',                                \
        'Combobox control',                        \
        'Standard',                                \
        'Combobox',                                \
................................................................................
        $00000003,                                 \            ; This is SubtypeMask
        <                                          \
          CBS_DROPDOWN,     'Dropdown combobox',  \
          CBS_DROPDOWNLIST, 'Dropdown listbox',   \
          CBS_SIMPLE,       'Simple combobox'     \
        >,                                         \            ; This is SubtipeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'combobox.ico'                                          ; Image for icon



>







 







|







 







|
1
2
3
4
5
6
7
8
9
10
11
..
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
..
69
70
71
72
73
74
75
76
include '..\..\..\source\designtime.inc'
include 'winconst.inc'

format binary as "vcl"

DesignTimeInfo                                     \
                                                   \
        'LISTBOX',                                 \
        'Listbox control',                         \
        'Standard',                                \
        'Listbox',                                 \
................................................................................
        $00000000,                                 \            ; This is StyleMaskAnd
        WS_CHILD,                                  \            ; This is StyleMaskOr
        $00000000,                                 \            ; This is StyleExMaskAnd
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000000,                                 \            ; This is SubtypeMask
        NONE,                                      \
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'listbox.png',                             \            ; Image for icon
\
\  ; ComboBox class
\
        'COMBOBOX',                                \
        'Combobox control',                        \
        'Standard',                                \
        'Combobox',                                \
................................................................................
        $00000003,                                 \            ; This is SubtypeMask
        <                                          \
          CBS_DROPDOWN,     'Dropdown combobox',  \
          CBS_DROPDOWNLIST, 'Dropdown listbox',   \
          CBS_SIMPLE,       'Simple combobox'     \
        >,                                         \            ; This is SubtipeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'combobox.png'                                          ; Image for icon

Name change from IDE/components/SOURCE/scrollbar.asm to IDE/components/source/scrollbar.asm.

1
2
3
4
5
6


7
8
9
10
11
12
13
..
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
..
59
60
61
62
63
64
65
66
; One file may contains description of more than one control.
; Look at 'DesignTimeInfo' macro definition.
;
; This file must be compiled with FASM compiler to get binary
; file. It will be compiled as .BIN file. This is not executable
; file. Don't start it.



include '..\..\..\source\designtime.inc'
include 'winconst.inc'


DesignTimeInfo                                     \
                                                   \       ; 1. SCROLLBAR CONTROL
................................................................................
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000001,                                 \            ; This is SubtypeMask
        <                                          \
          SBS_HORZ, 'Horizontal scrollbar',\
          SBS_VERT, 'Vertical scrollbar'\
        >,                                         \            ; This is SubtipeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'hscrollbar.ico',                          \            ; Image for icon
\
\ ; Vertical scrollbar control.
\
        'SCROLLBAR',                               \
        'Sizebox control',                         \
        'Standard',                                \
        ''      ,                                  \
................................................................................
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000001,                                 \            ; This is SubtypeMask
        <                                          \
          SBS_SIZEBOX, 'Standard sizebox',         \
          SBS_SIZEGRIP, 'SizeGrip'                 \
        >,                                         \            ; This is SubtipeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'sizebox.ico'






>
>







 







|







 







|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
..
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
..
61
62
63
64
65
66
67
68
; One file may contains description of more than one control.
; Look at 'DesignTimeInfo' macro definition.
;
; This file must be compiled with FASM compiler to get binary
; file. It will be compiled as .BIN file. This is not executable
; file. Don't start it.

format binary as "vcl"

include '..\..\..\source\designtime.inc'
include 'winconst.inc'


DesignTimeInfo                                     \
                                                   \       ; 1. SCROLLBAR CONTROL
................................................................................
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000001,                                 \            ; This is SubtypeMask
        <                                          \
          SBS_HORZ, 'Horizontal scrollbar',\
          SBS_VERT, 'Vertical scrollbar'\
        >,                                         \            ; This is SubtipeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'hscrollbar.png',                          \            ; Image for icon
\
\ ; Vertical scrollbar control.
\
        'SCROLLBAR',                               \
        'Sizebox control',                         \
        'Standard',                                \
        ''      ,                                  \
................................................................................
        $00000000,                                 \            ; This is StyleExMaskOr
        $00000001,                                 \            ; This is SubtypeMask
        <                                          \
          SBS_SIZEBOX, 'Standard sizebox',         \
          SBS_SIZEGRIP, 'SizeGrip'                 \
        >,                                         \            ; This is SubtipeRange
        NONE,                                      \            ; Library file NULL, because it's standard component.
        'sizebox.png'

Name change from IDE/components/SOURCE/STATIC.ASM to IDE/components/source/static.asm.

1
2
3

4
5
6
7
8
9
10
..
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
..
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
..
97
98
99
100
101
102
103
104
include '..\..\..\source\designtime.inc'
include 'winconst.inc'



DesignTimeInfo                                                \
        'STATIC',                                             \
        'Label control',                                      \
        'Standard',                                           \
        'Label',                                              \
        WS_VISIBLE or WS_CHILD,                               \         ; default style
................................................................................
            SS_LEFT              , "Left aligned with wordwrap",      \
            SS_CENTER            , "Centered",                        \
            SS_RIGHT             , "Right-aligned",                   \
            SS_SIMPLE            , "Simple one line text",            \
            SS_LEFTNOWORDWRAP    , "Left-aligned without wordwrap"   \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'label.ico',                                          \         ; Image for icon
                                                              \         ; 2.Shape control starts here
        'STATIC',                                             \
        'Shape control',                                      \
        'Standard',                                           \
        'Shape',                                              \
        WS_VISIBLE or WS_CHILD or SS_ETCHEDFRAME,             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
            SS_ETCHEDVERT        , "Draws the left and right edges of the static control using the EDGE_ETCHED edge style",     \
            SS_ETCHEDFRAME       , "Draws the frame of the static control using the EDGE_ETCHED edge style",                    \
            SS_BLACKRECT         , "Specifies a rectangle filled with the current window frame color",                          \
            SS_GRAYRECT          , "Specifies a rectangle filled with the current screen background color",                     \
            SS_WHITERECT         , "Specifies a rectangle filled with the current window background color"                      \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'shape.ico',                                          \         ; Image for icon
                                                              \         ; 3.Image control starts here
        'STATIC',                                             \
        'Image control',                                      \
        'Standard',                                           \
        'Image',                                              \
        WS_VISIBLE or WS_CHILD or SS_BITMAP or SS_CENTERIMAGE,\         ; default style
        0,                                                    \         ; default ex style
................................................................................
            SS_BITMAP            , 'Bitmap image'  ,                       \
            SS_ICON              , 'Icon image'    ,                       \
            SS_ENHMETAFILE       , 'Metafile image',                       \
            SS_OWNERDRAW         , 'Owner is responsible for drawing image.',   \
            SS_USERITEM          , 'User defined item'        \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'image.ico'



>







 







|







 







|







 







|
1
2
3
4
5
6
7
8
9
10
11
..
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
..
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
..
98
99
100
101
102
103
104
105
include '..\..\..\source\designtime.inc'
include 'winconst.inc'

format binary as "vcl"

DesignTimeInfo                                                \
        'STATIC',                                             \
        'Label control',                                      \
        'Standard',                                           \
        'Label',                                              \
        WS_VISIBLE or WS_CHILD,                               \         ; default style
................................................................................
            SS_LEFT              , "Left aligned with wordwrap",      \
            SS_CENTER            , "Centered",                        \
            SS_RIGHT             , "Right-aligned",                   \
            SS_SIMPLE            , "Simple one line text",            \
            SS_LEFTNOWORDWRAP    , "Left-aligned without wordwrap"   \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'label.png',                                          \         ; Image for icon
                                                              \         ; 2.Shape control starts here
        'STATIC',                                             \
        'Shape control',                                      \
        'Standard',                                           \
        'Shape',                                              \
        WS_VISIBLE or WS_CHILD or SS_ETCHEDFRAME,             \         ; default style
        0,                                                    \         ; default ex style
................................................................................
            SS_ETCHEDVERT        , "Draws the left and right edges of the static control using the EDGE_ETCHED edge style",     \
            SS_ETCHEDFRAME       , "Draws the frame of the static control using the EDGE_ETCHED edge style",                    \
            SS_BLACKRECT         , "Specifies a rectangle filled with the current window frame color",                          \
            SS_GRAYRECT          , "Specifies a rectangle filled with the current screen background color",                     \
            SS_WHITERECT         , "Specifies a rectangle filled with the current window background color"                      \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'shape.png',                                          \         ; Image for icon
                                                              \         ; 3.Image control starts here
        'STATIC',                                             \
        'Image control',                                      \
        'Standard',                                           \
        'Image',                                              \
        WS_VISIBLE or WS_CHILD or SS_BITMAP or SS_CENTERIMAGE,\         ; default style
        0,                                                    \         ; default ex style
................................................................................
            SS_BITMAP            , 'Bitmap image'  ,                       \
            SS_ICON              , 'Icon image'    ,                       \
            SS_ENHMETAFILE       , 'Metafile image',                       \
            SS_OWNERDRAW         , 'Owner is responsible for drawing image.',   \
            SS_USERITEM          , 'User defined item'        \
        >,                                                    \         ; This is SubtipeRange
        NONE,                                                 \         ; Library file NULL, because it's standard component.
        'image.png'

Name change from IDE/components/SOURCE/WINCONST.INC to IDE/components/source/winconst.inc.

Name change from IDE/components/STATIC.vcl to IDE/components/static.vcl.

cannot compute difference between binary files

Name change from IDE/components/statusbar.ico to IDE/components/statusbar.png.

cannot compute difference between binary files

Name change from IDE/components/TABCTL.ICO to IDE/components/tabctl.png.

cannot compute difference between binary files

Name change from IDE/components/Textbox.ico to IDE/components/textbox.png.

cannot compute difference between binary files

Name change from IDE/components/TOOLBAR.ICO to IDE/components/toolbar.png.

cannot compute difference between binary files

Name change from IDE/components/TREEVIEW.ICO to IDE/components/treeview.png.

cannot compute difference between binary files

Name change from IDE/components/vscrollbar.ico to IDE/components/vscrollbar.png.

cannot compute difference between binary files

Changes to include/libs/asmedit/asmedit.asm.

130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
758
759
760
761
762
763
764


















765
766
767
768
769
770
771
772
....
2828
2829
2830
2831
2832
2833
2834
2835


2836
2837
2838
2839
2840
2841
2842
  .caret_changed dd ?
  .PopupMenu dd ?
  .read_only dd ?
  .focus_line dd ?

  .bookmark_count = 10
  .bookmarks rd .bookmark_count
  .bookmark_icon dd ?

  .current_operation db ?
  .last_operation db ?
  .mouse_select db ?
  .focus db ?

  .editor_data_size = $ - .editor_data
................................................................................
        mov     ecx,[.font_height]
        mul     ecx
        sub     eax,[.font_height]
        mov     [.rc.top],eax
        mov     [.rc.left],1
        cmp     [.bookmark_icon],0
        je      .no_marks


















        invoke  DrawIconEx, ebx, [.rc.left], [.rc.top], [.bookmark_icon], 14, 14, 0, 0, DI_NORMAL

        retn



.wmsetfocus:

................................................................................
        add     eax, edx
        mov     dword [eax],0
        pop     ecx
        loop    .clear_next_mark
        ret
.aemsetbookmarkicon:
        mov     eax,[.wparam]
        mov     [.bookmark_icon],eax


        jmp     .wmsize

.aemcomment:
        cmp     [.was_selection], 0
        je      .done

        call    .store_status_for_undo







|







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|







 







|
>
>







130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
....
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
  .caret_changed dd ?
  .PopupMenu dd ?
  .read_only dd ?
  .focus_line dd ?

  .bookmark_count = 10
  .bookmarks rd .bookmark_count
  .bookmark_icon rd 2

  .current_operation db ?
  .last_operation db ?
  .mouse_select db ?
  .focus db ?

  .editor_data_size = $ - .editor_data
................................................................................
        mov     ecx,[.font_height]
        mul     ecx
        sub     eax,[.font_height]
        mov     [.rc.top],eax
        mov     [.rc.left],1
        cmp     [.bookmark_icon],0
        je      .no_marks

; what icon for the editor bookmark

        mov     eax, [.margin_background]
        movzx   ecx, al ; blue
        movzx   edx, ah ; green
        shr     eax, 16
        movzx   eax, al ; red

        lea     eax, [eax+2*ecx]
        add     eax, edx

        shr     eax, 2          ; gray middle level.

        cmp     eax, LIGHT_DARK_THRESHOLD
        seta    al
        movzx   eax, al

        invoke  DrawIconEx, ebx, [.rc.left], [.rc.top], [.bookmark_icon+4*eax], 14, 14, 0, 0, DI_NORMAL

        retn



.wmsetfocus:

................................................................................
        add     eax, edx
        mov     dword [eax],0
        pop     ecx
        loop    .clear_next_mark
        ret
.aemsetbookmarkicon:
        mov     eax,[.wparam]
        mov     [.bookmark_icon], eax
        mov     eax,[.lparam]
        mov     [.bookmark_icon+4], eax
        jmp     .wmsize

.aemcomment:
        cmp     [.was_selection], 0
        je      .done

        call    .store_status_for_undo

Changes to include/libs/pnglib.asm.

21
22
23
24
25
26
27







28


























29
30
31
32
33
34
35

        mov     [esp+4*regEAX], ebx
        popad
        return
endp








































;struct TPNGChunk
;  .length dd ?
;  .type   dd ?  ; 4 bytes ascii data - chunk name. Such as 'IDAT', 'iTXt', etc.







>
>
>
>
>
>
>

>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68

        mov     [esp+4*regEAX], ebx
        popad
        return
endp


struct ICONINFO
  .fIcon    dd ?
  .xHotspot dd ?
  .yHotspot dd ?
  .hbmMask  dd ?
  .hbmColor dd ?
ends

proc IconFromImage, .ptrImage
.ii ICONINFO
begin
        push    esi

        mov     esi, [.ptrImage]

        mov     [.ii.fIcon], TRUE       ; icon

        invoke  CreateBitmap, [esi+TImage.width], [esi+TImage.height], 1, 1, 0
        mov     [.ii.hbmMask], eax

        invoke  CreateBitmap, [esi+TImage.width], [esi+TImage.height], 1, 32, [esi+TImage.pPixels]
        mov     [.ii.hbmColor], eax

        lea     eax, [.ii]
        invoke  CreateIconIndirect, eax
        push    eax

        invoke  DeleteObject, [.ii.hbmMask]
        invoke  DeleteObject, [.ii.hbmColor]

        pop     eax
        pop     esi
        return
endp




;struct TPNGChunk
;  .length dd ?
;  .type   dd ?  ; 4 bytes ascii data - chunk name. Such as 'IDAT', 'iTXt', etc.

Changes to include/win32/win32a.inc.

25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
struct TBounds
  .x      dd ?
  .y      dd ?
  .width  dd ?
  .height dd ?
ends



include '%lib%/equates/Win32/_exceptions.inc'
include '%lib%/equates/Win32/_kernel32.inc'
include '%lib%/equates/Win32/_user32.inc'
include '%lib%/equates/Win32/_gdi32.inc'
include '%lib%/equates/Win32/_comctl32.inc'
include '%lib%/equates/Win32/_comdlg32.inc'
include '%lib%/equates/Win32/_shell32.inc'
include '%lib%/equates/Win32/_wsock32.inc'
include "%lib%/equates/_sqlite3.inc"








<
<

|
|
|
|
|
|
|

<
25
26
27
28
29
30
31


32
33
34
35
36
37
38
39
40

struct TBounds
  .x      dd ?
  .y      dd ?
  .width  dd ?
  .height dd ?
ends



include '%lib%/equates/Win32/_exceptions.inc'
include '%lib%/equates/Win32/_KERNEL32.INC'
include '%lib%/equates/Win32/_USER32.INC'
include '%lib%/equates/Win32/_GDI32.INC'
include '%lib%/equates/Win32/_COMCTL32.INC'
include '%lib%/equates/Win32/_COMDLG32.INC'
include '%lib%/equates/Win32/_SHELL32.INC'
include '%lib%/equates/Win32/_WSOCK32.INC'
include "%lib%/equates/_sqlite3.inc"

Changes to include/win32/win32w.inc.

8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
include '%lib%/macros/Win32/_export.inc'
include '%lib%/macros/_display.inc'
include '%lib%/macros/_globals.inc'

struc CHAR count { rw count }
macro TEXT lbl, [txt] { lbl  du  txt }

include '%lib%/equates/Win32/_kernel32.inc'
include '%lib%/equates/Win32/_user32.inc'
include '%lib%/equates/Win32/_gdi32.inc'
include '%lib%/equates/Win32/_comctl32.inc'
include '%lib%/equates/Win32/_comdlg32.inc'
include '%lib%/equates/Win32/_shell32.inc'
include '%lib%/equates/Win32/_wsock32.inc'
include "%lib%/equates/Win32/_sqlite3.inc"








|
|
|
|
|
|
|


8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
include '%lib%/macros/Win32/_export.inc'
include '%lib%/macros/_display.inc'
include '%lib%/macros/_globals.inc'

struc CHAR count { rw count }
macro TEXT lbl, [txt] { lbl  du  txt }

include '%lib%/equates/Win32/_KERNEL32.INC'
include '%lib%/equates/Win32/_USER32.INC'
include '%lib%/equates/Win32/_GDI32.INC'
include '%lib%/equates/Win32/_COMCTL32.INC'
include '%lib%/equates/Win32/_COMDLG32.INC'
include '%lib%/equates/Win32/_SHELL32.INC'
include '%lib%/equates/Win32/_WSOCK32.INC'
include "%lib%/equates/Win32/_sqlite3.inc"

Changes to source/EditorColors.frm.

225
226
227
228
229
230
231
232
233
234
235
236
237
238
239

        xchg    [CurrentSettings], eax
        stdcall DestroySettings, eax

        stdcall EnumOpenFiles, ApplyCurrentTheme, NULL

        stdcall ApplySettingsToAsmEdit, [hLister], [CurrentSettings], fasm_syntax
        invoke  SendMessageW, [hLister], AEM_SETBOOKMARKICON, [hBookmarkIcon], 0

        clc
        return











|







225
226
227
228
229
230
231
232
233
234
235
236
237
238
239

        xchg    [CurrentSettings], eax
        stdcall DestroySettings, eax

        stdcall EnumOpenFiles, ApplyCurrentTheme, NULL

        stdcall ApplySettingsToAsmEdit, [hLister], [CurrentSettings], fasm_syntax
        invoke  SendMessageW, [hLister], AEM_SETBOOKMARKICON, [hBookmarkIcon], [hBookmarkIcon+4]

        clc
        return




Changes to source/images/FreshNew.res.

cannot compute difference between binary files

Added source/images/next/arrow.png.

cannot compute difference between binary files

Added source/images/next/editor_bmk.svg.







































































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml-stylesheet href="./skin.css" type="text/css"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="14"
   height="14"
   viewBox="0 0 3.7041666 3.7041668"
   version="1.1"
   id="svg8"
   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
   sodipodi:docname="editor_bookmark.svg">
  <defs
     id="defs2" />
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="0.35"
     inkscape:cx="400"
     inkscape:cy="560"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     showgrid="true"
     units="px">
    <inkscape:grid
       type="xygrid"
       id="grid10"
       spacingx="0.26458334"
       spacingy="0.26458334"
       empspacing="14" />
  </sodipodi:namedview>
  <metadata
     id="metadata5">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(0,-293.29582)">
    <path
       d="m 0,296.20623 v -2.11666 h 3.5718734 l -1.05833,1.05833 1.05833,1.05833 z"
       id="bookmark_toggle"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="cccccc"
       class="primary" />
  </g>
</svg>

Added source/images/next/editor_bmk_dark.png.

cannot compute difference between binary files

Added source/images/next/editor_bmk_light.png.

cannot compute difference between binary files

Changes to source/images/next/render.

14
15
16
17
18
19
20


21
22
23
24
25
26
27
28
29
30
31
32
33



34
35
36
37
38
39
40
41

rsvg-convert -o messages_dark.png   messages.svg
rsvg-convert -o ideapplets_dark.png ideapplets.svg
rsvg-convert -o categories_dark.png categories.svg
rsvg-convert -o files_dark.png      files.svg
rsvg-convert -o newdlg_dark.png     newdlg.svg



# The light skin

ln -s -f ./skin_light.css ./skin.css

rsvg-convert -h 16 -o toolbar16_light.png toolbar16.svg
rsvg-convert -h 20 -o toolbar20_light.png toolbar20.svg
rsvg-convert -h 24 -o toolbar24_light.png toolbar24.svg

rsvg-convert -o messages_light.png   messages.svg
rsvg-convert -o ideapplets_light.png ideapplets.svg
rsvg-convert -o categories_light.png categories.svg
rsvg-convert -o files_light.png      files.svg
rsvg-convert -o newdlg_light.png     newdlg.svg




for i in *.png; do
    pngquant -v --ordered -s 1 --strip -f --ext .png 64 -- "$i" 
    printf "\n"
done


identify -format "%k colors in %f\n" ./*.png







>
>













>
>
>








14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

rsvg-convert -o messages_dark.png   messages.svg
rsvg-convert -o ideapplets_dark.png ideapplets.svg
rsvg-convert -o categories_dark.png categories.svg
rsvg-convert -o files_dark.png      files.svg
rsvg-convert -o newdlg_dark.png     newdlg.svg

rsvg-convert -o editor_bmk_dark.png  editor_bmk.svg

# The light skin

ln -s -f ./skin_light.css ./skin.css

rsvg-convert -h 16 -o toolbar16_light.png toolbar16.svg
rsvg-convert -h 20 -o toolbar20_light.png toolbar20.svg
rsvg-convert -h 24 -o toolbar24_light.png toolbar24.svg

rsvg-convert -o messages_light.png   messages.svg
rsvg-convert -o ideapplets_light.png ideapplets.svg
rsvg-convert -o categories_light.png categories.svg
rsvg-convert -o files_light.png      files.svg
rsvg-convert -o newdlg_light.png     newdlg.svg

rsvg-convert -o editor_bmk_light.png  editor_bmk.svg


for i in *.png; do
    pngquant -v --ordered -s 1 --strip -f --ext .png 64 -- "$i" 
    printf "\n"
done


identify -format "%k colors in %f\n" ./*.png

Changes to source/lister.asm.

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
                 ebx, [hInstance],                                    \
                 NULL

        mov     [hLister], eax
        mov     ebx, eax

        stdcall ApplySettingsToAsmEdit, ebx, [CurrentSettings], fasm_syntax
        invoke  SendMessageW, ebx, AEM_SETBOOKMARKICON, [hBookmarkIcon], 0
        invoke  SendMessageW, ebx, AEM_SETPOPUPMENU, 0, [hEditorMenu]

        stdcall SubclassWindow, ebx, ListerWinProc
        stdcall AttachToCell, ebx, [.hParent], MainLayout.cellLister

        return
endp







|







26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
                 ebx, [hInstance],                                    \
                 NULL

        mov     [hLister], eax
        mov     ebx, eax

        stdcall ApplySettingsToAsmEdit, ebx, [CurrentSettings], fasm_syntax
        invoke  SendMessageW, ebx, AEM_SETBOOKMARKICON, [hBookmarkIcon], [hBookmarkIcon+4]
        invoke  SendMessageW, ebx, AEM_SETPOPUPMENU, 0, [hEditorMenu]

        stdcall SubclassWindow, ebx, ListerWinProc
        stdcall AttachToCell, ebx, [.hParent], MainLayout.cellLister

        return
endp

Changes to source/palette.asm.

316
317
318
319
320
321
322



323
324
325



326
327
328
329
330
331
332
333
334
335
336
337
...
451
452
453
454
455
456
457
458
459


460
461


462
463
464
465
466
467
468
469
470
                                esi, 16, 10000, 24,               \
                                [hToolPalette], esi, [hInstance], \
                                esi
        mov     ebx, eax

        invoke  SendMessageW, ebx, TB_BUTTONSTRUCTSIZE, TToolbarButton.size, esi




        invoke  ImageList_Create, 24, 24, ILC_COLOR24 or ILC_MASK, 0, 1
        mov     esi, eax




        invoke  LoadImageW, [hInstance], resArrowIcon, IMAGE_ICON, 24, 24, LR_DEFAULTCOLOR
        push    eax

        invoke  ImageList_AddIcon, esi, eax

        invoke  DestroyIcon     ; eax is in the stack

        invoke  SendMessageW, ebx, TB_SETIMAGELIST, 0, esi
        invoke  SendMessageW, ebx, TB_SETBITMAPSIZE, 0, $00180018

; make tooltip to appear on not active main window.
        invoke  SendMessageW, ebx, TB_GETTOOLTIPS, 0, 0
................................................................................
.createbuttons:
        cmp     dword [edi], 0
        je      .endcreate

        stdcall GetPaletteToolbar, [edi+TDesignTimeInfo.Palette]
        mov     ebx, eax        ; handle for toolbar.

        stdcall utf8ToWideChar, [edi+TDesignTimeInfo.ImageFile]
        push    eax



        invoke  LoadImageW, [hInstance], eax, IMAGE_ICON, 24, 24, LR_LOADFROMFILE ;  or LR_LOADTRANSPARENT


        stdcall FreeMem ; from the stack

        test    eax, eax
        jz      .error_image

        mov     esi, eax

        invoke  SendMessageW, ebx, TB_GETIMAGELIST, 0, 0
        invoke  ImageList_ReplaceIcon, eax, -1, esi







>
>
>
|


>
>
>
|
|


<







 







|

>
>

<
>
>
|








316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335

336
337
338
339
340
341
342
...
456
457
458
459
460
461
462
463
464
465
466
467

468
469
470
471
472
473
474
475
476
477
478
                                esi, 16, 10000, 24,               \
                                [hToolPalette], esi, [hInstance], \
                                esi
        mov     ebx, eax

        invoke  SendMessageW, ebx, TB_BUTTONSTRUCTSIZE, TToolbarButton.size, esi

;        stdcall ImageList_LoadPNG, [GUI.imgSelectTool], FALSE
;        mov     esi, eax

        invoke  ImageList_Create, 24, 24, ILC_COLOR32, 0, 1
        mov     esi, eax

        stdcall IconFromImage, [GUI.imgSelectTool]
        push    eax

;        invoke  LoadImageW, [hInstance], resArrowIcon, IMAGE_ICON, 24, 24, LR_DEFAULTCOLOR
;        push    eax

        invoke  ImageList_AddIcon, esi, eax

        invoke  DestroyIcon     ; eax is in the stack

        invoke  SendMessageW, ebx, TB_SETIMAGELIST, 0, esi
        invoke  SendMessageW, ebx, TB_SETBITMAPSIZE, 0, $00180018

; make tooltip to appear on not active main window.
        invoke  SendMessageW, ebx, TB_GETTOOLTIPS, 0, 0
................................................................................
.createbuttons:
        cmp     dword [edi], 0
        je      .endcreate

        stdcall GetPaletteToolbar, [edi+TDesignTimeInfo.Palette]
        mov     ebx, eax        ; handle for toolbar.

        stdcall LoadBinaryFile, [edi+TDesignTimeInfo.ImageFile]
        push    eax
        stdcall CreateImagePNG, eax, ecx
        stdcall FreeMem ; from the stack


        push    eax
        stdcall IconFromImage, eax
        stdcall DestroyImage ; from the stack

        test    eax, eax
        jz      .error_image

        mov     esi, eax

        invoke  SendMessageW, ebx, TB_GETIMAGELIST, 0, 0
        invoke  ImageList_ReplaceIcon, eax, -1, esi

Changes to source/resourceid.inc.

1
2
3
4
5
6
7
8
9
10
;--------------------------------------------
; resource ID constants.
;--------------------------------------------
; Icons
resAppIcon              =       259
resArrowIcon            =       304
resBookmarkIcon         =       305








<
<



1
2
3
4
5


6
7
8
;--------------------------------------------
; resource ID constants.
;--------------------------------------------
; Icons
resAppIcon              =       259





Changes to source/skins.asm.



1
2
3
4
5
6
7
8
9
10
11
12


13
14
15
16
17
18
19
20
..
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51



iglobal
        NamedArray      GUI,                                    \
\
              imgUIIcons,     PNG, <'images/next/toolbar16_dark.png', 'images/next/toolbar16_light.png',        \
                                    'images/next/toolbar20_dark.png', 'images/next/toolbar20_light.png',        \
                                    'images/next/toolbar24_dark.png', 'images/next/toolbar24_light.png'>,       \
              imgMessages,    PNG, <'images/next/messages_dark.png', 'images/next/messages_light.png'>,       \
              imgNewDlg,      PNG, <'images/next/newdlg_dark.png', 'images/next/newdlg_light.png'>,         \
              imgApplets,     PNG, <'images/next/ideapplets_dark.png', 'images/next/ideapplets_light.png'>,     \
              imgCategories,  PNG, <'images/next/categories_dark.png', 'images/next/categories_light.png'>,     \
              imgFiles,       PNG, <'images/next/files_dark.png', 'images/next/files_light.png'>,          \


              imgAbout,       PNG, 'images/next/about.png',           \
\
              clSplitter,     HEX, <$00ccff, $bb7b3a>
endg


uglobal
  iTheme dd ?
................................................................................
        movzx   eax, al ; red

        lea     eax, [eax+2*ecx]
        add     eax, edx

        shr     eax, 2          ; gray middle level.

        cmp     eax, $80
        seta    al
        movzx   eax, al

        mov     [iTheme], eax

        stdcall GUI.Init

        popad
        return
endp
>
>







|
|


|
>
>
|







 







|










1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
..
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
LIGHT_DARK_THRESHOLD = $80


iglobal
        NamedArray      GUI,                                    \
\
              imgUIIcons,     PNG, <'images/next/toolbar16_dark.png', 'images/next/toolbar16_light.png',        \
                                    'images/next/toolbar20_dark.png', 'images/next/toolbar20_light.png',        \
                                    'images/next/toolbar24_dark.png', 'images/next/toolbar24_light.png'>,       \
              imgMessages,    PNG, <'images/next/messages_dark.png', 'images/next/messages_light.png'>,         \
              imgNewDlg,      PNG, <'images/next/newdlg_dark.png', 'images/next/newdlg_light.png'>,             \
              imgApplets,     PNG, <'images/next/ideapplets_dark.png', 'images/next/ideapplets_light.png'>,     \
              imgCategories,  PNG, <'images/next/categories_dark.png', 'images/next/categories_light.png'>,     \
              imgFiles,       PNG, <'images/next/files_dark.png', 'images/next/files_light.png'>,               \
              imgEditorBmk,   PNG, <'images/next/editor_bmk_dark.png', 'images/next/editor_bmk_light.png'>,     \
              imgSelectTool,  PNG, 'images/next/arrow.png',                                                     \
              imgAbout,       PNG, 'images/next/about.png',                                                     \
\
              clSplitter,     HEX, <$00ccff, $bb7b3a>
endg


uglobal
  iTheme dd ?
................................................................................
        movzx   eax, al ; red

        lea     eax, [eax+2*ecx]
        add     eax, edx

        shr     eax, 2          ; gray middle level.

        cmp     eax, LIGHT_DARK_THRESHOLD
        seta    al
        movzx   eax, al

        mov     [iTheme], eax

        stdcall GUI.Init

        popad
        return
endp

Changes to source/sourceeditor.asm.

1
2
3
4
5
6
7
8
9
10
..
65
66
67
68
69
70
71
72
73
74





75
76
77
78
79
80
81
...
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
uglobal
  hEditorMenu     dd 0                        ; source popup menu item.
  hBookmarkIcon   dd 0
  CurrentSettings dd  ?
endg

iglobal

DefaultEditorThemes dd cDefaultDark, cDefaultLight

................................................................................
; Call this only once.
;----------------------------------------
proc InitSourceEditor
begin
        stdcall CreateCoolMenu, EditorPopup, TRUE
        mov     [hEditorMenu], eax

        invoke  LoadImageW, [hInstance], resBookmarkIcon, IMAGE_ICON, 0, 0, LR_SHARED
        mov     [hBookmarkIcon], eax






; Load editor color profile...
        stdcall LoadEditorSettings, [hCfgFileName], TRUE
        mov     [CurrentSettings], eax
        return
endp


................................................................................

; adjust the look and feel for the editor window.

        mov     eax, [esi+TOpenFile.ptrType]
        stdcall ApplySettingsToAsmEdit, ebx, edi, [eax+TFileType.lParam]

        invoke  SendMessageW, ebx, AEM_SETPOPUPMENU, 0, [hEditorMenu]
        invoke  SendMessageW, ebx, AEM_SETBOOKMARKICON, [hBookmarkIcon], 0

        stdcall SubclassWindow, ebx, [.SubclassProc]

        invoke  SendMessageW, ebx, CEM_LOADFILE, [.hTemplate], 0
        test    eax, eax
        jnz     .errorload



|







 







|


>
>
>
>
>







 







|







1
2
3
4
5
6
7
8
9
10
..
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
...
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
uglobal
  hEditorMenu     dd 0                        ; source popup menu item.
  hBookmarkIcon   rd 2
  CurrentSettings dd  ?
endg

iglobal

DefaultEditorThemes dd cDefaultDark, cDefaultLight

................................................................................
; Call this only once.
;----------------------------------------
proc InitSourceEditor
begin
        stdcall CreateCoolMenu, EditorPopup, TRUE
        mov     [hEditorMenu], eax

        stdcall IconFromImage, [GUI.imgEditorBmk]
        mov     [hBookmarkIcon], eax

        stdcall IconFromImage, [GUI.imgEditorBmk+8]
        mov     [hBookmarkIcon+4], eax

;        invoke  LoadImageW, [hInstance], resBookmarkIcon, IMAGE_ICON, 0, 0, LR_SHARED

; Load editor color profile...
        stdcall LoadEditorSettings, [hCfgFileName], TRUE
        mov     [CurrentSettings], eax
        return
endp


................................................................................

; adjust the look and feel for the editor window.

        mov     eax, [esi+TOpenFile.ptrType]
        stdcall ApplySettingsToAsmEdit, ebx, edi, [eax+TFileType.lParam]

        invoke  SendMessageW, ebx, AEM_SETPOPUPMENU, 0, [hEditorMenu]
        invoke  SendMessageW, ebx, AEM_SETBOOKMARKICON, [hBookmarkIcon], [hBookmarkIcon+4]

        stdcall SubclassWindow, ebx, [.SubclassProc]

        invoke  SendMessageW, ebx, CEM_LOADFILE, [.hTemplate], 0
        test    eax, eax
        jnz     .errorload