summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamiano Galassi <[email protected]>2015-10-25 07:02:57 +0100
committerDamiano Galassi <[email protected]>2015-10-25 07:02:57 +0100
commit4fde4b8fdd7c40401f74b18f668de53d6a04c2dd (patch)
tree43a74f4b8c7a21b0ee73f76a34dfb2b5019ebdfa
parentc88aca690baa75be4f71207222f84222c27104f8 (diff)
MacGui: align some UI elements.
-rw-r--r--macosx/English.lproj/ChaptersTitles.xib8
-rw-r--r--macosx/English.lproj/Subtitles.xib8
-rw-r--r--macosx/HBJob.h3
3 files changed, 10 insertions, 9 deletions
diff --git a/macosx/English.lproj/ChaptersTitles.xib b/macosx/English.lproj/ChaptersTitles.xib
index 85b896f2e..d0c04d63b 100644
--- a/macosx/English.lproj/ChaptersTitles.xib
+++ b/macosx/English.lproj/ChaptersTitles.xib
@@ -70,14 +70,14 @@
</connections>
</button>
<scrollView horizontalLineScroll="18" horizontalPageScroll="0.0" verticalLineScroll="18" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="lqY-aE-MZi">
- <rect key="frame" x="20" y="20" width="886" height="266"/>
+ <rect key="frame" x="20" y="20" width="886" height="264"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="3Pi-zz-fFg">
- <rect key="frame" x="1" y="0.0" width="884" height="265"/>
+ <rect key="frame" x="1" y="0.0" width="884" height="263"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="16" headerView="0rK-Rs-NTb" viewBased="YES" id="InF-gR-Lia">
- <rect key="frame" x="0.0" y="0.0" width="884" height="248"/>
+ <rect key="frame" x="0.0" y="0.0" width="884" height="246"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
@@ -235,7 +235,7 @@
<animations/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="yp0-pp-Yw7">
- <rect key="frame" x="869" y="17" width="16" height="248"/>
+ <rect key="frame" x="869" y="17" width="16" height="246"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
</scroller>
diff --git a/macosx/English.lproj/Subtitles.xib b/macosx/English.lproj/Subtitles.xib
index bbc7f7275..dc4a11150 100644
--- a/macosx/English.lproj/Subtitles.xib
+++ b/macosx/English.lproj/Subtitles.xib
@@ -89,14 +89,14 @@
</connections>
</button>
<scrollView autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="Syo-rH-vof">
- <rect key="frame" x="20" y="20" width="886" height="266"/>
+ <rect key="frame" x="20" y="20" width="886" height="264"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="ljc-nW-Cnc">
- <rect key="frame" x="1" y="17" width="884" height="248"/>
+ <rect key="frame" x="1" y="0.0" width="884" height="263"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" rowSizeStyle="automatic" headerView="IiW-3a-Drv" viewBased="YES" id="0yM-wE-D2x">
- <rect key="frame" x="0.0" y="0.0" width="884" height="248"/>
+ <rect key="frame" x="0.0" y="0.0" width="884" height="246"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
@@ -423,7 +423,7 @@
</scrollView>
</subviews>
<animations/>
- <point key="canvasLocation" x="532" y="403"/>
+ <point key="canvasLocation" x="521" y="-253"/>
</customView>
<arrayController objectClassName="HBSubtitlesTrack" id="ssY-jQ-Nev">
<connections>
diff --git a/macosx/HBJob.h b/macosx/HBJob.h
index 2766bac9a..008fb7802 100644
--- a/macosx/HBJob.h
+++ b/macosx/HBJob.h
@@ -17,6 +17,7 @@
#import "HBAudio.h"
#import "HBSubtitles.h"
+#import "HBChapter.h"
#import "HBDistributedArray.h"
@@ -73,7 +74,7 @@ typedef NS_ENUM(NSUInteger, HBJobState){
@property (nonatomic, readonly) HBSubtitles *subtitles;
@property (nonatomic, readwrite) BOOL chaptersEnabled;
-@property (nonatomic, readonly) NSArray *chapterTitles;
+@property (nonatomic, readonly) NSArray<HBChapter *> *chapterTitles;
@property (nonatomic, readwrite, weak, nullable) NSUndoManager *undo;