old xml api removed from pascal plugins

3 files changed, 1 insertions, 338 deletions

diff --git a/plugins/Actman/ua/i_inoutjson.inc b/plugins/Actman/ua/i_inoutjson.inc
index 95f793e9f2..e06474c5e3 100644
--- a/plugins/Actman/ua/i_inoutjson.inc
+++ b/plugins/Actman/ua/i_inoutjson.inc
@@ -194,7 +194,7 @@ end;
 

 //--------------------------

 

-function ExportMenuItems(node:JSONNODE;MenuItem:tUAMenuItem):HXML;

+function ExportMenuItems(node:JSONNODE;MenuItem:tUAMenuItem):JSONNODE;

 begin

   with jsonparser do

   begin

diff --git a/plugins/Actman/ua/i_inoutxm.inc b/plugins/Actman/ua/i_inoutxm.inc
deleted file mode 100644
index 4a539a8275..0000000000
--- a/plugins/Actman/ua/i_inoutxm.inc
+++ /dev/null
@@ -1,334 +0,0 @@
-{}

-

-const

-  ioAction         :PWideChar = 'Action';

-  ioUA             :PWideChar = 'UA';

-

-  ioName           :PWideChar = 'name';

-

-  ioTwoState       :PWideChar = 'twostate';

-  ioSaveState      :PWideChar = 'savestate';

-

-  ioHotkey         :PWideChar = 'Hotkey';

-  ioToolbar        :PWideChar = 'Toolbar';

-  ioTabSRMM        :PWideChar = 'TabSRMM';

-  ioMenuItem       :PWideChar = 'Menu';

-

-  ioTooltip        :PWideChar = 'tooltip';

-  ioTooltipPressed :PWideChar = 'tt_pressed';

-

-  ioType           :PWideChar = 'type';

-  ioMenuPopup      :PWideChar = 'Popup';

-  ioMenuName       :PWideChar = 'Name';

-  ioMenuShow       :PWideChar = 'Show';

-  ioMenuUsed       :PWideChar = 'Used';

-  ioMenuSeparated  :PWideChar = 'Separated';

-  ioNoTranslate    :PWideChar = 'NoTranslate';

-

-

-function ImportMenuItems(node:HXML;var MenuItem:tUAMenuItem):integer;

-begin

-  result:=0;

-

-  with MenuItem do

-  begin

-    menu_opt:=0;

-  // popup

-    StrDupW(szMenuPopup,xmlGetAttrValue(node,ioMenuPopup));

-  // name

-    StrDupW(szMenuNameVars,xmlGetAttrValue(node,ioMenuName));

-  // show

-    StrDupW(szMenuShowWhenVars,xmlGetAttrValue(node,ioMenuShow));

-  // used

-    if StrToInt(xmlGetAttrValue(node,ioMenuUsed))<>0 then

-      menu_opt:=menu_opt or UAF_MENUUSE;

-  // separated

-    if StrToInt(xmlGetAttrValue(node,ioMenuSeparated))<>0 then

-      menu_opt:=menu_opt or UAF_MENUSEP;

-  // no translate

-    if StrToInt(xmlGetAttrValue(node,ioNoTranslate))<>0 then

-      menu_opt:=menu_opt or UAF_NOTRANS;

-  end;

-end;

-

-function ImportUAction(actnode:HXML;var UA:tMyActionItem):integer;

-var

-  num,i:integer;

-  sub:HXML;

-begin

-  result:=0;

-  if actnode=0 then exit;

-

-  UA.flags:=0;

-  // ----- Common -----

-  if StrToInt(xmlGetAttrValue(actnode,ioTwoState))<>0 then

-    UA.flags:=UA.flags or UAF_2STATE;

-

-  if StrToInt(xmlGetAttrValue(actnode,ioSaveState))<>0 then

-    UA.flags:=UA.flags or UAF_SAVESTATE;

-

