Przeglądaj źródła

Added Checkboxes in Pref Window for link removal after click and reloading after removal.

Thomas Buck 10 lat temu
rodzic
commit
7134ece515

+ 6
- 0
RedditBar/Base.lproj/Prefs.strings Wyświetl plik

8
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
8
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
9
 "32T-3T-EcY.title" = "Cut";
9
 "32T-3T-EcY.title" = "Cut";
10
 
10
 
11
+/* Class = "NSButtonCell"; title = "Remove visited links"; ObjectID = "7KI-oO-Qcg"; */
12
+"7KI-oO-Qcg.title" = "Remove visited links";
13
+
11
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
14
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
12
 "FNJ-RL-DXT.title" = "Items:";
15
 "FNJ-RL-DXT.title" = "Items:";
13
 
16
 
71
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
74
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
72
 "sKV-FZ-wbQ.title" = "hot";
75
 "sKV-FZ-wbQ.title" = "hot";
73
 
76
 
77
+/* Class = "NSButtonCell"; title = "Reload after every visited link"; ObjectID = "twM-Jr-KGn"; */
78
+"twM-Jr-KGn.title" = "Reload after every visited link";
79
+
74
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
80
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
75
 "wSY-To-FDI.title" = "Copy";
81
 "wSY-To-FDI.title" = "Copy";

+ 43
- 22
RedditBar/Base.lproj/Prefs.xib Wyświetl plik

14
                 <outlet property="progress" destination="vz0-tR-n1f" id="t06-dO-WKY"/>
14
                 <outlet property="progress" destination="vz0-tR-n1f" id="t06-dO-WKY"/>
15
                 <outlet property="refreshField" destination="2J7-SH-Grc" id="tsA-1R-BUz"/>
15
                 <outlet property="refreshField" destination="2J7-SH-Grc" id="tsA-1R-BUz"/>
16
                 <outlet property="refreshStepper" destination="uaS-Xm-tIa" id="1bf-OR-gsX"/>
16
                 <outlet property="refreshStepper" destination="uaS-Xm-tIa" id="1bf-OR-gsX"/>
17
+                <outlet property="reloadAfterVisit" destination="gmF-24-Psn" id="DMH-sN-L96"/>
18
+                <outlet property="removeVisited" destination="v96-KH-55h" id="40H-g7-GRb"/>
17
                 <outlet property="showSubreddit" destination="fRR-M9-szp" id="bGR-ej-R9R"/>
19
                 <outlet property="showSubreddit" destination="fRR-M9-szp" id="bGR-ej-R9R"/>
18
                 <outlet property="subreddits" destination="EhP-FS-8dT" id="td1-kv-jQm"/>
20
                 <outlet property="subreddits" destination="EhP-FS-8dT" id="td1-kv-jQm"/>
19
                 <outlet property="subscriptions" destination="vW5-Cp-Bm1" id="gja-K0-7Uh"/>
21
                 <outlet property="subscriptions" destination="vW5-Cp-Bm1" id="gja-K0-7Uh"/>
28
         <window title="RedditBar Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" animationBehavior="default" id="1" customClass="PrefWindow">
30
         <window title="RedditBar Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" wantsToBeColor="NO" animationBehavior="default" id="1" customClass="PrefWindow">
29
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
31
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
30
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
32
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
31
-            <rect key="contentRect" x="196" y="240" width="340" height="398"/>
33
+            <rect key="contentRect" x="196" y="240" width="340" height="430"/>
32
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
34
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
33
             <view key="contentView" id="2">
35
             <view key="contentView" id="2">
34
-                <rect key="frame" x="0.0" y="0.0" width="340" height="398"/>
36
+                <rect key="frame" x="0.0" y="0.0" width="340" height="430"/>
35
                 <autoresizingMask key="autoresizingMask"/>
37
                 <autoresizingMask key="autoresizingMask"/>
36
                 <subviews>
38
                 <subviews>
37
                     <textField verticalHuggingPriority="750" id="0mi-88-o94">
39
                     <textField verticalHuggingPriority="750" id="0mi-88-o94">
38
-                        <rect key="frame" x="120" y="358" width="200" height="22"/>
40
+                        <rect key="frame" x="120" y="390" width="200" height="22"/>
39
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
41
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
40
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="xlI-hU-MqM">
42
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="xlI-hU-MqM">
41
                             <font key="font" metaFont="system"/>
43
                             <font key="font" metaFont="system"/>
44
                         </textFieldCell>
46
                         </textFieldCell>
45
                     </textField>
47
                     </textField>
46
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="f72-fM-yQc">
48
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="f72-fM-yQc">
47
-                        <rect key="frame" x="18" y="363" width="96" height="17"/>
49
+                        <rect key="frame" x="18" y="395" width="96" height="17"/>
48
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
50
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
49
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username: " id="GTO-OP-MYS">
51
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username: " id="GTO-OP-MYS">
50
                             <font key="font" metaFont="system"/>
52
                             <font key="font" metaFont="system"/>
53
                         </textFieldCell>
55
                         </textFieldCell>
54
                     </textField>
56
                     </textField>
55
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="JMQ-a6-DKC">
57
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="JMQ-a6-DKC">
56
-                        <rect key="frame" x="18" y="329" width="96" height="17"/>
58
+                        <rect key="frame" x="18" y="361" width="96" height="17"/>
57
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
59
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
58
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Password:" id="m11-YF-fEa">
60
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Password:" id="m11-YF-fEa">
59
                             <font key="font" metaFont="system"/>
61
                             <font key="font" metaFont="system"/>
62
                         </textFieldCell>
64
                         </textFieldCell>
63
                     </textField>
65
                     </textField>
64
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qFP-pd-32c">
66
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qFP-pd-32c">
65
-                        <rect key="frame" x="18" y="163" width="63" height="17"/>
67
+                        <rect key="frame" x="18" y="195" width="63" height="17"/>
66
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
68
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
67
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Items:" id="FNJ-RL-DXT">
69
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Items:" id="FNJ-RL-DXT">
68
                             <font key="font" metaFont="system"/>
70
                             <font key="font" metaFont="system"/>
71
                         </textFieldCell>
73
                         </textFieldCell>
72
                     </textField>
74
                     </textField>
73
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="O82-1u-lSr">
75
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="O82-1u-lSr">
74
-                        <rect key="frame" x="152" y="163" width="63" height="17"/>
76
+                        <rect key="frame" x="152" y="195" width="63" height="17"/>
75
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
77
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
76
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Title:" id="Frl-AE-ROJ">
78
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Title:" id="Frl-AE-ROJ">
77
                             <font key="font" metaFont="system"/>
79
                             <font key="font" metaFont="system"/>
80
                         </textFieldCell>
82
                         </textFieldCell>
81
                     </textField>
83
                     </textField>
82
                     <secureTextField verticalHuggingPriority="750" id="ARP-lb-J16">
84
                     <secureTextField verticalHuggingPriority="750" id="ARP-lb-J16">
83
-                        <rect key="frame" x="120" y="326" width="200" height="22"/>
85
+                        <rect key="frame" x="120" y="358" width="200" height="22"/>
84
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
86
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
85
                         <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="We7-pG-rAt">
87
                         <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="We7-pG-rAt">
86
                             <font key="font" metaFont="system"/>
88
                             <font key="font" metaFont="system"/>
117
                         </connections>
119
                         </connections>
118
                     </button>
120
                     </button>
119
                     <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="8ew-wY-1Yh">
121
                     <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="8ew-wY-1Yh">
120
-                        <rect key="frame" x="20" y="188" width="300" height="100"/>
122
+                        <rect key="frame" x="20" y="220" width="300" height="100"/>
121
                         <autoresizingMask key="autoresizingMask"/>
123
                         <autoresizingMask key="autoresizingMask"/>
122
                         <clipView key="contentView" copiesOnScroll="NO" id="ENU-Jw-8fO">
