aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Tinypad: fix option checkmarks

Browse Source 
git-svn-id: svn://kolibrios.org@5845 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
pathoswithin
2015-10-12 10:02:58 +00:00
parent ab543a3b94
commit 88d4ecd139
6 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
programs/develop/tinypad/trunk/data/tp-defines.inc
View File

@@ -34,7 +34,6 @@ define mm.Options.Appearance set_opt.dialog
define mm.Options.SecureSel set_opt.secure_sel
define mm.Options.AutoBrackets set_opt.auto_braces
define mm.Options.AutoIndents set_opt.auto_indents
define mm.Options.SmartTabs 0
define mm.Options.OptimalFill set_opt.optimal_fill
define mm.Options.LineNumbers set_opt.line_numbers
define mm.Options.ZoomIn key.ctrl_plus

1
programs/develop/tinypad/trunk/data/tp-idata.inc
View File

@@ -112,7 +112,6 @@ sz ini_options_tabs_pos,'tabs_pos',0
sz ini_options_secure_sel,'secure_sel',0
sz ini_options_auto_braces,'auto_braces',0
sz ini_options_auto_indent,'auto_indent',0
sz ini_options_smart_tab,'smart_tab',0
sz ini_options_optim_save,'optim_save',0
sz ini_options_line_nums,'line_nums',0
;-----------------------------------------------------------------------------

4
programs/develop/tinypad/trunk/data/tp-locale.inc
View File

@@ -168,7 +168,6 @@ popup_res mm.Options,\
ru,'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᭮<EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD>' ,'',SecureSel ,\
ru,'<27><>⮬<EFBFBD><E2AEAC><EFBFBD><EFBFBD><EFBFBD>᪨<EFBFBD> ᪮<><E1AAAE><EFBFBD>' ,'',AutoBrackets,\
ru,'<27><>⮬<EFBFBD><E2AEAC><EFBFBD><EFBFBD><EFBFBD>᪨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' ,'',AutoIndents ,\
ru,'<27><><EFBFBD><EFBFBD><EFBFBD> ⠡<><E2A0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' ,'',SmartTabs ,\
ru,'<27><>⨬<EFBFBD><E2A8AC>쭮<EFBFBD> <20><><EFBFBD>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD>' ,'',OptimalFill ,\
ru,'-','',,\
ru,'<27><><EFBFBD>譨<EFBFBD> <20><><EFBFBD>...' ,'',Appearance ,\
@@ -180,7 +179,6 @@ popup_res mm.Options,\
en,'Secure selection' ,'',SecureSel ,\
en,'Automatic brackets' ,'',AutoBrackets,\
en,'Automatic indents' ,'',AutoIndents ,\
en,'Smart tabulation' ,'',SmartTabs ,\
en,'Optimal fill on saving' ,'',OptimalFill ,\
en,'-','',,\
en,'Appearance...' ,'',Appearance ,\
@@ -192,7 +190,6 @@ popup_res mm.Options,\
et,'Turvaline valimine' ,'',SecureSel ,\
et,'Automaatsed sulud' ,'',AutoBrackets,\
et,'Automaatsed taandread' ,'',AutoIndents ,\
et,'Tark tabulatsioon' ,'',SmartTabs ,\
et,'Optimaalne t<>itmine salvestamisel','',OptimalFill,\
et,'-','',,\
et,'V<>limus...' ,'',Appearance ,\
@@ -204,7 +201,6 @@ popup_res mm.Options,\
sp,'Selecci<63>n segura' ,'',SecureSel ,\
sp,'Par<61>ntesis autom<6F>ticos' ,'',AutoBrackets,\
sp,'Identaci<63>n autom<6F>tica' ,'',AutoIndents ,\
sp,'Tabulaci<63>n inteligente' ,'',SmartTabs ,\
sp,'Llenado <20>ptimo al guardar','',OptimalFill ,\
sp,'-','',,\
sp,'Apariencia...' ,'',Appearance

1
programs/develop/tinypad/trunk/data/tp-udata.inc
View File

@@ -126,7 +126,6 @@ tabs_pos db ?
secure_sel db ?
auto_braces db ?
auto_indent db ?
smart_tab db ?
optim_save db ?
line_nums db ?

4
programs/develop/tinypad/trunk/tinypad.asm
View File

@@ -383,8 +383,6 @@ proc load_settings ;//////////////////////////////////////////////////////////
mov [auto_braces],al
invoke ini.get_int,ini_path,ini_sec_options,ini_options_auto_indent,1
mov [auto_indent],al
invoke ini.get_int,ini_path,ini_sec_options,ini_options_smart_tab,1
mov [smart_tab],al
invoke ini.get_int,ini_path,ini_sec_options,ini_options_optim_save,1
mov [optim_save],al
invoke ini.get_int,ini_path,ini_sec_options,ini_options_line_nums,0
@@ -437,8 +435,6 @@ proc save_settings ;//////////////////////////////////////////////////////////
invoke ini.set_int,ini_path,ini_sec_options,ini_options_auto_braces,eax
movzx eax,[auto_indent]
invoke ini.set_int,ini_path,ini_sec_options,ini_options_auto_indent,eax
movzx eax,[smart_tab]
invoke ini.set_int,ini_path,ini_sec_options,ini_options_smart_tab,eax
movzx eax,[optim_save]
invoke ini.set_int,ini_path,ini_sec_options,ini_options_optim_save,eax
movzx eax,[line_nums]

24
programs/develop/tinypad/trunk/tp-popup.asm
View File

@@ -258,28 +258,26 @@ onshow:
.recode:
ret
.options:
;mov word[mm.Options+0],0
mov byte[mm.Options+5],0
or byte[mm.Options+2],0x02
test [secure_sel],1
jnz @f
and byte[mm.Options+2],0xFD
@@: or byte[mm.Options+3],0x02
test [auto_braces],1
or byte[mm.Options+3],0x02
test [line_nums],1
jnz @f
and byte[mm.Options+3],0xFD
@@: or byte[mm.Options+4],0x02
test [auto_indent],1
test [secure_sel],1
jnz @f
and byte[mm.Options+4],0xFD
@@: or byte[mm.Options+5],0x02
test [auto_braces],1
jnz @f
and byte[mm.Options+5],0xFD
@@: or byte[mm.Options+6],0x02
test [optim_save],1
test [auto_indent],1
jnz @f
and byte[mm.Options+6],0xFD
@@: or byte[mm.Options+8],0x02
test [line_nums],1
@@: or byte[mm.Options+7],0x02
test [optim_save],1
jnz @f
and byte[mm.Options+8],0xFD
and byte[mm.Options+7],0xFD
@@: ret
pi_sel dd ?