Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove/rearrange some settings and improve tiny button/LED handling #494

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Remove/rearrange some settings and improve tiny button/LED handling #494

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
01c687e
turn resethelp pref led into a button with a confirmation dialog
NQNStudios Nov 24, 2024
2f0a620
Remove graphical frills setting--now always on
NQNStudios Nov 24, 2024
39d6a8a
remove 'terrain animation' pref (now always on)
NQNStudios Nov 24, 2024
b156e41
remove shore frill setting (now always on)
NQNStudios Nov 24, 2024
1a63d67
move scale buttons to top of settings
NQNStudios Nov 24, 2024
6b85005
fix event return value
NQNStudios Nov 24, 2024
2042fda
fine-tune preferences layout
NQNStudios Nov 24, 2024
b2a7a33
move help-related settings next to each other
NQNStudios Nov 25, 2024
21e5fb5
make button text size changeable
NQNStudios Nov 25, 2024
7866446
match reset help button text size to leds
NQNStudios Nov 25, 2024
7db2d76
hide main window scale options that won't fit
NQNStudios Nov 25, 2024
d9fa1b1
bring speed buttons in from the right
NQNStudios Nov 25, 2024
17d9aba
align small window led with alignment leds
NQNStudios Nov 25, 2024
eda65cd
remove bad check
NQNStudios Nov 25, 2024
42ae755
remove TODO note
NQNStudios Nov 25, 2024
072c290
fix map scale
NQNStudios Nov 26, 2024
d4188cc
leds and tiny buttons measure actual preferred width
NQNStudios Nov 26, 2024
2b87114
still require width on other button types
NQNStudios Nov 26, 2024
e44d4b7
make text-size an optional attribute of button
NQNStudios Nov 26, 2024
16c66c0
remove cButton::setTextSize()
NQNStudios Nov 26, 2024
5d94416
remove lots of hardcoded led/tiny button widths
NQNStudios Nov 26, 2024
785b356
Editors hide unwieldy scale options
NQNStudios Nov 26, 2024
489f753
Mac editors fix Settings menu item
NQNStudios Nov 26, 2024
53eaea5
fix dialogs I broke
NQNStudios Nov 26, 2024
5e9028d
spell menu measure spell labels
NQNStudios Nov 26, 2024
4707826
change constant names
NQNStudios Nov 26, 2024
4a76302
add text-size to documentation
NQNStudios Nov 26, 2024
c833762
fix constant names
NQNStudios Nov 26, 2024
a97d0fc
Revert "Mac editors fix Settings menu item"
NQNStudios Nov 26, 2024
52bf585
make defaultTextSize() static
NQNStudios Nov 26, 2024
1966a97
LEDs allow text on the left side
NQNStudios Nov 26, 2024
aff33dd
when replaying, splash setting disable BOTH (save a lot of time)
NQNStudios Nov 26, 2024
166d71a
Fix replay mode black bg startup menu
NQNStudios Nov 26, 2024
5808732
simplify convoluted if statement
NQNStudios Nov 26, 2024
b51eb5e
remove accidental semicolon, fix led measurements
NQNStudios Nov 26, 2024
fc6b1ed
Efficient layout for preferences. Close #470
NQNStudios Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions rsrc/dialogs/cast-spell.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,44 +36,44 @@
<text name='sp5' top='181' left='304' width='32' height='16'/>
<text name='sp6' top='205' left='304' width='32' height='16'/>
<text name='feedback' framed='true' top='400' left='30' width='186' height='16'>Pick spell to cast.</text>
<led name='spell1' state='off' top='247' left='14' width='100'/>
<led name='spell2' state='off' top='261' left='14' width='100'/>
<led name='spell3' state='off' top='275' left='14' width='100'/>
<led name='spell4' state='off' top='289' left='14' width='100'/>
<led name='spell5' state='off' top='303' left='14' width='100'/>
<led name='spell6' state='off' top='317' left='14' width='100'/>
<led name='spell7' state='off' top='331' left='14' width='100'/>
<led name='spell8' state='off' top='345' left='14' width='100'/>
<led name='spell9' state='off' top='359' left='14' width='100'/>
<led name='spell10' state='off' top='373' left='14' width='100'/>
<led name='spell11' state='off' top='247' left='177' width='100'/>
<led name='spell12' state='off' top='261' left='177' width='100'/>
<led name='spell13' state='off' top='275' left='177' width='100'/>
<led name='spell14' state='off' top='289' left='177' width='100'/>
<led name='spell15' state='off' top='303' left='177' width='100'/>
<led name='spell16' state='off' top='317' left='177' width='100'/>
<led name='spell17' state='off' top='331' left='177' width='100'/>
<led name='spell18' state='off' top='345' left='177' width='100'/>
<led name='spell19' state='off' top='359' left='177' width='100'/>
<led name='spell20' state='off' top='373' left='177' width='100'/>
<led name='spell21' state='off' top='247' left='339' width='100'/>
<led name='spell22' state='off' top='261' left='339' width='100'/>
<led name='spell23' state='off' top='275' left='339' width='100'/>
<led name='spell24' state='off' top='289' left='339' width='100'/>
<led name='spell25' state='off' top='303' left='339' width='100'/>
<led name='spell26' state='off' top='317' left='339' width='100'/>
<led name='spell27' state='off' top='331' left='339' width='100'/>
<led name='spell28' state='off' top='345' left='339' width='100'/>
<led name='spell29' state='off' top='359' left='339' width='100'/>
<led name='spell30' state='off' top='373' left='339' width='100'/>
<led name='spell31' state='off' top='247' left='488' width='100'/>
<led name='spell32' state='off' top='261' left='488' width='100'/>
<led name='spell33' state='off' top='275' left='488' width='100'/>
<led name='spell34' state='off' top='289' left='488' width='100'/>
<led name='spell35' state='off' top='303' left='488' width='100'/>
<led name='spell36' state='off' top='317' left='488' width='100'/>
<led name='spell37' state='off' top='331' left='488' width='100'/>
<led name='spell38' state='off' top='345' left='488' width='100'/>
<led name='spell1' state='off' top='247' left='14'/>
<led name='spell2' state='off' top='261' left='14'/>
<led name='spell3' state='off' top='275' left='14'/>
<led name='spell4' state='off' top='289' left='14'/>
<led name='spell5' state='off' top='303' left='14'/>
<led name='spell6' state='off' top='317' left='14'/>
<led name='spell7' state='off' top='331' left='14'/>
<led name='spell8' state='off' top='345' left='14'/>
<led name='spell9' state='off' top='359' left='14'/>
<led name='spell10' state='off' top='373' left='14'/>
<led name='spell11' state='off' top='247' left='177'/>
<led name='spell12' state='off' top='261' left='177'/>
<led name='spell13' state='off' top='275' left='177'/>
<led name='spell14' state='off' top='289' left='177'/>
<led name='spell15' state='off' top='303' left='177'/>
<led name='spell16' state='off' top='317' left='177'/>
<led name='spell17' state='off' top='331' left='177'/>
<led name='spell18' state='off' top='345' left='177'/>
<led name='spell19' state='off' top='359' left='177'/>
<led name='spell20' state='off' top='373' left='177'/>
<led name='spell21' state='off' top='247' left='339'/>
<led name='spell22' state='off' top='261' left='339'/>
<led name='spell23' state='off' top='275' left='339'/>
<led name='spell24' state='off' top='289' left='339'/>
<led name='spell25' state='off' top='303' left='339'/>
<led name='spell26' state='off' top='317' left='339'/>
<led name='spell27' state='off' top='331' left='339'/>
<led name='spell28' state='off' top='345' left='339'/>
<led name='spell29' state='off' top='359' left='339'/>
<led name='spell30' state='off' top='373' left='339'/>
<led name='spell31' state='off' top='247' left='488'/>
<led name='spell32' state='off' top='261' left='488'/>
<led name='spell33' state='off' top='275' left='488'/>
<led name='spell34' state='off' top='289' left='488'/>
<led name='spell35' state='off' top='303' left='488'/>
<led name='spell36' state='off' top='317' left='488'/>
<led name='spell37' state='off' top='331' left='488'/>
<led name='spell38' state='off' top='345' left='488'/>
<button name='other' type='large' def-key='space' top='394' left='371'>Other Spells</button>
<text size='large' top='60' left='9' width='75' height='16'>Caster:</text>
<text size='large' top='60' left='209' width='223' height='16'>Target: HP: SP: Status:</text>
Expand Down
42 changes: 21 additions & 21 deletions rsrc/dialogs/choose-bg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<pict type='dlog' num='16' top='8' left='8'/>
<text name='title' size='large' top='6' left='50' width='256' height='14'>Select background pattern:</text>
<group name='group'>
<led name='led1' top='54' left='8' width='180'>Dark grey stone</led>
<led name='led2' top='69' left='8' width='180'>Black texture</led>
<led name='led3' top='84' left='8' width='180'>Grey stone with blue veins</led>
<led name='led4' top='99' left='8' width='180'>Pink stone with white veins</led>
<led name='led5' top='114' left='8' width='180'>Rough dark grey stone</led>
<led name='led6' top='129' left='8' width='180'>Black stone / Basalt</led>
<led name='led7' top='144' left='8' width='180'>White stone / Chalk</led>
<led name='led8' top='159' left='8' width='180'>Light grey stone</led>
<led name='led9' top='174' left='8' width='180'>Wood mosaic / parquet floor</led>
<led name='led10' top='189' left='8' width='180'>Dark / petrified wood</led>
<led name='led11' top='204' left='8' width='180'>Medium stone / Granite</led>
<led name='led1' top='54' left='8'>Dark grey stone</led>
<led name='led2' top='69' left='8'>Black texture</led>
<led name='led3' top='84' left='8'>Grey stone with blue veins</led>
<led name='led4' top='99' left='8'>Pink stone with white veins</led>
<led name='led5' top='114' left='8'>Rough dark grey stone</led>
<led name='led6' top='129' left='8'>Black stone / Basalt</led>
<led name='led7' top='144' left='8'>White stone / Chalk</led>
<led name='led8' top='159' left='8'>Light grey stone</led>
<led name='led9' top='174' left='8'>Wood mosaic / parquet floor</led>
<led name='led10' top='189' left='8'>Dark / petrified wood</led>
<led name='led11' top='204' left='8'>Medium stone / Granite</led>

