Many updates
- Exit warning dialog is now based on standard NSAlert
- All command-line tools are executed asynchronously using
NSOperationQueue
- Status is processed using XSLT and visualized in basic HTML format
Also, all constants for command-line tools are moved to wscipt/config.h. If
new commands needed, they should be added into wscript, which will
eventually create proper config.h file.
Change-Id: I2e7c248f8f3b92085a50c49761bd81702fe8685b
diff --git a/osx/menu-delegate.h b/osx/menu-delegate.h
index f2b508c..994ed4c 100644
--- a/osx/menu-delegate.h
+++ b/osx/menu-delegate.h
@@ -11,38 +11,45 @@
@interface MenuDelegate : NSObject <NSApplicationDelegate>
{
- NSStatusItem *statusItem;
- NSImage *menuIcon;
+ NSOperationQueue *m_operationQueue;
+
+ NSStatusItem *statusItem;
- IBOutlet NSPopover *statusPopover;
+ NSImage *m_connectedIcon;
+ NSImage *m_disconnectedIcon;
+ NSData *m_statusXslt;
- IBOutlet NSMenu *statusMenu;
- IBOutlet NSMenuItem *connectionStatus;
- IBOutlet NSMenuItem *startstopButton;
- IBOutlet NSMenuItem *daemonStatus;
- IBOutlet NSMenuItem *routingStatus;
- IBOutlet NSMenuItem *trafficMap;
- IBOutlet NSMenuItem *ndnPreferences;
+ IBOutlet NSPopover *statusPopover;
+
+ IBOutlet NSMenu *statusMenu;
+ IBOutlet NSMenuItem *connectionStatus;
+ IBOutlet NSMenuItem *startstopButton;
+ IBOutlet NSMenuItem *daemonStatus;
+ IBOutlet NSMenuItem *routingStatus;
+ IBOutlet NSMenuItem *trafficMap;
+ IBOutlet NSMenuItem *ndnPreferences;
- BOOL daemonStarted;
- BOOL allowSoftwareUpdates;
- BOOL enableHubDiscovery;
+ BOOL m_daemonStarted;
+ BOOL allowSoftwareUpdates;
+ BOOL enableHubDiscovery;
- IBOutlet NSView *daemonStatusView;
- IBOutlet NSTextField *daemonStatusText;
+ IBOutlet NSView *daemonStatusView;
+ IBOutlet NSTextField *daemonStatusHtml;
+ IBOutlet NSView *daemonStatusHtmlView;
+ NSAttributedString *m_statusString;
- IBOutlet NSView *connectionStatusView;
- IBOutlet NSTextField *connectionStatusText;
+ IBOutlet NSView *connectionStatusView;
+ IBOutlet NSTextField *connectionStatusText;
- IBOutlet PreferenceDelegate *preferencesDelegate;
-
- IBOutlet NSWindow *exitWindow;
+ IBOutlet PreferenceDelegate *preferencesDelegate;
}
-(void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item;
--(IBAction)openDaemonStatus:(id)sender;
+-(IBAction)openDaemonStatus:(id)sender;
-(IBAction)showExitConfirmationWindow:(id)sender;
--(IBAction)confirmExit:(id)sender;
--(IBAction)cancelExit:(id)sender;
+
+- (void)statusUpdated:(NSXMLDocument*)document;
+- (void)statusUnavailable:(id)none;
+
@end