Rebrand to WebSurf

frontends/gnustep/BrowserWindowController.m

@@ -580,51 +580,35 @@ static id newTabTarget;
 
 -(void)reconfigureUrlBarButtons {
 	NSLog(@"reconfigure url bar buttons");
-	UrlBarButtonType buttonType = [[Preferences defaultPreferences] urlBarButtonType];
-	switch (buttonType) {
-	case UrlBarButtonTypeImage:
-		[backButton setTitle: nil];
-		[backButton setImage: [NSImage imageNamed: @"ArrowLeft"]];
-		[backButton setAlternateImage: [NSImage imageNamed: @"Arrow_Left.Dis"]];
-		[forwardButton setTitle: nil];
-		[forwardButton setImage: [NSImage imageNamed: @"ArrowRight"]];
-		[forwardButton setAlternateImage: [NSImage imageNamed: @"Arrow_Right.Dis"]];
-		[refreshButton setTitle: nil];
-		[refreshButton setImage: [NSImage imageNamed: @"Fetch"]];
-		[searchImage setImage: [NSImage imageNamed: @"smallSearch"]];
-		[searchLabel setStringValue: nil];
 
-		/* new additions - eukara */
-		[homeButton setTitle: nil];
-		[homeButton setImage: [NSImage imageNamed: @"Home"]];
-		[bookmarksButton setTitle: nil];
-		[bookmarksButton setImage: [NSImage imageNamed: @"BookmarksPanel"]];
-		[bookmarkAddButton setTitle: nil];
-		[bookmarkAddButton setImage: [NSImage imageNamed: @"AddBookmark"]];
-		[findButton setTitle: nil];
-		[findButton setImage: [NSImage imageNamed: @"Librarian"]];
-		[shareButton setTitle: nil];
-		[shareButton setImage: [NSImage imageNamed: @"History"]];
-		[settingsButton setTitle: nil];
-		[settingsButton setImage: [NSImage imageNamed: @"Processes"]];
-		[infoButton setTitle: nil];
-		[infoButton setImage: [NSImage imageNamed: @"Inspector"]];
-		[printButton setTitle: nil];
-		[printButton setImage: [NSImage imageNamed: @"Print"]];
-		break;
-	case UrlBarButtonTypeText:
-		[backButton setTitle: @"Back"];
-		[backButton setImage: nil];
-		[forwardButton setTitle: @"Forward"];
-		[forwardButton setImage: nil];
-		[refreshButton setTitle: @"Refresh"];
-		[refreshButton setImage: nil];
-		[searchImage setImage: nil];
-		[searchLabel setStringValue: @"Search:"];
-		break;
-	default:
-		break;
-	}
+	[backButton setTitle: nil];
+	[backButton setImage: [NSImage imageNamed: @"ArrowLeft"]];
+	[backButton setAlternateImage: [NSImage imageNamed: @"Arrow_Left.Dis"]];
+	[forwardButton setTitle: nil];
+	[forwardButton setImage: [NSImage imageNamed: @"ArrowRight"]];
+	[forwardButton setAlternateImage: [NSImage imageNamed: @"Arrow_Right.Dis"]];
+	[refreshButton setTitle: nil];
+	[refreshButton setImage: [NSImage imageNamed: @"Fetch"]];
+	[searchImage setImage: [NSImage imageNamed: @"smallSearch"]];
+	[searchLabel setStringValue: nil];
+
+	/* new additions - eukara */
+	[homeButton setTitle: nil];
+	[homeButton setImage: [NSImage imageNamed: @"Home"]];
+	[bookmarksButton setTitle: nil];
+	[bookmarksButton setImage: [NSImage imageNamed: @"BookmarksPanel"]];
+	[bookmarkAddButton setTitle: nil];
+	[bookmarkAddButton setImage: [NSImage imageNamed: @"AddBookmark"]];
+	[findButton setTitle: nil];
+	[findButton setImage: [NSImage imageNamed: @"Librarian"]];
+	[shareButton setTitle: nil];
+	[shareButton setImage: [NSImage imageNamed: @"History"]];
+	[settingsButton setTitle: nil];
+	[settingsButton setImage: [NSImage imageNamed: @"Processes"]];
+	[infoButton setTitle: nil];
+	[infoButton setImage: [NSImage imageNamed: @"Inspector"]];
+	[printButton setTitle: nil];
+	[printButton setImage: [NSImage imageNamed: @"Print"]];
 }
 
 -(void)onPreferencesUpdated: (id)sender {

frontends/gnustep/Makefile

@@ -2,7 +2,7 @@
 # Mac OS X target setup
 # ----------------------------------------------------------------------------
 
-POSTEXES += NetSurf.app
+POSTEXES += WebSurf.app
 EXETARGET := nscocoa
 
 SDK_CFLAGS := $(shell gnustep-config --objc-flags)
@@ -81,13 +81,12 @@ SOURCES = $(addprefix $(shell pwd)/,$(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRON
 # prefixed rule so that the testament is run
 $(shell pwd)/content/fetchers/about/about.c: testament
 
-EXETARGET := NetSurf
+EXETARGET := WebSurf
 
 R_RESOURCES := \
 	Menu.gorm	\
 	Browser.gorm	\
 	Downloads.gorm	\
-	NetSurf.tiff	\
 	Find.gorm	\
 	History.gorm	\
 	Bookmarks.gorm	\
@@ -117,30 +116,29 @@ LOCALIZED_RESOURCES := Localizable.strings
 # Install target
 # ----------------------------------------------------------------------------
 
-install-cocoa: NetSurf.app
+install-cocoa: WebSurf.app
 
-NetSurf.app: NetSurf $(FRONTEND_SOURCE_DIR)/Makefile $(R_RESOURCES) NetSurf.app/Resources/Info-gnustep.plist
-	$(VQ)echo Assembling NetSurf.app bundle
-	$(Q)cp NetSurf NetSurf.app/
-	$(Q)cp $(FRONTEND_RESOURCES_DIR)/NetSurf.icns NetSurf.app
-	$(Q)mkdir -p NetSurf.app/Resources
-	$(Q)cp -pLR $(R_RESOURCES) NetSurf.app/Resources
-	$(Q)cp -pLR $(E_RESOURCES) NetSurf.app/
+WebSurf.app: WebSurf $(FRONTEND_SOURCE_DIR)/Makefile $(R_RESOURCES) WebSurf.app/Resources/Info-gnustep.plist
+	$(VQ)echo Assembling WebSurf.app bundle
+	$(Q)cp WebSurf WebSurf.app/
+	$(Q)mkdir -p WebSurf.app/Resources
+	$(Q)cp -pLR $(R_RESOURCES) WebSurf.app/Resources
+	$(Q)cp -pLR $(E_RESOURCES) WebSurf.app/
 
-NetSurf.app/Resources/Info-gnustep.plist: $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist $(FRONTEND_SOURCE_DIR)/Makefile
+WebSurf.app/Resources/Info-gnustep.plist: $(FRONTEND_RESOURCES_DIR)/WebSurf-Info.plist $(FRONTEND_SOURCE_DIR)/Makefile
 	$(VQ)echo Generating Info.plist
-	$(Q)rm -rf NetSurf.app/Resources
-	$(Q)mkdir -p NetSurf.app/Resources
+	$(Q)rm -rf WebSurf.app/Resources
+	$(Q)mkdir -p WebSurf.app/Resources
 	$(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \
 	    -e 's/$${PRODUCT_NAME.*}/$(EXETARGET)/' \
 	    -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \
 	    -e 's/$${NETSURF_VERSION}/$(VERSION_FULL)/' \
 		-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/' \
-	   < $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist > NetSurf.app/Resources/Info-gnustep.plist
+	   < $(FRONTEND_RESOURCES_DIR)/WebSurf-Info.plist > WebSurf.app/Resources/Info-gnustep.plist
 
 
 CLEANS += clean-package-cocoa
 
 clean-package-cocoa:
-	$(VQ)echo "   CLEAN: NetSurf.app"
-	$(Q)$(RM) -r NetSurf.app 
+	$(VQ)echo "   CLEAN: WebSurf.app"
+	$(Q)$(RM) -r WebSurf.app 

frontends/gnustep/res/WebSurf-Info.plist

@@ -1,12 +1,14 @@
 {
-    ApplicationDescription = "World Wide Web Viewer";
-    ApplicationIcon = "NetSurf.tiff";
-    ApplicationName = NetSurf;
+    ApplicationDescription = "World Wide Web Browser";
+    ApplicationIcon = "WebSurf.tiff";
+    ApplicationName = WebSurf;
     ApplicationRelease = "1.0";
     Authors = (
-	"Vera Visions, LLC."
+	"Marco Cawthorne",
+	"Anthony Cohen Richardby",
+	"NetSurf Team"
     );
-    CFBundleIdentifier = "com.vera-visions.NetSurf";
+    CFBundleIdentifier = "com.vera-visions.WebSurf";
     CFBundleURLTypes = (
 	{
 	    CFBundleURLName = "Website URL";
@@ -16,11 +18,10 @@
 	    );
 	}
     );
-    Copyright = "Copyright \U00A9 2022 Vera Visions, LLC.";
+    Copyright = "Copyright \U00A9 2022 Vera Visions, L.L.C.";
     GSMainMarkupFile = "";
-    NOTE = "Automatically generated, do not edit!";
-    NSExecutable = NetSurf;
-    NSIcon = "NetSurf.tiff";
+    NSExecutable = WebSurf;
+    NSIcon = "WebSurf.tiff";
     NSMainNibFile = "MainMenu.gorm";
     NSMainStoryboardFile = "";
     NSPrincipalClass = NSApplication;
@@ -28,10 +29,10 @@
     NSServices = (
 	{
 	    NSMenuItem = {
-		default = "Open URL in NetSurf";
+		default = "Open URL in WebSurf";
 	    };
 	    NSMessage = openURL;
-	    NSPortName = NetSurf;
+	    NSPortName = WebSurf;
 	    NSSendTypes = (
 		NSURLPboardType,
 		NSStringPboardType