fixes #3891 (Actman: кнопка "Помощь" ничего не делает)

5 files changed, 1 insertions, 15 deletions

diff --git a/plugins/Actman/hooks/hooks.rc b/plugins/Actman/hooks/hooks.rc
index ff351cc94d..b7e93da851 100644
--- a/plugins/Actman/hooks/hooks.rc
+++ b/plugins/Actman/hooks/hooks.rc
@@ -12,7 +12,6 @@ FONT 8, "MS Shell Dlg", 0, 0
            LVS_SHOWSELALWAYS| LVS_REPORT | LVS_EDITLABELS,// | LVS_SINGLESEL 

            0, 2, 280, 160, WS_EX_CONTROLPARENT

 

-  CONTROL  "Help"  ,IDC_EVENT_HELP ,"MButtonClass",WS_TABSTOP,284,  2,16,16,$18000000

   CONTROL  "Delete",IDC_HOOK_DELETE,"MButtonClass",WS_TABSTOP,284, 96,16,16,$18000000

 

   CONTROL  "New"   ,IDC_HOOK_NEW   ,"MButtonClass",WS_TABSTOP,284,126,16,16,$18000000

diff --git a/plugins/Actman/hooks/i_hconst.inc b/plugins/Actman/hooks/i_hconst.inc
index d011278b7e..a9a22148c9 100644
--- a/plugins/Actman/hooks/i_hconst.inc
+++ b/plugins/Actman/hooks/i_hconst.inc
@@ -11,7 +11,6 @@ const
   IDC_HOOKLIST      = 1025;

   IDC_ACTIONLIST    = 1026;

   IDC_EVENTLIST     = 1027;

-  IDC_EVENT_HELP    = 1028;

   IDC_HOOK_NEW      = 1029;

   IDC_HOOK_DELETE   = 1030;

   IDC_HOOK_APPLY    = 1031;

diff --git a/plugins/Actman/hooks/i_opt_dlg.inc b/plugins/Actman/hooks/i_opt_dlg.inc
index 895ce51f21..1f7f932000 100644
--- a/plugins/Actman/hooks/i_opt_dlg.inc
+++ b/plugins/Actman/hooks/i_opt_dlg.inc
@@ -164,7 +164,6 @@ begin
   EnableWindow(GetDlgItem(Dialog,IDC_HOOK_DELETE),b);

   EnableWindow(GetDlgItem(Dialog,IDC_HOOK_APPLY ),b);

   EnableWindow(GetDlgItem(Dialog,IDC_EVENT_CHELP),b);

-  EnableWindow(GetDlgItem(Dialog,IDC_EVENT_HELP ),b);

 end;

 

 function NewHook(Dialog:HWND;item:integer=-1):integer;

@@ -255,10 +254,6 @@ begin
   ti.hinst   :=hInstance;

 

   ti.lpszText:=TranslateW('Help');

-  ti.uId     :=GetDlgItem(Dialog,IDC_EVENT_HELP);

-  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));

-  SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));

-

   ti.uId     :=GetDlgItem(Dialog,IDC_EVENT_CHELP);

   SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));

   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));

@@ -390,7 +385,6 @@ begin
         BN_CLICKED: begin

           case loword(wParam) of

             IDC_EVENT_CHELP: SendMessage(Dialog,WM_HELP,0,0);

-            IDC_EVENT_HELP : ;

             IDC_HOOK_NEW   : NewHook(Dialog);

             IDC_HOOK_DELETE: DeleteHook(Dialog);

             IDC_HOOK_APPLY : SaveHookData(Dialog);

diff --git a/plugins/Actman/tasks/i_opt_dlg.inc b/plugins/Actman/tasks/i_opt_dlg.inc
index 3a130f7227..6d4a81906f 100644
--- a/plugins/Actman/tasks/i_opt_dlg.inc
+++ b/plugins/Actman/tasks/i_opt_dlg.inc
@@ -386,12 +386,7 @@ begin
   ti.uFlags  :=TTF_IDISHWND or TTF_SUBCLASS;

   ti.hwnd    :=dialog;

   ti.hinst   :=hInstance;

-{

-  ti.uId     :=GetDlgItem(Dialog,IDC_EVENT_HELP);

-  ti.lpszText:=TranslateW('Help');

-  SendMessage(ti.uId,BM_SETIMAGE,IMAGE_ICON,Skin_LoadIcon(SKINICON_OTHER_HELP,0));

-  SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,LPARAM(@ti));

-}  

+

   ti.uId     :=GetDlgItem(Dialog,IDC_TASK_NEW);

   ti.lpszText:=TranslateW('New');

   SetButtonIcon(ti.uId,ACI_NEW);

diff --git a/plugins/Actman/tasks/tasks.rc b/plugins/Actman/tasks/tasks.rc
index 2bc558fbc3..41c015dc39 100644
--- a/plugins/Actman/tasks/tasks.rc
+++ b/plugins/Actman/tasks/tasks.rc
@@ -43,5 +43,4 @@ FONT 8, "MS Shell Dlg", 0, 0
 

   CONTROL  "New"   ,IDC_TASK_NEW   ,"MButtonClass",WS_TABSTOP, 2,178,16,16,$18000000

   CONTROL  "Delete",IDC_TASK_DELETE,"MButtonClass",WS_TABSTOP,22,178,16,16,$18000000

-//  CONTROL  "Help"  ,IDC_EVENT_HELP ,"MButtonClass",WS_TABSTOP,42,164,16,16,$18000000

 }