HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1462:66c20669d3a7

Refactored main toolbar to make it suck less :)...

jeandet -

r1462:66c20669d3a7

parent child

Context file:

r1462:66c20669d3a7

app/include/toolbar.h created 644 +37 0

@@ -0,0 +1,37
	1	#ifndef TOOLBAR_H
	2	#define TOOLBAR_H
	3
	4	#include <Data/DateTimeRange.h>
	5	#include <QAction>
	6	#include <QActionGroup>
	7	#include <QObject>
	8	#include <QToolBar>
	9	#include <QWidget>
	10	#include <TimeWidget/TimeWidget.h>
	11
	12	// @TODO remove this, shouldn't need to include SqpApplication to get PlotsInteractionMode
	13	#include <SqpApplication.h>
	14
	15	class ToolBar : public QToolBar
	16	{
	17	Q_OBJECT
	18	public:
	19	explicit ToolBar(QWidget* parent = nullptr);
	20
	21	QAction* timeRange;
	22	QAction* pointerMode;
	23	QAction* zoomMode;
	24	QAction* organizationMode;
	25	QAction* zonesMode;
	26	QAction* cursorsActn;
	27	QAction* cataloguesActn;
	28
	29	TimeWidgetAction* timeWidget;
	30	signals:
	31	void setPlotsInteractionMode(SqpApplication::PlotsInteractionMode);
	32	void setPlotsCursorMode(SqpApplication::PlotsCursorMode);
	33	void timeUpdated(DateTimeRange time);
	34	void showCataloguesBrowser();
	35	};
	36
	37	#endif // TOOLBAR_H

app/src/toolbar.cpp created 644 +68 0

@@ -0,0 +1,68
	1	#include "toolbar.h"
	2	#include <QIcon>
	3	#include <QMenu>
	4	#include <QStringLiteral>
	5	#include <tuple>
	6
	7	using InteractionMode = SqpApplication::PlotsInteractionMode;
	8	using CursorMode = SqpApplication::PlotsCursorMode;
	9
	10	ToolBar::ToolBar(QWidget* parent)
	11	{
	12	#define mk_tuple std::make_tuple
	13
	14	for (auto [action, icon, text, checkable] :
	15	{ mk_tuple(&this->timeRange, ":/icones/Simple_icon_time.svg", "Set time range", false),
	16	mk_tuple(&this->pointerMode, ":/icones/pointer.png", "Move", true),
	17	mk_tuple(&this->zoomMode, ":/icones/zoom.png", "Zoom", true),
	18	mk_tuple(&this->organizationMode, ":/icones/drag.png", "Organize", true),
	19	mk_tuple(&this->zonesMode, ":/icones/rectangle.png", "Zones", true),
	20	mk_tuple(&this->cursorsActn, ":/icones/cursor.png", "Cursors", false),
	21	mk_tuple(&this->cataloguesActn, ":/icones/catalogue.png", "Catalogues", false) })
	22	{
	23	*action = new QAction(QIcon(icon), text, this);
	24	(*action)->setCheckable(checkable);
	25	this->addAction(*action);
	26	}
	27	connect(this->cataloguesActn, &QAction::triggered, this, &ToolBar::showCataloguesBrowser);
	28	this->pointerMode->setChecked(true);
	29	{
	30	this->cursorsActn->setMenu(new QMenu());
	31	auto menu = this->cursorsActn->menu();
	32	auto group = new QActionGroup { this };
	33	group->setExclusive(true);
	34	for (auto [icon, text, mode, checked] :
	35	{ mk_tuple("", "No Cursor", CursorMode::NoCursor, true),
	36	mk_tuple("", "Vertical Cursor", CursorMode::Vertical, false),
	37	mk_tuple("", "Horizontal Cursor", CursorMode::Horizontal, false),
	38	mk_tuple("", "Cross Cursor", CursorMode::Cross, false) })
	39	{
	40	auto action = menu->addAction(text);
	41	group->addAction(action);
	42	action->setCheckable(true);
	43	action->setChecked(checked);
	44	connect(action, &QAction::triggered,
	45	[this, mode = mode]() { emit this->setPlotsCursorMode(mode); });
	46	}
	47	}
	48
	49	for (auto [actn, mode] : { mk_tuple(this->pointerMode, InteractionMode::None),
	50	mk_tuple(this->zoomMode, InteractionMode::ZoomBox),
	51	mk_tuple(this->organizationMode, InteractionMode::DragAndDrop),
	52	mk_tuple(this->zonesMode, InteractionMode::SelectionZones) })
	53	{
	54	connect(actn, &QAction::triggered,
	55	[this, mode = mode]() { emit this->setPlotsInteractionMode(mode); });
	56	}
	57
	58	auto cursorModeActionGroup = new QActionGroup { this };
	59	cursorModeActionGroup->setExclusive(true);
	60	for (auto actn : { this->pointerMode, this->organizationMode, this->zoomMode, this->zonesMode })
	61	{
	62	cursorModeActionGroup->addAction(actn);
	63	}
	64
	65	this->timeWidget = new TimeWidgetAction();
	66	this->timeRange->setMenu(new QMenu());
	67	this->timeRange->menu()->addAction(this->timeWidget);
	68	}

gui/resources/icones/Simple_icon_time.svg created 644 +20 0

