Navigation

← Previous Changeset
Next Changeset →

Changeset 33

Timestamp:

01/17/05 14:47:14 (4 years ago)

Author:

bart

Message:

Added the screensaver check interval option

Files:

trunk/AgentController.m (modified) (2 diffs)
trunk/Controller.m (modified) (2 diffs)
trunk/English.lproj/Preferences.nib/classes.nib (modified) (2 diffs)
trunk/English.lproj/Preferences.nib/info.nib (modified) (2 diffs)
trunk/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
trunk/English.lproj/Preferences.nib/objects.nib (modified) (previous)
trunk/PreferenceController.h (modified) (1 diff)
trunk/PreferenceController.m (modified) (1 diff)
trunk/PreferenceViews/SecurityView.h (modified) (2 diffs)
trunk/PreferenceViews/SecurityView.m (modified) (9 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/AgentController.m

r28	r33
692	692	NSPipe *thePipe;
693	693	NSString *theOutput;
	694	int interval;
694	695
695	696	while(1)
…	…
731	732	}
732	733
733		sleep(30);
	734	interval = [[NSUserDefaults standardUserDefaults] integerForKey:checkScreensaverIntervalString];
	735
	736	if(interval < 5)
	737	{
	738	interval = 5;
	739	}
	740
	741	if(interval > 100)
	742	{
	743	interval = 100;
	744	}
	745
	746	sleep(interval);
734	747	[pool release];
735	748	}

trunk/Controller.m

r28	r33
58	58	[NSArray arrayWithObjects:@"~/.ssh/identity", @"~/.ssh/id_dsa", nil],
59	59	@"NO",
	60	@"30",
60	61	nil
61	62	]
…	…
74	75	@"Keys",
75	76	manageGlobalEnvironmentString,
	77	checkScreensaverIntervalString,
76	78	nil
77	79	]

trunk/English.lproj/Preferences.nib/classes.nib

r26	r33
77	77	{
78	78	ACTIONS = {
	79	changeCheckScreensaverInterval = id;
79	80	changeMinutesOfSleep = id;
	81	changeOnScreensaver = id;
80	82	changeOnSleep = id;
	83	myAction = id;
81	84	toggleCustomSecuritySettings = id;
82	85	};
…	…
86	89	addKeysOnConnection = id;
87	90	askForConfirmation = id;
	91	checkScreensaverInterval = id;
	92	checkScreensaverIntervalTextfield = id;
88	93	customSecuritySettingsView = id;
89	94	followKeychain = id;

trunk/English.lproj/Preferences.nib/info.nib

r26	r33
4	4	<dict>
5	5	<key>IBDocumentLocation</key>
6		<string>~~49 28~~ 388 356 0 0 1024 746 </string>
	6	<string>32 390 388 356 0 0 1024 746 </string>
7	7	<key>IBEditorPositions</key>
8	8	<dict>
9	9	<key>1065</key>
10		<string>~~485 529 416 112 0 0 1440 878~~ </string>
	10	<string>304 452 416 112 0 0 1024 746 </string>
11	11	<key>640</key>
12		<string>~~466 452 454 266 0 0 1440 878~~ </string>
	12	<string>170 32 495 292 0 0 1024 746 </string>
13	13	<key>722</key>
14	14	<string>446 468 495 234 0 0 1440 878 </string>
…	…
26	26	<string>446 468 495 234 0 0 1440 878 </string>
27	27	<key>909</key>
28		<string>~~447 465 495 234 0 0 1440 878~~ </string>
	28	<string>56 312 495 234 0 0 1024 746 </string>
29	29	</dict>
30	30	<key>IBFramework Version</key>
31	31	<string>364.0</string>
	32	<key>IBOpenObjects</key>
	33	<array>
	34	<integer>909</integer>
	35	<integer>640</integer>
	36	</array>
32	37	<key>IBSystem Version</key>
33		<string>7~~R28~~</string>
	38	<string>7S215</string>
34	39	</dict>
35	40	</plist>

trunk/PreferenceController.h

r17	r33
17	17	#define useGlobalEnvironmentString @"Use Global Environment ~/.MacOSX/environment.plist"
18	18	#define useCustomSecuritySettingsString @"Use Custom Security Settings"
	19	#define checkScreensaverIntervalString @"Check Screensaver Interval"
19	20
20	21	@interface PreferenceController : NSObject

trunk/PreferenceController.m

r29	r33
116	116	frame.origin.y -= newHeight + toolbarHeight;
117	117	frame.size.height = newHeight + toolbarHeight;
118		// We only resized larger to fit the Dynamic Ports tab, but that tab is gone on Jaguar
119		// So lets use the old size on Jaguar as well
120		if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_2) {
121		frame.size.width = 475;
122		} else {
123		frame.size.width = 500;
124		}
	118	frame.size.width = 475;
125	119
126	120	frame = [NSWindow frameRectForContentRect:frame styleMask:[window styleMask]];

trunk/PreferenceViews/SecurityView.h

r3	r33
7	7
8	8	/* Custom Security Settings View. */
9		IBOutlet id addKeysOnConnection, askForConfirmation, followKeychain, onScreensaver, onSleep, minutesOfSleep, minutesOfSleepTextfield;
	9	IBOutlet id addKeysOnConnection, askForConfirmation, followKeychain, onScreensaver, onSleep;
	10	IBOutlet id minutesOfSleep, minutesOfSleepTextfield, checkScreensaverInterval, checkScreensaverIntervalTextfield;
10	11	}
11	12
…	…
13	14	- (IBAction)changeMinutesOfSleep:(id)sender;
14	15
	16	- (IBAction)changeOnScreensaver:(id)sender;
	17	- (IBAction)changeCheckScreensaverInterval:(id)sender;
	18