124
                         <clipView key="contentView" copiesOnScroll="NO" id="ENU-Jw-8fO">
123
                             <rect key="frame" x="1" y="1" width="298" height="98"/>
125
                             <rect key="frame" x="1" y="1" width="298" height="98"/>
146
                         </scroller>
148
                         </scroller>
147
                     </scrollView>
149
                     </scrollView>
148
                     <button id="XZM-90-hQ8">
150
                     <button id="XZM-90-hQ8">
149
-                        <rect key="frame" x="18" y="295" width="280" height="25"/>
151
+                        <rect key="frame" x="18" y="327" width="280" height="25"/>
150
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
152
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
151
                         <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="vW5-Cp-Bm1">
153
                         <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="vW5-Cp-Bm1">
152
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
154
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
157
                         </connections>
159
                         </connections>
158
                     </button>
160
                     </button>
159
                     <textField verticalHuggingPriority="750" id="MAv-jO-hIv">
161
                     <textField verticalHuggingPriority="750" id="MAv-jO-hIv">
160
-                        <rect key="frame" x="87" y="160" width="38" height="22"/>
162
+                        <rect key="frame" x="87" y="192" width="38" height="22"/>
161
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
163
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
162
                         <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">
164
                         <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">
163
                             <font key="font" metaFont="system"/>
165
                             <font key="font" metaFont="system"/>
170
                         </connections>
172
                         </connections>
171
                     </textField>
173
                     </textField>
172
                     <textField verticalHuggingPriority="750" id="qju-1J-OOV">
174
                     <textField verticalHuggingPriority="750" id="qju-1J-OOV">
173
-                        <rect key="frame" x="221" y="160" width="38" height="22"/>
175
+                        <rect key="frame" x="221" y="192" width="38" height="22"/>
174
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
176
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
175
                         <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">
177
                         <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">
176
                             <font key="font" metaFont="system"/>
178
                             <font key="font" metaFont="system"/>
183
                         </connections>
185
                         </connections>
184
                     </textField>
186
                     </textField>
185
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="jxz-fQ-M1L">
187
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="jxz-fQ-M1L">
186
-                        <rect key="frame" x="130" y="157" width="19" height="27"/>
188
+                        <rect key="frame" x="130" y="189" width="19" height="27"/>
187
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
189
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
188
                         <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="100" doubleValue="1" id="Gba-jV-Ouh"/>
190
                         <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="100" doubleValue="1" id="Gba-jV-Ouh"/>
189
                         <connections>
191
                         <connections>
192
                         </connections>
194
                         </connections>
193
                     </stepper>
195
                     </stepper>
194
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="2aV-fo-xh7">
196
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="2aV-fo-xh7">
195
-                        <rect key="frame" x="264" y="157" width="19" height="27"/>
197
+                        <rect key="frame" x="264" y="189" width="19" height="27"/>
196
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
198
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
197
                         <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" doubleValue="1" id="BWQ-gm-H9h"/>
199
                         <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" doubleValue="1" id="BWQ-gm-H9h"/>
198
                         <connections>
200
                         <connections>
201
                         </connections>
203
                         </connections>
202
                     </stepper>
204
                     </stepper>
203
                     <progressIndicator canDrawConcurrently="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="vz0-tR-n1f">
205
                     <progressIndicator canDrawConcurrently="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="vz0-tR-n1f">
204
-                        <rect key="frame" x="304" y="299" width="16" height="16"/>
206
+                        <rect key="frame" x="304" y="331" width="16" height="16"/>
205
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
207
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
206
                     </progressIndicator>
208
                     </progressIndicator>
207
                     <button id="fRR-M9-szp">
209
                     <button id="fRR-M9-szp">
208
-                        <rect key="frame" x="18" y="128" width="304" height="18"/>
210
+                        <rect key="frame" x="18" y="160" width="304" height="18"/>
209
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
211
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
210
                         <buttonCell key="cell" type="check" title="Show Subreddit after Title" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="nFK-xi-2F3">