@@ -0,0 +1,20
	1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>
	2	<!-- Created with Inkscape (http://www.inkscape.org/) -->
	3	<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="50.000008" height="39.999996" id="svg12257" sodipodi:version="0.32" inkscape:version="0.44" version="1.0" sodipodi:docbase="D:\Home\Wikipedia" sodipodi:docname="Simple icon time.svg">
	4	<defs id="defs12259"/>
	5	<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.5795652" inkscape:cx="27.142857" inkscape:cy="44.285714" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1024" inkscape:window-height="682" inkscape:window-x="-4" inkscape:window-y="-4"/>
	6	<metadata id="metadata12262">
	7	<rdf:RDF>
	8	<cc:Work rdf:about="">
	9	<dc:format>image/svg+xml</dc:format>
	10	<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
	11	</cc:Work>
	12	</rdf:RDF>
	13	</metadata>
	14	<g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-306.4286,-335.2193)">
	15	<g id="g1960" transform="translate(131.4286,99.34979)">
	16	<path id="path1948" d="M 200,237.86949 C 190.08587,237.86949 181.99999,245.95537 181.99999,255.86951 C 181.99999,265.78364 190.08587,273.86952 200,273.86952 C 209.91414,273.86952 218.00002,265.78364 218.00002,255.86951 C 218.00002,245.95537 209.91414,237.86949 200,237.86949 z M 200,241.8695 C 207.74989,241.8695 214.00002,248.11963 214.00002,255.86951 C 214.00002,263.61939 207.74989,269.86952 200,269.86952 C 192.25012,269.86952 185.99999,263.61939 185.99999,255.86951 C 185.99999,248.11963 192.25012,241.8695 200,241.8695 z " style="color:black;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.00000048;stroke-linecap:butt;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"/>
	17	<path id="path1950" d="M 200.25,242.625 C 199.14542,242.64223 198.26397,243.55167 198.28125,244.65625 L 198.28125,258.375 C 198.27245,259.10687 198.6641,259.78511 199.30238,260.14332 C 199.94065,260.50154 200.72361,260.48253 201.34375,260.09375 L 208.625,255.625 C 209.25907,255.26307 209.64557,254.58442 209.63336,253.85443 C 209.62115,253.12444 209.21217,252.45909 208.56636,252.11857 C 207.92054,251.77804 207.1405,251.81644 206.53125,252.21875 L 202.28125,254.8125 L 202.28125,244.65625 C 202.28972,244.11498 202.07843,243.59338 201.69565,243.2106 C 201.31287,242.82782 200.79127,242.61653 200.25,242.625 z " style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.99999881;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
	18	</g>
	19	</g>
	20	</svg> No newline at end of file

app/meson.build +2 0

             app_moc_headers = [
               'include/MainWindow.h'
+              'include/toolbar.h'
             ]
             app_ui_files = [
               'ui/MainWindow.ui'
             ]
             app_qresources = ['resources/qlopapp.qrc']
             app_moc_files = qt5.preprocess(moc_headers : app_moc_headers,
                                            ui_files : app_ui_files,
                                            qresources : app_qresources)
             app_sources = [
               'src/Main.cpp',
               'src/MainWindow.cpp'
+              'src/toolbar.cpp'
             ]
             app_inc = include_directories(['include'])
             if host_machine.system()=='windows' or build_machine.system()=='windows'
               winmod = import('windows')
               rc = winmod.compile_resources('resources/qlopapp.rc')
             else
               rc = []
             endif
             app_libs = []
             cpp_args = []
             if 'static' == get_option('default_library')
               app_libs = [sciqlop_python_providers]
               cpp_args += ['-DQT_STATICPLUGIN']
             endif
             sciqlop_app = executable('sciqlop',
                                    app_sources,
                                    app_moc_files,
                                    rc,
                                    include_directories : [ app_inc],
                                    link_with: app_libs,
                                    cpp_args: cpp_args,
                                    dependencies : [sciqlop_gui, sciqlop_core],
                                    install : true
                                    )

