Added Submenu Item to open both link & comments

RedditBar/AppDelegate.m

@@ -144,7 +144,7 @@
     [self reloadListWithOptions];
 }
 
--(void)openAndRemoveAndReloadWithIndex:(NSInteger)index Comments:(Boolean)comments {
+-(void)openAndRemoveAndReloadWithIndex:(NSInteger)index Comments:(Boolean)comments Both:(Boolean)both {
     RedditItem *rItem = [redditItems objectAtIndex:index];
     NSString *url;
     if (comments)
@@ -152,6 +152,13 @@
     else
         url = [rItem link];
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
+    if (both) {
+        if (!comments)
+            url = [rItem comments];
+        else
+            url = [rItem link];
+        [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
+    }
     
     if (currentState.removeVisited) {
         // TODO remove selfpost, remove submenu if link & comments visited
@@ -172,12 +179,26 @@
 
 -(IBAction)linkToOpen:(id)sender {
     NSString *title = [(NSMenuItem *)sender title];
-    if ([title isEqualToString:NSLocalizedString(@"Link...", nil)] || [title isEqualToString:NSLocalizedString(@"Comments...", nil)]) {
+    if ([title isEqualToString:NSLocalizedString(@"Link...", nil)] || [title isEqualToString:NSLocalizedString(@"Comments...", nil)] || [title isEqualToString:NSLocalizedString(@"Both", nil)]) {
         for (NSUInteger i = 0; i < [menuItems count]; i++) {
             NSMenuItem *item = [menuItems objectAtIndex:i];
             NSMenu *submenu = item.submenu;
-            if ((submenu != nil) && (sender == [submenu itemAtIndex:([title isEqualToString:NSLocalizedString(@"Link...", nil)] ? 0 : 1)])) {
-                [self openAndRemoveAndReloadWithIndex:i Comments:[title isEqualToString:NSLocalizedString(@"Comments...", nil)]];
+            Boolean isComments = [title isEqualToString:NSLocalizedString(@"Comments...", nil)];
+            Boolean isBoth = [title isEqualToString:NSLocalizedString(@"Both", nil)];
+            if (isBoth) {
+                isComments = !isComments; // Open comments first, then link
+            }
+            
+            NSInteger index;
+            if ([title isEqualToString:NSLocalizedString(@"Link...", nil)])
+                index = 0;
+            else if ([title isEqualToString:NSLocalizedString(@"Comments...", nil)])
+                index = 1;
+            else
+                index = 2;
+            
+            if ((submenu != nil) && (sender == [submenu itemAtIndex:index])) {
+                [self openAndRemoveAndReloadWithIndex:i Comments:isComments Both:isBoth];
                 break;
             }
         }
@@ -185,7 +206,7 @@
         for (NSUInteger i = 0; i < [menuItems count]; i++) {
             NSMenuItem *item = [menuItems objectAtIndex:i];
             if (sender == item) {
-                [self openAndRemoveAndReloadWithIndex:i Comments:FALSE];
+                [self openAndRemoveAndReloadWithIndex:i Comments:FALSE Both:FALSE];
                 break;
             }
         }
@@ -228,6 +249,7 @@
         NSMenu *submenu = [[NSMenu alloc] init];
         [submenu addItemWithTitle:NSLocalizedString(@"Link...", @"Link item") action:@selector(linkToOpen:) keyEquivalent:@""];
         [submenu addItemWithTitle:NSLocalizedString(@"Comments...", @"comment item") action:@selector(linkToOpen:) keyEquivalent:@""];
+        [submenu addItemWithTitle:NSLocalizedString(@"Both", @"Link & Comment item") action:@selector(linkToOpen:) keyEquivalent:@""];
         [item setSubmenu:submenu];
     }
     return item;

RedditBar/RedditBar-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>286</string>
+	<string>290</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

RedditBar/RedditItem.h

@@ -35,6 +35,7 @@
 @property (atomic, retain) NSString *link; // link itself
 @property (atomic, retain) NSString *comments; // link to comments, or nil if isSelf is true
 @property (atomic) BOOL isSelf; // link or selfpost
+@property (atomic) NSInteger visitedCount; // used to keep track if both link & comments were opened to then remove item
 
 +(RedditItem *)itemWithName:(NSString *)name Link:(NSString *)link Comments:(NSString *)comments Self:(BOOL)isSelf;
 

RedditBar/RedditItem.m

@@ -30,7 +30,7 @@
 
 @implementation RedditItem
 
-@synthesize name, fullName, link, comments, isSelf;
+@synthesize name, fullName, link, comments, isSelf, visitedCount;
 
 +(RedditItem *)itemWithName:(NSString *)name Link:(NSString *)link Comments:(NSString *)comments Self:(BOOL)isSelf {
     RedditItem *i = [[RedditItem alloc] init];
@@ -38,6 +38,7 @@
     [i setLink:link];
     [i setComments:comments];
     [i setIsSelf:isSelf];
+    [i setVisitedCount:0];
     return i;
 }
 

RedditBar/de.lproj/Localizable.strings

@@ -1,6 +1,9 @@
 /* Pref Error */
 "Authentication Error" = "Authentfizierungsfehler";
 
+/* Link & Comment item */
+"Both" = "Beide";
+
 /* comment item */
 "Comments..." = "Kommentare...";