212
                         <buttonCell key="cell" type="check" title="Show Subreddit after Title" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="nFK-xi-2F3">
211
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
213
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
213
                         </buttonCell>
215
                         </buttonCell>
214
                     </button>
216
                     </button>
215
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="6zt-jq-NXJ">
217
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="6zt-jq-NXJ">
216
-                        <rect key="frame" x="6" y="64" width="236" height="17"/>
218
+                        <rect key="frame" x="9" y="52" width="236" height="17"/>
217
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
219
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
218
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="PM Refresh (in Minutes):" id="cwK-wP-wB6">
220
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="PM Refresh (in Minutes):" id="cwK-wP-wB6">
219
                             <font key="font" metaFont="system"/>
221
                             <font key="font" metaFont="system"/>
222
                         </textFieldCell>
224
                         </textFieldCell>
223
                     </textField>
225
                     </textField>
224
                     <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="paW-kV-tNF">
226
                     <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="paW-kV-tNF">
225
-                        <rect key="frame" x="12" y="87" width="316" height="5"/>
227
+                        <rect key="frame" x="14" y="77" width="316" height="5"/>
226
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
228
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
227
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
229
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
228
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
230
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
229
                         <font key="titleFont" metaFont="system"/>
231
                         <font key="titleFont" metaFont="system"/>
230
                     </box>
232
                     </box>
231
                     <textField verticalHuggingPriority="750" id="2J7-SH-Grc">
233
                     <textField verticalHuggingPriority="750" id="2J7-SH-Grc">
232
-                        <rect key="frame" x="248" y="61" width="38" height="22"/>
234
+                        <rect key="frame" x="251" y="49" width="38" height="22"/>
233
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
235
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
234
                         <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">
236
                         <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">
235
                             <font key="font" metaFont="system"/>
237
                             <font key="font" metaFont="system"/>
242
                         </connections>
244
                         </connections>
243
                     </textField>
245
                     </textField>
244
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="uaS-Xm-tIa">
246
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="uaS-Xm-tIa">
245
-                        <rect key="frame" x="291" y="58" width="19" height="27"/>
247
+                        <rect key="frame" x="294" y="46" width="19" height="27"/>
246
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
248
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
247
                         <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="100" doubleValue="1" id="rTZ-Zs-1eO"/>
249
                         <stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="100" doubleValue="1" id="rTZ-Zs-1eO"/>
248
                         <connections>
250
                         <connections>
251
                         </connections>
253
                         </connections>
252
                     </stepper>
254
                     </stepper>
253
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="cec-PF-2Hn">
255
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="cec-PF-2Hn">
254
-                        <rect key="frame" x="18" y="98" width="130" height="17"/>
256
+                        <rect key="frame" x="18" y="130" width="130" height="17"/>
255
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
257
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
256
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Filter:" id="coc-11-MQH">
258
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Filter:" id="coc-11-MQH">
257
                             <font key="font" metaFont="system"/>
259
                             <font key="font" metaFont="system"/>
260
                         </textFieldCell>
262
                         </textFieldCell>
261
                     </textField>
263
                     </textField>
262
                     <popUpButton verticalHuggingPriority="750" id="FR2-RR-NOg">
264
                     <popUpButton verticalHuggingPriority="750" id="FR2-RR-NOg">
263
-                        <rect key="frame" x="164" y="93" width="159" height="26"/>
265
+                        <rect key="frame" x="164" y="125" width="159" height="26"/>
264
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
266
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
265
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="zJW-6u-fHd">
267
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="zJW-6u-fHd">
266
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
268
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
277
                             </menu>
279
                             </menu>
278
                         </popUpButtonCell>
280
                         </popUpButtonCell>
279
                     </popUpButton>
281
                     </popUpButton>
