From 56c852e9be56b3d7f714df9ba520483d55c36113 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Sat, 21 Mar 2009 14:23:41 +0000
Subject: [PATCH] 	*
 Panels/English.lproj/GSToolbarCustomizationPalette.gorm: Add 	Default item
 to popup and make the connection to the show: method 	to allow setting the
 toolbar display mode. 	* Source/GSToolbarCustomizationPalette.m: Enable
 changing of 	text, text & icon, icon only on the toolbar. 	*
 Source/NSToolbar.m: Change _build method to load the 	displayMode setting.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28110 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                                     |  10 ++++++++++
 .../objects.gorm                              | Bin 3385 -> 3603 bytes
 Source/GSToolbarCustomizationPalette.m        |  12 +++++++++++-
 Source/NSToolbar.m                            |  13 ++++++++++++-
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbb47d92a..6d2929b2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-21 09:57-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Panels/English.lproj/GSToolbarCustomizationPalette.gorm: Add
+	Default item to popup and make the connection to the show: method
+	to allow setting the toolbar display mode.
+	* Source/GSToolbarCustomizationPalette.m: Enable changing of
+	text, text & icon, icon only on the toolbar.   
+	* Source/NSToolbar.m: Change _build method to load the 
+	displayMode setting. 
+
 2009-03-20 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/gopen.m: Extend to open URLs as well as files.
