[iclect-commits] iclect/src/iclect AssemblyInfo.cs,1.3,1.4 iclect.csproj,1.7,1.8 KeyboardHelpForm.cs
Status: Beta
Brought to you by:
mhjp
Menu
▾
▴
[iclect-commits] iclect/src/iclect AssemblyInfo.cs,1.3,1.4 iclect.csproj,1.7,1.8 KeyboardHelpForm.cs,1.2,1.3 KeyboardHelpForm.resx,1.1,1.2 MainForm.cs,1.10,1.11
|
From: Michael P. <mh...@us...> - 2003-07-03 17:32:53
|
Update of /cvsroot/iclect/iclect/src/iclect
In directory sc8-pr-cvs1:/tmp/cvs-serv13903/src/iclect
Modified Files:
AssemblyInfo.cs iclect.csproj KeyboardHelpForm.cs
KeyboardHelpForm.resx MainForm.cs
Log Message:
Modified to run on both .NET Framework 1.0 and 1.1.
Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblyInfo.cs 27 Jun 2003 02:31:42 -0000 1.3
--- AssemblyInfo.cs 3 Jul 2003 17:32:49 -0000 1.4
***************
*** 8,14 ****
//
[assembly: AssemblyTitle("iclect - image selection utility")]
[assembly: AssemblyDescription("http://iclect.sourceforge.net")]
! [assembly: AssemblyConfiguration("")]
! [assembly: AssemblyCompany("iclect.sourceforge.net")]
[assembly: AssemblyProduct("iclect")]
[assembly: AssemblyCopyright("Copyright (c) 2003 Michael Poettgen")]
--- 8,22 ----
//
[assembly: AssemblyTitle("iclect - image selection utility")]
+ #if DEBUG
+ [assembly: AssemblyDescription("Debug Version!")]
+ [assembly: AssemblyConfiguration("debug")]
+ #elif DOC
+ [assembly: AssemblyDescription("Doc Version!")]
+ [assembly: AssemblyConfiguration("doc")]
+ #else
[assembly: AssemblyDescription("http://iclect.sourceforge.net")]
! [assembly: AssemblyConfiguration("release")]
! #endif
! [assembly: AssemblyCompany("The iclect project at SourceForge.net. See http://iclect.sourceforge.net")]
[assembly: AssemblyProduct("iclect")]
[assembly: AssemblyCopyright("Copyright (c) 2003 Michael Poettgen")]
Index: iclect.csproj
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/iclect.csproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** iclect.csproj 3 Jul 2003 14:14:57 -0000 1.7
--- iclect.csproj 3 Jul 2003 17:32:49 -0000 1.8
***************
*** 139,144 ****
/>
<File
RelPath = "App.ico"
! BuildAction = "Content"
/>
<File
--- 139,148 ----
/>
<File
+ RelPath = "app.config"
+ BuildAction = "None"
+ />
+ <File
RelPath = "App.ico"
! BuildAction = "None"
/>
<File
Index: KeyboardHelpForm.cs
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/KeyboardHelpForm.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeyboardHelpForm.cs 29 Jun 2003 00:50:13 -0000 1.2
--- KeyboardHelpForm.cs 3 Jul 2003 17:32:50 -0000 1.3
***************
*** 60,64 ****
// buttonOK
//
! this.buttonOK.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.buttonOK.Location = new System.Drawing.Point(336, 400);
--- 60,64 ----
// buttonOK
//
! this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.buttonOK.Location = new System.Drawing.Point(336, 400);
***************
*** 69,80 ****
// richTextBox
//
! this.richTextBox.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
! | System.Windows.Forms.AnchorStyles.Right);
this.richTextBox.BackColor = System.Drawing.SystemColors.Control;
this.richTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.richTextBox.Name = "richTextBox";
this.richTextBox.ReadOnly = true;
! this.richTextBox.Size = new System.Drawing.Size(432, 400);
this.richTextBox.TabIndex = 1;
this.richTextBox.Text = "(Contents comes from Help.rtf)";
--- 69,81 ----
// richTextBox
//
! this.richTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
! | System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox.BackColor = System.Drawing.SystemColors.Control;
this.richTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.richTextBox.Location = new System.Drawing.Point(16, 8);
this.richTextBox.Name = "richTextBox";
this.richTextBox.ReadOnly = true;
! this.richTextBox.Size = new System.Drawing.Size(400, 392);
this.richTextBox.TabIndex = 1;
this.richTextBox.Text = "(Contents comes from Help.rtf)";
***************
*** 85,92 ****
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
this.ClientSize = new System.Drawing.Size(432, 429);
! this.Controls.AddRange(new System.Windows.Forms.Control[] {
! this.buttonOK,
! this.richTextBox});
this.Name = "KeyboardHelpForm";
this.Text = "Keyboard Help - iclect";
this.ResumeLayout(false);
--- 86,93 ----
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
this.ClientSize = new System.Drawing.Size(432, 429);
! this.Controls.Add(this.buttonOK);
! this.Controls.Add(this.richTextBox);
this.Name = "KeyboardHelpForm";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Keyboard Help - iclect";
this.ResumeLayout(false);
Index: KeyboardHelpForm.resx
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/KeyboardHelpForm.resx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** KeyboardHelpForm.resx 27 Jun 2003 02:31:42 -0000 1.1
--- KeyboardHelpForm.resx 3 Jul 2003 17:32:50 -0000 1.2
***************
*** 2,61 ****
<root>
<!--
! Microsoft ResX Schema
!
! Version 1.3
! The primary goals of this format is to allow a simple XML format
! that is mostly human readable. The generation and parsing of the
! various data types are done through the TypeConverter classes
! associated with the data types.
!
! Example:
!
! ... ado.net/XML headers & schema ...
! <resheader name="resmimetype">text/microsoft-resx</resheader>
! <resheader name="version">1.3</resheader>
! <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
! <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
! <data name="Name1">this is my long string</data>
! <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
! <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
! [base64 mime encoded serialized .NET Framework object]
! </data>
! <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
! [base64 mime encoded string representing a byte array form of the .NET Framework object]
! </data>
!
! There are any number of "resheader" rows that contain simple
! name/value pairs.
!
! Each data row contains a name, and value. The row also contains a
! type or mimetype. Type corresponds to a .NET class that support
! text/value conversion through the TypeConverter architecture.
! Classes that don't support this are serialized and stored with the
! mimetype set.
!
! The mimetype is used for serialized objects, and tells the
! ResXResourceReader how to depersist the object. This is currently not
! extensible. For a given mimetype the value must be set accordingly:
!
! Note - application/x-microsoft.net.object.binary.base64 is the format
! that the ResXResourceWriter will generate, however the reader can
! read any of the formats listed below.
!
! mimetype: application/x-microsoft.net.object.binary.base64
! value : The object must be serialized with
! : System.Serialization.Formatters.Binary.BinaryFormatter
! : and then encoded with base64 encoding.
!
! mimetype: application/x-microsoft.net.object.soap.base64
! value : The object must be serialized with
! : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
! : and then encoded with base64 encoding.
! mimetype: application/x-microsoft.net.object.bytearray.base64
! value : The object must be serialized into a byte array
! : using a System.ComponentModel.TypeConverter
! : and then encoded with base64 encoding.
! -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
--- 2,62 ----
<root>
<!--
! Microsoft ResX Schema
!
! Version 1.3
!
! The primary goals of this format is to allow a simple XML format
! that is mostly human readable. The generation and parsing of the
! various data types are done through the TypeConverter classes
! associated with the data types.
!
! Example:
!
! ... ado.net/XML headers & schema ...
! <resheader name="resmimetype">text/microsoft-resx</resheader>
! <resheader name="version">1.3</resheader>
! <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
! <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
! <data name="Name1">this is my long string</data>
! <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
! <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
! [base64 mime encoded serialized .NET Framework object]
! </data>
! <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
! [base64 mime encoded string representing a byte array form of the .NET Framework object]
! </data>
! There are any number of "resheader" rows that contain simple
! name/value pairs.
!
! Each data row contains a name, and value. The row also contains a
! type or mimetype. Type corresponds to a .NET class that support
! text/value conversion through the TypeConverter architecture.
! Classes that don't support this are serialized and stored with the
! mimetype set.
!
! The mimetype is used forserialized objects, and tells the
! ResXResourceReader how to depersist the object. This is currently not
! extensible. For a given mimetype the value must be set accordingly:
!
! Note - application/x-microsoft.net.object.binary.base64 is the format
! that the ResXResourceWriter will generate, however the reader can
! read any of the formats listed below.
!
! mimetype: application/x-microsoft.net.object.binary.base64
! value : The object must be serialized with
! : System.Serialization.Formatters.Binary.BinaryFormatter
! : and then encoded with base64 encoding.
!
! mimetype: application/x-microsoft.net.object.soap.base64
! value : The object must be serialized with
! : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
! : and then encoded with base64 encoding.
!
! mimetype: application/x-microsoft.net.object.bytearray.base64
! value : The object must be serialized into a byte array
! : using a System.ComponentModel.TypeConverter
! : and then encoded with base64 encoding.
! -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
***************
*** 92,102 ****
</resheader>
<resheader name="reader">
! <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
! <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="$this.Name">
<value>KeyboardHelpForm</value>
</data>
</root>
--- 93,148 ----
</resheader>
<resheader name="reader">
! <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
! <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <data name="buttonOK.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="buttonOK.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="buttonOK.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="richTextBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="richTextBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="richTextBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>(Default)</value>
+ </data>
+ <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>8, 8</value>
+ </data>
+ <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </data>
+ <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>80</value>
+ </data>
<data name="$this.Name">
<value>KeyboardHelpForm</value>
+ </data>
+ <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </data>
+ <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
</data>
</root>
Index: MainForm.cs
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/MainForm.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MainForm.cs 3 Jul 2003 14:31:45 -0000 1.10
--- MainForm.cs 3 Jul 2003 17:32:50 -0000 1.11
***************
*** 502,506 ****
while (true)
{
! FolderBrowserDialog dlg = new FolderBrowserDialog();
dlg.ShowNewFolderButton = true;
dlg.SelectedPath = selectedFolder;
--- 502,506 ----
while (true)
{
! iclect.Forms.Utility.FolderBrowserDialog dlg = new iclect.Forms.Utility.FolderBrowserDialog();
dlg.ShowNewFolderButton = true;
dlg.SelectedPath = selectedFolder;
|
