From f7bb9c31948c861b6a970376ca0ac005fac73e7d Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Tue, 11 Dec 2018 17:41:31 +0100
Subject: [PATCH] RemoteGUI: include in variantinfo now includes directly the
convenience classes
---
data/ArmarXGui/VariantInfo-ArmarXGui.xml | 7 +++--
.../libraries/RemoteGui/CMakeLists.txt | 1 +
.../ArmarXGui/libraries/RemoteGui/RemoteGui.h | 27 +++++++++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 source/ArmarXGui/libraries/RemoteGui/RemoteGui.h
diff --git a/data/ArmarXGui/VariantInfo-ArmarXGui.xml b/data/ArmarXGui/VariantInfo-ArmarXGui.xml
index 06bf4094..3fa809b8 100644
--- a/data/ArmarXGui/VariantInfo-ArmarXGui.xml
+++ b/data/ArmarXGui/VariantInfo-ArmarXGui.xml
@@ -19,13 +19,16 @@
propertyName="MessageDisplayName"
propertyIsOptional="true"
propertyDefaultValue="MessageDisplayTopic" />
- <Proxy include="ArmarXGui/interface/RemoteGuiInterface.h"
+ </Lib>
+ <Lib name="RemoteGui">
+ <Proxy include="ArmarXGui/libraries/RemoteGui/RemoteGui.h"
humanName="Remote GUI Provider"
typeName="RemoteGuiInterfacePrx"
memberName="RemoteGui"
getterName="getRemoteGui"
propertyName="RemoteGuiName"
propertyIsOptional="true"
- propertyDefaultValue="RemoteGuiProvider" />
+ propertyDefaultValue="RemoteGuiProvider">
+ </Proxy>
</Lib>
</VariantInfo>
diff --git a/source/ArmarXGui/libraries/RemoteGui/CMakeLists.txt b/source/ArmarXGui/libraries/RemoteGui/CMakeLists.txt
index e36112dc..3133b29c 100644
--- a/source/ArmarXGui/libraries/RemoteGui/CMakeLists.txt
+++ b/source/ArmarXGui/libraries/RemoteGui/CMakeLists.txt
@@ -31,6 +31,7 @@ set(SOURCES
)
set(HEADERS
+ RemoteGui.h
WidgetHandler.h
TypedWidget.h
Widgets.h
diff --git a/source/ArmarXGui/libraries/RemoteGui/RemoteGui.h b/source/ArmarXGui/libraries/RemoteGui/RemoteGui.h
new file mode 100644
index 00000000..e3544776
--- /dev/null
+++ b/source/ArmarXGui/libraries/RemoteGui/RemoteGui.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of ArmarX.
+ *
+ * Copyright (C) 2011-2017, High Performance Humanoid Technologies (H2T), Karlsruhe Institute of Technology (KIT), all rights reserved.
+ *
+ * ArmarX is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * ArmarX is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package ArmarX
+ * @author Mirko Waechter( mirko.waechter at kit dot edu)
+ * @date 2018
+ * @copyright http://www.gnu.org/licenses/gpl-2.0.txt
+ * GNU General Public License
+ */
+#pragma once
+
+#include "WidgetProxy.h"
+#include "WidgetBuilder.h"
--
GitLab