From: Felix Paul Kühne Date: Sun, 14 Mar 2010 23:16:30 +0000 (+0100) Subject: legacy OS X intf: removed unfinished VLM interface X-Git-Tag: 1.1.0-pre1~380 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ccee49c75601180e6f855383847f70d1caaa4af0;p=vlc legacy OS X intf: removed unfinished VLM interface The existing code only managed to display some windows without any functionality. --- diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib index 00f9624667..900aa3e01b 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib @@ -12,8 +12,8 @@ YES + - YES @@ -615,15 +615,6 @@ - - - VLM Configuration - - 1048576 - 2147483647 - - - Streaming/Exporting Wizard... @@ -7751,22 +7742,6 @@ LCAuLi4 4047 - - - showVLM: - - - - 4049 - - - - o_mi_open_vlm - - - - 4050 - downloadCoverArt: @@ -8238,7 +8213,6 @@ LCAuLi4 - @@ -8339,11 +8313,6 @@ LCAuLi4 - - 4048 - - - 217 @@ -11610,8 +11579,6 @@ LCAuLi4 3945.ImportedFromIB2 3946.IBPluginDependency 3946.ImportedFromIB2 - 4048.IBPluginDependency - 4048.ImportedFromIB2 413.IBPluginDependency 413.ImportedFromIB2 4147.IBPluginDependency @@ -11735,7 +11702,6 @@ LCAuLi4 4368.IBShouldRemoveOnLegacySave 4369.IBPluginDependency 4369.IBShouldRemoveOnLegacySave - 4370.IBPluginDependency 446.IBPluginDependency 446.ImportedFromIB2 5.IBPluginDependency @@ -11759,6 +11725,7 @@ LCAuLi4 79.ImportedFromIB2 801.IBPluginDependency 801.ImportedFromIB2 + 81.IBEditorWindowLastContentRect 81.IBPluginDependency 81.ImportedFromIB2 816.IBPluginDependency @@ -12021,9 +11988,9 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin - {{42, 670}, {338, 29}} + {{350, 670}, {338, 29}} com.apple.InterfaceBuilder.CocoaPlugin - {{42, 670}, {338, 29}} + {{350, 670}, {338, 29}} com.apple.InterfaceBuilder.CocoaPlugin @@ -12438,8 +12405,6 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12543,7 +12508,6 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12566,6 +12530,7 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin + {{408, 471}, {297, 243}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib index b865b2168b..ee5c4c014c 100644 Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/extras/package/macosx/Resources/English.lproj/VLM.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/designable.nib deleted file mode 100644 index fa4a935fb7..0000000000 --- a/extras/package/macosx/Resources/English.lproj/VLM.nib/designable.nib +++ /dev/null @@ -1,2965 +0,0 @@ - - - - 1050 - 9L16 - 677 - 949.54 - 353.00 - - YES - - - - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - YES - - - YES - - - - YES - - NSObject - - - FirstResponder - - - NSApplication - - - 15 - 2 - {{242, 396}, {480, 360}} - 1886912512 - VLM - - NSWindow - - - View - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - 256 - - YES - - - 274 - - YES - - - 2304 - - YES - - - 256 - {463, 328} - - YES - - - 256 - {463, 17} - - - - - - 256 - {{464, 0}, {16, 17}} - - - - YES - - 4.600000e+02 - 8.000000e+00 - 1.000000e+03 - - 75628032 - 0 - - - LucidaGrande - 1.100000e+01 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337772096 - 2048 - - LucidaGrande - 1.300000e+01 - 1044 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2OQA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 3.000000e+00 - 2.000000e+00 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA - - - 1.700000e+01 - -700448768 - 4 - -1 - 0 - YES - - - {{1, 17}, {463, 328}} - - - - - 4 - - - - 256 - {{464, 17}, {15, 328}} - - - _doScroller: - 8.947368e-01 - - - - 256 - {{1, 345}, {463, 15}} - - 1 - - _doScroller: - 9.904762e-01 - - - - 2304 - - YES - - - {{1, 0}, {463, 17}} - - - - - 4 - - - - {{0, -1}, {480, 361}} - - - 50 - - - - - - QSAAAEEgAABBmAAAQZgAAA - - - {480, 360} - - - {{0, 0}, {1280, 778}} - {213, 129} - {3.40282e+38, 3.40282e+38} - vlm_main_win - - - VLCVLMController - - - 3 - 2 - {{125, 271}, {654, 229}} - 1886912512 - Broadcast - - NSPanel - - - View - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - 256 - - YES - - - 256 - - YES - - - 256 - - YES - - - 256 - {{92, 68}, {370, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - 6 - System - textBackgroundColor - - - - 6 - System - textColor - - - - - - - 256 - {{92, 36}, {370, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{92, 100}, {370, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{11, 102}, {76, 17}} - - YES - - 67239424 - 272629760 - Name: - - - - 6 - System - controlColor - - - - - - - - 256 - {{11, 38}, {76, 17}} - - YES - - 67239424 - 272629760 - Output: - - - - - - - - - 256 - {{11, 70}, {76, 17}} - - YES - - 67239424 - 272629760 - Input: - - - - - - - - - 256 - {{90, 12}, {111, 18}} - - YES - - -2080244224 - 0 - Enable - - - 1211912703 - 2 - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{465, 65}, {142, 28}} - - YES - - 67239424 - 134348800 - Select Input - - - -2038284033 - 1 - - LucidaGrande - 1.100000e+01 - 16 - - - - - - 200 - 25 - - - - - 256 - {{465, 33}, {142, 28}} - - YES - - 67239424 - 134348800 - Select Output - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 256 - {{205, 12}, {160, 18}} - - YES - - -2080244224 - 0 - Loop - - - 1211912703 - 2 - - - - 200 - 25 - - - - {{2, 2}, {616, 136}} - - - - {{17, 56}, {620, 153}} - - {0, 0} - - 67239424 - 0 - Broadcast - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{526, 12}, {114, 32}} - - YES - - 67239424 - 134217728 - Add - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 256 - {{412, 12}, {114, 32}} - - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - {654, 229} - - - {{0, 0}, {1280, 778}} - {213, 129} - {3.40282e+38, 3.40282e+38} - - - 3 - 2 - {{38, 265}, {548, 420}} - 1886912512 - Schedule - - NSPanel - - - View - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - 256 - - YES - - - 256 - - YES - - - 256 - - YES - - - 256 - {{92, 259}, {262, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{92, 227}, {262, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{92, 291}, {402, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{11, 293}, {76, 17}} - - YES - - 67239424 - 272629760 - Name: - - - - - - - - - 256 - {{11, 229}, {76, 17}} - - YES - - 67239424 - 272629760 - Output: - - - - - - - - - 256 - {{11, 261}, {76, 17}} - - YES - - 67239424 - 272629760 - Input: - - - - - - - - - 256 - {{357, 255}, {142, 28}} - - YES - - 67239424 - 134348800 - Select Input - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 256 - {{357, 223}, {142, 28}} - - YES - - 67239424 - 134348800 - Select Output - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 256 - - YES - - - 256 - - YES - - - 256 - {{16, 11}, {277, 148}} - - YES - - 71433728 - 0 - - 0.000000e+00 - - - - 0.000000e+00 - 236 - 1 - - - - - - - 256 - {{13, 167}, {114, 17}} - - YES - - 67239424 - 272629760 - RGF0ZSAmIFRpbWU6A - - - - - - - - - 256 - {{347, 82}, {122, 27}} - - YES - - 71433728 - 0 - - 0.000000e+00 - - - - 0.000000e+00 - 12 - - - - - - - 256 - {{344, 167}, {114, 17}} - - YES - - 67239424 - 272629760 - Repeat: - - - - - - - - - 256 - {{344, 112}, {114, 17}} - - YES - - 67239424 - 272629760 - Repeat delay: - - - - - - - - - 256 - {{347, 137}, {98, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{450, 134}, {19, 27}} - - YES - - 917024 - 0 - - 5.900000e+01 - 1.000000e+00 - YES - YES - - - - {{2, 2}, {482, 197}} - - - - {{11, 7}, {486, 214}} - - {0, 0} - - 67239424 - 0 - Time Control - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - {{2, 2}, {510, 327}} - - - - {{17, 56}, {514, 344}} - - {0, 0} - - 67239424 - 0 - Schedule - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{420, 12}, {114, 32}} - - YES - - 67239424 - 134217728 - Add - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 256 - {{306, 12}, {114, 32}} - - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - {548, 420} - - - {{0, 0}, {1280, 778}} - {213, 129} - {3.40282e+38, 3.40282e+38} - - - 3 - 2 - {{268, 454}, {654, 229}} - 1886912512 - Video on Demand - - NSPanel - - - View - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - 256 - - YES - - - 256 - - YES - - - 256 - - YES - - - 256 - {{92, 68}, {370, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{92, 36}, {370, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{92, 100}, {370, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - - - - 256 - {{11, 102}, {76, 17}} - - YES - - 67239424 - 272629760 - Name: - - - - - - - - - 256 - {{11, 38}, {76, 17}} - - YES - - 67239424 - 272629760 - Output: - - - - - - - - - 256 - {{11, 70}, {76, 17}} - - YES - - 67239424 - 272629760 - Input: - - - - - - - - - 256 - {{465, 65}, {142, 28}} - - YES - - 67239424 - 134348800 - Select Input - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 256 - {{465, 33}, {142, 28}} - - YES - - 67239424 - 134348800 - Select Output - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 256 - {{90, 12}, {134, 18}} - - YES - - -2080244224 - 0 - Loop - - - 1211912703 - 2 - - - - 200 - 25 - - - - {{2, 2}, {616, 136}} - - - - {{17, 56}, {620, 153}} - - {0, 0} - - 67239424 - 0 - Video on Demand - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{526, 12}, {114, 32}} - - YES - - 67239424 - 134217728 - Add - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 256 - {{412, 12}, {114, 32}} - - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - {654, 229} - - - {{0, 0}, {1280, 778}} - {213, 129} - {3.40282e+38, 3.40282e+38} - - - - - YES - - - o_vlm_win - - - - 12 - - - - dataSource - - - - 14 - - - - delegate - - - - 15 - - - - listDoubleClickAction: - - - - 46 - - - - o_bcast_panel - - - - 47 - - - - o_bcast_input_fld - - - - 48 - - - - o_bcast_output_fld - - - - 49 - - - - o_bcast_name_fld - - - - 50 - - - - o_bcast_input_btn - - - - 51 - - - - o_bcast_add_btn - - - - 52 - - - - o_bcast_cancel_btn - - - - 53 - - - - o_bcast_enable_ckb - - - - 54 - - - - o_bcast_loop_ckb - - - - 55 - - - - o_bcast_output_btn - - - - 56 - - - - o_bcast_box - - - - 57 - - - - o_vlm_list - - - - 58 - - - - bcastButtonAction: - - - - 59 - - - - bcastButtonAction: - - - - 60 - - - - bcastButtonAction: - - - - 61 - - - - bcastButtonAction: - - - - 62 - - - - bcastButtonAction: - - - - 63 - - - - bcastButtonAction: - - - - 64 - - - - takeIntValueFrom: - - - - 102 - - - - takeIntValueFrom: - - - - 103 - - - - o_sched_date_datePicker - - - - 122 - - - - o_sched_repeatDelay_datePicker - - - - 123 - - - - o_sched_date_lbl - - - - 124 - - - - o_sched_input_btn - - - - 125 - - - - o_sched_box - - - - 126 - - - - o_sched_time_box - - - - 127 - - - - o_sched_input_fld - - - - 128 - - - - o_sched_input_lbl - - - - 129 - - - - o_sched_name_fld - - - - 130 - - - - o_sched_name_lbl - - - - 131 - - - - o_sched_output_btn - - - - 132 - - - - o_sched_output_fld - - - - 133 - - - - o_sched_output_lbl - - - - 134 - - - - o_sched_repeat_fld - - - - 135 - - - - o_sched_repeat_lbl - - - - 136 - - - - o_sched_panel - - - - 137 - - - - o_vod_panel - - - - 138 - - - - o_vod_add_btn - - - - 139 - - - - o_vod_cancel_btn - - - - 140 - - - - o_sched_cancel_btn - - - - 141 - - - - o_sched_add_btn - - - - 142 - - - - o_vod_input_fld - - - - 143 - - - - o_vod_input_btn - - - - 144 - - - - o_vod_input_lbl - - - - 145 - - - - o_vod_loop_ckb - - - - 146 - - - - o_vod_name_fld - - - - 147 - - - - o_vod_name_lbl - - - - 148 - - - - o_vod_output_btn - - - - 149 - - - - o_vod_output_fld - - - - 150 - - - - o_vod_output_lbl - - - - 151 - - - - vodButtonAction: - - - - 152 - - - - o_vod_box - - - - 153 - - - - vodButtonAction: - - - - 154 - - - - vodButtonAction: - - - - 155 - - - - vodButtonAction: - - - - 156 - - - - schedButtonAction: - - - - 157 - - - - schedButtonAction: - - - - 158 - - - - schedButtonAction: - - - - 159 - - - - schedButtonAction: - - - - 160 - - - - - YES - - 0 - - YES - - - - - - -2 - - - RmlsZSdzIE93bmVyA - - - -1 - - - First Responder - - - 5 - - - YES - - - - VLM - - - 6 - - - YES - - - - - - 8 - - - YES - - - - - - - - - 9 - - - YES - - - - - - 10 - - - YES - - - - - - 7 - - - VLCVLMController - - - 30 - - - YES - - - - Broadcast - - - 31 - - - YES - - - - - - - - 32 - - - YES - - - - - - - - - - - - - - - 44 - - - YES - - - - - - 45 - - - YES - - - - - - 65 - - - YES - - - - Schedule - - - 66 - - - YES - - - - - - - - 67 - - - YES - - - - - - - - - - - - - - 79 - - - YES - - - - - - 80 - - - YES - - - - - - 106 - - - YES - - - - VOD - - - 107 - - - YES - - - - - - - - 108 - - - YES - - - - - - 109 - - - YES - - - - - - - - - - - - - - 121 - - - YES - - - - - - 172 - - - - - 173 - - - - - 189 - - - - - 190 - - - - - 191 - - - - - 201 - - - - - 202 - - - - - 203 - - - - - 204 - - - - - 205 - - - - - -3 - - - Application - - - 38 - - - YES - - - - - - 166 - - - - - 34 - - - YES - - - - - - 162 - - - - - 41 - - - YES - - - - - - 169 - - - - - 35 - - - YES - - - - - - 163 - - - - - 42 - - - YES - - - - - - 170 - - - - - 40 - - - YES - - - - - - 168 - - - - - 39 - - - YES - - - - - - 167 - - - - - 36 - - - YES - - - - - - 164 - - - - - 37 - - - YES - - - - - - 165 - - - - - 43 - - - YES - - - - - - 171 - - - - - 78 - - - YES - - - - - - 181 - - - - - 73 - - - YES - - - - - - 177 - - - - - 76 - - - YES - - - - - - 179 - - - - - 77 - - - YES - - - - - - 180 - - - - - 74 - - - YES - - - - - - 178 - - - - - 72 - - - YES - - - - - - 176 - - - - - 69 - - - YES - - - - - - 174 - - - - - 71 - - - YES - - - - - - 175 - - - - - 93 - - - YES - - - - - - - - - - - - 95 - - - YES - - - - - - 182 - - - - - 96 - - - YES - - - - - - 183 - - - - - 97 - - - YES - - - - - - 184 - - - - - 98 - - - YES - - - - - - 185 - - - - - 99 - - - YES - - - - - - 186 - - - - - 100 - - - YES - - - - - - 187 - - - - - 101 - - - YES - - - - - - 188 - - - - - 115 - - - YES - - - - - - 195 - - - - - 116 - - - YES - - - - - - 196 - - - - - 117 - - - YES - - - - - - 197 - - - - - 119 - - - YES - - - - - - 199 - - - - - 118 - - - YES - - - - - - 198 - - - - - 120 - - - YES - - - - - - 200 - - - - - 112 - - - YES - - - - - - 193 - - - - - 111 - - - YES - - - - - - 192 - - - - - 114 - - - YES - - - - - - 194 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - 10.IBPluginDependency - 10.ImportedFromIB2 - 100.IBPluginDependency - 100.ImportedFromIB2 - 101.IBPluginDependency - 101.ImportedFromIB2 - 106.IBEditorWindowLastContentRect - 106.IBWindowTemplateEditedContentRect - 106.ImportedFromIB2 - 106.windowTemplate.hasMinSize - 106.windowTemplate.minSize - 107.IBPluginDependency - 107.ImportedFromIB2 - 108.IBPluginDependency - 108.ImportedFromIB2 - 109.IBPluginDependency - 109.ImportedFromIB2 - 111.IBPluginDependency - 111.ImportedFromIB2 - 112.IBPluginDependency - 112.ImportedFromIB2 - 114.IBPluginDependency - 114.ImportedFromIB2 - 115.IBPluginDependency - 115.ImportedFromIB2 - 116.IBPluginDependency - 116.ImportedFromIB2 - 117.IBPluginDependency - 117.ImportedFromIB2 - 118.IBPluginDependency - 118.ImportedFromIB2 - 119.IBPluginDependency - 119.ImportedFromIB2 - 120.IBPluginDependency - 120.ImportedFromIB2 - 121.IBPluginDependency - 121.ImportedFromIB2 - 202.IBShouldRemoveOnLegacySave - 203.IBShouldRemoveOnLegacySave - 204.IBShouldRemoveOnLegacySave - 205.IBShouldRemoveOnLegacySave - 30.IBEditorWindowLastContentRect - 30.IBWindowTemplateEditedContentRect - 30.ImportedFromIB2 - 30.windowTemplate.hasMinSize - 30.windowTemplate.minSize - 31.IBPluginDependency - 31.ImportedFromIB2 - 32.IBPluginDependency - 32.ImportedFromIB2 - 34.IBPluginDependency - 34.ImportedFromIB2 - 35.IBPluginDependency - 35.ImportedFromIB2 - 36.IBPluginDependency - 36.ImportedFromIB2 - 37.IBPluginDependency - 37.ImportedFromIB2 - 38.IBPluginDependency - 38.ImportedFromIB2 - 39.IBPluginDependency - 39.ImportedFromIB2 - 40.IBPluginDependency - 40.ImportedFromIB2 - 41.IBPluginDependency - 41.ImportedFromIB2 - 42.IBPluginDependency - 42.ImportedFromIB2 - 43.IBPluginDependency - 43.ImportedFromIB2 - 44.IBPluginDependency - 44.ImportedFromIB2 - 45.IBPluginDependency - 45.ImportedFromIB2 - 5.IBEditorWindowLastContentRect - 5.IBWindowTemplateEditedContentRect - 5.ImportedFromIB2 - 5.windowTemplate.hasMinSize - 5.windowTemplate.minSize - 6.IBPluginDependency - 6.ImportedFromIB2 - 65.IBEditorWindowLastContentRect - 65.IBWindowTemplateEditedContentRect - 65.ImportedFromIB2 - 65.windowTemplate.hasMinSize - 65.windowTemplate.minSize - 66.IBPluginDependency - 66.ImportedFromIB2 - 67.IBPluginDependency - 67.ImportedFromIB2 - 69.IBPluginDependency - 69.ImportedFromIB2 - 7.IBPluginDependency - 7.ImportedFromIB2 - 71.IBPluginDependency - 71.ImportedFromIB2 - 72.IBPluginDependency - 72.ImportedFromIB2 - 73.IBPluginDependency - 73.ImportedFromIB2 - 74.IBPluginDependency - 74.ImportedFromIB2 - 76.IBPluginDependency - 76.ImportedFromIB2 - 77.IBPluginDependency - 77.ImportedFromIB2 - 78.IBPluginDependency - 78.ImportedFromIB2 - 79.IBPluginDependency - 79.ImportedFromIB2 - 8.IBPluginDependency - 8.ImportedFromIB2 - 80.IBPluginDependency - 80.ImportedFromIB2 - 9.IBPluginDependency - 9.ImportedFromIB2 - 93.IBPluginDependency - 93.ImportedFromIB2 - 95.IBPluginDependency - 95.ImportedFromIB2 - 96.IBPluginDependency - 96.ImportedFromIB2 - 97.IBPluginDependency - 97.ImportedFromIB2 - 98.IBPluginDependency - 98.ImportedFromIB2 - 99.IBPluginDependency - 99.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{343, 425}, {654, 229}} - {{343, 425}, {654, 229}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - {{336, 379}, {654, 229}} - {{336, 379}, {654, 229}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{343, 317}, {480, 360}} - {{343, 317}, {480, 360}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - {{343, 211}, {548, 420}} - {{343, 211}, {548, 420}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - YES - - - YES - - - - - YES - - YES - - - YES - - - - 205 - - - - YES - - FirstResponder - - IBUserSource - - - - - NSDatePicker - - IBUserSource - - - - - VLCVLMController - NSObject - - YES - - YES - bcastButtonAction: - listDoubleClickAction: - schedButtonAction: - vodButtonAction: - - - YES - id - id - id - id - - - - YES - - YES - o_bcast_add_btn - o_bcast_box - o_bcast_cancel_btn - o_bcast_enable_ckb - o_bcast_input_btn - o_bcast_input_fld - o_bcast_loop_ckb - o_bcast_name_fld - o_bcast_output_btn - o_bcast_output_fld - o_bcast_panel - o_sched_add_btn - o_sched_box - o_sched_cancel_btn - o_sched_date_datePicker - o_sched_date_lbl - o_sched_input_btn - o_sched_input_fld - o_sched_input_lbl - o_sched_name_fld - o_sched_name_lbl - o_sched_output_btn - o_sched_output_fld - o_sched_output_lbl - o_sched_panel - o_sched_repeatDelay_datePicker - o_sched_repeat_fld - o_sched_repeat_lbl - o_sched_time_box - o_vlm_list - o_vlm_win - o_vod_add_btn - o_vod_box - o_vod_cancel_btn - o_vod_input_btn - o_vod_input_fld - o_vod_input_lbl - o_vod_loop_ckb - o_vod_name_fld - o_vod_name_lbl - o_vod_output_btn - o_vod_output_fld - o_vod_output_lbl - o_vod_panel - - - YES - NSButton - NSBox - NSButton - NSButton - NSButton - NSTextField - NSButton - NSTextField - NSButton - NSTextField - NSPanel - id - id - id - NSDatePicker - NSTextField - NSButton - NSTextField - NSTextField - NSTextField - NSTextField - NSButton - NSTextField - NSTextField - NSPanel - NSDatePicker - NSTextField - NSTextField - id - NSTableView - NSWindow - NSButton - id - NSButton - NSButton - NSTextField - NSTextField - NSButton - NSTextField - NSTextField - NSButton - NSTextField - NSTextField - NSPanel - - - - IBUserSource - - - - - - 0 - - 3 - - diff --git a/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib deleted file mode 100644 index bceebf89dd..0000000000 Binary files a/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib and /dev/null differ diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index 62527c1334..916546b94e 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -169,7 +169,6 @@ CC62B9600FC600E90077BB8C /* play_big_down.png in Resources */ = {isa = PBXBuildFile; fileRef = CC62B9580FC600E90077BB8C /* play_big_down.png */; }; CC62B9610FC600E90077BB8C /* play_big.png in Resources */ = {isa = PBXBuildFile; fileRef = CC62B9590FC600E90077BB8C /* play_big.png */; }; CC8062641021F8790021EB9A /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CC8062631021F8790021EB9A /* dsa_pub.pem */; }; - CCB60A420E6E5E3F00407004 /* VLM.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCB60A400E6E5E3F00407004 /* VLM.nib */; }; CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* CoreServices.framework */; }; CCD90F4E0E87C86D0034564A /* add_schedule.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD90F4B0E87C86D0034564A /* add_schedule.png */; }; CCD90F4F0E87C86D0034564A /* add_vod.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD90F4C0E87C86D0034564A /* add_vod.png */; }; @@ -310,8 +309,6 @@ CC4ED9B00ABE07C800CA4CC5 /* repeat_single_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_single_embedded_blue.png; path = Resources/repeat_single_embedded_blue.png; sourceTree = ""; }; CC4ED9B10ABE07C800CA4CC5 /* shuffle_embedded_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = shuffle_embedded_blue.png; path = Resources/shuffle_embedded_blue.png; sourceTree = ""; }; CC4ED9B20ABE07C800CA4CC5 /* shuffle_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = shuffle_embedded.png; path = Resources/shuffle_embedded.png; sourceTree = ""; }; - CC61608A0FCC2FDF00D71FB1 /* vlm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vlm.h; path = ../../../modules/gui/macosx/vlm.h; sourceTree = SOURCE_ROOT; }; - CC61608B0FCC2FDF00D71FB1 /* vlm.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = vlm.m; path = ../../../modules/gui/macosx/vlm.m; sourceTree = SOURCE_ROOT; }; CC62B8C50FC5787D0077BB8C /* aiff.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = aiff.icns; path = Resources/aiff.icns; sourceTree = ""; }; CC62B8C60FC5787D0077BB8C /* audio.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = audio.icns; path = Resources/audio.icns; sourceTree = ""; }; CC62B8C70FC5787D0077BB8C /* flv.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = flv.icns; path = Resources/flv.icns; sourceTree = ""; }; @@ -363,7 +360,6 @@ CC6C01B90DDF3EBC00C7D754 /* darwin_specific.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = darwin_specific.c; path = ../../../src/misc/darwin_specific.c; sourceTree = SOURCE_ROOT; }; CC6C01BA0DDF3EEC00C7D754 /* auhal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = auhal.c; path = ../../../modules/audio_output/auhal.c; sourceTree = SOURCE_ROOT; }; CC6C01BB0DDF3F0700C7D754 /* opengl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = opengl.c; path = ../../../modules/video_output/opengl.c; sourceTree = SOURCE_ROOT; }; - CC6C01BC0DDF3F0700C7D754 /* opengllayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = opengllayer.m; path = ../../../modules/video_output/opengllayer.m; sourceTree = SOURCE_ROOT; }; CC6C01BD0DDF3F2100C7D754 /* quartztext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = quartztext.c; path = ../../../modules/misc/quartztext.c; sourceTree = SOURCE_ROOT; }; CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppleRemote.h; path = ../../../modules/gui/macosx/AppleRemote.h; sourceTree = SOURCE_ROOT; }; CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; }; @@ -378,7 +374,6 @@ CC965D5F0DA5880F0088F222 /* display_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_right.png; path = Resources/display_right.png; sourceTree = ""; }; CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; }; CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; }; - CCB60A410E6E5E3F00407004 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/VLM.nib; sourceTree = ""; }; CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; }; CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; }; @@ -544,8 +539,6 @@ CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */, 2AEF857609A5FEC900130822 /* fspanel.h */, 2AEF857709A5FEC900130822 /* fspanel.m */, - CC61608A0FCC2FDF00D71FB1 /* vlm.h */, - CC61608B0FCC2FDF00D71FB1 /* vlm.m */, CC6EDD4F0B9CA2140096068A /* eyetv.h */, CC6EDD500B9CA2140096068A /* eyetv.m */, CCB24D5E0D54BBAE004D780C /* simple_prefs.h */, @@ -785,7 +778,6 @@ children = ( CC6C01BD0DDF3F2100C7D754 /* quartztext.c */, CC6C01BB0DDF3F0700C7D754 /* opengl.c */, - CC6C01BC0DDF3F0700C7D754 /* opengllayer.m */, CC6C01B90DDF3EBC00C7D754 /* darwin_specific.c */, CC6C01BA0DDF3EEC00C7D754 /* auhal.c */, CCC895830D9A8A82005AE59C /* eyetv.m */, @@ -855,7 +847,6 @@ children = ( CCF11B520F8BFB520088542D /* ErrorPanel.nib */, CC0FB34A0F8BED1100F057F7 /* CoreDialogs.nib */, - CCB60A400E6E5E3F00407004 /* VLM.nib */, CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */, DCA00AA7075F948800E6BF46 /* About.nib */, F74F13EA02C2A79C01EE194C /* MainMenu.nib */, @@ -1067,7 +1058,6 @@ CC402F3D0E00ABBB006A4BA4 /* display_middle.png in Resources */, CC402F3E0E00ABBB006A4BA4 /* display_left.png in Resources */, CC402F3F0E00ABBB006A4BA4 /* display_right.png in Resources */, - CCB60A420E6E5E3F00407004 /* VLM.nib in Resources */, CCD90F4E0E87C86D0034564A /* add_schedule.png in Resources */, CCD90F4F0E87C86D0034564A /* add_vod.png in Resources */, CCD90F500E87C86D0034564A /* add_broadcast.png in Resources */, @@ -1097,14 +1087,6 @@ name = CoreDialogs.nib; sourceTree = ""; }; - CCB60A400E6E5E3F00407004 /* VLM.nib */ = { - isa = PBXVariantGroup; - children = ( - CCB60A410E6E5E3F00407004 /* English */, - ); - name = VLM.nib; - sourceTree = ""; - }; CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */ = { isa = PBXVariantGroup; children = ( diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am index 5cc33556f3..b07dde5628 100644 --- a/modules/gui/macosx/Modules.am +++ b/modules/gui/macosx/Modules.am @@ -54,7 +54,5 @@ SOURCES_macosx = \ fspanel.h \ eyetv.h \ eyetv.m \ - vlm.h \ - vlm.m \ $(NULL) diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 8741d7cc30..56d293b268 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -106,9 +106,6 @@ struct intf_sys_t id o_wizard; /* VLCWizard */ id o_extended; /* VLCExtended */ id o_bookmarks; /* VLCBookmarks */ -#ifdef ENABLE_VLM - id o_vlm; /* VLCVLMController */ -#endif id o_embedded_list; /* VLCEmbeddedList*/ id o_coredialogs; /* VLCCoreDialogProvider */ VLCInformation * o_info; /* VLCInformation */ @@ -121,9 +118,6 @@ struct intf_sys_t BOOL nib_bookmarks_loaded; /* bookmarks nibfile */ BOOL nib_prefs_loaded; /* preferences nibfile */ BOOL nib_info_loaded; /* information panel nibfile */ -#ifdef ENABLE_VLM - BOOL nib_vlm_loaded; /* VLM Panel nibfile */ -#endif BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */ IBOutlet VLCControllerWindow * o_window; /* main window */ @@ -165,7 +159,7 @@ struct intf_sys_t BOOL b_msg_arr_changed; /* did the array change? */ IBOutlet NSButton * o_msgs_crashlog_btn; /* messages open crashlog */ IBOutlet NSButton * o_msgs_save_btn; /* save the log as rtf */ - + /* CrashReporter panel */ IBOutlet NSButton * o_crashrep_dontSend_btn; IBOutlet NSButton * o_crashrep_send_btn; @@ -199,7 +193,6 @@ struct intf_sys_t IBOutlet NSMenuItem * o_mi_open_recent; IBOutlet NSMenuItem * o_mi_open_recent_cm; IBOutlet NSMenuItem * o_mi_open_wizard; - IBOutlet NSMenuItem * o_mi_open_vlm; IBOutlet NSMenu * o_mu_edit; IBOutlet NSMenuItem * o_mi_cut; @@ -398,7 +391,6 @@ struct intf_sys_t - (IBAction)intfOpenCapture:(id)sender; - (IBAction)showWizard:(id)sender; -- (IBAction)showVLM:(id)sender; - (IBAction)showExtended:(id)sender; - (IBAction)showBookmarks:(id)sender; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 95a4989421..c04a399ea0 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -52,9 +52,6 @@ #import "AppleRemote.h" #import "eyetv.h" #import "simple_prefs.h" -#ifdef ENABLE_VLM -#import "vlm.h" -#endif #import /* for crashlog send mechanism */ #import /* for the media key support */ @@ -353,9 +350,6 @@ static VLCMain *_o_sharedMainInstance = nil; o_prefs = nil; o_open = [[VLCOpen alloc] init]; o_wizard = [[VLCWizard alloc] init]; -#ifdef ENABLE_VLM - o_vlm = [[VLCVLMController alloc] init]; -#endif o_extended = nil; o_bookmarks = [[VLCBookmarks alloc] init]; o_embedded_list = [[VLCEmbeddedList alloc] init]; @@ -1449,13 +1443,6 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -#ifdef ENABLE_VLM -- (id)vlm -{ - return o_vlm; -} -#endif - - (id)bookmarks { if( o_bookmarks ) @@ -2188,20 +2175,6 @@ end: } } -- (IBAction)showVLM:(id)sender -{ -#ifdef ENABLE_VLM - if( !nib_vlm_loaded ) - nib_vlm_loaded = [NSBundle loadNibNamed:@"VLM" owner: NSApp]; - - [o_vlm showVLMWindow]; -#else - NSAlert *theAlert; - theAlert = [NSAlert alertWithMessageText:_NS("VLM not available") defaultButton:_NS("OK") alternateButton:nil otherButton:nil informativeTextWithFormat:_NS("The VideoLAN Manager was not enabled in this version of VLC.")]; - [theAlert runModal]; -#endif -} - - (IBAction)showExtended:(id)sender { if( o_extended == nil ) diff --git a/modules/gui/macosx/vlm.h b/modules/gui/macosx/vlm.h deleted file mode 100644 index bbaeba74f9..0000000000 --- a/modules/gui/macosx/vlm.h +++ /dev/null @@ -1,115 +0,0 @@ -/***************************************************************************** - * vlm.h: VLM Configuration panel for Mac OS X - ***************************************************************************** - * Copyright (c) 2008 the VideoLAN team - * $Id$ - * - * Authors: Felix Paul Kühne - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - *****************************************************************************/ - - -#ifdef HAVE_CONFIG_H -# import "config.h" -#endif - -#ifdef ENABLE_VLM - -#import -#import "intf.h" - -#import - -@interface VLCVLMController : NSObject -{ - /* broadcast panel */ - IBOutlet NSButton *o_bcast_add_btn; - IBOutlet NSBox *o_bcast_box; - IBOutlet NSButton *o_bcast_cancel_btn; - IBOutlet NSButton *o_bcast_enable_ckb; - IBOutlet NSButton *o_bcast_input_btn; - IBOutlet NSTextField *o_bcast_input_fld; - IBOutlet NSButton *o_bcast_loop_ckb; - IBOutlet NSTextField *o_bcast_name_fld; - IBOutlet NSButton *o_bcast_output_btn; - IBOutlet NSTextField *o_bcast_output_fld; - IBOutlet NSPanel *o_bcast_panel; - - /* schedule panel */ - IBOutlet id o_sched_add_btn; - IBOutlet id o_sched_box; - IBOutlet id o_sched_cancel_btn; - IBOutlet NSDatePicker *o_sched_date_datePicker; - IBOutlet NSTextField *o_sched_date_lbl; - IBOutlet NSButton *o_sched_input_btn; - IBOutlet NSTextField *o_sched_input_fld; - IBOutlet NSTextField *o_sched_input_lbl; - IBOutlet NSTextField *o_sched_name_fld; - IBOutlet NSTextField *o_sched_name_lbl; - IBOutlet NSButton *o_sched_output_btn; - IBOutlet NSTextField *o_sched_output_fld; - IBOutlet NSTextField *o_sched_output_lbl; - IBOutlet NSTextField *o_sched_repeat_fld; - IBOutlet NSTextField *o_sched_repeat_lbl; - IBOutlet NSDatePicker *o_sched_repeatDelay_datePicker; - IBOutlet id o_sched_time_box; - IBOutlet NSWindow *o_sched_panel; - - /* VLM Window */ - IBOutlet NSTableView *o_vlm_list; - IBOutlet NSWindow *o_vlm_win; - - /* VOD Panel */ - IBOutlet NSButton *o_vod_add_btn; - IBOutlet id o_vod_box; - IBOutlet NSButton *o_vod_cancel_btn; - IBOutlet NSButton *o_vod_input_btn; - IBOutlet NSTextField *o_vod_input_fld; - IBOutlet NSTextField *o_vod_input_lbl; - IBOutlet NSButton *o_vod_loop_ckb; - IBOutlet NSTextField *o_vod_name_fld; - IBOutlet NSTextField *o_vod_name_lbl; - IBOutlet NSButton *o_vod_output_btn; - IBOutlet NSTextField *o_vod_output_fld; - IBOutlet NSTextField *o_vod_output_lbl; - IBOutlet NSWindow *o_vod_panel; -} -+ (VLCVLMController *)sharedInstance; - -/* toolbar */ -- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar - itemForItemIdentifier: (NSString *)o_itemIdent - willBeInsertedIntoToolbar: (BOOL)b_willBeInserted; -- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar; -- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar; - -- (void)showVLMWindow; -- (void)initStrings; - -- (void)addBcast; -- (void)addVOD; -- (void)addSched; - -- (IBAction)bcastButtonAction:(id)sender; -- (IBAction)listDoubleClickAction:(id)sender; -- (IBAction)schedButtonAction:(id)sender; -- (IBAction)vodButtonAction:(id)sender; - -- (int)numberOfRowsInTableView:(NSTableView *)aTableView; -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex; -@end - -#endif \ No newline at end of file diff --git a/modules/gui/macosx/vlm.m b/modules/gui/macosx/vlm.m deleted file mode 100644 index 39d19c4423..0000000000 --- a/modules/gui/macosx/vlm.m +++ /dev/null @@ -1,184 +0,0 @@ -/***************************************************************************** - * vlm.m: VLM Configuration panel for Mac OS X - ***************************************************************************** - * Copyright (c) 2008 the VideoLAN team - * $Id$ - * - * Authors: Felix Paul Kühne - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - *****************************************************************************/ - -#import "vlm.h" - -#ifdef ENABLE_VLM - -static NSString * VLCVLMToolbarIdentifier = @"Our VLM Toolbar Identifier"; -static NSString * VLCVODToolbarIdentifier = @"VLM Item"; -static NSString * VLCSchedToolbarIdentifier = @"Sched Item"; -static NSString * VLCBcastToolbarIdentifier = @"Bcast Item"; - -@implementation VLCVLMController - -static VLCVLMController *_o_sharedInstance = nil; - -+ (VLCVLMController *)sharedInstance -{ - return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init]; -} - -- (id)init -{ - if( _o_sharedInstance ) - [self dealloc]; - else - { - _o_sharedInstance = [super init]; - } - - return _o_sharedInstance; -} - -- (void)awakeFromNib -{ - [self initStrings]; - - /* setup the toolbar */ - NSToolbar * o_vlm_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCVLMToolbarIdentifier] autorelease]; - [o_vlm_toolbar setAllowsUserCustomization: NO]; - [o_vlm_toolbar setAutosavesConfiguration: NO]; - [o_vlm_toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel]; - [o_vlm_toolbar setSizeMode: NSToolbarSizeModeRegular]; - [o_vlm_toolbar setDelegate: self]; - [o_vlm_win setToolbar: o_vlm_toolbar]; -} - -#define CreateToolbarItem( o_name, o_desc, o_img, sel ) \ - o_toolbarItem = create_toolbar_item(o_itemIdent, o_name, o_desc, o_img, self, @selector(sel)); -static inline NSToolbarItem * -create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_desc, NSString * o_img, id target, SEL selector ) -{ - NSToolbarItem *o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \ - - [o_toolbarItem setLabel: o_name]; - [o_toolbarItem setPaletteLabel: o_desc]; - - [o_toolbarItem setToolTip: o_desc]; - [o_toolbarItem setImage: [NSImage imageNamed: o_img]]; - - [o_toolbarItem setTarget: target]; - [o_toolbarItem setAction: selector]; - - [o_toolbarItem setEnabled: YES]; - [o_toolbarItem setAutovalidates: YES]; - - return o_toolbarItem; -} - -- (NSToolbarItem *) toolbar: (NSToolbar *)o_vlm_toolbar - itemForItemIdentifier: (NSString *)o_itemIdent - willBeInsertedIntoToolbar: (BOOL)b_willBeInserted -{ - NSToolbarItem *o_toolbarItem = nil; - - if( [o_itemIdent isEqual: VLCVODToolbarIdentifier] ) - { - CreateToolbarItem( _NS("Video On Demand"), _NS("Video On Demand"), @"add_vod", addVOD ); - } - else if( [o_itemIdent isEqual: VLCSchedToolbarIdentifier] ) - { - CreateToolbarItem( _NS("Schedule"), _NS("Schedule"), @"add_schedule", addSched ); - } - else if( [o_itemIdent isEqual: VLCBcastToolbarIdentifier] ) - { - CreateToolbarItem( _NS("Broadcast"), _NS("Broadcast"), @"add_broadcast", addBcast ); - } - - return o_toolbarItem; -} - -- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar -{ - return [NSArray arrayWithObjects: VLCBcastToolbarIdentifier, VLCSchedToolbarIdentifier, VLCVODToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil]; -} - -- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar -{ - return [NSArray arrayWithObjects: VLCBcastToolbarIdentifier, VLCSchedToolbarIdentifier, VLCVODToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil]; -} - -- (void)initStrings -{ - /* not implemented */ -} - -- (void)showVLMWindow -{ - [o_vlm_win makeKeyAndOrderFront: self]; -} - -- (void)addBcast -{ - [NSApp beginSheet: o_bcast_panel modalForWindow: o_vlm_win - modalDelegate: self didEndSelector: nil contextInfo: nil]; -} - -- (void)addVOD -{ - [NSApp beginSheet: o_vod_panel modalForWindow: o_vlm_win - modalDelegate: self didEndSelector: nil contextInfo: nil]; -} - -- (void)addSched -{ - [NSApp beginSheet: o_sched_panel modalForWindow: o_vlm_win - modalDelegate: self didEndSelector: nil contextInfo: nil]; -} - -- (IBAction)bcastButtonAction:(id)sender -{ - [NSApp endSheet: o_bcast_panel]; - [o_bcast_panel close]; -} - -- (IBAction)listDoubleClickAction:(id)sender -{ -} - -- (IBAction)schedButtonAction:(id)sender -{ - [NSApp endSheet: o_sched_panel]; - [o_sched_panel close]; -} - -- (IBAction)vodButtonAction:(id)sender -{ - [NSApp endSheet: o_vod_panel]; - [o_vod_panel close]; -} - -- (int)numberOfRowsInTableView:(NSTableView *)aTableView -{ - return 0; -} - -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex -{ - return @"dummy"; -} - -@end - -#endif \ No newline at end of file