small corrections

wiegell · Nov 21, 2022 · 5c4bed4 · 5c4bed4
1 parent 63e44fe
commit 5c4bed4
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/AstroWall/ApplicationLayer/View/AppDelegate.Menu.cs b/AstroWall/ApplicationLayer/View/AppDelegate.Menu.cs
@@ -19,7 +19,7 @@ public void createStatusBar(string title)
             statusBar = NSStatusBar.SystemStatusBar;
             statusBarItem = statusBar.CreateStatusItem(NSStatusItemLength.Variable);
             General.InitIcon(statusBarItem, this.StatusMenu);
-            MenuTitle.Title = title;
+            setTitle( title);
         }
 
         public void updateMenuCheckMarks(Preferences prefs)
@@ -82,12 +82,13 @@ public void setSubTitle(string str)
         {
             General.RunOnUIThread(() =>
             {
-                MenuOutletState.Hidden = true;
+                MenuOutletState.Hidden = false;
+                MenuOutletState.Enabled = false;
                 MenuOutletState.Title = str;
             });
         }
 
-        public void hideSubTitle()
+        public void HideSubTitle()
         {
             General.RunOnUIThread(() =>
             {

diff --git a/AstroWall/BusinessLayer/ApplicationHandler.cs b/AstroWall/BusinessLayer/ApplicationHandler.cs
@@ -20,15 +20,15 @@ public class ApplicationHandler
         public Preferences.Preferences Prefs { get; private set; }
 
         // Misc
-        public Version CurrentVersion { private set; get; }
-        private string currentVersionString = General.currentVersion();
+        private string currentVersionStringWithCommit;
 
 
         public ApplicationHandler(AppDelegate del)
         {
             AppDelegate = del;
             MenuHandler = new MenuHandler(AppDelegate, this);
-            Updates = new Updates(this, currentVersionString);
+            currentVersionStringWithCommit = General.currentVersion();
+            Updates = new Updates(this, currentVersionStringWithCommit);
         }
 
         public async Task Init()
@@ -54,10 +54,10 @@ public void TerminationPreparations()
         private bool primaryInitAndCheckIfPrefsAreAvail()
         {
             // Create status bar icon / menu
-            MenuHandler.createStatusBar("Astrowall v" + currentVersionString);
+            MenuHandler.createStatusBar("Astrowall v" + Updates.currentVersion);
 
             // Init state
-            State = new State(this, currentVersionString);
+            State = new State(this, currentVersionStringWithCommit);
 
             // Load prefs. If non-present halt further actions until
             // preft are confirmed by user
@@ -127,17 +127,17 @@ public async Task checkForNewPics()
         {
 
             // Set state downloading
-            State.SetStateDownloading("Checking for new pics");
+            State.SetStateDownloading("Checking for new pics...");
             // Update db from online site
-            bool successfullOnlinCheck = await db.LoadDataButNoImgFromOnlineStartingAtDate(10, DateTime.Now);
+            bool successfullOnlinCheck = await db.LoadDataButNoImgFromOnlineStartingAtDate(20, DateTime.Now);
             if (successfullOnlinCheck)
             {
 
                 // Register successfull check in prefs
                 Prefs.LastOnlineCheck = DateTime.Now;
 
                 db.Sort();
-                State.SetStateDownloading("Downloading pictures");
+                State.SetStateDownloading("Downloading pictures...");
                 await db.LoadImgs();
 
                 // Update submenu

diff --git a/AstroWall/BusinessLayer/MenuHandler.cs b/AstroWall/BusinessLayer/MenuHandler.cs
@@ -72,11 +72,11 @@ public void DisableStatusIcon()
             appDelegate.disableStatusIcon();
         }
 
-        public void SetTitleInitialising()
+        public void SetSubTitleInitialising()
         {
             appDelegate.setSubTitle("Initializing...");
         }
-        public void SetTitleDownloading(string msg)
+        public void SetSubTitle(string msg)
         {
             appDelegate.setSubTitle(msg);
         }
@@ -129,11 +129,6 @@ public async Task SetIconToDefault()
             }
         }
 
-        public void HideState()
-        {
-
-        }
-
         public void PopulateSubmenuLatestPictures(List<ImgWrap> imgWrapList, State stateRef)
         {
 
@@ -234,6 +229,11 @@ public async void ClickedInMenuManualCheckForNewPic()
             await this.appHandler.checkForNewPics();
         }
 
+        public void HideSubtitle()
+        {
+            this.appHandler.AppDelegate.HideSubTitle();
+        }
+
         private void renewCancellationSource()
         {
             this.taskCancellationSource = new CancellationTokenSource();

diff --git a/AstroWall/BusinessLayer/State.cs b/AstroWall/BusinessLayer/State.cs
@@ -42,7 +42,7 @@ public void SetStateInitializing()
                 isInitializing = true;
                 applicationHandler.MenuHandler.EnableStatusIcon();
                 applicationHandler.MenuHandler.DisableAllItems();
-                applicationHandler.MenuHandler.SetTitleInitialising();
+                applicationHandler.MenuHandler.SetSubTitleInitialising();
                 applicationHandler.MenuHandler.RunSpinnerIconAnimation();
             }
         }
@@ -73,7 +73,7 @@ public void SetStateDownloading(string downloadingWhat, bool disableIcon = false
                     applicationHandler.MenuHandler.DisableStatusIcon();
                 }
                 applicationHandler.MenuHandler.DisableAllItems();
-                applicationHandler.MenuHandler.SetTitleDownloading(downloadingWhat);
+                applicationHandler.MenuHandler.SetSubTitle(downloadingWhat);
                 applicationHandler.MenuHandler.RunDownloadIconAnimation();
             }
         }
