Final Mac Integration Commit

DecimalTurn · Dec 17, 2017 · dfbb508 · dfbb508
1 parent 444333f
commit dfbb508
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 27 deletions.
diff --git a/Pomodoro_Timer.xlsb b/Pomodoro_Timer.xlsb
diff --git a/src/Pomodoro_Timer.xlsb/Main.bas b/src/Pomodoro_Timer.xlsb/Main.bas
@@ -21,10 +21,12 @@ Sub PomodoroSession()
     BreakTime = Range("Break")
     BreakTimeSec = Range("Break_sec")
     AutoLaunch = True
-    If Range("Run_in_seperate_instance").Value = True And Reopen_decision = True And Not IsMac Then
-        MsgBox "To let you work with Excel while the timer is running, this file will now be reopen in a second instance of Excel." & vbNewLine & _
-        "Once, the file has been reopened, you will need to relaunch the timer."
-        Call OpenItSelfInAnotherInstance
+    If Not IsMac Then
+        If Range("Run_in_seperate_instance").Value = True And Reopen_decision = True Then
+            MsgBox "To let you work with Excel while the timer is Reopen_decisionrunning, this file will now be reopen in a second instance of Excel." & vbNewLine & _
+            "Once, the file has been reopened, you will need to relaunch the timer."
+            Call OpenItSelfInAnotherInstance
+        End If
     End If
     ThisWorkbook.Application.WindowState = xlMinimized
     PomodoroTimer.Show vbModeless

diff --git a/src/Pomodoro_Timer.xlsb/NamedRanges.csv b/src/Pomodoro_Timer.xlsb/NamedRanges.csv
diff --git a/src/Pomodoro_Timer.xlsb/PomodoroTimer.frm b/src/Pomodoro_Timer.xlsb/PomodoroTimer.frm
@@ -51,16 +51,18 @@ Private Sub UserForm_Initialize()
     End If
 
     If AutoLaunch Then
-        If Not IsMac Then
-            Call Launch_timer
-        Else
+        If IsMac Then
             Call Launch_timer_mac
         End If
     End If
 
 End Sub
 Private Sub UserForm_Activate()
-    'Nothing
+        If AutoLaunch Then
+            If Not IsMac Then
+                Call Launch_timer
+            End If
+        End If
 End Sub
 
 Private Sub Launch_timer()

diff --git a/src/Pomodoro_Timer.xlsb/PomodoroTimer.frx b/src/Pomodoro_Timer.xlsb/PomodoroTimer.frx
diff --git a/src/Pomodoro_Timer.xlsb/ThisWorkbook.sheet.cls b/src/Pomodoro_Timer.xlsb/ThisWorkbook.sheet.cls
@@ -1,5 +1,5 @@
 Private Sub Workbook_Open()
-    If Sheets("Settings").Range("Shortcut").Value = True Then
+    If Sheets("Settings").Range("Shortcut").Value = True And Not IsMac Then
         Call Shortcuts
     End If
     Call MacOptions
@@ -18,12 +18,14 @@ If IsMac Then
     Range("Custom_position").EntireRow.Hidden = True
     Range("Left_pos").EntireRow.Hidden = True
     Range("Top_pos").EntireRow.Hidden = True
+    Range("Shortcut").EntireRow.Hidden = True
 Else
     Range("Reopen_Excel_after_x").EntireRow.Hidden = False
     Range("Run_in_seperate_instance").EntireRow.Hidden = False
     Range("Custom_position").EntireRow.Hidden = False
     Range("Left_pos").EntireRow.Hidden = False
     Range("Top_pos").EntireRow.Hidden = False
+    Range("Shortcut").EntireRow.Hidden = False
 End If
 
 End Sub
diff --git a/src/Pomodoro_Timer.xlsb/Version.bas b/src/Pomodoro_Timer.xlsb/Version.bas
@@ -5,6 +5,8 @@ Option Explicit
 Public Function IsMac() As Boolean
 #If Mac Then
     IsMac = True
+#Else
+    IsMac = False
 #End If
 End Function