-  if StrToInt(xmlGetAttrValue(actnode,ioHotkey))<>0 then

-    UA.flags:=UA.flags or UAF_REGHOTKEY;

-  if StrToInt(xmlGetAttrValue(actnode,ioToolbar))<>0 then

-    UA.flags:=UA.flags or UAF_REGTTBB;

-  if StrToInt(xmlGetAttrValue(actnode,ioTabSRMM))<>0 then

-    UA.flags:=UA.flags or UAF_REGTABB;

-

-  // ----- Hotkey -----

-  // nothing

-

-  // ----- Modern CList toolbar -----

-  // source - ANSI text

-  sub:=xmlGetNthChild(actnode,ioToolbar,0);

-  WideToAnsi(xmlGetAttrValue(sub,ioTooltip       ),UA.szTTBTooltip       ,MirandaCP);

-  WideToAnsi(xmlGetAttrValue(sub,ioTooltipPressed),UA.szTTBTooltipPressed,MirandaCP);

-

-  // ----- TabSRMM toolbar -----

-  sub:=xmlGetNthChild(actnode,ioTabSRMM,0);

-  StrDupW(UA.szTabBTooltip       ,xmlGetAttrValue(sub,ioTooltip));

-  StrDupW(UA.szTabBTooltipPressed,xmlGetAttrValue(sub,ioTooltipPressed));

-

-  // ----- Menus -----

-  num:=0;

-  repeat

-    sub:=xmlGetNextChild(actnode,ioMenuItem,@num);

-    if sub=0 then break;

-

-    i:=StrToInt(xmlGetAttrValue(sub,ioType));

-    ImportMenuItems(sub,UA.UAMenuItem[tMenuType(i)]);

-  until false;

-end;

-

-function Import(fname:PWideChar;aflags:dword):integer;

-var

-  i,j,act:integer;

-  root,actnode:HXML;

-  pcw,res:pWideChar;

-  f:THANDLE;

-  num,num1:integer;

-  ptr,ptr1:pChain;

-begin

-  result:=0;

-

