X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.h;h=39a8a787e93d443f0039f5e0a388ae058413a180;hb=9cbb86d3234e6fa489d9cce18170c59b1b13ab4c;hp=d43771cc04c751f58efdb4216ed04540e2292380;hpb=a55eb27d5f918b63310947ee559a762f92213e7a;p=vlc diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index d43771cc04..39a8a787e9 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -1,7 +1,7 @@ /***************************************************************************** * intf.h: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2005 VideoLAN + * Copyright (C) 2002-2006 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #include @@ -45,6 +45,10 @@ unsigned int CocoaKeyToVLC( unichar i_key ); * the translated string. the translation should be '1:translatedstring' though */ #define _ANS(s) [[[VLCMain sharedInstance] localizedString: _(s)] substringFromIndex:2] +#define MACOS_VERSION [[[NSDictionary dictionaryWithContentsOfFile: \ + @"/System/Library/CoreServices/SystemVersion.plist"] \ + objectForKey: @"ProductVersion"] floatValue] + /***************************************************************************** * intf_sys_t: description and status of the interface *****************************************************************************/ @@ -63,8 +67,10 @@ struct intf_sys_t /* interface update */ vlc_bool_t b_intf_update; vlc_bool_t b_playlist_update; + vlc_bool_t b_playmode_update; vlc_bool_t b_current_title_update; vlc_bool_t b_fullscreen_update; + vlc_bool_t b_volume_update; /* menus handlers */ vlc_bool_t b_input_update; @@ -73,6 +79,7 @@ struct intf_sys_t /* The messages window */ msg_subscription_t * p_sub; + }; /***************************************************************************** @@ -84,13 +91,28 @@ struct intf_sys_t id o_prefs; /* VLCPrefs */ id o_about; /* VLAboutBox */ id o_open; /* VLCOpen */ + id o_wizard; /* VLCWizard */ + id o_extended; /* VLCExtended */ + id o_bookmarks; /* VLCBookmarks */ + id o_embedded_list; /* VLCEmbeddedList*/ + id o_interaction_list; /* VLCInteractionList*/ + id o_sfilters; /* VLCsFilters */ + id o_update; /* VLCUpdate */ + BOOL nib_main_loaded; /* reference to the main-nib */ BOOL nib_open_loaded; /* reference to the open-nib */ + BOOL nib_about_loaded; /* reference to the about-nib */ + BOOL nib_wizard_loaded; /* reference to the wizard-nib */ + BOOL nib_extended_loaded; /* reference to the extended-nib */ + BOOL nib_bookmarks_loaded; /* reference to the bookmarks-nib */ + BOOL nib_sfilters_loaded; /* reference to the sfilters-nib */ + BOOL nib_update_loaded; /* reference to the update-nib */ IBOutlet id o_window; /* main window */ IBOutlet id o_playlist_view;/* playlist view */ IBOutlet id o_scrollfield; /* info field */ IBOutlet id o_timefield; /* time field */ IBOutlet id o_timeslider; /* time slider */ + IBOutlet id o_embedded_window; /* Embedded Vout Window */ float f_slider; /* slider value */ float f_slider_old; /* old slider val */ IBOutlet id o_volumeslider; /* volume slider */ @@ -133,6 +155,7 @@ struct intf_sys_t IBOutlet id o_mi_about; IBOutlet id o_mi_prefs; + IBOutlet id o_mi_checkForUpdate; IBOutlet id o_mi_add_intf; IBOutlet id o_mu_add_intf; IBOutlet id o_mi_services; @@ -148,6 +171,7 @@ struct intf_sys_t IBOutlet id o_mi_open_net; IBOutlet id o_mi_open_recent; IBOutlet id o_mi_open_recent_cm; + IBOutlet id o_mi_open_wizard; IBOutlet id o_mu_edit; IBOutlet id o_mi_cut; @@ -216,6 +240,8 @@ struct intf_sys_t IBOutlet id o_mi_close_window; IBOutlet id o_mi_controller; IBOutlet id o_mi_equalizer; + IBOutlet id o_mi_extended; + IBOutlet id o_mi_bookmarks; IBOutlet id o_mi_playlist; IBOutlet id o_mi_info; IBOutlet id o_mi_messages; @@ -227,6 +253,8 @@ struct intf_sys_t IBOutlet id o_mi_reportabug; IBOutlet id o_mi_website; IBOutlet id o_mi_license; + IBOutlet id o_mi_donation; + IBOutlet id o_mi_forum; /* dock menu */ IBOutlet id o_dmi_play; @@ -234,10 +262,14 @@ struct intf_sys_t IBOutlet id o_dmi_next; IBOutlet id o_dmi_previous; IBOutlet id o_dmi_mute; - + bool b_small_window; - + mtime_t i_end_scroll; + + NSSize o_size_with_playlist; + + int i_lastShownVolume; } + (VLCMain *)sharedInstance; @@ -248,6 +280,10 @@ struct intf_sys_t - (id)getControls; - (id)getPlaylist; - (id)getInfo; +- (id)getWizard; +- (id)getBookmarks; +- (id)getEmbeddedList; +- (id)getInteractionList; - (void)terminate; - (NSString *)localizedString:(char *)psz; - (char *)delocalizeString:(NSString *)psz; @@ -276,14 +312,22 @@ struct intf_sys_t - (IBAction)intfOpenDisc:(id)sender; - (IBAction)intfOpenNet:(id)sender; +- (IBAction)showWizard:(id)sender; +- (IBAction)showExtended:(id)sender; +- (IBAction)showBookmarks:(id)sender; +- (IBAction)showSFilters:(id)sender; + - (IBAction)viewAbout:(id)sender; - (IBAction)viewPreferences:(id)sender; +- (IBAction)checkForUpdate:(id)sender; - (IBAction)closeError:(id)sender; - (IBAction)openReadMe:(id)sender; - (IBAction)openDocumentation:(id)sender; - (IBAction)reportABug:(id)sender; - (IBAction)openWebsite:(id)sender; - (IBAction)openLicense:(id)sender; +- (IBAction)openForum:(id)sender; +- (IBAction)openDonate:(id)sender; - (IBAction)openCrashLog:(id)sender; - (IBAction)togglePlaylist:(id)sender;