Merge

FenPhoenix · Apr 21, 2019 · 5407cda · 5407cda
2 parents e108cb2 + 5d91c2b
commit 5407cda
Show file tree

Hide file tree

Showing 14 changed files with 534 additions and 157 deletions.
diff --git a/AngelLoader/BusinessLogic.cs b/AngelLoader/BusinessLogic.cs
@@ -2566,7 +2566,10 @@ internal void UpdateConfig(
             Point mainWindowLocation,
             float mainSplitterPercent,
             float topSplitterPercent,
-            List<ColumnData> columns, int sortedColumn, SortOrder sortDirection,
+            List<ColumnData> columns,
+            int sortedColumn,
+            SortOrder sortDirection, 
+            float fmsListFontSizeInPoints,
             Filter filter,
             SelectedFM selectedFM,
             GameTabsState gameTabsState,
@@ -2588,6 +2591,8 @@ internal void UpdateConfig(
             Config.SortedColumn = (Column)sortedColumn;
             Config.SortDirection = sortDirection;
 
+            Config.FMsListFontSizeInPoints = fmsListFontSizeInPoints;
+
             filter.DeepCopyTo(Config.Filter);
 
             Config.TopRightTab = topRightTab;

diff --git a/AngelLoader/Common/DataClasses/ConfigData.cs b/AngelLoader/Common/DataClasses/ConfigData.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using AngelLoader.Common.Utility;
@@ -64,6 +65,21 @@ internal void ClearAllFilters()
         internal List<ColumnData> Columns = new List<ColumnData>();
         internal Column SortedColumn = Column.Title;
         internal SortOrder SortDirection = SortOrder.Ascending;
+
+        private float _fMsListFontSizeInPoints = 8.25f;
+        internal float FMsListFontSizeInPoints
+        {
+            get => _fMsListFontSizeInPoints;
+            set
+            {
+                var val = value;
+                if (val < Math.Round(1.00f, 2)) val = 1.00f;
+                if (val > Math.Round(41.25f, 2)) val = 41.25f;
+                val = (float)Math.Round(val, 2);
+                _fMsListFontSizeInPoints = val;
+            }
+        }
+
         internal bool EnableArticles = true;
         internal readonly List<string> Articles = new List<string> { "a", "an", "the" };
         internal bool MoveArticlesToEnd = true;
@@ -121,7 +137,6 @@ internal float TopSplitterPercent
         internal bool ConvertOGGsToWAVsOnInstall = false;
 
         internal bool ConfirmUninstall = true;
-        internal bool HideUninstallButton = false;
 
         internal BackupFMData BackupFMData = BackupFMData.AllChangedFiles;
         internal bool BackupAlwaysAsk = true;
@@ -130,6 +145,14 @@ internal float TopSplitterPercent
 
         internal bool ConfirmPlayOnDCOrEnter = true;
 
+        #region Show/hide UI elements
+
+        internal bool HideUninstallButton = false;
+        internal bool HideFMListZoomButtons = false;
+
+        #endregion
+
+
         internal float _readmeZoomFactor = 1;
         internal float ReadmeZoomFactor
         {

diff --git a/AngelLoader/Common/DataClasses/Localization.cs b/AngelLoader/Common/DataClasses/Localization.cs
@@ -163,6 +163,10 @@ internal static class FilterBar
 
         internal static class FMsList
         {
+            internal static string ZoomInToolTip = "Zoom in (Ctrl++)";
+            internal static string ZoomOutToolTip = "Zoom out (Ctrl+-)";
+            internal static string ResetZoomToolTip = "Reset zoom (Ctrl-0)";
+            [FenGenBlankLine]
             internal static string GameColumn = "Game";
             internal static string InstalledColumn = "Installed";
             internal static string TitleColumn = "Title";
@@ -268,9 +272,9 @@ internal static class PatchTab
         internal static class ReadmeArea
         {
             internal static string ViewHTMLReadme = "View HTML Readme";
-            internal static string ZoomInToolTip = "Zoom in";
-            internal static string ZoomOutToolTip = "Zoom out";
-            internal static string ResetZoomToolTip = "Reset zoom";
+            internal static string ZoomInToolTip = "Zoom in (Ctrl++)";
+            internal static string ZoomOutToolTip = "Zoom out (Ctrl+-)";
+            internal static string ResetZoomToolTip = "Reset zoom (Ctrl+0)";
             internal static string FullScreenToolTip = "Fullscreen";
             [FenGenBlankLine]
             internal static string NoReadmeFound = "No readme found.";
@@ -372,7 +376,6 @@ internal static class SettingsWindow
             [FenGenBlankLine]
             internal static string Other_UninstallingFMs = "Uninstalling FMs";
             internal static string Other_ConfirmBeforeUninstalling = "Confirm before uninstalling";
-            internal static string Other_HideUninstallButton = "Hide \"Install / Uninstall FM\" button (like FMSel)";
             internal static string Other_WhenUninstallingBackUp = "When uninstalling, back up:";
             internal static string Other_BackUpSavesAndScreenshotsOnly = "Saves and screenshots only";
             internal static string Other_BackUpAllChangedFiles = "All changed files";
@@ -387,6 +390,9 @@ internal static class SettingsWindow
             [FenGenBlankLine]
             internal static string Other_ConfirmPlayOnDCOrEnter = "Play FM on double-click / Enter";
             internal static string Other_ConfirmPlayOnDCOrEnter_Ask = "Ask for confirmation";
+            [FenGenBlankLine]
+            internal static string Other_HideUninstallButton = "Hide \"Install / Uninstall FM\" button (like FMSel)";
+            internal static string Other_HideFMListZoomButtons = "Hide FM list zoom buttons";
         }
 
         internal static class DateFilterBox

diff --git a/AngelLoader/English.ini b/AngelLoader/English.ini
@@ -130,6 +130,10 @@ ClearFiltersButtonToolTip=Clear filters
 ResetLayoutButtonToolTip=Reset layout
 
 [FMsList]
+ZoomInToolTip=Zoom in (Ctrl++)
+ZoomOutToolTip=Zoom out (Ctrl+-)
+ResetZoomToolTip=Reset zoom (Ctrl-0)
+
 GameColumn=Game
 InstalledColumn=Installed
 TitleColumn=Title
@@ -223,9 +227,9 @@ OpenFMFolder=Open FM folder
 
 [ReadmeArea]
 ViewHTMLReadme=View HTML Readme
-ZoomInToolTip=Zoom in
-ZoomOutToolTip=Zoom out
-ResetZoomToolTip=Reset zoom
+ZoomInToolTip=Zoom in (Ctrl++)
+ZoomOutToolTip=Zoom out (Ctrl+-)
+ResetZoomToolTip=Reset zoom (Ctrl+0)
 FullScreenToolTip=Fullscreen
 
 NoReadmeFound=No readme found.
@@ -317,7 +321,6 @@ Other_ConvertOGGsToWAVsOnInstall=Convert .oggs to .wavs on install
 
 Other_UninstallingFMs=Uninstalling FMs
 Other_ConfirmBeforeUninstalling=Confirm before uninstalling
-Other_HideUninstallButton=Hide "Install / Uninstall FM" button (like FMSel)
 Other_WhenUninstallingBackUp=When uninstalling, back up:
 Other_BackUpSavesAndScreenshotsOnly=Saves and screenshots only
 Other_BackUpAllChangedFiles=All changed files
@@ -333,6 +336,9 @@ Other_WebSearchResetToolTip=Reset to default
 Other_ConfirmPlayOnDCOrEnter=Play FM on double-click / Enter
 Other_ConfirmPlayOnDCOrEnter_Ask=Ask for confirmation
 
+Other_HideUninstallButton=Hide "Install / Uninstall FM" button (like FMSel)
+Other_HideFMListZoomButtons=Hide FM list zoom buttons
+
 [DateFilterBox]
 ReleaseDateTitleText=Set release date filter
 LastPlayedTitleText=Set last played filter