From 811a306f5510ccde2e37ec4bceeffcf7fca7d0ad Mon Sep 17 00:00:00 2001 From: Sergii Stoian Date: Sat, 28 Feb 2009 22:47:37 +0000 Subject: [PATCH] * Modules/Preferences/Build/PCBuildPrefs.h: * Modules/Preferences/Build/PCBuildPrefs.m: * Modules/Preferences/Build/Resources/BuildPrefs.gorm: Move "Remove files in root build directory on quit" option from here... * Modules/Preferences/Misc/PCMiscPrefs.h: * Modules/Preferences/Misc/PCMiscPrefs.m: * Modules/Preferences/Misc/Resources/MiscPrefs.gorm: to here. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@28008 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 12 +++++++++++ Modules/Preferences/Build/PCBuildPrefs.h | 12 ++++++----- Modules/Preferences/Build/PCBuildPrefs.m | 20 ++++++++++++++++++ .../Resources/BuildPrefs.gorm/data.classes | 4 +++- .../Resources/BuildPrefs.gorm/objects.gorm | Bin 9416 -> 9818 bytes Modules/Preferences/Misc/PCMiscPrefs.h | 2 -- Modules/Preferences/Misc/PCMiscPrefs.m | 20 ------------------ .../Resources/MiscPrefs.gorm/data.classes | 2 -- .../Resources/MiscPrefs.gorm/objects.gorm | Bin 6125 -> 6757 bytes 9 files changed, 42 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 444f0fb..92360b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-03-01 00:47 Sergii Stoian + + * Modules/Preferences/Build/PCBuildPrefs.h: + * Modules/Preferences/Build/PCBuildPrefs.m: + * Modules/Preferences/Build/Resources/BuildPrefs.gorm: + Move "Remove files in root build directory on quit" option + from here... + * Modules/Preferences/Misc/PCMiscPrefs.h: + * Modules/Preferences/Misc/PCMiscPrefs.m: + * Modules/Preferences/Misc/Resources/MiscPrefs.gorm: + to here. + 2009-03-01 Sergii Stoian * Framework/PCProjectManager.m: diff --git a/Modules/Preferences/Build/PCBuildPrefs.h b/Modules/Preferences/Build/PCBuildPrefs.h index 1bb6f03..52affdc 100644 --- a/Modules/Preferences/Build/PCBuildPrefs.h +++ b/Modules/Preferences/Build/PCBuildPrefs.h @@ -30,11 +30,12 @@ #define PCDefaultBuildTool @"/usr/bin/make" #endif -#define SuccessSound @"SuccessSound" -#define FailureSound @"FailureSound" -#define RootBuildDirectory @"RootBuildDirectory" -#define BuildTool @"BuildTool" -#define PromptOnClean @"PromtOnClean" +#define SuccessSound @"SuccessSound" +#define FailureSound @"FailureSound" +#define RootBuildDirectory @"RootBuildDirectory" +#define BuildTool @"BuildTool" +#define DeleteCacheWhenQuitting @"DeleteBuildCacheWhenQuitting" +#define PromptOnClean @"PromtOnClean" @interface PCBuildPrefs : NSObject { @@ -52,6 +53,7 @@ IBOutlet NSTextField *buildToolField; IBOutlet NSButton *setBuildToolButton; + IBOutlet NSButton *deleteCache; IBOutlet NSButton *promptOnClean; } diff --git a/Modules/Preferences/Build/PCBuildPrefs.m b/Modules/Preferences/Build/PCBuildPrefs.m index 41a91de..8f7507c 100644 --- a/Modules/Preferences/Build/PCBuildPrefs.m +++ b/Modules/Preferences/Build/PCBuildPrefs.m @@ -58,6 +58,7 @@ [setRootBuildDirButton setRefusesFirstResponder:YES]; [setBuildToolButton setRefusesFirstResponder:YES]; + [deleteCache setRefusesFirstResponder:YES]; [promptOnClean setRefusesFirstResponder:YES]; } @@ -81,6 +82,7 @@ [prefs setObject:@"" forKey:FailureSound]; [prefs setObject:@"" forKey:RootBuildDirectory]; [prefs setObject:PCDefaultBuildTool forKey:BuildTool]; + [prefs setObject:@"YES" forKey:DeleteCacheWhenQuitting]; [prefs setObject:@"YES" forKey:PromptOnClean]; } @@ -104,6 +106,10 @@ val = PCDefaultBuildTool; [buildToolField setStringValue:val]; + val = [prefs objectForKey:DeleteCacheWhenQuitting]; + state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; + [deleteCache setState:state]; + val = [prefs objectForKey:PromptOnClean]; state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; [promptOnClean setState:state]; @@ -241,6 +247,20 @@ [[buildingView window] makeFirstResponder:buildToolField]; } +- (void)setDeleteCache:(id)sender +{ + NSString *state; + + if (deleteCache == nil) + {// HACK!!! need to be fixed in GNUstep + deleteCache = sender; + return; + } + + state = ([sender state] == NSOffState) ? @"NO" : @"YES"; + [prefs setObject:state forKey:DeleteCacheWhenQuitting]; +} + - (void)setPromptOnClean:(id)sender { NSString *state; diff --git a/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes b/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes index dd7f6bf..69e5f4c 100644 --- a/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes +++ b/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes @@ -2,6 +2,7 @@ "## Comment" = "Do NOT change this file, Gorm maintains it"; FirstResponder = { Actions = ( + "setDeleteCache:", "setBuildTool:", "setFailureSound:", "setPromptOnClean:", @@ -16,7 +17,8 @@ "setFailureSound:", "setRootBuildDir:", "setSuccessSound:", - "setBuildTool:" + "setBuildTool:", + "setDeleteCache:" ); Outlets = ( buildingView, diff --git a/Modules/Preferences/Build/Resources/BuildPrefs.gorm/objects.gorm b/Modules/Preferences/Build/Resources/BuildPrefs.gorm/objects.gorm index 707ea4011e1fe49a3acd9329cb8f1f783f85162f..65df3acbc4e288db38af850cc56e18615407da2c 100644 GIT binary patch delta 1705 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 Qq(*;>Mhg6+r^?^Yzr9Kl^Z)<= diff --git a/Modules/Preferences/Misc/PCMiscPrefs.h b/Modules/Preferences/Misc/PCMiscPrefs.h index ba72cbd..d99eee0 100644 --- a/Modules/Preferences/Misc/PCMiscPrefs.h +++ b/Modules/Preferences/Misc/PCMiscPrefs.h @@ -31,7 +31,6 @@ #endif #define PromptOnQuit @"PromtOnQuit" -#define DeleteCacheWhenQuitting @"DeleteBuildCacheWhenQuitting" #define FullPathInFilePanels @"FullPathInFilePanels" #define Debugger @"Debugger" #define Editor @"Editor" @@ -43,7 +42,6 @@ IBOutlet NSBox *miscView; IBOutlet NSButton *promptWhenQuit; - IBOutlet NSButton *deleteCache; IBOutlet NSButton *fullPathInFilePanels; IBOutlet NSTextField *debuggerField; IBOutlet NSButton *debuggerButton; diff --git a/Modules/Preferences/Misc/PCMiscPrefs.m b/Modules/Preferences/Misc/PCMiscPrefs.m index 3014c6e..994510f 100644 --- a/Modules/Preferences/Misc/PCMiscPrefs.m +++ b/Modules/Preferences/Misc/PCMiscPrefs.m @@ -53,7 +53,6 @@ - (void)awakeFromNib { [promptWhenQuit setRefusesFirstResponder:YES]; - [deleteCache setRefusesFirstResponder:YES]; [fullPathInFilePanels setRefusesFirstResponder:YES]; [debuggerButton setRefusesFirstResponder:YES]; @@ -77,7 +76,6 @@ - (void)setDefaults { [prefs setObject:@"YES" forKey:PromptOnQuit]; - [prefs setObject:@"YES" forKey:DeleteCacheWhenQuitting]; [prefs setObject:@"YES" forKey:FullPathInFilePanels]; [prefs setObject:@"/usr/bin/gdb" forKey:Debugger]; [prefs setObject:@"ProjectCenter" forKey:Editor]; @@ -92,10 +90,6 @@ state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; [promptWhenQuit setState:state]; - val = [prefs objectForKey:DeleteCacheWhenQuitting]; - state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; - [deleteCache setState:state]; - val = [prefs objectForKey:FullPathInFilePanels]; state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState; [fullPathInFilePanels setState:state]; @@ -129,20 +123,6 @@ [prefs setObject:state forKey:PromptOnQuit]; } -- (void)setDeleteCache:(id)sender -{ - NSString *state; - - if (deleteCache == nil) - {// HACK!!! need to be fixed in GNUstep - deleteCache = sender; - return; - } - - state = ([sender state] == NSOffState) ? @"NO" : @"YES"; - [prefs setObject:state forKey:DeleteCacheWhenQuitting]; -} - - (void)setFullPathInFilePanels:(id)sender { NSString *state; diff --git a/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes b/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes index 8bca312..27bddb3 100644 --- a/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes +++ b/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes @@ -4,7 +4,6 @@ Actions = ( "setEditor:", "setDebugger:", - "setDeleteCache:", "setFullPathInFilePanels:", "setPromptWhenQuit:" ); @@ -14,7 +13,6 @@ Actions = ( "setEditor:", "setDebugger:", - "setDeleteCache:", "setFullPathInFilePanels:", "setPromptWhenQuit:" ); diff --git a/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/objects.gorm b/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/objects.gorm index 1bb68825966a96cd7ab5c2431772db6417503ff6..45cd06e8b9cd6ccec2f592eebd40d41be2147e5d 100644 GIT binary patch delta 1138 zcmZ9L-*4Mg6vu5>&aljyHffxdwCQa}ArYH6LxH|9q|q`73ASpiV$wDsZQRwPwO!k3 zlC8hXZy2~cgN^-wvY%`~b*(<|$}{{4JRlz6Z4!Mz;t6rC1CfRzIiK(Mo_oIMTG#iV z{H+ugWHTxj+_G&>`^<4o+pI9lX0GR)HYWo9A}@rv z-R|LL$4F=P!GVW&Wu*h|hSHY&nc zIbeQJ_JXS03ejJ0Zj?fJ1MTEcx*YvKvRy=;9Dg8kf+8!;oqJl5dz3NXWCMX&_Lws{ zIUtVPJa28v^h{<2%<`FQ`MxtgZHf_iMUm(y&yGtw ztjOR7oW`WuEx(DIorTfGCg2>ws(_CP z>byYo3DJVELV`H~>jW#J(RqS30f>!EUiJ72T)?ZDe(lpJ&po~dpW*$?Yj zHJJ8!tmfb{9yI#3E3vA>RdkKKb}d#5@C9Bp`s6S1d!tWX;T~+@&&HtkRn$ju9$d## z_6h9f7q^P-Rn3ARRDtXU+X)0mQRHrw4BaFYxo3`W_ZQ67H%s*TD0PLFDXz$r z6}$&|9&yhys=j{l2j251O7DE%{NiG1Ca_%;S8yhfC`q#G+p&>P@bh^ar9)cQJgce0 zdPd8ux}jR8X{$p8J(E&Xx}_y;)0$9CL(LU*o9$sSb_jp^*W&4hJ{$-xVX6KtzHjLD zHNgN*H_q0aa22M&NeueK;wkKIigliLYuC}F>dMS&>6mV$%yAejXR0chDrvu-PqIOr zZ#vRAW$0Mf{sTSOh}l+`@Y0;8By!W_F`3^yrj#0=%y#H<(YjI#q^Q1xoj^m=TLvpP8A zRYRNwA?Mi$w}QnHcdhb^d77c{mNM9$m8#Z4f#)X^an=uK%Ug@^PZ5Ffj#i<*?{J?! z)MFZkcl7)K1U3f6|8CiV3AdFQY|Mdk1ZieCaGqdZ4wnfs9Ig=LI9w$d<#3I_;*G8oWI5a*C~&xmu~5WcWEM>0zEB(7awDwB zvT*y~Pm$6xnyvK=Ces?+@oWXSi-pkoz&%gda39}<)W8Ezje>)pLT!N=Pi5dCu7n~1 z^i&QWVKf{SALGt&)NipOJi%nRJ@M3y((;NhTORKHO5Q~eN_oxh{X2gfJR@s?tj}>K zydf}0$|g0BAHvbb7oAD@& MwQ+duws<%AH<+6;ZU6uP