1
0
This commit is contained in:
Scott E. Graves
2017-04-27 23:38:28 -05:00
parent 8683cd23f3
commit 5a9df8198f
12 changed files with 195 additions and 95 deletions

View File

@@ -27,7 +27,7 @@ class CSiaDriveApp :
public CefBrowserProcessHandler
{
public:
CSiaDriveApp(std::shared_ptr<Api::CSiaDriveConfig> siaDriveConfig);
CSiaDriveApp();
virtual ~CSiaDriveApp();
@@ -59,11 +59,12 @@ public:
// CefBrowserProcessHandler methods:
virtual void OnContextInitialized() OVERRIDE;
virtual void OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) OVERRIDE;
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefProcessId source_process, CefRefPtr<CefProcessMessage> message) OVERRIDE;
private:
static void ExecuteSetter(CefRefPtr<CefV8Context> context, CefRefPtr<CefV8Value> obj, const SString& method, const SString& value);
static void ExecuteSetter(CefRefPtr<CefV8Context> context, CefRefPtr<CefV8Value> obj, const SString& method, CefRefPtr<CefV8Value> value);
void ShutdownServices(const bool& closing = false);
void ShutdownServices(CefRefPtr<CefBrowser> browser, const bool& closing = false);
void SiaApiRefreshCallback(CefRefPtr<CefV8Context> context, const Api::CSiaCurl& siaCurl, Api::CSiaDriveConfig* siaDriveConfig);
private:

View File

@@ -46,20 +46,22 @@ public:
virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnLoadError(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, ErrorCode errorCode, const CefString& errorText, const CefString& failedUrl) OVERRIDE;
virtual bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefProcessId source_process, CefRefPtr<CefProcessMessage> message) OVERRIDE;
void CloseAllBrowsers(bool forceClose);
bool IsClosing() const { return _isClosing; }
bool GetUseViews() const { return _useViews; }
private:
void PlatformTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title);
private:
const bool _useViews;
bool _isClosing;
bool _active;
typedef std::list<CefRefPtr<CefBrowser> > BrowserList;
BrowserList _browserList;
bool _isClosing;
IMPLEMENT_REFCOUNTING(CSiaDriveHandler);
};
NS_END(1)

View File

@@ -17,6 +17,9 @@ public:
FilePath(const SString& path1, const SString& path2);
FilePath(FilePath&& filePath);
public:
~FilePath();
public:
static const SString DirSep;
@@ -26,6 +29,9 @@ public:
static SString GetAppDataDirectory();
private:
#ifdef _WIN32
const BOOL _uninit;
#endif
SString _path;
public:

View File

@@ -7,9 +7,9 @@ NS_BEGIN(Api)
class SIADRIVE_EXPORTABLE CSiaDriveConfig
{
public:
CSiaDriveConfig();
CSiaDriveConfig(const bool& autoSave);
CSiaDriveConfig(const SString& filePath);
CSiaDriveConfig(const bool& autoSave, const SString& filePath);
public:
~CSiaDriveConfig();
@@ -30,6 +30,7 @@ public:
JProperty(std::string, EventLevel, public, public, _configDocument)
private:
const bool _autoSave;
json _configDocument;
private: