WebSVN – Kolibri OS – Diff – /programs/other/fb2reader/SRC/Settings.ob07

 (*
-    Copyright 2016, 2018, 2020-2022 Anton Krotov
+    Copyright 2016, 2018, 2020-2023 Anton Krotov
     This file is part of fb2read.
     along with fb2read. If not, see .
 *)
 MODULE Settings;
-IMPORT SU := SysUtils, W := Window, C := ColorDlg, DOM, S := Strings,
+IMPORT SU := SysUtils, W := Window, C := ColorDlg, DOM, S := Strings, K := KOSAPI, File,
   BtnW*     =       80;
 VAR
-  Window   : W.TWindow;
+  Window   : W.tWindow;
   PID      : INTEGER;
   sb       : ARRAY 7 OF box_lib.scrollbar;
   check1   : box_lib.checkbox;
   check2   : box_lib.checkbox;
   OpenPict : OD.Dialog;
   picture  : INTEGER;
+  picture_fsize : INTEGER;
   picture_path : S.STRING;
 PROCEDURE Close*;
 VAR pid: INTEGER;
 BEGIN
   IF PID # 0 THEN
     pid := PID;
+    PID := 0;
-    PID := 0;
+    IF (picture # Data.Picture) & (picture # 0) THEN
-    IF (picture # 0) & (picture # Data.Picture) THEN
+    	picture := K.free(picture);
-      LibImg.img_destroy(picture)
+    	picture_fsize := 0
     END;
     C.Destroy(Color);
     OD.Destroy(OpenPict);
     SU.TerminateThreadId(pid)
   END
 END Close;
 PROCEDURE ClearWindow;
 VAR
   X, Y, TextY       : INTEGER;
   WinW, WinH, SkinH : INTEGER;
   i                 : INTEGER;
-  Rect              : W.TRect;
+  Rect              : W.tRect;
 BEGIN
-  Rect.Left := 10;
+  Rect.left := 10;
-  Rect.Top := 85;
+  Rect.top := 85;
-  Rect.Width := 210;
+  Rect.width := 210;
-  Rect.Height := 255;
+  Rect.height := 255;
-  SU.Box(Rect.Left, Rect.Top, Rect.Width, Rect.Height, SU.winColor, SU.borderColor);
+  SU.Box(Rect.left, Rect.top, Rect.width, Rect.height, SU.winColor, SU.borderColor);
-  SU.Box(Rect.Left + 230, Rect.Top, Rect.Width + 170, Rect.Height, SU.winColor, SU.borderColor);
+  SU.Box(Rect.left + 230, Rect.top, Rect.width + 170, Rect.height, SU.winColor, SU.borderColor);
-  WinW := Window.Width;
+  WinW := Window.width;
-  WinH := Window.Height;
+  WinH := Window.height;
   SkinH := SU.SkinHeight();
   X := 125;
   OutText(TextLeft + 230, Y, "epigraph");     PlusMinus(TextLeft + 330, Y - 6, MAX_EPIGRAPH,  0, sb[5]); Y := Y + BtnH + 10;
   OutText(TextLeft + 230, Y, "line spacing"); PlusMinus(TextLeft + 330, Y - 6, MAX_InterLin,  0, sb[6]);
   Y := Y - 6;
-  SU.CreateButton(DAY,   (Rect.Width - (BtnW + 5 + BtnW)) DIV 2 + Rect.Left,                       Y, 80, BtnH, SU.btnColor, "Day"   );
+  SU.CreateButton(DAY,   (Rect.width - (BtnW + 5 + BtnW)) DIV 2 + Rect.left,                       Y, 80, BtnH, SU.btnColor, "Day"   );
-  SU.CreateButton(NIGHT, (Rect.Width - (BtnW + 5 + BtnW)) DIV 2 + Rect.Left + 5 + BtnW,            Y, 80, BtnH, SU.btnColor, "Night" );
+  SU.CreateButton(NIGHT, (Rect.width - (BtnW + 5 + BtnW)) DIV 2 + Rect.left + 5 + BtnW,            Y, 80, BtnH, SU.btnColor, "Night" );
 PROCEDURE DrawWindow;
 BEGIN
   SU.GetSystemColors;
   SU.WindowRedrawStatus(1);
-  SU.DefineAndDrawWindow(Window.Left, Window.Top, Window.Width, Window.Height,
+  SU.DefineAndDrawWindow(Window.left, Window.top, Window.width, Window.height,
-        SU.winColor, LSL(ORD({0, 1}), 4) + 4, Window.Caption);
+        SU.winColor, LSL(ORD({0, 1}), 4) + 4, Window.caption);
   Buttons;
   SU.WindowRedrawStatus(2)
   Data.PADDING.CInt := sb[2].position;
   Data.PADDING.Top  := sb[3].position;
   Data.PARAGRAPH    := sb[4].position;
   Data.EPIGRAPH     := sb[5].position;
   Data.InterLin     := sb[6].position;
-  IF Data.Picture # picture THEN
+  IF (picture # 0) & (picture # Data.Picture) THEN
-    IF Data.Picture # 0 THEN
+  	IF Data.Picture # 0 THEN
-      LibImg.img_destroy(Data.Picture)
+    	Data.Picture := K.free(Data.Picture)
     END;
     Data.Picture := picture;
+    Data.picture_fsize := picture_fsize;
     Ini.SetPicturePath(picture_path)
   END;
   picture := 0;
+  picture_fsize := 0;
   DOM.SetSettings(Data);
   Close
 END Apply;
 PROCEDURE LoadPicture(file_path: S.STRING);
-VAR ysize, img: INTEGER;
+VAR fsize, img: INTEGER;
 BEGIN
-  img := LibImg.LoadFromFile(file_path, 10240000, ysize);
+  img := File.Load(file_path, fsize);
   IF img # 0 THEN
     IF (picture # 0) & (picture # Data.Picture) THEN
-      LibImg.img_destroy(picture)
+      picture := K.free(picture)
+    END;
-    END;
+    picture := img;
-    picture := img;
+    picture_fsize := fsize;
     picture_path := file_path
   Data.PADDING.CInt := 6;
   Data.PARAGRAPH    := 30;
   Data.EPIGRAPH     := 100;
   Data.InterLin     := 0;
   Data.Picture      := picture;
+  Data.picture_fsize := picture_fsize;
   DOM.SetSettings(Data)
 END Default;
 PROCEDURE Show;
 VAR i, scrWidth, scrHeight: INTEGER;
 BEGIN
   SU.SetEventsMask({0, 2, 5, 30, 31});
-  W.InitWindow(Window, 0, 0, 640, 420, "Settings");
+  W.init(Window, 0, 0, 640, 420, "Settings");
   SU.GetScreenSize(scrWidth, scrHeight);
-  Window.Left := (scrWidth - Window.Width) DIV 2;
+  Window.left := (scrWidth - Window.width) DIV 2;
-  Window.Top  := (scrHeight - Window.Height) DIV 2;
+  Window.top  := (scrHeight - Window.height) DIV 2;
   Color := C.Create(DrawWindow);
   OpenPict := OD.Create(DrawWindow, 0, "/sys", "JPG|PNG|BMP|GIF");
+  Data := DOM.Settings;
-  Data := DOM.Settings;
+  picture := Data.Picture;
-  picture := Data.Picture;
+  picture_fsize := Data.picture_fsize;
   DrawWindow;
   WHILE TRUE DO
     CASE SU.WaitForEvent() OF
   bpicture := "back picture";
   twocol := "two columns";
   check2 := box_lib.kolibri_new_check_box(TextLeft, 10 + 5,               16, 16, sys.SADR(""), LENGTH(bpicture) * 8 + 5);
   check1 := box_lib.kolibri_new_check_box(TextLeft, 10 + (BtnH + 10) + 5, 16, 16, sys.SADR(""), LENGTH(twocol)  * 8 + 5);
   picture := 0;
+  picture_fsize := 0;
   IF Ini.Picture # "" THEN
     LoadPicture(Ini.Picture)
   END
 END main;

Subversion Repositories Kolibri OS

(root)/programs/other/fb2reader/SRC/Settings.ob07 – Rev 9896 → 9898