Skip to content

Commit 1ac52c3

Browse files
committed
#63: Move some UI around and add proper icon
Clarify some variable names
1 parent 1318bce commit 1ac52c3

File tree

11 files changed

+133
-80
lines changed

11 files changed

+133
-80
lines changed

Interfaces/English.lproj/DBView.xib

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@
10751075
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10761076
<subviews>
10771077
<customView misplaced="YES" id="vcX-Xr-0cm" userLabel="Table Content Container">
1078-
<rect key="frame" x="0.0" y="0.0" width="695" height="488"/>
1078+
<rect key="frame" x="0.0" y="0.0" width="695" height="458"/>
10791079
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10801080
<subviews>
10811081
<imageView id="5179">
@@ -1145,8 +1145,8 @@
11451145
<binding destination="1907" name="value" keyPath="values.EditInSheetEnabled" id="6351"/>
11461146
</connections>
11471147
</button>
1148-
<textField verticalHuggingPriority="750" id="261">
1149-
<rect key="frame" x="159" y="-4" width="421" height="22"/>
1148+
<textField verticalHuggingPriority="750" misplaced="YES" id="261">
1149+
<rect key="frame" x="193" y="-4" width="362" height="22"/>
11501150
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
11511151
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="3759">
11521152
<font key="font" metaFont="smallSystem"/>
@@ -1238,26 +1238,15 @@
12381238
<autoresizingMask key="autoresizingMask"/>
12391239
</tableHeaderView>
12401240
</scrollView>
1241-
<progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="858">
1242-
<rect key="frame" x="676" y="466" width="16" height="16"/>
1243-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
1241+
<progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" misplaced="YES" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="858">
1242+
<rect key="frame" x="561" y="4" width="16" height="16"/>
1243+
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
12441244
</progressIndicator>
1245-
<button hidden="YES" verticalHuggingPriority="750" id="4676">
1246-
<rect key="frame" x="616" y="463" width="54" height="19"/>
1247-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
1248-
<buttonCell key="cell" type="roundRect" title="Filter" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="4677">
1249-
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
1250-
<font key="font" metaFont="smallSystem"/>
1251-
</buttonCell>
1252-
<connections>
1253-
<action selector="filterTable:" target="67" id="4678"/>
1254-
</connections>
1255-
</button>
12561245
<button toolTip="Show/Hide table content filters" horizontalHuggingPriority="750" verticalHuggingPriority="750" misplaced="YES" id="LYg-Ux-Lph">
1257-
<rect key="frame" x="2" y="456" width="36" height="32"/>
1258-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
1259-
<buttonCell key="cell" type="push" bezelStyle="rounded" image="NSIconViewTemplate" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="WNc-7G-qPQ">
1260-
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
1246+
<rect key="frame" x="155" y="-1" width="32" height="25"/>
1247+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
1248+
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="button_filter" imagePosition="overlaps" alignment="center" alternateImage="button_filter_active" inset="2" id="WNc-7G-qPQ">
1249+
<behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
12611250
<font key="font" metaFont="system"/>
12621251
</buttonCell>
12631252
<connections>
@@ -1267,11 +1256,11 @@
12671256
</subviews>
12681257
</customView>
12691258
<customView misplaced="YES" id="9oo-u0-ndW" userLabel="Filter Rule Editor Container">
1270-
<rect key="frame" x="0.0" y="488" width="695" height="41"/>
1259+
<rect key="frame" x="0.0" y="458" width="695" height="71"/>
12711260
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
12721261
<subviews>
12731262
<scrollView misplaced="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="CIQ-tc-1Fn">
1274-
<rect key="frame" x="0.0" y="1" width="694" height="40"/>
1263+
<rect key="frame" x="0.0" y="31" width="694" height="40"/>
12751264
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
12761265
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="kdv-Wp-s5h">
12771266
<rect key="frame" x="0.0" y="0.0" width="694" height="40"/>
@@ -1296,12 +1285,23 @@
12961285
</scroller>
12971286
</scrollView>
12981287
<customView misplaced="YES" id="GJn-1I-e7O" customClass="SPFillView">
1299-
<rect key="frame" x="0.0" y="0.0" width="695" height="1"/>
1288+
<rect key="frame" x="0.0" y="30" width="695" height="1"/>
13001289
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
13011290
<userDefinedRuntimeAttributes>
13021291
<userDefinedRuntimeAttribute type="string" keyPath="systemColorOfName" value="gridColor"/>
13031292
</userDefinedRuntimeAttributes>
13041293
</customView>
1294+
<button verticalHuggingPriority="750" misplaced="YES" id="4676">
1295+
<rect key="frame" x="616" y="5" width="54" height="19"/>
1296+
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
1297+
<buttonCell key="cell" type="roundRect" title="Filter" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="4677">
1298+
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
1299+
<font key="font" metaFont="smallSystem"/>
1300+
</buttonCell>
1301+
<connections>
1302+
<action selector="filterTable:" target="ki9-Po-bdr" id="eAC-YD-du3"/>
1303+
</connections>
1304+
</button>
13051305
</subviews>
13061306
</customView>
13071307
</subviews>
@@ -4596,7 +4596,6 @@ Gw
45964596
<outlet property="contentViewPane" destination="27" id="6661"/>
45974597
<outlet property="countText" destination="261" id="262"/>
45984598
<outlet property="duplicateButton" destination="5178" id="7837"/>
4599-
<outlet property="filterButton" destination="4676" id="5942"/>
46004599
<outlet property="filterControllerInstance" destination="ki9-Po-bdr" id="5od-0U-9xj"/>
46014600
<outlet property="filterRuleEditorContainer" destination="9oo-u0-ndW" id="OZb-jI-CMy"/>
46024601
<outlet property="filterTableController" destination="UBS-cN-3Af" id="FV7-by-Gy1"/>
@@ -4619,6 +4618,7 @@ Gw
46194618
</customObject>
46204619
<customObject id="ki9-Po-bdr" userLabel="SPTableContentFilter" customClass="SPTableContentFilterController">
46214620
<connections>
4621+
<outlet property="filterButton" destination="4676" id="9tZ-dW-BR3"/>
46224622
<outlet property="filterRuleEditor" destination="FF9-z2-9od" id="RW4-XM-XQS"/>
46234623
<outlet property="tableContentViewBelow" destination="36" id="ZGh-dM-J6C"/>
46244624
<outlet property="tableDataInstance" destination="4702" id="e69-W6-UwN"/>
@@ -5160,7 +5160,6 @@ Gw
51605160
<image name="NSApplicationIcon" width="128" height="128"/>
51615161
<image name="NSGoLeftTemplate" width="9" height="12"/>
51625162
<image name="NSGoRightTemplate" width="9" height="12"/>
5163-
<image name="NSIconViewTemplate" width="10" height="10"/>
51645163
<image name="NSLeftFacingTriangleTemplate" width="9" height="12"/>
51655164
<image name="NSListViewTemplate" width="14" height="10"/>
51665165
<image name="NSRightFacingTriangleTemplate" width="9" height="12"/>
@@ -5172,6 +5171,8 @@ Gw
51725171
<image name="button_edit" width="30" height="22"/>
51735172
<image name="button_edit_mode" width="30" height="22"/>
51745173
<image name="button_edit_mode_selected" width="30" height="22"/>
5174+
<image name="button_filter" width="30" height="22"/>
5175+
<image name="button_filter_active" width="30" height="22"/>
51755176
<image name="button_info_pane_show" width="30" height="22"/>
51765177
<image name="button_left" width="30" height="22"/>
51775178
<image name="button_pagination" width="30" height="22"/>

Resources/Images/button_filter.png

343 Bytes
Loading

Resources/Images/button_filter@2x.png

450 Bytes
Loading
332 Bytes
Loading
479 Bytes
Loading

Source/SPAppController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2368,7 +2368,7 @@ - (void)_copyDefaultThemes
23682368
*/
23692369
- (BOOL)application:(NSApplication *)sender delegateHandlesKey:(NSString *)key
23702370
{
2371-
NSLog(@"Not yet implemented.");
2371+
NSLog(@"Not yet implemented: %@", key);
23722372

23732373
return NO;
23742374
}

Source/SPTableContent.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
6969

7070
IBOutlet SPCopyTable *tableContentView;
7171

72-
IBOutlet NSButton *filterButton;
7372
IBOutlet NSButton *toggleRuleFilterButton;
7473
IBOutlet id addButton;
7574
IBOutlet id duplicateButton;
@@ -170,7 +169,6 @@ typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
170169
}
171170

172171
#ifdef SP_CODA /* glue */
173-
@property (assign) id filterButton;
174172
@property (assign) NSButton* addButton;
175173
@property (assign) NSButton* duplicateButton;
176174
@property (assign) NSButton* removeButton;

0 commit comments

Comments
 (0)