Skip to content

V
vlc
Commit c663c6d7 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* removed the check-for-update dialogues for 0.8.6d

parent 3694ac1b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 67 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ c663c6d7
......@@ -181,7 +181,6 @@
},
{
ACTIONS = {
checkForUpdate = id;
clearRecentItems = id;
closeError = id;
intfOpenDisc = id;
......@@ -241,7 +240,6 @@
"o_mi_bwd" = id;
"o_mi_channels" = id;
"o_mi_chapter" = id;
"o_mi_checkForUpdate" = id;
"o_mi_clear" = id;
"o_mi_close_window" = id;
"o_mi_controller" = id;
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ c663c6d7
......@@ -4,14 +4,15 @@
<dict>
<key>IBDocumentLocation</key>
<string>69 68 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>69 313 438 44 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
<string>446.1</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>2416</integer>
</array>
<key>IBSystem Version</key>
<string>8S2167</string>
<key>targetFramework</key>
......
extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib deleted 100644 → 0
View file @ 3694ac1b
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {download = id; okay = id; };
CLASS = VLCUpdate;
LANGUAGE = ObjC;
OUTLETS = {
"o_bar_checking" = id;
"o_btn_DownloadNow" = id;
"o_btn_okay" = id;
"o_fld_currentVersionAndSize" = id;
"o_fld_releaseNote" = id;
"o_fld_status" = id;
"o_update_window" = id;
};
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
}
\ No newline at end of file
extras/MacOSX/Resources/English.lproj/Update.nib/info.nib deleted 100644 → 0
View file @ 3694ac1b
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>16 104 356 240 0 0 1280 778 </string>
<key>IBFramework Version</key>
<string>489.0</string>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8S2167</string>
</dict>
</plist>
extras/MacOSX/vlc.xcodeproj/project.pbxproj
View file @ c663c6d7
......@@ -73,7 +73,6 @@
C2F2A708095AE51700018C74 /* skip_forward_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A704095AE51600018C74 /* skip_forward_embedded_blue.png */; };
C2F2A709095AE51700018C74 /* skip_previous_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = C2F2A705095AE51600018C74 /* skip_previous_embedded_blue.png */; };
CC1B4B4D09A8CF9E0078AD2E /* Interaction.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC1B4B4B09A8CF9E0078AD2E /* Interaction.nib */; };
CC26BF2C09A7A05000E94D62 /* Update.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC26BF2A09A7A05000E94D62 /* Update.nib */; };
CCD10D750AFE67EF0026254A /* fs_background.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD10D5A0AFE67EF0026254A /* fs_background.png */; };
CCD10D760AFE67EF0026254A /* fs_exit_fullscreen_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD10D5B0AFE67EF0026254A /* fs_exit_fullscreen_highlight.png */; };
CCD10D770AFE67EF0026254A /* fs_exit_fullscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD10D5C0AFE67EF0026254A /* fs_exit_fullscreen.png */; };
......@@ -1084,9 +1083,6 @@
CC1B4B4C09A8CF9E0078AD2E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Interaction.nib; sourceTree = "<group>"; };
CC1B4C1409A8EC690078AD2E /* interaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interaction.h; path = ../../modules/gui/macosx/interaction.h; sourceTree = "<group>"; };
CC1B4C1509A8EC690078AD2E /* interaction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = interaction.m; path = ../../modules/gui/macosx/interaction.m; sourceTree = "<group>"; };
CC26BF2B09A7A05000E94D62 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Update.nib; sourceTree = "<group>"; };
CC26BF3109A7A08C00E94D62 /* update.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = update.h; path = ../../modules/gui/macosx/update.h; sourceTree = SOURCE_ROOT; };
CC26BF3209A7A08C00E94D62 /* update.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = update.m; path = ../../modules/gui/macosx/update.m; sourceTree = SOURCE_ROOT; };
CC9AF0CE0B8F502C00728992 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; };
CC9AF0CF0B8F502C00728992 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; };
CCD10D5A0AFE67EF0026254A /* fs_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_background.png; path = Resources/fs_background.png; sourceTree = "<group>"; };
......@@ -1243,8 +1239,6 @@
DC7F46F108A187F60027DB24 /* extended.m */,
DCE7BD0708A5724D007B10AE /* bookmarks.h */,
DCE7BD0608A5724D007B10AE /* bookmarks.m */,
CC26BF3109A7A08C00E94D62 /* update.h */,
CC26BF3209A7A08C00E94D62 /* update.m */,
CCD10DA10AFE69B60026254A /* fspanel.h */,
CCD10DA20AFE69B60026254A /* fspanel.m */,
);
......@@ -1406,7 +1400,6 @@
DCFCCDB7085CE18F001E36AF /* Wizard.nib */,
DC7F46EB08A183FC0027DB24 /* Extended.nib */,
DCE7BD0308A56C8B007B10AE /* Bookmarks.nib */,
CC26BF2A09A7A05000E94D62 /* Update.nib */,
CC1B4B4B09A8CF9E0078AD2E /* Interaction.nib */,
);
name = nibs;
......@@ -1513,7 +1506,6 @@
C2F2A707095AE51700018C74 /* play_embedded_blue.png in Resources */,
C2F2A708095AE51700018C74 /* skip_forward_embedded_blue.png in Resources */,
C2F2A709095AE51700018C74 /* skip_previous_embedded_blue.png in Resources */,
CC26BF2C09A7A05000E94D62 /* Update.nib in Resources */,
CC1B4B4D09A8CF9E0078AD2E /* Interaction.nib in Resources */,
CCD10D750AFE67EF0026254A /* fs_background.png in Resources */,
CCD10D760AFE67EF0026254A /* fs_exit_fullscreen_highlight.png in Resources */,
......@@ -1573,14 +1565,6 @@
name = Interaction.nib;
sourceTree = "<group>";
};
CC26BF2A09A7A05000E94D62 /* Update.nib */ = {
isa = PBXVariantGroup;
children = (
CC26BF2B09A7A05000E94D62 /* English */,
);
name = Update.nib;
sourceTree = "<group>";
};
DC7F46EB08A183FC0027DB24 /* Extended.nib */ = {
isa = PBXVariantGroup;
children = (
......
modules/gui/macosx/Modules.am
View file @ c663c6d7
......@@ -40,8 +40,6 @@ SOURCES_macosx = \
bookmarks.m \
embeddedwindow.h \
embeddedwindow.m \
update.h \
update.m \
fspanel.h \
fspanel.m \
$(NULL)
......
modules/gui/macosx/intf.h
View file @ c663c6d7
......@@ -99,7 +99,7 @@ struct intf_sys_t
id o_bookmarks; /* VLCBookmarks */
id o_embedded_list; /* VLCEmbeddedList*/
id o_interaction_list; /* VLCInteractionList*/
id o_update; /* VLCUpdate */
/*id o_update; * VLCUpdate * disabled until further action */
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 */
......
modules/gui/macosx/intf.m
View file @ c663c6d7
......@@ -346,7 +346,8 @@ static VLCMain *_o_sharedMainInstance = nil;
o_bookmarks = [[VLCBookmarks alloc] init];
o_embedded_list = [[VLCEmbeddedList alloc] init];
o_interaction_list = [[VLCInteractionList alloc] init];
o_update = [[VLCUpdate alloc] init];
/* disabled until further action
o_update = [[VLCUpdate alloc] init]; */
i_lastShownVolume = -1;
......@@ -1787,6 +1788,7 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
[o_prefs showPrefs];
}
/* removed until further action
- (IBAction)checkForUpdate:(id)sender
{
if (!nib_update_loaded)
......@@ -1797,7 +1799,7 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
[o_update showUpdateWindow];
}
}
*/
- (IBAction)closeError:(id)sender
{
vlc_value_t val;
......
modules/gui/wxwidgets/interface.cpp
View file @ c663c6d7
......@@ -606,8 +606,9 @@ void Interface::CreateOurMenuBar()
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
help_menu->Append( About_Event, wxU(_("About...")) );
help_menu->AppendSeparator();
help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
/* updating disabled until further action
* help_menu->AppendSeparator();
* help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) ); */
/* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar();
......
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