From ec3298e342a9ae2a81aa439785048dbc478ea8b9 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Thu, 15 Apr 2021 04:02:07 -0400
Subject: [PATCH] Add Tabs section

---
 Headers/Protocols/Preferences.h               |   6 +++-
 .../Indentation/PCIndentationPrefs.h          |  10 +++++-
 .../Indentation/PCIndentationPrefs.m          |  33 ++++++++++++++++--
 .../IndentationPrefs.gorm/objects.gorm        | Bin 12541 -> 13247 bytes
 PCPrefController.m                            |  33 ++++++++++++++++++
 5 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/Headers/Protocols/Preferences.h b/Headers/Protocols/Preferences.h
index 636b7bc..37a849f 100644
--- a/Headers/Protocols/Preferences.h
+++ b/Headers/Protocols/Preferences.h
@@ -47,7 +47,8 @@
 - (float)floatForKey:(NSString *)key;
 - (float)floatForKey:(NSString *)key
 	defaultValue:(float)defaultValue;
-
+- (int) integerForKey: (NSString *)key
+         defaultValue: (int)defaultValue;
 - (NSColor *)colorForKey:(NSString *)key;
 - (NSColor *)colorForKey:(NSString *)key
         defaultValue:(NSColor *)defaultValue;
@@ -61,6 +62,9 @@
 - (void)setFloat:(float)floatValue
 	  forKey:(NSString *)aKey
 	  notify:(BOOL)notify;
+- (void) setInteger: (int)intValue
+             forKey: (NSString *)aKey
+             notify: (BOOL)notify;
 - (void)setColor:(NSColor *)color
 	  forKey:(NSString *)aKey
 	  notify:(BOOL)notify;
diff --git a/Modules/Preferences/Indentation/PCIndentationPrefs.h b/Modules/Preferences/Indentation/PCIndentationPrefs.h
index 1c11928..24eea70 100644
--- a/Modules/Preferences/Indentation/PCIndentationPrefs.h
+++ b/Modules/Preferences/Indentation/PCIndentationPrefs.h
@@ -36,7 +36,10 @@
 #define IndentForHash           @"IndentForHash"
 #define IndentForReturn         @"IndentForReturn"
 #define IndentForSoloOpenCurly  @"IndentForSoloOpenCurly"
-#define IndentForNumberOfSpaces @"IndentForNumberOfSpaces"
+#define IndentNumberOfSpaces    @"IndentNumberOfSpaces"
+#define IndentUsingSpaces       @"IndentUsingSpaces"
+#define IndentWidth             @"IndentWidth"
+#define TabWidth                @"TabWidth"
 
 @interface PCIndentationPrefs : NSObject <PCPrefsSection, NSTextFieldDelegate>
 {
@@ -53,6 +56,10 @@
   id _indentForReturn;
   id _indentForSoloOpenCurly;
   id _indentNumberOfSpaces;
+
+  id _indentUsingSpaces;
+  id _indentWidth;
+  id _tabWidth;
 }
 
 // Indentation
@@ -70,4 +77,5 @@
 - (void) setIndentUsingSpaces: (id)sender;
 - (void) setIndentWidth: (id)sender;
 - (void) setTabWidth: (id)sender;
+
 @end
diff --git a/Modules/Preferences/Indentation/PCIndentationPrefs.m b/Modules/Preferences/Indentation/PCIndentationPrefs.m
index b8589fc..b51dad2 100644
--- a/Modules/Preferences/Indentation/PCIndentationPrefs.m
+++ b/Modules/Preferences/Indentation/PCIndentationPrefs.m
@@ -98,12 +98,33 @@
   state = bVal ? NSOnState : NSOffState;
   [_indentForSoloOpenCurly setState: state];
 
-  val = [prefs stringForKey: IndentForNumberOfSpaces
+  val = [prefs stringForKey: IndentNumberOfSpaces
                defaultValue: spacesDefault];
   if (val)
     {
       [_indentNumberOfSpaces setStringValue: val];
     }
+
+  val = [prefs stringForKey: IndentUsingSpaces
+               defaultValue: spacesDefault];
+  if (val)
+    {
+      [_indentUsingSpaces setStringValue: val];
+    }
+
+  val = [prefs stringForKey: IndentWidth
+               defaultValue: spacesDefault];
+  if (val)
+    {
+      [_indentWidth setStringValue: val];
+    }
+  
+  val = [prefs stringForKey: TabWidth
+               defaultValue: spacesDefault];
+  if (val)
+    {
+      [_tabWidth setStringValue: val];
+    }
 }
 
 - (NSView *) view
