- iceit patcher restructuring (not working yet)

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

10 files changed, 33 insertions, 36 deletions

diff --git a/tools/iceit/Project1.bdsproj b/tools/iceit/IceIt.bdsproj
index 90f6d50082..fb825853ff 100644
--- a/tools/iceit/Project1.bdsproj
+++ b/tools/iceit/IceIt.bdsproj
@@ -10,7 +10,7 @@
 	</PersonalityInfo>

 	<Delphi.Personality>

 		<Source>

-			<Source Name="MainSource">Project1.dpr</Source>

+			<Source Name="MainSource">IceIt.dpr</Source>

 		</Source>

 		<FileVersion>

 			<FileVersion Name="Version">7.0</FileVersion>

diff --git a/tools/iceit/Project1.cfg b/tools/iceit/IceIt.cfg
index 367c22269e..367c22269e 100644
--- a/tools/iceit/Project1.cfg
+++ b/tools/iceit/IceIt.cfg
diff --git a/tools/iceit/Project1.dpr b/tools/iceit/IceIt.dpr
index 08b344c5f1..7697436f63 100644
--- a/tools/iceit/Project1.dpr
+++ b/tools/iceit/IceIt.dpr
@@ -1,4 +1,4 @@
-program Project1;

+program IceIt;

 

 uses

   Forms,

diff --git a/tools/iceit/Project1.res b/tools/iceit/IceIt.res
index 20b614bff8..20b614bff8 100644
--- a/tools/iceit/Project1.res
+++ b/tools/iceit/IceIt.res
diff --git a/tools/iceit/Project1.bdsproj.local b/tools/iceit/Project1.bdsproj.local
deleted file mode 100644
index 5153b9a118..0000000000
--- a/tools/iceit/Project1.bdsproj.local
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<BorlandProject>

-	<Transactions>

-    <Transaction>2007.08.24 16:31:46.093.pas,C:\Documents and Settings\induction\Мои документы\Borland Studio Projects\Unit1.pas=C:\ARHIV\PROG\ICERES\Unit1.pas</Transaction>

-    <Transaction>2007.08.24 16:31:46.093.dfm,C:\Documents and Settings\induction\Мои документы\Borland Studio Projects\Unit1.dfm=C:\ARHIV\PROG\ICERES\Unit1.dfm</Transaction>

-    <Transaction>2007.08.24 16:31:50.359.bdsproj,C:\Documents and Settings\induction\Мои документы\Borland Studio Projects\Project1.bdsproj=C:\ARHIV\PROG\ICERES\Project1.bdsproj</Transaction>

-  </Transactions>

-</BorlandProject>

diff --git a/tools/iceit/Project1.identcache b/tools/iceit/Project1.identcache
deleted file mode 100644
index db63ec0c60..0000000000
--- a/tools/iceit/Project1.identcache
+++ /dev/null
diff --git a/tools/iceit/Unit1.dfm b/tools/iceit/Unit1.dfm
index 3f49727fd5..91147e662c 100644
--- a/tools/iceit/Unit1.dfm
+++ b/tools/iceit/Unit1.dfm
@@ -215,32 +215,32 @@ object Form1: TForm1
     TabOrder = 0

     OnDrawItem = CheckListBox1DrawItem

   end

-  object Button1: TButton

+  object btnSelectAll: TButton

     Left = 8

     Top = 270

     Width = 75

     Height = 25

     Caption = 'Select All'

     TabOrder = 1

-    OnClick = Button1Click

+    OnClick = SelectAllClick

   end

-  object Button2: TButton

+  object btnSelectNone: TButton

     Left = 89

     Top = 270

     Width = 75

     Height = 25

     Caption = 'Nothing'

     TabOrder = 2

-    OnClick = Button2Click

+    OnClick = SelectNoneClick

   end

-  object Button3: TButton

+  object btnIceIt: TButton

     Left = 253

     Top = 270

     Width = 75

     Height = 25

     Caption = 'ICE It...'

     TabOrder = 3

-    OnClick = Button3Click

+    OnClick = IceItClick

   end

   object StatusBar1: TStatusBar

     Left = 0

@@ -267,14 +267,14 @@ object Form1: TForm1
     Height = 21

     TabOrder = 6

   end

-  object Button4: TButton

+  object btnMirandaPath: TButton

     Left = 307

     Top = 23

     Width = 20

     Height = 22

     Caption = '...'

     TabOrder = 7

-    OnClick = Button4Click

+    OnClick = MirandaPathClick

   end

   object XPManifest1: TXPManifest

     Left = 54