<led name='led12' top='54' left='216' width='180'>Checkerboard</led>
<led name='led13' top='69' left='216' width='180'>Grey marble</led>
<led name='led14' top='84' left='216' width='180'>Mosaic tiles</led>
<led name='led15' top='99' left='216' width='180'>Veined rock / Marble</led>
<led name='led16' top='114' left='216' width='180'>Pitted / Cracked stone</led>
<led name='led17' top='129' left='216' width='180'>Light grey stone with highlights</led>
<led name='led18' top='144' left='216' width='180'>White marble</led>
<led name='led19' top='159' left='216' width='180'>Reddish-grey texture</led>
<led name='led20' top='174' left='216' width='180'>Light wood grain</led>
<led name='led21' top='189' left='216' width='180'>Sandstone</led>
<led name='led12' top='54' left='216'>Checkerboard</led>
<led name='led13' top='69' left='216'>Grey marble</led>
<led name='led14' top='84' left='216'>Mosaic tiles</led>
<led name='led15' top='99' left='216'>Veined rock / Marble</led>
<led name='led16' top='114' left='216'>Pitted / Cracked stone</led>
<led name='led17' top='129' left='216'>Light grey stone with highlights</led>
<led name='led18' top='144' left='216'>White marble</led>
<led name='led19' top='159' left='216'>Reddish-grey texture</led>
<led name='led20' top='174' left='216'>Light wood grain</led>
<led name='led21' top='189' left='216'>Sandstone</led>
</group>
<button name='done' type='regular' top='223' left='338'>OK</button>
<button name='cancel' type='regular' def-key='esc' top='223' left='272'>Cancel</button>
Expand Down
72 changes: 36 additions & 36 deletions rsrc/dialogs/choose-pict.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,42 @@
<pict name='mainpic' type='dlog' num='16' top='6' left='6'/>
<text name='prompt' size='large' top='6' left='50' width='248' height='14'>Select a graphic:</text>
<group name='group'>
<led name='led1' state='off' top='29' left='55' width='16'/>
<led name='led2' state='off' top='74' left='55' width='16'/>
<led name='led3' state='off' top='119' left='55' width='16'/>
<led name='led4' state='off' top='164' left='55' width='16'/>
<led name='led5' state='off' top='209' left='55' width='16'/>
<led name='led6' state='off' top='254' left='55' width='16'/>
<led name='led7' state='off' top='29' left='119' width='16'/>
<led name='led8' state='off' top='74' left='119' width='16'/>
<led name='led9' state='off' top='119' left='119' width='16'/>
<led name='led10' state='off' top='164' left='119' width='16'/>
<led name='led11' state='off' top='209' left='119' width='16'/>
<led name='led12' state='off' top='254' left='119' width='16'/>
<led name='led13' state='off' top='29' left='183' width='16'/>
<led name='led14' state='off' top='74' left='183' width='16'/>
<led name='led15' state='off' top='119' left='183' width='16'/>
<led name='led16' state='off' top='164' left='183' width='16'/>
<led name='led17' state='off' top='209' left='183' width='16'/>
<led name='led18' state='off' top='254' left='183' width='16'/>
<led name='led19' state='off' top='29' left='251' width='16'/>
<led name='led20' state='off' top='74' left='251' width='16'/>
<led name='led21' state='off' top='119' left='251' width='16'/>
<led name='led22' state='off' top='164' left='251' width='16'/>
<led name='led23' state='off' top='209' left='251' width='16'/>
<led name='led24' state='off' top='254' left='251' width='16'/>
<led name='led25' state='off' top='29' left='320' width='16'/>
<led name='led26' state='off' top='74' left='320' width='16'/>
<led name='led27' state='off' top='119' left='320' width='16'/>
<led name='led28' state='off' top='164' left='320' width='16'/>
<led name='led29' state='off' top='209' left='320' width='16'/>
<led name='led30' state='off' top='254' left='320' width='16'/>
<led name='led31' state='off' top='29' left='388' width='16'/>
<led name='led32' state='off' top='74' left='388' width='16'/>
<led name='led33' state='off' top='119' left='388' width='16'/>
<led name='led34' state='off' top='164' left='388' width='16'/>
<led name='led35' state='off' top='209' left='388' width='16'/>
<led name='led36' state='off' top='254' left='388' width='16'/>
<led name='led1' state='off' top='29' left='55'/>
<led name='led2' state='off' top='74' left='55'/>
<led name='led3' state='off' top='119' left='55'/>
<led name='led4' state='off' top='164' left='55'/>
<led name='led5' state='off' top='209' left='55'/>
<led name='led6' state='off' top='254' left='55'/>
<led name='led7' state='off' top='29' left='119'/>
<led name='led8' state='off' top='74' left='119'/>
<led name='led9' state='off' top='119' left='119'/>
<led name='led10' state='off' top='164' left='119'/>
<led name='led11' state='off' top='209' left='119'/>
<led name='led12' state='off' top='254' left='119'/>
<led name='led13' state='off' top='29' left='183'/>
<led name='led14' state='off' top='74' left='183'/>
<led name='led15' state='off' top='119' left='183'/>
<led name='led16' state='off' top='164' left='183'/>
<led name='led17' state='off' top='209' left='183'/>
<led name='led18' state='off' top='254' left='183'/>
<led name='led19' state='off' top='29' left='251'/>
<led name='led20' state='off' top='74' left='251'/>
<led name='led21' state='off' top='119' left='251'/>
<led name='led22' state='off' top='164' left='251'/>
<led name='led23' state='off' top='209' left='251'/>
<led name='led24' state='off' top='254' left='251'/>
<led name='led25' state='off' top='29' left='320'/>
<led name='led26' state='off' top='74' left='320'/>
<led name='led27' state='off' top='119' left='320'/>
<led name='led28' state='off' top='164' left='320'/>
<led name='led29' state='off' top='209' left='320'/>
<led name='led30' state='off' top='254' left='320'/>
<led name='led31' state='off' top='29' left='388'/>
<led name='led32' state='off' top='74' left='388'/>
<led name='led33' state='off' top='119' left='388'/>
<led name='led34' state='off' top='164' left='388'/>
<led name='led35' state='off' top='209' left='388'/>
<led name='led36' state='off' top='254' left='388'/>
</group>
<pict name='pic1' type='ter' num='0' top='29' left='76'/>
<pict name='pic2' type='ter' num='1' top='74' left='76'/>
Expand Down
80 changes: 40 additions & 40 deletions rsrc/dialogs/choose-string.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,46 @@
<pict type='dlog' num='16' top='8' left='8'/>
<text name='title' size='large' top='6' left='50' width='256' height='14'>Select:</text>
<group name='strings'>
<led name='led1' state='off' top='54' left='8' width='180'/>
<led name='led2' state='off' top='69' left='8' width='180'/>
<led name='led3' state='off' top='84' left='8' width='180'/>
<led name='led4' state='off' top='99' left='8' width='180'/>
<led name='led5' state='off' top='114' left='8' width='180'/>
<led name='led6' state='off' top='129' left='8' width='180'/>
<led name='led7' state='off' top='144' left='8' width='180'/>
<led name='led8' state='off' top='159' left='8' width='180'/>
<led name='led9' state='off' top='174' left='8' width='180'/>
<led name='led10' state='off' top='189' left='8' width='180'/>
<led name='led11' state='off' top='204' left='8' width='180'/>
<led name='led12' state='off' top='219' left='8' width='180'/>
<led name='led13' state='off' top='234' left='8' width='180'/>
<led name='led14' state='off' top='249' left='8' width='180'/>
<led name='led15' state='off' top='264' left='8' width='180'/>
<led name='led16' state='off' top='279' left='8' width='180'/>
<led name='led17' state='off' top='294' left='8' width='180'/>
<led name='led18' state='off' top='309' left='8' width='180'/>
<led name='led19' state='off' top='324' left='8' width='180'/>
<led name='led20' state='off' top='339' left='8' width='180'/>
<led name='led21' state='off' top='54' left='216' width='180'/>
<led name='led22' state='off' top='69' left='216' width='180'/>
<led name='led23' state='off' top='84' left='216' width='180'/>
<led name='led24' state='off' top='99' left='216' width='180'/>
<led name='led25' state='off' top='114' left='216' width='180'/>
<led name='led26' state='off' top='129' left='216' width='180'/>
<led name='led27' state='off' top='144' left='216' width='180'/>
<led name='led28' state='off' top='159' left='216' width='180'/>
<led name='led29' state='off' top='174' left='216' width='180'/>
<led name='led30' state='off' top='189' left='216' width='180'/>
<led name='led31' state='off' top='204' left='216' width='180'/>
<led name='led32' state='off' top='219' left='216' width='180'/>
<led name='led33' state='off' top='234' left='216' width='180'/>
<led name='led34' state='off' top='249' left='216' width='180'/>
<led name='led35' state='off' top='264' left='216' width='180'/>
<led name='led36' state='off' top='279' left='216' width='180'/>
<led name='led37' state='off' top='294' left='216' width='180'/>
<led name='led38' state='off' top='309' left='216' width='180'/>
<led name='led39' state='off' top='324' left='216' width='180'/>
<led name='led40' state='off' top='339' left='216' width='180'/>
<led name='led1' state='off' top='54' left='8'/>
<led name='led2' state='off' top='69' left='8'/>
<led name='led3' state='off' top='84' left='8'/>
<led name='led4' state='off' top='99' left='8'/>
<led name='led5' state='off' top='114' left='8'/>
<led name='led6' state='off' top='129' left='8'/>
<led name='led7' state='off' top='144' left='8'/>
<led name='led8' state='off' top='159' left='8'/>
<led name='led9' state='off' top='174' left='8'/>
<led name='led10' state='off' top='189' left='8'/>
<led name='led11' state='off' top='204' left='8'/>
<led name='led12' state='off' top='219' left='8'/>
<led name='led13' state='off' top='234' left='8'/>
<led name='led14' state='off' top='249' left='8'/>
<led name='led15' state='off' top='264' left='8'/>
<led name='led16' state='off' top='279' left='8'/>
<led name='led17' state='off' top='294' left='8'/>
<led name='led18' state='off' top='309' left='8'/>
<led name='led19' state='off' top='324' left='8'/>
<led name='led20' state='off' top='339' left='8'/>
<led name='led21' state='off' top='54' left='216'/>
<led name='led22' state='off' top='69' left='216'/>
<led name='led23' state='off' top='84' left='216'/>
<led name='led24' state='off' top='99' left='216'/>
<led name='led25' state='off' top='114' left='216'/>
<led name='led26' state='off' top='129' left='216'/>
<led name='led27' state='off' top='144' left='216'/>
<led name='led28' state='off' top='159' left='216'/>
<led name='led29' state='off' top='174' left='216'/>
<led name='led30' state='off' top='189' left='216'/>
<led name='led31' state='off' top='204' left='216'/>
<led name='led32' state='off' top='219' left='216'/>
<led name='led33' state='off' top='234' left='216'/>
<led name='led34' state='off' top='249' left='216'/>
<led name='led35' state='off' top='264' left='216'/>
<led name='led36' state='off' top='279' left='216'/>
<led name='led37' state='off' top='294' left='216'/>
<led name='led38' state='off' top='309' left='216'/>
<led name='led39' state='off' top='324' left='216'/>
<led name='led40' state='off' top='339' left='216'/>
</group>
<button name='left' type='left' def-key='left' top='358' left='8'/>
<button name='right' type='right' def-key='right' top='358' left='71'/>
Expand Down
10 changes: 10 additions & 0 deletions rsrc/dialogs/confirm-reset-help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
<dialog defbtn='no'>
<button name='no' type='regular' def-key='n' top='39' left='244'>No</button>
<button name='yes' type='regular' def-key='y' top='39' left='178'>Yes</button>
<pict type='dlog' num='11' top='9' left='9'/>
<text top='4' left='51' width='251' height='32'>
Really reset instant help messages?
</text>
</dialog>
Loading
Loading