@@ -124,7 +145,6 @@
   [prefs setBool: state forKey: IndentForOpenCurly notify: YES];
 }
 
-
 - (void) setIndentForCloseCurlyBrace: (id)sender
 {
   BOOL state = ([sender state] == NSOffState) ? NO : YES;
@@ -155,7 +175,6 @@
   [prefs setBool: state forKey: IndentForReturn notify: YES];
 }
 
-
 - (void) setIndentForSoloOpenBrace: (id)sender
 {
   BOOL state = ([sender state] == NSOffState) ? NO : YES;
@@ -164,19 +183,27 @@
 
 - (void) setIndentNumberOfSpaces: (id)sender
 {
+  int val = [sender intValue];
+  [prefs setInteger: val forKey: IndentNumberOfSpaces notify: YES];
 }
 
 // Tabs/Spaces
 - (void) setIndentUsingSpaces: (id)sender
 {
+  NSUInteger idx = [sender indexOfSelectedItem];
+  [prefs setInteger: idx forKey: IndentUsingSpaces notify: YES];
 }
 
 - (void) setIndentWidth: (id)sender
 {
+  int val = [sender intValue];
+  [prefs setInteger: val forKey: IndentWidth notify: YES];
 }
 
 - (void) setTabWidth: (id)sender
 {
+  int val = [sender intValue];
+  [prefs setInteger: val forKey: TabWidth notify: YES];
 }
 
 - (void) dealloc
diff --git a/Modules/Preferences/Indentation/Resources/IndentationPrefs.gorm/objects.gorm b/Modules/Preferences/Indentation/Resources/IndentationPrefs.gorm/objects.gorm
index 22e1a9e30eddf59362d749ec21fa4be0f340d089..ea64523f1eb9bd189538eb0b939716c4193a7266 100644
GIT binary patch
delta 2895
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

delta 2286
zcmaJ@d0bRg6n<~U8GI=244Z5N!!RPud7_Erf{Gw6K;mv_sH1@Bm<}R}f{HuHg@Y&v
z+FrKUoibZ2Z8J;D)K*h7TC{A_Hm%e;_f4Tc$>xvwec$)a`ObIGyDa->U(I2m-tmbb
zJ}UHf+p@cOaTDXd+=Pd_MB_dm1*e$;ajI!fH%L$eB(L<Wq0R#50!fne67<7^-TKIh
zc(q%Ad^`I2Mk)Q>0lXhigaMf1YnBIMo^QV2Ab0yHs+ZElm-s-E+aCtwdEdZ}L)<0{
zDTa1~lO%}`#^z4J2&RUP3B12f(n+iahPt~#GM+H?)DPjw;(3jw3U@|!mxtjozg#&5
ztMs8b$$v!WVUX$>Wb`FRBMisg{`m=Mt%i@F;UnE%B9gZ@Ta<h2#^y{9n~*otm7B=;
z5I)i~$xf%A)9!khQRp9-?>D-YXF7RiV0~aXh0OTx)=Vr7%8$6CRqGgP&GN*N#NxAV
zT6}>vUe<Oo7M;QQ5#w5Uj3<u?H+W3A*~3R1!Q(Me4aA(#lDJ8&TqdhQQs?xnOy~S@
z^M@3=T+Vqz9R&rn9KG5d+l8&}J4FqajOkgU9rFrFl_hS1J3THsu|pkXt09uNry$Mc
zm`hq438vz~umrDZ?ru66?m}aDvLVME0@E=gyxEY=r|@j-V+MH!&NAow&1@CQK}VZ~
z=geZWvu@aISj$UcFx%55ix4tTfn2&WdE{?0h=u0eaA^$r^k@zqifpzPh?@#?JzF!1
zi{LH#jcueXsaRSlxg>`)7v|w{%K+JlouUHd`FJ!Yguc_F7WcmUpP;bdU$9UOmAcZ|
z3tc(W3mnOLGhBJjc{vM;$x~9pr1t4q*c|06yYNy}xLk+<R*Sp{2U#up$xwtzJp!=I
zYLFMB8XauB&BkM(7<XDj^f|BuFUEu!!Ny0xQoLXd)sKP_QE%*J<H4|u8qD%?t){n)
zkAYHL5*?^dfilgLM;qi7c*bTD)x%&Vc?JouY*<BJ-Gw?3$~8OH#sgrrm>)p}oneh<
zGhQt}B3`=jd5)rJYVm=!+Q4`lPlt7y5k;N>>$UV0!wMT{Xpp>76B2AZ9xAjl8qx<U
zX<mrDNm!(kTM|^=ViZ*?z&sB-wB+cZ%e;O=qbch|sMbzEgDp^_&FN#~V*$l<Oo}nc
zwb}}()C)Fi$tkV_>a;FOr@|I3XkQz*!&Z9BVRF5&5sMfO4Yx=~4-K%5>@0Gla6)HK
zgWRNzrzDxMUGt;^hQbap)I_1i!#$q+k}B?6D%`7v<B^`G(yiRZ;68UaZ{S-Q+)tpE
zH!ygBKozfL@F0OoUd7-c0;_o?gNF%}3*`|4%Xm41odimR@+g7ryoAAH1R90%I0591
z44xoREtFjZ*7IrxPZB7bC?rm3F)w4_CQu}lrwDA}MGT%MP$!h#1UB+I2G0<v5Xv3`
z+js?oX9=tl%5wxZ@l_0-SIxLLHrP<fUGM^)j<qU#-DV2yf)~*zE>3xgSP8Lxm>g$U
z_7iI)_A-{l*_2m^RTFy^cg0zh*NBx7dmT^3MJfk~6%l&_6?>F&kXRkDH!;B;tA9(4
zz+8KGgNs+fAzW{dR1Ui%xQmy-+qlPWRo>B9IUK>W)cdZ+8sRAVLX>h$W7TjRlfkUK
zr?E14ADs}ce4w!+_z>$MLitEzb?`ABfF8;Tja9%Wcp0K&PZF!3Jf}R@rfti;ZL6E<
zC~(ZqaXH|$)=>+eVutEh3TJ3z8^r29Bd~^VV9-opg-|{xP|8;@_<}$^FJ<s0fhD}2
z!B+&93gs+;wR|aqa|D`%@->0wyotd#1ZsqGp1=-X!{A#2Oeo(GSjia!<$K!TO1=nw
zz-wwmSNM@06pIHJNG~S+qR=hy6X}bD{xgAf!r~VKoB28hziQ`U@Eex*inPNejW)q$
z&kB^56)3uC^xIMUD+|ACMK$mTp6nHp0Dlr~qP1Q5pS4}3ni_hUSKt~&V^sYY_KmlB
gOT?%*Q<gD5KFnK3l*%$?J=VrYv~A-K)&BkX8?dAU;{X5v

diff --git a/PCPrefController.m b/PCPrefController.m
index b7398c6..503035f 100644
--- a/PCPrefController.m
+++ b/PCPrefController.m
@@ -199,6 +199,22 @@ static PCPrefController *_prefCtrllr = nil;
     }
 }
 
+- (int) integerForKey: (NSString *)key defaultValue: (int)defaultValue
+{
+  NSString *stringValue = [[NSUserDefaults standardUserDefaults]
+			    objectForKey:key];
+
+  if (stringValue)
+    {
+      return [stringValue intValue];
+    }
+  else
+    {
+      [self setInteger: defaultValue forKey: key notify: NO];
+      return defaultValue;
+    }
+}
+
 - (NSColor *)colorForKey:(NSString *)key
 {
   return [self colorForKey:key defaultValue:nil];
@@ -275,6 +291,23 @@ static PCPrefController *_prefCtrllr = nil;
     }
 }
 
+- (void) setInteger: (int)intValue
+             forKey: (NSString *)aKey
+             notify: (BOOL)notify
+{
+  NSString *stringValue = [NSString stringWithFormat:@"%d", intValue];
+
+  [[NSUserDefaults standardUserDefaults] setObject:stringValue
+					    forKey:aKey];
+
+  if (notify)
+    {
+      [[NSNotificationCenter defaultCenter] 
+	postNotificationName:PCPreferencesDidChangeNotification
+		      object:self];
+    }
+}
+
 - (void)setColor:(NSColor *)color 
 	   forKey:(NSString *)aKey
 	   notify:(BOOL)notify