app/src/MainWindow.cpp +12 -116

             /*------------------------------------------------------------------------------
             -- This file is a part of the SciQLop Software
             -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program 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, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "MainWindow.h"
             #include "ui_MainWindow.h"
             #include <Catalogue/CatalogueController.h>
             #include <Catalogue2/browser.h>
             #include <DataSource/DataSourceController.h>
             #include <DataSource/DataSourceWidget.h>
             #include <Settings/SqpSettingsDialog.h>
             #include <Settings/SqpSettingsGeneralWidget.h>
             #include <SidePane/SqpSidePane.h>
             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <TimeWidget/TimeWidget.h>
             #include <Visualization/VisualizationController.h>
+            #include "toolbar.h"
             #include <QAction>
             #include <QCloseEvent>
             #include <QDate>
             #include <QDir>
             #include <QFileDialog>
             #include <QMessageBox>
             #include <QToolBar>
             #include <QToolButton>
             #include <memory.h>
             Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow")
             namespace
             {
             const auto LEFTMAININSPECTORWIDGETSPLITTERINDEX = 0;
             const auto LEFTINSPECTORSIDEPANESPLITTERINDEX = 1;
             const auto VIEWPLITTERINDEX = 2;
             const auto RIGHTINSPECTORSIDEPANESPLITTERINDEX = 3;
             const auto RIGHTMAININSPECTORWIDGETSPLITTERINDEX = 4;
             }
             class MainWindow::MainWindowPrivate
             {
             public:
                 explicit MainWindowPrivate(MainWindow* mainWindow)
                         : m_LastOpenLeftInspectorSize {}
                         , m_LastOpenRightInspectorSize {}
                         , m_GeneralSettingsWidget { new SqpSettingsGeneralWidget { mainWindow } }
                         , m_SettingsDialog { new SqpSettingsDialog { mainWindow } }
                         , m_CatalogExplorer { new CataloguesBrowser { mainWindow } }
                 {
                 }
                 QSize m_LastOpenLeftInspectorSize;
                 QSize m_LastOpenRightInspectorSize;
                 /// General settings widget. MainWindow has the ownership
                 SqpSettingsGeneralWidget* m_GeneralSettingsWidget;
                 /// Settings dialog. MainWindow has the ownership
                 SqpSettingsDialog* m_SettingsDialog;
                 /// Catalogue dialog. MainWindow has the ownership
                 CataloguesBrowser* m_CatalogExplorer;
                 bool checkDataToSave(QWidget* parentWidget);
             };
             MainWindow::MainWindow(QWidget* parent)
                     : QMainWindow { parent }
                     , m_Ui { new Ui::MainWindow }
                     , impl { spimpl::make_unique_impl<MainWindowPrivate>(this) }
             {
                 m_Ui->setupUi(this);
                 setWindowTitle(QString("SciQLop v%1").arg(SCIQLOP_VERSION));
                 m_Ui->splitter->setCollapsible(LEFTINSPECTORSIDEPANESPLITTERINDEX, false);
                 m_Ui->splitter->setCollapsible(RIGHTINSPECTORSIDEPANESPLITTERINDEX, false);
                 // impl->m_CatalogExplorer->setVisualizationWidget(m_Ui->view);
                 auto spacerLeftTop = new QWidget {};
                 spacerLeftTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerLeftBottom = new QWidget {};
                 spacerLeftBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerRightTop = new QWidget {};
                 spacerRightTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerRightBottom = new QWidget {};
                 spacerRightBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto openInspector = [this](bool checked, bool right, auto action) {
                     action->setIcon(
                         QIcon { (checked ^ right) ? ":/icones/next.png" : ":/icones/previous.png" });
                     auto& lastInspectorSize
                         = right ? impl->m_LastOpenRightInspectorSize : impl->m_LastOpenLeftInspectorSize;
                     auto nextInspectorSize = right ? m_Ui->rightMainInspectorWidget->size()
                                                    : m_Ui->leftMainInspectorWidget->size();
                     // Update of the last opened geometry
                     if (checked)
                     {
                         lastInspectorSize = nextInspectorSize;
                     }
                     auto startSize = lastInspectorSize;
                     auto endSize = startSize;
                     endSize.setWidth(0);
                     auto splitterInspectorIndex
                         = right ? RIGHTMAININSPECTORWIDGETSPLITTERINDEX : LEFTMAININSPECTORWIDGETSPLITTERINDEX;
                     auto currentSizes = m_Ui->splitter->sizes();
                     if (checked)
                     {
                         // adjust sizes individually here, e.g.
                         currentSizes[splitterInspectorIndex] -= lastInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] += lastInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                     else
                     {
                         // adjust sizes individually here, e.g.
                         currentSizes[splitterInspectorIndex] += lastInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] -= lastInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                 };
                 // //////////////// //
                 // Menu and Toolbar //
                 // //////////////// //
                 this->menuBar()->addAction(tr("File"));
                 auto toolsMenu = this->menuBar()->addMenu(tr("Tools"));
                 toolsMenu->addAction(tr("Settings..."), [this]() {
                     // Loads settings
                     impl->m_SettingsDialog->loadSettings();
                     // Open settings dialog and save settings if the dialog is accepted
                     if (impl->m_SettingsDialog->exec() == QDialog::Accepted)
                     {
                         impl->m_SettingsDialog->saveSettings();
                     }
                 });
+                auto mainToolBar = new ToolBar(this);
-                auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar"));
+                this->addToolBar(mainToolBar);
+                connect(mainToolBar, &ToolBar::setPlotsInteractionMode, sqpApp,
-                auto timeWidget = new TimeWidget {};
+                    &SqpApplication::setPlotsInteractionMode);
-                mainToolBar->addWidget(timeWidget);
+                connect(mainToolBar, &ToolBar::setPlotsCursorMode, sqpApp, &SqpApplication::setPlotsCursorMode);
+                connect(mainToolBar, &ToolBar::showCataloguesBrowser,
-                // Interaction modes
-                auto actionPointerMode = new QAction { QIcon(":/icones/pointer.png"), "Move", this };
-                actionPointerMode->setCheckable(true);
-                actionPointerMode->setChecked(
-                    sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::None);
-                connect(actionPointerMode, &QAction::triggered,
-                    []() { sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::None); });
-                auto actionZoomMode = new QAction { QIcon(":/icones/zoom.png"), "Zoom", this };
-                actionZoomMode->setCheckable(true);
-                actionZoomMode->setChecked(
-                    sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::ZoomBox);
-                connect(actionZoomMode, &QAction::triggered,
-                    []() { sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::ZoomBox); });
-                auto actionOrganisationMode = new QAction { QIcon(":/icones/drag.png"), "Organize", this };
-                actionOrganisationMode->setCheckable(true);
-                actionOrganisationMode->setChecked(
-                    sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::DragAndDrop);
-                connect(actionOrganisationMode, &QAction::triggered, []() {
-                    sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::DragAndDrop);
-                });
-                auto actionZonesMode = new QAction { QIcon(":/icones/rectangle.png"), "Zones", this };
-                actionZonesMode->setCheckable(true);
-                actionZonesMode->setChecked(
-                    sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::SelectionZones);
-                connect(actionZonesMode, &QAction::triggered, []() {
-                    sqpApp->setPlotsInteractionMode(SqpApplication::PlotsInteractionMode::SelectionZones);
-                });
-                auto modeActionGroup = new QActionGroup { this };
-                modeActionGroup->addAction(actionZoomMode);
-                modeActionGroup->addAction(actionZonesMode);
-                modeActionGroup->addAction(actionOrganisationMode);
-                modeActionGroup->addAction(actionPointerMode);
-                modeActionGroup->setExclusive(true);
-                mainToolBar->addSeparator();
-                mainToolBar->addAction(actionPointerMode);
-                mainToolBar->addAction(actionZoomMode);
-                mainToolBar->addAction(actionOrganisationMode);
-                mainToolBar->addAction(actionZonesMode);
-                mainToolBar->addSeparator();
-                // Cursors
-                auto btnCursor = new QToolButton { this };
-                btnCursor->setIcon(QIcon(":/icones/cursor.png"));
-                btnCursor->setText("Cursor");
-                btnCursor->setToolTip("Cursor");
-                btnCursor->setPopupMode(QToolButton::InstantPopup);
-                auto cursorMenu = new QMenu("CursorMenu", this);
-                btnCursor->setMenu(cursorMenu);
-                auto noCursorAction = cursorMenu->addAction("No Cursor");
-                noCursorAction->setCheckable(true);
-                noCursorAction->setChecked(
-                    sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::NoCursor);
-                connect(noCursorAction, &QAction::triggered,
-                    []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::NoCursor); });
-                cursorMenu->addSeparator();
-                auto verticalCursorAction = cursorMenu->addAction("Vertical Cursor");
-                verticalCursorAction->setCheckable(true);
-                verticalCursorAction->setChecked(
-                    sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Vertical);
-                connect(verticalCursorAction, &QAction::triggered,
-                    []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Vertical); });
-                auto temporalCursorAction = cursorMenu->addAction("Temporal Cursor");
-                temporalCursorAction->setCheckable(true);
-                temporalCursorAction->setChecked(
-                    sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Temporal);
-                connect(temporalCursorAction, &QAction::triggered,
-                    []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Temporal); });
-                auto horizontalCursorAction = cursorMenu->addAction("Horizontal Cursor");
-                horizontalCursorAction->setCheckable(true);
-                horizontalCursorAction->setChecked(
-                    sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Horizontal);
-                connect(horizontalCursorAction, &QAction::triggered,
-                    []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Horizontal); });
-                auto crossCursorAction = cursorMenu->addAction("Cross Cursor");
-                crossCursorAction->setCheckable(true);
-                crossCursorAction->setChecked(
-                    sqpApp->plotsCursorMode() == SqpApplication::PlotsCursorMode::Cross);
-                connect(crossCursorAction, &QAction::triggered,
-                    []() { sqpApp->setPlotsCursorMode(SqpApplication::PlotsCursorMode::Cross); });
-                mainToolBar->addWidget(btnCursor);
-                auto cursorModeActionGroup = new QActionGroup { this };
-                cursorModeActionGroup->setExclusive(true);
-                cursorModeActionGroup->addAction(noCursorAction);
-                cursorModeActionGroup->addAction(verticalCursorAction);
-                cursorModeActionGroup->addAction(temporalCursorAction);
-                cursorModeActionGroup->addAction(horizontalCursorAction);
-                cursorModeActionGroup->addAction(crossCursorAction);
-                // Catalog
-                mainToolBar->addSeparator();
-                mainToolBar->addAction(QIcon(":/icones/catalogue.png"), "Catalogues",
                     [this]() { impl->m_CatalogExplorer->show(); });
                 // //////// //
                 // Settings //
                 // //////// //
                 // Registers "general settings" widget to the settings dialog
                 impl->m_SettingsDialog->registerWidget(
                     QStringLiteral("General"), impl->m_GeneralSettingsWidget);
                 // /////////// //
                 // Connections //
                 // /////////// //
-                // Controllers / controllers connections
-                //    connect(&sqpApp->timeController(), SIGNAL(timeUpdated(DateTimeRange)),
-                //    &sqpApp->variableController(),
-                //            SLOT(onDateTimeOnSelection(DateTimeRange)));
                 // Widgets / controllers connections
                 // DataSource
                 connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem*)),
                     m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem*)));
                 // Time
-                connect(timeWidget, SIGNAL(timeUpdated(DateTimeRange)), &sqpApp->timeController(),
+                //    connect(timeWidget, SIGNAL(timeUpdated(DateTimeRange)), &sqpApp->timeController(),
-                    SLOT(onTimeToUpdate(DateTimeRange)));
+                //        SLOT(onTimeToUpdate(DateTimeRange)));
+                connect(mainToolBar, &ToolBar::timeUpdated, &sqpApp->timeController(),
+                    &TimeController::setDateTimeRange);
                 // Visualization
                 connect(&sqpApp->visualizationController(),
                     SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable2>)), m_Ui->view,
                     SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable2>)));
                 connect(&sqpApp->visualizationController(),
                     SIGNAL(rangeChanged(std::shared_ptr<Variable2>, const DateTimeRange&)), m_Ui->view,
                     SLOT(onRangeChanged(std::shared_ptr<Variable2>, const DateTimeRange&)));
                 // Widgets / widgets connections
                 // For the following connections, we use DirectConnection to allow each widget that can
                 // potentially attach a menu to the variable's menu to do so before this menu is displayed.
                 // The order of connections is also important, since it determines the order in which each
                 // widget will attach its menu
                 connect(m_Ui->variableInspectorWidget,
                     SIGNAL(tableMenuAboutToBeDisplayed(QMenu*, const QVector<std::shared_ptr<Variable>>&)),
                     m_Ui->view, SLOT(attachVariableMenu(QMenu*, const QVector<std::shared_ptr<Variable>>&)),
                     Qt::DirectConnection);
             }
             MainWindow::~MainWindow() {}
             void MainWindow::changeEvent(QEvent* e)
             {
                 QMainWindow::changeEvent(e);
                 switch (e->type())
                 {
                     case QEvent::LanguageChange:
                         m_Ui->retranslateUi(this);
                         break;
                     default:
                         break;
                 }
             }
             void MainWindow::closeEvent(QCloseEvent* event)
             {
                 if (!impl->checkDataToSave(this))
                 {
                     event->ignore();
                 }
                 else
                 {
                     event->accept();
                 }
             }
             void MainWindow::keyPressEvent(QKeyEvent* event)
             {
                 switch (event->key())
                 {
                     case Qt::Key_F11:
                         if (this->isFullScreen())
                         {
                             this->showNormal();
                         }
                         else
                         {
                             this->showFullScreen();
                         }
                         break;
                     default:
                         break;
                 }
             }
             bool MainWindow::MainWindowPrivate::checkDataToSave(QWidget* parentWidget)
             {
                 //    auto hasChanges = sqpApp->catalogueController().hasChanges();
                 //    if (hasChanges)
                 //    {
                 //        // There are some unsaved changes
                 //        switch (QMessageBox::question(parentWidget, tr("Save changes"),
                 //            tr("The catalogue controller has unsaved changes.\nDo you want to save them ?"),
                 //            QMessageBox::SaveAll | QMessageBox::Discard | QMessageBox::Cancel,
                 //            QMessageBox::SaveAll))
                 //        {
                 //            case QMessageBox::SaveAll:
                 //                sqpApp->catalogueController().saveAll();
                 //                break;
                 //            case QMessageBox::Discard:
                 //                break;
                 //            case QMessageBox::Cancel:
                 //            default:
                 //                return false;
                 //        }
                 //    }
                 return true;
             }

app/ui/MainWindow.ui +16 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>MainWindow</class>
              <widget class="QMainWindow" name="MainWindow">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>800</width>
                 <height>600</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>SciQlop</string>
               </property>
               <property name="dockNestingEnabled">
                <bool>true</bool>
               </property>
               <widget class="QWidget" name="centralWidget">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>16777215</height>
                 </size>
                </property>
                <layout class="QHBoxLayout" name="horizontalLayout">
                 <property name="spacing">
                  <number>0</number>
                 </property>
                 <property name="leftMargin">
                  <number>0</number>
                 </property>
                 <property name="topMargin">
                  <number>0</number>
                 </property>
                 <property name="rightMargin">
                  <number>0</number>
                 </property>
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
                 <item>
                  <widget class="QSplitter" name="splitter">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
                   <widget class="QWidget" name="leftMainInspectorWidget" native="true">
                    <layout class="QVBoxLayout" name="verticalLayout">
                     <property name="spacing">
                      <number>0</number>
                     </property>
                     <property name="leftMargin">
                      <number>0</number>
                     </property>
                     <property name="topMargin">
                      <number>0</number>
                     </property>
                     <property name="rightMargin">
                      <number>0</number>
                     </property>
                     <property name="bottomMargin">
                      <number>0</number>
                     </property>
                     <item>
                      <widget class="DataSourceWidget" name="dataSourceWidget" native="true"/>
                     </item>
                     <item>
                      <widget class="QWidget" name="dateTimeWidget" native="true"/>
                     </item>
                     <item>
                      <widget class="VariableInspectorWidget" name="variableInspectorWidget" native="true"/>
                     </item>
                    </layout>
                   </widget>
                   <widget class="VisualizationWidget" name="view" native="true">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                      <horstretch>0</horstretch>
                      <verstretch>0</verstretch>
                     </sizepolicy>
                    </property>
                   </widget>
                   <widget class="QWidget" name="rightMainInspectorWidget" native="true">
                    <layout class="QVBoxLayout" name="verticalLayout_3">
                     <property name="spacing">
                      <number>0</number>
                     </property>
                     <property name="leftMargin">
                      <number>0</number>
                     </property>
                     <property name="topMargin">
                      <number>0</number>
                     </property>
                     <property name="rightMargin">
                      <number>0</number>
                     </property>
                     <property name="bottomMargin">
                      <number>0</number>
                     </property>
                     <item>
                      <widget class="QWidget" name="commonPropertyInspectorWidget" native="true"/>
                     </item>
                     <item>
                      <widget class="QTreeWidget" name="catalogWidget">
                       <column>
                        <property name="text">
                         <string notr="true">Name</string>
                        </property>
                       </column>
                      </widget>
                     </item>
                    </layout>
                   </widget>
                  </widget>
                 </item>
                </layout>
               </widget>
               <widget class="QMenuBar" name="menuBar">
                <property name="geometry">
                 <rect>
                  <x>0</x>
                  <y>0</y>
                  <width>800</width>
-                 <height>24</height>
+                 <height>27</height>
                 </rect>
                </property>
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="nativeMenuBar">
+                <bool>true</bool>
+               </property>
               </widget>
               <widget class="QStatusBar" name="statusBar"/>
              </widget>
              <layoutdefault spacing="6" margin="11"/>
              <customwidgets>
               <customwidget>
                <class>VisualizationWidget</class>
                <extends>QWidget</extends>
                <header location="global">Visualization/VisualizationWidget.h</header>
                <container>1</container>
               </customwidget>
               <customwidget>
                <class>DataSourceWidget</class>
                <extends>QWidget</extends>
                <header location="global">DataSource/DataSourceWidget.h</header>
                <container>1</container>
               </customwidget>
               <customwidget>
                <class>VariableInspectorWidget</class>
                <extends>QWidget</extends>
                <header location="global">Variable/VariableInspectorWidget.h</header>
                <container>1</container>
               </customwidget>
              </customwidgets>
              <resources/>
              <connections/>
             </ui>

gui/include/SqpApplication.h +44 -3

             #ifndef SCIQLOP_SQPAPPLICATION_H
             #define SCIQLOP_SQPAPPLICATION_H
             #include "SqpApplication.h"
+            #include <QAction>
             #include <QApplication>
             #include <QLoggingCategory>
+            #include <QMenuBar>
+            #include <QProxyStyle>
+            #include <QStyleOption>
+            #include <QWidget>
+            #include <QWidgetAction>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication)
             #if defined(sqpApp)
             #undef sqpApp
             #endif
             #define sqpApp (static_cast<SqpApplication*>(QCoreApplication::instance()))
             class DataSourceController;
             class NetworkController;
             class TimeController;
             class VariableController;
             class VariableController2;
             class VariableModel2;
             class VisualizationController;
             class DragDropGuiController;
             class ActionsGuiController;
             class CatalogueController;
+            /* stolen from here https://forum.qt.io/topic/90403/show-tooltip-immediatly/6 */
+            class MyProxyStyle : public QProxyStyle
+            {
+            public:
+                using QProxyStyle::QProxyStyle;
+                int styleHint(StyleHint hint, const QStyleOption* option = nullptr,
+                    const QWidget* widget = nullptr, QStyleHintReturn* returnData = nullptr) const override
+                {
+                    if (widget)
+                        auto cname = widget->metaObject()->className();
+                    if (hint == QStyle::SH_ToolButton_PopupDelay && widget
+                        /*&& widget->inherits(QWidgetAction::staticMetaObject.className())*/)
+                    {
+                        return 0;
+                    }
+                    return QProxyStyle::styleHint(hint, option, widget, returnData);
+                }
+            };
             /**
              * @brief The SqpApplication class aims to make the link between SciQlop
              * and its plugins. This is the intermediate class that SciQlop has to use
              * in the way to connect a data source. Please first use load method to initialize
              * a plugin specified by its metadata name (JSON plugin source) then others specifics
              * method will be able to access it.
              * You can load a data source driver plugin then create a data source.
              */
