From fe8d8b38b622b5afd89e1e45fdda814d9eaa0c84 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 3 Mar 2016 11:52:55 +0200 Subject: [PATCH] In image history form check setting buttons --- ShareX.HistoryLib/ImageHistoryForm.cs | 85 +++++++++++++++---------- ShareX.HistoryLib/ImageHistoryForm.resx | 16 ++--- ShareX/ApplicationConfig.cs | 2 +- 3 files changed, 61 insertions(+), 42 deletions(-) diff --git a/ShareX.HistoryLib/ImageHistoryForm.cs b/ShareX.HistoryLib/ImageHistoryForm.cs index 83e0f67d0..aed516061 100644 --- a/ShareX.HistoryLib/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/ImageHistoryForm.cs @@ -39,33 +39,8 @@ public partial class ImageHistoryForm : Form { public string HistoryPath { get; private set; } public int MaxItemCount { get; set; } - - public int ViewMode - { - get - { - return (int)ilvImages.View; - } - set - { - if (value.IsBetween(0, 3)) - { - ilvImages.View = (View)value; - } - } - } - - public Size ThumbnailSize - { - get - { - return ilvImages.ThumbnailSize; - } - set - { - ilvImages.ThumbnailSize = value; - } - } + public int ViewMode { get; set; } + public Size ThumbnailSize { get; set; } private HistoryManager history; private HistoryItemManager him; @@ -75,15 +50,51 @@ public ImageHistoryForm(string historyPath, int viewMode, Size thumbnailSize, in { InitializeComponent(); Icon = ShareXResources.Icon; - // TODO: Translate - Text = "ShareX - Image history"; HistoryPath = historyPath; MaxItemCount = maxItemCount; - ViewMode = viewMode; - ThumbnailSize = thumbnailSize; - tsbQuickList.Checked = MaxItemCount > -1; + ViewMode = viewMode.Between(0, 3); + ilvImages.View = (View)ViewMode; + + switch (ilvImages.View) + { + default: + case View.Thumbnails: + tsmiViewModeThumbnails.RadioCheck(); + break; + case View.Gallery: + tsmiViewModeGallery.RadioCheck(); + break; + case View.Pane: + tsmiViewModePane.RadioCheck(); + break; + } + + ThumbnailSize = thumbnailSize; + ilvImages.ThumbnailSize = ThumbnailSize; + + switch (ThumbnailSize.Width) + { + case 75: + tsmiThumbnailSize75.RadioCheck(); + break; + default: + case 100: + tsmiThumbnailSize100.RadioCheck(); + break; + case 150: + tsmiThumbnailSize150.RadioCheck(); + break; + case 200: + tsmiThumbnailSize200.RadioCheck(); + break; + case 250: + tsmiThumbnailSize250.RadioCheck(); + break; + } + + tsbQuickList.Checked = MaxItemCount > 0; him = new HistoryItemManager(); him.GetHistoryItems += him_GetHistoryItems; @@ -178,48 +189,56 @@ private void tsmiViewModeThumbnails_Click(object sender, EventArgs e) { tsmiViewModeThumbnails.RadioCheck(); ilvImages.View = View.Thumbnails; + ViewMode = (int)ilvImages.View; } private void tsmiViewModeGallery_Click(object sender, EventArgs e) { tsmiViewModeGallery.RadioCheck(); ilvImages.View = View.Gallery; + ViewMode = (int)ilvImages.View; } private void tsmiViewModePane_Click(object sender, EventArgs e) { tsmiViewModePane.RadioCheck(); ilvImages.View = View.Pane; + ViewMode = (int)ilvImages.View; } private void tsmiThumbnailSize75_Click(object sender, EventArgs e) { tsmiThumbnailSize75.RadioCheck(); ilvImages.ThumbnailSize = new Size(75, 75); + ThumbnailSize = ilvImages.ThumbnailSize; } private void tsmiThumbnailSize100_Click(object sender, EventArgs e) { tsmiThumbnailSize100.RadioCheck(); ilvImages.ThumbnailSize = new Size(100, 100); + ThumbnailSize = ilvImages.ThumbnailSize; } private void tsmiThumbnailSize150_Click(object sender, EventArgs e) { tsmiThumbnailSize150.RadioCheck(); ilvImages.ThumbnailSize = new Size(150, 150); + ThumbnailSize = ilvImages.ThumbnailSize; } private void tsmiThumbnailSize200_Click(object sender, EventArgs e) { tsmiThumbnailSize200.RadioCheck(); ilvImages.ThumbnailSize = new Size(200, 200); + ThumbnailSize = ilvImages.ThumbnailSize; } private void tsmiThumbnailSize250_Click(object sender, EventArgs e) { tsmiThumbnailSize250.RadioCheck(); ilvImages.ThumbnailSize = new Size(250, 250); + ThumbnailSize = ilvImages.ThumbnailSize; } private void tsbQuickList_Click(object sender, EventArgs e) @@ -230,7 +249,7 @@ private void tsbQuickList_Click(object sender, EventArgs e) } else { - MaxItemCount = -1; + MaxItemCount = 0; } RefreshHistoryItems(); diff --git a/ShareX.HistoryLib/ImageHistoryForm.resx b/ShareX.HistoryLib/ImageHistoryForm.resx index 4e4f8c3a6..06dc12ce6 100644 --- a/ShareX.HistoryLib/ImageHistoryForm.resx +++ b/ShareX.HistoryLib/ImageHistoryForm.resx @@ -138,7 +138,7 @@ 0, 0 - 804, 587 + 834, 636 @@ -157,7 +157,7 @@ 0 - 804, 587 + 834, 636 tscMain.ContentPanel @@ -202,7 +202,7 @@ 2 - 804, 612 + 834, 661 0 @@ -214,19 +214,19 @@ None - 137, 22 + 152, 22 Thumbnails - 137, 22 + 152, 22 Gallery - 137, 22 + 152, 22 Pane @@ -334,13 +334,13 @@ 6, 13 - 804, 612 + 834, 661 CenterScreen - Image history + ShareX - Image history tsddbViewMode diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index e8d560536..362cdd7e3 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -129,7 +129,7 @@ public ApplicationConfig() public WindowState ImageHistoryWindowState = new WindowState(); public int ImageHistoryMaxItemCount = 100; public int ImageHistoryViewMode = 3; - public Size ImageHistoryThumbnailSize = new Size(100, 100); + public Size ImageHistoryThumbnailSize = new Size(150, 150); #endregion History