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
f0a7d9a4
Commit
f0a7d9a4
authored
Aug 22, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: improve main window initialization
This targets the same issue as
5b8a4057
, but in a saner approach
parent
1c2af88f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+11
-11
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+5
-5
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
f0a7d9a4
...
...
@@ -21,17 +21,17 @@
</object>
<object
class=
"NSMutableArray"
key=
"IBDocument.EditedObjectIDs"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
<integer
value=
"5160"
/>
<integer
value=
"4722"
/>
<integer
value=
"3707"
/>
<integer
value=
"21"
/>
<integer
value=
"4850"
/>
<integer
value=
"1617"
/>
<integer
value=
"2730"
/>
<integer
value=
"4722"
/>
<integer
value=
"3707"
/>
<integer
value=
"915"
/>
<integer
value=
"2770"
/>
<integer
value=
"
484
5"
/>
<integer
value=
"
91
5"
/>
<integer
value=
"4948"
/>
<integer
value=
"5160"
/>
<integer
value=
"4850"
/>
<integer
value=
"4845"
/>
</object>
<object
class=
"NSArray"
key=
"IBDocument.PluginDependencies"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
...
...
@@ -11939,7 +11939,7 @@ LCAuLi4</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
{{329, 65}, {604, 310}}
</string>
<boolean
value=
"YES"
/>
<boolean
value=
"
NO
"
/>
<boolean
value=
"
YES
"
/>
<boolean
value=
"NO"
/>
<string>
{604, 36}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
...
...
@@ -12130,7 +12130,7 @@ LCAuLi4</string>
<boolean
value=
"YES"
/>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
{{5
92
, 715}, {468, 20}}
</string>
<string>
{{5
00
, 715}, {468, 20}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
...
...
@@ -12476,7 +12476,7 @@ LCAuLi4</string>
<string>
{{329, 634}, {100, 100}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
{{
68
8, 601}, {400, 22}}
</string>
<string>
{{
56
8, 601}, {400, 22}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<object
class=
"NSAffineTransform"
/>
<string>
VLCCustomWindowCloseButton
</string>
...
...
@@ -12640,7 +12640,7 @@ LCAuLi4</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
{{
736
, 282}, {302, 433}}
</string>
<string>
{{
644
, 282}, {302, 433}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
...
...
@@ -12692,7 +12692,7 @@ LCAuLi4</string>
<string>
{{1340, 354}, {64, 6}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<boolean
value=
"YES"
/>
<string>
{{
1038
, 299}, {64, 6}}
</string>
<string>
{{
946
, 299}, {64, 6}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<object
class=
"NSAffineTransform"
>
...
...
modules/gui/macosx/intf.m
View file @
f0a7d9a4
...
...
@@ -654,11 +654,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[[
VLCApplication
sharedApplication
]
setApplicationIconImage
:
[
NSImage
imageNamed
:
@"vlc-xmas"
]];
}
[
o_mainwindow
updateWindow
];
[
o_mainwindow
updateTimeSlider
];
[
o_mainwindow
updateVolumeSlider
];
[
o_mainwindow
makeKeyAndOrderFront
:
self
];
[
self
initStrings
];
nib_main_loaded
=
TRUE
;
...
...
@@ -692,6 +687,11 @@ static VLCMain *_o_sharedMainInstance = nil;
/* we will need this, so let's load it here so the interface appears to be more responsive */
nib_open_loaded
=
[
NSBundle
loadNibNamed
:
@"Open"
owner
:
NSApp
];
/* update the main window */
[
o_mainwindow
updateWindow
];
[
o_mainwindow
updateTimeSlider
];
[
o_mainwindow
updateVolumeSlider
];
}
-
(
void
)
initStrings
...
...
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