From 07168fc58808c11787740895634c5d885e9793d3 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Thu, 30 Dec 2021 21:10:09 +0000
Subject: [PATCH] RDSave: use app.ini instead of standalone rdsave.ini

git-svn-id: svn://kolibrios.org@9531 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/common/settings/app.ini                  |  5 +++++
 .../system/rdsave/trunk/app.ini               |  5 ++---
 programs/system/rdsave/trunk/rdsave.asm       | 19 +++++++++----------
 programs/system/rdsave/trunk/rdsave.ini       |  5 -----
 4 files changed, 16 insertions(+), 18 deletions(-)
 rename data/common/settings/rdsave.ini => programs/system/rdsave/trunk/app.ini (53%)
 delete mode 100644 programs/system/rdsave/trunk/rdsave.ini

diff --git a/data/common/settings/app.ini b/data/common/settings/app.ini
index 1c695d99a0..115e8f0540 100644
--- a/data/common/settings/app.ini
+++ b/data/common/settings/app.ini
@@ -17,3 +17,8 @@ Next=PgDn
 Prev=PgUp
 SlideShow=f
 ToggleBar=Tab
+
+[RDSave]
+path=/usbhd0/1/kolibri.img
+autoclose=0
+
diff --git a/data/common/settings/rdsave.ini b/programs/system/rdsave/trunk/app.ini
similarity index 53%
rename from data/common/settings/rdsave.ini
rename to programs/system/rdsave/trunk/app.ini
index 598e64a1bd..73d411d11d 100644
--- a/data/common/settings/rdsave.ini
+++ b/programs/system/rdsave/trunk/app.ini
@@ -1,5 +1,4 @@
-[path]
+[RDSave]
 path=/usbhd0/1/kolibri.img
-[settings]
 autoclose=0
-autosave=0
+
diff --git a/programs/system/rdsave/trunk/rdsave.asm b/programs/system/rdsave/trunk/rdsave.asm
index 754209409f..9afe0341ec 100644
--- a/programs/system/rdsave/trunk/rdsave.asm
+++ b/programs/system/rdsave/trunk/rdsave.asm
@@ -8,7 +8,7 @@
 ;   Heavyiron 01.12.2013 - new logic
 ;---------------------------------------------------------------------
 appname equ 'RDsave '
-version equ '1.43'
+version equ '1.44'
 debug	equ no
 
 use32	     ; включить 32-битный режим ассемблера
@@ -51,9 +51,9 @@ load_libraries l_libs_start,end_l_libs
 
 	stdcall dll.Init,[init_lib]
 
-	invoke	ini_get_int,ini_file,asettings,aautoclose,0
+	invoke	ini_get_int,ini_file,ini_section,aautoclose,0
 	mov	[autoclose],eax
-	invoke	ini_get_str,ini_file,apath,apath,fname_buf,4096,path
+	invoke	ini_get_str,ini_file,ini_section,apath,fname_buf,4096,path
 	stdcall _lstrcpy,ini_path,fname_buf
 	stdcall _lstrcpy,filename_area,start_temp_file_name
 
@@ -243,7 +243,7 @@ check_for_error:		      ;
 print_err:
 	stdcall _lstrlen,ini_path
 	pusha
-	invoke	ini_set_str,ini_file,apath,apath,ini_path,eax
+	invoke	ini_set_str,ini_file,ini_section,apath,ini_path,eax
 	popa
 	stdcall _lstrcpy,msg,edx
 	cmp	[hidden],1
@@ -315,8 +315,8 @@ draw_PathShow:
 save_ini:
 	pusha
 	stdcall _lstrlen,fname_buf
-	invoke	ini_set_str,ini_file,apath,apath,fname_buf,eax
-	invoke	ini_set_int,ini_file,asettings,aautoclose,[autoclose]
+	invoke	ini_set_str,ini_file,ini_section,apath,fname_buf,eax
+	invoke	ini_set_int,ini_file,ini_section,aautoclose,[autoclose]
 	popa
 	ret
 ;---------------------------------------------------------------------
@@ -640,16 +640,15 @@ aini_set_str db 'ini_set_str',0
 aini_set_int db 'ini_set_int',0
 ;---------------------------------------------------------------------
 
+ini_file db  '/sys/settings/app.ini',0
+ini_section db 'RDSave',0
 apath db 'path',0
-asettings db 'settings',0
 aautoclose db 'autoclose',0
 path	db '/hd2/1/kolibri.img',0
-ini_file db  '/sys/settings/rdsave.ini',0
-;ini_file db  '/sys/rdsave.ini',0
 ;---------------------------------------------------------------------
 is_notify:
     dd	  7, 0, ok, 0, 0
-    db	  "/rd/1/@notify", 0
+    db	  "/sys/@notify", 0
 
 read_folder:
 .subfunction	dd 1
diff --git a/programs/system/rdsave/trunk/rdsave.ini b/programs/system/rdsave/trunk/rdsave.ini
deleted file mode 100644
index 598e64a1bd..0000000000
--- a/programs/system/rdsave/trunk/rdsave.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[path]
-path=/usbhd0/1/kolibri.img
-[settings]
-autoclose=0
-autosave=0