diff --git a/tools/iceit/Unit1.pas b/tools/iceit/Unit1.pas
index 6493615a1c..e49f9f40d8 100644
--- a/tools/iceit/Unit1.pas
+++ b/tools/iceit/Unit1.pas
@@ -12,22 +12,22 @@ type
     ImageList1: TImageList;

     CheckListBox1: TCheckListBox;

     Label1: TLabel;

-    Button1: TButton;

-    Button2: TButton;

-    Button3: TButton;

+    btnSelectAll: TButton;

+    btnSelectNone: TButton;

+    btnIceIt: TButton;

+    btnMirandaPath: TButton;

     StatusBar1: TStatusBar;

     ProgressBar1: TProgressBar;

     Edit1: TEdit;

     Label2: TLabel;

-    Button4: TButton;

     OpenDialog1: TOpenDialog;

     procedure CheckListBox1DrawItem(Control: TWinControl; Index: Integer;

       Rect: TRect; State: TOwnerDrawState);

     procedure FormCreate(Sender: TObject);

-    procedure Button1Click(Sender: TObject);

-    procedure Button2Click(Sender: TObject);

-    procedure Button4Click(Sender: TObject);

-    procedure Button3Click(Sender: TObject);

+    procedure SelectAllClick(Sender: TObject);

+    procedure SelectNoneClick(Sender: TObject);

+    procedure IceItClick(Sender: TObject);

+    procedure MirandaPathClick(Sender: TObject);

     procedure FormDestroy(Sender: TObject);

   private

     { Private declarations }

@@ -380,25 +380,27 @@ begin
   end;

 end;

 

-procedure TForm1.Button1Click(Sender: TObject);

+procedure TForm1.SelectAllClick(Sender: TObject);

 var n: Integer;

 begin

   for n := 0 to CheckListBox1.Items.Count - 1 do

+  begin

     CheckListBox1.Items[n] := SetValue(CheckListBox1.Items[n], 1, 'NONE');

-  for n := 0 to CheckListBox1.Items.Count - 1 do

-  CheckListBox1.Checked[n] := True;

+    CheckListBox1.Checked[n] := True;

+  end;

 end;

 

-procedure TForm1.Button2Click(Sender: TObject);

+procedure TForm1.SelectNoneClick(Sender: TObject);

 var n: Integer;

 begin

   for n := 0 to CheckListBox1.Items.Count - 1 do

+  begin

     CheckListBox1.Items[n] := SetValue(CheckListBox1.Items[n], 1, 'NONE');

-  for n := 0 to CheckListBox1.Items.Count - 1 do

     CheckListBox1.Checked[n] := False;

+  end;

 end;

 

-procedure TForm1.Button3Click(Sender: TObject);

+procedure TForm1.IceItClick(Sender: TObject);

 var

   n: Integer;

   S: String;

@@ -426,8 +428,11 @@ begin
         ProgressBar1.Position := n;

         S := GetValue(CheckListBox1.Items[n], 0);

         S := LowerCase(S);

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

-        if n < CoreItem then F := '\plugins' else  F := '\core';

+        // keep the order as for FillCombo function (atm Core<Plugins<Icons)

+        if      n < PluginsItem then F := '\core'

+        else if n < IconsItem   then F := '\plugins'

+        else                         F := '\icons';

+

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

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

         begin

@@ -452,7 +457,7 @@ begin
           xTemp := xFilePath + '.temp';

           CopyFile(PChar(xFilePath), Pchar(xTemp), False);

 

-          if ProgressUpdate(xTemp, xIcoPath) then

+          if not ProgressUpdate(xTemp, xIcoPath) then

             res := 'ERROR'

           else

           begin

@@ -476,7 +481,7 @@ begin
   StatusBar1.Panels[0].Text := ' Ready';

 end;

 

-procedure TForm1.Button4Click(Sender: TObject);

+procedure TForm1.MirandaPathClick(Sender: TObject);

 begin

   if OpenDialog1.Execute then Edit1.Text := OpenDialog1.FileName;

 end;

diff --git a/tools/iceit/Utils.dcu b/tools/iceit/Utils.dcu
deleted file mode 100644
index f9502382c5..0000000000
--- a/tools/iceit/Utils.dcu
+++ /dev/null
diff --git a/tools/iceit/bin/iceit.exe b/tools/iceit/bin/iceit.exe
index 06f83c7e89..5b46ccba5e 100644
--- a/tools/iceit/bin/iceit.exe
+++ b/tools/iceit/bin/iceit.exe