[iclect-commits] iclect/src/iclect AboutDialog.cs,1.3,1.4 AboutDialog.resx,1.3,1.4 MainForm.cs,1.13,
Status: Beta
Brought to you by:
mhjp
|
From: Michael P. <mh...@us...> - 2003-07-06 21:13:52
|
Update of /cvsroot/iclect/iclect/src/iclect
In directory sc8-pr-cvs1:/tmp/cvs-serv3082/src/iclect
Modified Files:
AboutDialog.cs AboutDialog.resx MainForm.cs MainForm.resx
Log Message:
no message
Index: AboutDialog.cs
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/AboutDialog.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AboutDialog.cs 4 Jul 2003 14:49:53 -0000 1.3
--- AboutDialog.cs 6 Jul 2003 21:13:50 -0000 1.4
***************
*** 15,24 ****
{
private System.Windows.Forms.Button buttonOK;
- private System.Windows.Forms.Label labelVersion;
private System.Windows.Forms.PictureBox icon;
private System.Windows.Forms.RichTextBox richTextBox;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.LinkLabel linkLabel;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label labelRuntime;
/// <summary>
--- 15,25 ----
{
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.PictureBox icon;
private System.Windows.Forms.RichTextBox richTextBox;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.LinkLabel linkProjectHomepage;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label labelAssembly;
private System.Windows.Forms.Label labelRuntime;
/// <summary>
***************
*** 38,42 ****
richTextBox.LoadFile(stream, RichTextBoxStreamType.RichText);
! linkLabel.Links[0].LinkData = "http://iclect.sourceforge.net";
}
--- 39,43 ----
richTextBox.LoadFile(stream, RichTextBoxStreamType.RichText);
! linkProjectHomepage.Links[0].LinkData = "http://iclect.sourceforge.net";
}
***************
*** 65,75 ****
System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(AboutDialog));
this.buttonOK = new System.Windows.Forms.Button();
! this.labelVersion = new System.Windows.Forms.Label();
this.icon = new System.Windows.Forms.PictureBox();
this.richTextBox = new System.Windows.Forms.RichTextBox();
this.label2 = new System.Windows.Forms.Label();
! this.linkLabel = new System.Windows.Forms.LinkLabel();
this.label1 = new System.Windows.Forms.Label();
this.labelRuntime = new System.Windows.Forms.Label();
this.SuspendLayout();
//
--- 66,77 ----
System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(AboutDialog));
this.buttonOK = new System.Windows.Forms.Button();
! this.labelAssembly = new System.Windows.Forms.Label();
this.icon = new System.Windows.Forms.PictureBox();
this.richTextBox = new System.Windows.Forms.RichTextBox();
this.label2 = new System.Windows.Forms.Label();
! this.linkProjectHomepage = new System.Windows.Forms.LinkLabel();
this.label1 = new System.Windows.Forms.Label();
this.labelRuntime = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
***************
*** 83,95 ****
this.buttonOK.Text = "OK";
//
! // labelVersion
//
! this.labelVersion.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
! this.labelVersion.Location = new System.Drawing.Point(168, 320);
! this.labelVersion.Name = "labelVersion";
! this.labelVersion.Size = new System.Drawing.Size(176, 16);
! this.labelVersion.TabIndex = 1;
! this.labelVersion.Text = "Version";
//
// icon
--- 85,97 ----
this.buttonOK.Text = "OK";
//
! // labelAssembly
//
! this.labelAssembly.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
! this.labelAssembly.Location = new System.Drawing.Point(168, 320);
! this.labelAssembly.Name = "labelAssembly";
! this.labelAssembly.Size = new System.Drawing.Size(176, 16);
! this.labelAssembly.TabIndex = 1;
! this.labelAssembly.Text = "Version";
//
// icon
***************
*** 127,142 ****
this.label2.Text = "Assembly Version:";
//
! // linkLabel
//
! this.linkLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
! this.linkLabel.LinkArea = new System.Windows.Forms.LinkArea(22, 22);
! this.linkLabel.Location = new System.Drawing.Point(64, 304);
! this.linkLabel.Name = "linkLabel";
! this.linkLabel.Size = new System.Drawing.Size(280, 16);
! this.linkLabel.TabIndex = 5;
! this.linkLabel.TabStop = true;
! this.linkLabel.Text = "Project home page: iclect.sourceforge.net";
! this.linkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnClickedHomepage);
//
// label1
--- 129,144 ----
this.label2.Text = "Assembly Version:";
//
! // linkProjectHomepage
//
! this.linkProjectHomepage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
! this.linkProjectHomepage.LinkArea = new System.Windows.Forms.LinkArea(0, 29);
! this.linkProjectHomepage.Location = new System.Drawing.Point(168, 304);
! this.linkProjectHomepage.Name = "linkProjectHomepage";
! this.linkProjectHomepage.Size = new System.Drawing.Size(176, 16);
! this.linkProjectHomepage.TabIndex = 5;
! this.linkProjectHomepage.TabStop = true;
! this.linkProjectHomepage.Text = "http://iclect.sourceforge.net";
! this.linkProjectHomepage.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnClickedHomepage);
//
// label1
***************
*** 160,163 ****
--- 162,175 ----
this.labelRuntime.Text = "Version";
//
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label3.Location = new System.Drawing.Point(64, 304);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(104, 16);
+ this.label3.TabIndex = 4;
+ this.label3.Text = "Project Homepage:";
+ //
// AboutDialog
//
***************
*** 166,177 ****
this.CancelButton = this.buttonOK;
this.ClientSize = new System.Drawing.Size(450, 359);
! this.Controls.Add(this.linkLabel);
this.Controls.Add(this.richTextBox);
this.Controls.Add(this.icon);
this.Controls.Add(this.buttonOK);
! this.Controls.Add(this.labelVersion);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.labelRuntime);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
--- 178,190 ----
this.CancelButton = this.buttonOK;
this.ClientSize = new System.Drawing.Size(450, 359);
! this.Controls.Add(this.linkProjectHomepage);
this.Controls.Add(this.richTextBox);
this.Controls.Add(this.icon);
this.Controls.Add(this.buttonOK);
! this.Controls.Add(this.labelAssembly);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.labelRuntime);
+ this.Controls.Add(this.label3);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
***************
*** 192,196 ****
ProcessModule main = proc.MainModule;
FileVersionInfo info = main.FileVersionInfo;
! this.labelVersion.Text = info.ProductVersion;
Assembly assembly = Assembly.GetAssembly(typeof(Assembly));
--- 205,209 ----
ProcessModule main = proc.MainModule;
FileVersionInfo info = main.FileVersionInfo;
! this.labelAssembly.Text = info.ProductVersion;
Assembly assembly = Assembly.GetAssembly(typeof(Assembly));
Index: AboutDialog.resx
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/AboutDialog.resx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AboutDialog.resx 4 Jul 2003 14:49:53 -0000 1.3
--- AboutDialog.resx 6 Jul 2003 21:13:50 -0000 1.4
***************
*** 107,117 ****
<value>Private</value>
</data>
! <data name="labelVersion.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</data>
! <data name="labelVersion.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
! <data name="labelVersion.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
--- 107,117 ----
<value>Private</value>
</data>
! <data name="labelAssembly.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</data>
! <data name="labelAssembly.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
! <data name="labelAssembly.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
***************
*** 157,167 ****
<value>Private</value>
</data>
! <data name="linkLabel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
! <data name="linkLabel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
! <data name="linkLabel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</data>
--- 157,167 ----
<value>Private</value>
</data>
! <data name="linkProjectHomepage.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
! <data name="linkProjectHomepage.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
! <data name="linkProjectHomepage.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</data>
***************
*** 182,185 ****
--- 182,194 ----
</data>
<data name="labelRuntime.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="label3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="label3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="label3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
Index: MainForm.cs
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/MainForm.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MainForm.cs 4 Jul 2003 23:49:53 -0000 1.13
--- MainForm.cs 6 Jul 2003 21:13:50 -0000 1.14
***************
*** 50,53 ****
--- 50,55 ----
private System.Windows.Forms.StatusBarPanel statusBarText;
private System.Windows.Forms.StatusBarPanel statusBarCount;
+ private System.Windows.Forms.StatusBarPanel statusBarSelected;
+ private System.Windows.Forms.StatusBarPanel statusBarPosition;
string _title;
***************
*** 121,128 ****
--- 123,134 ----
this.panelTop = new System.Windows.Forms.Panel();
this.panelCenter = new System.Windows.Forms.Panel();
+ this.statusBarSelected = new System.Windows.Forms.StatusBarPanel();
+ this.statusBarPosition = new System.Windows.Forms.StatusBarPanel();
((System.ComponentModel.ISupportInitialize)(this.statusBarText)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.statusBarCount)).BeginInit();
this.panelTop.SuspendLayout();
this.panelCenter.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarSelected)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarPosition)).BeginInit();
this.SuspendLayout();
//
***************
*** 133,137 ****
this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
this.statusBarText,
! this.statusBarCount});
this.statusBar.ShowPanels = true;
this.statusBar.Size = new System.Drawing.Size(712, 22);
--- 139,145 ----
this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
this.statusBarText,
! this.statusBarPosition,
! this.statusBarCount,
! this.statusBarSelected});
this.statusBar.ShowPanels = true;
this.statusBar.Size = new System.Drawing.Size(712, 22);
***************
*** 144,148 ****
this.statusBarText.BorderStyle = System.Windows.Forms.StatusBarPanelBorderStyle.None;
this.statusBarText.Text = "Ready.";
! this.statusBarText.Width = 666;
//
// statusBarCount
--- 152,156 ----
this.statusBarText.BorderStyle = System.Windows.Forms.StatusBarPanelBorderStyle.None;
this.statusBarText.Text = "Ready.";
! this.statusBarText.Width = 606;
//
// statusBarCount
***************
*** 391,394 ****
--- 399,418 ----
this.panelCenter.TabIndex = 3;
//
+ // statusBarSelected
+ //
+ this.statusBarSelected.Alignment = System.Windows.Forms.HorizontalAlignment.Center;
+ this.statusBarSelected.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Contents;
+ this.statusBarSelected.Text = "n/a";
+ this.statusBarSelected.ToolTipText = "Number of selected file in the folder.";
+ this.statusBarSelected.Width = 30;
+ //
+ // statusBarPosition
+ //
+ this.statusBarPosition.Alignment = System.Windows.Forms.HorizontalAlignment.Center;
+ this.statusBarPosition.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Contents;
+ this.statusBarPosition.Text = "n/a";
+ this.statusBarPosition.ToolTipText = "Current position in the folder.";
+ this.statusBarPosition.Width = 30;
+ //
// MainForm
//
***************
*** 410,413 ****
--- 434,439 ----
this.panelTop.ResumeLayout(false);
this.panelCenter.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarSelected)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.statusBarPosition)).EndInit();
this.ResumeLayout(false);
***************
*** 503,506 ****
--- 529,537 ----
imagePreview.ImageReference = imageFile.GetImageReference();
}
+ int index = e.Index;
+ if (index >= 0)
+ {
+ this.statusBarPosition.Text = (index + 1).ToString();
+ }
}
***************
*** 564,569 ****
string source = imageFile.FileInfo.FullName;
string target = Path.Combine(selectedFolder, imageFile.FileInfo.Name);
! File.Copy(source, target, true);
! File.SetAttributes(target, FileAttributes.Normal);
}
}
--- 595,607 ----
string source = imageFile.FileInfo.FullName;
string target = Path.Combine(selectedFolder, imageFile.FileInfo.Name);
! try
! {
! File.Copy(source, target, false);
! File.SetAttributes(target, FileAttributes.Normal);
! }
! catch (Exception ex)
! {
! Debug.WriteLine(ex.Message);
! }
}
}
Index: MainForm.resx
===================================================================
RCS file: /cvsroot/iclect/iclect/src/iclect/MainForm.resx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MainForm.resx 4 Jul 2003 23:49:53 -0000 1.8
--- MainForm.resx 6 Jul 2003 21:13:50 -0000 1.9
***************
*** 230,236 ****
<value>Private</value>
</data>
- <data name="addressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
<data name="addressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
--- 230,233 ----
***************
*** 239,242 ****
--- 236,242 ----
<value>Private</value>
</data>
+ <data name="addressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
<data name="labelAddressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
***************
*** 266,269 ****
--- 266,272 ----
<value>Private</value>
</data>
+ <data name="panelTop.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </data>
<data name="panelTop.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
***************
*** 278,290 ****
<value>8, 8</value>
</data>
- <data name="panelTop.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
<data name="panelTop.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
- <data name="panelCenter.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>8, 8</value>
- </data>
<data name="panelCenter.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
--- 281,287 ----
***************
*** 296,299 ****
--- 293,299 ----
<value>Private</value>
</data>
+ <data name="panelCenter.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>8, 8</value>
+ </data>
<data name="panelCenter.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
***************
*** 302,308 ****
--- 302,323 ----
<value>Private</value>
</data>
+ <data name="statusBarSelected.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="statusBarSelected.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="statusBarPosition.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="statusBarPosition.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.Name">
+ <value>MainForm</value>
+ </data>
<data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>(Default)</value>
***************
*** 325,331 ****
<data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
- </data>
- <data name="$this.Name">
- <value>MainForm</value>
</data>
<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
--- 340,343 ----
|