From 00d0b7bcbcd109f7fac39f2b082439e75fa21d31 Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Fri, 24 Apr 2009 10:19:40 +0000
Subject: [PATCH] * fixed column min. widths * modified release script to make
 it easier to debug PH

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@1137 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 trunk/ProcessHacker/Build/release.cmd    | 26 ++++++++++++++++--------
 trunk/ProcessHacker/UI/ColumnSettings.cs |  1 +
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/trunk/ProcessHacker/Build/release.cmd b/trunk/ProcessHacker/Build/release.cmd
index 96d617d2f..c253a7b63 100644
--- a/trunk/ProcessHacker/Build/release.cmd
+++ b/trunk/ProcessHacker/Build/release.cmd
@@ -14,7 +14,7 @@ FOR %%a IN (
 
 :: Clear older files present in "Release" folder
 DEL/f/a "ProcessHacker.exe.config" "processhacker-*-setup.exe"^
- "ProcessHacker_in.exe" "processhacker-bin.zip" >NUL 2>&1
+ "ProcessHacker_in.exe" "Assistant_in.exe" "processhacker-bin.zip" >NUL 2>&1
 
 :: Check if ILMerge is present in the default installation location or in PATH
 SET ILMergePath="%PROGRAMFILES%\Microsoft\ILMerge\ILMerge.exe"
@@ -27,19 +27,16 @@ REN "ProcessHacker.exe" "ProcessHacker_in.exe"^
  && REN "Assistant.exe" "Assistant_in.exe"
 ECHO.
 
-:: Merge "ProcessHacker.Native.dll" with "Assistant.exe"
+:: Merge "ProcessHacker.Native.dll" with "Assistant.exe" (just for the installer + zip)
 %ILMergePath% /t:winexe /out:"Assistant.exe" "Assistant_in.exe"^
  "ProcessHacker.Native.dll"^
  && ECHO:ProcessHacker.Native.dll merged successfully with Assistant.exe!
 
-:: Merge "Aga.Controls.dll" with "ProcessHacker.exe" using ILMerge
+:: Merge "Aga.Controls.dll" with "ProcessHacker.exe" using ILMerge (just for the installer + zip)
 %ILMergePath% /t:winexe /out:"ProcessHacker.exe" "ProcessHacker_in.exe"^
  "ProcessHacker.Native.dll" "Aga.Controls.dll"^
  && ECHO:Aga.Controls.dll merged successfully with ProcessHacker.exe!
 
-DEL/f/a "ProcessHacker_in.exe" "Assistant_in.exe" "Aga.Controls.dll"^
- "ProcessHacker.Native.dll" >NUL 2>&1
-
 :: Set the path of Inno Setup and compile installer
 SET "U_=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
 SET "I_=Inno Setup"
@@ -54,14 +51,27 @@ IF DEFINED InnoSetupPath ("%InnoSetupPath%\iscc.exe" /Q /O"..\..\bin\Release"^
 	ECHO:Installer compiled successfully!)) ELSE (ECHO:%M_%)
 
 :CLEANUP
-:: Clean up the .pdb files in "Release" folder
-DEL /f/a/q *.pdb >NUL 2>&1
+:: Move the pdb files somewhere else for now (just for the zip creation)
+MKDIR pdb
+MOVE *.pdb pdb\
 
 :: ZIP the binaries
 IF NOT DEFINED N_ (START "" /B /WAIT "..\..\Build\7za\7za.exe" a -tzip^
  "processhacker-bin.zip" "*" -x!*setup.exe -mx=9 >NUL&&(
 	ECHO:ZIP created successfully!))
 
+:: Move the pdb files back
+MOVE pdb\*.pdb .\
+RMDIR pdb
+
+:: Delete the merged files
+DEL "ProcessHacker.exe"
+DEL "Assistant.exe"
+
+:: Rename the _in.exe files back
+REN "ProcessHacker_in.exe" "ProcessHacker.exe"
+REN "Assistant_in.exe" "Assistant.exe"
+
 :END
 GOTO :EOF
 
diff --git a/trunk/ProcessHacker/UI/ColumnSettings.cs b/trunk/ProcessHacker/UI/ColumnSettings.cs
index 9537074ba..3db72895b 100644
--- a/trunk/ProcessHacker/UI/ColumnSettings.cs
+++ b/trunk/ProcessHacker/UI/ColumnSettings.cs
@@ -132,6 +132,7 @@ namespace ProcessHacker.UI
                     newColumns[i] = new TreeColumn(s[0], Int32.Parse(s[1]));
                     newColumns[i].SortOrder = (SortOrder)Enum.Parse(typeof(SortOrder), s[2]);
                     newColumns[i].IsVisible = bool.Parse(s[3]);
+                    newColumns[i].MinColumnWidth = 3;
                     newColumnsD.Add(s[0], newColumns[i]);
                 }