Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit 73b14511 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas
Browse files

Merge branch 'release/2.24.1' into master

parents a3cf5055 c1b26acb
Pipeline #186326 failed with stage
in 0 seconds
# ChangeLog
## version 2.24.1 - 2020-11-13
- Fix regression introduced in 2.24.0 for dtkWidgetsParameterDirBrowse
## version 2.24.0 - 2020-10-01
- display doc and path in the tooltip, according if both, either one or none is available
- save button can be defined as read-only
......
......@@ -24,7 +24,7 @@ project(dtkWidgets)
set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 24)
set(${PROJECT_NAME}_VERSION_PATCH 0)
set(${PROJECT_NAME}_VERSION_PATCH 1)
set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
......@@ -46,6 +46,12 @@
"doc": "It's a button",
"type": "dtk::d_bool"
},
"dir_browse": {
"label": "Open a dir",
"doc": "Open a directory.",
"path": "..",
"type": "dtk::d_path"
},
"file_browse": {
"label": "Open a file",
"doc": "Open a VTK file.",
......@@ -152,7 +158,7 @@
},
"file_save_ro": {
"label": "Save a file (Read Only)",
"doc": "",
"doc": "Save a VTK file.",
"path": ".",
"filters": [
"VTK (*.vtk)",
......
......@@ -156,6 +156,13 @@
"widget_read_only": false
}
},
{
"parameter": {
"widget": "dtkWidgetsParameterDirBrowse",
"uid": "dir_browse",
"advanced": false
}
},
{
"parameter": {
"widget": "dtkWidgetsParameterFileBrowse",
......
......@@ -11,7 +11,6 @@ build:
requirements:
build:
- cmake >=3.14.0
- binutils_impl_linux-64<2.31.0 # [linux]
- {{ compiler('cxx') }}
- {{ cdt('xorg-x11-proto-devel') }} # [linux]
- {{ cdt('mesa-libgl-devel') }} # [linux]
......
......@@ -109,7 +109,7 @@ bool dtkWidgetsParameterBrowse::connect(dtkCoreParameter *p)
QObject::connect(d->push_button, &QPushButton::clicked, [=] ()
{
QString v = QFileDialog::getOpenFileName(this, "Open file", m_parameter->dirName(), m_parameter->filters().join(";;"));
QString v = this->browse();
m_parameter->shareValue(QVariant::fromValue(v));
});
......
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