summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorDennis Brentjes <d.brentjes@gmail.com>2014-05-03 10:57:11 +0200
committerDennis Brentjes <d.brentjes@gmail.com>2014-05-03 10:57:11 +0200
commit5bf919190e90b017ff00ab074bce68e90958fa3c (patch)
tree4dfa89be670c4b7ea8ca0054751fe7da8451134a /main.cpp
parent42442fd5025b69c4b7800c71d6f568ae255e7b00 (diff)
downloadgeneric-gui-5bf919190e90b017ff00ab074bce68e90958fa3c.tar.gz
generic-gui-5bf919190e90b017ff00ab074bce68e90958fa3c.tar.bz2
generic-gui-5bf919190e90b017ff00ab074bce68e90958fa3c.zip
Adds a mapping variant to the generic gui.
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp43
1 files changed, 9 insertions, 34 deletions
diff --git a/main.cpp b/main.cpp
index 3e9307d..380a3a9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,5 @@
+#include "main_window.hpp"
#include "fusion_model.hpp"
#include "qt_adapter.hpp"
#include "gui_item_delegate.hpp"
@@ -8,12 +9,6 @@
#include <iostream>
-#include <QMainWindow>
-#include <QHeaderView>
-#include <QVBoxLayout>
-#include <QApplication>
-#include <QMdiArea>
-
struct Data {
std::string name;
uint32_t number;
@@ -63,35 +58,15 @@ int main()
mapping.add_data("nummer2", d2);
mapping.add_data("nummer3", d3);
- auto&& adapter2 = make_qt_adapter(mapping);
-
- int argc = 0;
- QApplication qapp(argc, nullptr);
-
- QMainWindow w;
-
- widget_type<decltype(adapter)>::type widget;
- widget.setFixedSize(640, 480);
- widget.setModel(adapter.get());
- //widget.show();
-
- widget_type<decltype(adapter)>::type widget2;
- widget2.setFixedSize(640, 480);
- widget2.verticalHeader()->setEnabled(true);
- widget2.setModel(adapter2.get());
- //widget2.show();
-
- QMdiArea area;
-
- QVBoxLayout layout;
+ auto adapter2 = make_qt_adapter(mapping);
- layout.addWidget(&widget);
- layout.addWidget(&widget2);
+ MainWindow w;
- area.setLayout(&layout);
-
- w.setCentralWidget(&area);
- w.show();
+ widget_type<decltype(adapter)>::type widget(adapter);
+ widget_type<decltype(adapter2)>::type widget2(adapter2);
+
+ w.add_widget(&widget);
+ w.add_widget(&widget2);
- return qapp.exec();
+ w.show_and_run();
}