Ignore:
Timestamp:
Sep 20, 2018 3:20:39 AM (2 years ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
85ebb2f
Parents:
3c0a8cf
Message:

Mac OS X Launcher: more cleanup and some bugfixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/AppDelegate.h

    r3c0a8cf re8decff5  
    1414
    1515#include <Cocoa/Cocoa.h>
     16#include "SBridge.h"
    1617
    1718
    1819#include "RouterTask.h"
    19 #include "JavaHelper.h"
    2020
    2121
     
    3434
    3535@class ExtractMetaInfo;
    36 
    37 
    3836
    3937@interface ExtractMetaInfo : NSObject
     
    6462}
    6563
    66 inline void sendUserNotification(NSString* title, NSString* informativeText, NSImage* contentImage = NULL, bool makeSound = false) {
     64inline void sendUserNotification(NSString* title, NSString* informativeText, bool makeSound = false) {
    6765  NSUserNotification *userNotification = [[NSUserNotification alloc] init];
    6866 
     
    8179};
    8280
    83 using maybeAnRouterRunner = I2PRouterTask*;
    84 
    85 std::vector<std::string> buildClassPath(std::string basePath);
    86 
    87 extern JvmListSharedPtr gRawJvmList;
    88 
    89 // DO NOT ACCESS THIS GLOBAL VARIABLE DIRECTLY.
    90 static std::mutex globalRouterStatusMutex;
    91 static maybeAnRouterRunner globalRouterStatus = maybeAnRouterRunner{};
    92 static bool isRuterRunning = false;
    93 
    94 maybeAnRouterRunner getGlobalRouterObject();
    95 void setGlobalRouterObject(I2PRouterTask* newRouter);
    96 bool getGlobalRouterIsRunning();
    97 void setGlobalRouterIsRunning(bool running);
    98 
    99 #include "SBridge.h"
    100 
    10181#endif
    10282
    103 @class MenuBarCtrl;
    104 
    105 @interface AppDelegate : NSObject <NSUserNotificationCenterDelegate, NSApplicationDelegate> {
    106 @public
    107   //NSImageView *imageCell;
    108 }
     83@interface AppDelegate : NSObject <NSUserNotificationCenterDelegate, NSApplicationDelegate>
    10984@property BOOL enableLogging;
    11085@property BOOL enableVerboseLogging;
     
    11994- (void) applicationWillTerminate:(NSNotification *)aNotification;
    12095- (void) setApplicationDefaultPreferences;
    121 - (void) userChooseJavaHome;
    12296- (AppDelegate *) initWithArgc:(int)argc argv:(const char **)argv;
    123 #ifdef __cplusplus
    124 - (void) startupI2PRouter;
    125 - (NSString *) userSelectJavaHome:(JvmListPtr)rawJvmList;
    126 #endif
    12797- (BOOL) userNotificationCenter:(NSUserNotificationCenter *)center
    12898                               shouldPresentNotification:(NSUserNotification *)notification;
Note: See TracChangeset for help on using the changeset viewer.