Commit de0a53d6 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'hotfix/1.7.1' into develop

parents ce22bf71 17989ebe
# ChangeLog
## version 1.7.1 - 2019-01-24
- add isatty method in python redirector
## version 1.7.0 - 2019-01-24
- add clear method in factory
- add option to replace plugin in factory
......
......@@ -24,7 +24,7 @@ project(dtk)
set(dtk_VERSION_MAJOR 1)
set(dtk_VERSION_MINOR 7)
set(dtk_VERSION_PATCH 0)
set(dtk_VERSION_PATCH 1)
set(dtk_VERSION
${dtk_VERSION_MAJOR}.${dtk_VERSION_MINOR}.${dtk_VERSION_PATCH})
......
......@@ -262,20 +262,20 @@ void dtkFinderSideView::populate(void)
QTreeWidgetItem *item21 = new QTreeWidgetItem(item2, QStringList() << "Desktop");
item21->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
// item21->setData(0, Qt::FontRole, itemFont);
item21->setData(0, Qt::UserRole, QStandardPaths::displayName(QStandardPaths::DesktopLocation));
item21->setIcon(0, provider.icon(QFileInfo(QStandardPaths::displayName(QStandardPaths::DesktopLocation))));
item21->setData(0, Qt::UserRole, QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
item21->setIcon(0, provider.icon(QFileInfo(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation))));
QTreeWidgetItem *item22 = new QTreeWidgetItem(item2, QStringList() << "Home");
item22->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
// item22->setData(0, Qt::FontRole, itemFont);
item22->setData(0, Qt::UserRole, QStandardPaths::displayName(QStandardPaths::HomeLocation));
item22->setIcon(0, provider.icon(QFileInfo(QStandardPaths::displayName(QStandardPaths::HomeLocation))));
item22->setData(0, Qt::UserRole, QStandardPaths::writableLocation(QStandardPaths::HomeLocation));
item22->setIcon(0, provider.icon(QFileInfo(QStandardPaths::writableLocation(QStandardPaths::HomeLocation))));
QTreeWidgetItem *item23 = new QTreeWidgetItem(item2, QStringList() << "Documents");
item23->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
// item23->setData(0, Qt::FontRole, itemFont);
item23->setData(0, Qt::UserRole, QStandardPaths::displayName(QStandardPaths::DocumentsLocation));
item23->setIcon(0, provider.icon(QFileInfo(QStandardPaths::displayName(QStandardPaths::DocumentsLocation))));
item23->setData(0, Qt::UserRole, QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
item23->setIcon(0, provider.icon(QFileInfo(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation))));
d->items << item21 << item22 << item23;
......
......@@ -37,6 +37,8 @@ static const QString dtkScriptInterpreterPythonRedirector_declare =
" self.data+= stuff\n"
" def flush(self):\n"
" pass\n"
" def isatty(self):\n"
" return False\n"
" def reset(self):\n"
" self.data = ''\n";
......
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