diff --git a/baRSS/Info.plist b/baRSS/Info.plist
index 412f020..142e014 100644
--- a/baRSS/Info.plist
+++ b/baRSS/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.9.1
+ 0.9.2
CFBundleURLTypes
@@ -32,7 +32,7 @@
CFBundleVersion
- 1078
+ 1122
LSMinimumSystemVersion
$(MACOSX_DEPLOYMENT_TARGET)
LSUIElement
diff --git a/baRSS/Preferences/General Tab/SettingsGeneral.h b/baRSS/Preferences/General Tab/SettingsGeneral.h
index 9abae2a..58396e5 100644
--- a/baRSS/Preferences/General Tab/SettingsGeneral.h
+++ b/baRSS/Preferences/General Tab/SettingsGeneral.h
@@ -23,5 +23,5 @@
#import
@interface SettingsGeneral : NSViewController
-
+@property (assign) IBOutlet NSView *appearanceView;
@end
diff --git a/baRSS/Preferences/General Tab/SettingsGeneral.xib b/baRSS/Preferences/General Tab/SettingsGeneral.xib
index db2dd2e..37e3568 100644
--- a/baRSS/Preferences/General Tab/SettingsGeneral.xib
+++ b/baRSS/Preferences/General Tab/SettingsGeneral.xib
@@ -8,6 +8,7 @@
+
@@ -37,287 +38,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -326,8 +48,8 @@
-
-
+
+
@@ -341,61 +63,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -404,8 +73,8 @@
-
-
+
+
@@ -420,8 +89,8 @@
-
diff --git a/baRSS/Preferences/General Tab/UserPrefs.m b/baRSS/Preferences/General Tab/UserPrefs.m
index bff6a12..c429863 100644
--- a/baRSS/Preferences/General Tab/UserPrefs.m
+++ b/baRSS/Preferences/General Tab/UserPrefs.m
@@ -67,19 +67,22 @@
#pragma mark - Hidden Plist Properties -
-/// @return The limit on how many links should be opened at the same time, if user holds the option key. Default: @c 10
+/// @return The limit on how many links should be opened at the same time, if user holds the option key.
+/// Default: @c 10
+ (NSUInteger)openFewLinksLimit {
return (NSUInteger)[self defaultInt:10 forKey:@"openFewLinksLimit"];
}
-/// @return The limit on when to truncate article titles (Short names setting must be active). Default: @c 60
+/// @return The limit on when to truncate article titles (Short names setting must be active).
+/// Default: @c 60
+ (NSUInteger)shortArticleNamesLimit {
return (NSUInteger)[self defaultInt:60 forKey:@"shortArticleNamesLimit"];
}
-/// @return The maximum number of articles displayed per feed. Default: @c 0 (no limitation)
+/// @return The maximum number of articles displayed per feed (Limit articles setting must be active).
+/// Default: @c 40
+ (NSUInteger)articlesInMenuLimit {
- return (NSUInteger)[self defaultInt:0 forKey:@"articlesInMenuLimit"];
+ return (NSUInteger)[self defaultInt:40 forKey:@"articlesInMenuLimit"];
}
@end
diff --git a/baRSS/Preferences/Preferences.m b/baRSS/Preferences/Preferences.m
index a282e90..ef178b1 100644
--- a/baRSS/Preferences/Preferences.m
+++ b/baRSS/Preferences/Preferences.m
@@ -51,6 +51,13 @@
self.window.contentView = self.settingsGeneral.view;
} else if ([sender.itemIdentifier isEqualToString:@"tabFeeds"]) {
self.window.contentView = self.settingsFeeds.view;
+ } else if ([sender.itemIdentifier isEqualToString:@"tabAppearance"]) {
+ if (self.settingsGeneral.view.frame.size.width > 0) {
+ // using side effect when reading settingsGeneral.view -> will load appearanceView too.
+ // TODO: generate view programmatically
+ self.window.contentView = nil;
+ }
+ self.window.contentView = self.settingsGeneral.appearanceView;
} else if ([sender.itemIdentifier isEqualToString:@"tabAbout"]) {
NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
self.lblAppName.objectValue = infoDict[@"CFBundleName"];
diff --git a/baRSS/Preferences/Preferences.xib b/baRSS/Preferences/Preferences.xib
index 3e5e9d3..d7d2adc 100644
--- a/baRSS/Preferences/Preferences.xib
+++ b/baRSS/Preferences/Preferences.xib
@@ -38,6 +38,11 @@
+
+
+
+
+
@@ -48,6 +53,7 @@
+
@@ -769,6 +775,7 @@ Cg
+
diff --git a/baRSS/Status Bar Menu/BarMenu.m b/baRSS/Status Bar Menu/BarMenu.m
index 971705a..56be5cf 100644
--- a/baRSS/Status Bar Menu/BarMenu.m
+++ b/baRSS/Status Bar Menu/BarMenu.m
@@ -106,7 +106,10 @@
/// Generate items for @c FeedArticles menu.
- (void)setArticles:(NSArray*)sortedList forMenu:(NSMenu*)menu {
[menu insertDefaultHeader];
- NSUInteger mc = [UserPrefs articlesInMenuLimit];
+ NSUInteger mc = 0;
+ if ([UserPrefs defaultNO:@"feedLimitArticles"]) {
+ mc = [UserPrefs articlesInMenuLimit];
+ }
for (FeedArticle *fa in sortedList) {
[menu addItem:[fa newMenuItem]];
if (--mc == 0) // if mc==0 then unsigned int will underflow and turn into INT_MAX