-            class SqpApplication : public QApplication {
+            class SqpApplication : public QApplication
+            {
                 Q_OBJECT
             public:
                 explicit SqpApplication(int& argc, char** argv);
                 ~SqpApplication() override;
                 void initialize();
                 /// Accessors for the differents sciqlop controllers
                 DataSourceController& dataSourceController() noexcept;
                 NetworkController& networkController() noexcept;
                 TimeController& timeController() noexcept;
                 VariableController2& variableController() noexcept;
                 std::shared_ptr<VariableController2> variableControllerOwner() noexcept;
                 //@TODO there should not be any global model it's just GUI impl detail
                 //    VariableModel2 &variableModel() noexcept;
                 VisualizationController& visualizationController() noexcept;
                 CatalogueController& catalogueController() noexcept;
                 /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but
                 /// doesn't live in a thread and access gui
                 DragDropGuiController& dragDropGuiController() noexcept;
                 ActionsGuiController& actionsGuiController() noexcept;
-                enum class PlotsInteractionMode { None, ZoomBox, DragAndDrop, SelectionZones };
+                enum class PlotsInteractionMode
+                {
+                    None,
+                    ZoomBox,
+                    DragAndDrop,
+                    SelectionZones
+                };
-                enum class PlotsCursorMode { NoCursor, Vertical, Temporal, Horizontal, Cross };
+                enum class PlotsCursorMode
+                {
+                    NoCursor,
+                    Vertical,
+                    Temporal,
+                    Horizontal,
+                    Cross
+                };
                 PlotsInteractionMode plotsInteractionMode() const;
                 void setPlotsInteractionMode(PlotsInteractionMode mode);
                 PlotsCursorMode plotsCursorMode() const;
                 void setPlotsCursorMode(PlotsCursorMode mode);
             private:
                 class SqpApplicationPrivate;
                 spimpl::unique_impl_ptr<SqpApplicationPrivate> impl;
             };
             #endif // SCIQLOP_SQPAPPLICATION_H

gui/include/TimeWidget/TimeWidget.h +19 -2

             #ifndef SCIQLOP_TIMEWIDGET_H
             #define SCIQLOP_TIMEWIDGET_H
             #include <QWidget>
+            #include <QWidgetAction>
             #include <Data/DateTimeRange.h>
             #include <Common/spimpl.h>
-            namespace Ui {
+            namespace Ui
+            {
             class TimeWidget;
             } // Ui
-            class TimeWidget : public QWidget {
+            class TimeWidget : public QWidget
+            {
                 Q_OBJECT
             public:
                 explicit TimeWidget(QWidget* parent = 0);
                 virtual ~TimeWidget();
                 void setTimeRange(DateTimeRange time);
                 DateTimeRange timeRange() const;
             signals:
                 /// Signal emitted when the time parameters has beed updated
                 void timeUpdated(DateTimeRange time);
             public slots:
                 /// slot called when time parameters update has ben requested
                 void onTimeUpdateRequested();
             protected:
                 void dragEnterEvent(QDragEnterEvent* event) override;
                 void dragLeaveEvent(QDragLeaveEvent* event) override;
                 void dropEvent(QDropEvent* event) override;
                 void mousePressEvent(QMouseEvent* event) override;
                 void mouseMoveEvent(QMouseEvent* event) override;
             private:
                 Ui::TimeWidget* ui;
                 class TimeWidgetPrivate;
                 spimpl::unique_impl_ptr<TimeWidgetPrivate> impl;
             };
+            class TimeWidgetAction : public QWidgetAction
+            {
+                Q_OBJECT
+                TimeWidget* timeWidget;
+            public:
+                explicit TimeWidgetAction(QWidget* parent = 0) : QWidgetAction(parent)
+                {
+                    timeWidget = new TimeWidget();
+                    this->setDefaultWidget(timeWidget);
+                }
+            };
             #endif // SCIQLOP_ SQPSIDEPANE_H

gui/resources/sqpguiresources.qrc +1 0

             <RCC>
                 <qresource prefix="/">
                     <file>icones/dataSourceComponent.png</file>
                     <file>icones/dataSourceNode.png</file>
                     <file>icones/dataSourceProduct.png</file>
                     <file>icones/dataSourceRoot.png</file>
                     <file>icones/delete.png</file>
                     <file>icones/down.png</file>
                     <file>icones/openInspector.png</file>
                     <file>icones/next.png</file>
                     <file>icones/plot.png</file>
                     <file>icones/previous.png</file>
                     <file>icones/unplot.png</file>
                     <file>icones/up.png</file>
                     <file>icones/time.png</file>
                     <file>icones/zoom.png</file>
                     <file>icones/rectangle.png</file>
                     <file>icones/drag.png</file>
                     <file>icones/cursor.png</file>
                     <file>icones/pointer.png</file>
                     <file>icones/catalogue.png</file>
                     <file>icones/add.png</file>
                     <file>icones/remove.png</file>
                     <file>icones/chart.png</file>
                     <file>icones/allEvents.png</file>
                     <file>icones/trash.png</file>
                     <file>icones/database.png</file>
                     <file>icones/save.png</file>
                     <file>icones/discard.png</file>
+                    <file>icones/Simple_icon_time.svg</file>
                 </qresource>
             </RCC>

gui/src/SqpApplication.cpp +1 0

             #include "SqpApplication.h"
             #include <Actions/ActionsGuiController.h>
             #include <Catalogue/CatalogueController.h>
             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
             #include <DragAndDrop/DragDropGuiController.h>
             #include <Network/NetworkController.h>
             #include <QThread>
             #include <Time/TimeController.h>
             #include <Variable/VariableController2.h>
             #include <Variable/VariableModel2.h>
             #include <Visualization/VisualizationController.h>
             Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
             class SqpApplication::SqpApplicationPrivate
             {
             public:
                 SqpApplicationPrivate()
                         : m_VariableController { std::make_shared<VariableController2>() }
                         , m_PlotInterractionMode(SqpApplication::PlotsInteractionMode::None)
                         , m_PlotCursorMode(SqpApplication::PlotsCursorMode::NoCursor)
                 {
                     // /////////////////////////////// //
                     // Connections between controllers //
                     // /////////////////////////////// //
                     // VariableController <-> DataSourceController
                     connect(&m_DataSourceController, &DataSourceController::createVariable,
                         [](const QString& variableName, const QVariantHash& variableMetadata,
                             std::shared_ptr<IDataProvider> variableProvider) {
                             sqpApp->variableController().createVariable(variableName, variableMetadata,
                                 variableProvider, sqpApp->timeController().dateTime());
                         });
                     // VariableController <-> VisualizationController
                     //        connect(m_VariableController.get(),
                     //                SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
                     //                m_VisualizationController.get(),
                     //                SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
                     //                Qt::DirectConnection);
                     //        connect(m_VariableController.get(),
                     //                SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)),
                     //                m_VisualizationController.get(),
                     //                SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)));
                     m_DataSourceController.moveToThread(&m_DataSourceControllerThread);
                     m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
                     m_NetworkController.moveToThread(&m_NetworkControllerThread);
                     m_NetworkControllerThread.setObjectName("NetworkControllerThread");
                     m_VisualizationController.moveToThread(&m_VisualizationControllerThread);
                     m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
                     // Additionnal init
                     // m_VariableController->setTimeController(m_TimeController.get());
                 }
                 virtual ~SqpApplicationPrivate()
                 {
                     m_DataSourceControllerThread.quit();
                     m_DataSourceControllerThread.wait();
                     m_NetworkControllerThread.quit();
                     m_NetworkControllerThread.wait();
                     m_VisualizationControllerThread.quit();
                     m_VisualizationControllerThread.wait();
                 }
                 DataSourceController m_DataSourceController;
                 std::shared_ptr<VariableController2> m_VariableController;
                 TimeController m_TimeController;
                 NetworkController m_NetworkController;
                 VisualizationController m_VisualizationController;
                 CatalogueController m_CatalogueController;
                 QThread m_DataSourceControllerThread;
                 QThread m_NetworkControllerThread;
                 QThread m_VisualizationControllerThread;
                 DragDropGuiController m_DragDropGuiController;
                 ActionsGuiController m_ActionsGuiController;
                 SqpApplication::PlotsInteractionMode m_PlotInterractionMode;
                 SqpApplication::PlotsCursorMode m_PlotCursorMode;
             };
             SqpApplication::SqpApplication(int& argc, char** argv)
                     : QApplication { argc, argv }, impl { spimpl::make_unique_impl<SqpApplicationPrivate>() }
             {
+                this->setStyle(new MyProxyStyle(this->style()));
                 qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread();
                 QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
                 connect(&impl->m_DataSourceControllerThread, &QThread::started, &impl->m_DataSourceController,
                     &DataSourceController::initialize);
                 connect(&impl->m_DataSourceControllerThread, &QThread::finished, &impl->m_DataSourceController,
                     &DataSourceController::finalize);
                 connect(&impl->m_NetworkControllerThread, &QThread::started, &impl->m_NetworkController,
                     &NetworkController::initialize);
                 connect(&impl->m_NetworkControllerThread, &QThread::finished, &impl->m_NetworkController,
                     &NetworkController::finalize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::started,
                     &impl->m_VisualizationController, &VisualizationController::initialize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
                     &impl->m_VisualizationController, &VisualizationController::finalize);
                 impl->m_DataSourceControllerThread.start();
                 impl->m_NetworkControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
                 // impl->m_CatalogueController.initialize();
             }
             SqpApplication::~SqpApplication() {}
             void SqpApplication::initialize() {}
             DataSourceController& SqpApplication::dataSourceController() noexcept
             {
                 return impl->m_DataSourceController;
             }
             NetworkController& SqpApplication::networkController() noexcept
             {
                 return impl->m_NetworkController;
             }
             TimeController& SqpApplication::timeController() noexcept
             {
                 return impl->m_TimeController;
             }
             VariableController2& SqpApplication::variableController() noexcept
             {
                 return *impl->m_VariableController;
             }
             std::shared_ptr<VariableController2> SqpApplication::variableControllerOwner() noexcept
             {
                 return impl->m_VariableController;
             }
             // VariableModel2 &SqpApplication::variableModel() noexcept
             //{
             //    return impl->m_VariableModel;
             //}
             VisualizationController& SqpApplication::visualizationController() noexcept
             {
                 return impl->m_VisualizationController;
             }
             CatalogueController& SqpApplication::catalogueController() noexcept
             {
                 return impl->m_CatalogueController;
             }
             DragDropGuiController& SqpApplication::dragDropGuiController() noexcept
             {
                 return impl->m_DragDropGuiController;
             }
             ActionsGuiController& SqpApplication::actionsGuiController() noexcept
             {
                 return impl->m_ActionsGuiController;
             }
             SqpApplication::PlotsInteractionMode SqpApplication::plotsInteractionMode() const
             {
                 return impl->m_PlotInterractionMode;
             }
             void SqpApplication::setPlotsInteractionMode(SqpApplication::PlotsInteractionMode mode)
             {
                 impl->m_PlotInterractionMode = mode;
             }
             SqpApplication::PlotsCursorMode SqpApplication::plotsCursorMode() const
             {
                 return impl->m_PlotCursorMode;
             }
             void SqpApplication::setPlotsCursorMode(SqpApplication::PlotsCursorMode mode)
             {
                 impl->m_PlotCursorMode = mode;
             }

gui/src/TimeWidget/TimeWidget.cpp +19 -17

             #include "TimeWidget/TimeWidget.h"
             #include "ui_TimeWidget.h"
             #include <Common/DateUtils.h>
             #include <Common/MimeTypesDef.h>
             #include <DragAndDrop/DragDropGuiController.h>
             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <QDrag>
             #include <QDragEnterEvent>
             #include <QDropEvent>
             #include <QMimeData>
             #include <QStyle>
-            struct TimeWidget::TimeWidgetPrivate {
+            struct TimeWidget::TimeWidgetPrivate
+            {
                 explicit TimeWidgetPrivate() {}
                 QPoint m_DragStartPosition;
             };
             TimeWidget::TimeWidget(QWidget* parent)
-                    : QWidget{parent},
+                    : QWidget { parent }
-                      ui{new Ui::TimeWidget},
+                    , ui { new Ui::TimeWidget }
-                      impl{spimpl::make_unique_impl<TimeWidgetPrivate>()}
+                    , impl { spimpl::make_unique_impl<TimeWidgetPrivate>() }
             {
                 ui->setupUi(this);
-                ui->applyToolButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_DialogApplyButton));
                 // Connection
                 connect(ui->startDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
                     &TimeWidget::onTimeUpdateRequested);
                 connect(ui->endDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
                     &TimeWidget::onTimeUpdateRequested);
-                connect(ui->applyToolButton, &QToolButton::clicked, &sqpApp->timeController(),
-                        &TimeController::onTimeNotify);
                 // Initialisation
                 auto endDateTime = QDateTime::currentDateTimeUtc();
                 auto startDateTime = endDateTime.addSecs(-3600); // one hour before
                 ui->startDateTimeEdit->setDateTime(startDateTime);
                 ui->endDateTimeEdit->setDateTime(endDateTime);
                 auto dateTime = DateTimeRange { DateUtils::secondsSinceEpoch(startDateTime),
                     DateUtils::secondsSinceEpoch(endDateTime) };
                 sqpApp->timeController().setDateTimeRange(dateTime);
             }
             TimeWidget::~TimeWidget()
             {
                 delete ui;
             }
             void TimeWidget::setTimeRange(DateTimeRange time)
             {
                 auto startDateTime = DateUtils::dateTime(time.m_TStart);
                 auto endDateTime = DateUtils::dateTime(time.m_TEnd);
                 ui->startDateTimeEdit->setDateTime(startDateTime);
                 ui->endDateTimeEdit->setDateTime(endDateTime);
             }
             DateTimeRange TimeWidget::timeRange() const
             {
                 return DateTimeRange { DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
                     DateUtils::secondsSinceEpoch(ui->endDateTimeEdit->dateTime()) };
             }
             void TimeWidget::onTimeUpdateRequested()
             {
                 auto dateTime = timeRange();
                 emit timeUpdated(std::move(dateTime));
                 sqpApp->timeController().setDateTimeRange(dateTime);
             }
             void TimeWidget::dragEnterEvent(QDragEnterEvent* event)
             {
-                if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
+                if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE))
+                {
                     event->acceptProposedAction();
                     setStyleSheet("QDateTimeEdit{background-color: #BBD5EE; border:2px solid #2A7FD4}");
                 }
-                else {
+                else
+                {
                     event->ignore();
                 }
             }
             void TimeWidget::dragLeaveEvent(QDragLeaveEvent* event)
             {
                 setStyleSheet(QString {});
             }
             void TimeWidget::dropEvent(QDropEvent* event)
             {
-                if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE)) {
+                if (event->mimeData()->hasFormat(MIME_TYPE_TIME_RANGE))
+                {
                     auto mimeData = event->mimeData()->data(MIME_TYPE_TIME_RANGE);
                     auto timeRange = TimeController::timeRangeForMimeData(mimeData);
                     setTimeRange(timeRange);
                 }
-                else {
+                else
+                {
                     event->ignore();
                 }
                 setStyleSheet(QString {});
             }
             void TimeWidget::mousePressEvent(QMouseEvent* event)
             {
-                if (event->button() == Qt::LeftButton) {
+                if (event->button() == Qt::LeftButton)
+                {
                     impl->m_DragStartPosition = event->pos();
                 }
                 QWidget::mousePressEvent(event);
             }
             void TimeWidget::mouseMoveEvent(QMouseEvent* event)
             {
-                if (!(event->buttons() & Qt::LeftButton)) {
+                if (!(event->buttons() & Qt::LeftButton))
+                {
                     return;
                 }
                 if ((event->pos() - impl->m_DragStartPosition).manhattanLength()
-                    < QApplication::startDragDistance()) {
+                    < QApplication::startDragDistance())
+                {
                     return;
                 }
                 // Note: The management of the drag object is done by Qt
                 auto drag = new QDrag { this };
                 auto mimeData = new QMimeData;
                 auto timeData = TimeController::mimeDataForTimeRange(timeRange());
                 mimeData->setData(MIME_TYPE_TIME_RANGE, timeData);
                 drag->setMimeData(mimeData);
                 auto pixmap = QPixmap { ":/icones/time.png" };
                 drag->setPixmap(pixmap.scaledToWidth(22));
                 sqpApp->dragDropGuiController().resetDragAndDrop();
                 // Note: The exec() is blocking on windows but not on linux and macOS
                 drag->exec(Qt::MoveAction | Qt::CopyAction);
                 QWidget::mouseMoveEvent(event);
             }

gui/ui/TimeWidget/TimeWidget.ui 0 -7

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>TimeWidget</class>
              <widget class="QWidget" name="TimeWidget">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>716</width>
                 <height>48</height>
                </rect>
               </property>
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="acceptDrops">
                <bool>true</bool>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <property name="styleSheet">
                <string notr="true">b</string>
               </property>
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                <item>
                 <widget class="QLabel" name="label">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="text">
                   <string>TStart :</string>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QDateTimeEdit" name="startDateTimeEdit">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="displayFormat">
                   <string>dd/MM/yyyy HH:mm:ss:zzz</string>
                  </property>
                  <property name="calendarPopup">
                   <bool>true</bool>
                  </property>
                  <property name="timeSpec">
                   <enum>Qt::UTC</enum>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QLabel" name="label_2">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="text">
                   <string>TEnd :</string>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QDateTimeEdit" name="endDateTimeEdit">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="displayFormat">
                   <string>dd/MM/yyyy HH:mm:ss:zzz</string>
                  </property>
                  <property name="calendarPopup">
                   <bool>true</bool>
                  </property>
                  <property name="timeSpec">
                   <enum>Qt::UTC</enum>
                  </property>
                 </widget>
                </item>
-               <item>
-                <widget class="QToolButton" name="applyToolButton">
-                 <property name="text">
-                  <string>...</string>
-                 </property>
-                </widget>
-               </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

General Comments 0

Write
Preview

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

No TODOs yet

	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