Skip to content
Snippets Groups Projects
Commit 8e726501 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Move code to cpp

parent b3252ec4
No related branches found
No related tags found
1 merge request!84Add user and hostname to gui name
......@@ -47,6 +47,18 @@ namespace armarx
int ArmarXGuiApp::globalargc = 0;
ArmarXGuiAppPropertyDefinitions::ArmarXGuiAppPropertyDefinitions(std::string prefix) :
ApplicationPropertyDefinitions(prefix)
{
defineOptionalProperty<std::string>(
"LoadPlugins", "", "List of paths to GuiPlugin-Libs (semi-colon seperated)");
defineOptionalProperty<std::string>(
"GuiConfigFile", "", "Path to config file, that should be loaded on startup");
defineOptionalProperty<bool>(
"DisablePreloading", false, "Disables the preloading of widgets. Can be helpful if some preloaded widget crashes the gui.");
}
ArmarXGuiApp::ArmarXGuiApp(int& argc, char** argv) :
qApplication(nullptr), argc(argc), argv(argv)
{
......@@ -307,4 +319,5 @@ namespace armarx
ArmarXQApplication::~ArmarXQApplication()
{
}
}
......@@ -52,15 +52,10 @@ namespace armarx
public ApplicationPropertyDefinitions
{
public:
ArmarXGuiAppPropertyDefinitions(std::string prefix):
ApplicationPropertyDefinitions(prefix)
{
defineOptionalProperty<std::string>("LoadPlugins", "", "List of paths to GuiPlugin-Libs (semi-colon seperated)");
defineOptionalProperty<std::string>("GuiConfigFile", "", "Path to config file, that should be loaded on startup");
defineOptionalProperty<bool>("DisablePreloading", false, "Disables the preloading of widgets. Can be helpful if some preloaded widget crashes the gui.");
}
ArmarXGuiAppPropertyDefinitions(std::string prefix);
};
class ArmarXQApplication :
public QApplication
{
......@@ -128,10 +123,11 @@ namespace armarx
void closeRequest_sent();
private:
static std::string makeName();
void runArmarXManager();
int startArmarX();
static std::string makeName();
private:
RunningTask<ArmarXGuiApp>::pointer_type armarxManagerTask;
ArmarXQApplication* qApplication;
ArmarXMainWindow* mainWindow;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment