From: David Fuhrmann Date: Sat, 29 Nov 2014 11:27:46 +0000 (+0100) Subject: macosx: set better colors for playback speed controls (close #12633) X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c07294b17080f46e5940e9d24b4c52c78da0363e;p=vlc macosx: set better colors for playback speed controls (close #12633) --- diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib index 73c3b2872c..27ce9cd22a 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib @@ -2,20 +2,21 @@ 1050 - 12F45 + 13F34 851 - 1187.40 - 626.00 + 1265.21 + 698.00 com.apple.InterfaceBuilder.CocoaPlugin 851 YES - - + + + YES @@ -55,6 +56,7 @@ NSMenuMixedState submenuAction: + VLC @@ -115,6 +117,7 @@ submenuAction: + Extensions @@ -149,6 +152,7 @@ submenuAction: + Add Interface @@ -176,6 +180,7 @@ submenuAction: + Services @@ -257,6 +262,7 @@ submenuAction: + File @@ -325,6 +331,7 @@ submenuAction: + Open Recent @@ -432,6 +439,7 @@ submenuAction: + Edit @@ -493,6 +501,7 @@ submenuAction: + View @@ -547,6 +556,7 @@ submenuAction: + Playlist Table Columns @@ -566,6 +576,7 @@ submenuAction: + Playback @@ -748,6 +759,7 @@ submenuAction: + Program @@ -764,6 +776,7 @@ submenuAction: + Title @@ -780,6 +793,7 @@ submenuAction: + Chapter @@ -799,6 +813,7 @@ submenuAction: + Audio @@ -850,6 +865,7 @@ submenuAction: + Audio track @@ -866,6 +882,7 @@ submenuAction: + Stereo audio mode @@ -893,6 +910,7 @@ submenuAction: + Visualizations @@ -920,6 +938,7 @@ submenuAction: + Audio device @@ -939,6 +958,7 @@ submenuAction: + Video @@ -1040,6 +1060,7 @@ submenuAction: + Aspect-ratio @@ -1056,6 +1077,7 @@ submenuAction: + Crop @@ -1072,6 +1094,7 @@ submenuAction: + Deinterlace @@ -1088,6 +1111,7 @@ submenuAction: + Deinterlace mode @@ -1104,6 +1128,7 @@ submenuAction: + Post processing @@ -1131,6 +1156,7 @@ submenuAction: + Video track @@ -1158,6 +1184,7 @@ submenuAction: + Video device @@ -1176,6 +1203,7 @@ submenuAction: + Subtitles @@ -1198,6 +1226,7 @@ submenuAction: + Subtitle track @@ -1223,6 +1252,7 @@ submenuAction: + Size @@ -1238,6 +1268,7 @@ submenuAction: + Text Color @@ -1261,6 +1292,7 @@ submenuAction: + Outline Thickness @@ -1302,6 +1334,7 @@ submenuAction: + Background Color @@ -1336,6 +1369,7 @@ submenuAction: + Teletext @@ -1413,6 +1447,7 @@ submenuAction: + Window @@ -1580,6 +1615,7 @@ submenuAction: + Help @@ -1810,6 +1846,7 @@ NO + 1 @@ -1845,6 +1882,7 @@ NO + 1 @@ -1923,6 +1961,7 @@ NO + 1 {249, 103} @@ -2071,7 +2110,7 @@ SUUpdater - + 268 YES @@ -2092,35 +2131,14 @@ - - 6 - System - windowFrameColor - - - - NO - - - - 268 - {{19, 35}, {273, 18}} - - YES - - 605028416 - 272630784 - Playback Speed - - - - + NO + 1 - -2147483380 + 268 {{19, 35}, {273, 18}} YES @@ -2134,6 +2152,7 @@ NO + 1 @@ -2174,9 +2193,10 @@ - + NO + 1 @@ -2191,9 +2211,10 @@ - + NO + 1 @@ -2208,9 +2229,10 @@ - + NO + 1 @@ -2236,6 +2258,7 @@ {307, 53} + NSView @@ -2256,9 +2279,15 @@ - + + 6 + System + windowFrameColor + + NO + 1 @@ -2276,6 +2305,7 @@ NO + 1 @@ -3564,14 +3594,6 @@ 4624 - - - o_mi_rate_lbl_gray - - - - 4625 - floatOnTop: @@ -5463,7 +5485,6 @@ - Rate Menu View @@ -5557,20 +5578,6 @@ - - 4622 - - - YES - - - - - - 4623 - - - 4815 @@ -6547,9 +6554,6 @@ 4617.IBPluginDependency 4617.IBViewBoundsToFrameTransform 4618.IBPluginDependency - 4622.IBPluginDependency - 4622.IBViewBoundsToFrameTransform - 4623.IBPluginDependency 4815.IBPluginDependency 4824.IBEditorWindowLastContentRect 4824.IBPluginDependency @@ -7024,11 +7028,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABB2AAAwiwAAA - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin {{728, 603}, {143, 23}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -7255,7 +7254,7 @@ NSView - + IBProjectSource ../../../modules/gui/macosx/misc.h @@ -7556,6 +7555,7 @@ YES o_bottombar_view o_bwd_btn + o_drop_view o_fullscreen_btn o_fwd_btn o_play_btn @@ -7571,6 +7571,7 @@ YES id id + VLCDragDropView id id id @@ -7589,6 +7590,7 @@ YES o_bottombar_view o_bwd_btn + o_drop_view o_fullscreen_btn o_fwd_btn o_play_btn @@ -7610,6 +7612,10 @@ o_bwd_btn id + + o_drop_view + VLCDragDropView + o_fullscreen_btn id @@ -7657,6 +7663,11 @@ ../../../modules/gui/macosx/ControlsBar.h + + VLCDragDropView + NSView + + VLCMain NSObject @@ -7786,6 +7797,7 @@ intfOpenFile: intfOpenFileGeneric: intfOpenNet: + openAddonManager: openDocumentation: openDonate: openForum: @@ -7818,6 +7830,7 @@ toggleJumpButtons: togglePlaylistColumnTable: togglePlaymodeButtons: + togglePostProcessing: toggleRecord: toggleSidebar: toggleVar: @@ -7875,6 +7888,8 @@ id id id + id + id @@ -7889,6 +7904,7 @@ intfOpenFile: intfOpenFileGeneric: intfOpenNet: + openAddonManager: openDocumentation: openDonate: openForum: @@ -7921,6 +7937,7 @@ toggleJumpButtons: togglePlaylistColumnTable: togglePlaymodeButtons: + togglePostProcessing: toggleRecord: toggleSidebar: toggleVar: @@ -7963,6 +7980,10 @@ intfOpenNet: id + + openAddonManager: + id + openDocumentation: id @@ -8091,6 +8112,10 @@ togglePlaymodeButtons: id + + togglePostProcessing: + id + toggleRecord: id @@ -8126,6 +8151,7 @@ YES o_about + o_addonManager o_audioeffects o_bookmarks o_convertandsave @@ -8138,6 +8164,7 @@ o_mi_AtoBloop o_mi_about o_mi_add_intf + o_mi_addonManager o_mi_aspect_ratio o_mi_audioeffects o_mi_audiotrack @@ -8203,7 +8230,6 @@ o_mi_rate_faster_lbl o_mi_rate_fld o_mi_rate_lbl - o_mi_rate_lbl_gray o_mi_rate_normal_lbl o_mi_rate_sld o_mi_rate_slower_lbl @@ -8298,6 +8324,7 @@ id id id + id NSMenuItem NSMenuItem NSMenuItem @@ -8369,7 +8396,7 @@ NSMenuItem NSMenuItem NSMenuItem - id + NSMenuItem id id id @@ -8467,6 +8494,7 @@ YES o_about + o_addonManager o_audioeffects o_bookmarks o_convertandsave @@ -8479,6 +8507,7 @@ o_mi_AtoBloop o_mi_about o_mi_add_intf + o_mi_addonManager o_mi_aspect_ratio o_mi_audioeffects o_mi_audiotrack @@ -8544,7 +8573,6 @@ o_mi_rate_faster_lbl o_mi_rate_fld o_mi_rate_lbl - o_mi_rate_lbl_gray o_mi_rate_normal_lbl o_mi_rate_sld o_mi_rate_slower_lbl @@ -8639,6 +8667,10 @@ o_about id + + o_addonManager + id + o_audioeffects id @@ -8687,6 +8719,10 @@ o_mi_add_intf NSMenuItem + + o_mi_addonManager + NSMenuItem + o_mi_aspect_ratio NSMenuItem @@ -8947,10 +8983,6 @@ o_mi_rate_lbl id - - o_mi_rate_lbl_gray - id - o_mi_rate_normal_lbl id @@ -9369,6 +9401,7 @@ o_chosen_category_lbl o_dropzone_box o_dropzone_btn + o_dropzone_img o_dropzone_lbl o_dropzone_view o_left_split_view @@ -9423,6 +9456,7 @@ id id id + id @@ -9432,6 +9466,7 @@ o_chosen_category_lbl o_dropzone_box o_dropzone_btn + o_dropzone_img o_dropzone_lbl o_dropzone_view o_left_split_view @@ -9471,6 +9506,10 @@ o_dropzone_btn id + + o_dropzone_img + id + o_dropzone_lbl id @@ -9574,6 +9613,78 @@ ../../../modules/gui/macosx/MainWindow.h + + VLCMainWindowTitleView + VLCThreePartImageView + + buttonAction: + id + + + buttonAction: + + buttonAction: + id + + + + YES + + YES + o_fullscreen_btn + o_green_btn + o_red_btn + o_title_lbl + o_yellow_btn + + + YES + id + id + id + id + id + + + + YES + + YES + o_fullscreen_btn + o_green_btn + o_red_btn + o_title_lbl + o_yellow_btn + + + YES + + o_fullscreen_btn + id + + + o_green_btn + id + + + o_red_btn + id + + + o_title_lbl + id + + + o_yellow_btn + id + + + + + IBProjectSource + ../../../modules/gui/macosx/MainWindowTitle.h + + VLCPlaylist VLCPlaylistCommon @@ -9705,7 +9816,6 @@ o_save_accessory_text o_save_accessory_view o_search_field - o_search_field_other YES @@ -9731,7 +9841,6 @@ id id id - id @@ -9760,7 +9869,6 @@ o_save_accessory_text o_save_accessory_view o_search_field - o_search_field_other YES @@ -9852,10 +9960,6 @@ o_search_field id - - o_search_field_other - id - @@ -9867,56 +9971,14 @@ VLCPlaylistCommon NSObject - YES - - YES - o_outline_view - o_outline_view_other - o_tc_author_other - o_tc_duration_other - o_tc_name_other - - - YES - VLCPlaylistView - VLCPlaylistView - id - id - id - + o_outline_view + VLCPlaylistView - YES - - YES - o_outline_view - o_outline_view_other - o_tc_author_other - o_tc_duration_other - o_tc_name_other - - - YES - - o_outline_view - VLCPlaylistView - - - o_outline_view_other - VLCPlaylistView - - - o_tc_author_other - id - - - o_tc_duration_other - id - - - o_tc_name_other - id - + o_outline_view + + o_outline_view + VLCPlaylistView @@ -9926,6 +9988,11 @@ NSOutlineView + + VLCThreePartImageView + NSView + + VLCVideoWindowCommon VLCWindow @@ -9940,7 +10007,7 @@ YES VLCControlsBarCommon - id + VLCMainWindowTitleView VLCVoutView @@ -9960,7 +10027,7 @@ o_titlebar_view - id + VLCMainWindowTitleView o_video_view @@ -9987,1559 +10054,7 @@ - - YES - - VLCMainMenu - NSObject - - YES - - YES - addSubtitleFile: - createVideoSnapshot: - floatOnTop: - intfOpenCapture: - intfOpenDisc: - intfOpenFile: - intfOpenFileGeneric: - intfOpenNet: - openAddonManager: - openDocumentation: - openDonate: - openForum: - openReadMe: - openWebsite: - quitAfterPlayback: - resizeVideoWindow: - savePlaylist: - setPlaybackRate: - showAudioEffects: - showBookmarks: - showConvertAndSave: - showInformationPanel: - showLicense: - showMainWindow: - showMessagesPanel: - showPlaylist: - showTrackSynchronization: - showVideoEffects: - showWizard: - switchSubtitleBackgroundOpacity: - switchSubtitleOption: - telxNavLink: - telxTransparent: - toggleAtoBloop: - toggleAudioDevice: - toggleEffectsButton: - toggleFullscreen: - toggleFullscreenDevice: - toggleJumpButtons: - togglePlaylistColumnTable: - togglePlaymodeButtons: - toggleRecord: - toggleSidebar: - toggleVar: - viewAbout: - viewErrorsAndWarnings: - viewHelp: - viewPreferences: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - addSubtitleFile: - createVideoSnapshot: - floatOnTop: - intfOpenCapture: - intfOpenDisc: - intfOpenFile: - intfOpenFileGeneric: - intfOpenNet: - openAddonManager: - openDocumentation: - openDonate: - openForum: - openReadMe: - openWebsite: - quitAfterPlayback: - resizeVideoWindow: - savePlaylist: - setPlaybackRate: - showAudioEffects: - showBookmarks: - showConvertAndSave: - showInformationPanel: - showLicense: - showMainWindow: - showMessagesPanel: - showPlaylist: - showTrackSynchronization: - showVideoEffects: - showWizard: - switchSubtitleBackgroundOpacity: - switchSubtitleOption: - telxNavLink: - telxTransparent: - toggleAtoBloop: - toggleAudioDevice: - toggleEffectsButton: - toggleFullscreen: - toggleFullscreenDevice: - toggleJumpButtons: - togglePlaylistColumnTable: - togglePlaymodeButtons: - toggleRecord: - toggleSidebar: - toggleVar: - viewAbout: - viewErrorsAndWarnings: - viewHelp: - viewPreferences: - - - YES - - addSubtitleFile: - id - - - createVideoSnapshot: - id - - - floatOnTop: - id - - - intfOpenCapture: - id - - - intfOpenDisc: - id - - - intfOpenFile: - id - - - intfOpenFileGeneric: - id - - - intfOpenNet: - id - - - openAddonManager: - id - - - openDocumentation: - id - - - openDonate: - id - - - openForum: - id - - - openReadMe: - id - - - openWebsite: - id - - - quitAfterPlayback: - id - - - resizeVideoWindow: - id - - - savePlaylist: - id - - - setPlaybackRate: - id - - - showAudioEffects: - id - - - showBookmarks: - id - - - showConvertAndSave: - id - - - showInformationPanel: - id - - - showLicense: - id - - - showMainWindow: - id - - - showMessagesPanel: - id - - - showPlaylist: - id - - - showTrackSynchronization: - id - - - showVideoEffects: - id - - - showWizard: - id - - - switchSubtitleBackgroundOpacity: - id - - - switchSubtitleOption: - id - - - telxNavLink: - id - - - telxTransparent: - id - - - toggleAtoBloop: - id - - - toggleAudioDevice: - id - - - toggleEffectsButton: - id - - - toggleFullscreen: - id - - - toggleFullscreenDevice: - id - - - toggleJumpButtons: - id - - - togglePlaylistColumnTable: - id - - - togglePlaymodeButtons: - id - - - toggleRecord: - id - - - toggleSidebar: - id - - - toggleVar: - id - - - viewAbout: - id - - - viewErrorsAndWarnings: - id - - - viewHelp: - id - - - viewPreferences: - id - - - - - YES - - YES - o_about - o_audioeffects - o_bookmarks - o_convertandsave - o_dmi_mute - o_dmi_next - o_dmi_play - o_dmi_previous - o_dmi_stop - o_extMgr - o_mi_AtoBloop - o_mi_about - o_mi_add_intf - o_mi_addonManager - o_mi_aspect_ratio - o_mi_audioeffects - o_mi_audiotrack - o_mi_bookmarks - o_mi_bring_atf - o_mi_bwd - o_mi_channels - o_mi_chapter - o_mi_checkForUpdate - o_mi_clear - o_mi_close_window - o_mi_controller - o_mi_convertandsave - o_mi_copy - o_mi_crop - o_mi_cut - o_mi_deinterlace - o_mi_deinterlace_mode - o_mi_device - o_mi_documentation - o_mi_donation - o_mi_double_window - o_mi_errorsAndWarnings - o_mi_extensions - o_mi_ffmpeg_pp - o_mi_fittoscreen - o_mi_floatontop - o_mi_forum - o_mi_fullscreen - o_mi_fwd - o_mi_half_window - o_mi_help - o_mi_hide - o_mi_hide_others - o_mi_info - o_mi_license - o_mi_loop - o_mi_messages - o_mi_minimize - o_mi_mute - o_mi_next - o_mi_normal_window - o_mi_openSubtitleFile - o_mi_open_capture - o_mi_open_disc - o_mi_open_file - o_mi_open_generic - o_mi_open_net - o_mi_open_recent - o_mi_open_wizard - o_mi_paste - o_mi_play - o_mi_player - o_mi_playlist - o_mi_playlistTableColumns - o_mi_prefs - o_mi_previous - o_mi_program - o_mi_quit - o_mi_quitAfterPB - o_mi_random - o_mi_rate - o_mi_rate_faster_lbl - o_mi_rate_fld - o_mi_rate_lbl - o_mi_rate_lbl_gray - o_mi_rate_normal_lbl - o_mi_rate_sld - o_mi_rate_slower_lbl - o_mi_rate_view - o_mi_readme - o_mi_record - o_mi_repeat - o_mi_save_playlist - o_mi_screen - o_mi_select_all - o_mi_services - o_mi_show_all - o_mi_snapshot - o_mi_stop - o_mi_subtitle_bgcolor - o_mi_subtitle_bgopacity - o_mi_subtitle_bgopacity_lbl - o_mi_subtitle_bgopacity_lbl_gray - o_mi_subtitle_bgopacity_sld - o_mi_subtitle_bgopacity_view - o_mi_subtitle_outlinethickness - o_mi_subtitle_size - o_mi_subtitle_textcolor - o_mi_subtitle_track - o_mi_teletext - o_mi_teletext_blue - o_mi_teletext_green - o_mi_teletext_index - o_mi_teletext_red - o_mi_teletext_transparent - o_mi_teletext_yellow - o_mi_title - o_mi_toggleEffectsButton - o_mi_toggleJumpButtons - o_mi_togglePlaymodeButtons - o_mi_toggleSidebar - o_mi_trackSynchronization - o_mi_videoeffects - o_mi_videotrack - o_mi_visual - o_mi_vol_down - o_mi_vol_up - o_mi_website - o_mi_zoom_window - o_mu_add_intf - o_mu_aspect_ratio - o_mu_audio - o_mu_audiotrack - o_mu_channels - o_mu_chapter - o_mu_controls - o_mu_crop - o_mu_deinterlace - o_mu_deinterlace_mode - o_mu_device - o_mu_edit - o_mu_extensions - o_mu_ffmpeg_pp - o_mu_file - o_mu_help - o_mu_playlistTableColumns - o_mu_program - o_mu_screen - o_mu_subtitle_bgcolor - o_mu_subtitle_outlinethickness - o_mu_subtitle_size - o_mu_subtitle_textcolor - o_mu_subtitle_tracks - o_mu_subtitles - o_mu_title - o_mu_video - o_mu_videotrack - o_mu_view - o_mu_visual - o_mu_window - o_trackSynchronization - o_videoeffects - o_vmi_fullscreen - o_vmi_mute - o_vmi_next - o_vmi_play - o_vmi_prev - o_vmi_snapshot - o_vmi_stop - o_vmi_voldown - o_vmi_volup - o_vout_menu - - - YES - id - id - id - id - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - id - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - id - id - id - id - id - id - id - NSView - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - id - id - id - NSView - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - NSMenu - id - id - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenuItem - NSMenu - - - - YES - - YES - o_about - o_audioeffects - o_bookmarks - o_convertandsave - o_dmi_mute - o_dmi_next - o_dmi_play - o_dmi_previous - o_dmi_stop - o_extMgr - o_mi_AtoBloop - o_mi_about - o_mi_add_intf - o_mi_addonManager - o_mi_aspect_ratio - o_mi_audioeffects - o_mi_audiotrack - o_mi_bookmarks - o_mi_bring_atf - o_mi_bwd - o_mi_channels - o_mi_chapter - o_mi_checkForUpdate - o_mi_clear - o_mi_close_window - o_mi_controller - o_mi_convertandsave - o_mi_copy - o_mi_crop - o_mi_cut - o_mi_deinterlace - o_mi_deinterlace_mode - o_mi_device - o_mi_documentation - o_mi_donation - o_mi_double_window - o_mi_errorsAndWarnings - o_mi_extensions - o_mi_ffmpeg_pp - o_mi_fittoscreen - o_mi_floatontop - o_mi_forum - o_mi_fullscreen - o_mi_fwd - o_mi_half_window - o_mi_help - o_mi_hide - o_mi_hide_others - o_mi_info - o_mi_license - o_mi_loop - o_mi_messages - o_mi_minimize - o_mi_mute - o_mi_next - o_mi_normal_window - o_mi_openSubtitleFile - o_mi_open_capture - o_mi_open_disc - o_mi_open_file - o_mi_open_generic - o_mi_open_net - o_mi_open_recent - o_mi_open_wizard - o_mi_paste - o_mi_play - o_mi_player - o_mi_playlist - o_mi_playlistTableColumns - o_mi_prefs - o_mi_previous - o_mi_program - o_mi_quit - o_mi_quitAfterPB - o_mi_random - o_mi_rate - o_mi_rate_faster_lbl - o_mi_rate_fld - o_mi_rate_lbl - o_mi_rate_lbl_gray - o_mi_rate_normal_lbl - o_mi_rate_sld - o_mi_rate_slower_lbl - o_mi_rate_view - o_mi_readme - o_mi_record - o_mi_repeat - o_mi_save_playlist - o_mi_screen - o_mi_select_all - o_mi_services - o_mi_show_all - o_mi_snapshot - o_mi_stop - o_mi_subtitle_bgcolor - o_mi_subtitle_bgopacity - o_mi_subtitle_bgopacity_lbl - o_mi_subtitle_bgopacity_lbl_gray - o_mi_subtitle_bgopacity_sld - o_mi_subtitle_bgopacity_view - o_mi_subtitle_outlinethickness - o_mi_subtitle_size - o_mi_subtitle_textcolor - o_mi_subtitle_track - o_mi_teletext - o_mi_teletext_blue - o_mi_teletext_green - o_mi_teletext_index - o_mi_teletext_red - o_mi_teletext_transparent - o_mi_teletext_yellow - o_mi_title - o_mi_toggleEffectsButton - o_mi_toggleJumpButtons - o_mi_togglePlaymodeButtons - o_mi_toggleSidebar - o_mi_trackSynchronization - o_mi_videoeffects - o_mi_videotrack - o_mi_visual - o_mi_vol_down - o_mi_vol_up - o_mi_website - o_mi_zoom_window - o_mu_add_intf - o_mu_aspect_ratio - o_mu_audio - o_mu_audiotrack - o_mu_channels - o_mu_chapter - o_mu_controls - o_mu_crop - o_mu_deinterlace - o_mu_deinterlace_mode - o_mu_device - o_mu_edit - o_mu_extensions - o_mu_ffmpeg_pp - o_mu_file - o_mu_help - o_mu_playlistTableColumns - o_mu_program - o_mu_screen - o_mu_subtitle_bgcolor - o_mu_subtitle_outlinethickness - o_mu_subtitle_size - o_mu_subtitle_textcolor - o_mu_subtitle_tracks - o_mu_subtitles - o_mu_title - o_mu_video - o_mu_videotrack - o_mu_view - o_mu_visual - o_mu_window - o_trackSynchronization - o_videoeffects - o_vmi_fullscreen - o_vmi_mute - o_vmi_next - o_vmi_play - o_vmi_prev - o_vmi_snapshot - o_vmi_stop - o_vmi_voldown - o_vmi_volup - o_vout_menu - - - YES - - o_about - id - - - o_audioeffects - id - - - o_bookmarks - id - - - o_convertandsave - id - - - o_dmi_mute - NSMenuItem - - - o_dmi_next - NSMenuItem - - - o_dmi_play - NSMenuItem - - - o_dmi_previous - NSMenuItem - - - o_dmi_stop - NSMenuItem - - - o_extMgr - id - - - o_mi_AtoBloop - NSMenuItem - - - o_mi_about - NSMenuItem - - - o_mi_add_intf - NSMenuItem - - - o_mi_addonManager - NSMenuItem - - - o_mi_aspect_ratio - NSMenuItem - - - o_mi_audioeffects - NSMenuItem - - - o_mi_audiotrack - NSMenuItem - - - o_mi_bookmarks - NSMenuItem - - - o_mi_bring_atf - NSMenuItem - - - o_mi_bwd - NSMenuItem - - - o_mi_channels - NSMenuItem - - - o_mi_chapter - NSMenuItem - - - o_mi_checkForUpdate - NSMenuItem - - - o_mi_clear - NSMenuItem - - - o_mi_close_window - NSMenuItem - - - o_mi_controller - NSMenuItem - - - o_mi_convertandsave - NSMenuItem - - - o_mi_copy - NSMenuItem - - - o_mi_crop - NSMenuItem - - - o_mi_cut - NSMenuItem - - - o_mi_deinterlace - NSMenuItem - - - o_mi_deinterlace_mode - NSMenuItem - - - o_mi_device - NSMenuItem - - - o_mi_documentation - NSMenuItem - - - o_mi_donation - NSMenuItem - - - o_mi_double_window - NSMenuItem - - - o_mi_errorsAndWarnings - NSMenuItem - - - o_mi_extensions - NSMenuItem - - - o_mi_ffmpeg_pp - NSMenuItem - - - o_mi_fittoscreen - NSMenuItem - - - o_mi_floatontop - NSMenuItem - - - o_mi_forum - NSMenuItem - - - o_mi_fullscreen - NSMenuItem - - - o_mi_fwd - NSMenuItem - - - o_mi_half_window - NSMenuItem - - - o_mi_help - NSMenuItem - - - o_mi_hide - NSMenuItem - - - o_mi_hide_others - NSMenuItem - - - o_mi_info - NSMenuItem - - - o_mi_license - NSMenuItem - - - o_mi_loop - NSMenuItem - - - o_mi_messages - NSMenuItem - - - o_mi_minimize - NSMenuItem - - - o_mi_mute - NSMenuItem - - - o_mi_next - NSMenuItem - - - o_mi_normal_window - NSMenuItem - - - o_mi_openSubtitleFile - NSMenuItem - - - o_mi_open_capture - NSMenuItem - - - o_mi_open_disc - NSMenuItem - - - o_mi_open_file - NSMenuItem - - - o_mi_open_generic - NSMenuItem - - - o_mi_open_net - NSMenuItem - - - o_mi_open_recent - NSMenuItem - - - o_mi_open_wizard - NSMenuItem - - - o_mi_paste - NSMenuItem - - - o_mi_play - NSMenuItem - - - o_mi_player - NSMenuItem - - - o_mi_playlist - NSMenuItem - - - o_mi_playlistTableColumns - NSMenuItem - - - o_mi_prefs - NSMenuItem - - - o_mi_previous - NSMenuItem - - - o_mi_program - NSMenuItem - - - o_mi_quit - NSMenuItem - - - o_mi_quitAfterPB - NSMenuItem - - - o_mi_random - NSMenuItem - - - o_mi_rate - NSMenuItem - - - o_mi_rate_faster_lbl - id - - - o_mi_rate_fld - id - - - o_mi_rate_lbl - id - - - o_mi_rate_lbl_gray - id - - - o_mi_rate_normal_lbl - id - - - o_mi_rate_sld - id - - - o_mi_rate_slower_lbl - id - - - o_mi_rate_view - NSView - - - o_mi_readme - NSMenuItem - - - o_mi_record - NSMenuItem - - - o_mi_repeat - NSMenuItem - - - o_mi_save_playlist - NSMenuItem - - - o_mi_screen - NSMenuItem - - - o_mi_select_all - NSMenuItem - - - o_mi_services - NSMenuItem - - - o_mi_show_all - NSMenuItem - - - o_mi_snapshot - NSMenuItem - - - o_mi_stop - NSMenuItem - - - o_mi_subtitle_bgcolor - NSMenuItem - - - o_mi_subtitle_bgopacity - NSMenuItem - - - o_mi_subtitle_bgopacity_lbl - id - - - o_mi_subtitle_bgopacity_lbl_gray - id - - - o_mi_subtitle_bgopacity_sld - id - - - o_mi_subtitle_bgopacity_view - NSView - - - o_mi_subtitle_outlinethickness - NSMenuItem - - - o_mi_subtitle_size - NSMenuItem - - - o_mi_subtitle_textcolor - NSMenuItem - - - o_mi_subtitle_track - NSMenuItem - - - o_mi_teletext - NSMenuItem - - - o_mi_teletext_blue - NSMenuItem - - - o_mi_teletext_green - NSMenuItem - - - o_mi_teletext_index - NSMenuItem - - - o_mi_teletext_red - NSMenuItem - - - o_mi_teletext_transparent - NSMenuItem - - - o_mi_teletext_yellow - NSMenuItem - - - o_mi_title - NSMenuItem - - - o_mi_toggleEffectsButton - NSMenuItem - - - o_mi_toggleJumpButtons - NSMenuItem - - - o_mi_togglePlaymodeButtons - NSMenuItem - - - o_mi_toggleSidebar - NSMenuItem - - - o_mi_trackSynchronization - NSMenuItem - - - o_mi_videoeffects - NSMenuItem - - - o_mi_videotrack - NSMenuItem - - - o_mi_visual - NSMenuItem - - - o_mi_vol_down - NSMenuItem - - - o_mi_vol_up - NSMenuItem - - - o_mi_website - NSMenuItem - - - o_mi_zoom_window - NSMenuItem - - - o_mu_add_intf - NSMenu - - - o_mu_aspect_ratio - NSMenu - - - o_mu_audio - NSMenu - - - o_mu_audiotrack - NSMenu - - - o_mu_channels - NSMenu - - - o_mu_chapter - NSMenu - - - o_mu_controls - NSMenu - - - o_mu_crop - NSMenu - - - o_mu_deinterlace - NSMenu - - - o_mu_deinterlace_mode - NSMenu - - - o_mu_device - NSMenu - - - o_mu_edit - NSMenu - - - o_mu_extensions - NSMenu - - - o_mu_ffmpeg_pp - NSMenu - - - o_mu_file - NSMenu - - - o_mu_help - NSMenu - - - o_mu_playlistTableColumns - NSMenu - - - o_mu_program - NSMenu - - - o_mu_screen - NSMenu - - - o_mu_subtitle_bgcolor - NSMenu - - - o_mu_subtitle_outlinethickness - NSMenu - - - o_mu_subtitle_size - NSMenu - - - o_mu_subtitle_textcolor - NSMenu - - - o_mu_subtitle_tracks - NSMenu - - - o_mu_subtitles - NSMenu - - - o_mu_title - NSMenu - - - o_mu_video - NSMenu - - - o_mu_videotrack - NSMenu - - - o_mu_view - NSMenu - - - o_mu_visual - NSMenu - - - o_mu_window - NSMenu - - - o_trackSynchronization - id - - - o_videoeffects - id - - - o_vmi_fullscreen - NSMenuItem - - - o_vmi_mute - NSMenuItem - - - o_vmi_next - NSMenuItem - - - o_vmi_play - NSMenuItem - - - o_vmi_prev - NSMenuItem - - - o_vmi_snapshot - NSMenuItem - - - o_vmi_stop - NSMenuItem - - - o_vmi_voldown - NSMenuItem - - - o_vmi_volup - NSMenuItem - - - o_vout_menu - NSMenu - - - - - IBDocumentRelativeSource - ../../../../../modules/gui/macosx/MainMenu.h - - - - + YES NSActionCell @@ -11552,7 +10067,7 @@ NSApplication NSResponder - + IBFrameworkSource AppKit.framework/Headers/NSApplication.h @@ -11759,10 +10274,6 @@ AppKit.framework/Headers/NSAccessibility.h - - NSObject - - NSObject @@ -12026,7 +10537,7 @@ NSObject - + IBFrameworkSource QTKit.framework/Headers/QTMovieView.h @@ -12052,13 +10563,6 @@ WebKit.framework/Headers/WebFrameLoadDelegate.h - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebJavaPlugIn.h - - NSObject @@ -12323,162 +10827,6 @@ AppKit.framework/Headers/NSWindowScripting.h - - QTMovieView - NSView - - YES - - YES - add: - addScaled: - copy: - cut: - delete: - gotoBeginning: - gotoEnd: - gotoNextSelectionPoint: - gotoPosterFrame: - gotoPreviousSelectionPoint: - paste: - pause: - play: - replace: - selectAll: - selectNone: - stepBackward: - stepForward: - trim: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - add: - addScaled: - copy: - cut: - delete: - gotoBeginning: - gotoEnd: - gotoNextSelectionPoint: - gotoPosterFrame: - gotoPreviousSelectionPoint: - paste: - pause: - play: - replace: - selectAll: - selectNone: - stepBackward: - stepForward: - trim: - - - YES - - add: - id - - - addScaled: - id - - - copy: - id - - - cut: - id - - - delete: - id - - - gotoBeginning: - id - - - gotoEnd: - id - - - gotoNextSelectionPoint: - id - - - gotoPosterFrame: - id - - - gotoPreviousSelectionPoint: - id - - - paste: - id - - - pause: - id - - - play: - id - - - replace: - id - - - selectAll: - id - - - selectNone: - id - - - stepBackward: - id - - - stepForward: - id - - - trim: - id - - - - - 0 diff --git a/modules/gui/macosx/MainMenu.h b/modules/gui/macosx/MainMenu.h index cf2a777280..f53f3f56a5 100644 --- a/modules/gui/macosx/MainMenu.h +++ b/modules/gui/macosx/MainMenu.h @@ -98,7 +98,6 @@ IBOutlet NSMenuItem * o_mi_rate; IBOutlet NSView * o_mi_rate_view; IBOutlet id o_mi_rate_lbl; - IBOutlet id o_mi_rate_lbl_gray; IBOutlet id o_mi_rate_slower_lbl; IBOutlet id o_mi_rate_normal_lbl; IBOutlet id o_mi_rate_faster_lbl; diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m index 2fda43e985..0890108735 100644 --- a/modules/gui/macosx/MainMenu.m +++ b/modules/gui/macosx/MainMenu.m @@ -137,6 +137,8 @@ static VLCMainMenu *_o_sharedInstance = nil; msg_Dbg(VLCIntf, "adapting interface since '%s' is a RTL language", [preferredLanguage UTF8String]); [o_mi_rate_fld setAlignment: NSLeftTextAlignment]; } + + [self setRateControlsEnabled:NO]; } - (void)applicationWillFinishLaunching:(NSNotification *)o_notification @@ -700,13 +702,15 @@ static VLCMainMenu *_o_sharedInstance = nil; int i = [[VLCCoreInteraction sharedInstance] playbackRate]; double speed = pow(2, (double)i / 17); [o_mi_rate_fld setStringValue: [NSString stringWithFormat:@"%.2fx", speed]]; - if (b_enabled) { - [o_mi_rate_lbl setHidden: NO]; - [o_mi_rate_lbl_gray setHidden: YES]; - } else { - [o_mi_rate_lbl setHidden: YES]; - [o_mi_rate_lbl_gray setHidden: NO]; - } + + NSColor *o_color = b_enabled ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]; + + [o_mi_rate_lbl setTextColor:o_color]; + [o_mi_rate_slower_lbl setTextColor:o_color]; + [o_mi_rate_normal_lbl setTextColor:o_color]; + [o_mi_rate_faster_lbl setTextColor:o_color]; + [o_mi_rate_fld setTextColor:o_color]; + [self setSubtitleMenuEnabled: b_enabled]; [o_pool release]; }