Interface improvements

Author: r57zone

Source/Windows/AllowedIPs.txt

@@ -93,4 +93,4 @@
 192.168.3.12
 192.168.3.13
 192.168.3.14
-192.168.3.15
+192.168.3.15

Source/Windows/Unit1.dfm

@@ -16,6 +16,7 @@ object Main: TMain
   Font.Style = []
   OldCreateOrder = False
   Position = poScreenCenter
+  OnActivate = FormActivate
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -135,7 +136,7 @@ object Main: TMain
     Left = 16
     Top = 104
   end
-  object PopupMenu: TPopupMenu
+  object PopupMenuApp: TPopupMenu
     Left = 48
     Top = 104
     object AboutBtn: TMenuItem

Source/Windows/Unit1.pas

@@ -12,7 +12,7 @@   TMain = class(TForm)
     IdHTTPServer: TIdHTTPServer;
     CommandKeyEdt: TEdit;
     CommandLbl: TLabel;
-    PopupMenu: TPopupMenu;
+    PopupMenuApp: TPopupMenu;
     CloseBtn: TMenuItem;
     AboutBtn: TMenuItem;
     LineBtn: TMenuItem;
@@ -41,12 +41,13 @@   TMain = class(TForm)
     procedure CancelBtnClick(Sender: TObject);
     procedure AllowAnyIPsCBClick(Sender: TObject);
     procedure AllowedIPsMemoChange(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     procedure DefaultHandler(var Message); override;
     { Private declarations }
   protected
     procedure IconMouse(var Msg: TMessage); message WM_USER + 1;
-    procedure WMActivate(var Msg: TMessage); message WM_ACTIVATE;
+    //procedure WMActivate(var Msg: TMessage); message WM_ACTIVATE;
   public
     procedure AppShow;
     procedure AppHide;
@@ -55,7 +56,7 @@   TMain = class(TForm)
 
 var
   Main: TMain;
-  RunOnce, DebugMode: boolean;
+  DebugMode: boolean;
   WM_TASKBARCREATED: Cardinal;
   AllowClose: boolean = false;
   AllowedIPs: TStringList;
@@ -214,7 +215,8 @@ procedure TMain.IdHTTPServerCommandGet(AThread: TIdPeerThread;
   //CoUninitialize;
 end;
 
-procedure Tray(ActInd: integer); // 1 - äîáàâèòü, 2 - èçìåíèòü, 3 - óäàëèòü
+type TTrayAction = (TrayAdd, TrayUpdate, TrayDelete);
+procedure Tray(TrayAction: TTrayAction);
 var
   NIM: TNotifyIconData;
 begin
@@ -223,14 +225,14 @@ procedure TMain.IdHTTPServerCommandGet(AThread: TIdPeerThread;
     Wnd:=Main.Handle;
     uId:=1;
     uFlags:=NIF_MESSAGE or NIF_ICON or NIF_TIP;
-    hIcon:=SendMessage(Application.Handle, WM_GETICON, ICON_SMALL2, 0);
+    hIcon:=SendMessage(Main.Handle, WM_GETICON, ICON_SMALL2, 0);
     uCallBackMessage:=WM_USER + 1;
     StrCopy(szTip, PChar(Application.Title));
   end;
-  case ActInd of
-    1: Shell_NotifyIcon(NIM_ADD, @NIM);
-    2: Shell_NotifyIcon(NIM_MODIFY, @NIM);
-    3: Shell_NotifyIcon(NIM_DELETE, @NIM);
+  case TrayAction of
+    TrayAdd: Shell_NotifyIcon(NIM_ADD, @NIM);
+    TrayUpdate: Shell_NotifyIcon(NIM_MODIFY, @NIM);
+    TrayDelete: Shell_NotifyIcon(NIM_DELETE, @NIM);
   end;
 end;
 
@@ -248,10 +250,8 @@ procedure TMain.FormCreate(Sender: TObject);
   Ini: TIniFile;
 begin
   Application.Title:=Caption;
-  AppHide;
   WM_TASKBARCREATED:=RegisterWindowMessage('TaskbarCreated');
-  Tray(1);
-  SetWindowLong(Application.Handle, GWL_EXSTYLE, GetWindowLong(Application.Handle, GWL_EXSTYLE) or WS_EX_TOOLWINDOW);
+  //SetWindowLong(Application.Handle, GWL_EXSTYLE, GetWindowLong(Application.Handle, GWL_EXSTYLE) or WS_EX_TOOLWINDOW);
 
   if GetLocaleInformation(LOCALE_SENGLANGUAGE) = 'Russian' then begin
     IDS_ABOUT:='Î ïðîãðàììå...';
@@ -300,52 +300,54 @@ procedure TMain.IconMouse(var Msg: TMessage);
   case Msg.LParam of
     WM_LBUTTONDOWN:
       begin
-        if IsWindowVisible(Main.Handle) then
-          AppHide
-        else
-          AppShow;
+        // Ñêðûâàåì PopupMenu, åñëè ïîêàçàí
+        PostMessage(Handle, WM_LBUTTONDOWN, MK_LBUTTON, 0);
+        PostMessage(Handle, WM_LBUTTONUP, MK_LBUTTON, 0);
       end;
 
+    WM_LBUTTONDBLCLK:
+        if IsWindowVisible(Handle) then AppHide else AppShow;
+
     WM_RBUTTONDOWN:
-      PopupMenu.Popup(Mouse.CursorPos.X, Mouse.CursorPos.Y);
+      PopupMenuApp.Popup(Mouse.CursorPos.X, Mouse.CursorPos.Y);
   end;
 end;
 
-procedure TMain.WMActivate(var Msg: TMessage);
+{procedure TMain.WMActivate(var Msg: TMessage);
 begin
   if (Msg.WParam = WA_INACTIVE) then
     AppHide;
   inherited;
-end;
+end;}
 
 procedure TMain.FormDestroy(Sender: TObject);
 begin
   AllowClose:=true;
   AllowedIPs.Free;
-  Tray(3);
+  Tray(TrayDelete);
 end;
 
 procedure TMain.DefaultHandler(var Message);
 begin
   if TMessage(Message).Msg = WM_TASKBARCREATED then
-    Tray(1);
+    Tray(TrayAdd);
   inherited;
 end;
 
 procedure TMain.AppHide;
 begin
   AllowClose:=true;
-  ShowWindow(Handle, SW_HIDE);
+  Tray(TrayAdd);
+  ShowWindow(Main.Handle, SW_HIDE);  // Ñêðûâàåì ïðîãðàììó
+  ShowWindow(Application.Handle, SW_HIDE);  // Ñêðûâàåì ñ ïàíåëè çàäà÷
 end;
 
 procedure TMain.AppShow;
 begin
-  if Main.AlphaBlend then begin
-    Main.AlphaBlendValue:=255;
-    Main.AlphaBlend:=false;
-  end;
-  ShowWindow(Handle, SW_SHOW);
+  ShowWindow(Main.Handle, SW_SHOW);  // Ïîêàçûâàåì ïðîãðàììó
+  ShowWindow(Application.Handle, SW_SHOW);  // Ïîêàçûâàåì ïðîãðàììó íà ïàíåëè çàäà÷
   SetForegroundWindow(Handle);
+  Tray(TrayDelete);
   AllowClose:=false;
 end;
 
@@ -363,8 +365,8 @@ procedure TMain.CloseBtnClick(Sender: TObject);
 
 procedure TMain.AboutBtnClick(Sender: TObject);
 begin
-  Application.MessageBox(PChar(Caption + ' 1.0' + #13#10 +
-  IDS_LAST_UPDATE + ' 06.05.25' + #13#10 +
+  Application.MessageBox(PChar(Caption + ' 1.0.2' + #13#10 +
+  IDS_LAST_UPDATE + ' 29.10.25' + #13#10 +
   'https://r57zone.github.io' + #13#10 +
   '[email protected]'), PChar(IDS_ABOUT), MB_ICONINFORMATION);
 end;
@@ -392,7 +394,6 @@ procedure TMain.OkBtnClick(Sender: TObject);
   if IPSMemoChanged then
     AllowedIPsMemo.Lines.SaveToFile(ExtractFilePath(ParamStr(0)) + 'AllowedIPs.txt');
 
-  //AppHide;
   IdHTTPServer.Active:=false;
   WinExec(PChar(ParamStr(0)), SW_SHOW);
   AllowClose:=true;
@@ -414,4 +415,13 @@ procedure TMain.AllowedIPsMemoChange(Sender: TObject);
   IPSMemoChanged:=true;
 end;
 
+procedure TMain.FormActivate(Sender: TObject);
+begin
+  if Main.AlphaBlend then begin
+    AppHide;
+    Main.AlphaBlendValue:=255;
+    Main.AlphaBlend:=false;
+  end;
+end;
+
 end.