From 5216e488639fc8420d38c35177b796e1cf56ac8b Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 14 Jul 2018 14:06:05 +0200
Subject: join python and info into one tab

---
 gui/basewindow.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gui/basewindow.h')

diff --git a/gui/basewindow.h b/gui/basewindow.h
index d2d0505d..ebbe66f0 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -20,7 +20,6 @@
 #ifndef BASEMAINWINDOW_H
 #define BASEMAINWINDOW_H
 
-#include "infotab.h"
 #include "nextpnr.h"
 
 #include <QMainWindow>
@@ -35,6 +34,8 @@ Q_DECLARE_METATYPE(std::string)
 
 NEXTPNR_NAMESPACE_BEGIN
 
+class PythonTab;
+
 class BaseMainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -62,7 +63,7 @@ class BaseMainWindow : public QMainWindow
     std::unique_ptr<Context> ctx;
     QTabWidget *tabWidget;
     QTabWidget *centralTabWidget;
-    InfoTab *info;
+    PythonTab *console;
 
     QMenuBar *menuBar;
     QToolBar *mainToolBar;
-- 
cgit v1.2.3


From 8d1996cae99ff80a2d9390b94db54217ed1d8726 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 14 Jul 2018 19:44:37 +0200
Subject: display selected object from tree

---
 gui/basewindow.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gui/basewindow.h')

diff --git a/gui/basewindow.h b/gui/basewindow.h
index ebbe66f0..4d3d80a1 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -31,6 +31,7 @@
 #include <QToolBar>
 
 Q_DECLARE_METATYPE(std::string)
+Q_DECLARE_METATYPE(NEXTPNR_NAMESPACE_PREFIX DecalXY)
 
 NEXTPNR_NAMESPACE_BEGIN
 
-- 
cgit v1.2.3