15	19	- (IBAction)toggleCustomSecuritySettings:(id)sender;
16	20

trunk/PreferenceViews/SecurityView.m

r18	r33
12	12
13	13	[minutesOfSleepTextfield setRefusesFirstResponder:YES];
	14	[checkScreensaverIntervalTextfield setRefusesFirstResponder:YES];
14	15
15	16	[addKeysOnConnection setState:[[NSUserDefaults standardUserDefaults] boolForKey:addKeysOnConnectionString]];
…	…
23	24	{
24	25	[minutesOfSleep setEnabled:YES];
	26	[minutesOfSleepTextfield setEnabled:YES];
25	27	}
26	28
…	…
28	30	{
29	31	[minutesOfSleep setEnabled:NO];
	32	[minutesOfSleepTextfield setEnabled:NO];
30	33	}
31	34
32	35	[minutesOfSleepTextfield setIntValue:[prefs integerForKey:minutesOfSleepString]];
33	36	[minutesOfSleep setIntValue:[prefs integerForKey:minutesOfSleepString]];
	37
	38	if([prefs integerForKey:onScreensaverString] > 1)
	39	{
	40	[checkScreensaverInterval setEnabled:YES];
	41	[checkScreensaverIntervalTextfield setEnabled:YES];
	42	}
	43
	44	else
	45	{
	46	[checkScreensaverInterval setEnabled:NO];
	47	[checkScreensaverIntervalTextfield setEnabled:NO];
	48	}
	49
	50	[checkScreensaverIntervalTextfield setIntValue:[prefs integerForKey:checkScreensaverIntervalString]];
	51	[checkScreensaverInterval setIntValue:[prefs integerForKey:checkScreensaverIntervalString]];
34	52
35	53	[useCustomSecuritySettings setState:[[NSUserDefaults standardUserDefaults] boolForKey:useCustomSecuritySettingsString]];
…	…
59	77	[prefs setInteger:[[followKeychain selectedItem] tag] forKey:followKeychainString];
60	78	[prefs setInteger:[minutesOfSleepTextfield intValue] forKey:minutesOfSleepString];
	79
	80	[prefs setInteger:[checkScreensaverIntervalTextfield intValue] forKey:checkScreensaverIntervalString];
61	81	}
62	82
…	…
70	90	[prefs setInteger:4 forKey:followKeychainString];
71	91	[prefs setInteger:0 forKey:minutesOfSleepString];
	92	[prefs setInteger:30 forKey:checkScreensaverIntervalString];
72	93	}
73	94
…	…
120	141	[prefs setInteger:4 forKey:onScreensaverString];
121	142	[prefs setInteger:4 forKey:followKeychainString];
122		[prefs setInteger:0 forKey:minutesOfSleepString];
	143	[prefs setInteger:0 forKey:minutesOfSleepString];
	144	[prefs setInteger:30 forKey:checkScreensaverIntervalString];
123	145
124	146	[prefs synchronize];
…	…
134	156	{
135	157	[minutesOfSleep setEnabled:YES];
	158	[minutesOfSleepTextfield setEnabled:YES];
136	159	}
137	160
…	…
139	162	{
140	163	[minutesOfSleep setEnabled:NO];
	164	[minutesOfSleepTextfield setEnabled:NO];
141	165	}
142	166
143	167	[minutesOfSleepTextfield setIntValue:[prefs integerForKey:minutesOfSleepString]];
144	168	[minutesOfSleep setIntValue:[prefs integerForKey:minutesOfSleepString]];
	169
	170	if([prefs integerForKey:onScreensaverString] > 1)
	171	{
	172	[checkScreensaverInterval setEnabled:YES];
	173	[checkScreensaverIntervalTextfield setEnabled:YES];
	174	}
	175
	176	else
	177	{
	178	[checkScreensaverInterval setEnabled:NO];
	179	[checkScreensaverIntervalTextfield setEnabled:NO];
	180	}
	181
	182	[checkScreensaverIntervalTextfield setIntValue:[prefs integerForKey:checkScreensaverIntervalString]];
	183	[checkScreensaverInterval setIntValue:[prefs integerForKey:checkScreensaverIntervalString]];
	184
145	185	}
146	186	}
…	…
168	208	}
169	209
	210	/* When the On Screensaver option is toggled, the checkScreensaverInterval box needs to be greyed out or displayed. */
	211	- (IBAction)changeOnScreensaver:(id)sender
	212	{
	213	if([[sender selectedItem] tag] > 1)
	214	{
	215	[checkScreensaverInterval setEnabled:YES];
	216	[checkScreensaverIntervalTextfield setEnabled:YES];
	217	}
	218
	219	else
	220	{
	221	[checkScreensaverInterval setEnabled:NO];
	222	[checkScreensaverIntervalTextfield setEnabled:NO];
	223	}
	224	}
	225
	226	/* The seconds of screensaver check interval slidebar has changed. */
	227	- (IBAction)changeCheckScreensaverInterval:(id)sender
	228	{
	229	int seconds = [sender intValue];
	230
	231	if(seconds < 5)
	232	{
	233	seconds = 5;
	234	}
	235
	236	if(seconds > 100)
	237	{
	238	seconds = 100;
	239	}
	240
	241	if(sender == checkScreensaverInterval)
	242	{
	243	[checkScreensaverIntervalTextfield setIntValue:seconds];
	244	}
	245
	246	else if(sender == checkScreensaverIntervalTextfield)
	247	{
	248	[checkScreensaverIntervalTextfield setIntValue:seconds];
	249	[checkScreensaverInterval setIntValue:seconds];
	250	}
	251	}
	252
170	253	@end

Navigation

Changeset 33

Legend:

Download in other formats: