Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
7dd43543
Commit
7dd43543
authored
Jun 21, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: added a URI column to the playlist table
parent
9b8190ed
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
561 additions
and
751 deletions
+561
-751
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+542
-751
modules/gui/macosx/MainMenu.h
modules/gui/macosx/MainMenu.h
+1
-0
modules/gui/macosx/MainMenu.m
modules/gui/macosx/MainMenu.m
+5
-0
modules/gui/macosx/playlist.h
modules/gui/macosx/playlist.h
+1
-0
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+12
-0
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
7dd43543
This diff is collapsed.
Click to expand it.
modules/gui/macosx/MainMenu.h
View file @
7dd43543
...
@@ -117,6 +117,7 @@
...
@@ -117,6 +117,7 @@
IBOutlet
NSMenuItem
*
o_mi_ptc_description
;
IBOutlet
NSMenuItem
*
o_mi_ptc_description
;
IBOutlet
NSMenuItem
*
o_mi_ptc_date
;
IBOutlet
NSMenuItem
*
o_mi_ptc_date
;
IBOutlet
NSMenuItem
*
o_mi_ptc_language
;
IBOutlet
NSMenuItem
*
o_mi_ptc_language
;
IBOutlet
NSMenuItem
*
o_mi_ptc_uri
;
IBOutlet
NSMenu
*
o_mu_audio
;
IBOutlet
NSMenu
*
o_mu_audio
;
IBOutlet
NSMenuItem
*
o_mi_vol_up
;
IBOutlet
NSMenuItem
*
o_mi_vol_up
;
...
...
modules/gui/macosx/MainMenu.m
View file @
7dd43543
...
@@ -301,6 +301,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
...
@@ -301,6 +301,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[
o_mi_ptc_description
setTitle
:
_NS
(
"Description"
)];
[
o_mi_ptc_description
setTitle
:
_NS
(
"Description"
)];
[
o_mi_ptc_date
setTitle
:
_NS
(
"Date"
)];
[
o_mi_ptc_date
setTitle
:
_NS
(
"Date"
)];
[
o_mi_ptc_language
setTitle
:
_NS
(
"Language"
)];
[
o_mi_ptc_language
setTitle
:
_NS
(
"Language"
)];
[
o_mi_ptc_uri
setTitle
:
_NS
(
"URI"
)];
[
o_mi_program
setTitle
:
_NS
(
"Program"
)];
[
o_mi_program
setTitle
:
_NS
(
"Program"
)];
[
o_mu_program
setTitle
:
_NS
(
"Program"
)];
[
o_mu_program
setTitle
:
_NS
(
"Program"
)];
...
@@ -669,6 +670,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
...
@@ -669,6 +670,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
o_column
=
DATE_COLUMN
;
o_column
=
DATE_COLUMN
;
else
if
(
sender
==
o_mi_ptc_language
)
else
if
(
sender
==
o_mi_ptc_language
)
o_column
=
LANGUAGE_COLUMN
;
o_column
=
LANGUAGE_COLUMN
;
else
if
(
sender
==
o_mi_ptc_uri
)
o_column
=
URI_COLUMN
;
[[[
VLCMain
sharedInstance
]
playlist
]
setColumn
:
o_column
state
:
[
sender
state
]];
[[[
VLCMain
sharedInstance
]
playlist
]
setColumn
:
o_column
state
:
[
sender
state
]];
}
}
...
@@ -693,6 +696,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
...
@@ -693,6 +696,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
[
o_mi_ptc_date
setState
:
i_state
];
[
o_mi_ptc_date
setState
:
i_state
];
else
if
([
o_column
isEqualToString
:
LANGUAGE_COLUMN
])
else
if
([
o_column
isEqualToString
:
LANGUAGE_COLUMN
])
[
o_mi_ptc_language
setState
:
i_state
];
[
o_mi_ptc_language
setState
:
i_state
];
else
if
([
o_column
isEqualToString
:
URI_COLUMN
])
[
o_mi_ptc_uri
setState
:
i_state
];
}
}
#pragma mark -
#pragma mark -
...
...
modules/gui/macosx/playlist.h
View file @
7dd43543
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#define DESCRIPTION_COLUMN @"description"
#define DESCRIPTION_COLUMN @"description"
#define DATE_COLUMN @"date"
#define DATE_COLUMN @"date"
#define LANGUAGE_COLUMN @"language"
#define LANGUAGE_COLUMN @"language"
#define URI_COLUMN @"uri"
/*****************************************************************************
/*****************************************************************************
* VLCPlaylistView interface
* VLCPlaylistView interface
...
...
modules/gui/macosx/playlist.m
View file @
7dd43543
...
@@ -390,6 +390,14 @@
...
@@ -390,6 +390,14 @@
free
(
psz_value
);
\
free
(
psz_value
);
\
}
}
}
}
else
if
(
[
o_identifier
isEqualToString
:
URI_COLUMN
]
)
{
psz_value
=
decode_URI
(
input_item_GetURI
(
p_item
->
p_input
));
\
if
(
psz_value
)
{
\
o_value
=
[
NSString
stringWithUTF8String
:
psz_value
];
\
free
(
psz_value
);
\
}
}
else
if
(
[
o_identifier
isEqualToString
:
@"status"
]
)
else
if
(
[
o_identifier
isEqualToString
:
@"status"
]
)
{
{
if
(
input_item_HasErrorWhenReading
(
p_item
->
p_input
)
)
if
(
input_item_HasErrorWhenReading
(
p_item
->
p_input
)
)
...
@@ -1394,6 +1402,8 @@
...
@@ -1394,6 +1402,8 @@
i_mode
=
SORT_ALBUM
;
i_mode
=
SORT_ALBUM
;
else
if
(
[
o_identifier
isEqualToString
:
DESCRIPTION_COLUMN
]
)
else
if
(
[
o_identifier
isEqualToString
:
DESCRIPTION_COLUMN
]
)
i_mode
=
SORT_DESCRIPTION
;
i_mode
=
SORT_DESCRIPTION
;
else
if
(
[
o_identifier
isEqualToString
:
URI_COLUMN
]
)
i_mode
=
SORT_URI
;
else
else
return
;
return
;
...
@@ -1507,6 +1517,8 @@
...
@@ -1507,6 +1517,8 @@
[[
o_work_tc
headerCell
]
setStringValue
:
_NS
(
"Date"
)];
[[
o_work_tc
headerCell
]
setStringValue
:
_NS
(
"Date"
)];
else
if
([
o_column
isEqualToString
:
LANGUAGE_COLUMN
])
else
if
([
o_column
isEqualToString
:
LANGUAGE_COLUMN
])
[[
o_work_tc
headerCell
]
setStringValue
:
_NS
(
"Language"
)];
[[
o_work_tc
headerCell
]
setStringValue
:
_NS
(
"Language"
)];
else
if
([
o_column
isEqualToString
:
URI_COLUMN
])
[[
o_work_tc
headerCell
]
setStringValue
:
_NS
(
"URI"
)];
[
o_outline_view
addTableColumn
:
o_work_tc
];
[
o_outline_view
addTableColumn
:
o_work_tc
];
[
o_work_tc
release
];
[
o_work_tc
release
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment