GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1129:1d52e9600333

Add a button in the application toolbar to open the catalogues

trabillard -

r1129:1d52e9600333

parent child

Context file:

r1129:1d52e9600333

Collapse all files

gui/resources/icones/catalogue.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

app/src/MainWindow.cpp +12 -1

             #include "MainWindow.h"
             #include "ui_MainWindow.h"
+            #include <Catalogue/CatalogueExplorer.h>
             #include <DataSource/DataSourceController.h>
             #include <DataSource/DataSourceWidget.h>
             #include <Settings/SqpSettingsDialog.h>
                         : m_LastOpenLeftInspectorSize{},
                           m_LastOpenRightInspectorSize{},
                           m_GeneralSettingsWidget{new SqpSettingsGeneralWidget{mainWindow}},
-                          m_SettingsDialog{new SqpSettingsDialog{mainWindow}}
+                          m_SettingsDialog{new SqpSettingsDialog{mainWindow}},
+                          m_CatalogExplorer{new CatalogueExplorer{mainWindow}}
                 {
                 }
                 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)
                 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()
                 mainToolBar->addAction(actionZonesMode);
                 mainToolBar->addSeparator();
+                // Cursors
                 auto btnCursor = new QToolButton{this};
                 btnCursor->setIcon(QIcon(":/icones/cursor.png"));
                 btnCursor->setText("Cursor");
                 cursorModeActionGroup->addAction(horizontalCursorAction);
                 cursorModeActionGroup->addAction(crossCursorAction);
+                // Catalog
+                mainToolBar->addSeparator();
+                mainToolBar->addAction(QIcon(":/icones/catalogue.png"), "Catalogues",
+                                       [this]() { impl->m_CatalogExplorer->show(); });
                 // //////// //
                 // Settings //
                 // //////// //

gui/resources/sqpguiresources.qrc +1 0

             		<file>icones/drag.png</file>
             		<file>icones/cursor.png</file>
             		<file>icones/pointer.png</file>
+            		<file>icones/catalogue.png</file>
                 </qresource>
             </RCC>

General Comments 3

trabillard

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages