Skip to content

Commit

Permalink
fix macOS statusBar icons (#3113)
Browse files Browse the repository at this point in the history
* fix macOS statusBar icons

* improved CleanupTemplagte images
  • Loading branch information
sweetppro committed May 27, 2022
1 parent cec2195 commit 182e514
Show file tree
Hide file tree
Showing 35 changed files with 145 additions and 140 deletions.
1 change: 0 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Project Contributors
Malcolm Jarvis <mjarvis@transmissionbt.com> (Web client)
Kevin Glowacz <kjg@transmissionbt.com> (Web client)
Rashid Eissing (Mac OS X Transfers preferences icon)
Dean Ostetto (Mac OS X Turtle image)
Rick Patrick (Mac OS X images)
Jonas Rask (Mac OS X Globe icon)
Erick Turnquist (IPv6 code, support)
Expand Down
2 changes: 1 addition & 1 deletion macosx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ set(${PROJECT_NAME}_HIDPI_IMAGES
ToolbarResumeAllTemplate
ToolbarResumeSelectedTemplate
Transfers
TurtleTemplate
TortoiseTemplate
UpArrowGroupTemplate
UpArrowTemplate
YellowDotFlat
Expand Down
5 changes: 0 additions & 5 deletions macosx/Controller.mm
Original file line number Diff line number Diff line change
Expand Up @@ -589,11 +589,6 @@ - (void)awakeFromNib
@"Speed Limit overrides the total bandwidth limits with its own limits.",
"Main window -> 2nd bottom left button (turtle) tooltip");

if (@available(macOS 11.0, *))
{
self.fActionButton.image = [NSImage imageWithSystemSymbolName:@"gearshape.fill" accessibilityDescription:nil];
self.fSpeedLimitButton.image = [NSImage imageWithSystemSymbolName:@"tortoise.fill" accessibilityDescription:nil];
}
self.fClearCompletedButton.toolTip = NSLocalizedString(
@"Remove all transfers that have completed seeding.",
"Main window -> 3rd bottom left button (remove all) tooltip");
Expand Down
7 changes: 2 additions & 5 deletions macosx/Credits.rtf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{\rtf1\ansi\ansicpg1252\cocoartf2578
{\rtf1\ansi\ansicpg1252\cocoartf2638
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red0\green0\blue0;\red0\green0\blue0;
\red0\green0\blue0;\red0\green0\blue0;\red127\green127\blue127;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0\c84706\cname headerTextColor;\cssrgb\c0\c0\c0\cname textColor;\cssrgb\c0\c0\c0\c84706\cname labelColor;
\cssrgb\c0\c0\c0\c24706\cname tertiaryLabelColor;\cssrgb\c0\c0\c0\c49804\cname secondaryLabelColor;\csgenericrgb\c49804\c49804\c49804;}
\vieww14160\viewh15100\viewkind0
\paperw12240\paperh15840\vieww14160\viewh15100\viewkind0
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\qc\partightenfactor0

\f0\b\fs28 \cf2 The Transmission Project
Expand Down Expand Up @@ -70,9 +70,6 @@
\fs24 \cf0 \cf4 Rashid Eissing
\fs20 \cf3 \cf6 (Mac OS X Transfers preferences icon)\cf7 \

\fs24 \cf0 \cf4 Dean Ostetto
\fs20 \cf5 \cf6 (Mac OS X Turtle image)\cf7 \

\fs24 \cf0 \cf4 Rick Patrick
\fs20 \cf6 (Mac OS X images)\cf7 \

Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"images" : [
{
"idiom" : "mac",
"filename" : "CleanupTemplate.png",
"idiom" : "mac",
"scale" : "1x"
},
{
"idiom" : "mac",
"filename" : "CleanupTemplate@2x.png",
"idiom" : "mac",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "GearshapeTemplate.png",
"idiom" : "mac",
"scale" : "1x"
},
{
"filename" : "GearshapeTemplate@2x.png",
"idiom" : "mac",
"scale" : "2x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"images" : [
{
"filename" : "TortoiseTemplate.png",
"idiom" : "mac",
"filename" : "TurtleTemplate.png",
"scale" : "1x"
},
{
"filename" : "TortoiseTemplate@2x.png",
"idiom" : "mac",
"filename" : "TurtleTemplate@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
12 changes: 6 additions & 6 deletions macosx/da.lproj/MainMenu.xib
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -26,7 +26,7 @@
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2690">
<rect key="frame" x="36" y="3" width="36" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="TurtleTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3048">
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="TortoiseTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3048">
<behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand All @@ -49,7 +49,7 @@
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3435">
<rect key="frame" x="0.0" y="3" width="36" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="NSActionTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3436">
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="GearshapeTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3436">
<behavior key="behavior" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down Expand Up @@ -978,11 +978,11 @@ CA
</objects>
<resources>
<image name="CleanupTemplate" width="18" height="18"/>
<image name="NSActionTemplate" width="15" height="15"/>
<image name="GearshapeTemplate" width="18" height="18"/>
<image name="PriorityHighTemplate" width="12" height="12"/>
<image name="PriorityLowTemplate" width="12" height="12"/>
<image name="PriorityNormalTemplate" width="12" height="12"/>
<image name="TurtleTemplate" width="18" height="18"/>
<image name="TortoiseTemplate" width="18" height="18"/>
<image name="imageCell:3146:image" width="62" height="62">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
Expand Down
10 changes: 5 additions & 5 deletions macosx/da.lproj/PrefsWindow.xib
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -1247,7 +1247,7 @@
<imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="228">
<rect key="frame" x="27" y="117" width="18" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="TurtleTemplate" id="1279"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="TortoiseTemplate" id="1279"/>
</imageView>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="200">
<rect key="frame" x="177" y="73" width="348" height="14"/>
Expand Down Expand Up @@ -1951,7 +1951,7 @@
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" id="uYt-KS-e9s">
<rect key="frame" x="1" y="1" width="306" height="76"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" id="1521">
<rect key="frame" x="0.0" y="0.0" width="306" height="76"/>
Expand Down Expand Up @@ -2177,7 +2177,7 @@
<image name="NSAddTemplate" width="14" height="13"/>
<image name="NSRemoveTemplate" width="14" height="4"/>
<image name="NSStatusPartiallyAvailable" width="16" height="16"/>
<image name="TurtleTemplate" width="18" height="18"/>
<image name="TortoiseTemplate" width="18" height="18"/>
<image name="imageCell:1782:image" width="18" height="18">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
Expand Down
12 changes: 6 additions & 6 deletions macosx/de.lproj/MainMenu.xib
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -26,7 +26,7 @@
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2690">
<rect key="frame" x="36" y="3" width="36" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="TurtleTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3048">
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="TortoiseTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3048">
<behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand All @@ -49,7 +49,7 @@
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3435">
<rect key="frame" x="0.0" y="3" width="36" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="NSActionTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3436">
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="GearshapeTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3436">
<behavior key="behavior" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down Expand Up @@ -979,11 +979,11 @@ CA
</objects>
<resources>
<image name="CleanupTemplate" width="18" height="18"/>
<image name="NSActionTemplate" width="15" height="15"/>
<image name="GearshapeTemplate" width="18" height="18"/>
<image name="PriorityHighTemplate" width="12" height="12"/>
<image name="PriorityLowTemplate" width="12" height="12"/>
<image name="PriorityNormalTemplate" width="12" height="12"/>
<image name="TurtleTemplate" width="18" height="18"/>
<image name="TortoiseTemplate" width="18" height="18"/>
<image name="imageCell:3146:image" width="62" height="62">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
Expand Down
11 changes: 5 additions & 6 deletions macosx/de.lproj/PrefsWindow.xib
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -1446,7 +1445,7 @@
<imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="228">
<rect key="frame" x="10" y="151" width="18" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="TurtleTemplate" id="1279"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="TortoiseTemplate" id="1279"/>
</imageView>
</subviews>
<point key="canvasLocation" x="-484" y="48"/>
Expand Down Expand Up @@ -1949,7 +1948,7 @@
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" id="mfY-sh-Bfh">
<rect key="frame" x="1" y="1" width="333" height="76"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" id="1521">
<rect key="frame" x="0.0" y="0.0" width="333" height="76"/>
Expand Down Expand Up @@ -2187,7 +2186,7 @@
<image name="NSAddTemplate" width="14" height="13"/>
<image name="NSRemoveTemplate" width="14" height="4"/>
<image name="NSStatusPartiallyAvailable" width="16" height="16"/>
<image name="TurtleTemplate" width="18" height="18"/>
<image name="TortoiseTemplate" width="128" height="128"/>
<image name="imageCell:1782:image" width="18" height="18">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
Expand Down
12 changes: 6 additions & 6 deletions macosx/en.lproj/MainMenu.xib
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -26,7 +26,7 @@
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2690">
<rect key="frame" x="36" y="3" width="36" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="TurtleTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3048">
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="TortoiseTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3048">
<behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand All @@ -49,7 +49,7 @@
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3435">
<rect key="frame" x="0.0" y="3" width="36" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="NSActionTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3436">
<buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="GearshapeTemplate" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="3436">
<behavior key="behavior" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down Expand Up @@ -978,11 +978,11 @@ CA
</objects>
<resources>
<image name="CleanupTemplate" width="18" height="18"/>
<image name="NSActionTemplate" width="15" height="15"/>
<image name="GearshapeTemplate" width="18" height="18"/>
<image name="PriorityHighTemplate" width="12" height="12"/>
<image name="PriorityLowTemplate" width="12" height="12"/>
<image name="PriorityNormalTemplate" width="12" height="12"/>
<image name="TurtleTemplate" width="18" height="18"/>
<image name="TortoiseTemplate" width="18" height="18"/>
<image name="imageCell:3146:image" width="62" height="62">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
Expand Down

0 comments on commit 182e514

Please sign in to comment.