Commit ba9b0229 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'hotfix/2.11.1' into develop

parents 95ffa696 8a45e18d
# ChangeLog # ChangeLog
## version 2.11.1 - 2019-05-21
- menubar generator use dtk-core readParameters static method
## version 2.11.0 - 2019-05-21 ## version 2.11.0 - 2019-05-21
- menubar generator use dtk-core parameter reader - menubar generator use dtk-core parameter reader
- add python converter for parameters new json file formats - add python converter for parameters new json file formats
...@@ -30,7 +32,7 @@ ...@@ -30,7 +32,7 @@
## version 2.6.3 - 2019-02-22 ## version 2.6.3 - 2019-02-22
- fix resizing of dtkWidgetsOverlayPane - fix resizing of dtkWidgetsOverlayPane
- do not use hard coded color in dtkWidgetsHUDItem QPainter - do not use hard coded color in dtkWidgetsHUDItem QPainter
## version 2.6.2 - 20019-02-20 ## version 2.6.2 - 2019-02-20
- add the possibility to have a toogle button (with tooltip) to dtkWidgetsOverlayPane - add the possibility to have a toogle button (with tooltip) to dtkWidgetsOverlayPane
- add a dtkWidgetsOverlayPaneManager to have multiple dtkWidgetsOverlayPane with toogle buttons - add a dtkWidgetsOverlayPaneManager to have multiple dtkWidgetsOverlayPane with toogle buttons
## version 2.6.0 - 2019-02-14 ## version 2.6.0 - 2019-02-14
......
...@@ -24,7 +24,7 @@ project(dtkWidgets) ...@@ -24,7 +24,7 @@ project(dtkWidgets)
set(${PROJECT_NAME}_VERSION_MAJOR 2) set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 11) set(${PROJECT_NAME}_VERSION_MINOR 11)
set(${PROJECT_NAME}_VERSION_PATCH 0) set(${PROJECT_NAME}_VERSION_PATCH 1)
set(${PROJECT_NAME}_VERSION set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}) ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
...@@ -17,7 +17,7 @@ channels: ...@@ -17,7 +17,7 @@ channels:
- dtk - dtk
dependencies: dependencies:
- qt >=5.9.0 - qt >=5.9.0
- dtk-core >=2.5.0 - dtk-core >=2.5.1
- dtk-fonts >=2.1.0 - dtk-fonts >=2.1.0
- dtk-log - dtk-log
- dtk-themes - dtk-themes
......
...@@ -38,14 +38,14 @@ requirements: ...@@ -38,14 +38,14 @@ requirements:
- {{ cdt('libxxf86vm') }} # [linux] - {{ cdt('libxxf86vm') }} # [linux]
host: host:
- qt >=5.9.0 - qt >=5.9.0
- dtk-core >=2.5.0 - dtk-core >=2.5.1
- dtk-fonts >=2.1.0 - dtk-fonts >=2.1.0
- dtk-log - dtk-log
- dtk-themes - dtk-themes
run: run:
- qt >=5.9.0 - qt >=5.9.0
- dtk-core >=2.5.0 - dtk-core >=2.5.1
- dtk-fonts >=2.1.0 - dtk-fonts >=2.1.0
- dtk-log - dtk-log
- dtk-themes - dtk-themes
......
...@@ -85,6 +85,10 @@ int dtkWidgetsOverlayPane::width(void) ...@@ -85,6 +85,10 @@ int dtkWidgetsOverlayPane::width(void)
void dtkWidgetsOverlayPane::setBound(int bound) void dtkWidgetsOverlayPane::setBound(int bound)
{ {
d->bound = bound; d->bound = bound;
if(this->width() > d->bound) {
this->setFixedWidth(d->bound);
}
} }
void dtkWidgetsOverlayPane::setWidth(int width) void dtkWidgetsOverlayPane::setWidth(int width)
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "dtkWidgetsMenuBar.h" #include "dtkWidgetsMenuBar.h"
#include <dtkCore/dtkCoreParameter> #include <dtkCore/dtkCoreParameter>
#include <dtkCore/dtkCoreParameterReader>
#include <dtkFonts/dtkFontAwesome> #include <dtkFonts/dtkFontAwesome>
...@@ -90,14 +89,13 @@ dtkWidgetsParameterMenuBarGenerator::dtkWidgetsParameterMenuBarGenerator(const Q ...@@ -90,14 +89,13 @@ dtkWidgetsParameterMenuBarGenerator::dtkWidgetsParameterMenuBarGenerator(const Q
{ {
QFile menu_file(menu_file_path); QFile menu_file(menu_file_path);
dtkCoreParameterReader param_reader; d->parameters = dtk::core::readParameters(definition_file_path);
param_reader.setJsonFile(definition_file_path);
if (!param_reader.read()) { if (d->parameters.count() == 0) {
qWarning() << Q_FUNC_INFO << "The file" << definition_file_path << "could not be read."; qWarning() << Q_FUNC_INFO << "The file" << definition_file_path << "could not be read: no parameter found";
return; return;
} }
d->parameters = param_reader.parameters();
if (menu_file.open(QFile::ReadOnly)) { if (menu_file.open(QFile::ReadOnly)) {
QJsonParseError menu_error; QJsonParseError menu_error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment