Commit 49d1f5b7 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Felix Paul Kühne

macosx: added 'video-deco' to the simple preferences to match the Qt4 intf (refs #6426)

(cherry picked from commit 2ea9ea1117ba6bae74f9dcf7f00e3188bf3a1eb2)
parent b778e287
/***************************************************************************** /*****************************************************************************
* simple_prefs.h: Simple Preferences for Mac OS X * simple_prefs.h: Simple Preferences for Mac OS X
***************************************************************************** *****************************************************************************
* Copyright (C) 2008-2011 VLC authors and VideoLAN * Copyright (C) 2008-2012 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne at videolan dot org> * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
...@@ -145,6 +145,7 @@ IBOutlet id o_intf_mediakeys_ckb; ...@@ -145,6 +145,7 @@ IBOutlet id o_intf_mediakeys_ckb;
IBOutlet id o_video_display_box; IBOutlet id o_video_display_box;
IBOutlet id o_video_enable_ckb; IBOutlet id o_video_enable_ckb;
IBOutlet id o_video_fullscreen_ckb; IBOutlet id o_video_fullscreen_ckb;
IBOutlet id o_video_videodeco_ckb;
IBOutlet id o_video_onTop_ckb; IBOutlet id o_video_onTop_ckb;
IBOutlet id o_video_output_pop; IBOutlet id o_video_output_pop;
IBOutlet id o_video_output_txt; IBOutlet id o_video_output_txt;
......
...@@ -304,6 +304,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -304,6 +304,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[o_video_display_box setTitle: _NS("Display")]; [o_video_display_box setTitle: _NS("Display")];
[o_video_enable_ckb setTitle: _NS("Enable Video")]; [o_video_enable_ckb setTitle: _NS("Enable Video")];
[o_video_fullscreen_ckb setTitle: _NS("Fullscreen")]; [o_video_fullscreen_ckb setTitle: _NS("Fullscreen")];
[o_video_videodeco_ckb setTitle: _NS("Window decorations")];
[o_video_onTop_ckb setTitle: _NS("Always on top")]; [o_video_onTop_ckb setTitle: _NS("Always on top")];
[o_video_output_txt setStringValue: _NS("Output module")]; [o_video_output_txt setStringValue: _NS("Output module")];
[o_video_skipFrames_ckb setTitle: _NS("Skip frames")]; [o_video_skipFrames_ckb setTitle: _NS("Skip frames")];
...@@ -577,6 +578,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na ...@@ -577,6 +578,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
[self setupButton: o_video_onTop_ckb forBoolValue: "video-on-top"]; [self setupButton: o_video_onTop_ckb forBoolValue: "video-on-top"];
[self setupButton: o_video_skipFrames_ckb forBoolValue: "skip-frames"]; [self setupButton: o_video_skipFrames_ckb forBoolValue: "skip-frames"];
[self setupButton: o_video_black_ckb forBoolValue: "macosx-black"]; [self setupButton: o_video_black_ckb forBoolValue: "macosx-black"];
[self setupButton: o_video_videodeco_ckb forBoolValue: "video-deco"];
[self setupButton: o_video_output_pop forModuleList: "vout"]; [self setupButton: o_video_output_pop forModuleList: "vout"];
...@@ -925,6 +927,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -925,6 +927,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
{ {
config_PutInt( p_intf, "video", [o_video_enable_ckb state] ); config_PutInt( p_intf, "video", [o_video_enable_ckb state] );
config_PutInt( p_intf, "fullscreen", [o_video_fullscreen_ckb state] ); config_PutInt( p_intf, "fullscreen", [o_video_fullscreen_ckb state] );
config_PutInt( p_intf, "video-deco", [o_video_videodeco_ckb state] );
config_PutInt( p_intf, "video-on-top", [o_video_onTop_ckb state] ); config_PutInt( p_intf, "video-on-top", [o_video_onTop_ckb state] );
config_PutInt( p_intf, "skip-frames", [o_video_skipFrames_ckb state] ); config_PutInt( p_intf, "skip-frames", [o_video_skipFrames_ckb state] );
config_PutInt( p_intf, "macosx-black", [o_video_black_ckb state] ); config_PutInt( p_intf, "macosx-black", [o_video_black_ckb state] );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment