From b97727e23c3dc5635f3ee1adb026e613d4062581 Mon Sep 17 00:00:00 2001 From: Javier Castillo Date: Tue, 5 Apr 2011 19:40:30 +0200 Subject: FIX: Druckereintellung (RZ und UB2) Signed-off-by: Javier Castillo --- AccountValue.suo | Bin 51200 -> 53248 bytes AccountValue/DEVICES.XML | 24 +++++++-------- AccountValue/Form1.cs | 34 +++++++++++++++------ AccountValue/Form2.cs | 2 +- AccountValue/bin/Release/AccountValue.exe | Bin 329728 -> 329728 bytes AccountValue/bin/Release/AccountValue.pdb | Bin 79360 -> 60928 bytes .../bin/Release/Interop.IWshRuntimeLibrary.dll | Bin 49152 -> 49152 bytes AccountValue/bin/Release/Interop.SHDocVw.dll | Bin 139264 -> 139264 bytes .../AccountValue.Properties.Resources.resources | Bin 2745 -> 2745 bytes .../AccountValue.csproj.GenerateResource.Cache | Bin 1054 -> 1054 bytes .../AccountValue.csproj.ResolveComReference.cache | Bin 593 -> 593 bytes AccountValue/obj/Release/AccountValue.exe | Bin 329728 -> 329728 bytes AccountValue/obj/Release/AccountValue.pdb | Bin 79360 -> 60928 bytes .../obj/Release/Interop.IWshRuntimeLibrary.dll | Bin 49152 -> 49152 bytes AccountValue/obj/Release/Interop.SHDocVw.dll | Bin 139264 -> 139264 bytes 15 files changed, 37 insertions(+), 23 deletions(-) diff --git a/AccountValue.suo b/AccountValue.suo index 0275adb..ae00fad 100644 Binary files a/AccountValue.suo and b/AccountValue.suo differ diff --git a/AccountValue/DEVICES.XML b/AccountValue/DEVICES.XML index 3883ff9..53aa961 100644 --- a/AccountValue/DEVICES.XML +++ b/AccountValue/DEVICES.XML @@ -3,19 +3,19 @@ - - + + - - + + - + - + @@ -23,23 +23,23 @@ - - + + - - + + - + - + diff --git a/AccountValue/Form1.cs b/AccountValue/Form1.cs index 5d5170c..8472718 100644 --- a/AccountValue/Form1.cs +++ b/AccountValue/Form1.cs @@ -277,7 +277,8 @@ namespace AccountValue try { oNetDrive.LocalDrive = ""; - oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de"; + //oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de"; + oNetDrive.ShareName = "\\\\pub-ps03.public.ads.uni-freiburg.de"; oNetDrive.MapDrive("PUBLIC\\" + textBox1.Text, maskedTextBox1.Text); } catch @@ -291,40 +292,52 @@ namespace AccountValue { try { + // Installiere RZ-MONO System.Diagnostics.ProcessStartInfo sendInfo; sendInfo = new System.Diagnostics.ProcessStartInfo("cscript"); sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden; if (myOS == "WinXP") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz01"; if (myOS == "WinVista" || myOS == "Win7") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps1"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz01"; System.Diagnostics.Process.Start(sendInfo); sendInfo = null; + // Installiere RZ-FARBE sendInfo = new System.Diagnostics.ProcessStartInfo("cscript"); sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden; if (myOS == "WinXP") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz02"; if (myOS == "WinVista" || myOS == "Win7") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\rzps2"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\rz02"; System.Diagnostics.Process.Start(sendInfo); sendInfo = null; + // Installiere UB2-MONO sendInfo = new System.Diagnostics.ProcessStartInfo("cscript"); sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden; if (myOS == "WinXP") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub201"; if (myOS == "WinVista" || myOS == "Win7") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps1"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub201"; System.Diagnostics.Process.Start(sendInfo); sendInfo = null; + // Installiere UB2-FARBE sendInfo = new System.Diagnostics.ProcessStartInfo("cscript"); sendInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden; if (myOS == "WinXP") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub202"; if (myOS == "WinVista" || myOS == "Win7") - sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2"; + //sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps01.public.ads.uni-freiburg.de\\ubps2"; + sendInfo.Arguments = "C:\\WINDOWS\\system32\\printing_admin_scripts\\de-DE\\prnmngr.vbs -ac -p " + "\\\\pub-ps03.public.ads.uni-freiburg.de\\ub202"; System.Diagnostics.Process.Start(sendInfo); sendInfo = null; } @@ -339,7 +352,8 @@ namespace AccountValue try { oNetDrive.LocalDrive = ""; - oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de"; + //oNetDrive.ShareName = "\\\\pub-ps01.public.ads.uni-freiburg.de"; + oNetDrive.ShareName = "\\\\pub-ps03.public.ads.uni-freiburg.de"; oNetDrive.MapDrive("PUBLIC\\" + textBox1.Text, maskedTextBox1.Text); } catch diff --git a/AccountValue/Form2.cs b/AccountValue/Form2.cs index 24c4bf8..34d06b3 100644 --- a/AccountValue/Form2.cs +++ b/AccountValue/Form2.cs @@ -29,7 +29,7 @@ namespace AccountValue public partial class Form2 : Form { private DragExtender dragExtender1; - private String version = "0.5.0"; + private String version = "0.5.1"; /* * */ diff --git a/AccountValue/bin/Release/AccountValue.exe b/AccountValue/bin/Release/AccountValue.exe index a27fc8f..52e6098 100644 Binary files a/AccountValue/bin/Release/AccountValue.exe and b/AccountValue/bin/Release/AccountValue.exe differ diff --git a/AccountValue/bin/Release/AccountValue.pdb b/AccountValue/bin/Release/AccountValue.pdb index 1b001a1..d2d78a3 100644 Binary files a/AccountValue/bin/Release/AccountValue.pdb and b/AccountValue/bin/Release/AccountValue.pdb differ diff --git a/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll b/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll index 1398633..8a2cac8 100644 Binary files a/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll and b/AccountValue/bin/Release/Interop.IWshRuntimeLibrary.dll differ diff --git a/AccountValue/bin/Release/Interop.SHDocVw.dll b/AccountValue/bin/Release/Interop.SHDocVw.dll index 51c27d4..9396fbd 100644 Binary files a/AccountValue/bin/Release/Interop.SHDocVw.dll and b/AccountValue/bin/Release/Interop.SHDocVw.dll differ diff --git a/AccountValue/obj/Release/AccountValue.Properties.Resources.resources b/AccountValue/obj/Release/AccountValue.Properties.Resources.resources index 259ee4a..1aa9122 100644 Binary files a/AccountValue/obj/Release/AccountValue.Properties.Resources.resources and b/AccountValue/obj/Release/AccountValue.Properties.Resources.resources differ diff --git a/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache b/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache index ba0c099..98354a4 100644 Binary files a/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache and b/AccountValue/obj/Release/AccountValue.csproj.GenerateResource.Cache differ diff --git a/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache b/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache index 8651e3d..3a9f25f 100644 Binary files a/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache and b/AccountValue/obj/Release/AccountValue.csproj.ResolveComReference.cache differ diff --git a/AccountValue/obj/Release/AccountValue.exe b/AccountValue/obj/Release/AccountValue.exe index a27fc8f..52e6098 100644 Binary files a/AccountValue/obj/Release/AccountValue.exe and b/AccountValue/obj/Release/AccountValue.exe differ diff --git a/AccountValue/obj/Release/AccountValue.pdb b/AccountValue/obj/Release/AccountValue.pdb index 1b001a1..d2d78a3 100644 Binary files a/AccountValue/obj/Release/AccountValue.pdb and b/AccountValue/obj/Release/AccountValue.pdb differ diff --git a/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll b/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll index 1398633..8a2cac8 100644 Binary files a/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll and b/AccountValue/obj/Release/Interop.IWshRuntimeLibrary.dll differ diff --git a/AccountValue/obj/Release/Interop.SHDocVw.dll b/AccountValue/obj/Release/Interop.SHDocVw.dll index 51c27d4..9396fbd 100644 Binary files a/AccountValue/obj/Release/Interop.SHDocVw.dll and b/AccountValue/obj/Release/Interop.SHDocVw.dll differ -- cgit v1.2.3-55-g7522