diff --git a/Mk0.Software.ImageSorter/App.config b/Mk0.Software.ImageSorter/App.config index b6581f3..b993ce7 100644 --- a/Mk0.Software.ImageSorter/App.config +++ b/Mk0.Software.ImageSorter/App.config @@ -11,10 +11,10 @@ - + - + True @@ -49,6 +49,12 @@ False + + Control + + + Black + diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index 043e3ae..85f0eac 100644 --- a/Mk0.Software.ImageSorter/Main.Designer.cs +++ b/Mk0.Software.ImageSorter/Main.Designer.cs @@ -419,6 +419,7 @@ this.labelNoImages.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.labelNoImages.BackColor = System.Drawing.SystemColors.Control; this.labelNoImages.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelNoImages.ForeColor = System.Drawing.Color.Maroon; this.labelNoImages.Location = new System.Drawing.Point(0, 0); diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs index 513ea20..cf23333 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -193,6 +193,8 @@ namespace Mk0.Software.ImageSorter LoadPicture(GetImageIndex(Path.Combine(startuppath, startupimage))); } ResetUndo(); + panelImageBackground.BackColor = Properties.Settings.Default.lightBackgroundColour; + pictureBoxImage.BackColor = Properties.Settings.Default.lightBackgroundColour; ToolTip t1 = new ToolTip { AutoPopDelay = 5000, @@ -445,6 +447,9 @@ namespace Mk0.Software.ImageSorter SearchImages(); CountPicsInPath(); ResetUndo(); + + panelImageBackground.BackColor = Properties.Settings.Default.lightBackgroundColour; + pictureBoxImage.BackColor = Properties.Settings.Default.lightBackgroundColour; } /// @@ -1505,15 +1510,15 @@ namespace Mk0.Software.ImageSorter /// private void ButtonHintergrund_Click(object sender, EventArgs e) { - if(panelImageBackground.BackColor==Color.Black) + if(panelImageBackground.BackColor==Properties.Settings.Default.darkBackgroundColour) { - panelImageBackground.BackColor = SystemColors.Control; - pictureBoxImage.BackColor = SystemColors.Control; + panelImageBackground.BackColor = Properties.Settings.Default.lightBackgroundColour; + pictureBoxImage.BackColor = Properties.Settings.Default.lightBackgroundColour; } else { - panelImageBackground.BackColor = Color.Black; - pictureBoxImage.BackColor = Color.Black; + panelImageBackground.BackColor = Properties.Settings.Default.darkBackgroundColour; + pictureBoxImage.BackColor = Properties.Settings.Default.darkBackgroundColour; } } diff --git a/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs b/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs index 75d68fa..a4e7972 100644 --- a/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs +++ b/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs @@ -178,5 +178,29 @@ namespace Mk0.Software.ImageSorter.Properties { this["fullScreen"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Control")] + public global::System.Drawing.Color lightBackgroundColour { + get { + return ((global::System.Drawing.Color)(this["lightBackgroundColour"])); + } + set { + this["lightBackgroundColour"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Black")] + public global::System.Drawing.Color darkBackgroundColour { + get { + return ((global::System.Drawing.Color)(this["darkBackgroundColour"])); + } + set { + this["darkBackgroundColour"] = value; + } + } } } diff --git a/Mk0.Software.ImageSorter/Properties/Settings.settings b/Mk0.Software.ImageSorter/Properties/Settings.settings index 576bc42..f625f03 100644 --- a/Mk0.Software.ImageSorter/Properties/Settings.settings +++ b/Mk0.Software.ImageSorter/Properties/Settings.settings @@ -41,5 +41,11 @@ False + + Control + + + Black + \ No newline at end of file diff --git a/Mk0.Software.ImageSorter/Settings.Designer.cs b/Mk0.Software.ImageSorter/Settings.Designer.cs index 513d910..2eac5c0 100644 --- a/Mk0.Software.ImageSorter/Settings.Designer.cs +++ b/Mk0.Software.ImageSorter/Settings.Designer.cs @@ -49,12 +49,22 @@ this.trackBarFadingSpeed = new System.Windows.Forms.TrackBar(); this.checkBoxFading = new System.Windows.Forms.CheckBox(); this.label5 = new System.Windows.Forms.Label(); + this.tabPage5 = new System.Windows.Forms.TabPage(); + this.panelDarkBackgroundColour = new System.Windows.Forms.Panel(); + this.panelLightBackgroundColour = new System.Windows.Forms.Panel(); + this.buttonChangeDarkBackgroundColour = new System.Windows.Forms.Button(); + this.buttonChangeLightBackgroundColour = new System.Windows.Forms.Button(); + this.label11 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.buttonResetBackgroundColours = new System.Windows.Forms.Button(); + this.label9 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); this.tabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarFadingSpeed)).BeginInit(); + this.tabPage5.SuspendLayout(); this.SuspendLayout(); // // checkBoxSingleInstance @@ -107,6 +117,7 @@ this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage4); + this.tabControl1.Controls.Add(this.tabPage5); this.tabControl1.Location = new System.Drawing.Point(12, 12); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; @@ -262,9 +273,99 @@ this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(486, 34); this.label5.TabIndex = 0; - this.label5.Text = "Mit Fading wird eine farbliche markierung von zuletzt gedrückten Ziel-Buttons akt" + + this.label5.Text = "Mit Fading wird eine farbliche Markierung von zuletzt gedrückten Ziel-Buttons akt" + "iviert. Die Geschwindigkeit regelt, wie schnell diese Markierung wieder verblass" + "t."; + // + // tabPage5 + // + this.tabPage5.Controls.Add(this.panelDarkBackgroundColour); + this.tabPage5.Controls.Add(this.panelLightBackgroundColour); + this.tabPage5.Controls.Add(this.buttonChangeDarkBackgroundColour); + this.tabPage5.Controls.Add(this.buttonChangeLightBackgroundColour); + this.tabPage5.Controls.Add(this.label11); + this.tabPage5.Controls.Add(this.label10); + this.tabPage5.Controls.Add(this.buttonResetBackgroundColours); + this.tabPage5.Controls.Add(this.label9); + this.tabPage5.Location = new System.Drawing.Point(4, 22); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Padding = new System.Windows.Forms.Padding(3); + this.tabPage5.Size = new System.Drawing.Size(498, 107); + this.tabPage5.TabIndex = 4; + this.tabPage5.Text = "Farben"; + this.tabPage5.UseVisualStyleBackColor = true; + // + // panelDarkBackgroundColour + // + this.panelDarkBackgroundColour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panelDarkBackgroundColour.Location = new System.Drawing.Point(90, 75); + this.panelDarkBackgroundColour.Name = "panelDarkBackgroundColour"; + this.panelDarkBackgroundColour.Size = new System.Drawing.Size(100, 20); + this.panelDarkBackgroundColour.TabIndex = 8; + // + // panelLightBackgroundColour + // + this.panelLightBackgroundColour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panelLightBackgroundColour.Location = new System.Drawing.Point(90, 46); + this.panelLightBackgroundColour.Name = "panelLightBackgroundColour"; + this.panelLightBackgroundColour.Size = new System.Drawing.Size(100, 20); + this.panelLightBackgroundColour.TabIndex = 7; + // + // buttonChangeDarkBackgroundColour + // + this.buttonChangeDarkBackgroundColour.Location = new System.Drawing.Point(196, 73); + this.buttonChangeDarkBackgroundColour.Name = "buttonChangeDarkBackgroundColour"; + this.buttonChangeDarkBackgroundColour.Size = new System.Drawing.Size(75, 23); + this.buttonChangeDarkBackgroundColour.TabIndex = 6; + this.buttonChangeDarkBackgroundColour.Text = "Ändern"; + this.buttonChangeDarkBackgroundColour.UseVisualStyleBackColor = true; + this.buttonChangeDarkBackgroundColour.Click += new System.EventHandler(this.ButtonChangeDarkBackgroundColour_Click); + // + // buttonChangeLightBackgroundColour + // + this.buttonChangeLightBackgroundColour.Location = new System.Drawing.Point(196, 44); + this.buttonChangeLightBackgroundColour.Name = "buttonChangeLightBackgroundColour"; + this.buttonChangeLightBackgroundColour.Size = new System.Drawing.Size(75, 23); + this.buttonChangeLightBackgroundColour.TabIndex = 5; + this.buttonChangeLightBackgroundColour.Text = "Ändern"; + this.buttonChangeLightBackgroundColour.UseVisualStyleBackColor = true; + this.buttonChangeLightBackgroundColour.Click += new System.EventHandler(this.ButtonChangeLightBackgroundColour_Click); + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(43, 78); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(44, 13); + this.label11.TabIndex = 4; + this.label11.Text = "Dunkel:"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(43, 49); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(28, 13); + this.label10.TabIndex = 3; + this.label10.Text = "Hell:"; + // + // buttonResetBackgroundColours + // + this.buttonResetBackgroundColours.Location = new System.Drawing.Point(405, 78); + this.buttonResetBackgroundColours.Name = "buttonResetBackgroundColours"; + this.buttonResetBackgroundColours.Size = new System.Drawing.Size(87, 23); + this.buttonResetBackgroundColours.TabIndex = 2; + this.buttonResetBackgroundColours.Text = "Zurücksetzen"; + this.buttonResetBackgroundColours.UseVisualStyleBackColor = true; + this.buttonResetBackgroundColours.Click += new System.EventHandler(this.ButtonResetBackgroundColours_Click); + // + // label9 + // + this.label9.Location = new System.Drawing.Point(6, 3); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(486, 46); + this.label9.TabIndex = 1; + this.label9.Text = resources.GetString("label9.Text"); // // Settings // @@ -291,6 +392,8 @@ this.tabPage4.ResumeLayout(false); this.tabPage4.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarFadingSpeed)).EndInit(); + this.tabPage5.ResumeLayout(false); + this.tabPage5.PerformLayout(); this.ResumeLayout(false); } @@ -317,5 +420,14 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label6; + private System.Windows.Forms.TabPage tabPage5; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Button buttonResetBackgroundColours; + private System.Windows.Forms.Button buttonChangeDarkBackgroundColour; + private System.Windows.Forms.Button buttonChangeLightBackgroundColour; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Panel panelDarkBackgroundColour; + private System.Windows.Forms.Panel panelLightBackgroundColour; } } \ No newline at end of file diff --git a/Mk0.Software.ImageSorter/Settings.cs b/Mk0.Software.ImageSorter/Settings.cs index 6f37861..abfe98e 100644 --- a/Mk0.Software.ImageSorter/Settings.cs +++ b/Mk0.Software.ImageSorter/Settings.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using System.Windows.Forms; namespace Mk0.Software.ImageSorter @@ -26,6 +27,8 @@ namespace Mk0.Software.ImageSorter checkBoxFileAssociation.Checked = Properties.Settings.Default.fileAssociation; checkBoxFading.Checked = Properties.Settings.Default.fading; trackBarFadingSpeed.Value = Properties.Settings.Default.fadingSpeed; + panelDarkBackgroundColour.BackColor = Properties.Settings.Default.darkBackgroundColour; + panelLightBackgroundColour.BackColor = Properties.Settings.Default.lightBackgroundColour; } private void ButtonChangeTargetPath_Click(object sender, EventArgs e) @@ -64,6 +67,44 @@ namespace Mk0.Software.ImageSorter private void TrackBarFadingSpeed_Scroll(object sender, EventArgs e) { Properties.Settings.Default.fadingSpeed = trackBarFadingSpeed.Value; + Properties.Settings.Default.Save(); + } + + private void ButtonResetBackgroundColours_Click(object sender, EventArgs e) + { + Properties.Settings.Default.lightBackgroundColour = SystemColors.Control; + Properties.Settings.Default.darkBackgroundColour = Color.Black; + Properties.Settings.Default.Save(); + panelLightBackgroundColour.BackColor = Properties.Settings.Default.lightBackgroundColour; + panelDarkBackgroundColour.BackColor = Properties.Settings.Default.darkBackgroundColour; + } + + private void ButtonChangeLightBackgroundColour_Click(object sender, EventArgs e) + { + ColorDialog colorDlg = new ColorDialog(); + colorDlg.Color = Properties.Settings.Default.lightBackgroundColour; + colorDlg.AnyColor = true; + colorDlg.SolidColorOnly = false; + if (colorDlg.ShowDialog() == DialogResult.OK) + { + Properties.Settings.Default.lightBackgroundColour = colorDlg.Color; + panelLightBackgroundColour.BackColor = Properties.Settings.Default.lightBackgroundColour; + Properties.Settings.Default.Save(); + } + } + + private void ButtonChangeDarkBackgroundColour_Click(object sender, EventArgs e) + { + ColorDialog colorDlg = new ColorDialog(); + colorDlg.Color = Properties.Settings.Default.darkBackgroundColour; + colorDlg.AnyColor = true; + colorDlg.SolidColorOnly = false; + if (colorDlg.ShowDialog() == DialogResult.OK) + { + Properties.Settings.Default.darkBackgroundColour = colorDlg.Color; + panelDarkBackgroundColour.BackColor = Properties.Settings.Default.darkBackgroundColour; + Properties.Settings.Default.Save(); + } } } } diff --git a/Mk0.Software.ImageSorter/Settings.resx b/Mk0.Software.ImageSorter/Settings.resx index 3b877ca..d557585 100644 --- a/Mk0.Software.ImageSorter/Settings.resx +++ b/Mk0.Software.ImageSorter/Settings.resx @@ -124,6 +124,9 @@ Mit der Option Einzelinstanz legen sie fest, dass der ImageSorter nur ein Mal geöffnet sein kann. Wenn sie weitere Bilder öffnen, öffnen sich diese dann im selben Fenster. Wenn diese Option deaktiviert ist, öffnen sich jedes Bild in einem eigenen Fenster. - Der Zielpfad legt fest, wohin die Bilder verschoben werden sollen. Im Zielpfad sollten Unterordner vorhanden sein, welche dann im ImageSorter als Ziel zum Verschieben verfügbar sind. Der Zielpfad wird beim nächsten Start von ImageSorter wieder automatisch ausgewählt. + Der Zielpfad legt fest, wohin die Bilder verschoben werden sollen. Im Zielpfad sollten Unterordner vorhanden sein, welche dann im ImageSorter als Ziel zum Verschieben verfügbar sind. Der Zielpfad wird beim nächsten Start von ImageSorter wieder automatisch ausgewählt, sofern er verfügbar ist. + + + Hier kann für den Bildhintergrund zur leichteren Bildbearbeitung die Farbe individualisiert werden. Es kann sowohl die Farbe für den hellen Hintergrund (Standard), sowie den dunklen Hintergrund verändert werden. \ No newline at end of file