- iceit Miranda64.exe detection (patch from Jerbifor)

git-svn-id: http://svn.miranda-ng.org/main/trunk@3104 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 11 insertions, 11 deletions

diff --git a/tools/iceit/Project1.exe b/tools/iceit/Project1.exe
index aee17f3773..57395fae24 100644
--- a/tools/iceit/Project1.exe
+++ b/tools/iceit/Project1.exe
diff --git a/tools/iceit/Unit1.dcu b/tools/iceit/Unit1.dcu
index 1761f10055..d5f27d3cfd 100644
--- a/tools/iceit/Unit1.dcu
+++ b/tools/iceit/Unit1.dcu
diff --git a/tools/iceit/Unit1.dfm b/tools/iceit/Unit1.dfm
index 668d8cab85..3f49727fd5 100644
--- a/tools/iceit/Unit1.dfm
+++ b/tools/iceit/Unit1.dfm
@@ -1,6 +1,6 @@
 object Form1: TForm1

-  Left = 0

-  Top = 0

+  Left = 242

+  Top = 134

   BorderIcons = [biSystemMenu, biMinimize]

   BorderStyle = bsSingle

   Caption = 'Miranda ICE Icon pack patcher | v.0.2.b'

@@ -199,9 +199,9 @@ object Form1: TForm1
   object Label2: TLabel

     Left = 8

     Top = 8

-    Width = 114

+    Width = 202

     Height = 13

-    Caption = 'Path to Miranda32.exe:'

+    Caption = 'Path to Miranda32.exe or Miranda64.exe:'

   end

   object CheckListBox1: TCheckListBox

     Left = 8

@@ -688,9 +688,9 @@ object Form1: TForm1
       000000000000}

   end

   object OpenDialog1: TOpenDialog

-    Filter = 'Miranda32.exe|Miranda32.exe'

+    Filter = 'Miranda*.exe|Miranda*.exe'

     InitialDir = '.'

-    Title = 'Path to Miranda32.exe'

+    Title = 'Path to Miranda32.exe or Miranda64.exe'

     Left = 86

     Top = 226

   end

diff --git a/tools/iceit/Unit1.pas b/tools/iceit/Unit1.pas
index db51542ebf..e7e0e9ca77 100644
--- a/tools/iceit/Unit1.pas
+++ b/tools/iceit/Unit1.pas
@@ -117,7 +117,7 @@ begin
   else

     List.Add(Format('  #%d', [LoWord(Cardinal(ResName))]));

 }

-  List.Add(Format('%d', [LoWord(Cardinal(ResName))]));    

+  List.Add(Format('%d', [LoWord(Cardinal(ResName))]));

   Result := 1;

 end;

 

@@ -246,7 +246,7 @@ function IsValidIcon(P: Pointer; Size: Cardinal): Boolean;
 {

 var

   ItemCount: Cardinal;

-}  

+}

 begin

   {

   Result := False;

@@ -425,7 +425,7 @@ begin
       S := LowerCase(S);

       if n < PluginsItem then F := '\icons' else F := '\plugins';

       StatusBar1.Panels[0].Text := ' Processing: ' + S;

-      if (S = 'miranda32') or (S = 'dbtool') then

+      if (S = 'miranda32') or (S = 'miranda64') then

       begin

         xFilePath := MirandaPath + '\' + S + '.exe';

         xIcoPath := IcePath + F + '\' + S + '\' + S;

@@ -455,14 +455,14 @@ begin
       if FileExists(xTemp) then DeleteFile(xTemp);

     end;

   end else begin

-    Edit1.Text := 'Enter path to Mirenda32.exe here or click this button ------>';

+    Edit1.Text := 'Enter path to Miranda*.exe here or click this button ------>';

     Edit1.SelectAll;

     Edit1.SetFocus;

   end;

   ProgressBar1.Position := 0;

   StatusBar1.Panels[0].Text := ' Ready';

   if FileSize(Log) = 0 then DeleteFile('iceit.log');

-  

+

 end;

 

 procedure TForm1.Button4Click(Sender: TObject);

diff --git a/tools/iceit/Utils.dcu b/tools/iceit/Utils.dcu
index e77133dc8c..f9502382c5 100644
--- a/tools/iceit/Utils.dcu
+++ b/tools/iceit/Utils.dcu