diff --git a/Clocker/Clocker/ca.lproj/Localizable.strings b/Clocker/Clocker/ca.lproj/Localizable.strings
index 0a49ba7..79f22a8 100644
--- a/Clocker/Clocker/ca.lproj/Localizable.strings
+++ b/Clocker/Clocker/ca.lproj/Localizable.strings
@@ -112,6 +112,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/de.lproj/Localizable.strings b/Clocker/Clocker/de.lproj/Localizable.strings
index 38ac9eb..f781fd0 100644
--- a/Clocker/Clocker/de.lproj/Localizable.strings
+++ b/Clocker/Clocker/de.lproj/Localizable.strings
@@ -327,3 +327,6 @@
/* Errors */
"You're offline, maybe?" = "You're offline, maybe?";
+"Preview" = "Preview";
+
+"Miscellaneous" = "Miscellaneous";
diff --git a/Clocker/Clocker/en.lproj/Localizable.strings b/Clocker/Clocker/en.lproj/Localizable.strings
index 0a49ba7..79f22a8 100644
--- a/Clocker/Clocker/en.lproj/Localizable.strings
+++ b/Clocker/Clocker/en.lproj/Localizable.strings
@@ -112,6 +112,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/es.lproj/Localizable.strings b/Clocker/Clocker/es.lproj/Localizable.strings
index 0a49ba7..79f22a8 100644
--- a/Clocker/Clocker/es.lproj/Localizable.strings
+++ b/Clocker/Clocker/es.lproj/Localizable.strings
@@ -112,6 +112,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/fr.lproj/Localizable.strings b/Clocker/Clocker/fr.lproj/Localizable.strings
index 0a49ba7..79f22a8 100644
--- a/Clocker/Clocker/fr.lproj/Localizable.strings
+++ b/Clocker/Clocker/fr.lproj/Localizable.strings
@@ -112,6 +112,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/hi.lproj/Localizable.strings b/Clocker/Clocker/hi.lproj/Localizable.strings
index 31548da..27adc12 100644
--- a/Clocker/Clocker/hi.lproj/Localizable.strings
+++ b/Clocker/Clocker/hi.lproj/Localizable.strings
@@ -108,6 +108,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/it.lproj/Localizable.strings b/Clocker/Clocker/it.lproj/Localizable.strings
index 8788d9d..5996d6e 100644
--- a/Clocker/Clocker/it.lproj/Localizable.strings
+++ b/Clocker/Clocker/it.lproj/Localizable.strings
@@ -113,6 +113,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/ja.lproj/Localizable.strings b/Clocker/Clocker/ja.lproj/Localizable.strings
index 06b78fe..c89196e 100644
--- a/Clocker/Clocker/ja.lproj/Localizable.strings
+++ b/Clocker/Clocker/ja.lproj/Localizable.strings
@@ -111,6 +111,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
@@ -153,3 +155,4 @@
"New Zealand" = "New Zealand";
"Florida" = "Florida";
"San Francisco" = "San Francisco";
+
diff --git a/Clocker/Clocker/ko.lproj/Localizable.strings b/Clocker/Clocker/ko.lproj/Localizable.strings
index 06b78fe..6746fbf 100644
--- a/Clocker/Clocker/ko.lproj/Localizable.strings
+++ b/Clocker/Clocker/ko.lproj/Localizable.strings
@@ -111,6 +111,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/nl.lproj/Localizable.strings b/Clocker/Clocker/nl.lproj/Localizable.strings
index 0a49ba7..79f22a8 100644
--- a/Clocker/Clocker/nl.lproj/Localizable.strings
+++ b/Clocker/Clocker/nl.lproj/Localizable.strings
@@ -112,6 +112,8 @@
"Include Place Name" = "Include Place Name";
"Menubar Display Options" = "Menubar Display Options";
"Menubar Mode" = "Menubar Mode";
+"Preview" = "Preview";
+"Miscellaneous" = "Miscellaneous";
// Empty View
"No places added" = "No places added";
diff --git a/Clocker/Clocker/ru.lproj/Localizable.strings b/Clocker/Clocker/ru.lproj/Localizable.strings
index 2df876f..a1776b4 100644
--- a/Clocker/Clocker/ru.lproj/Localizable.strings
+++ b/Clocker/Clocker/ru.lproj/Localizable.strings
@@ -327,3 +327,6 @@
/* Errors */
"You're offline, maybe?" = "You're offline, maybe?";
+"Preview" = "Preview";
+
+"Miscellaneous" = "Miscellaneous";
diff --git a/Clocker/Clocker/zh-Hans.lproj/Localizable.strings b/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
index af72b4c..43b7460 100644
--- a/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
+++ b/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
@@ -327,3 +327,6 @@
/* Errors */
"You're offline, maybe?" = "You're offline, maybe?";
+"Preview" = "Preview";
+
+"Miscellaneous" = "Miscellaneous";
diff --git a/Clocker/Preferences/Appearance/AppearanceViewController.swift b/Clocker/Preferences/Appearance/AppearanceViewController.swift
index fac5c9a..3ee4a57 100644
--- a/Clocker/Preferences/Appearance/AppearanceViewController.swift
+++ b/Clocker/Preferences/Appearance/AppearanceViewController.swift
@@ -12,6 +12,7 @@ class AppearanceViewController: ParentViewController {
@IBOutlet var includeDayInMenubarControl: NSSegmentedControl!
@IBOutlet var includeDateInMenubarControl: NSSegmentedControl!
@IBOutlet var includePlaceNameControl: NSSegmentedControl!
+ @IBOutlet var appearanceTab: NSTabView!
private var themeDidChangeNotification: NSObjectProtocol?
@@ -50,16 +51,21 @@ class AppearanceViewController: ParentViewController {
"place_id": "TestIdentifier",
"timezoneID": "America/Los_Angeles",
"nextUpdate": "",
- "note": "Remember to finish setting up Clocker!",
+ "note": "Your individual note about this location goes here!",
"latitude": "37.7749295",
"longitude": "-122.4194155"])]
+ // Ensure the more beautiful tab is selected
+ appearanceTab.selectTabViewItem(at: 0)
+
// Setup Preview Pane
previewPanelTableView.dataSource = self
previewPanelTableView.delegate = self
previewPanelTableView.reloadData()
previewPanelTableView.selectionHighlightStyle = .none
previewPanelTableView.enclosingScrollView?.hasVerticalScroller = false
+ previewPanelTableView.enclosingScrollView?.wantsLayer = true
+ previewPanelTableView.enclosingScrollView?.layer?.cornerRadius = 12
}
deinit {
@@ -110,12 +116,12 @@ class AppearanceViewController: ParentViewController {
@IBOutlet var includeDateLabel: NSTextField!
@IBOutlet var includeDayLabel: NSTextField!
@IBOutlet var includePlaceLabel: NSTextField!
- @IBOutlet var menubarDisplayOptionsLabel: NSTextField!
@IBOutlet var appDisplayLabel: NSTextField!
@IBOutlet var menubarModeLabel: NSTextField!
+ @IBOutlet var previewLabel: NSTextField!
+ @IBOutlet var miscelleaneousLabel: NSTextField!
// Panel Preview
-
@IBOutlet var previewPanelTableView: NSTableView!
private func setup() {
@@ -131,12 +137,14 @@ class AppearanceViewController: ParentViewController {
includeDayLabel.stringValue = "Include Day".localized()
includePlaceLabel.stringValue = "Include Place Name".localized()
menubarModeLabel.stringValue = "Menubar Mode".localized()
+ previewLabel.stringValue = "Preview".localized()
+ miscelleaneousLabel.stringValue = "Miscellaneous".localized()
[timeFormatLabel, panelTheme,
dayDisplayOptionsLabel, showSliderLabel, showSecondsLabel,
showSunriseLabel, largerTextLabel, futureSliderRangeLabel,
- includeDayLabel, includeDateLabel, includePlaceLabel,
- menubarDisplayOptionsLabel, appDisplayLabel, menubarModeLabel].forEach {
+ includeDayLabel, includeDateLabel, includePlaceLabel, appDisplayLabel, menubarModeLabel,
+ previewLabel, miscelleaneousLabel].forEach {
$0?.textColor = Themer.shared().mainTextColor()
}
}
@@ -194,17 +202,23 @@ class AppearanceViewController: ParentViewController {
}
}
- @IBAction func changeRelativeDayDisplay(_ sender: NSSegmentedControl) {
- let selectedIndex = NSNumber(value: sender.selectedSegment)
- var selection = "Relative Day"
-
- if selectedIndex == 1 {
- selection = "Actual Day"
- } else if selectedIndex == 2 {
- selection = "Actual Date Day"
+ private func loggingStringForRelativeDisplaySelection(_ selection: Int) -> String {
+ switch selection {
+ case 0:
+ return "Relative Day"
+ case 1:
+ return "Actual Day"
+ case 2:
+ return "Actual Date Day"
+ case 3:
+ return "Hide"
+ default:
+ return "Unexpected Selection"
}
+ }
- Logger.log(object: ["dayPreference": selection], for: "RelativeDate")
+ @IBAction func changeRelativeDayDisplay(_ sender: NSSegmentedControl) {
+ Logger.log(object: ["dayPreference": loggingStringForRelativeDisplaySelection(sender.selectedSegment)], for: "RelativeDate")
refresh(panel: true, floating: true)
diff --git a/Clocker/Preferences/Preferences.storyboard b/Clocker/Preferences/Preferences.storyboard
index 995b392..e1d97c2 100644
--- a/Clocker/Preferences/Preferences.storyboard
+++ b/Clocker/Preferences/Preferences.storyboard
@@ -768,20 +768,20 @@
-
+
-
+
-
+
-
+
@@ -795,7 +795,7 @@
-
+
@@ -809,7 +809,7 @@
-
+
@@ -820,7 +820,7 @@
-
+
@@ -831,7 +831,7 @@
-
+
@@ -842,7 +842,7 @@
-
+
@@ -858,7 +858,7 @@
-
+
@@ -872,7 +872,7 @@
-
+
@@ -880,7 +880,7 @@
-
+
@@ -888,7 +888,7 @@
-
+
@@ -899,7 +899,7 @@
-
+
@@ -914,7 +914,7 @@
-
+
@@ -925,7 +925,7 @@
-
+
@@ -933,7 +933,7 @@
-
+
@@ -1109,18 +1109,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1130,6 +1142,7 @@
+
@@ -1140,6 +1153,7 @@
+
@@ -1151,11 +1165,11 @@
-
+
-
+
@@ -1166,7 +1180,7 @@
-
+
@@ -1180,7 +1194,7 @@
-
+
@@ -1188,7 +1202,7 @@
-
+
@@ -1202,7 +1216,7 @@
-
+
@@ -1219,7 +1233,7 @@
-
+
@@ -1227,7 +1241,7 @@
-
+
@@ -1235,7 +1249,7 @@
-
+
@@ -1249,7 +1263,7 @@
-
+
@@ -1261,17 +1275,20 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
@@ -1279,9 +1296,13 @@
+
+
+
+
-
+
@@ -1295,7 +1316,7 @@
-
+
@@ -1306,7 +1327,7 @@
-
+
@@ -1317,7 +1338,7 @@
-
+
@@ -1332,7 +1353,7 @@
-
+
@@ -1346,7 +1367,7 @@
-
+
@@ -1356,6 +1377,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1364,11 +1397,12 @@
-
-
+
+
+
@@ -1379,22 +1413,23 @@
+
+
-
-
+
-
+
-
+
@@ -1410,6 +1445,7 @@
+
@@ -1418,10 +1454,13 @@
+
+
+
@@ -1430,12 +1469,13 @@
+
-
+