macosx: move Subtitle and Teletext items to a newly created 'Subtitles' menu

[vlc] / modules / gui / macosx / MainMenu.h

diff --git a/modules/gui/macosx/MainMenu.h b/modules/gui/macosx/MainMenu.h
index 346c9acb9ce4ede0ac9df04094087c52ec81c6ff..b525b17c4a0f0eca12c6d2d85a16ca2573a645b9 100644 (file)
--- a/modules/gui/macosx/MainMenu.h
+++ b/modules/gui/macosx/MainMenu.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * MainMenu.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2011 Felix Paul Kühne
+ * Copyright (C) 2011-2013 Felix Paul Kühne
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
@@ -34,18 +34,24 @@
     BOOL b_nib_audioeffects_loaded;
     BOOL b_nib_tracksynchro_loaded;
     BOOL b_nib_bookmarks_loaded;
+    BOOL b_nib_convertandsave_loaded;
 
     id o_about;                 /* VLAboutBox     */
     id o_videoeffects;          /* VLCVideoEffects */
     id o_audioeffects;          /* VLCAudioEffects */
     id o_trackSynchronization;  /* VLCTrackSynchronization */
     id o_bookmarks;             /* VLCBookmarks */
+    id o_convertandsave;        /* VLCConvertAndSave */
+
+    id o_extMgr;                /* Extensions Manager */
 
     /* main menu */
 
     IBOutlet NSMenuItem * o_mi_about;
     IBOutlet NSMenuItem * o_mi_prefs;
     IBOutlet NSMenuItem * o_mi_checkForUpdate;
+    IBOutlet NSMenuItem * o_mi_extensions;
+    IBOutlet NSMenu * o_mu_extensions;
     IBOutlet NSMenuItem * o_mi_add_intf;
     IBOutlet NSMenu * o_mu_add_intf;
     IBOutlet NSMenuItem * o_mi_services;
@@ -62,6 +68,7 @@
     IBOutlet NSMenuItem * o_mi_open_capture;
     IBOutlet NSMenuItem * o_mi_open_recent;
     IBOutlet NSMenuItem * o_mi_open_wizard;
+    IBOutlet NSMenuItem * o_mi_convertandsave;
 
     IBOutlet NSMenu * o_mu_edit;
     IBOutlet NSMenuItem * o_mi_cut;
@@ -70,6 +77,13 @@
     IBOutlet NSMenuItem * o_mi_clear;
     IBOutlet NSMenuItem * o_mi_select_all;
 
+    IBOutlet NSMenu * o_mu_view;
+    IBOutlet NSMenuItem * o_mi_toggleJumpButtons;
+    IBOutlet NSMenuItem * o_mi_togglePlaymodeButtons;
+    IBOutlet NSMenuItem * o_mi_toggleSidebar;
+    IBOutlet NSMenu * o_mu_playlistTableColumns;
+    NSMenu * o_mu_playlistTableColumnsContextMenu;
+
     IBOutlet NSMenu * o_mu_controls;
     IBOutlet NSMenuItem * o_mi_play;
     IBOutlet NSMenuItem * o_mi_stop;
@@ -89,6 +103,7 @@
     IBOutlet NSMenuItem * o_mi_random;
     IBOutlet NSMenuItem * o_mi_repeat;
     IBOutlet NSMenuItem * o_mi_loop;
+    IBOutlet NSMenuItem * o_mi_AtoBloop;
     IBOutlet NSMenuItem * o_mi_quitAfterPB;
     IBOutlet NSMenuItem * o_mi_fwd;
     IBOutlet NSMenuItem * o_mi_bwd;
@@ -128,15 +143,17 @@
     IBOutlet NSMenu * o_mu_aspect_ratio;
     IBOutlet NSMenuItem * o_mi_crop;
     IBOutlet NSMenu * o_mu_crop;
-    IBOutlet NSMenuItem * o_mi_subtitle;
-    IBOutlet NSMenu * o_mu_subtitle;
-    IBOutlet NSMenuItem * o_mi_addSub;
     IBOutlet NSMenuItem * o_mi_deinterlace;
     IBOutlet NSMenu * o_mu_deinterlace;
     IBOutlet NSMenuItem * o_mi_deinterlace_mode;
     IBOutlet NSMenu * o_mu_deinterlace_mode;
     IBOutlet NSMenuItem * o_mi_ffmpeg_pp;
     IBOutlet NSMenu * o_mu_ffmpeg_pp;
+
+    IBOutlet NSMenu * o_mu_subtitles;
+    IBOutlet NSMenuItem * o_mi_subtitle_track;
+    IBOutlet NSMenu * o_mu_subtitle_tracks;
+    IBOutlet NSMenuItem * o_mi_openSubtitleFile;
     IBOutlet NSMenuItem * o_mi_teletext;
     IBOutlet NSMenuItem * o_mi_teletext_transparent;
     IBOutlet NSMenuItem * o_mi_teletext_index;
@@ -186,6 +203,10 @@
     IBOutlet NSMenuItem * o_vmi_mute;
     IBOutlet NSMenuItem * o_vmi_fullscreen;
     IBOutlet NSMenuItem * o_vmi_snapshot;
+
+    // information for playlist table columns menu
+    NSDictionary * o_ptc_translation_dict;
+    NSArray * o_ptc_menuorder;
 }
 + (VLCMainMenu *)sharedInstance;
 
@@ -196,6 +217,8 @@
 - (void)refreshVoutDeviceMenu:(NSNotification *)o_notification;
 - (void)setSubmenusEnabled:(BOOL)b_enabled;
 - (void)setRateControlsEnabled:(BOOL)b_enabled;
+- (void)setupExtensionsMenu;
+- (void)updateSidebarMenuItem;
 
 - (IBAction)intfOpenFile:(id)sender;
 - (IBAction)intfOpenFileGeneric:(id)sender;
@@ -203,17 +226,33 @@
 - (IBAction)intfOpenNet:(id)sender;
 - (IBAction)intfOpenCapture:(id)sender;
 
+- (IBAction)toggleJumpButtons:(id)sender;
+- (IBAction)togglePlaymodeButtons:(id)sender;
+- (IBAction)toggleSidebar:(id)sender;
+- (IBAction)togglePlaylistColumnTable:(id)sender;
+- (void)setPlaylistColumnTableState:(NSInteger)i_state forColumn:(NSString *)o_column;
+- (NSMenu *)setupPlaylistTableColumnsMenu;
+
 - (IBAction)toggleRecord:(id)sender;
 - (void)updateRecordState:(BOOL)b_value;
 - (IBAction)setPlaybackRate:(id)sender;
 - (void)updatePlaybackRate;
+- (IBAction)toggleAtoBloop:(id)sender;
+
+- (IBAction)toggleAudioDevice:(id)sender;
 
 - (IBAction)toggleFullscreen:(id)sender;
 - (IBAction)resizeVideoWindow:(id)sender;
 - (IBAction)floatOnTop:(id)sender;
 - (IBAction)createVideoSnapshot:(id)sender;
+- (IBAction)toggleFullscreenDevice:(id)sender;
+
+- (IBAction)addSubtitleFile:(id)sender;
+- (IBAction)telxTransparent:(id)sender;
+- (IBAction)telxNavLink:(id)sender;
 
 - (IBAction)showWizard:(id)sender;
+- (IBAction)showConvertAndSave:(id)sender;
 - (IBAction)showVideoEffects:(id)sender;
 - (IBAction)showAudioEffects:(id)sender;
 - (IBAction)showTrackSynchronization:(id)sender;