Alawn/dnscrypt-osxclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable the interface during updates.

Browse Source
This commit is contained in:
Frank Denis
2012-08-01 08:56:26 -07:00
parent 82c7f52841
commit 3a91b5b62b
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h
+2 -1
View File
@@ -21,7 +21,8 @@
#define kBUNDLE_IDENTIFIER @"com.opendns.osx.DNSCrypt"
#define kCHECKBOXES_FREEZE_DELAY 4.0
#define kREFRESH_DELAY 2.0
#define kCHECKBOXES_AFTER_CHANGE_DELAY 6.5
typedef enum {
kDNS_CONFIGURATION_UNKNOWN, kDNS_CONFIGURATION_VANILLA, kDNS_CONFIGURATION_LOCALHOST, kDNS_CONFIGURATION_OPENDNS
DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
+16 -5
View File
@@ -24,6 +24,14 @@
DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
- (void) setCheckBoxesEnabled: (BOOL) enabled
{
[_dnscryptButton setEnabled: enabled];
[_opendnsButton setEnabled: enabled];
[_familyShieldButton setEnabled: enabled];
[_fallbackButton setEnabled: enabled];
}
- (NSString *) fromCommand: (NSString *) launchPath withArguments: (NSArray *) arguments
{
NSPipe *pipe = [NSPipe pipe];
@@ -241,23 +249,29 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
if ([res isEqualToString: @"yes"]) {
[self initState];
}
[self setCheckBoxesEnabled: TRUE];
return TRUE;
}
- (void) showSpinners {
NSBundle *bundle = [NSBundle bundleWithIdentifier: kBUNDLE_IDENTIFIER];
_statusText.stringValue = @"";
[self setCheckBoxesEnabled: FALSE];
_statusText.stringValue = NSLocalizedString(@"Updating", @"Updating network configuraiton");
_statusImageView.image = [[[NSImage alloc] initWithContentsOfFile: [bundle pathForImageResource: @"ajax-loader.gif"]] autorelease];
_currentResolverTextField.stringValue = @"";
[self fromCommand: @"/bin/ksh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./gui-push-conf-change.sh menubar", nil]];
[NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(periodicallyUpdateStatusWithCurrentConfig) object: nil];
[self performSelector: @selector(periodicallyUpdateStatusWithCurrentConfig) withObject: self afterDelay:kCHECKBOXES_AFTER_CHANGE_DELAY];
}
- (void) periodicallyUpdateStatusWithCurrentConfig {
[self updateStatusWithCurrentConfig];
[NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(periodicallyUpdateStatusWithCurrentConfig) object: nil];
[self performSelector: @selector(periodicallyUpdateStatusWithCurrentConfig) withObject:nil afterDelay: 0.7];
[self performSelector: @selector(periodicallyUpdateStatusWithCurrentConfig) withObject:nil afterDelay: kREFRESH_DELAY];
}
- (void) mainViewDidLoad
@@ -310,14 +324,11 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element
defaultMenuItems:(NSArray *)defaultMenuItems
{
// disable right-click context menu
return nil;
}
- (BOOL) updateConfig
{
[NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(resetCheckBoxesHaveBeenInitialized) object: nil];
[self performSelector: @selector(resetCheckBoxesHaveBeenInitialized) withObject: self afterDelay:kCHECKBOXES_FREEZE_DELAY];
if (_dnscryptButton.state == NSOffState) {
if (_opendnsButton.state == NSOffState) {
currentState = kDNS_CONFIGURATION_VANILLA;