summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamiano Galassi <[email protected]>2018-06-06 12:36:59 +0200
committerDamiano Galassi <[email protected]>2018-06-06 12:36:59 +0200
commit3bf84768a9f5e08c81ac688ba5ef7b114f71ff1d (patch)
tree8f0512d82a52495c7197225987c4ce67cf436005
parent2a2d334ae2dda282603983abc3f978861ad7cbbe (diff)
MacGui: make it possible to resize down the "add titles to queue" toolbar button icon. It won't get as small as the others toolbar icon, but it's as good as it can get now. Fixes #1318
-rw-r--r--macosx/Assets.xcassets/addtitlestoqueue.imageset/AddTitlesToQueue.pngbin0 -> 2410 bytes
-rw-r--r--macosx/Assets.xcassets/addtitlestoqueue.imageset/[email protected]bin0 -> 4561 bytes
-rw-r--r--macosx/Assets.xcassets/addtitlestoqueue.imageset/Contents.json22
-rw-r--r--macosx/English.lproj/MainWindow.xib15
4 files changed, 30 insertions, 7 deletions
diff --git a/macosx/Assets.xcassets/addtitlestoqueue.imageset/AddTitlesToQueue.png b/macosx/Assets.xcassets/addtitlestoqueue.imageset/AddTitlesToQueue.png
new file mode 100644
index 000000000..d92b5c0e0
--- /dev/null
+++ b/macosx/Assets.xcassets/addtitlestoqueue.imageset/AddTitlesToQueue.png
Binary files differ
diff --git a/macosx/Assets.xcassets/addtitlestoqueue.imageset/[email protected] b/macosx/Assets.xcassets/addtitlestoqueue.imageset/[email protected]
new file mode 100644
index 000000000..67479c909
--- /dev/null
+++ b/macosx/Assets.xcassets/addtitlestoqueue.imageset/[email protected]
Binary files differ
diff --git a/macosx/Assets.xcassets/addtitlestoqueue.imageset/Contents.json b/macosx/Assets.xcassets/addtitlestoqueue.imageset/Contents.json
new file mode 100644
index 000000000..606188a8a
--- /dev/null
+++ b/macosx/Assets.xcassets/addtitlestoqueue.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "AddTitlesToQueue.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "[email protected]",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+} \ No newline at end of file
diff --git a/macosx/English.lproj/MainWindow.xib b/macosx/English.lproj/MainWindow.xib
index 04d9f90fb..bd6ad23e3 100644
--- a/macosx/English.lproj/MainWindow.xib
+++ b/macosx/English.lproj/MainWindow.xib
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
<capability name="box content view" minToolsVersion="7.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -40,7 +40,7 @@
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="41" y="572" width="885" height="600"/>
- <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<view key="contentView" id="2" customClass="HBFocusRingView">
<rect key="frame" x="0.0" y="0.0" width="885" height="600"/>
<autoresizingMask key="autoresizingMask"/>
@@ -764,18 +764,18 @@ Blu-ray and DVD sources often have multiple titles, the longest of which is typi
<action selector="addToQueue:" target="-2" id="TRB-HE-1GW"/>
</connections>
</toolbarItem>
- <toolbarItem implicitItemIdentifier="A5F62853-5047-43C2-AD64-73654B0E34B2" label="Add Titles To Queue" paletteLabel="Add Titles To Queue" toolTip="Add Titles To Queue" image="addqueue" id="38K-hd-P5J">
- <size key="minSize" width="58" height="32"/>
+ <toolbarItem implicitItemIdentifier="A5F62853-5047-43C2-AD64-73654B0E34B2" label="Add Titles To Queue" paletteLabel="Add Titles To Queue" toolTip="Add Titles To Queue" image="addtitlestoqueue" id="38K-hd-P5J">
+ <size key="minSize" width="57" height="32"/>
<size key="maxSize" width="58" height="32"/>
<popUpButton key="view" imageHugsTitle="YES" id="pJJ-0V-TQq">
<rect key="frame" x="28" y="14" width="58" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
- <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" inset="2" pullsDown="YES" id="BAK-n3-eIN">
+ <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="addtitlestoqueue" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="BAK-n3-eIN">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
<menu key="menu" id="QCi-1O-Msg">
<items>
- <menuItem state="on" image="addqueue" hidden="YES" id="MCy-je-2nL"/>
+ <menuItem state="on" image="addtitlestoqueue" hidden="YES" id="MCy-je-2nL"/>
<menuItem title="Add Title To Queue" id="L8z-c6-E1u">
<connections>
<action selector="addToQueue:" target="-2" id="0SF-Rk-zUS"/>
@@ -915,6 +915,7 @@ Blu-ray and DVD sources often have multiple titles, the longest of which is typi
<resources>
<image name="activity" width="32" height="32"/>
<image name="addqueue" width="32" height="32"/>
+ <image name="addtitlestoqueue" width="32" height="31"/>
<image name="encode" width="32" height="32"/>
<image name="pauseencode" width="32" height="32"/>
<image name="presets" width="32" height="32"/>