282
+                    <button id="v96-KH-55h">
283
+                        <rect key="frame" x="18" y="106" width="304" height="18"/>
284
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
285
+                        <buttonCell key="cell" type="check" title="Remove visited links" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7KI-oO-Qcg">
286
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
287
+                            <font key="font" metaFont="system"/>
288
+                        </buttonCell>
289
+                        <connections>
290
+                            <action selector="removeVisitedToggled:" target="-2" id="dSw-IW-lQ9"/>
291
+                        </connections>
292
+                    </button>
293
+                    <button id="gmF-24-Psn">
294
+                        <rect key="frame" x="18" y="86" width="304" height="18"/>
295
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
296
+                        <buttonCell key="cell" type="check" title="Reload after every visited link" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="twM-Jr-KGn">
297
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
298
+                            <font key="font" metaFont="system"/>
299
+                        </buttonCell>
300
+                    </button>
280
                 </subviews>
301
                 </subviews>
281
             </view>
302
             </view>
282
         </window>
303
         </window>

+ 3
- 0
RedditBar/PrefController.h Wyświetl plik

45
 @property (atomic, retain) IBOutlet NSTextField *refreshField;
45
 @property (atomic, retain) IBOutlet NSTextField *refreshField;
46
 @property (atomic, retain) IBOutlet NSStepper *refreshStepper;
46
 @property (atomic, retain) IBOutlet NSStepper *refreshStepper;
47
 @property (atomic, retain) IBOutlet NSPopUpButton *filterSelection;
47
 @property (atomic, retain) IBOutlet NSPopUpButton *filterSelection;
48
+@property (atomic, retain) IBOutlet NSButton *removeVisited;
49
+@property (atomic, retain) IBOutlet NSButton *reloadAfterVisit;
48
 
50
 
49
 @property (atomic, retain) NSObject *parent;
51
 @property (atomic, retain) NSObject *parent;
50
 @property (atomic, retain) StateModel *state;
52
 @property (atomic, retain) StateModel *state;
57
 -(IBAction)lengthDidChange:(id)sender;
59
 -(IBAction)lengthDidChange:(id)sender;
58
 -(IBAction)titleDidChange:(id)sender;
60
 -(IBAction)titleDidChange:(id)sender;
59
 -(IBAction)refreshDidChange:(id)sender;
61
 -(IBAction)refreshDidChange:(id)sender;
62
+- (IBAction)removeVisitedToggled:(id)sender;
60
 
63
 
61
 @end
64
 @end

+ 33
- 1
RedditBar/PrefController.m Wyświetl plik

34
 NSString *modhashSetLiteral = @"__MODHASH__IS__SET__";
34
 NSString *modhashSetLiteral = @"__MODHASH__IS__SET__";
35
 NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_\n";
35
 NSString *subredditCharacters = @"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_\n";
36
 
36
 
37
-@synthesize username, password, subscriptions, subreddits, win, parent, state, lengthField, lengthStepper, length, progress, showSubreddit, titleField, titleStepper, titleLength, refreshField, refreshStepper, refreshInterval, filterSelection;
37
+@synthesize username, password, subscriptions, subreddits, win, parent, state, lengthField, lengthStepper, length, progress, showSubreddit, titleField, titleStepper, titleLength, refreshField, refreshStepper, refreshInterval, filterSelection, removeVisited, reloadAfterVisit;
38
 
38
 
39
 -(Boolean)isValidList:(NSString *)input {
39
 -(Boolean)isValidList:(NSString *)input {
40
     NSCharacterSet *invalidChars = [[NSCharacterSet characterSetWithCharactersInString:subredditCharacters] invertedSet];
40
     NSCharacterSet *invalidChars = [[NSCharacterSet characterSetWithCharactersInString:subredditCharacters] invertedSet];
75
     } else {
75
     } else {
76
         [filterSelection selectItemAtIndex:1];
76
         [filterSelection selectItemAtIndex:1];
77
     }
77
     }
78
+    if (state.removeVisited) {
79
+        [removeVisited setState:1];
80
+        [reloadAfterVisit setEnabled:TRUE];
81
+    } else {
82
+        [removeVisited setState:0];
83
+        [reloadAfterVisit setEnabled:FALSE];
84
+    }
85
+    if (state.reloadAfterVisit) {
86
+        [reloadAfterVisit setState:1];
87
+    } else {
88
+        [reloadAfterVisit setState:0];
89
+    }
78
 }