@@ -122,12 +122,12 @@ public void SetStatePostProcessing()
                 // No reason for multiple sets
                 if (!isPostProcessing)
                 {
-
-                Console.WriteLine("State: PostProcessing");
-                isPostProcessing = true;
-                isIdle = false;
-                // Check to see if animation already running
-                if (!isInitializing && !isDownloading) applicationHandler.MenuHandler.RunSpinnerIconAnimation();
+                    applicationHandler.MenuHandler.SetSubTitle("Processing picture...");
+                    Console.WriteLine("State: PostProcessing");
+                    isPostProcessing = true;
+                    isIdle = false;
+                    // Check to see if animation already running
+                    if (!isInitializing && !isDownloading) applicationHandler.MenuHandler.RunSpinnerIconAnimation();
                 }
             }
         }
@@ -189,8 +189,8 @@ private void trySetStateIdle()
                     Console.WriteLine("Setting state to idle:");
                     isIdle = true;
                     applicationHandler.MenuHandler.EnableStatusIcon();
-                    Task t =applicationHandler.MenuHandler.SetIconToDefault();
-                    applicationHandler.MenuHandler.HideState();
+                    Task t = applicationHandler.MenuHandler.SetIconToDefault();
+                    applicationHandler.MenuHandler.HideSubtitle();
                 }
             }
         }

diff --git a/AstroWall/BusinessLayer/Updates.cs b/AstroWall/BusinessLayer/Updates.cs
@@ -20,7 +20,7 @@ public class Updates
 
         // Misc
         public UpdateLibrary.Release pendingUpdate { private set; get; }
-        private Version currentVersion;
+        public Version currentVersion { get; private set; }
         private string pendingUpdatePKGpath;
 
         public Updates(ApplicationHandler applicationHandlerArg, string currentVersionString)

diff --git a/AstroWall/Main.storyboard b/AstroWall/Main.storyboard
@@ -553,6 +553,9 @@
                     <items>
                         <menuItem title="{{title placeholder}}" enabled="NO" identifier="header" id="XzL-bp-nyZ">
                             <modifierMask key="keyEquivalentModifierMask"/>
+                            <connections>
+                                <segue destination="YBH-Bd-rg8" kind="show" id="CBT-gw-Kos"/>
+                            </connections>
                         </menuItem>
                         <menuItem title="{{state placeholder}}" enabled="NO" identifier="state" id="gSP-HT-QMc">
                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -944,6 +947,9 @@
             <point key="canvasLocation" x="685" y="-1164"/>
         </scene>
     </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="sqK-k6-xIF"/>
+    </inferredMetricsTieBreakers>
     <resources>
         <image name="AppIconImage" width="256" height="256"/>
         <image name="MainIcon_rot_400_trans" width="24" height="24"/>