diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index 6916c88..5b390f8 100644 --- a/Mk0.Software.ImageSorter/Main.Designer.cs +++ b/Mk0.Software.ImageSorter/Main.Designer.cs @@ -500,7 +500,7 @@ // buttonRandAlle // this.buttonRandAlle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonRandAlle.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_left_icon; + this.buttonRandAlle.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_all_icon; this.buttonRandAlle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRandAlle.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonRandAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat; @@ -515,7 +515,7 @@ // buttonRandObenUnten // this.buttonRandObenUnten.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonRandObenUnten.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_left_icon; + this.buttonRandObenUnten.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_topbottom_icon; this.buttonRandObenUnten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRandObenUnten.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonRandObenUnten.FlatStyle = System.Windows.Forms.FlatStyle.Flat; @@ -530,7 +530,7 @@ // buttonRandLinksRechts // this.buttonRandLinksRechts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonRandLinksRechts.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_left_icon; + this.buttonRandLinksRechts.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_leftright_icon; this.buttonRandLinksRechts.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRandLinksRechts.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonRandLinksRechts.FlatStyle = System.Windows.Forms.FlatStyle.Flat; @@ -802,7 +802,6 @@ this.buttonPreview.Size = new System.Drawing.Size(23, 23); this.buttonPreview.TabIndex = 19; this.buttonPreview.UseVisualStyleBackColor = true; - this.buttonPreview.Visible = false; this.buttonPreview.Click += new System.EventHandler(this.ButtonPreview_Click); // // panelPreview diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs index c7c922f..3a870dc 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -1459,6 +1459,11 @@ namespace Mk0.Software.ImageSorter catch (Exception) { } + + if (panelPreview.Visible) + { + ShowPreviewImages(); + } } /// @@ -1989,6 +1994,7 @@ namespace Mk0.Software.ImageSorter private void ShowPreviewImages() { + panelPreview.Controls.Clear(); int panelWidthAvailable = panelPreview.Width - 11; //verfügbare breite abzüglich ränder links+rechts int previewImageWidth = 80; //breite eines preview-bildes int previewImageAbstand = 11; //abstand zwischen preview-bildern diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj index 2ddc075..cc0cd3d 100644 --- a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj +++ b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj @@ -187,6 +187,9 @@ + + + diff --git a/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs b/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs index e197c4c..383856f 100644 --- a/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs +++ b/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs @@ -110,6 +110,16 @@ namespace Mk0.Software.ImageSorter.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap border_2_all_icon { + get { + object obj = ResourceManager.GetObject("border_2_all_icon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -130,6 +140,16 @@ namespace Mk0.Software.ImageSorter.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap border_2_leftright_icon { + get { + object obj = ResourceManager.GetObject("border_2_leftright_icon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -150,6 +170,16 @@ namespace Mk0.Software.ImageSorter.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap border_2_topbottom_icon { + get { + object obj = ResourceManager.GetObject("border_2_topbottom_icon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/Mk0.Software.ImageSorter/Properties/Resources.resx b/Mk0.Software.ImageSorter/Properties/Resources.resx index 6187614..f875d05 100644 --- a/Mk0.Software.ImageSorter/Properties/Resources.resx +++ b/Mk0.Software.ImageSorter/Properties/Resources.resx @@ -241,4 +241,13 @@ ..\Resources\webp.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\border-2-leftright-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\border-2-topbottom-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\border-2-all-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Mk0.Software.ImageSorter/Resources/border-2-all-icon.png b/Mk0.Software.ImageSorter/Resources/border-2-all-icon.png new file mode 100644 index 0000000..1999aa5 Binary files /dev/null and b/Mk0.Software.ImageSorter/Resources/border-2-all-icon.png differ diff --git a/Mk0.Software.ImageSorter/Resources/border-2-leftright-icon.png b/Mk0.Software.ImageSorter/Resources/border-2-leftright-icon.png new file mode 100644 index 0000000..b6a03b0 Binary files /dev/null and b/Mk0.Software.ImageSorter/Resources/border-2-leftright-icon.png differ diff --git a/Mk0.Software.ImageSorter/Resources/border-2-topbottom-icon.png b/Mk0.Software.ImageSorter/Resources/border-2-topbottom-icon.png new file mode 100644 index 0000000..e337ad7 Binary files /dev/null and b/Mk0.Software.ImageSorter/Resources/border-2-topbottom-icon.png differ