-  if (fname=nil) or (fname^=#0) then

-    exit;

-  i:=GetFSize(fname);

-  if i=0 then

-    exit;

-

-  num:=CallService(MS_ACT_GETLIST,0,LPARAM(@ptr));

-  if num=0 then exit;

-  ptr1:=ptr;

-

-  mGetMem (res ,i+SizeOf(WideChar));

-  FillChar(res^,i+SizeOf(WideChar),0);

-  f:=Reset(fname);

-  BlockRead(f,res^,i);

-  CloseHandle(f);

-

-  root:=xmlParseString(ChangeUnicode(res),@i,nil);

-  j:=0;

-  repeat

-    actnode:=xmlGetNthChild(root,ioAction,j);

-    if actnode=0 then break;

-    // search id by name?

-    pcw:=xmlGetAttrValue(actnode,ioName);

-    ptr:=ptr1;

-    inc(pbyte(ptr),4);

-    for i:=0 to num-1 do

-    begin

-      if (ptr.flags and ACF_SELECTED)<>0 then

-      begin

-        if StrCmpw(pcw,ptr.descr)=0 then

-        begin

-          // delete old UA for overwrited actions

-          if (ptr.flags and ACF_OVERLOAD)<>0 then

-          begin

-            for act:=0 to HIGH(UActionList) do

-            begin

-              if ptr.id=UActionList[act].dwActID then

-              begin

-                DeleteUAction(act,true);

-                break;

-              end;

-            end;

-          end;

-          num1:=AddUAction(-1,ptr);

-          ImportUAction(xmlGetNthChild(actnode,ioUA,0),UActionList[num1]);

-          break;

-        end;

-      end;

-      inc(ptr);

-    end;

-    

-    inc(j);

-  until false;

-  xmlDestroyNode(root);

-

-  CallService(MS_ACT_FREELIST,0,LPARAM(ptr1));

-  mFreeMem(res);

-  result:=1;

-  if settings<>0 then

-  begin

-    FillActionList(settings);

-    ShowAction(settings,-1);

-  end;

-end;

-

-//--------------------------

-

-function ExportMenuItems(node:HXML;const MenuItem:tUAMenuItem):HXML;

-begin

-  result:=xmlAddChild(node,ioMenuItem,nil);

-  with MenuItem do

-  begin

-  // popup

-    if (szMenuPopup<>nil) and (szMenuPopup^<>#0) then

-      xmlAddAttr(result,ioMenuPopup,szMenuPopup);

-  // name

-    if (szMenuNameVars<>nil) and (szMenuNameVars^<>#0) then

-      xmlAddAttr(result,ioMenuName,szMenuNameVars);

-  // show

-    if (szMenuShowWhenVars<>nil) and (szMenuShowWhenVars^<>#0) then

-      xmlAddAttr(result,ioMenuShow,szMenuShowWhenVars);

-  // used

-    xmlAddAttrInt(result,ioMenuUsed,ord((menu_opt AND UAF_MENUUSE)<>0));

-  // separated

-    xmlAddAttrInt(result,ioMenuSeparated,ord((menu_opt AND UAF_MENUSEP)<>0));

-  // no translate

-    xmlAddAttrInt(result,ioNoTranslate,ord((menu_opt AND UAF_NOTRANS)<>0));

-  end;

-end;

-

-procedure WriteUAction(root:HXML;id:dword;name:pWideChar);

-var

-  i:integer;

-  lmenu:tMenuType;

-  pc:pWideChar;

-  actnode,sub:HXML;

-  UA:pMyActionItem;

-begin

-  for i:=0 to HIGH(UActionList) do

-  begin

-    if UActionList[i].dwActID=id then

-    begin

-      UA:=@UActionList[i];

-      actnode:=xmlGetChildByAttrValue(root,ioAction,ioName,name);

-      if actnode=0 then break;

-      // we don't need that node as is, just it's child for UA

-      actnode:=xmlAddChild(actnode,ioUA,nil);

-

-      // ----- Common -----

-      xmlAddAttrInt(actnode,ioTwoState ,ORD((UA.flags and UAF_2STATE   )<>0));

-      xmlAddAttrInt(actnode,ioSaveState,ORD((UA.flags and UAF_SAVESTATE)<>0));

-

-      xmlAddAttrInt(actnode,ioHotkey ,ORD((UA.flags and UAF_REGHOTKEY)<>0));

-      xmlAddAttrInt(actnode,ioToolbar,ORD((UA.flags and UAF_REGTTBB )<>0));

-      xmlAddAttrInt(actnode,ioTabSRMM,ORD((UA.flags and UAF_REGTABB )<>0));

-

-      // ----- Hotkey -----

-      // nothing

-

-      // ----- Modern CList toolbar -----

-      // source - ANSI text

-      if ((UA.szTTBTooltip       <>nil) and (UA.szTTBTooltip^       <>#0)) or

-         ((UA.szTTBTooltipPressed<>nil) and (UA.szTTBTooltipPressed^<>#0)) then

-      begin

-        sub:=xmlAddChild(actnode,ioToolbar,nil);

-        if (UA.szTTBTooltip<>nil) and (UA.szTTBTooltip^<>#0) then

-        begin

-          AnsiToWide(UA.szTTBTooltip,pc,MirandaCP);

-          xmlAddAttr(sub,ioTooltip,pc);

-          mFreeMem(pc);

-        end;

-        if (UA.szTTBTooltipPressed<>nil) and (UA.szTTBTooltipPressed^<>#0) then

-        begin

-          AnsiToWide(UA.szTTBTooltipPressed,pc,MirandaCP);

-          xmlAddAttr(sub,ioTooltipPressed,pc);

-          mFreeMem(pc);

-        end;

-      end;

-

-      // ----- TabSRMM toolbar -----

-      if ((UA.szTabBTooltip       <>nil) and (UA.szTabBTooltip^       <>#0)) or

-         ((UA.szTabBTooltipPressed<>nil) and (UA.szTabBTooltipPressed^<>#0)) then

-      begin

-        sub:=xmlAddChild(actnode,ioTabSRMM,nil);

-        if (UA.szTabBTooltip<>nil) and (UA.szTabBTooltip^<>#0) then

-          xmlAddAttr(sub,ioTooltip,UA.szTabBTooltip);

-        if (UA.szTabBTooltipPressed<>nil) and (UA.szTabBTooltipPressed^<>#0) then

-          xmlAddAttr(sub,ioTooltipPressed,UA.szTabBTooltipPressed);

-      end;

-

-      // ----- Menus -----

-      for lmenu:=main_menu to HIGH(tMenuType) do

-      begin

-        sub:=ExportMenuItems(actnode,UA.UAMenuItem[lmenu]);

-        xmlAddAttrInt(sub,ioType,ORD(lmenu));

-      end;

-

-      break;

-    end;

-  end;

-end;

-

-function Export(fname:pWideChar;aflags:dword):integer;

-var

-  i,num:integer;

-  f:THANDLE;

-  root:HXML;

-  res:pWideChar;

-  ptr,ptr1:pChain;

-begin

-  result:=0;

-

-  // we need append file, not rewrite

-  i:=GetFSize(fname);

-  if i=0 then exit;

-

-  mGetMem (res ,i+SizeOf(WideChar));

-  FillChar(res^,i+SizeOf(WideChar),0);

-  f:=Reset(fname);

-  BlockRead(f,res^,i);

-  CloseHandle(f);

-  root:=xmlParseString(res,@i,nil);

-  mFreeMem(res);

-

-  num:=CallService(MS_ACT_GETLIST,0,LPARAM(@ptr));

-  if num>0 then

-  begin

-    ptr1:=ptr;

-    inc(pbyte(ptr),4);

-    for i:=0 to num-1 do

-    begin

-      if ((aflags and ACIO_SELECTED)=0) or

-         ((ptr.flags and ACCF_EXPORT)<>0) then

-      begin

-        WriteUAction(root,ptr.id,ptr.descr);

-      end;

-      inc(ptr);

-    end;

-    CallService(MS_ACT_FREELIST,0,LPARAM(ptr1));

-  end;

-

-  res:=xmlToString(root,@i);

-

-  f:=Rewrite(fname);

-  BlockWrite(f,res^,i*SizeOf(WideChar));

-  CloseHandle(f);

-  xmlFree(res);

-  xmlDestroyNode(root);

-  result:=1;

-end;

-

-function ActInOut(wParam:WPARAM;lParam:LPARAM):int_ptr; cdecl;

-begin

-  if (wParam and ACIO_EXPORT)=0 then

-  begin

-    result:=Import(pWideChar(lParam),wParam);

-  end

-  else

-  begin

-    result:=Export(pWideChar(lParam),wParam);

-  end;

-end;

diff --git a/plugins/Actman/ua/ua.pas b/plugins/Actman/ua/ua.pas
index da59fda540..7f3c9e1b61 100644
--- a/plugins/Actman/ua/ua.pas
+++ b/plugins/Actman/ua/ua.pas
@@ -43,7 +43,6 @@ var
 {$include i_options.inc}

 {$include i_opt_dlg.inc}

 {$include i_ua.inc}

-{$include i_inoutxm.inc}

 

 // ------------ base interface functions -------------

 

@@ -78,8 +77,6 @@ begin
   HookEvent(ME_CLIST_PREBUILDMAINMENU   , PreBuildMainMenu);

   HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PreBuildContactMenu);

   HookEvent(ME_CLIST_PREBUILDTRAYMENU   , PreBuildTrayMenu);

-

-  HookEvent(ME_ACT_INOUT,@ActInOut);

 end;

 

 procedure DeInit;