rawfilewizard

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.clttr.info/rawfilewizard.git
Log | Files | Refs | README | LICENSE

commit 0a59a68c9f5008f005105cafe0a6506ea77183ed
parent b6724f0d66a3161d2bc37d5ed0a69f93e580701f
Author: rwa <apollo@rw-net.de>
Date:   Mon, 15 Oct 2018 19:39:12 +0200

rework info dialog

Diffstat:
MJpegDivider/Program.cs | 4++++
MSilkypixFileMover/About.Designer.cs | 28+++++++++-------------------
MSilkypixFileMover/About.cs | 7+++++--
MSilkypixFileMover/About.resx | 355+++++++++++++++++++++++++++++++++++--------------------------------------------
MSilkypixFileMover/Properties/AssemblyInfo.cs | 8++++----
MSilkypixFileMover/SilkypixFileMover.csproj | 4++--
6 files changed, 179 insertions(+), 227 deletions(-)

diff --git a/JpegDivider/Program.cs b/JpegDivider/Program.cs @@ -67,6 +67,10 @@ namespace JpegDivider private static void showHelp() { Console.WriteLine($"{Assembly.GetExecutingAssembly().GetName().Name} - Version {Assembly.GetExecutingAssembly().GetName().Version}"); + Console.WriteLine("published under BSD 3 - Clause License"); + Console.WriteLine("Copyright(c) 2018, René Wagner"); + Console.WriteLine("https://gitlab.com/guzzisti1/rawfilewizard"); + Console.WriteLine(""); Console.WriteLine("divide jpegs from raw files by moving them to subfolder JPEG"); Console.WriteLine(""); Console.WriteLine("Commandline:"); diff --git a/SilkypixFileMover/About.Designer.cs b/SilkypixFileMover/About.Designer.cs @@ -33,9 +33,8 @@ this.labelProductName = new System.Windows.Forms.Label(); this.labelVersion = new System.Windows.Forms.Label(); this.labelCopyright = new System.Windows.Forms.Label(); - this.labelCompanyName = new System.Windows.Forms.Label(); - this.textBoxDescription = new System.Windows.Forms.TextBox(); this.okButton = new System.Windows.Forms.Button(); + this.textBoxDescription = new System.Windows.Forms.RichTextBox(); this.tableLayoutPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit(); this.SuspendLayout(); @@ -47,16 +46,15 @@ this.tableLayoutPanel.Controls.Add(this.labelProductName, 1, 0); this.tableLayoutPanel.Controls.Add(this.labelVersion, 1, 1); this.tableLayoutPanel.Controls.Add(this.labelCopyright, 1, 2); - this.tableLayoutPanel.Controls.Add(this.labelCompanyName, 1, 3); - this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 4); - this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5); + this.tableLayoutPanel.Controls.Add(this.okButton, 1, 4); + this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 3); this.tableLayoutPanel.Name = "tableLayoutPanel"; // // logoPictureBox // resources.ApplyResources(this.logoPictureBox, "logoPictureBox"); this.logoPictureBox.Name = "logoPictureBox"; - this.tableLayoutPanel.SetRowSpan(this.logoPictureBox, 6); + this.tableLayoutPanel.SetRowSpan(this.logoPictureBox, 5); this.logoPictureBox.TabStop = false; // // labelProductName @@ -74,23 +72,17 @@ resources.ApplyResources(this.labelCopyright, "labelCopyright"); this.labelCopyright.Name = "labelCopyright"; // - // labelCompanyName + // okButton // - resources.ApplyResources(this.labelCompanyName, "labelCompanyName"); - this.labelCompanyName.Name = "labelCompanyName"; + resources.ApplyResources(this.okButton, "okButton"); + this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.okButton.Name = "okButton"; // // textBoxDescription // resources.ApplyResources(this.textBoxDescription, "textBoxDescription"); this.textBoxDescription.Name = "textBoxDescription"; this.textBoxDescription.ReadOnly = true; - this.textBoxDescription.TabStop = false; - // - // okButton - // - resources.ApplyResources(this.okButton, "okButton"); - this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.okButton.Name = "okButton"; // // About // @@ -106,7 +98,6 @@ this.ShowInTaskbar = false; this.TopMost = true; this.tableLayoutPanel.ResumeLayout(false); - this.tableLayoutPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).EndInit(); this.ResumeLayout(false); @@ -119,8 +110,7 @@ private System.Windows.Forms.Label labelProductName; private System.Windows.Forms.Label labelVersion; private System.Windows.Forms.Label labelCopyright; - private System.Windows.Forms.Label labelCompanyName; - private System.Windows.Forms.TextBox textBoxDescription; private System.Windows.Forms.Button okButton; + private System.Windows.Forms.RichTextBox textBoxDescription; } } diff --git a/SilkypixFileMover/About.cs b/SilkypixFileMover/About.cs @@ -12,8 +12,11 @@ namespace SilkypixFileMover labelProductName.Text = AssemblyProduct; labelVersion.Text = string.Format( "Version {0}", AssemblyVersion ); labelCopyright.Text = AssemblyCopyright; - labelCompanyName.Text = AssemblyCompany; - textBoxDescription.Text = string.Format( "Programm zum automatisierten Verschieben von RAW-Dateien (im Digital Negative-Format) inkl. mittels Silkypix Developer Studio erzeugter Artefakte (Sidecar-Dateien).{0}{0}Diese Software ist Freeware.{0}{0}Mit Farm Fresh Icons von FatCow Webhosting:{0}http://www.fatcow.com/free-icons", Environment.NewLine ); + textBoxDescription.Text = @"BSD 3-Clause License + +hosted on GitLab: https://gitlab.com/guzzisti1/rawfilewizard + +Using Farm Fresh Icons von FatCow Webhosting: http://www.fatcow.com/free-icons"; } #region Assembly Attribute Accessors diff --git a/SilkypixFileMover/About.resx b/SilkypixFileMover/About.resx @@ -117,35 +117,15 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <data name="textBoxDescription.Text" xml:space="preserve"> - <value>Description</value> - </data> - <data name="&gt;&gt;labelCopyright.Type" xml:space="preserve"> - <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="tableLayoutPanel.Size" type="System.Drawing.Size, System.Drawing"> - <value>417, 265</value> - </data> - <data name="okButton.Text" xml:space="preserve"> - <value>&amp;OK</value> - </data> - <data name="&gt;&gt;labelVersion.Parent" xml:space="preserve"> - <value>tableLayoutPanel</value> + <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="tableLayoutPanel.ColumnCount" type="System.Int32, mscorlib"> + <value>2</value> </data> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="textBoxDescription.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <data name="logoPictureBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> - <data name="&gt;&gt;labelVersion.ZOrder" xml:space="preserve"> - <value>2</value> - </data> - <data name="&gt;&gt;$this.Name" xml:space="preserve"> - <value>About</value> - </data> - <data name="&gt;&gt;labelVersion.Type" xml:space="preserve"> - <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> + <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="logoPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAAHgAAAEGCAIAAAAhWcaAAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 @@ -628,272 +608,247 @@ cJWw3xX9u6JfoPW7on9X9Ku1flf074p+tdbviv5d0a/S+r//+/8BPTxUq6Ub7iwAAAAASUVORK5CYII= </value> </data> - <data name="labelCopyright.Size" type="System.Drawing.Size, System.Drawing"> - <value>271, 17</value> + <data name="logoPictureBox.Location" type="System.Drawing.Point, System.Drawing"> + <value>3, 3</value> </data> - <data name="textBoxDescription.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>6, 3, 3, 3</value> + <data name="logoPictureBox.Size" type="System.Drawing.Size, System.Drawing"> + <value>131, 259</value> </data> - <data name="&gt;&gt;labelCompanyName.Name" xml:space="preserve"> - <value>labelCompanyName</value> + <data name="logoPictureBox.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> + <value>StretchImage</value> </data> - <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> - <value>6, 13</value> + <data name="logoPictureBox.TabIndex" type="System.Int32, mscorlib"> + <value>12</value> </data> - <data name="&gt;&gt;labelProductName.Name" xml:space="preserve"> - <value>labelProductName</value> + <data name="&gt;&gt;logoPictureBox.Name" xml:space="preserve"> + <value>logoPictureBox</value> + </data> + <data name="&gt;&gt;logoPictureBox.Type" xml:space="preserve"> + <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name="&gt;&gt;logoPictureBox.Parent" xml:space="preserve"> + <value>tableLayoutPanel</value> + </data> + <data name="&gt;&gt;logoPictureBox.ZOrder" xml:space="preserve"> + <value>0</value> + </data> + <data name="labelProductName.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Fill</value> + </data> + <data name="labelProductName.Location" type="System.Drawing.Point, System.Drawing"> + <value>143, 0</value> </data> <data name="labelProductName.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>6, 0, 3, 0</value> </data> - <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="tableLayoutPanel.RowCount" type="System.Int32, mscorlib"> - <value>6</value> + <data name="labelProductName.MaximumSize" type="System.Drawing.Size, System.Drawing"> + <value>0, 17</value> </data> <data name="labelProductName.Size" type="System.Drawing.Size, System.Drawing"> <value>271, 17</value> </data> - <data name="okButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> - <value>Bottom, Right</value> - </data> - <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> - <value>CenterParent</value> - </data> - <data name="labelVersion.Text" xml:space="preserve"> - <value>Version</value> - </data> - <data name="&gt;&gt;textBoxDescription.Name" xml:space="preserve"> - <value>textBoxDescription</value> + <data name="labelProductName.TabIndex" type="System.Int32, mscorlib"> + <value>19</value> </data> - <data name="&gt;&gt;logoPictureBox.ZOrder" xml:space="preserve"> - <value>0</value> + <data name="labelProductName.Text" xml:space="preserve"> + <value>Product Name</value> </data> - <data name="labelCopyright.MaximumSize" type="System.Drawing.Size, System.Drawing"> - <value>0, 17</value> + <data name="labelProductName.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> + <value>MiddleLeft</value> </data> - <data name="logoPictureBox.Size" type="System.Drawing.Size, System.Drawing"> - <value>131, 259</value> + <data name="&gt;&gt;labelProductName.Name" xml:space="preserve"> + <value>labelProductName</value> </data> - <data name="logoPictureBox.TabIndex" type="System.Int32, mscorlib"> - <value>12</value> + <data name="&gt;&gt;labelProductName.Type" xml:space="preserve"> + <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="&gt;&gt;logoPictureBox.Parent" xml:space="preserve"> + <data name="&gt;&gt;labelProductName.Parent" xml:space="preserve"> <value>tableLayoutPanel</value> </data> - <data name="&gt;&gt;labelCompanyName.Type" xml:space="preserve"> - <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="&gt;&gt;labelProductName.ZOrder" xml:space="preserve"> + <value>1</value> </data> - <data name="textBoxDescription.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms"> - <value>Both</value> + <data name="labelVersion.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Fill</value> </data> - <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> - <value>435, 283</value> + <data name="labelVersion.Location" type="System.Drawing.Point, System.Drawing"> + <value>143, 26</value> </data> - <data name="&gt;&gt;labelVersion.Name" xml:space="preserve"> - <value>labelVersion</value> + <data name="labelVersion.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <value>6, 0, 3, 0</value> </data> <data name="labelVersion.MaximumSize" type="System.Drawing.Size, System.Drawing"> <value>0, 17</value> </data> - <data name="&gt;&gt;labelProductName.Type" xml:space="preserve"> - <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="labelVersion.Size" type="System.Drawing.Size, System.Drawing"> + <value>271, 17</value> </data> <data name="labelVersion.TabIndex" type="System.Int32, mscorlib"> <value>0</value> </data> - <data name="textBoxDescription.Multiline" type="System.Boolean, mscorlib"> - <value>True</value> + <data name="labelVersion.Text" xml:space="preserve"> + <value>Version</value> </data> - <data name="tableLayoutPanel.ColumnCount" type="System.Int32, mscorlib"> - <value>2</value> + <data name="labelVersion.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> + <value>MiddleLeft</value> </data> - <data name="textBoxDescription.Size" type="System.Drawing.Size, System.Drawing"> - <value>271, 126</value> + <data name="&gt;&gt;labelVersion.Name" xml:space="preserve"> + <value>labelVersion</value> </data> - <data name="labelProductName.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <data name="&gt;&gt;labelVersion.Type" xml:space="preserve"> + <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name="&gt;&gt;labelVersion.Parent" xml:space="preserve"> + <value>tableLayoutPanel</value> + </data> + <data name="&gt;&gt;labelVersion.ZOrder" xml:space="preserve"> + <value>2</value> + </data> + <data name="labelCopyright.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> - <data name="labelCompanyName.TabIndex" type="System.Int32, mscorlib"> - <value>22</value> + <data name="labelCopyright.Location" type="System.Drawing.Point, System.Drawing"> + <value>143, 52</value> </data> - <data name="okButton.Size" type="System.Drawing.Size, System.Drawing"> - <value>75, 23</value> + <data name="labelCopyright.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> + <value>6, 0, 3, 0</value> </data> - <data name="&gt;&gt;okButton.Type" xml:space="preserve"> - <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="labelCopyright.MaximumSize" type="System.Drawing.Size, System.Drawing"> + <value>0, 17</value> </data> - <data name="labelCopyright.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> - <value>MiddleLeft</value> + <data name="labelCopyright.Size" type="System.Drawing.Size, System.Drawing"> + <value>271, 17</value> </data> - <data name="tableLayoutPanel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> - <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="logoPictureBox" Row="0" RowSpan="6" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelProductName" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelVersion" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCopyright" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCompanyName" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxDescription" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="okButton" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,33,Percent,67" /&gt;&lt;Rows Styles="Percent,10,Percent,10,Percent,10,Percent,10,Percent,50,Percent,10" /&gt;&lt;/TableLayoutSettings&gt;</value> + <data name="labelCopyright.TabIndex" type="System.Int32, mscorlib"> + <value>21</value> </data> - <data name="&gt;&gt;tableLayoutPanel.ZOrder" xml:space="preserve"> - <value>0</value> + <data name="labelCopyright.Text" xml:space="preserve"> + <value>Copyright</value> </data> - <data name="okButton.Location" type="System.Drawing.Point, System.Drawing"> - <value>339, 239</value> + <data name="labelCopyright.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> + <value>MiddleLeft</value> </data> - <data name="&gt;&gt;labelCompanyName.ZOrder" xml:space="preserve"> - <value>4</value> + <data name="&gt;&gt;labelCopyright.Name" xml:space="preserve"> + <value>labelCopyright</value> </data> - <data name="&gt;&gt;tableLayoutPanel.Parent" xml:space="preserve"> - <value>$this</value> + <data name="&gt;&gt;labelCopyright.Type" xml:space="preserve"> + <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="&gt;&gt;tableLayoutPanel.Name" xml:space="preserve"> + <data name="&gt;&gt;labelCopyright.Parent" xml:space="preserve"> <value>tableLayoutPanel</value> </data> - <data name="&gt;&gt;okButton.Name" xml:space="preserve"> - <value>okButton</value> + <data name="&gt;&gt;labelCopyright.ZOrder" xml:space="preserve"> + <value>3</value> </data> - <data name="logoPictureBox.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> + <data name="okButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> + <value>Bottom, Right</value> </data> - <data name="labelCopyright.TabIndex" type="System.Int32, mscorlib"> - <value>21</value> + <data name="okButton.Location" type="System.Drawing.Point, System.Drawing"> + <value>339, 240</value> </data> - <data name="&gt;&gt;labelCompanyName.Parent" xml:space="preserve"> - <value>tableLayoutPanel</value> + <data name="okButton.Size" type="System.Drawing.Size, System.Drawing"> + <value>75, 22</value> </data> - <data name="labelProductName.TabIndex" type="System.Int32, mscorlib"> - <value>19</value> + <data name="okButton.TabIndex" type="System.Int32, mscorlib"> + <value>24</value> </data> - <data name="&gt;&gt;textBoxDescription.Type" xml:space="preserve"> - <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="okButton.Text" xml:space="preserve"> + <value>&amp;OK</value> </data> - <data name="tableLayoutPanel.TabIndex" type="System.Int32, mscorlib"> - <value>0</value> + <data name="&gt;&gt;okButton.Name" xml:space="preserve"> + <value>okButton</value> </data> - <data name="labelVersion.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>6, 0, 3, 0</value> + <data name="&gt;&gt;okButton.Type" xml:space="preserve"> + <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="&gt;&gt;labelCopyright.Parent" xml:space="preserve"> + <data name="&gt;&gt;okButton.Parent" xml:space="preserve"> <value>tableLayoutPanel</value> </data> - <data name="labelVersion.Size" type="System.Drawing.Size, System.Drawing"> - <value>271, 17</value> + <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve"> + <value>4</value> </data> - <data name="labelProductName.Text" xml:space="preserve"> - <value>Product Name</value> + <data name="textBoxDescription.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> + <value>Fill</value> </data> <data name="textBoxDescription.Location" type="System.Drawing.Point, System.Drawing"> - <value>143, 107</value> + <value>140, 81</value> </data> - <data name="labelProductName.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> - <value>MiddleLeft</value> + <data name="textBoxDescription.ScrollBars" type="System.Windows.Forms.RichTextBoxScrollBars, System.Windows.Forms"> + <value>Vertical</value> </data> - <data name="textBoxDescription.TabIndex" type="System.Int32, mscorlib"> - <value>23</value> + <data name="textBoxDescription.Size" type="System.Drawing.Size, System.Drawing"> + <value>274, 153</value> </data> - <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve"> - <value>6</value> + <data name="textBoxDescription.TabIndex" type="System.Int32, mscorlib"> + <value>25</value> </data> - <data name="labelCopyright.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> + <data name="textBoxDescription.Text" xml:space="preserve"> + <value /> </data> - <data name="&gt;&gt;tableLayoutPanel.Type" xml:space="preserve"> - <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <data name="&gt;&gt;textBoxDescription.Name" xml:space="preserve"> + <value>textBoxDescription</value> </data> - <data name="labelProductName.Location" type="System.Drawing.Point, System.Drawing"> - <value>143, 0</value> + <data name="&gt;&gt;textBoxDescription.Type" xml:space="preserve"> + <value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="labelVersion.Location" type="System.Drawing.Point, System.Drawing"> - <value>143, 26</value> + <data name="&gt;&gt;textBoxDescription.Parent" xml:space="preserve"> + <value>tableLayoutPanel</value> </data> <data name="&gt;&gt;textBoxDescription.ZOrder" xml:space="preserve"> <value>5</value> </data> - <data name="labelCopyright.Location" type="System.Drawing.Point, System.Drawing"> - <value>143, 52</value> - </data> - <data name="&gt;&gt;$this.Type" xml:space="preserve"> - <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> <data name="tableLayoutPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> - <data name="&gt;&gt;labelProductName.ZOrder" xml:space="preserve"> - <value>1</value> + <data name="tableLayoutPanel.Location" type="System.Drawing.Point, System.Drawing"> + <value>9, 9</value> </data> - <data name="&gt;&gt;logoPictureBox.Name" xml:space="preserve"> - <value>logoPictureBox</value> + <data name="tableLayoutPanel.RowCount" type="System.Int32, mscorlib"> + <value>5</value> </data> - <data name="&gt;&gt;labelProductName.Parent" xml:space="preserve"> - <value>tableLayoutPanel</value> + <data name="tableLayoutPanel.Size" type="System.Drawing.Size, System.Drawing"> + <value>417, 265</value> </data> - <data name="labelProductName.MaximumSize" type="System.Drawing.Size, System.Drawing"> - <value>0, 17</value> + <data name="tableLayoutPanel.TabIndex" type="System.Int32, mscorlib"> + <value>0</value> </data> - <data name="labelCompanyName.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> + <data name="&gt;&gt;tableLayoutPanel.Name" xml:space="preserve"> + <value>tableLayoutPanel</value> </data> - <data name="logoPictureBox.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms"> - <value>StretchImage</value> + <data name="&gt;&gt;tableLayoutPanel.Type" xml:space="preserve"> + <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="tableLayoutPanel.Location" type="System.Drawing.Point, System.Drawing"> - <value>9, 9</value> + <data name="&gt;&gt;tableLayoutPanel.Parent" xml:space="preserve"> + <value>$this</value> </data> - <data name="labelCompanyName.Location" type="System.Drawing.Point, System.Drawing"> - <value>143, 78</value> + <data name="&gt;&gt;tableLayoutPanel.ZOrder" xml:space="preserve"> + <value>0</value> </data> - <data name="&gt;&gt;labelCopyright.ZOrder" xml:space="preserve"> - <value>3</value> + <data name="tableLayoutPanel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> + <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="logoPictureBox" Row="0" RowSpan="5" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelProductName" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelVersion" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCopyright" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="okButton" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxDescription" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,33,Percent,67" /&gt;&lt;Rows Styles="Percent,10,Percent,10,Percent,10,Percent,60,Percent,10,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value> </data> - <data name="labelCompanyName.Size" type="System.Drawing.Size, System.Drawing"> - <value>271, 17</value> + <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> + <value>6, 13</value> </data> - <data name="logoPictureBox.Location" type="System.Drawing.Point, System.Drawing"> - <value>3, 3</value> + <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> + <value>435, 283</value> </data> <data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <value>9, 9, 9, 9</value> </data> - <data name="labelVersion.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> - <value>Fill</value> + <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> + <value>CenterParent</value> </data> <data name="$this.Text" xml:space="preserve"> <value>About</value> </data> - <data name="&gt;&gt;logoPictureBox.Type" xml:space="preserve"> - <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name="labelVersion.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> - <value>MiddleLeft</value> - </data> - <data name="labelCompanyName.Text" xml:space="preserve"> - <value>Company Name</value> - </data> - <data name="&gt;&gt;okButton.Parent" xml:space="preserve"> - <value>tableLayoutPanel</value> - </data> - <data name="labelCompanyName.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> - <value>MiddleLeft</value> - </data> - <data name="&gt;&gt;labelCopyright.Name" xml:space="preserve"> - <value>labelCopyright</value> - </data> - <data name="labelCopyright.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>6, 0, 3, 0</value> - </data> - <data name="&gt;&gt;textBoxDescription.Parent" xml:space="preserve"> - <value>tableLayoutPanel</value> - </data> - <data name="labelCompanyName.MaximumSize" type="System.Drawing.Size, System.Drawing"> - <value>0, 17</value> - </data> - <data name="labelCompanyName.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> - <value>6, 0, 3, 0</value> - </data> - <data name="okButton.TabIndex" type="System.Int32, mscorlib"> - <value>24</value> + <data name="&gt;&gt;$this.Name" xml:space="preserve"> + <value>About</value> </data> - <data name="labelCopyright.Text" xml:space="preserve"> - <value>Copyright</value> + <data name="&gt;&gt;$this.Type" xml:space="preserve"> + <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>de</value> - </metadata> </root> \ No newline at end of file diff --git a/SilkypixFileMover/Properties/AssemblyInfo.cs b/SilkypixFileMover/Properties/AssemblyInfo.cs @@ -10,8 +10,8 @@ using System; [assembly: AssemblyDescription( "Programm zum automatisierten Verschieben von RAW-Dateien inkl. mittels Silkypix Developer Studio erzeugter Artefakte. Mit Farm Fresh Icons von FatCow Webhosting:http://www.fatcow.com/free-icons")] [assembly: AssemblyConfiguration( "" )] [assembly: AssemblyCompany( "René Wagner" )] -[assembly: AssemblyProduct( "spFileMover" )] -[assembly: AssemblyCopyright("Copyright René Wagner © 2014-2018")] +[assembly: AssemblyProduct( "RawFileWizard" )] +[assembly: AssemblyCopyright("Copyright © René Wagner 2018")] [assembly: AssemblyTrademark( "" )] [assembly: AssemblyCulture( "" )] @@ -33,6 +33,6 @@ using System; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.1.0")] +[assembly: AssemblyVersion("1.6.2.0")] [assembly: NeutralResourcesLanguage( "de" )] -[assembly: AssemblyFileVersion("1.6.1.0")] +[assembly: AssemblyFileVersion("1.6.2.0")] diff --git a/SilkypixFileMover/SilkypixFileMover.csproj b/SilkypixFileMover/SilkypixFileMover.csproj @@ -39,8 +39,8 @@ <CreateWebPageOnPublish>true</CreateWebPageOnPublish> <WebPage>index.htm</WebPage> <OpenBrowserOnPublish>false</OpenBrowserOnPublish> - <ApplicationRevision>2</ApplicationRevision> - <ApplicationVersion>1.6.1.%2a</ApplicationVersion> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.6.2.%2a</ApplicationVersion> <UseApplicationTrust>false</UseApplicationTrust> <CreateDesktopShortcut>true</CreateDesktopShortcut> <PublishWizardCompleted>true</PublishWizardCompleted>