Introduce ability to configure ports etc for external applications. (#785)

Introduce ability to configure ports etc for external applications, including webgui
This commit is contained in:
Emil Axelsson
2019-01-04 10:23:28 +01:00
committed by GitHub
parent acd897784e
commit 0c6b5e95c6
19 changed files with 604 additions and 125 deletions
+11 -3
View File
@@ -22,9 +22,10 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/webbrowser/webbrowsermodule.h>
#include <modules/cefwebgui/cefwebguimodule.h>
#include <modules/webbrowser/webbrowsermodule.h>
#include <modules/webgui/webguimodule.h>
#include <modules/cefwebgui/include/guirenderhandler.h>
#include <modules/cefwebgui/include/guikeyboardhandler.h>
#include <modules/webbrowser/include/browserinstance.h>
@@ -131,7 +132,14 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
}
});
_url = configuration.value<std::string>(GuiUrlInfo.identifier);
if (configuration.hasValue<std::string>(GuiUrlInfo.identifier)) {
_url = configuration.value<std::string>(GuiUrlInfo.identifier);
} else {
WebGuiModule* webGuiModule = global::moduleEngine.module<WebGuiModule>();
_url = "http://localhost:" +
std::to_string(webGuiModule->port()) + "/#/onscreen";
}
_enabled = configuration.hasValue<bool>(EnabledInfo.identifier) &&
configuration.value<bool>(EnabledInfo.identifier);