From 1d52e96003335dc7dfd8b1827cb0510e5930dc74 2017-12-07 14:51:25
From: Thibaud Rabillard <trabillard@itlink.fr>
Date: 2017-12-07 14:51:25
Subject: [PATCH] Add a button in the application toolbar to open the catalogues

---

diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index 0831198..c96666f 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -22,6 +22,7 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
 
+#include <Catalogue/CatalogueExplorer.h>
 #include <DataSource/DataSourceController.h>
 #include <DataSource/DataSourceWidget.h>
 #include <Settings/SqpSettingsDialog.h>
@@ -60,7 +61,8 @@ public:
             : m_LastOpenLeftInspectorSize{},
               m_LastOpenRightInspectorSize{},
               m_GeneralSettingsWidget{new SqpSettingsGeneralWidget{mainWindow}},
-              m_SettingsDialog{new SqpSettingsDialog{mainWindow}}
+              m_SettingsDialog{new SqpSettingsDialog{mainWindow}},
+              m_CatalogExplorer{new CatalogueExplorer{mainWindow}}
     {
     }
 
@@ -70,6 +72,8 @@ public:
     SqpSettingsGeneralWidget *m_GeneralSettingsWidget;
     /// Settings dialog. MainWindow has the ownership
     SqpSettingsDialog *m_SettingsDialog;
+    /// Catalogue dialog. MainWindow has the ownership
+    CatalogueExplorer *m_CatalogExplorer;
 };
 
 MainWindow::MainWindow(QWidget *parent)
@@ -189,6 +193,7 @@ MainWindow::MainWindow(QWidget *parent)
     auto timeWidget = new TimeWidget{};
     mainToolBar->addWidget(timeWidget);
 
+    // Interaction modes
     auto actionPointerMode = new QAction{QIcon(":/icones/pointer.png"), "Move", this};
     actionPointerMode->setCheckable(true);
     actionPointerMode->setChecked(sqpApp->plotsInteractionMode()
@@ -234,6 +239,7 @@ MainWindow::MainWindow(QWidget *parent)
     mainToolBar->addAction(actionZonesMode);
     mainToolBar->addSeparator();
 
+    // Cursors
     auto btnCursor = new QToolButton{this};
     btnCursor->setIcon(QIcon(":/icones/cursor.png"));
     btnCursor->setText("Cursor");
@@ -288,6 +294,11 @@ MainWindow::MainWindow(QWidget *parent)
     cursorModeActionGroup->addAction(horizontalCursorAction);
     cursorModeActionGroup->addAction(crossCursorAction);
 
+    // Catalog
+    mainToolBar->addSeparator();
+    mainToolBar->addAction(QIcon(":/icones/catalogue.png"), "Catalogues",
+                           [this]() { impl->m_CatalogExplorer->show(); });
+
     // //////// //
     // Settings //
     // //////// //
diff --git a/gui/resources/icones/catalogue.png b/gui/resources/icones/catalogue.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2ee3c619f73fb9257581ffdc3b563f49e6737ba
GIT binary patch
literal 615
zc%17D@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5)2GXoSrU@Ar*7p-Z0DxVH9zD_&Lsnb2Fp#!9#Jvo0+CRP>MNT%-Q6@
z<n=8fTVQrbS8o_w(2gES12JL8Ng6B8{7L@z`Jk?xPoeyGk$y(cNh&b3#NL=O{o%~8
zKYhPiJO6y_RY*~)FHz>0c|!g+hm+bTceADmoqr0!!XaSc%N!7m{|+%H$p2tEbMk-W
z<3G30oX_9M|K^kQ?E?qdbl$8fi(@p_yTNuZ_dwCPs%JAkb8L&KVzhD7eaEo9@jCMc
z=9)9_7Ejo#`#|%9!QM_Iwg)UbrpLJmsxxn3$Xj9_cqA#|XXuKc<SNEgNe4@2jdX^m
zJPYP9PBCsMVhcFOaB6S~DsS-6UpV6^M~!d(!WowZD`wwwGIVF&z`n;nf6-QJ=6C%E
z*dG||>ACja^25vHhj}d0B3q09KIbjy=1x0snm6KH<lP$Pc^@x-WY@dRIFF&fVfTTv
v+I5TnAD6LU?Q39uP+TU96kS`g?lW51Y`$5kUAzRCQW!j4{an^LB{Ts5BDU;Y

literal 0
Hc$@<O00001

diff --git a/gui/resources/sqpguiresources.qrc b/gui/resources/sqpguiresources.qrc
index e1d97e8..09c1afa 100644
--- a/gui/resources/sqpguiresources.qrc
+++ b/gui/resources/sqpguiresources.qrc
@@ -18,5 +18,6 @@
 		<file>icones/drag.png</file>
 		<file>icones/cursor.png</file>
 		<file>icones/pointer.png</file>
+		<file>icones/catalogue.png</file>
     </qresource>
 </RCC>