From 32bef062dd407ab56c997482b88cba397e813c98 Mon Sep 17 00:00:00 2001 From: anthony Date: Thu, 8 Apr 2021 20:47:23 +0100 Subject: [PATCH] Toolbar icon/text setting implemented --- frontends/gnustep/BrowserWindowController.h | 1 + frontends/gnustep/BrowserWindowController.m | 17 ++++++++++++++++- .../gnustep/res/Browser.gorm/data.classes | 3 ++- .../gnustep/res/Browser.gorm/objects.gorm | Bin 5021 -> 5109 bytes resources/back.png | Bin 242 -> 109 bytes resources/forward.png | Bin 252 -> 117 bytes resources/refresh.png | Bin 847 -> 248 bytes resources/search.png | Bin 755 -> 213 bytes 8 files changed, 19 insertions(+), 2 deletions(-) diff --git a/frontends/gnustep/BrowserWindowController.h b/frontends/gnustep/BrowserWindowController.h index 63181de6d..8d5dfc0bc 100644 --- a/frontends/gnustep/BrowserWindowController.h +++ b/frontends/gnustep/BrowserWindowController.h @@ -19,6 +19,7 @@ struct browser_window; enum gui_pointer_shape lastRequestedPointer; id searchBar; id searchImage; + id searchLabel; NSMutableArray *tabs; BOOL isClosing; id activeTab; diff --git a/frontends/gnustep/BrowserWindowController.m b/frontends/gnustep/BrowserWindowController.m index fab1622b7..45ff31ed9 100644 --- a/frontends/gnustep/BrowserWindowController.m +++ b/frontends/gnustep/BrowserWindowController.m @@ -97,6 +97,7 @@ static id newTabTarget; object: nil]; urlSuggestionView = [[UrlSuggestionView alloc] initForUrlBar: urlBar inBrowserWindowController: self]; + [self reconfigureUrlBarButtons]; NSLog(@"Browser window loaded"); } @@ -537,12 +538,26 @@ static id newTabTarget; -(void)reconfigureUrlBarButtons { NSLog(@"reconfigure url bar buttons"); UrlBarButtonType buttonType = [[Preferences defaultPreferences] urlBarButtonType]; - NSLog(@"type: %d", buttonType); switch (buttonType) { case UrlBarButtonTypeImage: + [backButton setTitle: nil]; [backButton setImage: [NSImage imageNamed: @"back"]]; + [forwardButton setTitle: nil]; + [forwardButton setImage: [NSImage imageNamed: @"forward"]]; + [refreshButton setTitle: nil]; + [refreshButton setImage: [NSImage imageNamed: @"refresh"]]; + [searchImage setImage: [NSImage imageNamed: @"search"]]; + [searchLabel setStringValue: nil]; 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; diff --git a/frontends/gnustep/res/Browser.gorm/data.classes b/frontends/gnustep/res/Browser.gorm/data.classes index 54504a408..d06688bcf 100644 --- a/frontends/gnustep/res/Browser.gorm/data.classes +++ b/frontends/gnustep/res/Browser.gorm/data.classes @@ -18,7 +18,8 @@ refreshButton, searchImage, searchBar, - tabView + tabView, + searchLabel ); Super = NSWindowController; }; diff --git a/frontends/gnustep/res/Browser.gorm/objects.gorm b/frontends/gnustep/res/Browser.gorm/objects.gorm index da3aa435fb495288459d60493577580c07dee350..0ca18c6a49fdfb696d22bfdf5355fa843e73d8f1 100644 GIT binary patch delta 216 zcmbQM{#AW~24m_*&50b!3I`atU04|y#JC*~Fff1#F)?liAOI5};mP;e#W#Q9h-I5x z!Y|3_KiQjKi7{YuKd-{%b^Ly8YN9~3YLl4+(i#0XX9+B2lJnc(G{K;0qud6&4So|0 znt=@O4R#X@S~kjW2;JZ}Syxzr(QmS!uq!)=?`zOKxnD@a*(Wh6HOHU_s3vfOw?Xel xb~T`}qN+fG6=Z=ZQ)XUfNoHb>TV_#lNl|(i~*DTc@-wF&u-oWcC^fAYg$xx4CSuhUOpa?fCzUcq$!1&f^#=VQMeo)V6SwmuV5 zshM9eQNi(0aXP26hs9N&CKk@SeL^Zc6AMoGM}(=Wn~1tiUi*Khz{>xA9armBU0yQ- c-63Jj|MZfoe+J7cdyum{UHx3vIVCg!0GaJ%9{>OV diff --git a/resources/forward.png b/resources/forward.png index a88025c76cf95125a29ccd4d05cf1f36cbc45863..a873ca0d6d57716a47565f067ddb51b6e5121904 100644 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*18&4O<5R22v2@?Aj$Z>cw+~V0U z`ET+v)hQ*qi6s|>{6cmAe>_yBm9d~p-y=lME%>R58n2O%eCNsP3`U0BekWT#wtq4} Pa~M2b{an^LB{Ts5`0OGC literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg4tu&dhE&{od&`@z$w7qmqTK52 z679W4g7&|&I)syFaI&qNQzgB^i^JrD7b8%4!~KBco!9aoU&;AK#>&8Ru8psN^U-)J){(%w4+jC1bbh zmM<;S<|!oXpB_*u{Z(h#dkf$H`th1Ce{XP||4-_d?cb{$|4+Kl|Ht#U&+c#j*TdoG z9!>xE=(^r=&WF2qKfHbU;qTWMe*qoDu1(I`A(#4g_>6euS6_)J-IM>rvNgF-kn{Hl$}%exE$ zG{uh`;!kr134(IUErtWa*eSOdt_Zy*`)_P8Tl#}-=r-8gyH*k(Ak9gJ<;wrzXQ8pSzXeeXea&A*Z_=B{>E)kR7v zrIb=iDW#NBN-3q3QXX_0zC|T;!*r~|Mi>kmu?o}C6&3LfZbgz+L6E(OhL{U0q1mX1 z=MoscA(*bme^>xZ$Q=BIYvLI`0_Y}G!46nTwxS%aFX8Y}*cD+bEF&B7a|woz!t7y; zgLz^&?$3YtD8RnOZkT7by&;g{!=J9f7Ke|T zF9bAv_|tE&92y2TeE8FJhu_|>3vBrCqi0|_{2So#;YT$ceptIUz~RG>Cc`2$4s-bM zpc`-u7U9(}hYt_>*x}EVi^Ci~Jm`N|gzn)EA0E^S7UA!3hYt@L1B>txR8l!?C43Aj z!PdYc+zORoJ7E#7KyYaRlwN}LCam-^RA0oD!%q<*ryt{#`_IwJ|373rsx2(Sc#!^* zOrkq+7#5*4NPo&FQB_zDPlB{9CGKv$vQMw%MU=9W$#&k&UR*Z%@ z*oM0iQ#z*lDwe?EhO% zsEiwtV!FC`A^uKx@VdNvG3wxTjWxOJ>vv)mrl31&;Y-{JrIb=iDW#NBN-3q3Qc9^z ZI|UVP4wW#SMtT4M002ovPDHLkV1gC=hS~rC diff --git a/resources/search.png b/resources/search.png index 30c21c89edab7e4d19f6fdf203e7b7909b803fc6..aa8a2c4a98e53511b3d4701e3a7589d7d1502b98 100644 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iIi4<#Ar`04PWI(%G7xaP-?TKw z(SkW=c7d&hLqEf}ASb6+vL>-Ld0RJn2s_WYSvzz3&vtwB!za2TBn|I3aqCnSdv9co za7kG3(B-g$!;Q5`E(@vyt(d&T%@lumycP`R`p{u^DXPVvvD`&6Q}xlr*$=1PZvK69 zirxEzPjhc6ioLSk{$yuD1FK>1Tl-_PEX7yyIj@^jEVud;xBZQIs;;4HpFR=30dyyW Mr>mdKI;Vst0Gu0AzyJUM literal 755 zcmV?g`5P$*zEhr)=0H8$(>H(rv z`VRtT?t1m!z5na`@d3qm_i^`scXucBNC+W>5JCtcgb+e#U>6Dv4H)nS}s1x?w)B=%7~aqMH#e}xeopz3lQU<80Lj8)vC>QUTc6~n~jdW5P_ z9HHTv8bcdZ;b>#bGxG_TsQM%>@yRnW)?w$jv4I)1@CGmM;|*Gv!3NqL7GcbQYjn^# zn`mK3z9F=**+G#T2GsBaC){0(dc0BWK5$|lHh@+$JKzQjp56j(GILlpU`BA8IRuRB zp7G2f@D?Km$U$c3ztes1GK+9vKulx~JL7t1JaagjPIUI+5#+8al4Q_@6ru9IK)8M5Es7A8!-6o~xm&M5A8m zAFmR*UMVUH@JCTG1hr!lj!8H^L(7RDVm}oXOA)h*ip9A1iizdulh}}n4Vl=IEF(7M zcNG=KQa&pt4rc8sDvl<8R7@PsT~n`@NkQ$^1~N@+oJ;$0AUyaf?3+Os_yO#5g`)pM))W1 z{}Z^A6OQP}1g_+SJuso8GdW=eCUkTpC(OWvj`rk)5gnPpN>13~bFBIS%=-Au`uL3c l_>B7aY;WQN00000@BjgrQX7=3hSLB5002ovPDHLkV1m^