90
 }
79
 
91
 
80
 -(IBAction)buttonSave:(id)sender {
92
 -(IBAction)buttonSave:(id)sender {
135
         print = TRUE;
147
         print = TRUE;
136
     else
148
     else
137
         print = FALSE;
149
         print = FALSE;
150
+    Boolean remove;
151
+    if (removeVisited.state != 0)
152
+        remove = TRUE;
153
+    else
154
+        remove = FALSE;
155
+    Boolean reload;
156
+    if (reloadAfterVisit.state != 0)
157
+        reload = TRUE;
158
+    else
159
+        reload = FALSE;
138
     
160
     
139
     state.username = username.stringValue;
161
     state.username = username.stringValue;
140
     state.modhash = modhash;
162
     state.modhash = modhash;
145
     state.titleLength = [titleField integerValue];
167
     state.titleLength = [titleField integerValue];
146
     state.refreshInterval = [refreshField integerValue];
168
     state.refreshInterval = [refreshField integerValue];
147
     state.filter = [filterSelection titleOfSelectedItem];
169
     state.filter = [filterSelection titleOfSelectedItem];
170
+    state.removeVisited = remove;
171
+    state.reloadAfterVisit = reload;
148
     [(AppDelegate *)parent prefsDidSave];
172
     [(AppDelegate *)parent prefsDidSave];
149
     [win performClose:self];
173
     [win performClose:self];
150
 }
174
 }
177
     [refreshField setIntegerValue:refreshInterval];
201
     [refreshField setIntegerValue:refreshInterval];
178
 }
202
 }
179
 
203
 
204
+- (IBAction)removeVisitedToggled:(id)sender {
205
+    if (removeVisited.state != 0) {
206
+        [reloadAfterVisit setEnabled:TRUE];
207
+    } else {
208
+        [reloadAfterVisit setEnabled:FALSE];
209
+    }
210
+}
211
+
180
 @end
212
 @end

+ 1
- 1
RedditBar/RedditBar-Info.plist Wyświetl plik

21
 	<key>CFBundleSignature</key>
21
 	<key>CFBundleSignature</key>
22
 	<string>????</string>
22
 	<string>????</string>
23
 	<key>CFBundleVersion</key>
23
 	<key>CFBundleVersion</key>
24
-	<string>280</string>
24
+	<string>283</string>
25
 	<key>LSApplicationCategoryType</key>
25
 	<key>LSApplicationCategoryType</key>
26
 	<string>public.app-category.utilities</string>
26
 	<string>public.app-category.utilities</string>
27
 	<key>LSMinimumSystemVersion</key>
27
 	<key>LSMinimumSystemVersion</key>

+ 2
- 0
RedditBar/StateModel.h Wyświetl plik

39
 @property (atomic) NSInteger titleLength;
39
 @property (atomic) NSInteger titleLength;
40
 @property (atomic) NSInteger refreshInterval;
40
 @property (atomic) NSInteger refreshInterval;
41
 @property (atomic, retain) NSString *filter;
41
 @property (atomic, retain) NSString *filter;
42
+@property (atomic) Boolean removeVisited;
43
+@property (atomic) Boolean reloadAfterVisit;
42
 
44
 
43
 -(void)registerDefaultPreferences;
45
 -(void)registerDefaultPreferences;
44
 -(void)savePreferences;
46
 -(void)savePreferences;

+ 9
- 1
RedditBar/StateModel.m Wyświetl plik

30
 
30
 
31
 @implementation StateModel
31
 @implementation StateModel
32
 
32
 
33
-@synthesize username, modhash, useSubscriptions, subreddits, length, showSubreddit, titleLength, refreshInterval, filter;
33
+@synthesize username, modhash, useSubscriptions, subreddits, length, showSubreddit, titleLength, refreshInterval, filter, removeVisited, reloadAfterVisit;
34
 
