FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-03 12:27:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mac-candidate' into main

Browse Source
This commit is contained in:
Maurice Parker 2020-08-15 02:06:31 -05:00
commit c7fe39791d
9 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Mac/Base.lproj/MainWindow.storyboard
View File

@ -303,14 +303,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<visualEffectView blendingMode="behindWindow" material="appearanceBased" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="977-L4-4ey">
<rect key="frame" x="0.0" y="392" width="206" height="24"/>
<rect key="frame" x="0.0" y="393" width="206" height="23"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eZS-8K-qiN">
<rect key="frame" x="180" y="5" width="14" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="14" id="ELp-U5-6Vw"/>
<constraint firstAttribute="width" constant="14" id="vyT-yU-oaI"/>
</constraints>
<rect key="frame" x="181" y="5" width="13" height="13"/>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="filterInactive" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="5QJ-Ja-Gng">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@ -322,19 +318,19 @@
</button>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="24" id="Ax2-oO-NTV"/>
<constraint firstAttribute="height" constant="23" id="Ax2-oO-NTV"/>
<constraint firstAttribute="trailing" secondItem="eZS-8K-qiN" secondAttribute="trailing" constant="12" id="CFy-rz-Otf"/>
<constraint firstItem="eZS-8K-qiN" firstAttribute="top" secondItem="977-L4-4ey" secondAttribute="top" constant="5" id="M0q-C7-z10"/>
</constraints>
</visualEffectView>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="28" horizontalPageScroll="10" verticalLineScroll="28" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="cJj-Wv-9ep">
<rect key="frame" x="0.0" y="0.0" width="206" height="392"/>
<rect key="frame" x="0.0" y="0.0" width="206" height="393"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="2eU-Wz-F9g">
<rect key="frame" x="0.0" y="0.0" width="206" height="392"/>
<rect key="frame" x="0.0" y="0.0" width="206" height="393"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" tableStyle="sourceList" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="28" rowSizeStyle="systemDefault" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="13" outlineTableColumn="ih9-mJ-EA7" id="cnV-kg-Dn2" customClass="SidebarOutlineView" customModule="NetNewsWire" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="206" height="392"/>
<rect key="frame" x="0.0" y="0.0" width="206" height="393"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="0.0"/>
<color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
@ -493,9 +489,9 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<visualEffectView blendingMode="behindWindow" material="contentBackground" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="PdS-jL-yH1">
<rect key="frame" x="0.0" y="119" width="450" height="27"/>
<rect key="frame" x="0.0" y="120" width="450" height="26"/>
<constraints>
<constraint firstAttribute="height" constant="27" id="ZMg-gZ-6aa"/>
<constraint firstAttribute="height" constant="26" id="ZMg-gZ-6aa"/>
</constraints>
</visualEffectView>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lSU-OC-sEC">
@ -532,11 +528,7 @@
</popUpButtonCell>
</popUpButton>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iA5-go-AO0">
<rect key="frame" x="424" y="127" width="14" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="14" id="FbQ-4n-ThT"/>
<constraint firstAttribute="height" constant="14" id="dlW-82-T6N"/>
</constraints>
<rect key="frame" x="425" y="128" width="13" height="13"/>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="filterInactive" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="j7d-36-DO5">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@ -639,11 +631,11 @@
<segue reference="WS2-WB-dc4"/>
</inferredMetricsTieBreakers>
<resources>
<image name="NSAddTemplate" width="15" height="13"/>
<image name="NSAddTemplate" width="14" height="13"/>
<image name="NSRefreshTemplate" width="14" height="16"/>
<image name="NSShareTemplate" width="16" height="17"/>
<image name="NSShareTemplate" width="15" height="17"/>
<image name="cleanUp" width="149" height="113"/>
<image name="filterInactive" width="100" height="101"/>
<image name="filterInactive" width="13" height="13"/>
<image name="markAllRead" width="22" height="19"/>
<image name="markRead" width="19" height="19"/>
<image name="newFolder" width="19" height="19"/>

18
Mac/Resources/Assets.xcassets/filterActive.imageset/Contents.json vendored
View File

@ -1,15 +1,25 @@
{
"images" : [
{
"filename" : "filter-selected_Normal.png",
"idiom" : "universal",
"filename" : "filterActive.pdf"
"scale" : "1x"
},
{
"filename" : "filter-selected_Normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
Mac/Resources/Assets.xcassets/filterActive.imageset/filter-selected_Normal@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
Mac/Resources/Assets.xcassets/filterActive.imageset/filterActive.pdf vendored
View File

Binary file not shown.

18
Mac/Resources/Assets.xcassets/filterInactive.imageset/Contents.json vendored
View File

@ -1,15 +1,25 @@
{
"images" : [
{
"filename" : "filter-unselected_Normal.png",
"idiom" : "universal",
"filename" : "filterInactive.pdf"
"scale" : "1x"
},
{
"filename" : "filter-unselected_Normal@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
Mac/Resources/Assets.xcassets/filterInactive.imageset/filter-unselected_Normal@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
Mac/Resources/Assets.xcassets/filterInactive.imageset/filterInactive.pdf vendored
View File

Binary file not shown.