From 08b6fade0bc95749acc9820cb9688aaf39d00c87 Mon Sep 17 00:00:00 2001 From: rogerman Date: Sun, 22 May 2022 21:37:41 -0700 Subject: [PATCH] Documentation: Update all URLs to match. - Also fix a bug in the Cocoa port with copying the troubleshooting info to the Clipboard. --- desmume/README | 2 +- desmume/README.MAC | 16 ++++++++-------- desmume/src/frontend/cocoa/cocoa_globals.h | 8 ++++---- .../troubleshootingWindowDelegate.mm | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/desmume/README b/desmume/README index c49f37c4c..0a247a942 100644 --- a/desmume/README +++ b/desmume/README @@ -73,7 +73,7 @@ Special thanks go to: Official Website: https://desmume.org Public Forum: https://forums.desmume.org -Developer Chat: irc://irc.libera.chat/desmume +Developer Chat: irc://irc.libera.chat:6697/desmume Source & Bug Reports: https://github.com/TASEmulators/desmume Please don't ask for ROMs, BIOS files, or any other copyrighted stuff. diff --git a/desmume/README.MAC b/desmume/README.MAC index ad5f415a5..99baa08ac 100644 --- a/desmume/README.MAC +++ b/desmume/README.MAC @@ -2,7 +2,7 @@ _________________________________________ Copyright (C) 2006 yopyop Copyright (C) 2006-2022 DeSmuME team - Last Updated: May 22, 2022 + Last Updated: May 23, 2022 Contents: 1) System Requirements ..................................................... 17 @@ -249,24 +249,24 @@ everything that DeSmuME can do! If you need any additional information about DeSmuME, then you can reference our online Wiki pages for up-to-date information. -* Official Documentation: http://wiki.desmume.org/index.php?title=Main_Page +* Official Documentation: https://wiki.desmume.org/index.php?title=Main_Page This is the main Wiki page that contains all of our official documentation. -* FAQ: http://wiki.desmume.org/index.php?title=Faq +* FAQ: https://wiki.desmume.org/index.php?title=Faq The Frequently Asked Questions (FAQ) page has a lot of useful general information about DeSmuME. Do note that some of the information may be platform specific, and may not directly apply to the macOS version of DeSmuME. * DeSmuME Manual for macOS: -http://wiki.desmume.org/index.php?title=DeSmuME_Manual_for_the_Macintosh_port +https://wiki.desmume.org/index.php?title=DeSmuME_Manual_for_the_Macintosh_port This page contains complete and detailed information about how to operate DeSmuME for macOS. * DeSmuME Build Instructions for macOS: -http://wiki.desmume.org/index.php?title=Installing_DeSmuME_from_source_on_OS_X +https://wiki.desmume.org/index.php?title=Installing_DeSmuME_from_source_on_OS_X This page contains complete and detailed instructions about how to make your own build of DeSmuME for macOS directly from the source code. @@ -295,14 +295,14 @@ However, keep in mind that there are a few of rules that you need to follow: go to the Support forum. In short, use the appropriate contact method. That's why the different methods exist! -* Official Website: http://desmume.org +* Official Website: https://desmume.org Our official website has the latest news on DeSmuME releases, and also has a lot of other useful information about DeSmuME. You can comment on different posts telling us how you feel about DeSmuME. Is DeSmuME the best thing in your life? Is it making you cry? Or is it a bunch of blah? Let us know here! -* Public Forum: http://forums.desmume.org +* Public Forum: https://forums.desmume.org If you have a question about DeSmuME, then this is the place to ask it. But before you ask it, be aware that your question may have already been answered @@ -386,7 +386,7 @@ 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 software. If not, see . +this software. If not, see . * See the GNU General Public License details in COPYING. diff --git a/desmume/src/frontend/cocoa/cocoa_globals.h b/desmume/src/frontend/cocoa/cocoa_globals.h index 4826ff119..7e6a1605f 100644 --- a/desmume/src/frontend/cocoa/cocoa_globals.h +++ b/desmume/src/frontend/cocoa/cocoa_globals.h @@ -16,11 +16,11 @@ along with the this software. If not, see . */ -#define STRING_DESMUME_WEBSITE "http://desmume.org" +#define STRING_DESMUME_WEBSITE "https://desmume.org" #define STRING_DESMUME_SHORT_DESCRIPTION "Nintendo DS Emulator" -#define STRING_DESMUME_FORUM_SITE "http://forums.desmume.org/index.php" -#define STRING_DESMUME_TECH_SUPPORT_SITE "http://forums.desmume.org/viewforum.php?id=4" -#define STRING_DESMUME_BUG_REPORT_SITE "https://github.com/TASVideos/desmume/issues" +#define STRING_DESMUME_FORUM_SITE "https://forums.desmume.org/index.php" +#define STRING_DESMUME_TECH_SUPPORT_SITE "https://forums.desmume.org/viewforum.php?id=4" +#define STRING_DESMUME_BUG_REPORT_SITE "https://github.com/TASEmulators/desmume/issues" // User Interface Localized Strings #define NSSTRING_TITLE_OPEN_ROM_PANEL NSLocalizedString(@"Open ROM", nil) diff --git a/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm b/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm index f7a706d56..33d73e59e 100644 --- a/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm +++ b/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm @@ -204,7 +204,7 @@ - (IBAction) copyInfoToPasteboard:(id)sender { NSPasteboard *pboard = [NSPasteboard generalPasteboard]; [pboard declareTypes:[NSArray arrayWithObjects:PASTEBOARDTYPE_STRING, nil] owner:self]; - [pboard setString:(NSString *)[bindings valueForKey:@"finalFormText"] forType:PASTEBOARDTYPE_STRING]; + [pboard setString:[(NSAttributedString *)[bindings valueForKey:@"finalFormText"] string] forType:PASTEBOARDTYPE_STRING]; } - (IBAction) goToWebpage:(id)sender