34
 
35
 NSString *s_username = @"username";
35
 NSString *s_username = @"username";
36
 NSString *s_modhash = @"modhash";
36
 NSString *s_modhash = @"modhash";
41
 NSString *s_title = @"titleLength";
41
 NSString *s_title = @"titleLength";
42
 NSString *s_refresh = @"refreshInterval";
42
 NSString *s_refresh = @"refreshInterval";
43
 NSString *s_filter = @"filter";
43
 NSString *s_filter = @"filter";
44
+NSString *s_remove = @"remove";
45
+NSString *s_reload = @"reload";
44
 
46
 
45
 -(void)registerDefaultPreferences {
47
 -(void)registerDefaultPreferences {
46
     NSUserDefaults *store = [NSUserDefaults standardUserDefaults];
48
     NSUserDefaults *store = [NSUserDefaults standardUserDefaults];
52
     [appDefaults setValue:[NSNumber numberWithInt:66] forKey:s_title];
54
     [appDefaults setValue:[NSNumber numberWithInt:66] forKey:s_title];
53
     [appDefaults setValue:[NSNumber numberWithInt:5] forKey:s_refresh];
55
     [appDefaults setValue:[NSNumber numberWithInt:5] forKey:s_refresh];
54
     [appDefaults setValue:@"hot" forKey:s_filter];
56
     [appDefaults setValue:@"hot" forKey:s_filter];
57
+    [appDefaults setValue:[NSNumber numberWithBool:YES] forKey:s_remove];
58
+    [appDefaults setValue:[NSNumber numberWithBool:YES] forKey:s_reload];
55
     [store registerDefaults:appDefaults];
59
     [store registerDefaults:appDefaults];
56
 }
60
 }
57
 
61
 
66
     [store setInteger:titleLength forKey:s_title];
70
     [store setInteger:titleLength forKey:s_title];
67
     [store setInteger:refreshInterval forKey:s_refresh];
71
     [store setInteger:refreshInterval forKey:s_refresh];
68
     [store setObject:filter forKey:s_filter];
72
     [store setObject:filter forKey:s_filter];
73
+    [store setBool:removeVisited forKey:s_remove];
74
+    [store setBool:reloadAfterVisit forKey:s_reload];
69
     [store synchronize];
75
     [store synchronize];
70
 }
76
 }
71
 
77
 
81
     titleLength = [store integerForKey:s_title];
87
     titleLength = [store integerForKey:s_title];
82
     refreshInterval = [store integerForKey:s_refresh];
88
     refreshInterval = [store integerForKey:s_refresh];
83
     filter = [store stringForKey:s_filter];
89
     filter = [store stringForKey:s_filter];
90
+    removeVisited = [store boolForKey:s_remove];
91
+    reloadAfterVisit = [store boolForKey:s_reload];
84
 }
92
 }
85
 
93
 
86
 @end
94
 @end

+ 6
- 0
RedditBar/de.lproj/Prefs.strings Wyświetl plik

7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
8
 "32T-3T-EcY.title" = "Ausschneiden";
8
 "32T-3T-EcY.title" = "Ausschneiden";
9
 
9
 
10
+/* Class = "NSButtonCell"; title = "Remove visited links"; ObjectID = "7KI-oO-Qcg"; */
11
+"7KI-oO-Qcg.title" = "Remove visited links";
12
+
10
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
13
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
11
 "FNJ-RL-DXT.title" = "Links:";
14
 "FNJ-RL-DXT.title" = "Links:";
12
 
15
 
70
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
73
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
71
 "sKV-FZ-wbQ.title" = "hot";
74
 "sKV-FZ-wbQ.title" = "hot";
72
 
75
 
76
+/* Class = "NSButtonCell"; title = "Reload after every visited link"; ObjectID = "twM-Jr-KGn"; */
77
+"twM-Jr-KGn.title" = "Reload after every visited link";
78
+
73
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
79
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
74
 "wSY-To-FDI.title" = "Kopieren";
80
 "wSY-To-FDI.title" = "Kopieren";
