Version 1.3.0. Can select hot or new.

RedditBar/AppDelegate.h

@@ -66,6 +66,6 @@
 -(void)reloadListHasFrontpageCallback:(NSArray *)items;
 -(void)readPMsCallback:(NSNumber *)items;
 
--(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length printSubs:(Boolean)showSubreddits titleLength:(NSInteger)titleLength refresh:(NSInteger)refreshInterval;
+-(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length printSubs:(Boolean)showSubreddits titleLength:(NSInteger)titleLength refresh:(NSInteger)refreshInterval filter:(NSString *)filter;
 
 @end

RedditBar/AppDelegate.m

@@ -234,7 +234,7 @@
     [application orderFrontStandardAboutPanel:self];
 }
 
--(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length printSubs:(Boolean)showSubreddits titleLength:(NSInteger)titleLength refresh:(NSInteger)refreshInterval {
+-(void)prefReturnName:(NSString *)name Modhash:(NSString *)modhash subscriptions:(Boolean)subscriptions subreddits:(NSString *)subreddits length:(NSInteger)length printSubs:(Boolean)showSubreddits titleLength:(NSInteger)titleLength refresh:(NSInteger)refreshInterval filter:(NSString *)filter {
     currentState.username = name;
     currentState.modhash = modhash;
     currentState.useSubscriptions = subscriptions;
@@ -243,7 +243,11 @@
     currentState.showSubreddit = showSubreddits;
     currentState.titleLength = titleLength;
     currentState.refreshInterval = refreshInterval;
+    currentState.filter = filter;
     [currentState savePreferences];
+    [firstMenuItem setTitle:NSLocalizedString(@"Loading...", nil)];
+    [self clearMenuItems];
+    [firstMenuItem setHidden:NO];
     lastFullName = nil; // reload from start
     [self reloadListWithOptions];
     [self recreateRefreshTimer];

RedditBar/Base.lproj/Prefs.strings

@@ -26,6 +26,9 @@
 /* Class = "NSButtonCell"; title = "Save"; ObjectID = "Mqa-FJ-C43"; */
 "Mqa-FJ-C43.title" = "Save";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Ow7-gc-PGv"; */
+"Ow7-gc-PGv.title" = "OtherViews";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "TjO-Z6-Vng"; */
 "TjO-Z6-Vng.title" = "Cancel";
 
@@ -35,12 +38,18 @@
 /* Class = "NSTextFieldCell"; title = "66"; ObjectID = "b76-4r-MEp"; */
 "b76-4r-MEp.title" = "66";
 
+/* Class = "NSTextFieldCell"; title = "Filter:"; ObjectID = "coc-11-MQH"; */
+"coc-11-MQH.title" = "Filter:";
+
 /* Class = "NSTextFieldCell"; title = "PM Refresh (in Minutes):"; ObjectID = "cwK-wP-wB6"; */
 "cwK-wP-wB6.title" = "PM Refresh (in Minutes):";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "czz-51-wxr"; */
 "czz-51-wxr.title" = "Edit";
 
+/* Class = "NSMenuItem"; title = "new"; ObjectID = "dxr-Ml-O8i"; */
+"dxr-Ml-O8i.title" = "new";
+
 /* Class = "NSTextFieldCell"; title = "5"; ObjectID = "gZN-n2-TGX"; */
 "gZN-n2-TGX.title" = "5";
 
@@ -59,5 +68,8 @@
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
+/* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
+"sKV-FZ-wbQ.title" = "hot";
+
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";

RedditBar/Base.lproj/Prefs.xib

@@ -7,6 +7,7 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PrefController">
             <connections>
+                <outlet property="filterSelection" destination="FR2-RR-NOg" id="sOl-hW-dbV"/>
                 <outlet property="lengthField" destination="MAv-jO-hIv" id="tbQ-UG-2ew"/>
                 <outlet property="lengthStepper" destination="jxz-fQ-M1L" id="NK5-G4-9UJ"/>
                 <outlet property="password" destination="ARP-lb-J16" id="EDd-om-ciF"/>
@@ -27,14 +28,14 @@
         <window title="RedditBar Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" animationBehavior="default" id="1" customClass="PrefWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="340" height="363"/>
+            <rect key="contentRect" x="196" y="240" width="340" height="398"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="340" height="363"/>
+                <rect key="frame" x="0.0" y="0.0" width="340" height="398"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" id="0mi-88-o94">
-                        <rect key="frame" x="120" y="323" width="200" height="22"/>
+                        <rect key="frame" x="120" y="358" width="200" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="xlI-hU-MqM">
                             <font key="font" metaFont="system"/>
@@ -43,7 +44,7 @@
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="f72-fM-yQc">
-                        <rect key="frame" x="18" y="328" width="96" height="17"/>
+                        <rect key="frame" x="18" y="363" width="96" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username: " id="GTO-OP-MYS">
                             <font key="font" metaFont="system"/>
@@ -52,7 +53,7 @@
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="JMQ-a6-DKC">
-                        <rect key="frame" x="18" y="294" width="96" height="17"/>
+                        <rect key="frame" x="18" y="329" width="96" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Password:" id="m11-YF-fEa">
                             <font key="font" metaFont="system"/>
@@ -61,7 +62,7 @@
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qFP-pd-32c">
-                        <rect key="frame" x="18" y="128" width="63" height="17"/>
+                        <rect key="frame" x="18" y="163" width="63" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Items:" id="FNJ-RL-DXT">
                             <font key="font" metaFont="system"/>
@@ -70,7 +71,7 @@
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="O82-1u-lSr">
-                        <rect key="frame" x="152" y="128" width="63" height="17"/>
+                        <rect key="frame" x="152" y="163" width="63" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Title:" id="Frl-AE-ROJ">
                             <font key="font" metaFont="system"/>
@@ -79,7 +80,7 @@
                         </textFieldCell>
                     </textField>
                     <secureTextField verticalHuggingPriority="750" id="ARP-lb-J16">
-                        <rect key="frame" x="120" y="291" width="200" height="22"/>
+                        <rect key="frame" x="120" y="326" width="200" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="We7-pG-rAt">
                             <font key="font" metaFont="system"/>
@@ -116,7 +117,7 @@ Gw
                         </connections>
                     </button>
                     <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="8ew-wY-1Yh">
-                        <rect key="frame" x="20" y="153" width="300" height="100"/>
+                        <rect key="frame" x="20" y="188" width="300" height="100"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" copiesOnScroll="NO" id="ENU-Jw-8fO">
                             <rect key="frame" x="1" y="1" width="298" height="98"/>
@@ -145,7 +146,7 @@ Gw
                         </scroller>
                     </scrollView>
                     <button id="XZM-90-hQ8">
-                        <rect key="frame" x="18" y="260" width="280" height="25"/>
+                        <rect key="frame" x="18" y="295" width="280" height="25"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="vW5-Cp-Bm1">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -156,7 +157,7 @@ Gw
                         </connections>
                     </button>
                     <textField verticalHuggingPriority="750" id="MAv-jO-hIv">
-                        <rect key="frame" x="87" y="125" width="38" height="22"/>
+                        <rect key="frame" x="87" y="160" width="38" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="10" drawsBackground="YES" id="0SD-Tf-uZS">
                             <font key="font" metaFont="system"/>
@@ -169,7 +170,7 @@ Gw
                         </connections>
                     </textField>
                     <textField verticalHuggingPriority="750" id="qju-1J-OOV">
-                        <rect key="frame" x="221" y="125" width="38" height="22"/>
+                        <rect key="frame" x="221" y="160" width="38" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="66" drawsBackground="YES" id="b76-4r-MEp">
                             <font key="font" metaFont="system"/>
@@ -182,7 +183,7 @@ Gw
                         </connections>
                     </textField>
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="jxz-fQ-M1L">
-                        <rect key="frame" x="130" y="122" width="19" height="27"/>
+                        <rect key="frame" x="130" y="157" width="19" height="27"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="Gba-jV-Ouh"/>
                         <connections>
@@ -191,7 +192,7 @@ Gw
                         </connections>
                     </stepper>
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="2aV-fo-xh7">
-                        <rect key="frame" x="264" y="122" width="19" height="27"/>
+                        <rect key="frame" x="264" y="157" width="19" height="27"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="BWQ-gm-H9h"/>
                         <connections>
@@ -200,11 +201,11 @@ Gw
                         </connections>
                     </stepper>
                     <progressIndicator canDrawConcurrently="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="vz0-tR-n1f">
-                        <rect key="frame" x="304" y="264" width="16" height="16"/>
+                        <rect key="frame" x="304" y="299" width="16" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     </progressIndicator>
                     <button id="fRR-M9-szp">
-                        <rect key="frame" x="18" y="93" width="304" height="18"/>
+                        <rect key="frame" x="18" y="128" width="304" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Show Subreddit after Title" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="nFK-xi-2F3">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -212,7 +213,7 @@ Gw
                         </buttonCell>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="6zt-jq-NXJ">
-                        <rect key="frame" x="18" y="61" width="236" height="17"/>
+                        <rect key="frame" x="6" y="64" width="236" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="PM Refresh (in Minutes):" id="cwK-wP-wB6">
                             <font key="font" metaFont="system"/>
@@ -221,14 +222,14 @@ Gw
                         </textFieldCell>
                     </textField>
                     <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="paW-kV-tNF">
-                        <rect key="frame" x="12" y="84" width="316" height="5"/>
+                        <rect key="frame" x="12" y="87" width="316" height="5"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <font key="titleFont" metaFont="system"/>
                     </box>
                     <textField verticalHuggingPriority="750" id="2J7-SH-Grc">
-                        <rect key="frame" x="260" y="58" width="38" height="22"/>
+                        <rect key="frame" x="248" y="61" width="38" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="5" drawsBackground="YES" id="gZN-n2-TGX">
                             <font key="font" metaFont="system"/>
@@ -241,7 +242,7 @@ Gw
                         </connections>
                     </textField>
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="uaS-Xm-tIa">
-                        <rect key="frame" x="303" y="55" width="19" height="27"/>
+                        <rect key="frame" x="291" y="58" width="19" height="27"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="rTZ-Zs-1eO"/>
                         <connections>
@@ -249,6 +250,33 @@ Gw
                             <outlet property="formatter" destination="Y11-Cs-X1g" id="hoL-jC-QPe"/>
                         </connections>
                     </stepper>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="cec-PF-2Hn">
+                        <rect key="frame" x="18" y="98" width="130" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Filter:" id="coc-11-MQH">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <popUpButton verticalHuggingPriority="750" id="FR2-RR-NOg">
+                        <rect key="frame" x="164" y="93" width="159" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="zJW-6u-fHd">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <menu key="menu" title="OtherViews" id="Ow7-gc-PGv">
+                                <items>
+                                    <menuItem title="hot" state="on" id="sKV-FZ-wbQ">
+                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                    </menuItem>
+                                    <menuItem title="new" id="dxr-Ml-O8i">
+                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                    </menuItem>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                    </popUpButton>
                 </subviews>
             </view>
         </window>

RedditBar/PrefController.h

@@ -39,15 +39,17 @@
 @property (atomic, retain) IBOutlet NSTextField *lengthField;
 @property (atomic, retain) IBOutlet NSStepper *lengthStepper;
 @property (atomic, retain) IBOutlet NSProgressIndicator *progress;
-@property (weak) IBOutlet NSButton *showSubreddit;
-@property (atomic, retain) NSObject *parent;
-@property (atomic, retain) StateModel *state;
-@property (atomic) NSInteger length;
+@property (atomic, retain) IBOutlet NSButton *showSubreddit;
 @property (atomic, retain) IBOutlet NSTextField *titleField;
 @property (atomic, retain) IBOutlet NSStepper *titleStepper;
-@property (atomic) NSInteger titleLength;
 @property (atomic, retain) IBOutlet NSTextField *refreshField;
 @property (atomic, retain) IBOutlet NSStepper *refreshStepper;
+@property (atomic, retain) IBOutlet NSPopUpButton *filterSelection;
+
+@property (atomic, retain) NSObject *parent;
+@property (atomic, retain) StateModel *state;
+@property (atomic) NSInteger length;
+@property (atomic) NSInteger titleLength;
 @property (atomic) NSInteger refreshInterval;
 
 -(IBAction)buttonSave:(id)sender;

RedditBar/PrefController.m

@@ -34,7 +34,7 @@
 NSString *modhashSetLiteral = @"__MODHASH__IS__SET__";
 NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_\n";
 
-@synthesize username, password, subscriptions, subreddits, win, parent, state, lengthField, lengthStepper, length, progress, showSubreddit, titleField, titleStepper, titleLength, refreshField, refreshStepper, refreshInterval;
+@synthesize username, password, subscriptions, subreddits, win, parent, state, lengthField, lengthStepper, length, progress, showSubreddit, titleField, titleStepper, titleLength, refreshField, refreshStepper, refreshInterval, filterSelection;
 
 -(Boolean)isValidList:(NSString *)input {
     NSCharacterSet *invalidChars = [[NSCharacterSet characterSetWithCharactersInString:subredditCharacters] invertedSet];
@@ -70,6 +70,11 @@ NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRST
     [refreshField setIntegerValue:refreshInterval];
     [progress setUsesThreadedAnimation:YES];
     [showSubreddit setState:[NSNumber numberWithBool:state.showSubreddit].integerValue];
+    if ([state.filter isEqualToString:@"hot"]) {
+        [filterSelection selectItemAtIndex:0];
+    } else {
+        [filterSelection selectItemAtIndex:1];
+    }
 }
 
 -(IBAction)buttonSave:(id)sender {
@@ -132,7 +137,7 @@ NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRST
         print = FALSE;
     
     AppDelegate *app = (AppDelegate *)parent;
-    [app prefReturnName:username.stringValue Modhash:modhash subscriptions:subs subreddits:subreddits.textStorage.string length:[lengthField integerValue] printSubs:print titleLength:[titleField integerValue] refresh:[refreshField integerValue]];
+    [app prefReturnName:username.stringValue Modhash:modhash subscriptions:subs subreddits:subreddits.textStorage.string length:[lengthField integerValue] printSubs:print titleLength:[titleField integerValue] refresh:[refreshField integerValue] filter:[filterSelection titleOfSelectedItem]];
     [win performClose:self];
 }
 

RedditBar/Reddit.m

@@ -106,11 +106,12 @@ NSString *subredditFormat = @" [r/%@]";
     
     NSString *after = ((AppDelegate *)parent).lastFullName;
     Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
+    NSString *where = ((AppDelegate *)parent).currentState.filter;
     NSString *url;
     if (after == nil)
-        url = [NSString stringWithFormat:@"hot.json?limit=%ld", (long)length];
+        url = [NSString stringWithFormat:@"%@.json?limit=%ld", where, (long)length];
     else
-        url = [NSString stringWithFormat:@"hot.json?limit=%ld&after=%@", (long)length, after];
+        url = [NSString stringWithFormat:@"%@.json?limit=%ld&after=%@", where, (long)length, after];
         
     NSData *data = [self queryAPI:url withResponse:&response];
     if ((data == nil) || ([response statusCode] != 200)) {
@@ -131,11 +132,12 @@ NSString *subredditFormat = @" [r/%@]";
     
     NSString *after = ((AppDelegate *)parent).lastFullName;
     Boolean showSubreddits = ((AppDelegate *)parent).currentState.showSubreddit;
+    NSString *where = ((AppDelegate *)parent).currentState.filter;
     NSString *url;
     if (after == nil)
-        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld", subs, (long)length];
+        url = [NSString stringWithFormat:@"%@/%@.json?limit=%ld", subs, where, (long)length];
     else
-        url = [NSString stringWithFormat:@"%@/hot.json?limit=%ld&after=%@", subs, (long)length, after];
+        url = [NSString stringWithFormat:@"%@/%@.json?limit=%ld&after=%@", subs, where, (long)length, after];
     
     NSHTTPURLResponse *response;
     NSData *data = [self queryAPI:url withResponse:&response];

RedditBar/RedditBar-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>266</string>
+	<string>274</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

RedditBar/StateModel.h

@@ -38,6 +38,7 @@
 @property (atomic) Boolean showSubreddit;
 @property (atomic) NSInteger titleLength;
 @property (atomic) NSInteger refreshInterval;
+@property (atomic, retain) NSString *filter;
 
 -(void)registerDefaultPreferences;
 -(void)savePreferences;

RedditBar/StateModel.m

@@ -30,7 +30,7 @@
 
 @implementation StateModel
 
-@synthesize username, modhash, useSubscriptions, subreddits, length, showSubreddit, titleLength, refreshInterval;
+@synthesize username, modhash, useSubscriptions, subreddits, length, showSubreddit, titleLength, refreshInterval, filter;
 
 NSString *s_username = @"username";
 NSString *s_modhash = @"modhash";
@@ -40,6 +40,7 @@ NSString *s_length = @"length";
 NSString *s_subs = @"showSubs";
 NSString *s_title = @"titleLength";
 NSString *s_refresh = @"refreshInterval";
+NSString *s_filter = @"filter";
 
 -(void)registerDefaultPreferences {
     NSUserDefaults *store = [NSUserDefaults standardUserDefaults];
@@ -50,6 +51,7 @@ NSString *s_refresh = @"refreshInterval";
     [appDefaults setValue:[NSNumber numberWithBool:YES] forKey:s_subs];
     [appDefaults setValue:[NSNumber numberWithInt:66] forKey:s_title];
     [appDefaults setValue:[NSNumber numberWithInt:5] forKey:s_refresh];
+    [appDefaults setValue:@"hot" forKey:s_filter];
     [store registerDefaults:appDefaults];
 }
 
@@ -63,6 +65,7 @@ NSString *s_refresh = @"refreshInterval";
     [store setBool:showSubreddit forKey:s_subs];
     [store setInteger:titleLength forKey:s_title];
     [store setInteger:refreshInterval forKey:s_refresh];
+    [store setObject:filter forKey:s_filter];
     [store synchronize];
 }
 
@@ -77,6 +80,7 @@ NSString *s_refresh = @"refreshInterval";
     showSubreddit = [store boolForKey:s_subs];
     titleLength = [store integerForKey:s_title];
     refreshInterval = [store integerForKey:s_refresh];
+    filter = [store stringForKey:s_filter];
 }
 
 @end

RedditBar/de.lproj/Prefs.strings

@@ -25,6 +25,9 @@
 /* Class = "NSButtonCell"; title = "Save"; ObjectID = "Mqa-FJ-C43"; */
 "Mqa-FJ-C43.title" = "Speichern";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Ow7-gc-PGv"; */
+"Ow7-gc-PGv.title" = "OtherViews";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "TjO-Z6-Vng"; */
 "TjO-Z6-Vng.title" = "Abbrechen";
 
@@ -34,12 +37,18 @@
 /* Class = "NSTextFieldCell"; title = "66"; ObjectID = "b76-4r-MEp"; */
 "b76-4r-MEp.title" = "66";
 
+/* Class = "NSTextFieldCell"; title = "Filter:"; ObjectID = "coc-11-MQH"; */
+"coc-11-MQH.title" = "Filter:";
+
 /* Class = "NSTextFieldCell"; title = "PM Refresh (in Minutes):"; ObjectID = "cwK-wP-wB6"; */
 "cwK-wP-wB6.title" = "PM Aktualisierung (in Minuten):";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "czz-51-wxr"; */
 "czz-51-wxr.title" = "Bearbeiten";
 
+/* Class = "NSMenuItem"; title = "new"; ObjectID = "dxr-Ml-O8i"; */
+"dxr-Ml-O8i.title" = "new";
+
 /* Class = "NSTextFieldCell"; title = "5"; ObjectID = "gZN-n2-TGX"; */
 "gZN-n2-TGX.title" = "5";
 
@@ -58,6 +67,9 @@
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Alle auswählen";
 
+/* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
+"sKV-FZ-wbQ.title" = "hot";
+
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Kopieren";
 

RedditBar/en.lproj/Prefs.strings

@@ -25,6 +25,9 @@
 /* Class = "NSButtonCell"; title = "Save"; ObjectID = "Mqa-FJ-C43"; */
 "Mqa-FJ-C43.title" = "Save";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Ow7-gc-PGv"; */
+"Ow7-gc-PGv.title" = "OtherViews";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "TjO-Z6-Vng"; */
 "TjO-Z6-Vng.title" = "Cancel";
 
@@ -34,12 +37,18 @@
 /* Class = "NSTextFieldCell"; title = "66"; ObjectID = "b76-4r-MEp"; */
 "b76-4r-MEp.title" = "66";
 
+/* Class = "NSTextFieldCell"; title = "Filter:"; ObjectID = "coc-11-MQH"; */
+"coc-11-MQH.title" = "Filter:";
+
 /* Class = "NSTextFieldCell"; title = "PM Refresh (in Minutes):"; ObjectID = "cwK-wP-wB6"; */
 "cwK-wP-wB6.title" = "PM Refresh (in Minutes):";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "czz-51-wxr"; */
 "czz-51-wxr.title" = "Edit";
 
+/* Class = "NSMenuItem"; title = "new"; ObjectID = "dxr-Ml-O8i"; */
+"dxr-Ml-O8i.title" = "new";
+
 /* Class = "NSTextFieldCell"; title = "5"; ObjectID = "gZN-n2-TGX"; */
 "gZN-n2-TGX.title" = "5";
 
@@ -58,6 +67,9 @@
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
+/* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
+"sKV-FZ-wbQ.title" = "hot";
+
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";
 

RedditBarTests/de.lproj/Prefs.strings

@@ -25,6 +25,9 @@
 /* Class = "NSButtonCell"; title = "Save"; ObjectID = "Mqa-FJ-C43"; */
 "Mqa-FJ-C43.title" = "Save";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Ow7-gc-PGv"; */
+"Ow7-gc-PGv.title" = "OtherViews";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "TjO-Z6-Vng"; */
 "TjO-Z6-Vng.title" = "Cancel";
 
@@ -34,12 +37,18 @@
 /* Class = "NSTextFieldCell"; title = "66"; ObjectID = "b76-4r-MEp"; */
 "b76-4r-MEp.title" = "66";
 
+/* Class = "NSTextFieldCell"; title = "Filter:"; ObjectID = "coc-11-MQH"; */
+"coc-11-MQH.title" = "Filter:";
+
 /* Class = "NSTextFieldCell"; title = "PM Refresh (in Minutes):"; ObjectID = "cwK-wP-wB6"; */
 "cwK-wP-wB6.title" = "PM Refresh (in Minutes):";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "czz-51-wxr"; */
 "czz-51-wxr.title" = "Edit";
 
+/* Class = "NSMenuItem"; title = "new"; ObjectID = "dxr-Ml-O8i"; */
+"dxr-Ml-O8i.title" = "new";
+
 /* Class = "NSTextFieldCell"; title = "5"; ObjectID = "gZN-n2-TGX"; */
 "gZN-n2-TGX.title" = "5";
 
@@ -58,6 +67,9 @@
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
+/* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
+"sKV-FZ-wbQ.title" = "hot";
+
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";
 

RedditBarTests/en.lproj/Prefs.strings

@@ -25,6 +25,9 @@
 /* Class = "NSButtonCell"; title = "Save"; ObjectID = "Mqa-FJ-C43"; */
 "Mqa-FJ-C43.title" = "Save";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Ow7-gc-PGv"; */
+"Ow7-gc-PGv.title" = "OtherViews";
+
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "TjO-Z6-Vng"; */
 "TjO-Z6-Vng.title" = "Cancel";
 
@@ -34,12 +37,18 @@
 /* Class = "NSTextFieldCell"; title = "66"; ObjectID = "b76-4r-MEp"; */
 "b76-4r-MEp.title" = "66";
 
+/* Class = "NSTextFieldCell"; title = "Filter:"; ObjectID = "coc-11-MQH"; */
+"coc-11-MQH.title" = "Filter:";
+
 /* Class = "NSTextFieldCell"; title = "PM Refresh (in Minutes):"; ObjectID = "cwK-wP-wB6"; */
 "cwK-wP-wB6.title" = "PM Refresh (in Minutes):";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "czz-51-wxr"; */
 "czz-51-wxr.title" = "Edit";
 
+/* Class = "NSMenuItem"; title = "new"; ObjectID = "dxr-Ml-O8i"; */
+"dxr-Ml-O8i.title" = "new";
+
 /* Class = "NSTextFieldCell"; title = "5"; ObjectID = "gZN-n2-TGX"; */
 "gZN-n2-TGX.title" = "5";
 
@@ -58,6 +67,9 @@
 /* Class = "NSMenuItem"; title = "Select All"; ObjectID = "qSu-ha-DhM"; */
 "qSu-ha-DhM.title" = "Select All";
 
+/* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
+"sKV-FZ-wbQ.title" = "hot";
+
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
 "wSY-To-FDI.title" = "Copy";