[vlc-commits] macosx: Fix argument order when constructing stream chain
vlc | branch: master | Marvin Scholz | Sun Aug 19 02:50:42
2018 +0200| [feb75e4148220664fc3c38766390083b19077904] | committer: Marvin
Scholz
macosx: Fix argument order when constructing stream chain
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=feb75e4148220664fc3c38766390083b19077904
---
modules/gui/macosx/VLCConvertAndSaveWindowController.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index 91bda74f16..f663075179 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -973,7 +973,7 @@
else if ([[[_streamTypePopup selectedItem] title]
isEqualToString:@"MMSH"])
[composedOptions
appendFormat:@":standard{mux=asfh,dst=%@,port=%@,access=mmsh",
_outputDestination, [_streamPortField stringValue]];
else
-[composedOptions
appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http",
[self.currentProfile firstObject], [_streamPortField stringValue],
_outputDestination];
+[composedOptions
appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http",
[self.currentProfile firstObject], _outputDestination, [_streamPortField
stringValue]];
if ([_streamSAPCheckbox state])
[composedOptions appendFormat:@",sap,name=\"%@\"",
[_streamChannelField stringValue]];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Set correct state/highlight for badge button
vlc | branch: master | Marvin Scholz | Sat Aug 18 21:09:39
2018 +0200| [cae48baeb1e91f1c5fa4442ec807b2bc5f70237e] | committer: Marvin
Scholz
macosx: Set correct state/highlight for badge button
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cae48baeb1e91f1c5fa4442ec807b2bc5f70237e
---
modules/gui/macosx/VLCSourceListBadgeButton.m | 11 +++
1 file changed, 11 insertions(+)
diff --git a/modules/gui/macosx/VLCSourceListBadgeButton.m
b/modules/gui/macosx/VLCSourceListBadgeButton.m
index ec14deef04..edc6a2cc14 100644
--- a/modules/gui/macosx/VLCSourceListBadgeButton.m
+++ b/modules/gui/macosx/VLCSourceListBadgeButton.m
@@ -33,6 +33,17 @@
return nil;
}
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+self = [super initWithCoder:coder];
+if (self) {
+[(NSButtonCell*)[self cell] setShowsStateBy:0];
+[(NSButtonCell*)[self cell] setHighlightsBy:0];
+}
+
+return self;
+}
+
/* Our badges show integer values so make it easier to set those by setting
* the title depending on the integer value.
*/
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Use NSButton subclass for badge drawing
vlc | branch: master | Marvin Scholz | Sat Aug 18 18:49:55
2018 +0200| [9385e8ba801e1a3baee3580f29e011e162b7d993] | committer: Marvin
Scholz
macosx: Use NSButton subclass for badge drawing
For badges in source lists a NSInlineBezelStyle button should be used
according to the documentation. This greatly improves the look of the
badge, especially in selected state and Dark Aqua.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9385e8ba801e1a3baee3580f29e011e162b7d993
---
.../package/macosx/VLC.xcodeproj/project.pbxproj | 12
modules/gui/macosx/Makefile.am | 2 +
modules/gui/macosx/UI/MainWindow.xib | 28 ++
modules/gui/macosx/VLCMainWindow.m | 10 ++--
modules/gui/macosx/VLCSourceListBadgeButton.h | 34 +++
modules/gui/macosx/VLCSourceListBadgeButton.m | 65 ++
modules/gui/macosx/VLCSourceListTableCellView.h| 35
modules/gui/macosx/VLCSourceListTableCellView.m| 28 ++
8 files changed, 198 insertions(+), 16 deletions(-)
diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index a2a7c6baa5..59cd9ef2c4 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -111,6 +111,8 @@
6B8A6B0221279D2600DC29F3 /* PXSourceList.m in Sources */ = {isa
= PBXBuildFile; fileRef = 6B8A6AF921279D2600DC29F3 /* PXSourceList.m */; };
6B8A6B0321279D2600DC29F3 /* PXSourceListBadgeCell.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 6B8A6AFC21279D2600DC29F3 /*
PXSourceListBadgeCell.m */; };
6B8A6B082127A3EA00DC29F3 /* VLCSourceListItem.m in Sources */ =
{isa = PBXBuildFile; fileRef = 6B8A6B072127A3EA00DC29F3 /* VLCSourceListItem.m
*/; };
+ 6B8A6B0B2128697E00DC29F3 /* VLCSourceListTableCellView.m in
Sources */ = {isa = PBXBuildFile; fileRef = 6B8A6B0A2128697E00DC29F3 /*
VLCSourceListTableCellView.m */; };
+ 6B8A6B0E21286D3600DC29F3 /* VLCSourceListBadgeButton.m in
Sources */ = {isa = PBXBuildFile; fileRef = 6B8A6B0D21286D3600DC29F3 /*
VLCSourceListBadgeButton.m */; };
6BBB05DA1EEFEA29003A1019 /* VLCHUDOutlineView.m in Sources */ =
{isa = PBXBuildFile; fileRef = 6BBB05D91EEFEA29003A1019 /* VLCHUDOutlineView.m
*/; };
6BBB05E01EEFF165003A1019 /* VLCHUDTableCornerView.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 6BBB05DF1EEFF165003A1019 /*
VLCHUDTableCornerView.m */; };
6BBBF9851F7B257100B404CD /* VLCLogMessage.m in Sources */ =
{isa = PBXBuildFile; fileRef = 6BBBF9841F7B257100B404CD /* VLCLogMessage.m */;
};
@@ -395,6 +397,10 @@
6B8A6AFC21279D2600DC29F3 /* PXSourceListBadgeCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= PXSourceListBadgeCell.m; sourceTree = ""; };
6B8A6B0421279FA200DC29F3 /* VLCSourceListItem.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
VLCSourceListItem.h; sourceTree = ""; };
6B8A6B072127A3EA00DC29F3 /* VLCSourceListItem.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
VLCSourceListItem.m; sourceTree = ""; };
+ 6B8A6B092128697E00DC29F3 /* VLCSourceListTableCellView.h */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
VLCSourceListTableCellView.h; sourceTree = ""; };
+ 6B8A6B0A2128697E00DC29F3 /* VLCSourceListTableCellView.m */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
VLCSourceListTableCellView.m; sourceTree = ""; };
+ 6B8A6B0C21286D3600DC29F3 /* VLCSourceListBadgeButton.h */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
VLCSourceListBadgeButton.h; sourceTree = ""; };
+ 6B8A6B0D21286D3600DC29F3 /* VLCSourceListBadgeButton.m */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
VLCSourceListBadgeButton.m; sourceTree = ""; };
6BA1A0632038D93D005EA18A /* ci_filters.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= ci_filters.m; path = ../../../modules/video_filter/ci_filters.m; sourceTree =
""; };
6BBB05D81EEFEA29003A1019 /* VLCHUDOutlineView.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
VLCHUDOutlineView.h; sourceTree = ""; };
6BBB05D91EEFEA29003A1019 /* VLCHUDOutlineView.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= VLCHUDOutlineView.m; sourceTree = ""; };
@@ -1097,8 +1103,12 @@
7D5678EF1D5BA397002698F3 /*
VLCMainWindowControlsBar.m */,
CC448A6213B68A0B009F72E0 /* VLCMainWindow.h */,
[vlc-commits] macosx: Update sidebar on playlist table changes
vlc | branch: master | Marvin Scholz | Sat Aug 18 14:32:27
2018 +0200| [d8e1c0ccd5e30d988f5d089553285c48aa57de47] | committer: Marvin
Scholz
macosx: Update sidebar on playlist table changes
This is necessary to update the counter badges properly.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8e1c0ccd5e30d988f5d089553285c48aa57de47
---
modules/gui/macosx/VLCPlaylist.m | 4
1 file changed, 4 insertions(+)
diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m
index f0ce42beb5..e28872c1e7 100644
--- a/modules/gui/macosx/VLCPlaylist.m
+++ b/modules/gui/macosx/VLCPlaylist.m
@@ -48,6 +48,8 @@
#import "VLCResumeDialogController.h"
#import "VLCOpenWindowController.h"
+#import "PXSourceList/PXSourceList.h"
+
#include
#import
#include
@@ -363,6 +365,7 @@
- (IBAction)deleteItem:(id)sender
{
[_model deleteSelectedItem];
+VLCMain sharedInstance] mainWindow] sidebarView]
performSelector:@selector(reloadData) withObject:nil afterDelay:0.15];
}
// Actions for playlist column selections
@@ -645,6 +648,7 @@
input_item_Release(p_input);
}
PL_UNLOCK;
+VLCMain sharedInstance] mainWindow] sidebarView]
performSelector:@selector(reloadData) withObject:nil afterDelay:0.15];
}
- (IBAction)recursiveExpandOrCollapseNode:(id)sender
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Convert sidebar to view based table
vlc | branch: master | Marvin Scholz | Sat Aug 18 04:51:03 2018 +0200| [7da1546f7ce2bac338bfeeea7e2c6063302a0417] | committer: Marvin Scholz macosx: Convert sidebar to view based table The sidebar is now a view based table with autolayout for the cell view layout. The height follows now as expected the system setting for the size of sidebar items. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7da1546f7ce2bac338bfeeea7e2c6063302a0417 --- modules/gui/macosx/UI/MainWindow.xib | 101 +++ modules/gui/macosx/VLCMainWindow.m | 84 - 2 files changed, 114 insertions(+), 71 deletions(-) diff --git a/modules/gui/macosx/UI/MainWindow.xib b/modules/gui/macosx/UI/MainWindow.xib index 5c004ab205..0275e3a325 100644 --- a/modules/gui/macosx/UI/MainWindow.xib +++ b/modules/gui/macosx/UI/MainWindow.xib @@ -32,57 +32,113 @@ - + - + - + + - + - - + + - + - + - - + + + + + + + + + + + + + + + + + + + + + +