75
 
81
 

+ 6
- 0
RedditBar/en.lproj/Prefs.strings Wyświetl plik

7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
8
 "32T-3T-EcY.title" = "Cut";
8
 "32T-3T-EcY.title" = "Cut";
9
 
9
 
10
+/* Class = "NSButtonCell"; title = "Remove visited links"; ObjectID = "7KI-oO-Qcg"; */
11
+"7KI-oO-Qcg.title" = "Remove visited links";
12
+
10
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
13
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
11
 "FNJ-RL-DXT.title" = "Items:";
14
 "FNJ-RL-DXT.title" = "Items:";
12
 
15
 
70
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
73
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
71
 "sKV-FZ-wbQ.title" = "hot";
74
 "sKV-FZ-wbQ.title" = "hot";
72
 
75
 
76
+/* Class = "NSButtonCell"; title = "Reload after every visited link"; ObjectID = "twM-Jr-KGn"; */
77
+"twM-Jr-KGn.title" = "Reload after every visited link";
78
+
73
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
79
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
74
 "wSY-To-FDI.title" = "Copy";
80
 "wSY-To-FDI.title" = "Copy";
75
 
81
 

+ 6
- 0
RedditBarTests/de.lproj/Prefs.strings Wyświetl plik

7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
8
 "32T-3T-EcY.title" = "Cut";
8
 "32T-3T-EcY.title" = "Cut";
9
 
9
 
10
+/* Class = "NSButtonCell"; title = "Remove visited links"; ObjectID = "7KI-oO-Qcg"; */
11
+"7KI-oO-Qcg.title" = "Remove visited links";
12
+
10
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
13
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
11
 "FNJ-RL-DXT.title" = "Items:";
14
 "FNJ-RL-DXT.title" = "Items:";
12
 
15
 
70
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
73
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
71
 "sKV-FZ-wbQ.title" = "hot";
74
 "sKV-FZ-wbQ.title" = "hot";
72
 
75
 
76
+/* Class = "NSButtonCell"; title = "Reload after every visited link"; ObjectID = "twM-Jr-KGn"; */
77
+"twM-Jr-KGn.title" = "Reload after every visited link";
78
+
73
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
79
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
74
 "wSY-To-FDI.title" = "Copy";
80
 "wSY-To-FDI.title" = "Copy";
75
 
81
 

+ 6
- 0
RedditBarTests/en.lproj/Prefs.strings Wyświetl plik

7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
7
 /* Class = "NSMenuItem"; title = "Cut"; ObjectID = "32T-3T-EcY"; */
8
 "32T-3T-EcY.title" = "Cut";
8
 "32T-3T-EcY.title" = "Cut";
9
 
9
 
10
+/* Class = "NSButtonCell"; title = "Remove visited links"; ObjectID = "7KI-oO-Qcg"; */
11
+"7KI-oO-Qcg.title" = "Remove visited links";
12
+
10
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
13
 /* Class = "NSTextFieldCell"; title = "Items:"; ObjectID = "FNJ-RL-DXT"; */
11
 "FNJ-RL-DXT.title" = "Items:";
14
 "FNJ-RL-DXT.title" = "Items:";
12
 
15
 
70
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
73
 /* Class = "NSMenuItem"; title = "hot"; ObjectID = "sKV-FZ-wbQ"; */
71
 "sKV-FZ-wbQ.title" = "hot";
74
 "sKV-FZ-wbQ.title" = "hot";
72
 
75
 
76
+/* Class = "NSButtonCell"; title = "Reload after every visited link"; ObjectID = "twM-Jr-KGn"; */
77
+"twM-Jr-KGn.title" = "Reload after every visited link";
78
+
73
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
79
 /* Class = "NSMenuItem"; title = "Copy"; ObjectID = "wSY-To-FDI"; */
74
 "wSY-To-FDI.title" = "Copy";
80
 "wSY-To-FDI.title" = "Copy";
75
 
81
 

Ładowanie…
Anuluj
Zapisz