eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebrand to WebSurf

This commit is contained in:
Marco Cawthorne 2022-09-17 13:31:50 -07:00
parent 647b06b4b0
commit c7a7f46b34
Signed by: eukara
GPG Key ID: CE2032F0A2882A22
12 changed files with 55 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
frontends/gnustep/BrowserWindowController.m
View File

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

32
frontends/gnustep/Makefile
View File

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

BIN
frontends/gnustep/res/Find.gorm/data.info
View File

Binary file not shown.

BIN
frontends/gnustep/res/Find.gorm/objects.gorm
View File

Binary file not shown.

BIN
frontends/gnustep/res/Menu.gorm/objects.gorm
View File

Binary file not shown.

BIN
frontends/gnustep/res/NetSurf.icns
View File

Binary file not shown.

BIN
frontends/gnustep/res/NetSurf.tiff
View File

Binary file not shown.

BIN
frontends/gnustep/res/Preferences.gorm/data.info
View File

Binary file not shown.

BIN
frontends/gnustep/res/Preferences.gorm/objects.gorm
View File

Binary file not shown.

BIN
frontends/gnustep/res/WebDocument.tiff Executable file
View File

Binary file not shown.

23
frontends/gnustep/res/NetSurf-Info.plist → frontends/gnustep/res/WebSurf-Info.plist
View File

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

BIN
frontends/gnustep/res/WebSurf.tiff Normal file
View File

Binary file not shown.