diff --git a/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm b/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
index dffe82aa09463dbd1acfd9f16869444530fbf451..f1ee2e418836c5bb07c85c48d20f78ef38431d2e 100644
GIT binary patch
delta 1224
zcmZ`&J983I6u!H#kY&M$F=zq_5FikrXX8835CTa=3^8sJ-;YFB%?yE2aiTWbX}RN>
zu}NcZb9b!#4UWB?W37dig^ixO3yhD+7WaI6&Ueq_-tWHe$Cwol92o=WJ34BQ_@y)X
z=ZtBE?TkgV;!lFb*NhD_0vTF_bCYl>`<#KI2br&GEU%dx6p@%iup$wymEzq~X-R(O
z?WLd>!g`bis>YmIe^hRo>%zxihutMo`^8R0@ceSgytDGC)`T86M5U<}LHZ>~k}Sba
zJ;wZ1qrARy*Ay;BzFwCd>Ld!uw;Jo~jrxsvb!~OEW?GgdORq$j2}rvvh}cosh2K2m
zNvY%8O};)inc7LF%2@VhyX6k6pIA|R<~<>K@V$3bi?y1ycnp7d_hopPZ{uO7npmWN
z7Ma0-K7iB8^1`4U62rM?2XTFnbytl=^Ko-#&8*!nnzb4QiJx#QD4m`Z*|^u(7_%U0
z_c>0jFv%EC;CCg4&=ta7U%6*UkBg%!HfoIrl*hv$h4+2wXxh!@>tyrE#*>G1Es#O(
z8&-$yI8X63Wbw0aNXgmVFoHh+xU>hS{4+g!|LS?49fAG0>CgEO*fF|_gZPP<`&)f1
z_e1+^KyM)!b%=-XP1k(#uqXvbwruDqZdY^BWB<o5tkrKfHsClKYFavukJU=-yHF;{
z6;8A|gt0al$It3vPY_PxN3BnWQ>X_(n!we-kS7Oud=W@VllV4}kP7%U(C66$Q*^zN
zl5-1u0E%vXZ|A_gvXDJjpyWoJ*WpN5liM24!3Yn-G$ys^Py}XN;-9K&6Lr2DW-+e~
zmrrj^8s+^^cE<^erxJ!UdWvnU8YJ*yqh2>}HJwW)5lljb#*EINwNt#vCoPyGkmp4U
zssv^Qm?to8S#XZ*4A}*;r^%itJ0%DPfe8T?2^0ia!ehZfrNZ;DjF*EM^@5$|6{>X+
zUk0=4CFidIm+?!m2R{Tu>J`T`3s=dLP_H?E6L1{^q3qlZN?M|FH}wqbZI94=(5U@0
Y$t<tHik%Qo<WK286w-%PJL$Zg-#zRPQvd(}

delta 924
zcmZ`%%}*0i5P!Sd?RIxt8Z2$;cj<Q(aTY;s%SWMr@>SFY)FW!6B+wc}h<cEN2V*pO
z$s}I&V&cVQH=Im7nh+B&Ui>ReJaE&4zTHBN2lp`Zn|U+8`R$vB(GOvoP=?B2f5RoS
zC~<SuJwjB=1k~D325YYf$q@#!%vi}CEBTQS5H&Y(*7eo(#x6VIh+RMf0lS--{YTsi
z9~1oSP=IbNLX^6`*l0eO-EM5MoP)p#+;mh@gi^}0ehNM_0zIb78mCxnqSdSLN&M`{
zd;gaCSy=#oJ4zhEk~pXa+bx6|LEI7h9n|Qe_)d%py;>9x#MSPQ>9IK53L&h;aKITX
zM%ry+XOhV4cU!w<3Q;p;C)J56Aw~r6Ipg@kx$KK+aU#|AT5F@V#pnbAaXfTpB8fJW
zv%}=%^@sP_Z$c6WrJUSn#*Mg<fE2DtDKTw&A%oAP3YW!C(u^<nkGi}WfC9!`1%FXX
zSkq=V*X}gfG>-5boWuoJg)1B>Qt_pb#ILSm_|)+gK>rbf(`JG-3}BDE)OW@b0PtU#
z8a|Z^+#tS}L)=+BkTcAFm*=Bz*siDc*sh0;G{W#PIET72B&cv6pDSVR0=`v%E8#aK
zC8VK@zmzmr!GxORM%bbP^2~Z;<F?TYqgYi#LKepGu^LK@w*|R6_vYe{ABfQnRXkL4
z+ysW*VNo-DFv(E#i63fh30~`QcwtIQldig6U%y#vHJgoF+xBYM+A1*Jrk6VO5?|Ms
zcAJeY3NvQf7&9sqE;3Ly#wc83plX3x2F59cIp!yrpJ#rO`32@jf>y;MLnRB;85p&|
z5`J;V#c87qm+^-?D_=1)#<Wp^s~Gd-W!;WOVHp=aNqNPNs<4VXEV^b#CAf~SJ$cs+
Jv(J91e*lng)%O4Z

diff --git a/Source/GSToolbarCustomizationPalette.m b/Source/GSToolbarCustomizationPalette.m
index 7f5950616..20b8838da 100644
--- a/Source/GSToolbarCustomizationPalette.m
+++ b/Source/GSToolbarCustomizationPalette.m
@@ -34,7 +34,7 @@
 #include "AppKit/NSWindow.h"
 #include "AppKit/NSToolbar.h"
 #include "AppKit/NSToolbarItem.h"
-
+#include "AppKit/NSPopUpButton.h"
 #include "NSToolbarFrameworkPrivate.h"
 #include "GSToolbarCustomizationPalette.h"
 
@@ -238,10 +238,12 @@
   NSArray *itemIdentifiers = nil;
   NSEnumerator *e = nil;
   NSString *identifier = nil;
+  NSToolbarDisplayMode tag = [toolbar displayMode];
   id delegate = [toolbar delegate];
 
   [_allowedItems removeAllObjects];
   [_defaultItems removeAllObjects];
+  [_displayPopup selectItemWithTag: tag];
 
   if (delegate == nil)
     {
@@ -304,4 +306,12 @@
   RELEASE(self);
 }
 
+- (void) show: (id) sender
+{
+  NSToolbarDisplayMode displayMode = (NSToolbarDisplayMode)
+    [[sender selectedItem] tag];
+  [_toolbar setDisplayMode: displayMode];
+  [_toolbar _saveConfig];
+}
+
 @end
diff --git a/Source/NSToolbar.m b/Source/NSToolbar.m
index 936b8ad47..022af63fe 100644
--- a/Source/NSToolbar.m
+++ b/Source/NSToolbar.m
@@ -894,7 +894,18 @@ static GSValidationCenter *vc = nil;
   NSEnumerator *e;
   id itemIdentifier;
   int i = 0;
-  
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  NSString *tableKey = 
+    [NSString stringWithFormat: @"NSToolbar Config %@",_identifier];
+  NSDictionary *config = [defaults objectForKey: tableKey];
+  NSToolbarDisplayMode displayMode = 0;
+
+  if(config)
+    {
+      displayMode = (NSToolbarDisplayMode)[[config objectForKey: @"displayMode"] intValue];
+      [self setDisplayMode: displayMode];
+    }
+
   // Switch off toolbar view reload
   _build = YES;