Olena-patches February 2013

olena-patches@lrde.epita.fr

9 participants
139 discussions

0319bef Good page widget advancement : customize model to see in the vieww which picture is selected and optimize memory and speed with new custom model.

by Antoine Froger

--- GScribo/GScribo.pro | 6 ++- GScribo/GScribo.pro.user | 32 ++++++++++---------- GScribo/PagesWidget/listmodel.cpp | 40 ++++++++++++------------ GScribo/PagesWidget/listmodel.h | 27 +++++++++++++---- GScribo/PagesWidget/pagesdelegate.cpp | 20 ++++++++++++ GScribo/PagesWidget/pagesdelegate.h | 18 +++++++++++ GScribo/PagesWidget/pageswidget.cpp | 31 ++++--------------- GScribo/PagesWidget/pageswidget.h | 32 +++++++++++++++++--- GScribo/Rendering/polygonitem.cpp | 1 - GScribo/Rendering/scene.cpp | 44 +++++++++++++++------------ GScribo/Rendering/scene.h | 12 +++++-- GScribo/Rendering/selection.cpp | 2 +- GScribo/XmlWidget/regionwidget.cpp | 5 +++ GScribo/XmlWidget/selectionproxy.h | 5 +-- GScribo/XmlWidget/xmlwidget.cpp | 1 + GScribo/XmlWidget/xmlwidget.h | 2 +- GScribo/mainwindow.cpp | 39 ++++++++++++------------ GScribo/mainwindow.h | 2 +- GScribo/xml.cpp | 53 +++++++++++++++++---------------- 19 files changed, 220 insertions(+), 152 deletions(-) create mode 100644 GScribo/PagesWidget/pagesdelegate.cpp create mode 100644 GScribo/PagesWidget/pagesdelegate.h create mode 100644 GScribo/XmlWidget/regionwidget.cpp diff --git a/GScribo/GScribo.pro b/GScribo/GScribo.pro index c02e8c9..a7f730e 100644 --- a/GScribo/GScribo.pro +++ b/GScribo/GScribo.pro @@ -28,7 +28,8 @@ SOURCES += main.cpp \ XmlWidget/xmlmodel.cpp \ XmlWidget/xmlitem.cpp \ XmlWidget/xmlattributes.cpp \ - XmlWidget/attributemodel.cpp + XmlWidget/attributemodel.cpp \ + PagesWidget/pagesdelegate.cpp HEADERS += mainwindow.h \ variantpointer.h \ configs.h \ @@ -52,7 +53,8 @@ HEADERS += mainwindow.h \ XmlWidget/xmlattributes.h \ XmlWidget/selectionproxy.h \ XmlWidget/xmldelegate.h \ - XmlWidget/attributemodel.h + XmlWidget/attributemodel.h \ + PagesWidget/pagesdelegate.h FORMS += mainwindow.ui \ Preferences/preferencesdialog.ui \ Preferences/ocroptions.ui \ diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index c386cec..77c6b9f 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -76,7 +76,7 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-e9nHbn7LYK,guid=e39a93d8f03a16fd6bc992a3000b7303</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-8HhQV0Db3w,guid=820a1dac27c5f8287b84357100000031</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> @@ -87,22 +87,22 @@ <value type="QString">LANG=fr_FR.UTF-8</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=8057</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-EVOSGL8004/agent.8004</value> + <value type="QString">SSH_AGENT_PID=2149</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vKpzBP2096/agent.2096</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmD7T7RW</value> + <value type="QString">WINDOWID=16777252</value> + <value type="QString">WINDOWPATH=7</value> + <value type="QString">XAUTHORITY=/tmp/.gdmYQPASW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1360136006.519710-1569843383</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1360245257.460868-2058632410</value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> <value type="QString">XTERM_VERSION=XTerm(261)</value> @@ -125,7 +125,7 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-e9nHbn7LYK,guid=e39a93d8f03a16fd6bc992a3000b7303</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-8HhQV0Db3w,guid=820a1dac27c5f8287b84357100000031</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> @@ -136,22 +136,22 @@ <value type="QString">LANG=fr_FR.UTF-8</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=8057</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-EVOSGL8004/agent.8004</value> + <value type="QString">SSH_AGENT_PID=2149</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vKpzBP2096/agent.2096</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmD7T7RW</value> + <value type="QString">WINDOWID=16777252</value> + <value type="QString">WINDOWPATH=7</value> + <value type="QString">XAUTHORITY=/tmp/.gdmYQPASW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1360136006.519710-1569843383</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1360245257.460868-2058632410</value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> <value type="QString">XTERM_VERSION=XTerm(261)</value> diff --git a/GScribo/PagesWidget/listmodel.cpp b/GScribo/PagesWidget/listmodel.cpp index 0a57f97..35a86e4 100644 --- a/GScribo/PagesWidget/listmodel.cpp +++ b/GScribo/PagesWidget/listmodel.cpp @@ -3,16 +3,7 @@ ListModel::ListModel(QObject *parent): QAbstractListModel(parent) { -} - -QStringList ListModel::filenames() const -{ - return paths; -} - -int ListModel::rowCount(const QModelIndex&) const -{ - return pixmaps.count(); + currentRow_ = -1; } QVariant ListModel::data(const QModelIndex& index, int role) const @@ -21,27 +12,25 @@ QVariant ListModel::data(const QModelIndex& index, int role) const return QVariant(); if(role == Qt::DecorationRole) - return QIcon(pixmaps.value(index.row()).scaled(QSize(200, 200), Qt::KeepAspectRatio, Qt::SmoothTransformation)); + return pixmaps_[index.row()]; - // Store the original pixmap in a custom place. if(role == Qt::UserRole) - return pixmaps[index.row()]; + return filenames_[index.row()]; - // Store the path of the pixmap in an other custom place. if(role == Qt::UserRole+1) - return paths[index.row()]; + return currentRow_; return QVariant(); } -void ListModel::addPixmap(const QString& filename, const QPixmap& pixmap) +void ListModel::addPicture(const QString& filename, const QPixmap& pixmap) { int row = rowCount(); beginInsertRows(QModelIndex(), row, row); - pixmaps.insert(row, pixmap); - paths.insert(row, filename); + pixmaps_.insert(row, pixmap.scaled(QSize(200, 200), Qt::KeepAspectRatio, Qt::SmoothTransformation)); + filenames_.insert(row, filename); endInsertRows(); } @@ -52,8 +41,19 @@ void ListModel::removePixmap(const QModelIndex &parent) beginRemoveRows(parent, row, row); - pixmaps.removeAt(row); - paths.removeAt(row); + pixmaps_.removeAt(row); + filenames_.removeAt(row); endRemoveRows(); } + +void ListModel::setCurrentRow(int currentRow) +{ + int precRow = currentRow_; + currentRow_ = currentRow; + + QModelIndex i = index(precRow, 0, QModelIndex()); + emit dataChanged(i, i); + i = index(currentRow_, 0, QModelIndex()); + emit dataChanged(i, i); +} diff --git a/GScribo/PagesWidget/listmodel.h b/GScribo/PagesWidget/listmodel.h index dac1a2d..46bc04e 100644 --- a/GScribo/PagesWidget/listmodel.h +++ b/GScribo/PagesWidget/listmodel.h @@ -12,17 +12,32 @@ class ListModel: public: explicit ListModel(QObject *parent = 0); - QStringList filenames() const; - int rowCount(const QModelIndex& parent = QModelIndex()) const; + + inline QStringList filenames() const; + inline int rowCount(const QModelIndex& parent = QModelIndex()) const; + + inline int currentRow() const; + void setCurrentRow(int currentRow); + QVariant data(const QModelIndex& index, int role = Qt::DecorationRole) const; - void addPixmap(const QString& filename, const QPixmap& pixmap); + void addPicture(const QString& filename, const QPixmap& pixmap); private: - QList<QPixmap> pixmaps; - QStringList paths; + QStringList filenames_; + QList<QPixmap> pixmaps_; + int currentRow_; public slots: - void removePixmap(const QModelIndex &parent); + void removePixmap(const QModelIndex& parent); }; +inline QStringList ListModel::filenames() const +{ return filenames_; } + +inline int ListModel::rowCount(const QModelIndex&) const +{ return filenames_.count(); } + +inline int ListModel::currentRow() const +{ return currentRow_; } + #endif // LISTMODEL_H diff --git a/GScribo/PagesWidget/pagesdelegate.cpp b/GScribo/PagesWidget/pagesdelegate.cpp new file mode 100644 index 0000000..19a34c2 --- /dev/null +++ b/GScribo/PagesWidget/pagesdelegate.cpp @@ -0,0 +1,20 @@ +#include "pagesdelegate.h" + +PagesDelegate::PagesDelegate(QObject *parent) : + QStyledItemDelegate(parent) +{ + pen_.setColor(QColor::fromRgb(255, 69, 0, 255)); + pen_.setWidth(2); +} + +void PagesDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const +{ + QStyledItemDelegate::paint(painter, option, index); + + if(index.row() == index.data(Qt::UserRole+1).toInt()) + { + painter->setPen(pen_); + painter->drawRect(option.rect); + painter->fillRect(option.rect, QColor::fromRgb(255, 69, 0, 60)); + } +} diff --git a/GScribo/PagesWidget/pagesdelegate.h b/GScribo/PagesWidget/pagesdelegate.h new file mode 100644 index 0000000..ff422ca --- /dev/null +++ b/GScribo/PagesWidget/pagesdelegate.h @@ -0,0 +1,18 @@ +#ifndef PAGESDELEGATE_H +#define PAGESDELEGATE_H + +#include <QStyledItemDelegate> +#include <QPainter> + +class PagesDelegate : + public QStyledItemDelegate +{ + public: + explicit PagesDelegate(QObject *parent = 0); + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + + private: + QPen pen_; +}; + +#endif // PAGESDELEGATE_H diff --git a/GScribo/PagesWidget/pageswidget.cpp b/GScribo/PagesWidget/pageswidget.cpp index e05d38a..b7d2ac8 100644 --- a/GScribo/PagesWidget/pageswidget.cpp +++ b/GScribo/PagesWidget/pageswidget.cpp @@ -5,35 +5,16 @@ PagesWidget::PagesWidget(QWidget *parent): { setUniformItemSizes(true); setSelectionMode(QAbstractItemView::ExtendedSelection); - setSelectionRectVisible(false); setViewMode(QListView::IconMode); setIconSize(QSize(200, 200)); - setFlow(QListView::TopToBottom); setMovement(QListView::Static); + setResizeMode(QListView::Adjust); setSpacing(10); - setWrapping(false); - setModel(&model); - connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(getPixmap(QModelIndex))); -} + setModel(&model_); + setItemDelegate(new PagesDelegate()); -QStringList PagesWidget::filenames() const -{ - return model.filenames(); -} - -void PagesWidget::getPixmap(const QModelIndex& index) -{ - // Get the pixmap and the path of the icon to send it to the scene and draw it. - QPixmap pixmap = index.data(Qt::UserRole).value<QPixmap>(); - QString filename = index.data(Qt::UserRole+1).toString(); - - emit sceneChanged(filename, pixmap); -} - -void PagesWidget::addPixmap(const QString& filename, const QPixmap& pixmap) -{ - model.addPixmap(filename, pixmap); + connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(getPicture(QModelIndex))); } void PagesWidget::removeSelection() @@ -47,10 +28,10 @@ void PagesWidget::removeSelection() // From the highest row value to the smallest to be sure to remove the good index. for(int i = indexes.count()-1; i > -1; i--) - model.removePixmap(indexes[i]); + model_.removePixmap(indexes[i]); // Draw new pixmap on the scene. - getPixmap(model.index(indexes[0].row())); + getPicture(model_.index(indexes[0].row())); clearSelection(); } } diff --git a/GScribo/PagesWidget/pageswidget.h b/GScribo/PagesWidget/pageswidget.h index 60ea9b6..3e2c443 100644 --- a/GScribo/PagesWidget/pageswidget.h +++ b/GScribo/PagesWidget/pageswidget.h @@ -4,6 +4,7 @@ #include <QListView> #include <QShortcut> +#include "pagesdelegate.h" #include "listmodel.h" class PagesWidget: @@ -13,18 +14,39 @@ class PagesWidget: public: explicit PagesWidget(QWidget *parent = 0); - void addPixmap(const QString& filename, const QPixmap& pixmap); - QStringList filenames() const; + + inline QStringList filenames() const; + inline int currentRow() const; + inline void setCurrentRow(int currentRow); + + inline void addPicture(const QString& filename, const QPixmap& pixmap); private: - ListModel model; + ListModel model_; public slots: - void getPixmap(const QModelIndex &index); void removeSelection(); + private slots: + inline void getPicture(const QModelIndex& index); + signals: - void sceneChanged(const QString& filename, const QPixmap& pixmap); + void imageSelectionned(const QString& filename); }; +inline QStringList PagesWidget::filenames() const +{ return model_.filenames(); } + +inline int PagesWidget::currentRow() const +{ return model_.currentRow(); } + +inline void PagesWidget::setCurrentRow(int currentRow) +{ model_.setCurrentRow(currentRow); } + +void PagesWidget::getPicture(const QModelIndex& index) +{ QString filename = index.data(Qt::UserRole).toString(); emit imageSelectionned(filename); } + +inline void PagesWidget::addPicture(const QString& filename, const QPixmap& pixmap) +{ model_.addPicture(filename, pixmap); } + #endif // PAGESWIDGET_H diff --git a/GScribo/Rendering/polygonitem.cpp b/GScribo/Rendering/polygonitem.cpp index ba35395..7c84d0c 100644 --- a/GScribo/Rendering/polygonitem.cpp +++ b/GScribo/Rendering/polygonitem.cpp @@ -71,7 +71,6 @@ void PolygonItem::setSelected(const QRectF& rect, bool clic) if(region_ == GraphicRegion::Line) static_cast<PolygonItem *>(parentItem())->xmlItem()->select(); } - else { // Unselect graphical and xml item. diff --git a/GScribo/Rendering/scene.cpp b/GScribo/Rendering/scene.cpp index 1572ecb..25a0f15 100644 --- a/GScribo/Rendering/scene.cpp +++ b/GScribo/Rendering/scene.cpp @@ -21,8 +21,8 @@ Scene::Scene(qreal x, qreal y, qreal width, qreal height, QObject *parent): void Scene::init() { isPressing_ = false; - clic_ = false; - item_ = 0; + click_ = false; + rootItem_ = 0; // Disable the scene size adaptation to items rect with a non null rect. setSceneRect(0, 0, 0, 1); @@ -33,10 +33,10 @@ void Scene::init() void Scene::clear() { - if(item_) - delete item_; + if(rootItem_) + delete rootItem_; - item_ = 0; + rootItem_ = 0; } void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event) @@ -44,7 +44,7 @@ void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event) if(event->button() == Qt::LeftButton && !isPressing_) { isPressing_ = true; - clic_ = true; + click_ = true; pressPos_ = event->scenePos(); selection_.show(); @@ -55,7 +55,7 @@ void Scene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { if(isPressing_) { - clic_ = false; + click_ = false; // Adapt if the selection rectangle has a negative size. if(pressPos_.x() < event->scenePos().x()) @@ -77,14 +77,14 @@ void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) isPressing_ = false; // If no selection, store the click position in the selection rectangle. - if(clic_) + if(click_) selection_.setRect(QRectF(QPointF(0, 0), event->scenePos())); // Redraw all items in selection. - if(item_) + if(rootItem_) { emit beginSelection(); - selectItems(selection_.rect(), clic_); + selectItems(selection_.rect(), click_); emit endSelection(); } @@ -99,7 +99,7 @@ void Scene::selectItem(PolygonItem *graphicalItem) PolygonItem *polygonItem; // Unselect all items. - foreach(child, item_->childItems()) + foreach(child, rootItem_->childItems()) { polygonItem = static_cast<PolygonItem *>(child); polygonItem->unselect(); @@ -120,30 +120,34 @@ void Scene::selectItem(PolygonItem *graphicalItem) void Scene::selectItems(const QRectF& rect, bool clic) { QGraphicsItem *child; - foreach(child, item_->childItems()) + foreach(child, rootItem_->childItems()) static_cast<PolygonItem *>(child)->setSelected(rect, clic); } -void Scene::addPolygonItem(QGraphicsItem *item) +void Scene::setRootItem(QGraphicsItem *rootItem) { - // Delete all items in the scene. + // Delete all items. clear(); - item_ = item; - addItem(item); + rootItem_ = rootItem; + addItem(rootItem); } -void Scene::changeScene(const QString& filename, const QPixmap& pixmap, QGraphicsItem *item) +void Scene::changeScene(const QString& filename, QGraphicsItem *rootItem) { backgroundPath_ = filename; - // Delete all items in the scene. + // Delete all items. clear(); + QPixmap pixmap(filename); setSceneRect(pixmap.rect()); setBackgroundBrush(QBrush(pixmap)); // Add new items. - if(item) - addPolygonItem(item); + if(rootItem) + { + rootItem_ = rootItem; + addItem(rootItem); + } } diff --git a/GScribo/Rendering/scene.h b/GScribo/Rendering/scene.h index 0cf964e..a11ff2c 100644 --- a/GScribo/Rendering/scene.h +++ b/GScribo/Rendering/scene.h @@ -20,10 +20,11 @@ class Scene : explicit Scene(qreal x, qreal y, qreal width, qreal height, QObject *parent = 0); inline QString backgroundPath() const; + void setRootItem(QGraphicsItem *graphicalItem); + inline QGraphicsItem *rootItem() const; void clear(); - void addPolygonItem(QGraphicsItem *item); - void changeScene(const QString& filename, const QPixmap& pixmap, QGraphicsItem *item = 0); + void changeScene(const QString& filename, QGraphicsItem *rootItem = 0); void selectItems(const QRectF& rect, bool clic); protected: @@ -34,11 +35,11 @@ class Scene : private: void init(); - QGraphicsItem *item_; + QGraphicsItem *rootItem_; Selection selection_; QPointF pressPos_; bool isPressing_; - bool clic_; + bool click_; QString backgroundPath_; public slots: @@ -52,4 +53,7 @@ class Scene : inline QString Scene::backgroundPath() const { return backgroundPath_; } +inline QGraphicsItem *Scene::rootItem() const +{ return rootItem_; } + #endif // SCENE_H diff --git a/GScribo/Rendering/selection.cpp b/GScribo/Rendering/selection.cpp index 438e92e..dfe187e 100644 --- a/GScribo/Rendering/selection.cpp +++ b/GScribo/Rendering/selection.cpp @@ -24,7 +24,7 @@ void Selection::init() setZValue(INT_MAX); QPen pen; - pen.setStyle(Qt::DashLine); + pen.setStyle(Qt::SolidLine); pen.setCapStyle(Qt::SquareCap); pen.setCosmetic(true); setPen(pen); diff --git a/GScribo/XmlWidget/regionwidget.cpp b/GScribo/XmlWidget/regionwidget.cpp new file mode 100644 index 0000000..70b021f --- /dev/null +++ b/GScribo/XmlWidget/regionwidget.cpp @@ -0,0 +1,5 @@ +nclude "regionwidget.h" + +RegionWidget::RegionWidget() +{ +} diff --git a/GScribo/XmlWidget/selectionproxy.h b/GScribo/XmlWidget/selectionproxy.h index c169dea..32edae4 100644 --- a/GScribo/XmlWidget/selectionproxy.h +++ b/GScribo/XmlWidget/selectionproxy.h @@ -19,10 +19,7 @@ class SelectionProxy : }; inline bool SelectionProxy::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const -{ - QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); - return index.data(filterRole()).toBool(); -} +{ QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); return index.data(filterRole()).toBool(); } inline void SelectionProxy::beginResetModel() { QSortFilterProxyModel::beginResetModel(); } diff --git a/GScribo/XmlWidget/xmlwidget.cpp b/GScribo/XmlWidget/xmlwidget.cpp index 05f69e1..3b0e055 100644 --- a/GScribo/XmlWidget/xmlwidget.cpp +++ b/GScribo/XmlWidget/xmlwidget.cpp @@ -36,6 +36,7 @@ XmlWidget::XmlWidget(QWidget *parent) : void XmlWidget::changeView(XmlItem *rootItem) { + attributesModel_.reset(); model_.load(rootItem); } diff --git a/GScribo/XmlWidget/xmlwidget.h b/GScribo/XmlWidget/xmlwidget.h index 70a3ece..a8063f9 100644 --- a/GScribo/XmlWidget/xmlwidget.h +++ b/GScribo/XmlWidget/xmlwidget.h @@ -52,6 +52,6 @@ inline void XmlWidget::onBeginGraphicalSelection() { selectionProxy_.beginResetModel(); } inline void XmlWidget::onEndGraphicalSelection() -{ selectionProxy_.endResetModel(); property_.reset(); selection_.expandAll(); } +{ selectionProxy_.endResetModel(); attributesModel_.reset(); selection_.expandAll(); } #endif // XMLWIDGET_H diff --git a/GScribo/mainwindow.cpp b/GScribo/mainwindow.cpp index 9dcd31b..13902e4 100644 --- a/GScribo/mainwindow.cpp +++ b/GScribo/mainwindow.cpp @@ -39,8 +39,7 @@ void MainWindow::initPageWidget() { dockPages.setWindowTitle(tr("Pages")); dockPages.setFeatures(QDockWidget::DockWidgetClosable); - dockPages.setMaximumWidth(190); - dockPages.setMinimumWidth(190); + //dockPages.setFixedWidth(190); dockPages.setWidget(&pagesWidget); addDockWidget(Qt::LeftDockWidgetArea, &dockPages); @@ -84,21 +83,19 @@ void MainWindow::initMenuBar() connect(preferences, SIGNAL(triggered()), SLOT(onPreferences())); } -void MainWindow::onFileChanged(const QString &filename, const QPixmap &pixmap) +void MainWindow::onFileChanged(const QString& filename) { // If it's not the current scene. if(scene.backgroundPath() != filename) { QString xmlPath = Xml::getPath(filename); - // Check if the xml file exists to draw data in the scene. - if(QFile(xmlPath).exists()) - { - xml.load(xmlPath); - scene.changeScene(filename, pixmap, xml.graphicItem()); - xmlWidget.changeView(xml.treeItem()); - } - else - scene.changeScene(filename, pixmap); + // Check if the xml file already exists. + if(!QFile(xmlPath).exists()) + xmlPath = QString(); + + xml.load(xmlPath); + scene.changeScene(filename, xml.graphicItem()); + xmlWidget.changeView(xml.treeItem()); } } @@ -113,6 +110,7 @@ void MainWindow::onOpen() int counter = 0; bool isContained; + // Check for an image not already added to the page widget. do { path = paths[counter]; @@ -122,22 +120,23 @@ void MainWindow::onOpen() if(!isContained) { - QPixmap pixmap(path); - pagesWidget.addPixmap(path, pixmap); + onFileChanged(path); + pagesWidget.setCurrentRow(filenames.count()+counter-1); + pagesWidget.addPicture(path, QPixmap(path)); // If more than one file, we store it in the page widget. for(int i = counter; i < paths.count(); i++) { + // Check if the page widget contains the image. if(!filenames.contains(paths[i], Qt::CaseSensitive)) { path = paths[i]; - pixmap.load(path); - pagesWidget.addPixmap(path, pixmap); + pagesWidget.addPicture(path, QPixmap(path)); } } - - onFileChanged(path, pixmap); } + else + onFileChanged(path); } } @@ -162,7 +161,7 @@ void MainWindow::onXmlSaved(const QString& filename) { xml.load(filename); xmlWidget.changeView(xml.treeItem()); - scene.addPolygonItem(xml.graphicItem()); + scene.setRootItem(xml.graphicItem()); } void MainWindow::onPreferences() @@ -174,7 +173,7 @@ void MainWindow::onPreferences() void MainWindow::connectWidgets() { // If double click on a picture of the page widget -> draw it on background scene. - connect(&pagesWidget, SIGNAL(sceneChanged(QString,QPixmap)), this, SLOT(onFileChanged(QString,QPixmap))); + connect(&pagesWidget, SIGNAL(imageSelectionned(QString)), this, SLOT(onFileChanged(QString))); // Connect the scene to the xml widget and vice versa. connect(&scene, SIGNAL(beginSelection()), &xmlWidget, SLOT(onBeginGraphicalSelection())); diff --git a/GScribo/mainwindow.h b/GScribo/mainwindow.h index 92642d1..28132ca 100644 --- a/GScribo/mainwindow.h +++ b/GScribo/mainwindow.h @@ -64,7 +64,7 @@ class MainWindow: void onSegment(); void onXmlSaved(const QString& filename); void onPreferences(); - void onFileChanged(const QString& filename, const QPixmap& pixmap); + void onFileChanged(const QString& filename); }; #endif // MAINWINDOW_H diff --git a/GScribo/xml.cpp b/GScribo/xml.cpp index af59c0a..8a273db 100644 --- a/GScribo/xml.cpp +++ b/GScribo/xml.cpp @@ -16,16 +16,13 @@ static const GraphicRegion::Data itemsData[] = { QColor::fromRgb(0, 204, 255, 90), "ChartRegion", (int)GraphicRegion::Chart, 2 } }; -Xml::Xml(const QString &filename) +Xml::Xml(const QString& filename) { - gItem = 0; - tItem = 0; - path = filename; load(filename); } -QString Xml::getPath(const QString &filename) +QString Xml::getPath(const QString& filename) { // Get instance of the configuration settings. Configs *const conf = Configs::getInstance(); @@ -41,35 +38,39 @@ QString Xml::getPath(const QString &filename) return conf->generalSaveXmlCustomDirPath() + "/" + xmlPath; } -void Xml::load(const QString &filename) +void Xml::load(const QString& filename) { - if(!filename.isEmpty()) + if(filename.isEmpty()) { - // Reset graphic and tree items; - tItem = new XmlItem; - gItem = new QGraphicsPolygonItem; + tItem = 0; + gItem = 0; + return; + } - QFile xmlFile(filename); - xmlFile.open(QIODevice::ReadOnly); + // Reset graphic and tree items; + tItem = new XmlItem; + gItem = new QGraphicsPolygonItem; - // Fill new xml tree. - xml.clear(); - xml.setContent(&xmlFile); + QFile xmlFile(filename); + xmlFile.open(QIODevice::ReadOnly); - xmlFile.close(); + // Fill new xml tree. + xml.clear(); + xml.setContent(&xmlFile); - QDomElement root = xml.documentElement(); - tItem->load(root); + xmlFile.close(); - root = root.firstChild().toElement(); - XmlItem *parentTreeItem = init(root, tItem); + QDomElement root = xml.documentElement(); + tItem->load(root); - // Run through the xml file structure by structure. - root = root.nextSibling().firstChild().toElement(); - processNode(root, itemsData[1], parentTreeItem); - for(int i = 2; i < 10; i++) - processNode(root.nextSiblingElement(itemsData[i].name), itemsData[i], parentTreeItem); - } + root = root.firstChild().toElement(); + XmlItem *parentTreeItem = init(root, tItem); + + // Run through the xml file structure by structure. + root = root.nextSibling().firstChild().toElement(); + processNode(root, itemsData[1], parentTreeItem); + for(int i = 2; i < 10; i++) + processNode(root.nextSiblingElement(itemsData[i].name), itemsData[i], parentTreeItem); } XmlItem *Xml::init(const QDomElement& root, XmlItem *rootTreeItem) -- 1.7.2.5

11 years, 10 months

3705ff9 Good xml tree with selection from scene and from tree. Fixed redondance in pages widget.

by Antoine Froger

--- GScribo/GScribo.pro | 15 +- GScribo/GScribo.pro.user | 1069 +++++++------------------------- GScribo/Rendering/polygonitem.cpp | 16 +- GScribo/Rendering/polygonitem.h | 3 + GScribo/Rendering/scene.cpp | 29 +- GScribo/XmlWidget/attributemodel.cpp | 69 ++ GScribo/XmlWidget/attributemodel.h | 44 ++ GScribo/XmlWidget/attributesdelegate.h | 22 - GScribo/XmlWidget/selectionproxy.h | 9 +- GScribo/XmlWidget/treedelegate.h | 21 - GScribo/XmlWidget/xmlattributes.h | 4 + GScribo/XmlWidget/xmldelegate.h | 29 + GScribo/XmlWidget/xmlitem.h | 4 +- GScribo/XmlWidget/xmlmodel.cpp | 17 +- GScribo/XmlWidget/xmlmodel.h | 5 +- GScribo/XmlWidget/xmlview.cpp | 5 - GScribo/XmlWidget/xmlview.h | 16 - GScribo/XmlWidget/xmlwidget.cpp | 32 +- GScribo/XmlWidget/xmlwidget.h | 23 +- GScribo/dir.h | 2 +- GScribo/mainwindow.cpp | 41 +- 21 files changed, 475 insertions(+), 1000 deletions(-) create mode 100644 GScribo/XmlWidget/attributemodel.cpp create mode 100644 GScribo/XmlWidget/attributemodel.h delete mode 100644 GScribo/XmlWidget/attributesdelegate.h delete mode 100644 GScribo/XmlWidget/treedelegate.h create mode 100644 GScribo/XmlWidget/xmldelegate.h delete mode 100644 GScribo/XmlWidget/xmlview.cpp delete mode 100644 GScribo/XmlWidget/xmlview.h diff --git a/GScribo/GScribo.pro b/GScribo/GScribo.pro index 6d94c04..c02e8c9 100644 --- a/GScribo/GScribo.pro +++ b/GScribo/GScribo.pro @@ -2,13 +2,13 @@ # Project created by QtCreator 2013-01-21T09:20:54 # ------------------------------------------------- QT += xml -INCLUDEPATH += /home/onix/olena/scribo/ \ - /home/onix/olena/_build/scribo/demo/ +INCLUDEPATH += /lrde/home/stage/froger_a/olena/scribo/ \ + /lrde/home/stage/froger_a/olena/_build/scribo/demo/ QMAKE_CXXFLAGS += -DNDEBUG \ -DMLN_WO_GLOBAL_VARS LIBS += -I/usr/include/graphicsImage \ -lGraphicsMagick++ \ - -ltesseract + -ltesseract_full TARGET = GScribo TEMPLATE = app SOURCES += main.cpp \ @@ -28,7 +28,7 @@ SOURCES += main.cpp \ XmlWidget/xmlmodel.cpp \ XmlWidget/xmlitem.cpp \ XmlWidget/xmlattributes.cpp \ - XmlWidget/xmlview.cpp + XmlWidget/attributemodel.cpp HEADERS += mainwindow.h \ variantpointer.h \ configs.h \ @@ -50,10 +50,9 @@ HEADERS += mainwindow.h \ XmlWidget/xmlmodel.h \ XmlWidget/xmlitem.h \ XmlWidget/xmlattributes.h \ - XmlWidget/treedelegate.h \ - XmlWidget/attributesdelegate.h \ - XmlWidget/xmlview.h \ - XmlWidget/selectionproxy.h + XmlWidget/selectionproxy.h \ + XmlWidget/xmldelegate.h \ + XmlWidget/attributemodel.h FORMS += mainwindow.ui \ Preferences/preferencesdialog.ui \ Preferences/ocroptions.ui \ diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index 8f62543..c386cec 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -1,892 +1,245 @@ -<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> - <qtcreator> <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> + <variable>RunConfiguration0-BaseEnvironmentBase</variable> + <value type="int">2</value> + </data> + <data> + <variable>RunConfiguration0-CommandLineArguments</variable> + <valuelist type="QVariantList"/> + </data> + <data> + <variable>RunConfiguration0-ProFile</variable> + <value type="QString">GScribo.pro</value> + </data> + <data> + <variable>RunConfiguration0-RunConfiguration.name</variable> + <value type="QString">GScribo</value> + </data> + <data> + <variable>RunConfiguration0-UseDyldImageSuffix</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UseTerminal</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserEnvironmentChanges</variable> + <valuelist type="QVariantList"/> + </data> + <data> + <variable>RunConfiguration0-UserSetName</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserSetWorkingDirectory</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserWorkingDirectory</variable> + <value type="QString"></value> + </data> + <data> + <variable>RunConfiguration0-type</variable> + <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> + </data> + <data> + <variable>activeRunConfiguration</variable> <value type="int">0</value> </data> <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> + <variable>activebuildconfiguration</variable> + <value type="QString">Debug</value> + </data> + <data> + <variable>buildConfiguration-Debug</variable> <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">System</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <value key="QtVersionId" type="int">0</value> + <value key="ToolChain" type="int">0</value> + <value key="addQDumper" type=""></value> + <value key="buildConfiguration" type="int">2</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"/> + <variable>buildConfiguration-Release</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + <value key="QtVersionId" type="int">0</value> + <value key="addQDumper" type=""></value> + <value key="buildConfiguration" type="int">0</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-buildstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-e9nHbn7LYK,guid=e39a93d8f03a16fd6bc992a3000b7303</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=8057</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-EVOSGL8004/agent.8004</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmD7T7RW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1360136006.519710-1569843383</value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo/GScribo.pro</value> + <value type="QString">-spec</value> + <value type="QString">linux-g++</value> + <value type="QString">-r</value> + <value type="QString">CONFIG+=debug</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> + <value key="abstractProcess.enabled" type="bool">false</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-e9nHbn7LYK,guid=e39a93d8f03a16fd6bc992a3000b7303</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=8057</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-EVOSGL8004/agent.8004</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmD7T7RW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1360136006.519710-1569843383</value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">-w</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/make</value> + <value key="abstractProcess.enabled" type="bool">true</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-cleanstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <value key="cleanConfig" type="bool">true</value> + <valuelist key="makeargs" type="QVariantList"> + <value type="QString">clean</value> + </valuelist> + </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.0</variable> + <variable>buildconfiguration-Release-buildstep0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-desktop-Debug</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-desktop-Release</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Configuration d'exécution Qt4</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">GScribo</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GScribo.pro</value> - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.1</variable> + <variable>buildconfiguration-Release-buildstep1</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60EmulatorTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo sur l'émulateur Symbian</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60EmulatorRunConfiguration</value> - <value type="QString" key="Qt4ProjectManager.S60EmulatorRunConfiguration.ProFile">GScribo.pro</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.2</variable> + <variable>buildconfiguration-Release-cleanstep0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">3</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60DeviceTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Créer le paquet SIS</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Create SIS package</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60SignBuildStep</value> - <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Certificate"></value> - <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Keyfile"></value> - <value type="int" key="Qt4ProjectManager.S60CreatePackageStep.SignMode">0</value> - <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SmartInstaller">false</value> - <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SuppressPatchWarningDialog">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeployStep</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Symbian</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo sur périphérique Symbian</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeviceRunConfiguration</value> - <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments"></value> - <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.ProFile">GScribo.pro</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.3</variable> + <variable>buildconfigurations</variable> + <valuelist type="QVariantList"> + <value type="QString">Debug</value> + <value type="QString">Release</value> + </valuelist> + </data> + <data> + <variable>buildstep0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.MaemoDeviceTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-maemo-Debug</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-maemo-Release</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer le paquet par montage UTFS</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoDeployStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compilation du paquet Debian et installation sur le périphérique Maemo5</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Maemo</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">2.2MaemoDeployConfig</value> - <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">0</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo (sur un périphérique distant)</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoRunConfiguration</value> - <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value> - <value type="int" key="Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase">1</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.ExportedLocalDirs"/> - <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.ProFile">GScribo.pro</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.RemoteMountPoints"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value> - <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value key="mkspec" type="QString"></value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">4</value> + <variable>buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> - <value type="QString">{5e5821f7-3a40-405f-b196-cbc6284a3a45}</value> + <variable>buildsteps</variable> + <valuelist type="QVariantList"> + <value type="QString">trolltech.qt4projectmanager.qmake</value> + <value type="QString">trolltech.qt4projectmanager.make</value> + </valuelist> </data> <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">10</value> + <variable>cleanstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value key="clean" type="bool">true</value> + </valuemap> + </data> + <data> + <variable>cleansteps</variable> + <valuelist type="QVariantList"> + <value type="QString">trolltech.qt4projectmanager.make</value> + </valuelist> + </data> + <data> + <variable>defaultFileEncoding</variable> + <value type="QByteArray">System</value> + </data> + <data> + <variable>project</variable> + <valuemap type="QVariantMap"/> </data> </qtcreator> diff --git a/GScribo/Rendering/polygonitem.cpp b/GScribo/Rendering/polygonitem.cpp index f8fee8a..ba35395 100644 --- a/GScribo/Rendering/polygonitem.cpp +++ b/GScribo/Rendering/polygonitem.cpp @@ -12,6 +12,14 @@ PolygonItem::PolygonItem(const QPolygonF &polygon, QGraphicsItem *parent, QGraph init(); } +PolygonItem::~PolygonItem() +{ + // Delete all childs. + QGraphicsItem *child; + foreach(child, childItems()) + delete child; +} + void PolygonItem::init() { xmlItem_ = 0; @@ -29,7 +37,7 @@ void PolygonItem::init() unselectedBrush_.setStyle(Qt::SolidPattern); } -void PolygonItem::setColor(const QColor &color) +void PolygonItem::setColor(const QColor& color) { selectedPen_.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 255)); unselectedPen_.setColor(color); @@ -58,6 +66,10 @@ void PolygonItem::setSelected(const QRectF& rect, bool clic) // Select graphical and xml item. select(); xmlItem_->select(); + + // If we are on a line, select the text xml item. + if(region_ == GraphicRegion::Line) + static_cast<PolygonItem *>(parentItem())->xmlItem()->select(); } else @@ -68,7 +80,7 @@ void PolygonItem::setSelected(const QRectF& rect, bool clic) } // Set selection for line items. - if(region_ == (int)GraphicRegion::Text) + if(region_ == GraphicRegion::Text) { QGraphicsItem *child; foreach(child, childItems()) diff --git a/GScribo/Rendering/polygonitem.h b/GScribo/Rendering/polygonitem.h index 78f5e0a..affdc2b 100644 --- a/GScribo/Rendering/polygonitem.h +++ b/GScribo/Rendering/polygonitem.h @@ -15,6 +15,7 @@ class PolygonItem : public: explicit PolygonItem(QGraphicsItem *parent = 0, QGraphicsScene *scene = 0); explicit PolygonItem(const QPolygonF& path, QGraphicsItem *parent = 0, QGraphicsScene *scene = 0); + ~PolygonItem(); void setColor(const QColor& color); inline QColor color() const; @@ -63,4 +64,6 @@ inline void PolygonItem::select() inline void PolygonItem::unselect() { if(pen() != unselectedPen_) { setPen(unselectedPen_); setBrush(unselectedBrush_);} } +Q_DECLARE_METATYPE(PolygonItem *) + #endif // POLYGONITEM_H diff --git a/GScribo/Rendering/scene.cpp b/GScribo/Rendering/scene.cpp index f3e4ec1..1572ecb 100644 --- a/GScribo/Rendering/scene.cpp +++ b/GScribo/Rendering/scene.cpp @@ -95,29 +95,26 @@ void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void Scene::selectItem(PolygonItem *graphicalItem) { - if(graphicalItem) + QGraphicsItem *child; + PolygonItem *polygonItem; + + // Unselect all items. + foreach(child, item_->childItems()) { - QGraphicsItem *child; - PolygonItem *polygonItem; + polygonItem = static_cast<PolygonItem *>(child); + polygonItem->unselect(); - // Unselect all items. - foreach(child, item_->childItems()) + // Unselect lines. + foreach(child, polygonItem->childItems()) { polygonItem = static_cast<PolygonItem *>(child); polygonItem->unselect(); - - // Unselect lines. - foreach(child, polygonItem->childItems()) - { - polygonItem = static_cast<PolygonItem *>(child); - polygonItem->unselect(); - } } - - // Select the good item. - graphicalItem->select(); - views()[0]->centerOn(graphicalItem); } + + // Select the good item. + graphicalItem->select(); + views()[0]->centerOn(graphicalItem); } void Scene::selectItems(const QRectF& rect, bool clic) diff --git a/GScribo/XmlWidget/attributemodel.cpp b/GScribo/XmlWidget/attributemodel.cpp new file mode 100644 index 0000000..6fddf89 --- /dev/null +++ b/GScribo/XmlWidget/attributemodel.cpp @@ -0,0 +1,69 @@ +#include "attributemodel.h" + +AttributeModel::AttributeModel(const XmlAttributes& attributes, QObject *parent) : + QAbstractItemModel(parent) +{ + attributes_ = attributes; +} + +AttributeModel::AttributeModel(const XmlAttributes& attributes, QAbstractItemModelPrivate& dd, QObject *parent) : + QAbstractItemModel(dd, parent) +{ + attributes_ = attributes; +} + +QVariant AttributeModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if(orientation == Qt::Horizontal && role == Qt::DisplayRole) + { + switch(section) + { + case 0: + return tr("Name"); + + case 1: + return tr("Value"); + + default: + return QVariant(); + } + } + + return QVariant(); +} + +QVariant AttributeModel::data(const QModelIndex& index, int role) const +{ + if(!index.isValid()) + return QVariant(); + + switch(role) + { + case Qt::UserRole: + return attributes_.names()[index.row()]; + + case Qt::UserRole+1: + return attributes_.values()[index.row()]; + + default: + return QVariant(); + } +} + +void AttributeModel::load(const XmlAttributes& attributes) +{ + beginResetModel(); + + attributes_ = attributes; + + endResetModel(); +} + +void AttributeModel::reset() +{ + beginResetModel(); + + attributes_ = XmlAttributes(); + + endResetModel(); +} diff --git a/GScribo/XmlWidget/attributemodel.h b/GScribo/XmlWidget/attributemodel.h new file mode 100644 index 0000000..c1a7ff1 --- /dev/null +++ b/GScribo/XmlWidget/attributemodel.h @@ -0,0 +1,44 @@ +#ifndef ATTRIBUTEMODEL_H +#define ATTRIBUTEMODEL_H + +#include <QAbstractItemModel> + +#include "xmlattributes.h" + +class AttributeModel : + public QAbstractItemModel +{ + public: + explicit AttributeModel(const XmlAttributes& attributes = XmlAttributes(), QObject *parent = 0); + explicit AttributeModel(const XmlAttributes& attributes, QAbstractItemModelPrivate& dd, QObject *parent = 0); + + void load(const XmlAttributes& attributes); + + inline int rowCount(const QModelIndex& parent) const; + inline int columnCount(const QModelIndex& parent) const; + + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant data(const QModelIndex& index, int role) const; + + inline QModelIndex index(int row, int column, const QModelIndex &parent) const; + inline QModelIndex parent(const QModelIndex &child) const; + + void reset(); + + private: + XmlAttributes attributes_; +}; + +inline int AttributeModel::rowCount(const QModelIndex&) const +{ return attributes_.names().count(); } + +inline int AttributeModel::columnCount(const QModelIndex&) const +{ return 2; } + +inline QModelIndex AttributeModel::index(int row, int column, const QModelIndex& parent) const +{ if(!hasIndex(row, column, parent)) return QModelIndex(); return createIndex(row, column, 0); } + +inline QModelIndex AttributeModel::parent(const QModelIndex&) const +{ return QModelIndex(); } + +#endif // ATTRIBUTEMODEL_H diff --git a/GScribo/XmlWidget/attributesdelegate.h b/GScribo/XmlWidget/attributesdelegate.h deleted file mode 100644 index 6442e49..0000000 --- a/GScribo/XmlWidget/attributesdelegate.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ATTRIBUTESDELEGATE_H -#define ATTRIBUTESDELEGATE_H - -#include <QStyledItemDelegate> -#include <QPainter> - -class AttributesDelegate : - public QStyledItemDelegate -{ - public: - explicit AttributesDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) { } - - inline void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; -}; - -inline void paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const -{ - QStyledItemDelegate::paint(painter, option, index); - painter->drawText(option.rect, painter.index.column() == 0 ? index.data(Qt::UserRole+1).toString() : index.data(Qt::UserRole+2).toString()); -} - -#endif // ATTRIBUTESDELEGATE_H diff --git a/GScribo/XmlWidget/selectionproxy.h b/GScribo/XmlWidget/selectionproxy.h index c9beaae..c169dea 100644 --- a/GScribo/XmlWidget/selectionproxy.h +++ b/GScribo/XmlWidget/selectionproxy.h @@ -2,6 +2,7 @@ #define SELECTIONPROXY_H #include <QSortFilterProxyModel> +#include <QDebug> #include "xmlitem.h" @@ -19,12 +20,8 @@ class SelectionProxy : inline bool SelectionProxy::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const { - QModelIndex index = static_cast<QSortFilterProxyModel *>(sourceModel())->sourceModel()->index(sourceRow, 0, sourceParent); - - if(index.isValid()) - return static_cast<XmlItem *>(index.internalPointer())->isSelected(); - - return false; + QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); + return index.data(filterRole()).toBool(); } inline void SelectionProxy::beginResetModel() diff --git a/GScribo/XmlWidget/treedelegate.h b/GScribo/XmlWidget/treedelegate.h deleted file mode 100644 index 4dbc8be..0000000 --- a/GScribo/XmlWidget/treedelegate.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef TREEDELEGATE_H -#define TREEDELEGATE_H - -#include <QStyledItemDelegate> -#include <QPainter> - -#include "xmlitem.h" - -class TreeDelegate : - public QStyledItemDelegate -{ - public: - explicit TreeDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) { } - - inline void paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; -}; - -inline void TreeDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const -{ QStyledItemDelegate::paint(painter, option, index); painter->drawText(option.rect, index.data(Qt::UserRole).toString()); } - -#endif // TREEDELEGATE_H diff --git a/GScribo/XmlWidget/xmlattributes.h b/GScribo/XmlWidget/xmlattributes.h index b0ac030..8dbf547 100644 --- a/GScribo/XmlWidget/xmlattributes.h +++ b/GScribo/XmlWidget/xmlattributes.h @@ -3,6 +3,7 @@ #include <QDomNamedNodeMap> #include <QStringList> +#include <QVariant> class XmlAttributes { @@ -26,4 +27,7 @@ inline QStringList XmlAttributes::names() const inline QStringList XmlAttributes::values() const { return values_; } +Q_DECLARE_METATYPE(XmlAttributes) +Q_DECLARE_METATYPE(XmlAttributes *) + #endif // XMLATTRIBUTES_H diff --git a/GScribo/XmlWidget/xmldelegate.h b/GScribo/XmlWidget/xmldelegate.h new file mode 100644 index 0000000..35b3089 --- /dev/null +++ b/GScribo/XmlWidget/xmldelegate.h @@ -0,0 +1,29 @@ +#ifndef XMLDELEGATE_H +#define XMLDELEGATE_H + +#include <QStyledItemDelegate> + +class XmlDelegate : + public QStyledItemDelegate +{ + public: + explicit XmlDelegate(int role = Qt::DisplayRole, QObject *parent = 0) : QStyledItemDelegate(parent) { role_ = role; }; + inline void paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; + + inline void setRole(int role); + inline int role() const; + + private: + int role_; +}; + +inline void XmlDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const +{ QStyledItemDelegate::paint(painter, option, index); painter->drawText(option.rect, index.data(role_).toString()); } + +inline void XmlDelegate::setRole(int role) +{ role_ = role; } + +inline int XmlDelegate::role() const +{ return role_; } + +#endif // XMLDELEGATE_H diff --git a/GScribo/XmlWidget/xmlitem.h b/GScribo/XmlWidget/xmlitem.h index 542d764..b72d96d 100644 --- a/GScribo/XmlWidget/xmlitem.h +++ b/GScribo/XmlWidget/xmlitem.h @@ -70,10 +70,10 @@ inline void XmlItem::setSelected(bool selected) { isSelected_ = selected; } inline void XmlItem::select() -{ setSelected(true); } +{ isSelected_ = true; } inline void XmlItem::unselect() -{ setSelected(false); } +{ isSelected_ = false; } inline QString XmlItem::text() const { return text_; } diff --git a/GScribo/XmlWidget/xmlmodel.cpp b/GScribo/XmlWidget/xmlmodel.cpp index cafef3e..460ddb4 100644 --- a/GScribo/XmlWidget/xmlmodel.cpp +++ b/GScribo/XmlWidget/xmlmodel.cpp @@ -18,7 +18,7 @@ XmlModel::~XmlModel() delete rootItem_; } -QVariant XmlModel::headerData(int/* section*/, Qt::Orientation orientation, int role) const +QVariant XmlModel::headerData(int, Qt::Orientation orientation, int role) const { if(orientation == Qt::Horizontal && role == Qt::DisplayRole) return tr("Tree"); @@ -26,14 +26,6 @@ QVariant XmlModel::headerData(int/* section*/, Qt::Orientation orientation, int return QVariant(); } -Qt::ItemFlags XmlModel::flags(const QModelIndex &index) const -{ - if(!index.isValid()) - return 0; - - return Qt::ItemIsEnabled | Qt::ItemIsSelectable; -} - QVariant XmlModel::data(const QModelIndex& index, int role) const { if(!index.isValid()) @@ -45,10 +37,13 @@ QVariant XmlModel::data(const QModelIndex& index, int role) const return static_cast<XmlItem *>(index.internalPointer())->text(); case Qt::UserRole+1: - return static_cast<XmlItem *>(index.internalPointer())->attributes().names(); + return static_cast<XmlItem *>(index.internalPointer())->isSelected(); case Qt::UserRole+2: - return static_cast<XmlItem *>(index.internalPointer())->attributes().values(); + return QVariant::fromValue(static_cast<XmlItem *>(index.internalPointer())->attributes()); + + case Qt::UserRole+3: + return VariantPointer<PolygonItem>::toQVariant(static_cast<XmlItem *>(index.internalPointer())->graphicalItem()); default: return QVariant(); diff --git a/GScribo/XmlWidget/xmlmodel.h b/GScribo/XmlWidget/xmlmodel.h index 2ac9fac..7e74e6f 100644 --- a/GScribo/XmlWidget/xmlmodel.h +++ b/GScribo/XmlWidget/xmlmodel.h @@ -3,6 +3,7 @@ #include <QAbstractItemModel> +#include "variantpointer.h" #include "xmlitem.h" class XmlModel : @@ -14,13 +15,11 @@ class XmlModel : ~XmlModel(); void load(XmlItem *rootItem); - void clear(); inline int rowCount(const QModelIndex& parent) const; inline int columnCount(const QModelIndex& parent) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const; - Qt::ItemFlags flags(const QModelIndex &index) const; QVariant data(const QModelIndex& index, int role) const; @@ -39,7 +38,7 @@ inline XmlItem *XmlModel::toXmlItem(const QModelIndex& parent) const inline int XmlModel::rowCount(const QModelIndex& parent) const { if(rootItem_) return toXmlItem(parent)->childs().count(); return 0; } -inline int XmlModel::columnCount(const QModelIndex&/* parent*/) const +inline int XmlModel::columnCount(const QModelIndex&) const { return 1; } #endif // XMLMODEL_H diff --git a/GScribo/XmlWidget/xmlview.cpp b/GScribo/XmlWidget/xmlview.cpp deleted file mode 100644 index 59b55f5..0000000 --- a/GScribo/XmlWidget/xmlview.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "xmlview.h" - -XmlView::XmlView(XmlItem */*rootItem*/) -{ -} diff --git a/GScribo/XmlWidget/xmlview.h b/GScribo/XmlWidget/xmlview.h deleted file mode 100644 index 89fee1e..0000000 --- a/GScribo/XmlWidget/xmlview.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef XMLVIEW_H -#define XMLVIEW_H - -#include <QTreeView> - -#include "xmlitem.h" -#include "xmlmodel.h" - -class XmlView : - public QTreeView -{ - public: - explicit XmlView(XmlItem * = 0); -}; - -#endif // XMLVIEW_H diff --git a/GScribo/XmlWidget/xmlwidget.cpp b/GScribo/XmlWidget/xmlwidget.cpp index f5f2184..05f69e1 100644 --- a/GScribo/XmlWidget/xmlwidget.cpp +++ b/GScribo/XmlWidget/xmlwidget.cpp @@ -5,31 +5,45 @@ XmlWidget::XmlWidget(QWidget *parent) : { QHBoxLayout *hLayout = new QHBoxLayout; - proxy_.setFilterRegExp(QRegExp(".Region|Line|Metadata|Page|Creator|Created|LastChange|Comments", Qt::CaseInsensitive)); + proxy_.setFilterRegExp(QRegExp("Page|.Region|Line", Qt::CaseInsensitive)); proxy_.setFilterRole(Qt::UserRole); proxy_.setSourceModel(&model_); proxy_.setDynamicSortFilter(true); - selectionProxy_.setFilterRole(Qt::UserRole); + selectionProxy_.setFilterRole(Qt::UserRole+1); selectionProxy_.setSourceModel(&proxy_); selectionProxy_.setDynamicSortFilter(true); - TreeDelegate *treeDelegate = new TreeDelegate; - - viewer_.setModel(&proxy_); - viewer_.setItemDelegate(treeDelegate); - selection_.setModel(&selectionProxy_); - selection_.setItemDelegate(treeDelegate); + selection_.setUniformRowHeights(true); + selection_.setItemDelegate(new XmlDelegate(Qt::UserRole)); + + property_.setModel(&attributesModel_); + property_.setUniformRowHeights(true); + property_.setItemsExpandable(false); + property_.setColumnWidth(0, property_.width() / 2.5); + property_.setSelectionMode(QAbstractItemView::NoSelection); + property_.setItemDelegateForColumn(0, new XmlDelegate(Qt::UserRole)); + property_.setItemDelegateForColumn(1, new XmlDelegate(Qt::UserRole+1)); - hLayout->addWidget(&viewer_); hLayout->addWidget(&selection_); hLayout->addWidget(&property_); setLayout(hLayout); + + connect(&selection_, SIGNAL(clicked(QModelIndex)), this, SLOT(onClick(QModelIndex))); } void XmlWidget::changeView(XmlItem *rootItem) { model_.load(rootItem); } + +void XmlWidget::onClick(const QModelIndex& index) +{ + attributesModel_.load(index.data(Qt::UserRole+2).value<XmlAttributes>()); + PolygonItem *graphicalItem = VariantPointer<PolygonItem>::fromQVariant(index.data(Qt::UserRole+3)); + + if(graphicalItem) + emit select(graphicalItem); +} diff --git a/GScribo/XmlWidget/xmlwidget.h b/GScribo/XmlWidget/xmlwidget.h index 5962d4a..70a3ece 100644 --- a/GScribo/XmlWidget/xmlwidget.h +++ b/GScribo/XmlWidget/xmlwidget.h @@ -6,13 +6,16 @@ #include <QTreeWidget> #include <QVBoxLayout> #include <QDomElement> +#include <QHeaderView> #include <QWidget> #include <QLabel> +#include "Rendering/scene.h" #include "selectionproxy.h" -#include "treedelegate.h" +#include "attributemodel.h" +#include "variantpointer.h" +#include "xmldelegate.h" #include "xmlmodel.h" -#include "xmlview.h" class XmlWidget : public QWidget @@ -27,20 +30,28 @@ class XmlWidget : private: QSortFilterProxyModel proxy_; SelectionProxy selectionProxy_; + XmlModel model_; - XmlView viewer_; - XmlView selection_; - QTreeWidget property_; + AttributeModel attributesModel_; + + QTreeView selection_; + QTreeView property_; public slots: inline void onBeginGraphicalSelection(); inline void onEndGraphicalSelection(); + + private slots: + void onClick(const QModelIndex& index); + + signals: + void select(PolygonItem *polygonItem); }; inline void XmlWidget::onBeginGraphicalSelection() { selectionProxy_.beginResetModel(); } inline void XmlWidget::onEndGraphicalSelection() -{ selectionProxy_.endResetModel(); } +{ selectionProxy_.endResetModel(); property_.reset(); selection_.expandAll(); } #endif // XMLWIDGET_H diff --git a/GScribo/dir.h b/GScribo/dir.h index 3de42da..a6c036b 100644 --- a/GScribo/dir.h +++ b/GScribo/dir.h @@ -1,7 +1,7 @@ #ifndef DIR_H #define DIR_H -#define SCRIBO_LOCAL_DEMODIR "/home/onix/olena/_build/scribo/demo" +#define SCRIBO_LOCAL_DEMODIR "/lrde/home/stage/froger_a/olena/_build/scribo/demo" #define SCRIBO_PREFIX_BINDIR "/usr/local/bin" #endif // DIR_H diff --git a/GScribo/mainwindow.cpp b/GScribo/mainwindow.cpp index 9f343d3..9dcd31b 100644 --- a/GScribo/mainwindow.cpp +++ b/GScribo/mainwindow.cpp @@ -108,20 +108,36 @@ void MainWindow::onOpen() if(paths.count() > 0) { - QString path = paths[0]; - QPixmap pixmap(path); + QStringList filenames = pagesWidget.filenames(); + QString path; - pagesWidget.addPixmap(path, pixmap); + int counter = 0; + bool isContained; + do + { + path = paths[counter]; + counter++; + isContained = filenames.contains(path, Qt::CaseSensitive); + } while(isContained && counter < paths.count()); - // If more than one file, we store it in the page widget. - for(int i = 1; i < paths.count(); i++) + if(!isContained) { - path = paths[i]; - pixmap.load(path); + QPixmap pixmap(path); pagesWidget.addPixmap(path, pixmap); - } - onFileChanged(path, pixmap); + // If more than one file, we store it in the page widget. + for(int i = counter; i < paths.count(); i++) + { + if(!filenames.contains(paths[i], Qt::CaseSensitive)) + { + path = paths[i]; + pixmap.load(path); + pagesWidget.addPixmap(path, pixmap); + } + } + + onFileChanged(path, pixmap); + } } } @@ -160,13 +176,10 @@ void MainWindow::connectWidgets() // If double click on a picture of the page widget -> draw it on background scene. connect(&pagesWidget, SIGNAL(sceneChanged(QString,QPixmap)), this, SLOT(onFileChanged(QString,QPixmap))); + // Connect the scene to the xml widget and vice versa. connect(&scene, SIGNAL(beginSelection()), &xmlWidget, SLOT(onBeginGraphicalSelection())); connect(&scene, SIGNAL(endSelection()), &xmlWidget, SLOT(onEndGraphicalSelection())); - - // Connect scene selection with xml tree and vice versa. - /*connect(&scene, SIGNAL(selectTreeItems(QList<QTreeWidgetItem*>)), &xmlWidget, SLOT(selectItems(QList<QTreeWidgetItem*>))); - connect(&xmlWidget, SIGNAL(selectGraphicalItem(PolygonItem*)), &scene, SLOT(selectItem(PolygonItem*))); - connect(&pagesWidget, SIGNAL(removeTreeSelection()), &xmlWidget, SLOT(clear()));*/ + connect(&xmlWidget, SIGNAL(select(PolygonItem*)), &scene, SLOT(selectItem(PolygonItem*))); /*connect(&runner, SIGNAL(progress()), &progressDialog, SLOT(run())); connect(&runner, SIGNAL(new_progress_max_value(int)), &progressDialog, SLOT(setMaximum(int))); -- 1.7.2.5

11 years, 10 months

1ec914f Continue xmlWidget. Succeed in the implementation of the model for the tree and the selected tree. Problem with the selection proxy : don t reach childs. Don t have test the attribute widget.

by Antoine Froger

--- GScribo/GScribo.pro | 10 +- GScribo/GScribo.pro.user | 1069 +++++++++++++++++++++----- GScribo/GScribo.pro.user.1.3 | 118 ++-- GScribo/Preferences/ocroptions.cpp | 2 +- GScribo/Preferences/ocroptions.h | 2 +- GScribo/Preferences/preprocessingoptions.cpp | 45 ++ GScribo/Preferences/preprocessingoptions.h | 2 +- GScribo/Preferences/segmentationoptions.cpp | 2 +- GScribo/Preferences/segmentationoptions.h | 2 +- GScribo/Rendering/polygonitem.cpp | 65 ++- GScribo/Rendering/polygonitem.h | 48 +- GScribo/Rendering/scene.cpp | 121 +-- GScribo/Rendering/scene.h | 17 +- GScribo/XmlWidget/selectionproxy.h | 36 + GScribo/XmlWidget/xmlitem.cpp | 1 + GScribo/XmlWidget/xmlitem.h | 22 +- GScribo/XmlWidget/xmlmodel.cpp | 46 +- GScribo/XmlWidget/xmlmodel.h | 9 +- GScribo/XmlWidget/xmlview.cpp | 9 +- GScribo/XmlWidget/xmlview.h | 13 +- GScribo/XmlWidget/xmlwidget.cpp | 20 +- GScribo/XmlWidget/xmlwidget.h | 19 +- GScribo/configs.h | 10 +- GScribo/dir.h | 2 +- GScribo/mainwindow.cpp | 3 + GScribo/xml.cpp | 8 + XmlTree/XmlTree.pro.user | 1067 +++++++++++++++++++++----- XmlTree/XmlTree.pro.user.1.3 | 84 +-- XmlTree/xmldelegate.cpp | 4 +- 29 files changed, 2092 insertions(+), 764 deletions(-) create mode 100644 GScribo/Preferences/preprocessingoptions.cpp create mode 100644 GScribo/XmlWidget/selectionproxy.h diff --git a/GScribo/GScribo.pro b/GScribo/GScribo.pro index 7798a52..6d94c04 100644 --- a/GScribo/GScribo.pro +++ b/GScribo/GScribo.pro @@ -2,14 +2,13 @@ # Project created by QtCreator 2013-01-21T09:20:54 # ------------------------------------------------- QT += xml -INCLUDEPATH += /lrde/home/stage/froger_a/olena/milena/ \ - /lrde/home/stage/froger_a/olena/scribo/ \ - /lrde/home/stage/froger_a/olena/_build/scribo/demo/ +INCLUDEPATH += /home/onix/olena/scribo/ \ + /home/onix/olena/_build/scribo/demo/ QMAKE_CXXFLAGS += -DNDEBUG \ -DMLN_WO_GLOBAL_VARS LIBS += -I/usr/include/graphicsImage \ -lGraphicsMagick++ \ - -ltesseract_full + -ltesseract TARGET = GScribo TEMPLATE = app SOURCES += main.cpp \ @@ -53,7 +52,8 @@ HEADERS += mainwindow.h \ XmlWidget/xmlattributes.h \ XmlWidget/treedelegate.h \ XmlWidget/attributesdelegate.h \ - XmlWidget/xmlview.h + XmlWidget/xmlview.h \ + XmlWidget/selectionproxy.h FORMS += mainwindow.ui \ Preferences/preferencesdialog.ui \ Preferences/ocroptions.ui \ diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index ab3db9a..8f62543 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -1,245 +1,892 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> + <qtcreator> <data> - <variable>RunConfiguration0-BaseEnvironmentBase</variable> - <value type="int">2</value> - </data> - <data> - <variable>RunConfiguration0-CommandLineArguments</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-ProFile</variable> - <value type="QString">GScribo.pro</value> - </data> - <data> - <variable>RunConfiguration0-RunConfiguration.name</variable> - <value type="QString">GScribo</value> - </data> - <data> - <variable>RunConfiguration0-UseDyldImageSuffix</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UseTerminal</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserEnvironmentChanges</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-UserSetName</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserSetWorkingDirectory</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserWorkingDirectory</variable> - <value type="QString"></value> - </data> - <data> - <variable>RunConfiguration0-type</variable> - <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> - </data> - <data> - <variable>activeRunConfiguration</variable> + <variable>ProjectExplorer.Project.ActiveTarget</variable> <value type="int">0</value> </data> <data> - <variable>activebuildconfiguration</variable> - <value type="QString">Debug</value> - </data> - <data> - <variable>buildConfiguration-Debug</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <value key="QtVersionId" type="int">0</value> - <value key="ToolChain" type="int">0</value> - <value key="addQDumper" type=""></value> - <value key="buildConfiguration" type="int">2</value> - </valuemap> - </data> - <data> - <variable>buildConfiguration-Release</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - <value key="QtVersionId" type="int">0</value> - <value key="addQDumper" type=""></value> - <value key="buildConfiguration" type="int">0</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt/GScribo/XmlWidget</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=758</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo/GScribo.pro</value> - <value type="QString">-spec</value> - <value type="QString">linux-g++</value> - <value type="QString">-r</value> - <value type="QString">CONFIG+=debug</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> - <value key="abstractProcess.enabled" type="bool">false</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt/GScribo/XmlWidget</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=758</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-cleanstep0</variable> + <variable>ProjectExplorer.Project.EditorSettings</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <value key="cleanConfig" type="bool">true</value> - <valuelist key="makeargs" type="QVariantList"> - <value type="QString">clean</value> - </valuelist> + <value type="bool" key="EditorConfiguration.AutoIndent">true</value> + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> + <value type="QString" key="language">Cpp</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">CppGlobal</value> + </valuemap> + </valuemap> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> + <value type="QString" key="language">QmlJS</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> + </valuemap> + </valuemap> + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> + <value type="QByteArray" key="EditorConfiguration.Codec">System</value> + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> + <value type="int" key="EditorConfiguration.IndentSize">4</value> + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> + <value type="int" key="EditorConfiguration.PaddingMode">1</value> + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> + <value type="int" key="EditorConfiguration.TabSize">8</value> + <value type="bool" key="EditorConfiguration.UseGlobal">true</value> + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> </valuemap> </data> <data> - <variable>buildconfiguration-Release-buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Release-buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - </valuemap> + <variable>ProjectExplorer.Project.PluginSettings</variable> + <valuemap type="QVariantMap"/> </data> <data> - <variable>buildconfiguration-Release-cleanstep0</variable> + <variable>ProjectExplorer.Project.Target.0</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-desktop-Debug</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-desktop-Release</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Configuration d'exécution Qt4</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">GScribo</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GScribo.pro</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildconfigurations</variable> - <valuelist type="QVariantList"> - <value type="QString">Debug</value> - <value type="QString">Release</value> - </valuelist> - </data> - <data> - <variable>buildstep0</variable> + <variable>ProjectExplorer.Project.Target.1</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="mkspec" type="QString"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60EmulatorTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo sur l'émulateur Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60EmulatorRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.S60EmulatorRunConfiguration.ProFile">GScribo.pro</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildstep1</variable> + <variable>ProjectExplorer.Project.Target.2</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">3</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60DeviceTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Créer le paquet SIS</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Create SIS package</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60SignBuildStep</value> + <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Certificate"></value> + <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Keyfile"></value> + <value type="int" key="Qt4ProjectManager.S60CreatePackageStep.SignMode">0</value> + <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SmartInstaller">false</value> + <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SuppressPatchWarningDialog">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeployStep</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo sur périphérique Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeviceRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.ProFile">GScribo.pro</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildsteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.qmake</value> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> - </data> - <data> - <variable>cleanstep0</variable> + <variable>ProjectExplorer.Project.Target.3</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="clean" type="bool">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.MaemoDeviceTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-maemo-Debug</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo-build-maemo-Release</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer le paquet par montage UTFS</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoDeployStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compilation du paquet Debian et installation sur le périphérique Maemo5</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Maemo</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">2.2MaemoDeployConfig</value> + <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">0</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo (sur un périphérique distant)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value> + <value type="int" key="Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase">1</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.ExportedLocalDirs"/> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.ProFile">GScribo.pro</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.RemoteMountPoints"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value> + <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>cleansteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> + <variable>ProjectExplorer.Project.TargetCount</variable> + <value type="int">4</value> </data> <data> - <variable>defaultFileEncoding</variable> - <value type="QByteArray">System</value> + <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> + <value type="QString">{5e5821f7-3a40-405f-b196-cbc6284a3a45}</value> </data> <data> - <variable>project</variable> - <valuemap type="QVariantMap"/> + <variable>ProjectExplorer.Project.Updater.FileVersion</variable> + <value type="int">10</value> </data> </qtcreator> diff --git a/GScribo/GScribo.pro.user.1.3 b/GScribo/GScribo.pro.user.1.3 index d01f28d..ab3db9a 100644 --- a/GScribo/GScribo.pro.user.1.3 +++ b/GScribo/GScribo.pro.user.1.3 @@ -56,48 +56,53 @@ <variable>buildConfiguration-Debug</variable> <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <value key="QtVersionId" type="int">2</value> + <value key="QtVersionId" type="int">0</value> <value key="ToolChain" type="int">0</value> <value key="addQDumper" type=""></value> <value key="buildConfiguration" type="int">2</value> </valuemap> </data> <data> + <variable>buildConfiguration-Release</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + <value key="QtVersionId" type="int">0</value> + <value key="addQDumper" type=""></value> + <value key="buildConfiguration" type="int">0</value> + </valuemap> + </data> + <data> <variable>buildconfiguration-Debug-buildstep0</variable> <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt/GScribo/XmlWidget</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=12582948</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> <value type="QString">XTERM_VERSION=XTerm(261)</value> @@ -120,37 +125,33 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt/GScribo/XmlWidget</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=12582948</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> <value type="QString">XTERM_VERSION=XTerm(261)</value> @@ -169,50 +170,6 @@ <variable>buildconfiguration-Debug-cleanstep0</variable> <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> - <value type="QString">GNOME_KEYRING_PID=8443</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=8518</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">true</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">clean</value> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> <value key="cleanConfig" type="bool">true</value> <valuelist key="makeargs" type="QVariantList"> <value type="QString">clean</value> @@ -220,9 +177,28 @@ </valuemap> </data> <data> + <variable>buildconfiguration-Release-buildstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Release-buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Release-cleanstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + </valuemap> + </data> + <data> <variable>buildconfigurations</variable> <valuelist type="QVariantList"> <value type="QString">Debug</value> + <value type="QString">Release</value> </valuelist> </data> <data> diff --git a/GScribo/Preferences/ocroptions.cpp b/GScribo/Preferences/ocroptions.cpp index b2137bd..ac337ed 100644 --- a/GScribo/Preferences/ocroptions.cpp +++ b/GScribo/Preferences/ocroptions.cpp @@ -1,7 +1,7 @@ #include "ocroptions.h" #include "ui_ocroptions.h" -using namespace scribo::toolchain::internal; +//using namespace scribo::toolchain::internal; static const char *language[][2] = { diff --git a/GScribo/Preferences/ocroptions.h b/GScribo/Preferences/ocroptions.h index b45fef6..9ba8d53 100644 --- a/GScribo/Preferences/ocroptions.h +++ b/GScribo/Preferences/ocroptions.h @@ -1,7 +1,7 @@ #ifndef OCR_OPTIONS_H #define OCR_OPTIONS_H -#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> +//#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> #include "optionwidget.h" #include "configs.h" diff --git a/GScribo/Preferences/preprocessingoptions.cpp b/GScribo/Preferences/preprocessingoptions.cpp new file mode 100644 index 0000000..f7a6647 --- /dev/null +++ b/GScribo/Preferences/preprocessingoptions.cpp @@ -0,0 +1,45 @@ +#include "preprocessingoptions.h" +#include "ui_preprocessingoptions.h" + +//using namespace scribo::toolchain::internal; + +PreprocessingOptions::PreprocessingOptions(QWidget *parent) : + OptionWidget(parent), + ui(new Ui::PreprocessingOptions) +{ + ui->setupUi(this); + + /*ui->bin_algoCbox->insertItem(Convert, "Violent convert"); + ui->bin_algoCbox->insertItem(Sauvola, "Local threshold"); + ui->bin_algoCbox->insertItem(SauvolaMs, "Local threshold multiscale");*/ + + loadConfig(); +} + +PreprocessingOptions::~PreprocessingOptions() +{ + delete ui; +} + +void PreprocessingOptions::loadConfig() +{ + Configs * const conf = Configs::getInstance(); + + ui->subsampleCb->setChecked(conf->preprocessingSubsample()); + ui->remove_bgCb->setChecked(conf->preprocessingRemoveBg()); + ui->deskewCb->setChecked(conf->preprocessingDeskew()); + ui->remove_noiseCb->setChecked(conf->preprocessingRemoveNoise()); + //ui->bin_algoCbox->setCurrentIndex(conf->preprocessingBinAlgo()); +} + + +void PreprocessingOptions::saveConfig() +{ + Configs * const conf = Configs::getInstance(); + + conf->setPreprocessingSubsample(ui->subsampleCb->isChecked()); + conf->setPreprocessingRemoveBg(ui->remove_bgCb->isChecked()); + conf->setPreprocessingDeskew(ui->deskewCb->isChecked()); + conf->setPreprocessingRemoveNoise(ui->remove_noiseCb->isChecked()); + conf->setPreprocessingBinAlgo(ui->bin_algoCbox->currentIndex()); +} diff --git a/GScribo/Preferences/preprocessingoptions.h b/GScribo/Preferences/preprocessingoptions.h index 6cc0081..1818322 100644 --- a/GScribo/Preferences/preprocessingoptions.h +++ b/GScribo/Preferences/preprocessingoptions.h @@ -1,7 +1,7 @@ #ifndef PREPROCESSINGOPTIONS_H #define PREPROCESSINGOPTIONS_H -#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> +//#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> #include "optionwidget.h" #include "region.h" diff --git a/GScribo/Preferences/segmentationoptions.cpp b/GScribo/Preferences/segmentationoptions.cpp index 21059cd..ef47f66 100644 --- a/GScribo/Preferences/segmentationoptions.cpp +++ b/GScribo/Preferences/segmentationoptions.cpp @@ -1,7 +1,7 @@ #include "segmentationoptions.h" #include "ui_segmentationoptions.h" -using namespace scribo::toolchain::internal; +//using namespace scribo::toolchain::internal; SegmentationOptions::SegmentationOptions(QWidget *parent) : OptionWidget(parent), diff --git a/GScribo/Preferences/segmentationoptions.h b/GScribo/Preferences/segmentationoptions.h index 8003397..1506bfa 100644 --- a/GScribo/Preferences/segmentationoptions.h +++ b/GScribo/Preferences/segmentationoptions.h @@ -1,7 +1,7 @@ #ifndef SEGMENTATIONOPTIONS_H #define SEGMENTATIONOPTIONS_H -#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> +//#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> #include "optionwidget.h" #include "configs.h" diff --git a/GScribo/Rendering/polygonitem.cpp b/GScribo/Rendering/polygonitem.cpp index b447e28..f8fee8a 100644 --- a/GScribo/Rendering/polygonitem.cpp +++ b/GScribo/Rendering/polygonitem.cpp @@ -14,27 +14,64 @@ PolygonItem::PolygonItem(const QPolygonF &polygon, QGraphicsItem *parent, QGraph void PolygonItem::init() { - selectedPen.setStyle(Qt::SolidLine); - unselectedPen.setStyle(Qt::SolidLine); + xmlItem_ = 0; - selectedPen.setWidthF(2); - unselectedPen.setWidth(0); + selectedPen_.setStyle(Qt::SolidLine); + unselectedPen_.setStyle(Qt::SolidLine); - selectedPen.setCapStyle(Qt::SquareCap); - unselectedPen.setCapStyle(Qt::SquareCap); + selectedPen_.setWidthF(2); + unselectedPen_.setWidth(0); - selectedBrush.setStyle(Qt::SolidPattern); - unselectedBrush.setStyle(Qt::SolidPattern); + selectedPen_.setCapStyle(Qt::SquareCap); + unselectedPen_.setCapStyle(Qt::SquareCap); + + selectedBrush_.setStyle(Qt::SolidPattern); + unselectedBrush_.setStyle(Qt::SolidPattern); } void PolygonItem::setColor(const QColor &color) { - selectedPen.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 255)); - unselectedPen.setColor(color); + selectedPen_.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 255)); + unselectedPen_.setColor(color); + + selectedBrush_.setColor(color); + unselectedBrush_.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 40)); + + setPen(unselectedPen_); + setBrush(unselectedBrush_); +} + +bool PolygonItem::isSelected(const QRectF& rect, bool clic) +{ + if(clic) + return (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().contains(rect.bottomRight())) && + shape().contains(rect.bottomRight()); + else + return (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().intersects(rect)) && + shape().intersects(rect); +} + +void PolygonItem::setSelected(const QRectF& rect, bool clic) +{ + if(isSelected(rect, clic)) + { + // Select graphical and xml item. + select(); + xmlItem_->select(); + } - selectedBrush.setColor(color); - unselectedBrush.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 40)); + else + { + // Unselect graphical and xml item. + unselect(); + xmlItem_->unselect(); + } - setPen(unselectedPen); - setBrush(unselectedBrush); + // Set selection for line items. + if(region_ == (int)GraphicRegion::Text) + { + QGraphicsItem *child; + foreach(child, childItems()) + static_cast<PolygonItem *>(child)->setSelected(rect, clic); + } } diff --git a/GScribo/Rendering/polygonitem.h b/GScribo/Rendering/polygonitem.h index ca32774..78f5e0a 100644 --- a/GScribo/Rendering/polygonitem.h +++ b/GScribo/Rendering/polygonitem.h @@ -5,6 +5,7 @@ #include <QTreeWidgetItem> #include <QPen> +#include "XmlWidget/xmlitem.h" #include "variantpointer.h" #include "region.h" @@ -18,43 +19,48 @@ class PolygonItem : void setColor(const QColor& color); inline QColor color() const; + inline void setXmlItem(XmlItem *xmlItem); + inline XmlItem *xmlItem() const; + inline void loadData(const GraphicRegion::Data& data); + inline int region() const; - inline bool isSelected(const QRectF& rect, bool clic); + bool isSelected(const QRectF& rect, bool clic); + void setSelected(const QRectF& rect, bool clic); inline void unselect(); inline void select(); - inline void setSelected(bool selected); private: void init(); - QPen selectedPen; - QPen unselectedPen; - QBrush selectedBrush; - QBrush unselectedBrush; + XmlItem *xmlItem_; + int region_; + + QPen selectedPen_; + QPen unselectedPen_; + QBrush selectedBrush_; + QBrush unselectedBrush_; }; +inline void PolygonItem::setXmlItem(XmlItem *xmlItem) +{ xmlItem_ = xmlItem; } + +inline XmlItem *PolygonItem::xmlItem() const +{ return xmlItem_; } + inline QColor PolygonItem::color() const -{ return selectedBrush.color(); } +{ return selectedBrush_.color(); } -inline void PolygonItem::loadData(const GraphicRegion::Data &data) -{ setData(0, data.region); setColor(data.color); setZValue(data.zValue); } +inline void PolygonItem::loadData(const GraphicRegion::Data& data) +{ region_ = data.region; setColor(data.color); setZValue(data.zValue); } -inline bool PolygonItem::isSelected(const QRectF &rect, bool clic) -{ - if(clic) - return (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().contains(rect.bottomRight())) && shape().contains(rect.bottomRight()); - else - return (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().intersects(rect)) && shape().intersects(rect); -} +inline int PolygonItem::region() const +{ return region_; } inline void PolygonItem::select() -{ if(pen() != selectedPen) { setPen(selectedPen); setBrush(selectedBrush); } } +{ if(pen() != selectedPen_) { setPen(selectedPen_); setBrush(selectedBrush_); } } inline void PolygonItem::unselect() -{ if(pen() != unselectedPen) { setPen(unselectedPen); setBrush(unselectedBrush); } } - -inline void PolygonItem::setSelected(bool selected) -{ if(selected) select(); else unselect(); } +{ if(pen() != unselectedPen_) { setPen(unselectedPen_); setBrush(unselectedBrush_);} } #endif // POLYGONITEM_H diff --git a/GScribo/Rendering/scene.cpp b/GScribo/Rendering/scene.cpp index 3b4c70b..f3e4ec1 100644 --- a/GScribo/Rendering/scene.cpp +++ b/GScribo/Rendering/scene.cpp @@ -20,53 +20,53 @@ Scene::Scene(qreal x, qreal y, qreal width, qreal height, QObject *parent): void Scene::init() { - isPressing = false; - clic = false; - item = 0; + isPressing_ = false; + clic_ = false; + item_ = 0; // Disable the scene size adaptation to items rect with a non null rect. setSceneRect(0, 0, 0, 1); - selection.setRect(0, 0, 0, 0); - addItem(&selection); + selection_.setRect(0, 0, 0, 0); + addItem(&selection_); } void Scene::clear() { - if(item) - delete item; + if(item_) + delete item_; - item = 0; + item_ = 0; } void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if(event->button() == Qt::LeftButton && !isPressing) + if(event->button() == Qt::LeftButton && !isPressing_) { - isPressing = true; - clic = true; + isPressing_ = true; + clic_ = true; - pressPos = event->scenePos(); - selection.show(); + pressPos_ = event->scenePos(); + selection_.show(); } } void Scene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - if(isPressing) + if(isPressing_) { - clic = false; + clic_ = false; // Adapt if the selection rectangle has a negative size. - if(pressPos.x() < event->scenePos().x()) - selection.setRect(pressPos.x(), 0, event->scenePos().x()-pressPos.x(), 0); + if(pressPos_.x() < event->scenePos().x()) + selection_.setRect(pressPos_.x(), 0, event->scenePos().x()-pressPos_.x(), 0); else - selection.setRect(event->scenePos().x(), 0, pressPos.x()-event->scenePos().x(), 0); + selection_.setRect(event->scenePos().x(), 0, pressPos_.x()-event->scenePos().x(), 0); - if(pressPos.y() < event->scenePos().y()) - selection.setRect(selection.rect().x(), pressPos.y(), selection.rect().width(), event->scenePos().y()-pressPos.y()); + if(pressPos_.y() < event->scenePos().y()) + selection_.setRect(selection_.rect().x(), pressPos_.y(), selection_.rect().width(), event->scenePos().y()-pressPos_.y()); else - selection.setRect(selection.rect().x(), event->scenePos().y(), selection.rect().width(), pressPos.y()-event->scenePos().y()); + selection_.setRect(selection_.rect().x(), event->scenePos().y(), selection_.rect().width(), pressPos_.y()-event->scenePos().y()); } } @@ -74,18 +74,22 @@ void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if(event->button() == Qt::LeftButton) { - isPressing = false; + isPressing_ = false; // If no selection, store the click position in the selection rectangle. - if(clic) - selection.setRect(QRectF(QPointF(0, 0), event->scenePos())); + if(clic_) + selection_.setRect(QRectF(QPointF(0, 0), event->scenePos())); // Redraw all items in selection. - if(item) - selectItems(selection.rect(), clic); - - selection.setRect(0, 0, 0, 0); - selection.hide(); + if(item_) + { + emit beginSelection(); + selectItems(selection_.rect(), clic_); + emit endSelection(); + } + + selection_.setRect(0, 0, 0, 0); + selection_.hide(); } } @@ -97,7 +101,7 @@ void Scene::selectItem(PolygonItem *graphicalItem) PolygonItem *polygonItem; // Unselect all items. - foreach(child, item->childItems()) + foreach(child, item_->childItems()) { polygonItem = static_cast<PolygonItem *>(child); polygonItem->unselect(); @@ -116,58 +120,11 @@ void Scene::selectItem(PolygonItem *graphicalItem) } } -void Scene::selectItems(const QRectF &rect, bool clic) +void Scene::selectItems(const QRectF& rect, bool clic) { QGraphicsItem *child; - PolygonItem *polygonItem; - QList<QTreeWidgetItem *> selectionTree; - QTreeWidgetItem *treeItem; - bool isSel; - - // Redraw all items in the scene except selection. - foreach(child, item->childItems()) - { - polygonItem = static_cast<PolygonItem *>(child); - isSel = polygonItem->isSelected(rect, clic); - - // If item selectionned, select it on the xml tree and the scene. - if(isSel) - { - polygonItem->select(); - treeItem = VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1)); - treeItem = new QTreeWidgetItem(*treeItem); - selectionTree << treeItem; - } - else - polygonItem->unselect(); - - if(polygonItem->data(0).toInt() == GraphicRegion::Text) - { - // Run through each child lines items and do the same. - foreach(child, polygonItem->childItems()) - { - polygonItem = static_cast<PolygonItem *>(child); - isSel = polygonItem->isSelected(rect, clic); - - if(isSel) - { - polygonItem->select(); - - // Check if the corresponding text region has been clicked. - if(treeItem) - treeItem->addChild(new QTreeWidgetItem(*VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1)))); - else - selectionTree << new QTreeWidgetItem(*VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1))); - } - else - polygonItem->unselect(); - } - } - - treeItem = 0; - } - - emit selectTreeItems(selectionTree); + foreach(child, item_->childItems()) + static_cast<PolygonItem *>(child)->setSelected(rect, clic); } void Scene::addPolygonItem(QGraphicsItem *item) @@ -175,13 +132,13 @@ void Scene::addPolygonItem(QGraphicsItem *item) // Delete all items in the scene. clear(); - this->item = item; + item_ = item; addItem(item); } void Scene::changeScene(const QString& filename, const QPixmap& pixmap, QGraphicsItem *item) { - path = filename; + backgroundPath_ = filename; // Delete all items in the scene. clear(); diff --git a/GScribo/Rendering/scene.h b/GScribo/Rendering/scene.h index ac63f7f..0cf964e 100644 --- a/GScribo/Rendering/scene.h +++ b/GScribo/Rendering/scene.h @@ -34,21 +34,22 @@ class Scene : private: void init(); - QGraphicsItem *item; - Selection selection; - QPointF pressPos; - bool isPressing; - bool clic; - QString path; + QGraphicsItem *item_; + Selection selection_; + QPointF pressPos_; + bool isPressing_; + bool clic_; + QString backgroundPath_; public slots: void selectItem(PolygonItem *graphicalItem); signals: - void selectTreeItems(const QList<QTreeWidgetItem *>& selectionTree); + void beginSelection(); + void endSelection(); }; inline QString Scene::backgroundPath() const -{ return path; } +{ return backgroundPath_; } #endif // SCENE_H diff --git a/GScribo/XmlWidget/selectionproxy.h b/GScribo/XmlWidget/selectionproxy.h new file mode 100644 index 0000000..c9beaae --- /dev/null +++ b/GScribo/XmlWidget/selectionproxy.h @@ -0,0 +1,36 @@ +#ifndef SELECTIONPROXY_H +#define SELECTIONPROXY_H + +#include <QSortFilterProxyModel> + +#include "xmlitem.h" + +class SelectionProxy : + public QSortFilterProxyModel +{ + public: + explicit SelectionProxy(QObject *parent = 0) : QSortFilterProxyModel(parent) { } + inline void beginResetModel(); + inline void endResetModel(); + + protected: + inline bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const; +}; + +inline bool SelectionProxy::filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const +{ + QModelIndex index = static_cast<QSortFilterProxyModel *>(sourceModel())->sourceModel()->index(sourceRow, 0, sourceParent); + + if(index.isValid()) + return static_cast<XmlItem *>(index.internalPointer())->isSelected(); + + return false; +} + +inline void SelectionProxy::beginResetModel() +{ QSortFilterProxyModel::beginResetModel(); } + +inline void SelectionProxy::endResetModel() +{ QSortFilterProxyModel::endResetModel(); } + +#endif // SELECTIONPROXY_H diff --git a/GScribo/XmlWidget/xmlitem.cpp b/GScribo/XmlWidget/xmlitem.cpp index b844eab..ec635ba 100644 --- a/GScribo/XmlWidget/xmlitem.cpp +++ b/GScribo/XmlWidget/xmlitem.cpp @@ -21,6 +21,7 @@ XmlItem::~XmlItem() void XmlItem::init(XmlItem *parent, XmlItem *precItem) { + isSelected_ = true; graphicalItem_ = 0; parent_ = parent; diff --git a/GScribo/XmlWidget/xmlitem.h b/GScribo/XmlWidget/xmlitem.h index 7dafdae..542d764 100644 --- a/GScribo/XmlWidget/xmlitem.h +++ b/GScribo/XmlWidget/xmlitem.h @@ -3,9 +3,10 @@ #include <QDomElement> -#include "Rendering/polygonitem.h" #include "xmlattributes.h" +class PolygonItem; + class XmlItem { public: @@ -18,12 +19,16 @@ class XmlItem inline QList<XmlItem *> childs() const; inline XmlItem *child(int i) const; inline void addChild(XmlItem *child); - inline XmlItem *parent() const; inline PolygonItem *graphicalItem(); inline void setGraphicalItem(PolygonItem *graphicalItem); + inline bool isSelected() const; + inline void setSelected(bool selected); + inline void select(); + inline void unselect(); + inline QString text() const; inline int row() const; inline XmlAttributes attributes() const; @@ -32,6 +37,7 @@ class XmlItem void init(XmlItem *parent = 0, XmlItem *precItem = 0); int row_; + bool isSelected_; QList<XmlItem *> childs_; XmlItem *parent_; PolygonItem *graphicalItem_; @@ -57,6 +63,18 @@ inline PolygonItem *XmlItem::graphicalItem() inline void XmlItem::setGraphicalItem(PolygonItem *graphicalItem) { graphicalItem_ = graphicalItem; } +inline bool XmlItem::isSelected() const +{ return isSelected_; } + +inline void XmlItem::setSelected(bool selected) +{ isSelected_ = selected; } + +inline void XmlItem::select() +{ setSelected(true); } + +inline void XmlItem::unselect() +{ setSelected(false); } + inline QString XmlItem::text() const { return text_; } diff --git a/GScribo/XmlWidget/xmlmodel.cpp b/GScribo/XmlWidget/xmlmodel.cpp index b147c68..cafef3e 100644 --- a/GScribo/XmlWidget/xmlmodel.cpp +++ b/GScribo/XmlWidget/xmlmodel.cpp @@ -3,15 +3,13 @@ XmlModel::XmlModel(XmlItem *rootItem, QObject *parent) : QAbstractItemModel(parent) { - rowCount_ = 0; - rootItem_ = 0; + rootItem_ = rootItem; } XmlModel::XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate& dd, QObject *parent) : QAbstractItemModel(dd, parent) { - rowCount_ = 0; - rootItem_ = 0; + rootItem_ = rootItem; } XmlModel::~XmlModel() @@ -28,6 +26,14 @@ QVariant XmlModel::headerData(int/* section*/, Qt::Orientation orientation, int return QVariant(); } +Qt::ItemFlags XmlModel::flags(const QModelIndex &index) const +{ + if(!index.isValid()) + return 0; + + return Qt::ItemIsEnabled | Qt::ItemIsSelectable; +} + QVariant XmlModel::data(const QModelIndex& index, int role) const { if(!index.isValid()) @@ -36,14 +42,13 @@ QVariant XmlModel::data(const QModelIndex& index, int role) const switch(role) { case Qt::UserRole: - return list_.at(index.row())->text(); - //return static_cast<XmlItem *>(index.internalPointer())->text(); + return static_cast<XmlItem *>(index.internalPointer())->text(); case Qt::UserRole+1: - //return static_cast<XmlItem *>(index.internalPointer())->attributes().names(); + return static_cast<XmlItem *>(index.internalPointer())->attributes().names(); case Qt::UserRole+2: - //return static_cast<XmlItem *>(index.internalPointer())->attributes().values(); + return static_cast<XmlItem *>(index.internalPointer())->attributes().values(); default: return QVariant(); @@ -77,29 +82,14 @@ QModelIndex XmlModel::parent(const QModelIndex& child) const return createIndex(parentItem->row(), 0, parentItem); } -void XmlModel::clear() -{ - /*if(rootItem_) - { - beginResetModel(); - delete rootItem_; - rowCount_ = 0; - endResetModel(); - }*/ -} - void XmlModel::load(XmlItem *rootItem) { - if(rootItem) - { - //beginInsertRows(QModelIndex(), 0, rootItem_->childs().count()); + beginResetModel(); - XmlItem *child; - foreach(child, rootItem->childs()) - list_ << child; + if(rootItem_) + delete rootItem_; - rowCount_ = rootItem->childs().count(); + rootItem_ = rootItem; - //endInsertRows(); - } + endResetModel(); } diff --git a/GScribo/XmlWidget/xmlmodel.h b/GScribo/XmlWidget/xmlmodel.h index 46e7cd4..2ac9fac 100644 --- a/GScribo/XmlWidget/xmlmodel.h +++ b/GScribo/XmlWidget/xmlmodel.h @@ -20,6 +20,8 @@ class XmlModel : inline int columnCount(const QModelIndex& parent) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const; + Qt::ItemFlags flags(const QModelIndex &index) const; + QVariant data(const QModelIndex& index, int role) const; QModelIndex index(int row, int column, const QModelIndex& parent) const; @@ -29,16 +31,13 @@ class XmlModel : inline XmlItem *toXmlItem(const QModelIndex& index) const; XmlItem *rootItem_; - QList<XmlItem *> list_; - int rowCount_; - }; inline XmlItem *XmlModel::toXmlItem(const QModelIndex& parent) const { return !parent.isValid() ? rootItem_ : static_cast<XmlItem *>(parent.internalPointer()); } -inline int XmlModel::rowCount(const QModelIndex&/* parent*/) const -{ return rowCount_; } +inline int XmlModel::rowCount(const QModelIndex& parent) const +{ if(rootItem_) return toXmlItem(parent)->childs().count(); return 0; } inline int XmlModel::columnCount(const QModelIndex&/* parent*/) const { return 1; } diff --git a/GScribo/XmlWidget/xmlview.cpp b/GScribo/XmlWidget/xmlview.cpp index 5f71bdf..59b55f5 100644 --- a/GScribo/XmlWidget/xmlview.cpp +++ b/GScribo/XmlWidget/xmlview.cpp @@ -1,12 +1,5 @@ #include "xmlview.h" -XmlView::XmlView(XmlItem *rootItem) +XmlView::XmlView(XmlItem */*rootItem*/) { - load(rootItem); -} - -void XmlView::load(XmlItem *rootItem) -{ - model_->clear(); - model_->load(rootItem); } diff --git a/GScribo/XmlWidget/xmlview.h b/GScribo/XmlWidget/xmlview.h index e3f0881..89fee1e 100644 --- a/GScribo/XmlWidget/xmlview.h +++ b/GScribo/XmlWidget/xmlview.h @@ -10,18 +10,7 @@ class XmlView : public QTreeView { public: - explicit XmlView(XmlItem *rootItem = 0); - - void load(XmlItem *rootItem); - - inline XmlItem *rootItem() const; - inline XmlModel *model() const; - - private: - XmlModel *model_; + explicit XmlView(XmlItem * = 0); }; -inline XmlModel *XmlView::model() const -{ return model_; } - #endif // XMLVIEW_H diff --git a/GScribo/XmlWidget/xmlwidget.cpp b/GScribo/XmlWidget/xmlwidget.cpp index aab3ad5..f5f2184 100644 --- a/GScribo/XmlWidget/xmlwidget.cpp +++ b/GScribo/XmlWidget/xmlwidget.cpp @@ -5,8 +5,22 @@ XmlWidget::XmlWidget(QWidget *parent) : { QHBoxLayout *hLayout = new QHBoxLayout; - viewer_.setModel(new XmlModel()); - viewer_.setItemDelegate(new TreeDelegate()); + proxy_.setFilterRegExp(QRegExp(".Region|Line|Metadata|Page|Creator|Created|LastChange|Comments", Qt::CaseInsensitive)); + proxy_.setFilterRole(Qt::UserRole); + proxy_.setSourceModel(&model_); + proxy_.setDynamicSortFilter(true); + + selectionProxy_.setFilterRole(Qt::UserRole); + selectionProxy_.setSourceModel(&proxy_); + selectionProxy_.setDynamicSortFilter(true); + + TreeDelegate *treeDelegate = new TreeDelegate; + + viewer_.setModel(&proxy_); + viewer_.setItemDelegate(treeDelegate); + + selection_.setModel(&selectionProxy_); + selection_.setItemDelegate(treeDelegate); hLayout->addWidget(&viewer_); hLayout->addWidget(&selection_); @@ -17,5 +31,5 @@ XmlWidget::XmlWidget(QWidget *parent) : void XmlWidget::changeView(XmlItem *rootItem) { - viewer_.load(rootItem); + model_.load(rootItem); } diff --git a/GScribo/XmlWidget/xmlwidget.h b/GScribo/XmlWidget/xmlwidget.h index 6b9c98c..5962d4a 100644 --- a/GScribo/XmlWidget/xmlwidget.h +++ b/GScribo/XmlWidget/xmlwidget.h @@ -1,6 +1,7 @@ #ifndef XMLWIDGET_H #define XMLWIDGET_H +#include <QSortFilterProxyModel> #include <QGraphicsView> #include <QTreeWidget> #include <QVBoxLayout> @@ -8,7 +9,7 @@ #include <QWidget> #include <QLabel> -#include "Rendering/polygonitem.h" +#include "selectionproxy.h" #include "treedelegate.h" #include "xmlmodel.h" #include "xmlview.h" @@ -24,10 +25,22 @@ class XmlWidget : void changeView(XmlItem *rootItem); private: - + QSortFilterProxyModel proxy_; + SelectionProxy selectionProxy_; + XmlModel model_; XmlView viewer_; - QTreeWidget selection_; + XmlView selection_; QTreeWidget property_; + + public slots: + inline void onBeginGraphicalSelection(); + inline void onEndGraphicalSelection(); }; +inline void XmlWidget::onBeginGraphicalSelection() +{ selectionProxy_.beginResetModel(); } + +inline void XmlWidget::onEndGraphicalSelection() +{ selectionProxy_.endResetModel(); } + #endif // XMLWIDGET_H diff --git a/GScribo/configs.h b/GScribo/configs.h index 594650f..97e5528 100644 --- a/GScribo/configs.h +++ b/GScribo/configs.h @@ -1,7 +1,7 @@ #ifndef CONFIGS_H #define CONFIGS_H -#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> +//#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> #include <QSettings> #include <QDir> @@ -11,7 +11,7 @@ class Configs : public QSettings { public: - Configs() : QSettings("olena-scribo", "gui") {} + Configs() : QSettings("olena-scribo", "gui") { } static Configs * getInstance() { static Configs *conf = new Configs(); return conf; } @@ -28,7 +28,7 @@ class Configs : inline bool preprocessingRemoveNoise(); inline void setPreprocessingRemoveNoise(bool b); - inline int preprocessingBinAlgo(); + //inline int preprocessingBinAlgo(); inline void setPreprocessingBinAlgo(int algo); inline int segmentationFindSeps(); @@ -77,8 +77,8 @@ inline bool Configs::preprocessingRemoveNoise() inline void Configs::setPreprocessingRemoveNoise(bool b) { setValue("preprocessing/remove_noise", b); } -inline int Configs::preprocessingBinAlgo() -{ return value("preprocessing/bin_algo", scribo::toolchain::internal::SauvolaMs).toInt(); } +//inline int Configs::preprocessingBinAlgo() +//{ return value("preprocessing/bin_algo", scribo::toolchain::internal::SauvolaMs).toInt(); } inline void Configs::setPreprocessingBinAlgo(int algo) { setValue("preprocessing/bin_algo", algo); } diff --git a/GScribo/dir.h b/GScribo/dir.h index a6c036b..3de42da 100644 --- a/GScribo/dir.h +++ b/GScribo/dir.h @@ -1,7 +1,7 @@ #ifndef DIR_H #define DIR_H -#define SCRIBO_LOCAL_DEMODIR "/lrde/home/stage/froger_a/olena/_build/scribo/demo" +#define SCRIBO_LOCAL_DEMODIR "/home/onix/olena/_build/scribo/demo" #define SCRIBO_PREFIX_BINDIR "/usr/local/bin" #endif // DIR_H diff --git a/GScribo/mainwindow.cpp b/GScribo/mainwindow.cpp index 0382140..9f343d3 100644 --- a/GScribo/mainwindow.cpp +++ b/GScribo/mainwindow.cpp @@ -160,6 +160,9 @@ void MainWindow::connectWidgets() // If double click on a picture of the page widget -> draw it on background scene. connect(&pagesWidget, SIGNAL(sceneChanged(QString,QPixmap)), this, SLOT(onFileChanged(QString,QPixmap))); + connect(&scene, SIGNAL(beginSelection()), &xmlWidget, SLOT(onBeginGraphicalSelection())); + connect(&scene, SIGNAL(endSelection()), &xmlWidget, SLOT(onEndGraphicalSelection())); + // Connect scene selection with xml tree and vice versa. /*connect(&scene, SIGNAL(selectTreeItems(QList<QTreeWidgetItem*>)), &xmlWidget, SLOT(selectItems(QList<QTreeWidgetItem*>))); connect(&xmlWidget, SIGNAL(selectGraphicalItem(PolygonItem*)), &scene, SLOT(selectItem(PolygonItem*))); diff --git a/GScribo/xml.cpp b/GScribo/xml.cpp index eb7348d..af59c0a 100644 --- a/GScribo/xml.cpp +++ b/GScribo/xml.cpp @@ -123,6 +123,10 @@ void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, PolygonItem *polygonItem = new PolygonItem(polygon, gItem); polygonItem->loadData(data); + // Store xml item and graphical item in each object for selection. + regionItem->setGraphicalItem(polygonItem); + polygonItem->setXmlItem(regionItem); + if(data.region == GraphicRegion::Text) processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, coordsItem); @@ -176,6 +180,10 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte PolygonItem *polygonItem = new PolygonItem(polygon, parentPolygonItem); polygonItem->loadData(itemsData[0]); + // Store xml item and graphical item in each object for selection. + lineItem->setGraphicalItem(polygonItem); + polygonItem->setXmlItem(lineItem); + // Get meanline and baseline. processTypoNode(root, QPoint(xMin, xMax), polygonItem); // Run through all line nodes recursively. diff --git a/XmlTree/XmlTree.pro.user b/XmlTree/XmlTree.pro.user index b935109..866d800 100644 --- a/XmlTree/XmlTree.pro.user +++ b/XmlTree/XmlTree.pro.user @@ -1,243 +1,892 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> + <qtcreator> <data> - <variable>RunConfiguration0-BaseEnvironmentBase</variable> - <value type="int">2</value> - </data> - <data> - <variable>RunConfiguration0-CommandLineArguments</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-ProFile</variable> - <value type="QString">XmlTree.pro</value> - </data> - <data> - <variable>RunConfiguration0-RunConfiguration.name</variable> - <value type="QString">XmlTree</value> - </data> - <data> - <variable>RunConfiguration0-UseDyldImageSuffix</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UseTerminal</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserEnvironmentChanges</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-UserSetName</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserSetWorkingDirectory</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserWorkingDirectory</variable> - <value type="QString"></value> - </data> - <data> - <variable>RunConfiguration0-type</variable> - <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> - </data> - <data> - <variable>activeRunConfiguration</variable> + <variable>ProjectExplorer.Project.ActiveTarget</variable> <value type="int">0</value> </data> <data> - <variable>activebuildconfiguration</variable> - <value type="QString">Debug</value> - </data> - <data> - <variable>buildConfiguration-Debug</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <value key="QtVersionId" type="int">0</value> - <value key="ToolChain" type="int">0</value> - <value key="buildConfiguration" type="int">2</value> - </valuemap> - </data> - <data> - <variable>buildConfiguration-Release</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - <value key="QtVersionId" type="int">0</value> - <value key="buildConfiguration" type="int">0</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=758</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=12582948</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree/XmlTree.pro</value> - <value type="QString">-spec</value> - <value type="QString">linux-g++</value> - <value type="QString">-r</value> - <value type="QString">CONFIG+=debug</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> - <value key="abstractProcess.enabled" type="bool">false</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=758</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=12582948</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-cleanstep0</variable> + <variable>ProjectExplorer.Project.EditorSettings</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <value key="cleanConfig" type="bool">true</value> - <valuelist key="makeargs" type="QVariantList"> - <value type="QString">clean</value> - </valuelist> + <value type="bool" key="EditorConfiguration.AutoIndent">true</value> + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> + <value type="QString" key="language">Cpp</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">CppGlobal</value> + </valuemap> + </valuemap> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> + <value type="QString" key="language">QmlJS</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> + </valuemap> + </valuemap> + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> + <value type="QByteArray" key="EditorConfiguration.Codec">System</value> + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> + <value type="int" key="EditorConfiguration.IndentSize">4</value> + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> + <value type="int" key="EditorConfiguration.PaddingMode">1</value> + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> + <value type="int" key="EditorConfiguration.TabSize">8</value> + <value type="bool" key="EditorConfiguration.UseGlobal">true</value> + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> </valuemap> </data> <data> - <variable>buildconfiguration-Release-buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Release-buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - </valuemap> + <variable>ProjectExplorer.Project.PluginSettings</variable> + <valuemap type="QVariantMap"/> </data> <data> - <variable>buildconfiguration-Release-cleanstep0</variable> + <variable>ProjectExplorer.Project.Target.0</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-desktop-Debug</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-desktop-Release</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Configuration d'exécution Qt4</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">XmlTree</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">XmlTree.pro</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildconfigurations</variable> - <valuelist type="QVariantList"> - <value type="QString">Debug</value> - <value type="QString">Release</value> - </valuelist> - </data> - <data> - <variable>buildstep0</variable> + <variable>ProjectExplorer.Project.Target.1</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="mkspec" type="QString"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60EmulatorTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree sur l'émulateur Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60EmulatorRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.S60EmulatorRunConfiguration.ProFile">XmlTree.pro</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildstep1</variable> + <variable>ProjectExplorer.Project.Target.2</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">3</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60DeviceTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Créer le paquet SIS</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Create SIS package</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60SignBuildStep</value> + <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Certificate"></value> + <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Keyfile"></value> + <value type="int" key="Qt4ProjectManager.S60CreatePackageStep.SignMode">0</value> + <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SmartInstaller">false</value> + <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SuppressPatchWarningDialog">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeployStep</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree sur périphérique Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeviceRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.ProFile">XmlTree.pro</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildsteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.qmake</value> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> - </data> - <data> - <variable>cleanstep0</variable> + <variable>ProjectExplorer.Project.Target.3</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="clean" type="bool">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.MaemoDeviceTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-maemo-Debug</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-maemo-Release</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer le paquet par montage UTFS</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoDeployStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compilation du paquet Debian et installation sur le périphérique Maemo5</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Maemo</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">2.2MaemoDeployConfig</value> + <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">0</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree (sur un périphérique distant)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value> + <value type="int" key="Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase">1</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.ExportedLocalDirs"/> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.ProFile">XmlTree.pro</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.RemoteMountPoints"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value> + <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>cleansteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> + <variable>ProjectExplorer.Project.TargetCount</variable> + <value type="int">4</value> </data> <data> - <variable>defaultFileEncoding</variable> - <value type="QByteArray">System</value> + <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> + <value type="QString">{5e5821f7-3a40-405f-b196-cbc6284a3a45}</value> </data> <data> - <variable>project</variable> - <valuemap type="QVariantMap"/> + <variable>ProjectExplorer.Project.Updater.FileVersion</variable> + <value type="int">10</value> </data> </qtcreator> diff --git a/XmlTree/XmlTree.pro.user.1.3 b/XmlTree/XmlTree.pro.user.1.3 index 7cf0eb5..b935109 100644 --- a/XmlTree/XmlTree.pro.user.1.3 +++ b/XmlTree/XmlTree.pro.user.1.3 @@ -58,7 +58,6 @@ <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <value key="QtVersionId" type="int">0</value> <value key="ToolChain" type="int">0</value> - <value key="addQDumper" type=""></value> <value key="buildConfiguration" type="int">2</value> </valuemap> </data> @@ -67,7 +66,6 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> <value key="QtVersionId" type="int">0</value> - <value key="addQDumper" type=""></value> <value key="buildConfiguration" type="int">0</value> </valuemap> </data> @@ -76,36 +74,33 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> <value type="QString">XTERM_VERSION=XTerm(261)</value> @@ -128,36 +123,33 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> <value type="QString">XTERM_VERSION=XTerm(261)</value> @@ -176,50 +168,6 @@ <variable>buildconfiguration-Debug-cleanstep0</variable> <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">true</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">clean</value> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> <value key="cleanConfig" type="bool">true</value> <valuelist key="makeargs" type="QVariantList"> <value type="QString">clean</value> diff --git a/XmlTree/xmldelegate.cpp b/XmlTree/xmldelegate.cpp index 1999dfe..6c6402b 100644 --- a/XmlTree/xmldelegate.cpp +++ b/XmlTree/xmldelegate.cpp @@ -6,6 +6,4 @@ XmlDelegate::XmlDelegate(QObject *parent) : } void XmlDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const -{ - -} +{ QStyledItemDelegate::paint(painter, option, index); painter->drawText(option.rect, index.data(Qt::UserRole).toString()); } -- 1.7.2.5

11 years, 10 months

0e51828 Try to implement model but can t find out how to load and delete all curent index to replace it.

by Antoine Froger

--- GScribo/GScribo.pro | 52 +- GScribo/GScribo.pro.user | 466 ++++----- GScribo/{PagesViewer => PagesWidget}/listmodel.cpp | 0 GScribo/{PagesViewer => PagesWidget}/listmodel.h | 0 .../{PagesViewer => PagesWidget}/pageswidget.cpp | 0 GScribo/{PagesViewer => PagesWidget}/pageswidget.h | 0 GScribo/XmlWidget/attributesdelegate.h | 22 + GScribo/XmlWidget/treedelegate.h | 21 + GScribo/{ => XmlWidget}/xmlattributes.cpp | 0 GScribo/{ => XmlWidget}/xmlattributes.h | 1 + GScribo/XmlWidget/xmlattributes.o | Bin 0 -> 174652 bytes GScribo/{ => XmlWidget}/xmlitem.cpp | 19 +- GScribo/{ => XmlWidget}/xmlitem.h | 12 +- GScribo/XmlWidget/xmlitem.o | Bin 0 -> 275912 bytes GScribo/XmlWidget/xmlmodel.cpp | 105 ++ GScribo/{ => XmlWidget}/xmlmodel.h | 18 +- GScribo/XmlWidget/xmlmodel.o | Bin 0 -> 289792 bytes GScribo/XmlWidget/xmlview.cpp | 12 + GScribo/XmlWidget/xmlview.h | 27 + GScribo/XmlWidget/xmlwidget.cpp | 21 + GScribo/XmlWidget/xmlwidget.h | 33 + GScribo/XmlWidget/xmlwidget.o | Bin 0 -> 339732 bytes GScribo/dir.h | 2 +- GScribo/main.cpp | 14 +- GScribo/mainwindow.cpp | 16 +- GScribo/mainwindow.h | 14 +- GScribo/xml.cpp | 93 +- GScribo/xml.h | 21 +- GScribo/xmlmodel.cpp | 71 -- GScribo/xmlwidget.cpp | 163 --- GScribo/xmlwidget.h | 55 - XmlTree/XmlTree.pro.user | 1067 ++++---------------- XmlTree/xmldelegate.cpp | 3 +- 33 files changed, 795 insertions(+), 1533 deletions(-) rename GScribo/{PagesViewer => PagesWidget}/listmodel.cpp (100%) rename GScribo/{PagesViewer => PagesWidget}/listmodel.h (100%) rename GScribo/{PagesViewer => PagesWidget}/pageswidget.cpp (100%) rename GScribo/{PagesViewer => PagesWidget}/pageswidget.h (100%) create mode 100644 GScribo/XmlWidget/attributesdelegate.h create mode 100644 GScribo/XmlWidget/treedelegate.h rename GScribo/{ => XmlWidget}/xmlattributes.cpp (100%) rename GScribo/{ => XmlWidget}/xmlattributes.h (96%) create mode 100644 GScribo/XmlWidget/xmlattributes.o rename GScribo/{ => XmlWidget}/xmlitem.cpp (63%) rename GScribo/{ => XmlWidget}/xmlitem.h (81%) create mode 100644 GScribo/XmlWidget/xmlitem.o create mode 100644 GScribo/XmlWidget/xmlmodel.cpp rename GScribo/{ => XmlWidget}/xmlmodel.h (61%) create mode 100644 GScribo/XmlWidget/xmlmodel.o create mode 100644 GScribo/XmlWidget/xmlview.cpp create mode 100644 GScribo/XmlWidget/xmlview.h create mode 100644 GScribo/XmlWidget/xmlwidget.cpp create mode 100644 GScribo/XmlWidget/xmlwidget.h create mode 100644 GScribo/XmlWidget/xmlwidget.o delete mode 100644 GScribo/xmlmodel.cpp delete mode 100644 GScribo/xmlwidget.cpp delete mode 100644 GScribo/xmlwidget.h diff --git a/GScribo/GScribo.pro b/GScribo/GScribo.pro index fe3d55e..7798a52 100644 --- a/GScribo/GScribo.pro +++ b/GScribo/GScribo.pro @@ -2,62 +2,58 @@ # Project created by QtCreator 2013-01-21T09:20:54 # ------------------------------------------------- QT += xml -INCLUDEPATH += /home/onix/olena/milena/ \ - /home/onix/olena/scribo/ \ - /home/onix/olena/_build/scribo/demo/ +INCLUDEPATH += /lrde/home/stage/froger_a/olena/milena/ \ + /lrde/home/stage/froger_a/olena/scribo/ \ + /lrde/home/stage/froger_a/olena/_build/scribo/demo/ QMAKE_CXXFLAGS += -DNDEBUG \ -DMLN_WO_GLOBAL_VARS LIBS += -I/usr/include/graphicsImage \ -lGraphicsMagick++ \ - -ltesseract + -ltesseract_full TARGET = GScribo TEMPLATE = app SOURCES += main.cpp \ mainwindow.cpp \ + xml.cpp \ Rendering/scene.cpp \ Rendering/selection.cpp \ Rendering/polygonitem.cpp \ - PagesViewer/pageswidget.cpp \ - PagesViewer/listmodel.cpp \ + PagesWidget/pageswidget.cpp \ + PagesWidget/listmodel.cpp \ Preferences/segmentationoptions.cpp \ Preferences/preprocessingoptions.cpp \ Preferences/ocroptions.cpp \ Preferences/generaloptions.cpp \ Preferences/preferencesdialog.cpp \ - Processing/progressdialog.cpp \ - Processing/process.cpp \ - Processing/preprocess.cpp \ - Processing/runner.cpp \ - xml.cpp \ - xmlwidget.cpp \ - xmlmodel.cpp \ - xmlitem.cpp \ - xmlattributes.cpp + XmlWidget/xmlwidget.cpp \ + XmlWidget/xmlmodel.cpp \ + XmlWidget/xmlitem.cpp \ + XmlWidget/xmlattributes.cpp \ + XmlWidget/xmlview.cpp HEADERS += mainwindow.h \ + variantpointer.h \ configs.h \ region.h \ + dir.h \ + xml.h \ Rendering/scene.h \ Rendering/selection.h \ Rendering/polygonitem.h \ - PagesViewer/pageswidget.h \ - PagesViewer/listmodel.h \ + PagesWidget/pageswidget.h \ + PagesWidget/listmodel.h \ Preferences/segmentationoptions.h \ Preferences/preprocessingoptions.h \ Preferences/ocroptions.h \ Preferences/generaloptions.h \ Preferences/optionwidget.h \ Preferences/preferencesdialog.h \ - Processing/preprocess.h \ - Processing/progressdialog.h \ - Processing/process.h \ - dir.h \ - Processing/runner.h \ - xml.h \ - variantpointer.h \ - xmlwidget.h \ - xmlmodel.h \ - xmlitem.h \ - xmlattributes.h + XmlWidget/xmlwidget.h \ + XmlWidget/xmlmodel.h \ + XmlWidget/xmlitem.h \ + XmlWidget/xmlattributes.h \ + XmlWidget/treedelegate.h \ + XmlWidget/attributesdelegate.h \ + XmlWidget/xmlview.h FORMS += mainwindow.ui \ Preferences/preferencesdialog.ui \ Preferences/ocroptions.ui \ diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index 0f4e800..ab3db9a 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -1,265 +1,245 @@ -<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> - <qtcreator> <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> + <variable>RunConfiguration0-BaseEnvironmentBase</variable> + <value type="int">2</value> + </data> + <data> + <variable>RunConfiguration0-CommandLineArguments</variable> + <valuelist type="QVariantList"/> + </data> + <data> + <variable>RunConfiguration0-ProFile</variable> + <value type="QString">GScribo.pro</value> + </data> + <data> + <variable>RunConfiguration0-RunConfiguration.name</variable> + <value type="QString">GScribo</value> + </data> + <data> + <variable>RunConfiguration0-UseDyldImageSuffix</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UseTerminal</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserEnvironmentChanges</variable> + <valuelist type="QVariantList"/> + </data> + <data> + <variable>RunConfiguration0-UserSetName</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserSetWorkingDirectory</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserWorkingDirectory</variable> + <value type="QString"></value> + </data> + <data> + <variable>RunConfiguration0-type</variable> + <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> + </data> + <data> + <variable>activeRunConfiguration</variable> <value type="int">0</value> </data> <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> + <variable>activebuildconfiguration</variable> + <value type="QString">Debug</value> + </data> + <data> + <variable>buildConfiguration-Debug</variable> <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">System</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <value key="QtVersionId" type="int">0</value> + <value key="ToolChain" type="int">0</value> + <value key="addQDumper" type=""></value> + <value key="buildConfiguration" type="int">2</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"/> + <variable>buildConfiguration-Release</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + <value key="QtVersionId" type="int">0</value> + <value key="addQDumper" type=""></value> + <value key="buildConfiguration" type="int">0</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-buildstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt/GScribo/XmlWidget</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo/GScribo.pro</value> + <value type="QString">-spec</value> + <value type="QString">linux-g++</value> + <value type="QString">-r</value> + <value type="QString">CONFIG+=debug</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> + <value key="abstractProcess.enabled" type="bool">false</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt/GScribo/XmlWidget</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">-w</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/make</value> + <value key="abstractProcess.enabled" type="bool">true</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-cleanstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <value key="cleanConfig" type="bool">true</value> + <valuelist key="makeargs" type="QVariantList"> + <value type="QString">clean</value> + </valuelist> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Release-buildstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Release-buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Release-cleanstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + </valuemap> + </data> + <data> + <variable>buildconfigurations</variable> + <valuelist type="QVariantList"> + <value type="QString">Debug</value> + <value type="QString">Release</value> + </valuelist> + </data> + <data> + <variable>buildstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value key="mkspec" type="QString"></value> + </valuemap> + </data> + <data> + <variable>buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + </valuemap> + </data> + <data> + <variable>buildsteps</variable> + <valuelist type="QVariantList"> + <value type="QString">trolltech.qt4projectmanager.qmake</value> + <value type="QString">trolltech.qt4projectmanager.make</value> + </valuelist> </data> <data> - <variable>ProjectExplorer.Project.Target.0</variable> + <variable>cleanstep0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.1 dans le PATH (Système) Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.1 dans le PATH (Système) Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GScribo.pro</value> - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value key="clean" type="bool">true</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">1</value> + <variable>cleansteps</variable> + <valuelist type="QVariantList"> + <value type="QString">trolltech.qt4projectmanager.make</value> + </valuelist> </data> <data> - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> - <value type="QString">{5e5821f7-3a40-405f-b196-cbc6284a3a45}</value> + <variable>defaultFileEncoding</variable> + <value type="QByteArray">System</value> </data> <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">10</value> + <variable>project</variable> + <valuemap type="QVariantMap"/> </data> </qtcreator> diff --git a/GScribo/PagesViewer/listmodel.cpp b/GScribo/PagesWidget/listmodel.cpp similarity index 100% rename from GScribo/PagesViewer/listmodel.cpp rename to GScribo/PagesWidget/listmodel.cpp diff --git a/GScribo/PagesViewer/listmodel.h b/GScribo/PagesWidget/listmodel.h similarity index 100% rename from GScribo/PagesViewer/listmodel.h rename to GScribo/PagesWidget/listmodel.h diff --git a/GScribo/PagesViewer/pageswidget.cpp b/GScribo/PagesWidget/pageswidget.cpp similarity index 100% rename from GScribo/PagesViewer/pageswidget.cpp rename to GScribo/PagesWidget/pageswidget.cpp diff --git a/GScribo/PagesViewer/pageswidget.h b/GScribo/PagesWidget/pageswidget.h similarity index 100% rename from GScribo/PagesViewer/pageswidget.h rename to GScribo/PagesWidget/pageswidget.h diff --git a/GScribo/XmlWidget/attributesdelegate.h b/GScribo/XmlWidget/attributesdelegate.h new file mode 100644 index 0000000..6442e49 --- /dev/null +++ b/GScribo/XmlWidget/attributesdelegate.h @@ -0,0 +1,22 @@ +#ifndef ATTRIBUTESDELEGATE_H +#define ATTRIBUTESDELEGATE_H + +#include <QStyledItemDelegate> +#include <QPainter> + +class AttributesDelegate : + public QStyledItemDelegate +{ + public: + explicit AttributesDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) { } + + inline void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; +}; + +inline void paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const +{ + QStyledItemDelegate::paint(painter, option, index); + painter->drawText(option.rect, painter.index.column() == 0 ? index.data(Qt::UserRole+1).toString() : index.data(Qt::UserRole+2).toString()); +} + +#endif // ATTRIBUTESDELEGATE_H diff --git a/GScribo/XmlWidget/treedelegate.h b/GScribo/XmlWidget/treedelegate.h new file mode 100644 index 0000000..4dbc8be --- /dev/null +++ b/GScribo/XmlWidget/treedelegate.h @@ -0,0 +1,21 @@ +#ifndef TREEDELEGATE_H +#define TREEDELEGATE_H + +#include <QStyledItemDelegate> +#include <QPainter> + +#include "xmlitem.h" + +class TreeDelegate : + public QStyledItemDelegate +{ + public: + explicit TreeDelegate(QObject *parent = 0) : QStyledItemDelegate(parent) { } + + inline void paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; +}; + +inline void TreeDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const +{ QStyledItemDelegate::paint(painter, option, index); painter->drawText(option.rect, index.data(Qt::UserRole).toString()); } + +#endif // TREEDELEGATE_H diff --git a/GScribo/xmlattributes.cpp b/GScribo/XmlWidget/xmlattributes.cpp similarity index 100% rename from GScribo/xmlattributes.cpp rename to GScribo/XmlWidget/xmlattributes.cpp diff --git a/GScribo/xmlattributes.h b/GScribo/XmlWidget/xmlattributes.h similarity index 96% rename from GScribo/xmlattributes.h rename to GScribo/XmlWidget/xmlattributes.h index cc187b1..b0ac030 100644 --- a/GScribo/xmlattributes.h +++ b/GScribo/XmlWidget/xmlattributes.h @@ -2,6 +2,7 @@ #define XMLATTRIBUTES_H #include <QDomNamedNodeMap> +#include <QStringList> class XmlAttributes { diff --git a/GScribo/XmlWidget/xmlattributes.o b/GScribo/XmlWidget/xmlattributes.o new file mode 100644 index 0000000..f199519 Binary files /dev/null and b/GScribo/XmlWidget/xmlattributes.o differ diff --git a/GScribo/xmlitem.cpp b/GScribo/XmlWidget/xmlitem.cpp similarity index 63% rename from GScribo/xmlitem.cpp rename to GScribo/XmlWidget/xmlitem.cpp index 3f939ee..b844eab 100644 --- a/GScribo/xmlitem.cpp +++ b/GScribo/XmlWidget/xmlitem.cpp @@ -1,22 +1,11 @@ #include "xmlitem.h" -XmlItem::XmlItem(XmlItem *parent) -{ - init(parent); -} - -XmlItem::XmlItem(XmlItem *precItem, XmlItem *parent) +XmlItem::XmlItem(XmlItem *parent, XmlItem *precItem) { init(parent, precItem); } -XmlItem::XmlItem(const QDomElement& node, XmlItem *parent) -{ - init(parent); - load(node); -} - -XmlItem::XmlItem(const QDomElement& node, XmlItem *precItem, XmlItem *parent) +XmlItem::XmlItem(const QDomElement& node, XmlItem *parent, XmlItem *precItem) { init(parent, precItem); load(node); @@ -31,7 +20,7 @@ XmlItem::~XmlItem() } void XmlItem::init(XmlItem *parent, XmlItem *precItem) -{ +{ graphicalItem_ = 0; parent_ = parent; @@ -49,5 +38,5 @@ void XmlItem::load(const QDomElement& node) text_ = node.tagName(); // Load attributes. - attributes_.load(node); + attributes_.load(node.attributes()); } diff --git a/GScribo/xmlitem.h b/GScribo/XmlWidget/xmlitem.h similarity index 81% rename from GScribo/xmlitem.h rename to GScribo/XmlWidget/xmlitem.h index d5de01c..7dafdae 100644 --- a/GScribo/xmlitem.h +++ b/GScribo/XmlWidget/xmlitem.h @@ -9,10 +9,8 @@ class XmlItem { public: - explicit XmlItem(XmlItem *parent = 0); - explicit XmlItem(XmlItem *precItem, XmlItem *parent = 0); - explicit XmlItem(const QDomElement& node, XmlItem *parent = 0); - explicit XmlItem(const QDomElement& node, XmlItem *precItem, XmlItem *parent = 0); + explicit XmlItem(XmlItem *parent = 0, XmlItem *precItem = 0); + explicit XmlItem(const QDomElement& node, XmlItem *parent = 0, XmlItem *precItem = 0); ~XmlItem(); void load(const QDomElement& node); @@ -28,7 +26,7 @@ class XmlItem inline QString text() const; inline int row() const; - inline XmlAttributes *attributes() const; + inline XmlAttributes attributes() const; private: void init(XmlItem *parent = 0, XmlItem *precItem = 0); @@ -45,7 +43,7 @@ inline QList<XmlItem *> XmlItem::childs() const { return childs_; } inline XmlItem *XmlItem::child(int i) const -{ return childs_[i]; } +{ if(i > -1 && i < childs_.count()) return childs_[i]; return 0; } inline void XmlItem::addChild(XmlItem *child) { childs_ << child; } @@ -53,7 +51,7 @@ inline void XmlItem::addChild(XmlItem *child) inline XmlItem *XmlItem::parent() const { return parent_; } -inline PolygonItem *XmlItem::graphicalItem() const +inline PolygonItem *XmlItem::graphicalItem() { return graphicalItem_; } inline void XmlItem::setGraphicalItem(PolygonItem *graphicalItem) diff --git a/GScribo/XmlWidget/xmlitem.o b/GScribo/XmlWidget/xmlitem.o new file mode 100644 index 0000000..4a2a0e8 Binary files /dev/null and b/GScribo/XmlWidget/xmlitem.o differ diff --git a/GScribo/XmlWidget/xmlmodel.cpp b/GScribo/XmlWidget/xmlmodel.cpp new file mode 100644 index 0000000..b147c68 --- /dev/null +++ b/GScribo/XmlWidget/xmlmodel.cpp @@ -0,0 +1,105 @@ +#include "xmlmodel.h" + +XmlModel::XmlModel(XmlItem *rootItem, QObject *parent) : + QAbstractItemModel(parent) +{ + rowCount_ = 0; + rootItem_ = 0; +} + +XmlModel::XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate& dd, QObject *parent) : + QAbstractItemModel(dd, parent) +{ + rowCount_ = 0; + rootItem_ = 0; +} + +XmlModel::~XmlModel() +{ + if(rootItem_) + delete rootItem_; +} + +QVariant XmlModel::headerData(int/* section*/, Qt::Orientation orientation, int role) const +{ + if(orientation == Qt::Horizontal && role == Qt::DisplayRole) + return tr("Tree"); + + return QVariant(); +} + +QVariant XmlModel::data(const QModelIndex& index, int role) const +{ + if(!index.isValid()) + return QVariant(); + + switch(role) + { + case Qt::UserRole: + return list_.at(index.row())->text(); + //return static_cast<XmlItem *>(index.internalPointer())->text(); + + case Qt::UserRole+1: + //return static_cast<XmlItem *>(index.internalPointer())->attributes().names(); + + case Qt::UserRole+2: + //return static_cast<XmlItem *>(index.internalPointer())->attributes().values(); + + default: + return QVariant(); + } +} + +QModelIndex XmlModel::index(int row, int column, const QModelIndex& parent) const +{ + if(!hasIndex(row, column, parent)) + return QModelIndex(); + + XmlItem *childItem = toXmlItem(parent)->child(row); + + // Create the model index from the child item. + if(childItem) + return createIndex(row, column, childItem); + else + return QModelIndex(); +} + +QModelIndex XmlModel::parent(const QModelIndex& child) const +{ + if(!child.isValid()) + return QModelIndex(); + + XmlItem *parentItem = static_cast<XmlItem *>(child.internalPointer())->parent(); + + if(!parentItem || parentItem == rootItem_) + return QModelIndex(); + + return createIndex(parentItem->row(), 0, parentItem); +} + +void XmlModel::clear() +{ + /*if(rootItem_) + { + beginResetModel(); + delete rootItem_; + rowCount_ = 0; + endResetModel(); + }*/ +} + +void XmlModel::load(XmlItem *rootItem) +{ + if(rootItem) + { + //beginInsertRows(QModelIndex(), 0, rootItem_->childs().count()); + + XmlItem *child; + foreach(child, rootItem->childs()) + list_ << child; + + rowCount_ = rootItem->childs().count(); + + //endInsertRows(); + } +} diff --git a/GScribo/xmlmodel.h b/GScribo/XmlWidget/xmlmodel.h similarity index 61% rename from GScribo/xmlmodel.h rename to GScribo/XmlWidget/xmlmodel.h index 10953ae..46e7cd4 100644 --- a/GScribo/xmlmodel.h +++ b/GScribo/XmlWidget/xmlmodel.h @@ -9,11 +9,15 @@ class XmlModel : public QAbstractItemModel { public: - explicit XmlModel(XmlItem *rootItem, QObject *parent = 0); + explicit XmlModel(XmlItem *rootItem = 0, QObject *parent = 0); explicit XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate& dd, QObject *parent = 0); ~XmlModel(); + void load(XmlItem *rootItem); + void clear(); + inline int rowCount(const QModelIndex& parent) const; + inline int columnCount(const QModelIndex& parent) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const; QVariant data(const QModelIndex& index, int role) const; @@ -25,12 +29,18 @@ class XmlModel : inline XmlItem *toXmlItem(const QModelIndex& index) const; XmlItem *rootItem_; + QList<XmlItem *> list_; + int rowCount_; + }; inline XmlItem *XmlModel::toXmlItem(const QModelIndex& parent) const -{ return parent.isValid() ? rootItem_ : static_cast<XmlItem *>(parent.internalPointer()); } +{ return !parent.isValid() ? rootItem_ : static_cast<XmlItem *>(parent.internalPointer()); } + +inline int XmlModel::rowCount(const QModelIndex&/* parent*/) const +{ return rowCount_; } -inline int XmlModel::rowCount(const QModelIndex& parent) const -{ toXmlItem(parent)->childs().count(); } +inline int XmlModel::columnCount(const QModelIndex&/* parent*/) const +{ return 1; } #endif // XMLMODEL_H diff --git a/GScribo/XmlWidget/xmlmodel.o b/GScribo/XmlWidget/xmlmodel.o new file mode 100644 index 0000000..922dc17 Binary files /dev/null and b/GScribo/XmlWidget/xmlmodel.o differ diff --git a/GScribo/XmlWidget/xmlview.cpp b/GScribo/XmlWidget/xmlview.cpp new file mode 100644 index 0000000..5f71bdf --- /dev/null +++ b/GScribo/XmlWidget/xmlview.cpp @@ -0,0 +1,12 @@ +#include "xmlview.h" + +XmlView::XmlView(XmlItem *rootItem) +{ + load(rootItem); +} + +void XmlView::load(XmlItem *rootItem) +{ + model_->clear(); + model_->load(rootItem); +} diff --git a/GScribo/XmlWidget/xmlview.h b/GScribo/XmlWidget/xmlview.h new file mode 100644 index 0000000..e3f0881 --- /dev/null +++ b/GScribo/XmlWidget/xmlview.h @@ -0,0 +1,27 @@ +#ifndef XMLVIEW_H +#define XMLVIEW_H + +#include <QTreeView> + +#include "xmlitem.h" +#include "xmlmodel.h" + +class XmlView : + public QTreeView +{ + public: + explicit XmlView(XmlItem *rootItem = 0); + + void load(XmlItem *rootItem); + + inline XmlItem *rootItem() const; + inline XmlModel *model() const; + + private: + XmlModel *model_; +}; + +inline XmlModel *XmlView::model() const +{ return model_; } + +#endif // XMLVIEW_H diff --git a/GScribo/XmlWidget/xmlwidget.cpp b/GScribo/XmlWidget/xmlwidget.cpp new file mode 100644 index 0000000..aab3ad5 --- /dev/null +++ b/GScribo/XmlWidget/xmlwidget.cpp @@ -0,0 +1,21 @@ +#include "xmlwidget.h" + +XmlWidget::XmlWidget(QWidget *parent) : + QWidget(parent) +{ + QHBoxLayout *hLayout = new QHBoxLayout; + + viewer_.setModel(new XmlModel()); + viewer_.setItemDelegate(new TreeDelegate()); + + hLayout->addWidget(&viewer_); + hLayout->addWidget(&selection_); + hLayout->addWidget(&property_); + + setLayout(hLayout); +} + +void XmlWidget::changeView(XmlItem *rootItem) +{ + viewer_.load(rootItem); +} diff --git a/GScribo/XmlWidget/xmlwidget.h b/GScribo/XmlWidget/xmlwidget.h new file mode 100644 index 0000000..6b9c98c --- /dev/null +++ b/GScribo/XmlWidget/xmlwidget.h @@ -0,0 +1,33 @@ +#ifndef XMLWIDGET_H +#define XMLWIDGET_H + +#include <QGraphicsView> +#include <QTreeWidget> +#include <QVBoxLayout> +#include <QDomElement> +#include <QWidget> +#include <QLabel> + +#include "Rendering/polygonitem.h" +#include "treedelegate.h" +#include "xmlmodel.h" +#include "xmlview.h" + +class XmlWidget : + public QWidget +{ + Q_OBJECT + + public: + explicit XmlWidget(QWidget *parent = 0); + + void changeView(XmlItem *rootItem); + + private: + + XmlView viewer_; + QTreeWidget selection_; + QTreeWidget property_; +}; + +#endif // XMLWIDGET_H diff --git a/GScribo/XmlWidget/xmlwidget.o b/GScribo/XmlWidget/xmlwidget.o new file mode 100644 index 0000000..87ac89f Binary files /dev/null and b/GScribo/XmlWidget/xmlwidget.o differ diff --git a/GScribo/dir.h b/GScribo/dir.h index 3de42da..a6c036b 100644 --- a/GScribo/dir.h +++ b/GScribo/dir.h @@ -1,7 +1,7 @@ #ifndef DIR_H #define DIR_H -#define SCRIBO_LOCAL_DEMODIR "/home/onix/olena/_build/scribo/demo" +#define SCRIBO_LOCAL_DEMODIR "/lrde/home/stage/froger_a/olena/_build/scribo/demo" #define SCRIBO_PREFIX_BINDIR "/usr/local/bin" #endif // DIR_H diff --git a/GScribo/main.cpp b/GScribo/main.cpp index d47ec16..22113d6 100644 --- a/GScribo/main.cpp +++ b/GScribo/main.cpp @@ -1,18 +1,18 @@ #undef MLN_WO_GLOBAL_VARS -#include <scribo/make/debug_filename.hh> -#include <mln/labeling/colorize.hh> -#include <mln/io/magick/load.hh> -#include <mln/literal/colors.hh> -#include <mln/debug/filename.hh> +//#include <scribo/make/debug_filename.hh> +//#include <mln/labeling/colorize.hh> +//#include <mln/io/magick/load.hh> +//#include <mln/literal/colors.hh> +//#include <mln/debug/filename.hh> #include <QtGui/QApplication> -#include <mln/math/pi.hh> +//#include <mln/math/pi.hh> #include "mainwindow.h" int main(int argc, char *argv[]) { - Magick::InitializeMagick(*argv); + //Magick::InitializeMagick(*argv); // On Linux, we NEED to use the raster graphics system. // Linux don't really support openGL graphics system (the default one on Linux). QApplication::setGraphicsSystem("raster"); diff --git a/GScribo/mainwindow.cpp b/GScribo/mainwindow.cpp index 32b5975b..0382140 100644 --- a/GScribo/mainwindow.cpp +++ b/GScribo/mainwindow.cpp @@ -137,8 +137,8 @@ void MainWindow::onSegment() filenames = pagesWidget.filenames(); // Run segmentation of page(s). - progressDialog.reset(); - runner.start_demat(filenames); + //progressDialog.reset(); + //runner.start_demat(filenames); } } @@ -151,8 +151,8 @@ void MainWindow::onXmlSaved(const QString& filename) void MainWindow::onPreferences() { - PreferencesDialog *preferenceDialog = new PreferencesDialog(this); - preferenceDialog->show(); + //PreferencesDialog *preferenceDialog = new PreferencesDialog(this); + //preferenceDialog->show(); } void MainWindow::connectWidgets() @@ -161,15 +161,15 @@ void MainWindow::connectWidgets() connect(&pagesWidget, SIGNAL(sceneChanged(QString,QPixmap)), this, SLOT(onFileChanged(QString,QPixmap))); // Connect scene selection with xml tree and vice versa. - connect(&scene, SIGNAL(selectTreeItems(QList<QTreeWidgetItem*>)), &xmlWidget, SLOT(selectItems(QList<QTreeWidgetItem*>))); + /*connect(&scene, SIGNAL(selectTreeItems(QList<QTreeWidgetItem*>)), &xmlWidget, SLOT(selectItems(QList<QTreeWidgetItem*>))); connect(&xmlWidget, SIGNAL(selectGraphicalItem(PolygonItem*)), &scene, SLOT(selectItem(PolygonItem*))); - connect(&pagesWidget, SIGNAL(removeTreeSelection()), &xmlWidget, SLOT(clear())); + connect(&pagesWidget, SIGNAL(removeTreeSelection()), &xmlWidget, SLOT(clear()));*/ - connect(&runner, SIGNAL(progress()), &progressDialog, SLOT(run())); + /*connect(&runner, SIGNAL(progress()), &progressDialog, SLOT(run())); connect(&runner, SIGNAL(new_progress_max_value(int)), &progressDialog, SLOT(setMaximum(int))); connect(&runner, SIGNAL(new_progress_label(QString)), &progressDialog, SLOT(setLabelText(QString))); connect(&runner, SIGNAL(finished()), &progressDialog, SLOT(close())); - connect(&runner, SIGNAL(xml_saved(QString)), this, SLOT(onXmlSaved(QString))); + connect(&runner, SIGNAL(xml_saved(QString)), this, SLOT(onXmlSaved(QString)));*/ } void MainWindow::connectShortcuts() diff --git a/GScribo/mainwindow.h b/GScribo/mainwindow.h index 456ec65..92642d1 100644 --- a/GScribo/mainwindow.h +++ b/GScribo/mainwindow.h @@ -9,12 +9,12 @@ #include <QFileDialog> #include <QGroupBox> -#include "Preferences/preferencesdialog.h" -#include "Processing/progressdialog.h" -#include "PagesViewer/pageswidget.h" -#include "Processing/runner.h" +//#include "Preferences/preferencesdialog.h" +//#include "Processing/progressdialog.h" +#include "PagesWidget/pageswidget.h" +#include "XmlWidget/xmlwidget.h" +//#include "Processing/runner.h" #include "Rendering/scene.h" -#include "xmlwidget.h" #include "xml.h" namespace Ui @@ -54,8 +54,8 @@ class MainWindow: Scene scene; QPlainTextEdit textEdit; PagesWidget pagesWidget; - Runner runner; - ProgressDialog progressDialog; + //Runner runner; + //ProgressDialog progressDialog; Xml xml; XmlWidget xmlWidget; diff --git a/GScribo/xml.cpp b/GScribo/xml.cpp index 994d788..eb7348d 100644 --- a/GScribo/xml.cpp +++ b/GScribo/xml.cpp @@ -46,7 +46,7 @@ void Xml::load(const QString &filename) if(!filename.isEmpty()) { // Reset graphic and tree items; - tItem = new QTreeWidgetItem; + tItem = new XmlItem; gItem = new QGraphicsPolygonItem; QFile xmlFile(filename); @@ -59,12 +59,10 @@ void Xml::load(const QString &filename) xmlFile.close(); QDomElement root = xml.documentElement(); - tItem->setText(0, root.tagName()); - tItem->setData(1, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); + tItem->load(root); root = root.firstChild().toElement(); - QTreeWidgetItem *parentTreeItem = init(root, tItem); - parentTreeItem->setData(1, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(0)); + XmlItem *parentTreeItem = init(root, tItem); // Run through the xml file structure by structure. root = root.nextSibling().firstChild().toElement(); @@ -74,57 +72,50 @@ void Xml::load(const QString &filename) } } -QTreeWidgetItem *Xml::init(const QDomElement& root, QTreeWidgetItem *rootTreeItem) +XmlItem *Xml::init(const QDomElement& root, XmlItem *rootTreeItem) { - QDomElement node = root; + XmlItem *metadataItem = new XmlItem(root, rootTreeItem); - QTreeWidgetItem *parentTreeItem = new QTreeWidgetItem(rootTreeItem); - parentTreeItem->setText(0, root.tagName()); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(0)); - - QString nodeText; - QTreeWidgetItem *treeItem, *childTreeItem; + XmlItem *contentItem = 0; // Run through "METADATA" node and subnodes. - node = node.firstChild().toElement(); + QDomElement node = root.firstChild().toElement(); while(!node.isNull()) { - treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); - treeItem->setText(0, node.tagName()); - // Store the xml node in the item. - treeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(0)); - - // Add widget item child with text content. - nodeText = node.text(); - childTreeItem = new QTreeWidgetItem(treeItem); - childTreeItem->setText(0, nodeText); - + contentItem = new XmlItem(node, metadataItem, contentItem); node = node.nextSibling().toElement(); } // Add "PAGE" root node and return it. - parentTreeItem = new QTreeWidgetItem(rootTreeItem, parentTreeItem); - parentTreeItem->setText(0, root.nextSibling().toElement().tagName()); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.nextSibling().attributes()))); + metadataItem = new XmlItem(root.nextSibling().toElement(), rootTreeItem, metadataItem); - return parentTreeItem; + return metadataItem; } -void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, QTreeWidgetItem *rootTreeItem) +void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, XmlItem *pageItem) { if(!root.isNull()) { // Create corresponding tree item. - QTreeWidgetItem *parentTreeItem = new QTreeWidgetItem(rootTreeItem, QStringList(root.tagName())); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); + XmlItem *regionItem = new XmlItem(root, pageItem); + + QDomElement node = root.firstChild().toElement(); + XmlItem *coordsItem = new XmlItem(node, regionItem); QPolygon polygon; + XmlItem *pointItem = 0; + QString x, y; // Run through all points data. - QDomElement node = root.firstChild().firstChild().toElement(); + node = node.firstChild().toElement(); while(!node.isNull()) { - polygon << QPoint(node.attribute("x", "null").toInt(), node.attribute("y", "null").toInt()); + x = node.attribute("x", "null"); + y = node.attribute("y", "null"); + + pointItem = new XmlItem(node, coordsItem, pointItem); + + polygon << QPoint(x.toInt(), y.toInt()); node = node.nextSibling().toElement(); } @@ -132,38 +123,44 @@ void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, PolygonItem *polygonItem = new PolygonItem(polygon, gItem); polygonItem->loadData(data); - // Store tree object in the graphical object an vice versa. - polygonItem->setData(1, VariantPointer<QTreeWidgetItem>::toQVariant(parentTreeItem)); - parentTreeItem->setData(0, Qt::UserRole+1, VariantPointer<PolygonItem>::toQVariant(polygonItem)); - if(data.region == GraphicRegion::Text) - processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, parentTreeItem); + processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, coordsItem); // Run through all nodes from the same data structure recursively. - processNode(root.nextSiblingElement(data.name), data, rootTreeItem); + processNode(root.nextSiblingElement(data.name), data, pageItem); } } -void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, QTreeWidgetItem *rootTreeItem) +void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, XmlItem *precItem) { if(!root.isNull()) { // Create corresponding tree item. - QTreeWidgetItem *parentTreeItem = new QTreeWidgetItem(rootTreeItem, QStringList(root.tagName())); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); + XmlItem *lineItem = new XmlItem(root, precItem->parent(), precItem); + + QDomElement node = root.firstChild().toElement(); + XmlItem *coordsItem = new XmlItem(node, lineItem); QPolygon polygon; + XmlItem *pointItem = 0; + + QString xs, ys; int x, y; int xMin = INT_MAX; int xMax = INT_MIN; // Run through all points data. - QDomElement node = root.firstChild().firstChild().toElement(); + node = node.firstChild().toElement(); while(!node.isNull()) { - x = node.attribute("x", "null").toInt(); - y = node.attribute("y", "null").toInt(); + xs = node.attribute("x", "null"); + ys = node.attribute("y", "null"); + + pointItem = new XmlItem(node, coordsItem, pointItem); + + x = xs.toInt(); + y = ys.toInt(); // Get beginning and end of line. if(xMin > x) @@ -179,14 +176,10 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte PolygonItem *polygonItem = new PolygonItem(polygon, parentPolygonItem); polygonItem->loadData(itemsData[0]); - // Store tree object in the graphical object and vice versa. - polygonItem->setData(1, VariantPointer<QTreeWidgetItem>::toQVariant(parentTreeItem)); - parentTreeItem->setData(0, Qt::UserRole+1, VariantPointer<PolygonItem>::toQVariant(polygonItem)); - // Get meanline and baseline. processTypoNode(root, QPoint(xMin, xMax), polygonItem); // Run through all line nodes recursively. - processLineNode(root.nextSiblingElement("Line"), parentPolygonItem, rootTreeItem); + processLineNode(root.nextSiblingElement("Line"), parentPolygonItem, lineItem); } } diff --git a/GScribo/xml.h b/GScribo/xml.h index 67f460c..6637260 100644 --- a/GScribo/xml.h +++ b/GScribo/xml.h @@ -9,6 +9,7 @@ #include <QFile> #include "Rendering/polygonitem.h" +#include "XmlWidget/xmlitem.h" #include "variantpointer.h" #include "configs.h" #include "region.h" @@ -18,7 +19,7 @@ class Xml public: explicit Xml(const QString& filename = QString()); - inline QTreeWidgetItem *treeItem(); + inline XmlItem *treeItem(); inline QGraphicsItem *graphicItem(); inline QDomDocument document() const; inline QString filename() const; @@ -27,19 +28,18 @@ class Xml void load(const QString& filename); private: - QTreeWidgetItem *init(const QDomElement& root, QTreeWidgetItem *rootTreeItem); - inline QTreeWidgetItem *fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem); - void processNode(const QDomElement& root, const GraphicRegion::Data& data, QTreeWidgetItem *rootTreeItem); - void processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, QTreeWidgetItem *rootTreeItem); + XmlItem *init(const QDomElement& root, XmlItem *rootTreeItem); + void processNode(const QDomElement& root, const GraphicRegion::Data& data, XmlItem *rootTreeItem); + void processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, XmlItem *rootTreeItem); void processTypoNode(const QDomElement& root, const QPoint& xPoint, PolygonItem *rootPolygonItem); QGraphicsPolygonItem *gItem; - QTreeWidgetItem *tItem; + XmlItem *tItem; QDomDocument xml; QString path; }; -inline QTreeWidgetItem *Xml::treeItem() +inline XmlItem *Xml::treeItem() { return tItem; } inline QGraphicsItem *Xml::graphicItem() @@ -51,11 +51,4 @@ inline QDomDocument Xml::document() const inline QString Xml::filename() const { return path; } -inline QTreeWidgetItem *Xml::fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem) -{ - QTreeWidgetItem *treeItem = new QTreeWidgetItem(rootTreeItem, QStringList(tagName)); - treeItem = new QTreeWidgetItem(treeItem, QStringList("Coords")); - return treeItem; -} - #endif // XML_H diff --git a/GScribo/xmlmodel.cpp b/GScribo/xmlmodel.cpp deleted file mode 100644 index b923417..0000000 --- a/GScribo/xmlmodel.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "xmlmodel.h" - -XmlModel::XmlModel(XmlItem *rootItem, QObject *parent) : - QAbstractItemModel(parent) -{ - rootItem_ = rootItem; -} - -XmlModel::XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate& dd, QObject *parent) : - QAbstractItemModel(dd, parent) -{ - rootItem_ = rootItem; -} - -XmlModel::~XmlModel() -{ - delete rootItem_; -} - -QVariant XmlModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - return tr("Tree"); -} - -QVariant XmlModel::data(const QModelIndex& index, int role) const -{ - if(!index.isValid()) - return QVariant(); - - switch(role) - { - case Qt::UserRole: - return static_cast<XmlItem *>(index.internalPointer())->text(); - - case Qt::UserRole+1: - return static_cast<XmlItem *>(index.internalPointer())->attributes()->names(); - - case Qt::UserRole+2: - return static_cast<XmlItem *>(index.internalPointer())->attributes()->values(); - - default: - return QVariant(); - } -} - -QModelIndex XmlModel::index(int row, int column, const QModelIndex& parent) const -{ - if(!hasIndex(row, column, parent)) - return QModelIndex(); - - XmlItem *childItem = toXmlItem(parent)->child(row); - - // Create the model index from the child item. - if(childItem) - return createIndex(row, column, childItem); - else - return QModelIndex(); -} - -QModelIndex XmlModel::parent(const QModelIndex& child) const -{ - if(!child.isValid()) - return QModelIndex(); - - XmlItem *parentItem = static_cast<XmlItem *>(child.internalPointer())->parent(); - - if(!parentItem || parentItem == rootItem) - return QModelIndex(); - - return createIndex(parentItem->rowCount(), 0, parentItem); -} diff --git a/GScribo/xmlwidget.cpp b/GScribo/xmlwidget.cpp deleted file mode 100644 index a128b95..0000000 --- a/GScribo/xmlwidget.cpp +++ /dev/null @@ -1,163 +0,0 @@ -#include "xmlwidget.h" - -XmlWidget::XmlWidget(QWidget *parent) : - QWidget(parent) -{ - QHBoxLayout *hLayout = new QHBoxLayout; - - QStringList headerNames; - headerNames << tr("Name") << tr("Value"); - - property.setHeaderItem(new QTreeWidgetItem(headerNames)); - viewer.setHeaderItem(new QTreeWidgetItem(QStringList("Tree"))); - selection.setHeaderItem(new QTreeWidgetItem(QStringList("Selection"))); - - hLayout->addWidget(&viewer); - hLayout->addWidget(&selection); - hLayout->addWidget(&property); - - setLayout(hLayout); - - connect(&viewer, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(selectTreeItem(QTreeWidgetItem*))); - connect(&selection, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(selectSelectedItem(QTreeWidgetItem*))); -} - -XmlWidget::~XmlWidget() -{ - clear(); -} - -void XmlWidget::selectItem(QTreeWidgetItem *treeItem, bool fromSelection) -{ - // Get graphical item corresponding to the tree item. - PolygonItem *graphicalItem = VariantPointer<PolygonItem>::fromQVariant(treeItem->data(0, Qt::UserRole+1)); - - if(!fromSelection) - { - clearSelection(); - - QTreeWidgetItem *selectionedItem = new QTreeWidgetItem(*treeItem); - selectionedItems << selectionedItem; - selection.addTopLevelItem(selectionedItem); - } - - // Told to the scene to select the corresponding graphical item. - emit selectGraphicalItem(graphicalItem); - - viewer.setCurrentItem(treeItem, 0); - - // Fill property tree view. - fillProperty(treeItem); -} - -void XmlWidget::selectItems(const QList<QTreeWidgetItem *>& selectionTree) -{ - clearSelection(); - - if(!selectionTree.isEmpty()) - { - selectionedItems = selectionTree; - - QTreeWidgetItem *treeItem; - foreach(treeItem, selectionTree) - { - selection.addTopLevelItem(treeItem); - /*selection.setCurrentItem(treeItem, 0); - treeItem->setExpanded(true);*/ - } - - fillProperty(treeItem); - } -} - -void XmlWidget::fillProperty(QTreeWidgetItem *treeItem) -{ - property.clear(); - - // Get node from the tree item. - QDomNamedNodeMap *node = VariantPointer<QDomNamedNodeMap>::fromQVariant(treeItem->data(0, Qt::UserRole)); - - if(node) - { - QStringList values; - - // Fill tree widget with all property of a node. - for(int i = 0; i < node->count(); i++) - { - values << node->item(i).toAttr().name() << node->item(i).toAttr().value(); - property.addTopLevelItem(new QTreeWidgetItem(values)); - values.clear(); - } - } - - property.resizeColumnToContents(0); -} - -void XmlWidget::changeView(QTreeWidgetItem *treeItem) -{ - if(treeItem != viewer.topLevelItem(0)) - { - // Delete all dom nodes pointers inside items data. - clear(); - - // Reset tree widgets. - viewer.reset(); - - if(treeItem != 0) - { - viewer.addTopLevelItem(treeItem); - viewer.setCurrentItem(treeItem->child(1), 0); - treeItem->child(1)->setExpanded(true); - } - } -} - -void XmlWidget::clear() -{ - QTreeWidgetItem *topLevelItem = viewer.takeTopLevelItem(0); - - // Delete top level item, all its childs and datas. - if(topLevelItem) - { - deleteItemsNode(topLevelItem); - delete VariantPointer<QDomNamedNodeMap>::fromQVariant(topLevelItem->data(0, Qt::UserRole)); - delete topLevelItem; - - clearSelection(); - } -} - -void XmlWidget::clearSelection() -{ - property.clear(); - - // Delete all selectionned items. - QTreeWidgetItem *item, *child; - foreach(item, selectionedItems) - { - // Delete selectionned lines. - for(int i = 0; i < item->childCount(); i++) - { - child = item->child(i); - delete child; - } - - delete item; - } - - selectionedItems = QList<QTreeWidgetItem *>(); -} - -void XmlWidget::deleteItemsNode(QTreeWidgetItem *topLevelItem) -{ - QTreeWidgetItem *item; - - // Delete recursively all childs of an item and the child of the child item etc ... - for(int i = 0; i < topLevelItem->childCount(); i++) - { - item = topLevelItem->child(i); - deleteItemsNode(item); - delete VariantPointer<QDomNamedNodeMap>::fromQVariant(item->data(0, Qt::UserRole)); - delete item; - } -} diff --git a/GScribo/xmlwidget.h b/GScribo/xmlwidget.h deleted file mode 100644 index e1f23cc..0000000 --- a/GScribo/xmlwidget.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef XMLWIDGET_H -#define XMLWIDGET_H - -#include <QGraphicsView> -#include <QTreeWidget> -#include <QVBoxLayout> -#include <QDomElement> -#include <QWidget> -#include <QLabel> - -#include "Rendering/polygonitem.h" -#include "variantpointer.h" - -class XmlWidget : - public QWidget -{ - Q_OBJECT - - public: - explicit XmlWidget(QWidget *parent = 0); - ~XmlWidget(); - - void changeView(QTreeWidgetItem *treeItem); - void selectItem(QTreeWidgetItem *treeItem, bool fromSelection = false); - - private: - void fillProperty(QTreeWidgetItem *treeItem); - void deleteItemsNode(QTreeWidgetItem *topLevelItem); - - QTreeWidget viewer; - QTreeWidget selection; - QTreeWidget property; - QList<QTreeWidgetItem *> selectionedItems; - - public slots: - void selectItems(const QList<QTreeWidgetItem *>& selectionTree); - - void clear(); - void clearSelection(); - - private slots: - inline void selectTreeItem(QTreeWidgetItem *treeItem); - inline void selectSelectedItem(QTreeWidgetItem *selectedItem); - - signals: - void selectGraphicalItem(PolygonItem *polygonItem); -}; - -inline void XmlWidget::selectTreeItem(QTreeWidgetItem *treeItem) -{ selectItem(treeItem, false); } - -inline void XmlWidget::selectSelectedItem(QTreeWidgetItem *selectedItem) -{ selectItem(selectedItem, true); } - -#endif // XMLWIDGET_H diff --git a/XmlTree/XmlTree.pro.user b/XmlTree/XmlTree.pro.user index 41ca59a..b935109 100644 --- a/XmlTree/XmlTree.pro.user +++ b/XmlTree/XmlTree.pro.user @@ -1,892 +1,243 @@ -<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> - <qtcreator> <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> + <variable>RunConfiguration0-BaseEnvironmentBase</variable> + <value type="int">2</value> + </data> + <data> + <variable>RunConfiguration0-CommandLineArguments</variable> + <valuelist type="QVariantList"/> + </data> + <data> + <variable>RunConfiguration0-ProFile</variable> + <value type="QString">XmlTree.pro</value> + </data> + <data> + <variable>RunConfiguration0-RunConfiguration.name</variable> + <value type="QString">XmlTree</value> + </data> + <data> + <variable>RunConfiguration0-UseDyldImageSuffix</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UseTerminal</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserEnvironmentChanges</variable> + <valuelist type="QVariantList"/> + </data> + <data> + <variable>RunConfiguration0-UserSetName</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserSetWorkingDirectory</variable> + <value type="bool">false</value> + </data> + <data> + <variable>RunConfiguration0-UserWorkingDirectory</variable> + <value type="QString"></value> + </data> + <data> + <variable>RunConfiguration0-type</variable> + <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> + </data> + <data> + <variable>activeRunConfiguration</variable> <value type="int">0</value> </data> <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> + <variable>activebuildconfiguration</variable> + <value type="QString">Debug</value> + </data> + <data> + <variable>buildConfiguration-Debug</variable> <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">System</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <value key="QtVersionId" type="int">0</value> + <value key="ToolChain" type="int">0</value> + <value key="buildConfiguration" type="int">2</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"/> + <variable>buildConfiguration-Release</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + <value key="QtVersionId" type="int">0</value> + <value key="buildConfiguration" type="int">0</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-buildstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree/XmlTree.pro</value> + <value type="QString">-spec</value> + <value type="QString">linux-g++</value> + <value type="QString">-r</value> + <value type="QString">CONFIG+=debug</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> + <value key="abstractProcess.enabled" type="bool">false</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Ym4qd3xwr0,guid=fde40b3a0f4d1c9822b6f826000921d9</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=758</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-vklgVis705/agent.705</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmKSVXRW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=9a5c41ad78622411b8e25b00459a554f-1359984156.79822-629324293</value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">-w</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/make</value> + <value key="abstractProcess.enabled" type="bool">true</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> + </valuemap> + </data> + <data> + <variable>buildconfiguration-Debug-cleanstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <value key="cleanConfig" type="bool">true</value> + <valuelist key="makeargs" type="QVariantList"> + <value type="QString">clean</value> + </valuelist> + </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.0</variable> + <variable>buildconfiguration-Release-buildstep0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-desktop-Debug</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-desktop-Release</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Configuration d'exécution Qt4</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">XmlTree</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">XmlTree.pro</value> - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.1</variable> + <variable>buildconfiguration-Release-buildstep1</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60EmulatorTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree sur l'émulateur Symbian</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60EmulatorRunConfiguration</value> - <value type="QString" key="Qt4ProjectManager.S60EmulatorRunConfiguration.ProFile">XmlTree.pro</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.2</variable> + <variable>buildconfiguration-Release-cleanstep0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">3</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60DeviceTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Créer le paquet SIS</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Create SIS package</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60SignBuildStep</value> - <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Certificate"></value> - <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Keyfile"></value> - <value type="int" key="Qt4ProjectManager.S60CreatePackageStep.SignMode">0</value> - <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SmartInstaller">false</value> - <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SuppressPatchWarningDialog">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeployStep</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Symbian</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree sur périphérique Symbian</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeviceRunConfiguration</value> - <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments"></value> - <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.ProFile">XmlTree.pro</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Target.3</variable> + <variable>buildconfigurations</variable> + <valuelist type="QVariantList"> + <value type="QString">Debug</value> + <value type="QString">Release</value> + </valuelist> + </data> + <data> + <variable>buildstep0</variable> <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.MaemoDeviceTarget</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-maemo-Debug</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> - </valuemap> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-maemo-Release</value> - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer le paquet par montage UTFS</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoDeployStep</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> - </valuemap> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compilation du paquet Debian et installation sur le périphérique Maemo5</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Maemo</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">2.2MaemoDeployConfig</value> - <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">0</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree (sur un périphérique distant)</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoRunConfiguration</value> - <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value> - <value type="int" key="Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase">1</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.ExportedLocalDirs"/> - <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.ProFile">XmlTree.pro</value> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.RemoteMountPoints"/> - <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges"/> - <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value> - <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value key="mkspec" type="QString"></value> </valuemap> </data> <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">4</value> + <variable>buildstep1</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + </valuemap> </data> <data> - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> - <value type="QString">{5e5821f7-3a40-405f-b196-cbc6284a3a45}</value> + <variable>buildsteps</variable> + <valuelist type="QVariantList"> + <value type="QString">trolltech.qt4projectmanager.qmake</value> + <value type="QString">trolltech.qt4projectmanager.make</value> + </valuelist> </data> <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">10</value> + <variable>cleanstep0</variable> + <valuemap type="QVariantMap"> + <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value key="clean" type="bool">true</value> + </valuemap> + </data> + <data> + <variable>cleansteps</variable> + <valuelist type="QVariantList"> + <value type="QString">trolltech.qt4projectmanager.make</value> + </valuelist> + </data> + <data> + <variable>defaultFileEncoding</variable> + <value type="QByteArray">System</value> + </data> + <data> + <variable>project</variable> + <valuemap type="QVariantMap"/> </data> </qtcreator> diff --git a/XmlTree/xmldelegate.cpp b/XmlTree/xmldelegate.cpp index b4d2941..1999dfe 100644 --- a/XmlTree/xmldelegate.cpp +++ b/XmlTree/xmldelegate.cpp @@ -7,6 +7,5 @@ XmlDelegate::XmlDelegate(QObject *parent) : void XmlDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const { - QStyledItemDelegate::paint(painter, option, index); - painter->drawText(option.rect, index.data(Qt::UserRole).toString()); + } -- 1.7.2.5

11 years, 10 months

efec80c Add proper GScribo/xmlitem and /xmlmodel but can t test : problem with tesseract linking on personal computer.

by Antoine Froger

--- GScribo/GScribo.pro | 8 +- GScribo/GScribo.pro.user | 490 +++++++++---------- GScribo/GScribo.pro.user.1.3 | 59 ++-- GScribo/dir.h | 2 +- GScribo/main.cpp | 2 +- GScribo/mainwindow.cpp | 4 +- GScribo/xmlattributes.cpp | 18 + GScribo/xmlattributes.h | 24 +- GScribo/xmlitem.cpp | 50 ++- GScribo/xmlitem.h | 43 ++- GScribo/xmlmodel.cpp | 68 +++- GScribo/xmlmodel.h | 22 +- XmlTree/XmlTree.pro | 1 + XmlTree/XmlTree.pro.user | 1119 ++++++++++++++++++++++++++++++++---------- XmlTree/XmlTree.pro.user.1.3 | 135 +++++ 15 files changed, 1473 insertions(+), 572 deletions(-) diff --git a/GScribo/GScribo.pro b/GScribo/GScribo.pro index 8478bd9..fe3d55e 100644 --- a/GScribo/GScribo.pro +++ b/GScribo/GScribo.pro @@ -2,14 +2,14 @@ # Project created by QtCreator 2013-01-21T09:20:54 # ------------------------------------------------- QT += xml -INCLUDEPATH += /lrde/home/stage/froger_a/olena/milena/ \ - /lrde/home/stage/froger_a/olena/scribo/ \ - /lrde/home/stage/froger_a/olena/_build/scribo/demo/ +INCLUDEPATH += /home/onix/olena/milena/ \ + /home/onix/olena/scribo/ \ + /home/onix/olena/_build/scribo/demo/ QMAKE_CXXFLAGS += -DNDEBUG \ -DMLN_WO_GLOBAL_VARS LIBS += -I/usr/include/graphicsImage \ -lGraphicsMagick++ \ - -ltesseract_full + -ltesseract TARGET = GScribo TEMPLATE = app SOURCES += main.cpp \ diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index d01f28d..0f4e800 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -1,269 +1,265 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> + <qtcreator> <data> - <variable>RunConfiguration0-BaseEnvironmentBase</variable> - <value type="int">2</value> - </data> - <data> - <variable>RunConfiguration0-CommandLineArguments</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-ProFile</variable> - <value type="QString">GScribo.pro</value> - </data> - <data> - <variable>RunConfiguration0-RunConfiguration.name</variable> - <value type="QString">GScribo</value> - </data> - <data> - <variable>RunConfiguration0-UseDyldImageSuffix</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UseTerminal</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserEnvironmentChanges</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-UserSetName</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserSetWorkingDirectory</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserWorkingDirectory</variable> - <value type="QString"></value> - </data> - <data> - <variable>RunConfiguration0-type</variable> - <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> - </data> - <data> - <variable>activeRunConfiguration</variable> + <variable>ProjectExplorer.Project.ActiveTarget</variable> <value type="int">0</value> </data> <data> - <variable>activebuildconfiguration</variable> - <value type="QString">Debug</value> - </data> - <data> - <variable>buildConfiguration-Debug</variable> + <variable>ProjectExplorer.Project.EditorSettings</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <value key="QtVersionId" type="int">2</value> - <value key="ToolChain" type="int">0</value> - <value key="addQDumper" type=""></value> - <value key="buildConfiguration" type="int">2</value> + <value type="bool" key="EditorConfiguration.AutoIndent">true</value> + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> + <value type="QString" key="language">Cpp</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">CppGlobal</value> + </valuemap> + </valuemap> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> + <value type="QString" key="language">QmlJS</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> + </valuemap> + </valuemap> + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> + <value type="QByteArray" key="EditorConfiguration.Codec">System</value> + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> + <value type="int" key="EditorConfiguration.IndentSize">4</value> + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> + <value type="int" key="EditorConfiguration.PaddingMode">1</value> + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> + <value type="int" key="EditorConfiguration.TabSize">8</value> + <value type="bool" key="EditorConfiguration.UseGlobal">true</value> + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> </valuemap> </data> <data> - <variable>buildconfiguration-Debug-buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=12582948</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo/GScribo.pro</value> - <value type="QString">-spec</value> - <value type="QString">linux-g++</value> - <value type="QString">-r</value> - <value type="QString">CONFIG+=debug</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> - <value key="abstractProcess.enabled" type="bool">false</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=12582948</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-cleanstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> - <value type="QString">GNOME_KEYRING_PID=8443</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=8518</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">true</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">clean</value> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/GScribo</value> - <value key="cleanConfig" type="bool">true</value> - <valuelist key="makeargs" type="QVariantList"> - <value type="QString">clean</value> - </valuelist> - </valuemap> - </data> - <data> - <variable>buildconfigurations</variable> - <valuelist type="QVariantList"> - <value type="QString">Debug</value> - </valuelist> - </data> - <data> - <variable>buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="mkspec" type="QString"></value> - </valuemap> - </data> - <data> - <variable>buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - </valuemap> - </data> - <data> - <variable>buildsteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.qmake</value> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> + <variable>ProjectExplorer.Project.PluginSettings</variable> + <valuemap type="QVariantMap"/> </data> <data> - <variable>cleanstep0</variable> + <variable>ProjectExplorer.Project.Target.0</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="clean" type="bool">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.1 dans le PATH (Système) Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/GScribo</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.1 dans le PATH (Système) Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GScribo</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GScribo.pro</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>cleansteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> + <variable>ProjectExplorer.Project.TargetCount</variable> + <value type="int">1</value> </data> <data> - <variable>defaultFileEncoding</variable> - <value type="QByteArray">System</value> + <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> + <value type="QString">{5e5821f7-3a40-405f-b196-cbc6284a3a45}</value> </data> <data> - <variable>project</variable> - <valuemap type="QVariantMap"/> + <variable>ProjectExplorer.Project.Updater.FileVersion</variable> + <value type="int">10</value> </data> </qtcreator> diff --git a/GScribo/GScribo.pro.user.1.3 b/GScribo/GScribo.pro.user.1.3 index 2415250..d01f28d 100644 --- a/GScribo/GScribo.pro.user.1.3 +++ b/GScribo/GScribo.pro.user.1.3 @@ -67,35 +67,36 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-P80XV4IXzt,guid=a5409515b0d4b55f3087c5ac006be134</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-hNSqJb</value> - <value type="QString">GNOME_KEYRING_PID=26128</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=26203</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-JCcKD26137/agent.26137</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=16777252</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmDXEURW</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359117815.965216-788943747</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -119,35 +120,36 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-P80XV4IXzt,guid=a5409515b0d4b55f3087c5ac006be134</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-hNSqJb</value> - <value type="QString">GNOME_KEYRING_PID=26128</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=26203</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-JCcKD26137/agent.26137</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=16777252</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmDXEURW</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359117815.965216-788943747</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -168,18 +170,17 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-E725PGjN72,guid=03a3a01426a1915469d93b2f006b9a87</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-qpwUT9</value> - <value type="QString">GNOME_KEYRING_PID=23170</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> + <value type="QString">GNOME_KEYRING_PID=8443</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> @@ -188,16 +189,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=23245</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-CQzeO23179/agent.23179</value> + <value type="QString">SSH_AGENT_PID=8518</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm87KZRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359099722.931858-1143452610</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> diff --git a/GScribo/dir.h b/GScribo/dir.h index a6c036b..3de42da 100644 --- a/GScribo/dir.h +++ b/GScribo/dir.h @@ -1,7 +1,7 @@ #ifndef DIR_H #define DIR_H -#define SCRIBO_LOCAL_DEMODIR "/lrde/home/stage/froger_a/olena/_build/scribo/demo" +#define SCRIBO_LOCAL_DEMODIR "/home/onix/olena/_build/scribo/demo" #define SCRIBO_PREFIX_BINDIR "/usr/local/bin" #endif // DIR_H diff --git a/GScribo/main.cpp b/GScribo/main.cpp index 9ccedca..d47ec16 100644 --- a/GScribo/main.cpp +++ b/GScribo/main.cpp @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { Magick::InitializeMagick(*argv); // On Linux, we NEED to use the raster graphics system. - // Linux don't really support X11 graphics system (the default one). + // Linux don't really support openGL graphics system (the default one on Linux). QApplication::setGraphicsSystem("raster"); QApplication a(argc, argv); MainWindow w; diff --git a/GScribo/mainwindow.cpp b/GScribo/mainwindow.cpp index c048456..32b5975b 100644 --- a/GScribo/mainwindow.cpp +++ b/GScribo/mainwindow.cpp @@ -2,8 +2,8 @@ #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) + QMainWindow(parent), + ui(new Ui::MainWindow) { ui->setupUi(this); diff --git a/GScribo/xmlattributes.cpp b/GScribo/xmlattributes.cpp index 5e2ecfc..0c4221f 100644 --- a/GScribo/xmlattributes.cpp +++ b/GScribo/xmlattributes.cpp @@ -3,3 +3,21 @@ XmlAttributes::XmlAttributes() { } + +XmlAttributes::XmlAttributes(const QDomNamedNodeMap& node) +{ + load(node); +} + +void XmlAttributes::load(const QDomNamedNodeMap& node) +{ + QDomAttr attr; + + for(int i = 0; i < node.count(); i++) + { + attr = node.item(i).toAttr(); + + names_ << attr.name(); + values_ << attr.value(); + } +} diff --git a/GScribo/xmlattributes.h b/GScribo/xmlattributes.h index af99e6e..cc187b1 100644 --- a/GScribo/xmlattributes.h +++ b/GScribo/xmlattributes.h @@ -6,21 +6,23 @@ class XmlAttributes { public: - explicit XmlAttributes(XmlAttributes *precItem = 0); + explicit XmlAttributes(); explicit XmlAttributes(const QDomNamedNodeMap& node); - explicit XmlAttributes(const QDomNamedNodeMap& node, XmlAttributes *precItem = 0); - ~XmlAttributes(); - inline QString name() const; - inline QString value() const; - inline int row(); + void load(const QDomNamedNodeMap& node); - private: - void init(XmlAttributes *precItem = 0); + inline QStringList names() const; + inline QStringList values() const; - QString n; - QString v; - int r; + private: + QStringList names_; + QStringList values_; }; +inline QStringList XmlAttributes::names() const +{ return names_; } + +inline QStringList XmlAttributes::values() const +{ return values_; } + #endif // XMLATTRIBUTES_H diff --git a/GScribo/xmlitem.cpp b/GScribo/xmlitem.cpp index bf82191..3f939ee 100644 --- a/GScribo/xmlitem.cpp +++ b/GScribo/xmlitem.cpp @@ -1,5 +1,53 @@ #include "xmlitem.h" -XmlItem::XmlItem() +XmlItem::XmlItem(XmlItem *parent) { + init(parent); +} + +XmlItem::XmlItem(XmlItem *precItem, XmlItem *parent) +{ + init(parent, precItem); +} + +XmlItem::XmlItem(const QDomElement& node, XmlItem *parent) +{ + init(parent); + load(node); +} + +XmlItem::XmlItem(const QDomElement& node, XmlItem *precItem, XmlItem *parent) +{ + init(parent, precItem); + load(node); +} + +XmlItem::~XmlItem() +{ + // Delete all childs. + XmlItem *child; + foreach(child, childs_) + delete child; +} + +void XmlItem::init(XmlItem *parent, XmlItem *precItem) +{ + graphicalItem_ = 0; + parent_ = parent; + + if(parent) + parent->addChild(this); + + if(precItem) + row_ = precItem->row()+1; + else + row_ = 0; +} + +void XmlItem::load(const QDomElement& node) +{ + text_ = node.tagName(); + + // Load attributes. + attributes_.load(node); } diff --git a/GScribo/xmlitem.h b/GScribo/xmlitem.h index a45c81c..d5de01c 100644 --- a/GScribo/xmlitem.h +++ b/GScribo/xmlitem.h @@ -12,17 +12,16 @@ class XmlItem explicit XmlItem(XmlItem *parent = 0); explicit XmlItem(XmlItem *precItem, XmlItem *parent = 0); explicit XmlItem(const QDomElement& node, XmlItem *parent = 0); - explicit XmlItem(const QDomElement& node, XmlItem precItem, XmlItem *parent = 0); + explicit XmlItem(const QDomElement& node, XmlItem *precItem, XmlItem *parent = 0); ~XmlItem(); void load(const QDomElement& node); inline QList<XmlItem *> childs() const; inline XmlItem *child(int i) const; - inline void setChild(XmlItem *child); + inline void addChild(XmlItem *child); inline XmlItem *parent() const; - inline void setParent(XmlItem *parent); inline PolygonItem *graphicalItem(); inline void setGraphicalItem(PolygonItem *graphicalItem); @@ -34,11 +33,39 @@ class XmlItem private: void init(XmlItem *parent = 0, XmlItem *precItem = 0); - QList<XmlItem *> lChilds; - XmlItem *par; - PolygonItem *graphItem; - QString name; - XmlAttributes *attrs; + int row_; + QList<XmlItem *> childs_; + XmlItem *parent_; + PolygonItem *graphicalItem_; + QString text_; + XmlAttributes attributes_; }; +inline QList<XmlItem *> XmlItem::childs() const +{ return childs_; } + +inline XmlItem *XmlItem::child(int i) const +{ return childs_[i]; } + +inline void XmlItem::addChild(XmlItem *child) +{ childs_ << child; } + +inline XmlItem *XmlItem::parent() const +{ return parent_; } + +inline PolygonItem *XmlItem::graphicalItem() const +{ return graphicalItem_; } + +inline void XmlItem::setGraphicalItem(PolygonItem *graphicalItem) +{ graphicalItem_ = graphicalItem; } + +inline QString XmlItem::text() const +{ return text_; } + +inline int XmlItem::row() const +{ return row_; } + +inline XmlAttributes XmlItem::attributes() const +{ return attributes_; } + #endif // XMLITEM_H diff --git a/GScribo/xmlmodel.cpp b/GScribo/xmlmodel.cpp index 728d601..b923417 100644 --- a/GScribo/xmlmodel.cpp +++ b/GScribo/xmlmodel.cpp @@ -1,5 +1,71 @@ #include "xmlmodel.h" -XmlModel::XmlModel() +XmlModel::XmlModel(XmlItem *rootItem, QObject *parent) : + QAbstractItemModel(parent) { + rootItem_ = rootItem; +} + +XmlModel::XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate& dd, QObject *parent) : + QAbstractItemModel(dd, parent) +{ + rootItem_ = rootItem; +} + +XmlModel::~XmlModel() +{ + delete rootItem_; +} + +QVariant XmlModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + return tr("Tree"); +} + +QVariant XmlModel::data(const QModelIndex& index, int role) const +{ + if(!index.isValid()) + return QVariant(); + + switch(role) + { + case Qt::UserRole: + return static_cast<XmlItem *>(index.internalPointer())->text(); + + case Qt::UserRole+1: + return static_cast<XmlItem *>(index.internalPointer())->attributes()->names(); + + case Qt::UserRole+2: + return static_cast<XmlItem *>(index.internalPointer())->attributes()->values(); + + default: + return QVariant(); + } +} + +QModelIndex XmlModel::index(int row, int column, const QModelIndex& parent) const +{ + if(!hasIndex(row, column, parent)) + return QModelIndex(); + + XmlItem *childItem = toXmlItem(parent)->child(row); + + // Create the model index from the child item. + if(childItem) + return createIndex(row, column, childItem); + else + return QModelIndex(); +} + +QModelIndex XmlModel::parent(const QModelIndex& child) const +{ + if(!child.isValid()) + return QModelIndex(); + + XmlItem *parentItem = static_cast<XmlItem *>(child.internalPointer())->parent(); + + if(!parentItem || parentItem == rootItem) + return QModelIndex(); + + return createIndex(parentItem->rowCount(), 0, parentItem); } diff --git a/GScribo/xmlmodel.h b/GScribo/xmlmodel.h index 33c54f0..10953ae 100644 --- a/GScribo/xmlmodel.h +++ b/GScribo/xmlmodel.h @@ -3,24 +3,34 @@ #include <QAbstractItemModel> +#include "xmlitem.h" + class XmlModel : public QAbstractItemModel { public: - explicit XmlModel(QObject *parent); + explicit XmlModel(XmlItem *rootItem, QObject *parent = 0); + explicit XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate& dd, QObject *parent = 0); ~XmlModel(); - inline int rowCount(const QModelIndex &parent) const; - inline int columnCount(const QModelIndex &parent) const; + inline int rowCount(const QModelIndex& parent) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const; - QVariant data(const QModelIndex &index, int role) const; + QVariant data(const QModelIndex& index, int role) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &child) const; + QModelIndex index(int row, int column, const QModelIndex& parent) const; + QModelIndex parent(const QModelIndex& child) const; private: + inline XmlItem *toXmlItem(const QModelIndex& index) const; + XmlItem *rootItem_; }; +inline XmlItem *XmlModel::toXmlItem(const QModelIndex& parent) const +{ return parent.isValid() ? rootItem_ : static_cast<XmlItem *>(parent.internalPointer()); } + +inline int XmlModel::rowCount(const QModelIndex& parent) const +{ toXmlItem(parent)->childs().count(); } + #endif // XMLMODEL_H diff --git a/XmlTree/XmlTree.pro b/XmlTree/XmlTree.pro index f5205b2..3df8724 100644 --- a/XmlTree/XmlTree.pro +++ b/XmlTree/XmlTree.pro @@ -4,6 +4,7 @@ QT += xml TARGET = XmlTree TEMPLATE = app +LIBS += SOURCES += main.cpp \ mainwindow.cpp \ xmlwidget.cpp \ diff --git a/XmlTree/XmlTree.pro.user b/XmlTree/XmlTree.pro.user index 7cf0eb5..41ca59a 100644 --- a/XmlTree/XmlTree.pro.user +++ b/XmlTree/XmlTree.pro.user @@ -1,295 +1,892 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> + <qtcreator> <data> - <variable>RunConfiguration0-BaseEnvironmentBase</variable> - <value type="int">2</value> - </data> - <data> - <variable>RunConfiguration0-CommandLineArguments</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-ProFile</variable> - <value type="QString">XmlTree.pro</value> - </data> - <data> - <variable>RunConfiguration0-RunConfiguration.name</variable> - <value type="QString">XmlTree</value> - </data> - <data> - <variable>RunConfiguration0-UseDyldImageSuffix</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UseTerminal</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserEnvironmentChanges</variable> - <valuelist type="QVariantList"/> - </data> - <data> - <variable>RunConfiguration0-UserSetName</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserSetWorkingDirectory</variable> - <value type="bool">false</value> - </data> - <data> - <variable>RunConfiguration0-UserWorkingDirectory</variable> - <value type="QString"></value> - </data> - <data> - <variable>RunConfiguration0-type</variable> - <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value> - </data> - <data> - <variable>activeRunConfiguration</variable> + <variable>ProjectExplorer.Project.ActiveTarget</variable> <value type="int">0</value> </data> <data> - <variable>activebuildconfiguration</variable> - <value type="QString">Debug</value> - </data> - <data> - <variable>buildConfiguration-Debug</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <value key="QtVersionId" type="int">0</value> - <value key="ToolChain" type="int">0</value> - <value key="addQDumper" type=""></value> - <value key="buildConfiguration" type="int">2</value> - </valuemap> - </data> - <data> - <variable>buildConfiguration-Release</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - <value key="QtVersionId" type="int">0</value> - <value key="addQDumper" type=""></value> - <value key="buildConfiguration" type="int">0</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree/XmlTree.pro</value> - <value type="QString">-spec</value> - <value type="QString">linux-g++</value> - <value type="QString">-r</value> - <value type="QString">CONFIG+=debug</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> - <value key="abstractProcess.enabled" type="bool">false</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Debug-cleanstep0</variable> + <variable>ProjectExplorer.Project.EditorSettings</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> - <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> - <value type="QString">DESKTOP_SESSION=fluxbox</value> - <value type="QString">DISPLAY=:0.0</value> - <value type="QString">GDMSESSION=fluxbox</value> - <value type="QString">GDM_LANG=fr_FR.UTF-8</value> - <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> - <value type="QString">GNOME_KEYRING_PID=2702</value> - <value type="QString">GTK_MODULES=canberra-gtk-module</value> - <value type="QString">HOME=/lrde/home/stage/froger_a</value> - <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> - <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> - <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> - <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> - <value type="QString">QTDIR=/usr/share/qt4</value> - <value type="QString">SHELL=/bin/bash</value> - <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=2784</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> - <value type="QString">TERM=xterm</value> - <value type="QString">USER=froger_a</value> - <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> - <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> - <value type="QString">XPSERVERLIST=:64 </value> - <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> - <value type="QString">XTERM_SHELL=/bin/bash</value> - <value type="QString">XTERM_VERSION=XTerm(261)</value> - <value type="QString">_=/usr/bin/qtcreator</value> - </valuelist> - <value key="abstractProcess.IgnoreReturnValue" type="bool">true</value> - <valuelist key="abstractProcess.arguments" type="QVariantList"> - <value type="QString">clean</value> - <value type="QString">-w</value> - </valuelist> - <value key="abstractProcess.command" type="QString">/usr/bin/make</value> - <value key="abstractProcess.enabled" type="bool">true</value> - <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> - <value key="cleanConfig" type="bool">true</value> - <valuelist key="makeargs" type="QVariantList"> - <value type="QString">clean</value> - </valuelist> + <value type="bool" key="EditorConfiguration.AutoIndent">true</value> + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> + <value type="QString" key="language">Cpp</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">CppGlobal</value> + </valuemap> + </valuemap> + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> + <value type="QString" key="language">QmlJS</value> + <valuemap type="QVariantMap" key="value"> + <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> + </valuemap> + </valuemap> + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> + <value type="QByteArray" key="EditorConfiguration.Codec">System</value> + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> + <value type="int" key="EditorConfiguration.IndentSize">4</value> + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> + <value type="int" key="EditorConfiguration.PaddingMode">1</value> + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> + <value type="int" key="EditorConfiguration.TabSize">8</value> + <value type="bool" key="EditorConfiguration.UseGlobal">true</value> + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> </valuemap> </data> <data> - <variable>buildconfiguration-Release-buildstep0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - </valuemap> - </data> - <data> - <variable>buildconfiguration-Release-buildstep1</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> - </valuemap> + <variable>ProjectExplorer.Project.PluginSettings</variable> + <valuemap type="QVariantMap"/> </data> <data> - <variable>buildconfiguration-Release-cleanstep0</variable> + <variable>ProjectExplorer.Project.Target.0</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-desktop-Debug</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-desktop-Release</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Configuration d'exécution Qt4</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">XmlTree</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">XmlTree.pro</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildconfigurations</variable> - <valuelist type="QVariantList"> - <value type="QString">Debug</value> - <value type="QString">Release</value> - </valuelist> - </data> - <data> - <variable>buildstep0</variable> + <variable>ProjectExplorer.Project.Target.1</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="mkspec" type="QString"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60EmulatorTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree sur l'émulateur Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60EmulatorRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.S60EmulatorRunConfiguration.ProFile">XmlTree.pro</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildstep1</variable> + <variable>ProjectExplorer.Project.Target.2</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">3</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.S60DeviceTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Créer le paquet SIS</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Create SIS package</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60SignBuildStep</value> + <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Certificate"></value> + <value type="QString" key="Qt4ProjectManager.S60CreatePackageStep.Keyfile"></value> + <value type="int" key="Qt4ProjectManager.S60CreatePackageStep.SignMode">0</value> + <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SmartInstaller">false</value> + <value type="bool" key="Qt4ProjectManager.S60CreatorPackageStep.SuppressPatchWarningDialog">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeployStep</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Pas de déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree sur périphérique Symbian</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.S60DeviceRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.CommandLineArguments"></value> + <value type="QString" key="Qt4ProjectManager.S60DeviceRunConfiguration.ProFile">XmlTree.pro</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>buildsteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.qmake</value> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> - </data> - <data> - <variable>cleanstep0</variable> + <variable>ProjectExplorer.Project.Target.3</variable> <valuemap type="QVariantMap"> - <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value> - <value key="clean" type="bool">true</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">4</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.MaemoDeviceTarget</value> + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-maemo-Debug</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> + <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value> + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> + </valuemap> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/onix/qt/XmlTree-build-maemo-Release</value> + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer le paquet par montage UTFS</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoDeployStep</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/> + </valuemap> + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> + </valuemap> + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compilation du paquet Debian et installation sur le périphérique Maemo5</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Déployer sur un périphérique Maemo</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">2.2MaemoDeployConfig</value> + <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">0</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> + <value type="int">0</value> + <value type="int">1</value> + <value type="int">2</value> + <value type="int">3</value> + <value type="int">4</value> + <value type="int">5</value> + <value type="int">6</value> + <value type="int">7</value> + <value type="int">8</value> + <value type="int">9</value> + <value type="int">10</value> + <value type="int">11</value> + <value type="int">12</value> + <value type="int">13</value> + <value type="int">14</value> + </valuelist> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">XmlTree (sur un périphérique distant)</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MaemoRunConfiguration</value> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.Arguments"></value> + <value type="int" key="Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase">1</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.ExportedLocalDirs"/> + <value type="QString" key="Qt4ProjectManager.MaemoRunConfiguration.ProFile">XmlTree.pro</value> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.RemoteMountPoints"/> + <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges"/> + <value type="QString" key="RemoteLinux.RunConfig.AlternateRemoteExecutable"></value> + <value type="bool" key="RemoteLinux.RunConfig.UseAlternateRemoteExecutable">false</value> + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> + </valuemap> + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> </valuemap> </data> <data> - <variable>cleansteps</variable> - <valuelist type="QVariantList"> - <value type="QString">trolltech.qt4projectmanager.make</value> - </valuelist> + <variable>ProjectExplorer.Project.TargetCount</variable> + <value type="int">4</value> </data> <data> - <variable>defaultFileEncoding</variable> - <value type="QByteArray">System</value> + <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> + <value type="QString">{5e5821f7-3a40-405f-b196-cbc6284a3a45}</value> </data> <data> - <variable>project</variable> - <valuemap type="QVariantMap"/> + <variable>ProjectExplorer.Project.Updater.FileVersion</variable> + <value type="int">10</value> </data> </qtcreator> diff --git a/XmlTree/XmlTree.pro.user.1.3 b/XmlTree/XmlTree.pro.user.1.3 index eef8a12..7cf0eb5 100644 --- a/XmlTree/XmlTree.pro.user.1.3 +++ b/XmlTree/XmlTree.pro.user.1.3 @@ -58,6 +58,7 @@ <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <value key="QtVersionId" type="int">0</value> <value key="ToolChain" type="int">0</value> + <value key="addQDumper" type=""></value> <value key="buildConfiguration" type="int">2</value> </valuemap> </data> @@ -66,6 +67,7 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value> <value key="QtVersionId" type="int">0</value> + <value key="addQDumper" type=""></value> <value key="buildConfiguration" type="int">0</value> </valuemap> </data> @@ -73,18 +75,151 @@ <variable>buildconfiguration-Debug-buildstep0</variable> <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> + <value type="QString">XPSERVERLIST=:64 </value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree/XmlTree.pro</value> + <value type="QString">-spec</value> + <value type="QString">linux-g++</value> + <value type="QString">-r</value> + <value type="QString">CONFIG+=debug</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value> + <value key="abstractProcess.enabled" type="bool">false</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> </valuemap> </data> <data> <variable>buildconfiguration-Debug-buildstep1</variable> <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> + <value type="QString">XPSERVERLIST=:64 </value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <value key="abstractProcess.IgnoreReturnValue" type="bool">false</value> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">-w</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/make</value> + <value key="abstractProcess.enabled" type="bool">true</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> </valuemap> </data> <data> <variable>buildconfiguration-Debug-cleanstep0</variable> <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> + <valuelist key="abstractProcess.Environment" type="QVariantList"> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> + <value type="QString">DESKTOP_SESSION=fluxbox</value> + <value type="QString">DISPLAY=:0.0</value> + <value type="QString">GDMSESSION=fluxbox</value> + <value type="QString">GDM_LANG=fr_FR.UTF-8</value> + <value type="QString">GDM_XSERVER_LOCATION=local</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> + <value type="QString">GTK_MODULES=canberra-gtk-module</value> + <value type="QString">HOME=/lrde/home/stage/froger_a</value> + <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> + <value type="QString">LOGNAME=froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> + <value type="QString">PWD=/lrde/home/stage/froger_a/qt/XmlTree</value> + <value type="QString">QTDIR=/usr/share/qt4</value> + <value type="QString">SHELL=/bin/bash</value> + <value type="QString">SHLVL=2</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> + <value type="QString">TERM=xterm</value> + <value type="QString">USER=froger_a</value> + <value type="QString">USERNAME=froger_a</value> + <value type="QString">WINDOWID=10485796</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> + <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> + <value type="QString">XPSERVERLIST=:64 </value> + <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> + <value type="QString">XTERM_SHELL=/bin/bash</value> + <value type="QString">XTERM_VERSION=XTerm(261)</value> + <value type="QString">_=/usr/bin/qtcreator</value> + </valuelist> + <value key="abstractProcess.IgnoreReturnValue" type="bool">true</value> + <valuelist key="abstractProcess.arguments" type="QVariantList"> + <value type="QString">clean</value> + <value type="QString">-w</value> + </valuelist> + <value key="abstractProcess.command" type="QString">/usr/bin/make</value> + <value key="abstractProcess.enabled" type="bool">true</value> + <value key="abstractProcess.workingDirectory" type="QString">/amd/nfs/volume1/home/stage/froger_a/qt/XmlTree</value> <value key="cleanConfig" type="bool">true</value> <valuelist key="makeargs" type="QVariantList"> <value type="QString">clean</value> -- 1.7.2.5

11 years, 10 months

58b937b Update XmlTree with custom modeland delegate to handle multiple tree view with one model. Begin the implementation on GScribo.

by Antoine Froger

--- GScribo/GScribo.pro | 10 ++- GScribo/GScribo.pro.user | 42 +++++----- GScribo/PagesViewer/pageswidget.cpp | 4 +- GScribo/xmlattributes.cpp | 5 + GScribo/xmlattributes.h | 26 ++++++ GScribo/xmlitem.cpp | 5 + GScribo/xmlitem.h | 44 +++++++++++ GScribo/xmlmodel.cpp | 5 + GScribo/xmlmodel.h | 26 ++++++ XmlTree/XmlTree.pro | 15 +++- XmlTree/XmlTree.pro.user | 48 ++++++------ {GScribo => XmlTree}/configs.h | 14 ++-- XmlTree/main.cpp | 1 + XmlTree/mainwindow.cpp | 11 +-- XmlTree/mainwindow.h | 1 - XmlTree/pointer.h | 19 ----- XmlTree/polygonitem.cpp | 44 +---------- XmlTree/polygonitem.h | 39 +++++++--- XmlTree/treeview.h | 19 +++++ {GScribo => XmlTree}/variantpointer.h | 0 XmlTree/xml.cpp | 137 ++++++++++++++++++--------------- XmlTree/xml.h | 49 +++++++----- XmlTree/xmldelegate.cpp | 12 +++ XmlTree/xmldelegate.h | 21 +++++ XmlTree/xmlitem.cpp | 52 +++++++++++++ XmlTree/xmlitem.h | 71 +++++++++++++++++ XmlTree/xmlmodel.cpp | 104 +++++++++++++++++++++++++ XmlTree/xmlmodel.h | 38 +++++++++ XmlTree/xmlproxy.cpp | 6 ++ XmlTree/xmlproxy.h | 13 +++ XmlTree/xmlwidget.cpp | 12 +++- XmlTree/xmlwidget.h | 16 ++-- 32 files changed, 680 insertions(+), 229 deletions(-) create mode 100644 GScribo/xmlattributes.cpp create mode 100644 GScribo/xmlattributes.h create mode 100644 GScribo/xmlitem.cpp create mode 100644 GScribo/xmlitem.h create mode 100644 GScribo/xmlmodel.cpp create mode 100644 GScribo/xmlmodel.h copy {GScribo => XmlTree}/configs.h (91%) delete mode 100644 XmlTree/pointer.h create mode 100644 XmlTree/treeview.h copy {GScribo => XmlTree}/variantpointer.h (100%) create mode 100644 XmlTree/xmldelegate.cpp create mode 100644 XmlTree/xmldelegate.h create mode 100644 XmlTree/xmlitem.cpp create mode 100644 XmlTree/xmlitem.h create mode 100644 XmlTree/xmlmodel.cpp create mode 100644 XmlTree/xmlmodel.h create mode 100644 XmlTree/xmlproxy.cpp create mode 100644 XmlTree/xmlproxy.h diff --git a/GScribo/GScribo.pro b/GScribo/GScribo.pro index 42d9e7b..8478bd9 100644 --- a/GScribo/GScribo.pro +++ b/GScribo/GScribo.pro @@ -29,7 +29,10 @@ SOURCES += main.cpp \ Processing/preprocess.cpp \ Processing/runner.cpp \ xml.cpp \ - xmlwidget.cpp + xmlwidget.cpp \ + xmlmodel.cpp \ + xmlitem.cpp \ + xmlattributes.cpp HEADERS += mainwindow.h \ configs.h \ region.h \ @@ -51,7 +54,10 @@ HEADERS += mainwindow.h \ Processing/runner.h \ xml.h \ variantpointer.h \ - xmlwidget.h + xmlwidget.h \ + xmlmodel.h \ + xmlitem.h \ + xmlattributes.h FORMS += mainwindow.ui \ Preferences/preferencesdialog.ui \ Preferences/ocroptions.ui \ diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index 4d451eb..d01f28d 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -67,35 +67,36 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-qmlsXLWJn3,guid=e4b2f30ca8d018ccce50314c0073cc47</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-tl4Csb</value> - <value type="QString">GNOME_KEYRING_PID=6905</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=6981</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-Xmeufp6914/agent.6914</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmHN3NRW</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359636746.918575-1681926162</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -119,35 +120,36 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-qmlsXLWJn3,guid=e4b2f30ca8d018ccce50314c0073cc47</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-tl4Csb</value> - <value type="QString">GNOME_KEYRING_PID=6905</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> + <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=6981</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-Xmeufp6914/agent.6914</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> - <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmHN3NRW</value> + <value type="QString">WINDOWID=12582948</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359636746.918575-1681926162</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> diff --git a/GScribo/PagesViewer/pageswidget.cpp b/GScribo/PagesViewer/pageswidget.cpp index 7140d73..e05d38a 100644 --- a/GScribo/PagesViewer/pageswidget.cpp +++ b/GScribo/PagesViewer/pageswidget.cpp @@ -22,7 +22,7 @@ QStringList PagesWidget::filenames() const return model.filenames(); } -void PagesWidget::getPixmap(const QModelIndex &index) +void PagesWidget::getPixmap(const QModelIndex& index) { // Get the pixmap and the path of the icon to send it to the scene and draw it. QPixmap pixmap = index.data(Qt::UserRole).value<QPixmap>(); @@ -31,7 +31,7 @@ void PagesWidget::getPixmap(const QModelIndex &index) emit sceneChanged(filename, pixmap); } -void PagesWidget::addPixmap(const QString& filename, const QPixmap &pixmap) +void PagesWidget::addPixmap(const QString& filename, const QPixmap& pixmap) { model.addPixmap(filename, pixmap); } diff --git a/GScribo/xmlattributes.cpp b/GScribo/xmlattributes.cpp new file mode 100644 index 0000000..5e2ecfc --- /dev/null +++ b/GScribo/xmlattributes.cpp @@ -0,0 +1,5 @@ +#include "xmlattributes.h" + +XmlAttributes::XmlAttributes() +{ +} diff --git a/GScribo/xmlattributes.h b/GScribo/xmlattributes.h new file mode 100644 index 0000000..af99e6e --- /dev/null +++ b/GScribo/xmlattributes.h @@ -0,0 +1,26 @@ +#ifndef XMLATTRIBUTES_H +#define XMLATTRIBUTES_H + +#include <QDomNamedNodeMap> + +class XmlAttributes +{ + public: + explicit XmlAttributes(XmlAttributes *precItem = 0); + explicit XmlAttributes(const QDomNamedNodeMap& node); + explicit XmlAttributes(const QDomNamedNodeMap& node, XmlAttributes *precItem = 0); + ~XmlAttributes(); + + inline QString name() const; + inline QString value() const; + inline int row(); + + private: + void init(XmlAttributes *precItem = 0); + + QString n; + QString v; + int r; +}; + +#endif // XMLATTRIBUTES_H diff --git a/GScribo/xmlitem.cpp b/GScribo/xmlitem.cpp new file mode 100644 index 0000000..bf82191 --- /dev/null +++ b/GScribo/xmlitem.cpp @@ -0,0 +1,5 @@ +#include "xmlitem.h" + +XmlItem::XmlItem() +{ +} diff --git a/GScribo/xmlitem.h b/GScribo/xmlitem.h new file mode 100644 index 0000000..a45c81c --- /dev/null +++ b/GScribo/xmlitem.h @@ -0,0 +1,44 @@ +#ifndef XMLITEM_H +#define XMLITEM_H + +#include <QDomElement> + +#include "Rendering/polygonitem.h" +#include "xmlattributes.h" + +class XmlItem +{ + public: + explicit XmlItem(XmlItem *parent = 0); + explicit XmlItem(XmlItem *precItem, XmlItem *parent = 0); + explicit XmlItem(const QDomElement& node, XmlItem *parent = 0); + explicit XmlItem(const QDomElement& node, XmlItem precItem, XmlItem *parent = 0); + ~XmlItem(); + + void load(const QDomElement& node); + + inline QList<XmlItem *> childs() const; + inline XmlItem *child(int i) const; + inline void setChild(XmlItem *child); + + inline XmlItem *parent() const; + inline void setParent(XmlItem *parent); + + inline PolygonItem *graphicalItem(); + inline void setGraphicalItem(PolygonItem *graphicalItem); + + inline QString text() const; + inline int row() const; + inline XmlAttributes *attributes() const; + + private: + void init(XmlItem *parent = 0, XmlItem *precItem = 0); + + QList<XmlItem *> lChilds; + XmlItem *par; + PolygonItem *graphItem; + QString name; + XmlAttributes *attrs; +}; + +#endif // XMLITEM_H diff --git a/GScribo/xmlmodel.cpp b/GScribo/xmlmodel.cpp new file mode 100644 index 0000000..728d601 --- /dev/null +++ b/GScribo/xmlmodel.cpp @@ -0,0 +1,5 @@ +#include "xmlmodel.h" + +XmlModel::XmlModel() +{ +} diff --git a/GScribo/xmlmodel.h b/GScribo/xmlmodel.h new file mode 100644 index 0000000..33c54f0 --- /dev/null +++ b/GScribo/xmlmodel.h @@ -0,0 +1,26 @@ +#ifndef XMLMODEL_H +#define XMLMODEL_H + +#include <QAbstractItemModel> + +class XmlModel : + public QAbstractItemModel +{ + public: + explicit XmlModel(QObject *parent); + ~XmlModel(); + + inline int rowCount(const QModelIndex &parent) const; + inline int columnCount(const QModelIndex &parent) const; + + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant data(const QModelIndex &index, int role) const; + + QModelIndex index(int row, int column, const QModelIndex &parent) const; + QModelIndex parent(const QModelIndex &child) const; + + private: + +}; + +#endif // XMLMODEL_H diff --git a/XmlTree/XmlTree.pro b/XmlTree/XmlTree.pro index f3f3df2..f5205b2 100644 --- a/XmlTree/XmlTree.pro +++ b/XmlTree/XmlTree.pro @@ -8,11 +8,20 @@ SOURCES += main.cpp \ mainwindow.cpp \ xmlwidget.cpp \ xml.cpp \ - polygonitem.cpp + polygonitem.cpp \ + xmlmodel.cpp \ + xmlitem.cpp \ + xmlproxy.cpp \ + xmldelegate.cpp HEADERS += mainwindow.h \ xmlwidget.h \ xml.h \ - pointer.h \ + region.h \ polygonitem.h \ - region.h + variantpointer.h \ + configs.h \ + xmlmodel.h \ + xmlitem.h \ + xmlproxy.h \ + xmldelegate.h FORMS += mainwindow.ui diff --git a/XmlTree/XmlTree.pro.user b/XmlTree/XmlTree.pro.user index 847bc66..7cf0eb5 100644 --- a/XmlTree/XmlTree.pro.user +++ b/XmlTree/XmlTree.pro.user @@ -76,14 +76,14 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-eapkGsqUHQ,guid=856e00f0cd1b8664a4a8a6ce006f8d7e</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-bwEU7s</value> - <value type="QString">GNOME_KEYRING_PID=2961</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> @@ -95,16 +95,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=3036</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-yHlEXz2970/agent.2970</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm5EEHRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359358530.347400-806764092</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -128,14 +128,14 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-eapkGsqUHQ,guid=856e00f0cd1b8664a4a8a6ce006f8d7e</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-bwEU7s</value> - <value type="QString">GNOME_KEYRING_PID=2961</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> @@ -147,16 +147,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=3036</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-yHlEXz2970/agent.2970</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm5EEHRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359358530.347400-806764092</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -177,14 +177,14 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-eapkGsqUHQ,guid=856e00f0cd1b8664a4a8a6ce006f8d7e</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-Cbkm7WIjhu,guid=65649d2ae970b655ca196e3400751d1b</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-bwEU7s</value> - <value type="QString">GNOME_KEYRING_PID=2961</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-xOpurb</value> + <value type="QString">GNOME_KEYRING_PID=2702</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> @@ -196,16 +196,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=3036</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-yHlEXz2970/agent.2970</value> + <value type="QString">SSH_AGENT_PID=2784</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-UFTNiR2711/agent.2711</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdm5EEHRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdm6IKTRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359358530.347400-806764092</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359722975.26426-1436129248</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> diff --git a/GScribo/configs.h b/XmlTree/configs.h similarity index 91% copy from GScribo/configs.h copy to XmlTree/configs.h index 594650f..74968c9 100644 --- a/GScribo/configs.h +++ b/XmlTree/configs.h @@ -1,7 +1,7 @@ #ifndef CONFIGS_H #define CONFIGS_H -#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> +//#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> #include <QSettings> #include <QDir> @@ -28,8 +28,8 @@ class Configs : inline bool preprocessingRemoveNoise(); inline void setPreprocessingRemoveNoise(bool b); - inline int preprocessingBinAlgo(); - inline void setPreprocessingBinAlgo(int algo); + /*inline int preprocessingBinAlgo(); + inline void setPreprocessingBinAlgo(int algo);*/ inline int segmentationFindSeps(); inline void setSegmentationFindSeps(int seps); @@ -77,11 +77,11 @@ inline bool Configs::preprocessingRemoveNoise() inline void Configs::setPreprocessingRemoveNoise(bool b) { setValue("preprocessing/remove_noise", b); } -inline int Configs::preprocessingBinAlgo() -{ return value("preprocessing/bin_algo", scribo::toolchain::internal::SauvolaMs).toInt(); } +/*inline int Configs::preprocessingBinAlgo() +{ return value("preprocessing/bin_algo", scribo::toolchain::internal::SauvolaMs).toInt(); }*/ -inline void Configs::setPreprocessingBinAlgo(int algo) -{ setValue("preprocessing/bin_algo", algo); } +/*inline void Configs::setPreprocessingBinAlgo(int algo) +{ setValue("preprocessing/bin_algo", algo); }*/ inline int Configs::segmentationFindSeps() { return value("segmentation/find_seps", Separator::Both).toInt(); } diff --git a/XmlTree/main.cpp b/XmlTree/main.cpp index 6e7efd9..3d5e575 100644 --- a/XmlTree/main.cpp +++ b/XmlTree/main.cpp @@ -1,4 +1,5 @@ #include <QtGui/QApplication> + #include "mainwindow.h" int main(int argc, char *argv[]) diff --git a/XmlTree/mainwindow.cpp b/XmlTree/mainwindow.cpp index 26729b7..e76f576 100644 --- a/XmlTree/mainwindow.cpp +++ b/XmlTree/mainwindow.cpp @@ -9,15 +9,8 @@ MainWindow::MainWindow(QWidget *parent) : xml.load("/tmp/mp00082c_gui.xml"); - //xmlWidget.load(xml.treeItem()); - - view = new QGraphicsView(new QGraphicsScene()); - - QGraphicsItem *item; - foreach(item, xml.graphicsItems()) - view->scene()->addItem(item); - - setCentralWidget(view); + XmlWidget *xmlWidget = new XmlWidget(xml.treeItem()); + setCentralWidget(&xmlWidget->tree); } MainWindow::~MainWindow() diff --git a/XmlTree/mainwindow.h b/XmlTree/mainwindow.h index 221d43d..98c4c68 100644 --- a/XmlTree/mainwindow.h +++ b/XmlTree/mainwindow.h @@ -27,7 +27,6 @@ class MainWindow : private: Ui::MainWindow *ui; QGraphicsView *view; - XmlWidget xmlWidget; Xml xml; }; diff --git a/XmlTree/pointer.h b/XmlTree/pointer.h deleted file mode 100644 index 7a84c47..0000000 --- a/XmlTree/pointer.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef POINTER_H -#define POINTER_H - -#include <QVariant> - -template<typename T> class Pointer -{ - public: - static inline QVariant toQVariant(T *pointer) - { return QVariant::fromValue((void *)pointer); } - - static inline T *fromQVariant(const QVariant& variant) - { return (T *)variant.value<void *>(); } - - private: - Pointer() { } -}; - -#endif // POINTER_H diff --git a/XmlTree/polygonitem.cpp b/XmlTree/polygonitem.cpp index 6bdcd3e..b447e28 100644 --- a/XmlTree/polygonitem.cpp +++ b/XmlTree/polygonitem.cpp @@ -29,48 +29,12 @@ void PolygonItem::init() void PolygonItem::setColor(const QColor &color) { - selectedPen.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 200)); + selectedPen.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 255)); unselectedPen.setColor(color); selectedBrush.setColor(color); - unselectedBrush.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 30)); + unselectedBrush.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 40)); - setPen(selectedPen); - setBrush(selectedBrush); -} - -QColor PolygonItem::color() const -{ - return selectedBrush.color(); -} - -void PolygonItem::repaint(const QRectF& rect, bool clic) -{ - bool sel; - - // For optimization, do first an intersection by bounding rectangle beetween items and selection and then an intersection by shape. - if(clic) - sel = (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().contains(rect.bottomRight())) && shape().contains(rect.bottomRight()); - else - sel = (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().intersects(rect)) && shape().intersects(rect); - - // Change items brush and pen if it's selectionned or not. - if(sel) - { - if(pen() != selectedPen) - { - setPen(selectedPen); - setBrush(selectedBrush); - update(rect); - } - } - else - { - if(pen() != unselectedPen) - { - setPen(unselectedPen); - setBrush(unselectedBrush); - update(rect); - } - } + setPen(unselectedPen); + setBrush(unselectedBrush); } diff --git a/XmlTree/polygonitem.h b/XmlTree/polygonitem.h index 0e8377d..ca32774 100644 --- a/XmlTree/polygonitem.h +++ b/XmlTree/polygonitem.h @@ -1,26 +1,30 @@ #ifndef POLYGONITEM_H #define POLYGONITEM_H -#include <QGraphicsPathItem> +#include <QGraphicsPolygonItem> +#include <QTreeWidgetItem> #include <QPen> +#include "variantpointer.h" #include "region.h" class PolygonItem : - public QObject, public QGraphicsPolygonItem { - Q_OBJECT - public: explicit PolygonItem(QGraphicsItem *parent = 0, QGraphicsScene *scene = 0); explicit PolygonItem(const QPolygonF& path, QGraphicsItem *parent = 0, QGraphicsScene *scene = 0); void setColor(const QColor& color); - QColor color() const; + inline QColor color() const; inline void loadData(const GraphicRegion::Data& data); + inline bool isSelected(const QRectF& rect, bool clic); + inline void unselect(); + inline void select(); + inline void setSelected(bool selected); + private: void init(); @@ -28,16 +32,29 @@ class PolygonItem : QPen unselectedPen; QBrush selectedBrush; QBrush unselectedBrush; - - public slots: - void repaint(const QRectF& rect, bool clic); }; +inline QColor PolygonItem::color() const +{ return selectedBrush.color(); } + inline void PolygonItem::loadData(const GraphicRegion::Data &data) +{ setData(0, data.region); setColor(data.color); setZValue(data.zValue); } + +inline bool PolygonItem::isSelected(const QRectF &rect, bool clic) { - setData(0, data.region); - setColor(data.color); - setZValue(data.zValue); + if(clic) + return (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().contains(rect.bottomRight())) && shape().contains(rect.bottomRight()); + else + return (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().intersects(rect)) && shape().intersects(rect); } +inline void PolygonItem::select() +{ if(pen() != selectedPen) { setPen(selectedPen); setBrush(selectedBrush); } } + +inline void PolygonItem::unselect() +{ if(pen() != unselectedPen) { setPen(unselectedPen); setBrush(unselectedBrush); } } + +inline void PolygonItem::setSelected(bool selected) +{ if(selected) select(); else unselect(); } + #endif // POLYGONITEM_H diff --git a/XmlTree/treeview.h b/XmlTree/treeview.h new file mode 100644 index 0000000..4321f34 --- /dev/null +++ b/XmlTree/treeview.h @@ -0,0 +1,19 @@ +#ifndef TREEVIEW_H +#define TREEVIEW_H + +#include <QTreeView> + +#include "xmlmodel.h" + +class TreeView : public QTreeView +{ + public: + explicit TreeView(QWidget *parent); + explicit TreeView(QTreeViewPrivate& dd, QWidget *parent); + explicit TreeView(const QTreeView& view); + + private: + XmlModel model; +}; + +#endif // TREEVIEW_H diff --git a/GScribo/variantpointer.h b/XmlTree/variantpointer.h similarity index 100% copy from GScribo/variantpointer.h copy to XmlTree/variantpointer.h diff --git a/XmlTree/xml.cpp b/XmlTree/xml.cpp index 8dd9d17..5931e92 100644 --- a/XmlTree/xml.cpp +++ b/XmlTree/xml.cpp @@ -2,131 +2,147 @@ static const GraphicRegion::Data itemsData[] = { - /* COLOR | NAME | REGION | ZVALUE */ - { QColor::fromRgb(255, 0, 0, 80), "Line", (int)GraphicRegion::Line, 2 }, - { QColor::fromRgb(0, 100, 0, 80), "TextRegion", (int)GraphicRegion::Text, 1 }, - { QColor::fromRgb(0, 0, 255, 60), "VerticalSeparatorRegion", (int)GraphicRegion::VerticalSeparator, 2 }, - { QColor::fromRgb(0, 0, 255, 60), "HorizontalSeparatorRegion", (int)GraphicRegion::HorizontalSeparator, 2 }, - { QColor::fromRgb(0, 0, 128, 60), "WhitespaceSeparatorRegion", (int)GraphicRegion::WhiteSpaceSeparator, 2 }, - { QColor::fromRgb(255, 120, 0, 60), "ImageRegion", (int)GraphicRegion::Image, 1 }, - { QColor::fromRgb(43, 39, 128, 60), "NoiseRegion", (int)GraphicRegion::Noise, 2 }, - { QColor::fromRgb(220, 246, 0, 60), "TableRegion", (int)GraphicRegion::Table, 2 }, - { QColor::fromRgb(170, 0, 255, 60), "MathsRegion", (int)GraphicRegion::Maths, 2 }, - { QColor::fromRgb(255, 0, 144, 60), "GraphicRegion", (int)GraphicRegion::Graphic, 2 }, - { QColor::fromRgb(0, 204, 255, 60), "ChartRegion", (int)GraphicRegion::Chart, 2 } + /* COLOR | NAME | REGION | ZVALUE */ + { QColor::fromRgb(255, 0, 0, 90), "Line", (int)GraphicRegion::Line, 2 }, + { QColor::fromRgb(0, 100, 0, 90), "TextRegion", (int)GraphicRegion::Text, 1 }, + { QColor::fromRgb(0, 0, 255, 90), "VerticalSeparatorRegion", (int)GraphicRegion::VerticalSeparator, 2 }, + { QColor::fromRgb(0, 0, 255, 90), "HorizontalSeparatorRegion", (int)GraphicRegion::HorizontalSeparator, 2 }, + { QColor::fromRgb(0, 0, 128, 90), "WhitespaceSeparatorRegion", (int)GraphicRegion::WhiteSpaceSeparator, 2 }, + { QColor::fromRgb(255, 120, 0, 90), "ImageRegion", (int)GraphicRegion::Image, 1 }, + { QColor::fromRgb(43, 39, 128, 90), "NoiseRegion", (int)GraphicRegion::Noise, 2 }, + { QColor::fromRgb(220, 246, 0, 90), "TableRegion", (int)GraphicRegion::Table, 2 }, + { QColor::fromRgb(170, 0, 255, 90), "MathsRegion", (int)GraphicRegion::Maths, 2 }, + { QColor::fromRgb(255, 0, 144, 90), "GraphicRegion", (int)GraphicRegion::Graphic, 2 }, + { QColor::fromRgb(0, 204, 255, 90), "ChartRegion", (int)GraphicRegion::Chart, 2 } }; Xml::Xml(const QString &filename) { + gItem = 0; + tItem = 0; + + path = filename; load(filename); } +QString Xml::getPath(const QString &filename) +{ + // Get instance of the configuration settings. + Configs *const conf = Configs::getInstance(); + + QString xmlPath = filename; + + // Get xml filename from image path. + xmlPath.remove(0, xmlPath.lastIndexOf('/')+1); + int pos = xmlPath.lastIndexOf('.'); + xmlPath.remove(pos, xmlPath.length()-pos); + xmlPath += "_gui.xml"; + + return conf->generalSaveXmlCustomDirPath() + "/" + xmlPath; +} + void Xml::load(const QString &filename) { if(!filename.isEmpty()) { + // Reset graphic and tree items; + tItem = new XmlItem; + gItem = new QGraphicsPolygonItem; + QFile xmlFile(filename); xmlFile.open(QIODevice::ReadOnly); - QDomDocument xml; + // Fill new xml tree. + xml.clear(); xml.setContent(&xmlFile); xmlFile.close(); QDomElement root = xml.documentElement(); - tItems.setText(0, root.tagName()); + tItem->load(root); root = root.firstChild().toElement(); - QTreeWidgetItem *parentTreeItem = init(root, &tItems); + XmlItem *parentTreeItem = init(root, tItem); // Run through the xml file structure by structure. root = root.nextSibling().firstChild().toElement(); - for(int i = 1; i < 10; i++) + processNode(root, itemsData[1], parentTreeItem); + for(int i = 2; i < 10; i++) processNode(root.nextSiblingElement(itemsData[i].name), itemsData[i], parentTreeItem); } } -QTreeWidgetItem *Xml::init(const QDomElement& root, QTreeWidgetItem *rootTreeItem) +XmlItem *Xml::init(const QDomElement& root, XmlItem *rootTreeItem) { QDomElement node = root; - QString nodeText; - QTreeWidgetItem *parentTreeItem = new QTreeWidgetItem(rootTreeItem); - parentTreeItem->setText(0, node.tagName()); + XmlItem *parentTreeItem = new XmlItem(node, rootTreeItem); - QTreeWidgetItem *treeItem, *childTreeItem; - node = node.firstChild().toElement(); + QString nodeText; + XmlItem *treeItem = 0; // Run through "METADATA" node and subnodes. + node = node.firstChild().toElement(); while(!node.isNull()) { - treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); - treeItem->setText(0, node.tagName()); - - // Add widget item child with text content. - nodeText = node.text(); - childTreeItem = new QTreeWidgetItem(treeItem); - childTreeItem->setText(0, nodeText); - + treeItem = new XmlItem(node, parentTreeItem, treeItem); node = node.nextSibling().toElement(); } // Add "PAGE" root node and return it. - parentTreeItem = new QTreeWidgetItem(rootTreeItem, parentTreeItem); - parentTreeItem->setText(0, root.nextSibling().toElement().tagName()); - + parentTreeItem = new XmlItem(root.nextSibling().toElement(), rootTreeItem, parentTreeItem); return parentTreeItem; } -void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, QTreeWidgetItem *rootTreeItem) +void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, XmlItem *rootTreeItem) { if(!root.isNull()) { // Create corresponding tree item. - QTreeWidgetItem *parentTreeItem = fillWidgetItem(root.tagName(), rootTreeItem); - QTreeWidgetItem *treeItem; + XmlItem *parentTreeItem = new XmlItem(root, rootTreeItem); + XmlItem *parentItem = new XmlItem(root.firstChild().toElement(), parentTreeItem); QPolygon polygon; - QString sx, sy; + QString x, y; + XmlItem *item = 0; // Run through all points data. QDomElement node = root.firstChild().firstChild().toElement(); while(!node.isNull()) { - sx = node.attribute("x", "null"); - sy = node.attribute("y", "null"); + x = node.attribute("x", "null"); + y = node.attribute("y", "null"); - treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); - treeItem->setText(0, node.tagName() + " = " + sx + ", " + sy); + item = new XmlItem(node, parentItem, item); - polygon << QPoint(sx.toInt(), sy.toInt()); + polygon << QPoint(x.toInt(), y.toInt()); node = node.nextSibling().toElement(); } // Create the graphical item from data structure. - PolygonItem *polygonItem = new PolygonItem(polygon); + PolygonItem *polygonItem = new PolygonItem(polygon, gItem); polygonItem->loadData(data); - gItems << polygonItem; + parentTreeItem->setGraphicalItem(polygonItem); if(data.region == GraphicRegion::Text) - processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, parentTreeItem->parent()); + processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, parentTreeItem); // Run through all nodes from the same data structure recursively. processNode(root.nextSiblingElement(data.name), data, rootTreeItem); } } -void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, QTreeWidgetItem *rootTreeItem) +void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, XmlItem *rootTreeItem) { if(!root.isNull()) { // Create corresponding tree item. - QTreeWidgetItem *parentTreeItem = fillWidgetItem(root.tagName(), rootTreeItem); - QTreeWidgetItem *treeItem; + XmlItem *parentTreeItem = new XmlItem(root, rootTreeItem, rootTreeItem->child(0)); + XmlItem *parentItem = new XmlItem(root.firstChild().toElement(), parentTreeItem); + XmlItem *item = 0; QPolygon polygon; - QString sx, sy; - int x, y; + QString x, y; int xMin = INT_MAX; int xMax = INT_MIN; @@ -135,28 +151,25 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte QDomElement node = root.firstChild().firstChild().toElement(); while(!node.isNull()) { - sx = node.attribute("x", "null"); - sy = node.attribute("y", "null"); - - treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); - treeItem->setText(0, node.tagName() + " = " + sx + ", " + sy); + x = node.attribute("x", "null"); + y = node.attribute("y", "null"); - x = sx.toInt(); - y = sy.toInt(); + item = new XmlItem(node, parentItem, item); // Get beginning and end of line. - if(xMin > x) - xMin = x; - if(xMax < x) - xMax = x; + if(xMin > x.toInt()) + xMin = x.toInt(); + if(xMax < x.toInt()) + xMax = x.toInt(); - polygon << QPoint(x, y); + polygon << QPoint(x.toInt(), y.toInt()); node = node.nextSibling().toElement(); } // Create the graphical item from data structure. PolygonItem *polygonItem = new PolygonItem(polygon, parentPolygonItem); polygonItem->loadData(itemsData[0]); + parentTreeItem->setGraphicalItem(polygonItem); // Get meanline and baseline. processTypoNode(root, QPoint(xMin, xMax), polygonItem); diff --git a/XmlTree/xml.h b/XmlTree/xml.h index 9abec4e..5ab1c31 100644 --- a/XmlTree/xml.h +++ b/XmlTree/xml.h @@ -1,7 +1,6 @@ #ifndef XML_H #define XML_H -#include <QTreeWidgetItem> #include <QGraphicsItem> #include <QStringList> #include <QDomElement> @@ -9,42 +8,54 @@ #include <QFile> #include "polygonitem.h" +#include "variantpointer.h" +#include "xmlitem.h" +#include "configs.h" #include "region.h" -class Xml : - QObject +class Xml { - Q_OBJECT - public: explicit Xml(const QString& filename = QString()); + inline XmlItem *treeItem(); + inline QGraphicsItem *graphicItem(); + inline QDomDocument document() const; + inline QString filename() const; + + static QString getPath(const QString& filename); void load(const QString& filename); - inline QTreeWidgetItem *treeItem(); - inline QList<QGraphicsItem *> graphicsItems(); private: - QTreeWidgetItem *init(const QDomElement& root, QTreeWidgetItem *rootTreeItem); - inline QTreeWidgetItem *fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem); - void processNode(const QDomElement& root, const GraphicRegion::Data& data, QTreeWidgetItem *rootTreeItem); - void processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, QTreeWidgetItem *rootTreeItem); + XmlItem *init(const QDomElement& root, XmlItem *rootTreeItem); + //inline QTreeWidgetItem *fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem); + void processNode(const QDomElement& root, const GraphicRegion::Data& data, XmlItem *rootTreeItem); + void processLineNode(const QDomElement& root, PolygonItem *parentPolygonItem, XmlItem *rootTreeItem); void processTypoNode(const QDomElement& root, const QPoint& xPoint, PolygonItem *rootPolygonItem); - QList<QGraphicsItem *> gItems; - QTreeWidgetItem tItems; + QGraphicsPolygonItem *gItem; + XmlItem *tItem; + QDomDocument xml; + QString path; }; -inline QTreeWidgetItem *Xml::treeItem() -{ return &tItems; } +inline XmlItem *Xml::treeItem() +{ return tItem; } + +inline QGraphicsItem *Xml::graphicItem() +{ return gItem; } + +inline QDomDocument Xml::document() const +{ return xml; } -inline QList<QGraphicsItem *> Xml::graphicsItems() -{ return gItems; } +inline QString Xml::filename() const +{ return path; } -inline QTreeWidgetItem *Xml::fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem) +/*inline XmlItem *Xml::fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem) { QTreeWidgetItem *treeItem = new QTreeWidgetItem(rootTreeItem, QStringList(tagName)); treeItem = new QTreeWidgetItem(treeItem, QStringList("Coords")); return treeItem; -} +}*/ #endif // XML_H diff --git a/XmlTree/xmldelegate.cpp b/XmlTree/xmldelegate.cpp new file mode 100644 index 0000000..b4d2941 --- /dev/null +++ b/XmlTree/xmldelegate.cpp @@ -0,0 +1,12 @@ +#include "xmldelegate.h" + +XmlDelegate::XmlDelegate(QObject *parent) : + QStyledItemDelegate(parent) +{ +} + +void XmlDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option, const QModelIndex& index) const +{ + QStyledItemDelegate::paint(painter, option, index); + painter->drawText(option.rect, index.data(Qt::UserRole).toString()); +} diff --git a/XmlTree/xmldelegate.h b/XmlTree/xmldelegate.h new file mode 100644 index 0000000..ebd54c3 --- /dev/null +++ b/XmlTree/xmldelegate.h @@ -0,0 +1,21 @@ +#ifndef XMLDELEGATE_H +#define XMLDELEGATE_H + +#include <QStyledItemDelegate> +#include <QPainter> +#include <QSpinBox> +#include <QLabel> + +class XmlDelegate : + public QStyledItemDelegate +{ + public: + explicit XmlDelegate(QObject *parent = 0); + + //QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem& option, const QModelIndex& index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + /*void setEditorData(QWidget *editor, const QModelIndex& index) const; + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem& option, const QModelIndex& index) const;*/ +}; + +#endif // XMLDELEGATE_H diff --git a/XmlTree/xmlitem.cpp b/XmlTree/xmlitem.cpp new file mode 100644 index 0000000..b72a682 --- /dev/null +++ b/XmlTree/xmlitem.cpp @@ -0,0 +1,52 @@ +#include "xmlitem.h" + +XmlItem::XmlItem(XmlItem *parent, XmlItem *precItem) +{ + init(parent, precItem); +} + +XmlItem::XmlItem(const QDomElement &node, XmlItem *parent, XmlItem *precItem) +{ + init(parent, precItem); + load(node); +} + +XmlItem::~XmlItem() +{ + // Delete all childs. + XmlItem *child; + foreach(child, childs()) + delete child; +} + +void XmlItem::init(XmlItem *parent, XmlItem *precItem) +{ + if(parent) + parent->addChild(this); + + gItem = 0; + father = parent; + + if(precItem) + row = precItem->rowCount()+1; + else + row = 0; +} + +void XmlItem::load(const QDomElement& node) +{ + tagName = node.tagName(); + + // Load node attributes. + QDomNamedNodeMap nodeMap = node.attributes(); + QDomAttr attr; + QStringList values; + + for(int i = 0; i < nodeMap.count(); i++) + { + attr = nodeMap.item(i).toAttr(); + values << attr.name() << attr.value(); + + attrs << values; + } +} diff --git a/XmlTree/xmlitem.h b/XmlTree/xmlitem.h new file mode 100644 index 0000000..d9e4aa3 --- /dev/null +++ b/XmlTree/xmlitem.h @@ -0,0 +1,71 @@ +#ifndef XMLITEM_H +#define XMLITEM_H + +#include <QDomElement> + +#include "polygonitem.h" + +class XmlItem +{ + public: + explicit XmlItem(XmlItem *parent = 0, XmlItem *precItem = 0); + explicit XmlItem(const QDomElement& node, XmlItem *parent = 0, XmlItem *precItem = 0); + ~XmlItem(); + + void load(const QDomElement& node); + + inline QList<XmlItem *> childs() const; + inline void addChild(XmlItem *child); + inline XmlItem *child(int i); + inline XmlItem *parent(); + + inline PolygonItem *graphicalItem() const; + inline void setGraphicalItem(PolygonItem *graphicalItem); + + inline QString text() const; + inline QList<QStringList> attributes() const; + inline int rowCount() const; + + private: + void init(XmlItem *parent = 0, XmlItem *precItem = 0); + + QList<XmlItem *> listChilds; + XmlItem *father; + PolygonItem *gItem; + + QString tagName; + QList<QStringList> attrs; + + int row; +}; + +inline QList<XmlItem *> XmlItem::childs() const +{ return listChilds; } + +inline void XmlItem::addChild(XmlItem *child) +{ listChilds << child; } + +inline XmlItem *XmlItem::child(int i) +{ if(i > -1 && i < listChilds.count()) return listChilds[i]; return 0; } + +inline XmlItem *XmlItem::parent() +{ return father; } + +inline PolygonItem *XmlItem::graphicalItem() const +{ return gItem; } + +inline void XmlItem::setGraphicalItem(PolygonItem *graphicalItem) +{ gItem = graphicalItem; } + +inline QString XmlItem::text() const +{ return tagName; } + +inline QList<QStringList> XmlItem::attributes() const +{ return attrs; } + +inline int XmlItem::rowCount() const +{ return row; } + +Q_DECLARE_METATYPE(XmlItem); + +#endif // XMLITEM_H diff --git a/XmlTree/xmlmodel.cpp b/XmlTree/xmlmodel.cpp new file mode 100644 index 0000000..58ee88d --- /dev/null +++ b/XmlTree/xmlmodel.cpp @@ -0,0 +1,104 @@ +#include "xmlmodel.h" + +XmlModel::XmlModel(XmlItem *rootItem, QObject *parent) : + QAbstractItemModel(parent) +{ + this->rootItem = rootItem; +} + +XmlModel::XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate &dd, QObject *parent) : + QAbstractItemModel(dd, parent) +{ + this->rootItem = rootItem; +} + +XmlModel::~XmlModel() +{ + delete rootItem; +} + +XmlItem *XmlModel::xmlItem(const QModelIndex &parent) const +{ + // Check if we are in the root item. + if(!parent.isValid()) + return rootItem; + else + // Get xml item from the model index. + return static_cast<XmlItem *>(parent.internalPointer()); +} + +QVariant XmlModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if(orientation == Qt::Horizontal && role == Qt::DisplayRole) + { + switch(section) + { + case 0: + return tr("Tree"); + case 1: + return tr("Name"); + case 2: + return tr("Value"); + default: + return QVariant(); + } + } + + return QVariant(); +} + +QVariant XmlModel::data(const QModelIndex& index, int role) const +{ + if(!index.isValid()) + return QVariant(); + + if(role == Qt::UserRole) + return static_cast<XmlItem *>(index.internalPointer())->text(); + + /*if(role == Qt::UserRole) + static_cast<XmlItem *>(index.internalPointer())->text(); + + if(role == Qt::UserRole+1) + static_cast<XmlItem *>(index.internalPointer())->attributes(); + + if(role == Qt::UserRole+2) + VariantPointer::toQVariant(static_cast<XmlItem *>(index.internalPointer())->graphicalItem());*/ + + return QVariant(); +} + +QModelIndex XmlModel::index(int row, int column, const QModelIndex& parent) const +{ + if(!hasIndex(row, column, parent)) + return QModelIndex(); + + XmlItem *parentItem, *childItem; + + // Check if we are in the root item. + if(!parent.isValid()) + parentItem = rootItem; + else + // Get xml item from the model index. + parentItem = static_cast<XmlItem *>(parent.internalPointer()); + + childItem = parentItem->child(row); + + // Create the model index from the child item. + if(childItem) + return createIndex(row, column, childItem); + else + return QModelIndex(); +} + +QModelIndex XmlModel::parent(const QModelIndex& child) const +{ + if(!child.isValid()) + return QModelIndex(); + + XmlItem *parentItem = static_cast<XmlItem *>(child.internalPointer())->parent(); + + if(!parentItem || parentItem == rootItem) + return QModelIndex(); + + return createIndex(parentItem->rowCount(), 0, parentItem); +} diff --git a/XmlTree/xmlmodel.h b/XmlTree/xmlmodel.h new file mode 100644 index 0000000..6247cb1 --- /dev/null +++ b/XmlTree/xmlmodel.h @@ -0,0 +1,38 @@ +#ifndef XMLMODEL_H +#define XMLMODEL_H + +#include <QAbstractItemModel> + +#include "xmlitem.h" + +class XmlModel : + public QAbstractItemModel +{ + public: + explicit XmlModel(XmlItem *rootItem, QObject *parent = 0); + explicit XmlModel(XmlItem *rootItem, QAbstractItemModelPrivate& dd, QObject *parent); + ~XmlModel(); + + inline int rowCount(const QModelIndex& parent) const; + int columnCount(const QModelIndex& parent) const; + + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + + QVariant data(const QModelIndex& index, int role) const; + + QModelIndex index(int row, int column, const QModelIndex& parent) const; + QModelIndex parent(const QModelIndex& child) const; + + private: + XmlItem *xmlItem(const QModelIndex& parent) const; + + XmlItem *rootItem; +}; + +inline int XmlModel::rowCount(const QModelIndex& parent) const +{ XmlItem *parentItem = xmlItem(parent); return parentItem->childs().count(); } + +inline int XmlModel::columnCount(const QModelIndex&/* parent*/) const +{ return 1; } + +#endif // XMLMODEL_H diff --git a/XmlTree/xmlproxy.cpp b/XmlTree/xmlproxy.cpp new file mode 100644 index 0000000..b861bf6 --- /dev/null +++ b/XmlTree/xmlproxy.cpp @@ -0,0 +1,6 @@ +#include "xmlproxy.h" + +XmlProxy::XmlProxy(QObject *parent) : + QSortFilterProxyModel(parent) +{ +} diff --git a/XmlTree/xmlproxy.h b/XmlTree/xmlproxy.h new file mode 100644 index 0000000..8f1f517 --- /dev/null +++ b/XmlTree/xmlproxy.h @@ -0,0 +1,13 @@ +#ifndef XMLPROXY_H +#define XMLPROXY_H + +#include <QSortFilterProxyModel> + +class XmlProxy : + QSortFilterProxyModel +{ + public: + explicit XmlProxy(QObject *parent = 0); +}; + +#endif // XMLPROXY_H diff --git a/XmlTree/xmlwidget.cpp b/XmlTree/xmlwidget.cpp index d39651c..255642c 100644 --- a/XmlTree/xmlwidget.cpp +++ b/XmlTree/xmlwidget.cpp @@ -1,7 +1,15 @@ #include "xmlwidget.h" -XmlWidget::XmlWidget(QTreeWidgetItem *item) +XmlWidget::XmlWidget(XmlItem *item) { + XmlModel *model = new XmlModel(item); + XmlDelegate *delegate = new XmlDelegate(); + + proxy.setFilterRegExp(QRegExp(".Region|Line|Metadata|Page|Creator|Created|LastChange|Comments", Qt::CaseInsensitive)); + proxy.setFilterRole(Qt::UserRole); + proxy.setSourceModel(model); + tree.setParent(this); - load(item); + tree.setItemDelegate(delegate); + tree.setModel(&proxy); } diff --git a/XmlTree/xmlwidget.h b/XmlTree/xmlwidget.h index 301ee1d..8ee8699 100644 --- a/XmlTree/xmlwidget.h +++ b/XmlTree/xmlwidget.h @@ -1,25 +1,25 @@ #ifndef XMLWIDGET_H #define XMLWIDGET_H +#include <QSortFilterProxyModel> #include <QTreeWidgetItem> #include <QDomElement> #include <QWidget> +#include "xmldelegate.h" +#include "xmlmodel.h" +#include "xmlitem.h" + class XmlWidget : public QWidget { - friend class QTreeWidget; - public: - explicit XmlWidget(QTreeWidgetItem *item = 0); + explicit XmlWidget(XmlItem *item = 0); - inline void load(QTreeWidgetItem *item); + QTreeView tree; private: - QTreeWidget tree; + QSortFilterProxyModel proxy; }; -inline void XmlWidget::load(QTreeWidgetItem *item) -{ tree.addTopLevelItem(item); } - #endif // XMLWIDGET_H -- 1.7.2.5

11 years, 10 months

5635203 Add configs inline functions.

by Antoine Froger

--- GScribo/GScribo.pro | 60 ++++++++++ GScribo/Preferences/generaloptions.cpp | 44 +++++++ GScribo/Preferences/generaloptions.h | 34 ++++++ GScribo/Preferences/ocroptions.cpp | 55 +++++++++ GScribo/Preferences/ocroptions.h | 33 ++++++ GScribo/Preferences/optionwidget.cpp | 14 --- GScribo/Preferences/optionwidget.h | 6 +- GScribo/Preferences/preferencesdialog.cpp | 98 ++++++++++++++++ GScribo/Preferences/preferencesdialog.h | 42 +++++++ GScribo/Preferences/preprocessingoptions.h | 32 +++++ GScribo/Preferences/segmentationoptions.cpp | 35 ++++++ GScribo/Preferences/segmentationoptions.h | 31 +++++ GScribo/configs.cpp | 164 --------------------------- GScribo/configs.h | 138 ++++++++++++++++++---- 14 files changed, 579 insertions(+), 207 deletions(-) create mode 100644 GScribo/GScribo.pro create mode 100644 GScribo/Preferences/generaloptions.cpp create mode 100644 GScribo/Preferences/generaloptions.h create mode 100644 GScribo/Preferences/ocroptions.cpp create mode 100644 GScribo/Preferences/ocroptions.h delete mode 100644 GScribo/Preferences/optionwidget.cpp create mode 100644 GScribo/Preferences/preferencesdialog.cpp create mode 100644 GScribo/Preferences/preferencesdialog.h create mode 100644 GScribo/Preferences/preprocessingoptions.h create mode 100644 GScribo/Preferences/segmentationoptions.cpp create mode 100644 GScribo/Preferences/segmentationoptions.h delete mode 100644 GScribo/configs.cpp diff --git a/GScribo/GScribo.pro b/GScribo/GScribo.pro new file mode 100644 index 0000000..42d9e7b --- /dev/null +++ b/GScribo/GScribo.pro @@ -0,0 +1,60 @@ +# ------------------------------------------------- +# Project created by QtCreator 2013-01-21T09:20:54 +# ------------------------------------------------- +QT += xml +INCLUDEPATH += /lrde/home/stage/froger_a/olena/milena/ \ + /lrde/home/stage/froger_a/olena/scribo/ \ + /lrde/home/stage/froger_a/olena/_build/scribo/demo/ +QMAKE_CXXFLAGS += -DNDEBUG \ + -DMLN_WO_GLOBAL_VARS +LIBS += -I/usr/include/graphicsImage \ + -lGraphicsMagick++ \ + -ltesseract_full +TARGET = GScribo +TEMPLATE = app +SOURCES += main.cpp \ + mainwindow.cpp \ + Rendering/scene.cpp \ + Rendering/selection.cpp \ + Rendering/polygonitem.cpp \ + PagesViewer/pageswidget.cpp \ + PagesViewer/listmodel.cpp \ + Preferences/segmentationoptions.cpp \ + Preferences/preprocessingoptions.cpp \ + Preferences/ocroptions.cpp \ + Preferences/generaloptions.cpp \ + Preferences/preferencesdialog.cpp \ + Processing/progressdialog.cpp \ + Processing/process.cpp \ + Processing/preprocess.cpp \ + Processing/runner.cpp \ + xml.cpp \ + xmlwidget.cpp +HEADERS += mainwindow.h \ + configs.h \ + region.h \ + Rendering/scene.h \ + Rendering/selection.h \ + Rendering/polygonitem.h \ + PagesViewer/pageswidget.h \ + PagesViewer/listmodel.h \ + Preferences/segmentationoptions.h \ + Preferences/preprocessingoptions.h \ + Preferences/ocroptions.h \ + Preferences/generaloptions.h \ + Preferences/optionwidget.h \ + Preferences/preferencesdialog.h \ + Processing/preprocess.h \ + Processing/progressdialog.h \ + Processing/process.h \ + dir.h \ + Processing/runner.h \ + xml.h \ + variantpointer.h \ + xmlwidget.h +FORMS += mainwindow.ui \ + Preferences/preferencesdialog.ui \ + Preferences/ocroptions.ui \ + Preferences/segmentationoptions.ui \ + Preferences/generaloptions.ui \ + Preferences/preprocessingoptions.ui diff --git a/GScribo/Preferences/generaloptions.cpp b/GScribo/Preferences/generaloptions.cpp new file mode 100644 index 0000000..39a0160 --- /dev/null +++ b/GScribo/Preferences/generaloptions.cpp @@ -0,0 +1,44 @@ +#include "generaloptions.h" +#include "ui_generaloptions.h" + +GeneralOptions::GeneralOptions(QWidget *parent) : + OptionWidget(parent), + ui(new Ui::GeneralOptions) +{ + ui->setupUi(this); + loadConfig(); +} + +GeneralOptions::~GeneralOptions() +{ + delete ui; +} + +void GeneralOptions::loadConfig() +{ + Configs * const conf = Configs::getInstance(); + + ui->saveXml->setChecked(conf->generalSaveXmlEnabled()); + ui->sameDir->setChecked(conf->generalSaveXmlSameDir()); + ui->customDir->setChecked(conf->generalSaveXmlCustomDir()); + ui->customDirValue->setText(conf->generalSaveXmlCustomDirPath()); +} + + +void GeneralOptions::saveConfig() +{ + Configs * const conf = Configs::getInstance(); + + conf->setGeneralSaveXmlEnabled(ui->saveXml->isChecked()); + conf->setGeneralSaveXmlSameDir(ui->sameDir->isChecked()); + conf->setGeneralSaveXmlCustomDir(ui->customDir->isChecked()); + conf->setGeneralSaveXmlCustomDirPath(ui->customDirValue->text()); +} + +void GeneralOptions::onCustomDirBrowseBtnClicked() +{ + QString dir = QFileDialog::getExistingDirectory(0, "Choose a directory"); + + if (!dir.isEmpty()) + ui->customDirValue->setText(dir); +} diff --git a/GScribo/Preferences/generaloptions.h b/GScribo/Preferences/generaloptions.h new file mode 100644 index 0000000..0c07129 --- /dev/null +++ b/GScribo/Preferences/generaloptions.h @@ -0,0 +1,34 @@ +#ifndef GENERALOPTIONS_H +#define GENERALOPTIONS_H + +#include <QFileDialog> + +#include "optionwidget.h" +#include "configs.h" + +namespace Ui +{ + class GeneralOptions; +} + +class GeneralOptions : + public OptionWidget +{ + Q_OBJECT + + public: + explicit GeneralOptions(QWidget *parent = 0); + ~GeneralOptions(); + + virtual void loadConfig(); + virtual void saveConfig(); + + private: + Ui::GeneralOptions *ui; + + private slots: + void onCustomDirBrowseBtnClicked(); + +}; + +#endif // GENERAL_OPTIONS_H diff --git a/GScribo/Preferences/ocroptions.cpp b/GScribo/Preferences/ocroptions.cpp new file mode 100644 index 0000000..b2137bd --- /dev/null +++ b/GScribo/Preferences/ocroptions.cpp @@ -0,0 +1,55 @@ +#include "ocroptions.h" +#include "ui_ocroptions.h" + +using namespace scribo::toolchain::internal; + +static const char *language[][2] = +{ + { "English", "eng" }, + { "French", "fra" }, + { 0, 0 } +}; + +OcrOptions::OcrOptions(QWidget *parent) : + OptionWidget(parent), + ui(new Ui::OcrOptions) +{ + ui->setupUi(this); + + for (unsigned i = 0; language[i][0]; ++i) + ui->ocr_language->insertItem(i, language[i][0]); + + loadConfig(); +} + +OcrOptions::~OcrOptions() +{ + delete ui; +} + +int OcrOptions::findIndex(const QString& lang) +{ + for (unsigned i = 0; language[i][0]; ++i) + if (lang == language[i][1]) + return i; + + return 0; +} + + +void OcrOptions::loadConfig() +{ + Configs * const conf = Configs::getInstance(); + + ui->enable_ocr->setChecked(conf->ocrEnabled()); + ui->ocr_language->setCurrentIndex(findIndex(conf->ocrLanguage())); +} + + +void OcrOptions::saveConfig() +{ + Configs * const conf = Configs::getInstance(); + + conf->setOcrEnabled(ui->enable_ocr->isChecked()); + conf->setOcrLanguage(language[ui->ocr_language->currentIndex()][1]); +} diff --git a/GScribo/Preferences/ocroptions.h b/GScribo/Preferences/ocroptions.h new file mode 100644 index 0000000..b45fef6 --- /dev/null +++ b/GScribo/Preferences/ocroptions.h @@ -0,0 +1,33 @@ +#ifndef OCR_OPTIONS_H +#define OCR_OPTIONS_H + +#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> + +#include "optionwidget.h" +#include "configs.h" +#include "region.h" + +namespace Ui +{ + class OcrOptions; +} + +class OcrOptions : + public OptionWidget +{ + Q_OBJECT + + public: + explicit OcrOptions(QWidget *parent = 0); + ~OcrOptions(); + + void loadConfig(); + void saveConfig(); + + private: + int findIndex(const QString& lang); + + Ui::OcrOptions *ui; +}; + +#endif // OCR_OPTIONS_H diff --git a/GScribo/Preferences/optionwidget.cpp b/GScribo/Preferences/optionwidget.cpp deleted file mode 100644 index 75ee55d..0000000 --- a/GScribo/Preferences/optionwidget.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "optionwidget.h" - -OptionWidget::OptionWidget(QWidget * parent) : - QWidget(parent) -{ -} - -void OptionWidget::saveConfig() -{ -} - -void OptionWidget::loadConfig() -{ -} diff --git a/GScribo/Preferences/optionwidget.h b/GScribo/Preferences/optionwidget.h index ecdb650..e0979d2 100644 --- a/GScribo/Preferences/optionwidget.h +++ b/GScribo/Preferences/optionwidget.h @@ -6,10 +6,10 @@ struct OptionWidget : public QWidget { - explicit OptionWidget(QWidget * parent); + explicit OptionWidget(QWidget * parent) : QWidget(parent) {} - virtual void loadConfig(); - virtual void saveConfig(); + virtual void loadConfig() {} + virtual void saveConfig() {} }; #endif // OPTIONWIDGET_H diff --git a/GScribo/Preferences/preferencesdialog.cpp b/GScribo/Preferences/preferencesdialog.cpp new file mode 100644 index 0000000..6855698 --- /dev/null +++ b/GScribo/Preferences/preferencesdialog.cpp @@ -0,0 +1,98 @@ +#include "preferencesdialog.h" +#include "ui_preferencesdialog.h" + +PreferencesDialog::PreferencesDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::PreferencesDialog) +{ + ui->setupUi(this); + + // We may want to remove this useless object in the ui file. + delete ui->widget; + + connect(ui->optionList, SIGNAL(currentRowChanged(int)), this, SLOT(onOptionListCurrentRowChanged(int))); + setAttribute(Qt::WA_DeleteOnClose); + + loadOptionList(); + ui->optionList->setCurrentRow(0); +} + +PreferencesDialog::~PreferencesDialog() +{ + delete ui; +} + +void PreferencesDialog::loadOptionList() +{ + static const char *options[] = { "General", "Preprocessing", "Segmentation", "OCR", 0 }; + + int i; + for (i = 0; options[i]; ++i) + ui->optionList->insertItem(i, options[i]); + + widgets.fill(0, i); +} + +void PreferencesDialog::selectOptionWidget(int row) +{ + if(!widgets[row]) + { + QWidget *widget = 0; + + switch(row) + { + case 0: + widget = new GeneralOptions(this); + break; + + case 1: + widget = new PreprocessingOptions(this); + break; + + case 2: + widget = new SegmentationOptions(this); + break; + + case 3: + widget = new OcrOptions(this); + break; + } + + if(widget) + widgets[row] = widget; + } + + if(ui->horizontalLayout_2->count() == 2) + { + QWidget *current_widget = ui->horizontalLayout_2->itemAt(1)->widget(); + ui->horizontalLayout_2->removeWidget(current_widget); + current_widget->hide(); + } + + ui->horizontalLayout_2->insertWidget(1, widgets[row]); + widgets[row]->show(); +} + + +void PreferencesDialog::accept() +{ + for (int i = 0; i < widgets.size(); ++i) + { + if (widgets[i]) + { + static_cast<OptionWidget *>(widgets[i])->saveConfig(); + delete widgets[i]; + } + } + + QDialog::accept(); +} + + +void PreferencesDialog::reject() +{ + for (int i = 0; i < widgets.size(); ++i) + delete widgets[i]; + + QDialog::reject(); +} diff --git a/GScribo/Preferences/preferencesdialog.h b/GScribo/Preferences/preferencesdialog.h new file mode 100644 index 0000000..b0b9b61 --- /dev/null +++ b/GScribo/Preferences/preferencesdialog.h @@ -0,0 +1,42 @@ +#ifndef PREFERENCESDIALOG_H +#define PREFERENCESDIALOG_H + +#include <QDialog> + +#include "preprocessingoptions.h" +#include "segmentationoptions.h" +#include "generaloptions.h" +#include "ocroptions.h" + +namespace Ui +{ + class PreferencesDialog; +} + +class PreferencesDialog : + public QDialog +{ + Q_OBJECT + + public: + explicit PreferencesDialog(QWidget *parent = 0); + ~PreferencesDialog(); + + private: + void loadOptionList(); + void selectOptionWidget(int row); + + Ui::PreferencesDialog *ui; + QVector<QWidget *> widgets; + + private slots: + inline void onOptionListCurrentRowChanged(int row); + virtual void accept(); + virtual void reject(); + +}; + +inline void PreferencesDialog::onOptionListCurrentRowChanged(int row) +{ selectOptionWidget(row); } + +#endif // PREFERENCESDIALOG_H diff --git a/GScribo/Preferences/preprocessingoptions.h b/GScribo/Preferences/preprocessingoptions.h new file mode 100644 index 0000000..6cc0081 --- /dev/null +++ b/GScribo/Preferences/preprocessingoptions.h @@ -0,0 +1,32 @@ +#ifndef PREPROCESSINGOPTIONS_H +#define PREPROCESSINGOPTIONS_H + +#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> + +#include "optionwidget.h" +#include "region.h" +#include "configs.h" + +namespace Ui +{ + class PreprocessingOptions; +} + +class PreprocessingOptions : + public OptionWidget +{ + Q_OBJECT + + public: + explicit PreprocessingOptions(QWidget *parent = 0); + ~PreprocessingOptions(); + + void loadConfig(); + void saveConfig(); + + private: + Ui::PreprocessingOptions *ui; + +}; + +#endif // PREPROCESSINGOPTIONS_H diff --git a/GScribo/Preferences/segmentationoptions.cpp b/GScribo/Preferences/segmentationoptions.cpp new file mode 100644 index 0000000..21059cd --- /dev/null +++ b/GScribo/Preferences/segmentationoptions.cpp @@ -0,0 +1,35 @@ +#include "segmentationoptions.h" +#include "ui_segmentationoptions.h" + +using namespace scribo::toolchain::internal; + +SegmentationOptions::SegmentationOptions(QWidget *parent) : + OptionWidget(parent), + ui(new Ui::SegmentationOptions) +{ + ui->setupUi(this); + + ui->find_sepsCbox->insertItem(Separator::Lines, "Lines"); + ui->find_sepsCbox->insertItem(Separator::Whitespaces, "Whitespaces"); + ui->find_sepsCbox->insertItem(Separator::Both, "Lines and whitespaces"); + + loadConfig(); +} + +SegmentationOptions::~SegmentationOptions() +{ + delete ui; +} + +void SegmentationOptions::loadConfig() +{ + Configs *const conf = Configs::getInstance(); + ui->find_sepsCbox->setCurrentIndex(conf->segmentationFindSeps()); +} + + +void SegmentationOptions::saveConfig() +{ + Configs *const conf = Configs::getInstance(); + conf->setSegmentationFindSeps(ui->find_sepsCbox->currentIndex()); +} diff --git a/GScribo/Preferences/segmentationoptions.h b/GScribo/Preferences/segmentationoptions.h new file mode 100644 index 0000000..8003397 --- /dev/null +++ b/GScribo/Preferences/segmentationoptions.h @@ -0,0 +1,31 @@ +#ifndef SEGMENTATIONOPTIONS_H +#define SEGMENTATIONOPTIONS_H + +#include <scribo/toolchain/internal/text_in_doc_preprocess_functor.hh> + +#include "optionwidget.h" +#include "configs.h" +#include "region.h" + +namespace Ui +{ + class SegmentationOptions; +} + +class SegmentationOptions : + public OptionWidget +{ + Q_OBJECT + + public: + explicit SegmentationOptions(QWidget *parent = 0); + ~SegmentationOptions(); + + void loadConfig(); + void saveConfig(); + + private: + Ui::SegmentationOptions *ui; +}; + +#endif // SEGMENTATIONOPTIONS_H diff --git a/GScribo/configs.cpp b/GScribo/configs.cpp deleted file mode 100644 index 56282d3..0000000 --- a/GScribo/configs.cpp +++ /dev/null @@ -1,164 +0,0 @@ -#include "configs.h" - -Configs::Configs() - : QSettings("Olena-Scribo", "viewer") -{ -} - -Configs * Configs::getInstance() -{ - static Configs *conf = new Configs(); - return conf; -} - -// Preprocessing configs. -bool Configs::preprocessingSubsample() -{ - return value("preprocessing/subsample", false).toBool(); -} - -void Configs::setPreprocessingSubsample(bool b) -{ - setValue("preprocessing/subsample", b); -} - - - -bool Configs::preprocessingRemoveBg() -{ - return value("preprocessing/remove_bg", false).toBool(); -} - -void Configs::setPreprocessingRemoveBg(bool b) -{ - setValue("preprocessing/remove_bg", b); -} - - - -bool Configs::preprocessingDeskew() -{ - return value("preprocessing/deskew", false).toBool(); -} - -void Configs::setPreprocessingDeskew(bool b) -{ - setValue("preprocessing/deskew", b); -} - - - -bool Configs::preprocessingRemoveNoise() -{ - return value("preprocessing/remove_noise", true).toBool(); -} - -void Configs::setPreprocessingRemoveNoise(bool b) -{ - setValue("preprocessing/remove_noise", b); -} - - - -int Configs::preprocessingBinAlgo() -{ - return value("preprocessing/bin_algo", scribo::toolchain::internal::SauvolaMs).toInt(); -} - -void Configs::setPreprocessingBinAlgo(int algo) -{ - setValue("preprocessing/bin_algo", algo); -} - - - - - -// Segmentation configs. -int Configs::segmentationFindSeps() -{ - return value("segmentation/find_seps", Separator::Both).toInt(); -} - -void Configs::setSegmentationFindSeps(int seps) -{ - setValue("segmentation/find_seps", seps); -} - - - - - -// OCR configs. -bool Configs::ocrEnabled() -{ - return value("ocr/enabled", true).toBool(); -} - -void Configs::setOcrEnabled(bool b) -{ - setValue("ocr/enabled", b); -} - - - -QString Configs::ocrLanguage() -{ - return value("ocr/language", 0).toString(); -} - -void Configs::setOcrLanguage(const QString &lang) -{ - setValue("ocr/language", lang); -} - - - - - -// OCR configs. -bool Configs::generalSaveXmlEnabled() -{ - return value("general/save_xml/enabled", true).toBool(); -} - -void Configs::setGeneralSaveXmlEnabled(bool b) -{ - setValue("general/save_xml/enabled", b); -} - - - -bool Configs::generalSaveXmlSameDir() -{ - return value("general/save_xml/same_dir", true).toBool(); -} - -void Configs::setGeneralSaveXmlSameDir(bool b) -{ - setValue("general/save_xml/same_dir", b); -} - - - -bool Configs::generalSaveXmlCustomDir() -{ - return value("general/save_xml/custom_dir", false).toBool(); -} - -void Configs::setGeneralSaveXmlCustomDir(bool b) -{ - setValue("general/save_xml/custom_dir", b); -} - - - -QString Configs::generalSaveXmlCustomDirPath() -{ - return value("general/save_xml/custom_dir_path", QDir::tempPath()).toString(); -} - -void Configs::setGeneralSaveXmlCustomDirPath(const QString &path) -{ - setValue("general/save_xml/custom_dir_path", path); -} diff --git a/GScribo/configs.h b/GScribo/configs.h index aff4889..594650f 100644 --- a/GScribo/configs.h +++ b/GScribo/configs.h @@ -11,32 +11,118 @@ class Configs : public QSettings { public: - Configs(); - static Configs * getInstance(); - bool preprocessingSubsample(); - void setPreprocessingSubsample(bool b); - bool preprocessingRemoveBg(); - void setPreprocessingRemoveBg(bool b); - bool preprocessingDeskew(); - void setPreprocessingDeskew(bool b); - bool preprocessingRemoveNoise(); - void setPreprocessingRemoveNoise(bool b); - int preprocessingBinAlgo(); - void setPreprocessingBinAlgo(int algo); - int segmentationFindSeps(); - void setSegmentationFindSeps(int seps); - bool ocrEnabled(); - void setOcrEnabled(bool b); - QString ocrLanguage(); - void setOcrLanguage(const QString& lang); - bool generalSaveXmlEnabled(); - void setGeneralSaveXmlEnabled(bool b); - bool generalSaveXmlSameDir(); - void setGeneralSaveXmlSameDir(bool b); - bool generalSaveXmlCustomDir(); - void setGeneralSaveXmlCustomDir(bool b); - QString generalSaveXmlCustomDirPath(); - void setGeneralSaveXmlCustomDirPath(const QString& path); + Configs() : QSettings("olena-scribo", "gui") {} + + static Configs * getInstance() + { static Configs *conf = new Configs(); return conf; } + + inline bool preprocessingSubsample(); + inline void setPreprocessingSubsample(bool b); + + inline bool preprocessingRemoveBg(); + inline void setPreprocessingRemoveBg(bool b); + + inline bool preprocessingDeskew(); + inline void setPreprocessingDeskew(bool b); + + inline bool preprocessingRemoveNoise(); + inline void setPreprocessingRemoveNoise(bool b); + + inline int preprocessingBinAlgo(); + inline void setPreprocessingBinAlgo(int algo); + + inline int segmentationFindSeps(); + inline void setSegmentationFindSeps(int seps); + + inline bool ocrEnabled(); + inline void setOcrEnabled(bool b); + + inline QString ocrLanguage(); + inline void setOcrLanguage(const QString& lang); + + inline bool generalSaveXmlEnabled(); + inline void setGeneralSaveXmlEnabled(bool b); + + inline bool generalSaveXmlSameDir(); + inline void setGeneralSaveXmlSameDir(bool b); + + inline bool generalSaveXmlCustomDir(); + inline void setGeneralSaveXmlCustomDir(bool b); + + inline QString generalSaveXmlCustomDirPath(); + inline void setGeneralSaveXmlCustomDirPath(const QString& path); }; +inline bool Configs::preprocessingSubsample() +{ return value("preprocessing/subsample", false).toBool(); } + +inline void Configs::setPreprocessingSubsample(bool b) +{ setValue("preprocessing/subsample", b); } + +inline bool Configs::preprocessingRemoveBg() +{ return value("preprocessing/remove_bg", false).toBool(); } + +inline void Configs::setPreprocessingRemoveBg(bool b) +{ setValue("preprocessing/remove_bg", b); } + +inline bool Configs::preprocessingDeskew() +{ return value("preprocessing/deskew", false).toBool(); } + +inline void Configs::setPreprocessingDeskew(bool b) +{ setValue("preprocessing/deskew", b); } + +inline bool Configs::preprocessingRemoveNoise() +{ return value("preprocessing/remove_noise", true).toBool(); } + +inline void Configs::setPreprocessingRemoveNoise(bool b) +{ setValue("preprocessing/remove_noise", b); } + +inline int Configs::preprocessingBinAlgo() +{ return value("preprocessing/bin_algo", scribo::toolchain::internal::SauvolaMs).toInt(); } + +inline void Configs::setPreprocessingBinAlgo(int algo) +{ setValue("preprocessing/bin_algo", algo); } + +inline int Configs::segmentationFindSeps() +{ return value("segmentation/find_seps", Separator::Both).toInt(); } + +inline void Configs::setSegmentationFindSeps(int seps) +{ setValue("segmentation/find_seps", seps); } + +inline bool Configs::ocrEnabled() +{ return value("ocr/enabled", true).toBool(); } + +inline void Configs::setOcrEnabled(bool b) +{ setValue("ocr/enabled", b); } + +inline QString Configs::ocrLanguage() +{ return value("ocr/language", 0).toString(); } + +inline void Configs::setOcrLanguage(const QString& lang) +{ setValue("ocr/language", lang); } + +inline bool Configs::generalSaveXmlEnabled() +{ return value("general/save_xml/enabled", true).toBool(); } + +inline void Configs::setGeneralSaveXmlEnabled(bool b) +{ setValue("general/save_xml/enabled", b); } + +inline bool Configs::generalSaveXmlSameDir() +{ return value("general/save_xml/same_dir", true).toBool(); } + +inline void Configs::setGeneralSaveXmlSameDir(bool b) +{ setValue("general/save_xml/same_dir", b); } + +inline bool Configs::generalSaveXmlCustomDir() +{ return value("general/save_xml/custom_dir", false).toBool(); } + +inline void Configs::setGeneralSaveXmlCustomDir(bool b) +{ setValue("general/save_xml/custom_dir", b); } + +inline QString Configs::generalSaveXmlCustomDirPath() +{ return value("general/save_xml/custom_dir_path", QDir::tempPath()).toString(); } + +inline void Configs::setGeneralSaveXmlCustomDirPath(const QString& path) +{ setValue("general/save_xml/custom_dir_path", path); } + #endif // CONFIGS_H -- 1.7.2.5

11 years, 10 months

9aa27a6 new feFeatures for the tree widget : new treeWidget which show the selectionned items on the scene. TODO : Kill that and do it with model and proxy model to do something more generic.

by Antoine Froger

--- GScribo/GScribo.pro.user | 32 ++++++------ GScribo/PagesViewer/pageswidget.cpp | 3 +- GScribo/PagesViewer/pageswidget.h | 3 +- GScribo/Rendering/polygonitem.cpp | 31 ----------- GScribo/Rendering/polygonitem.h | 28 ++++------ GScribo/Rendering/scene.cpp | 88 ++++++++++++++++++------------ GScribo/Rendering/scene.h | 18 ++++--- GScribo/mainwindow.cpp | 60 +++++++-------------- GScribo/mainwindow.h | 2 +- GScribo/xml.cpp | 17 ++++++ GScribo/xml.h | 14 ++++- GScribo/xmlwidget.cpp | 101 +++++++++++++++++++++++++++++----- GScribo/xmlwidget.h | 22 ++++++-- 13 files changed, 246 insertions(+), 173 deletions(-) diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index b6ad263..4d451eb 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -67,14 +67,14 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-qmlsXLWJn3,guid=e4b2f30ca8d018ccce50314c0073cc47</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> - <value type="QString">GNOME_KEYRING_PID=8443</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-tl4Csb</value> + <value type="QString">GNOME_KEYRING_PID=6905</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> @@ -86,16 +86,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=8518</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> + <value type="QString">SSH_AGENT_PID=6981</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-Xmeufp6914/agent.6914</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmHN3NRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359636746.918575-1681926162</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -119,14 +119,14 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-qmlsXLWJn3,guid=e4b2f30ca8d018ccce50314c0073cc47</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> - <value type="QString">GNOME_KEYRING_PID=8443</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-tl4Csb</value> + <value type="QString">GNOME_KEYRING_PID=6905</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> @@ -138,16 +138,16 @@ <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=8518</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> + <value type="QString">SSH_AGENT_PID=6981</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-Xmeufp6914/agent.6914</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmHN3NRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359636746.918575-1681926162</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> diff --git a/GScribo/PagesViewer/pageswidget.cpp b/GScribo/PagesViewer/pageswidget.cpp index 3f975b4..7140d73 100644 --- a/GScribo/PagesViewer/pageswidget.cpp +++ b/GScribo/PagesViewer/pageswidget.cpp @@ -28,7 +28,7 @@ void PagesWidget::getPixmap(const QModelIndex &index) QPixmap pixmap = index.data(Qt::UserRole).value<QPixmap>(); QString filename = index.data(Qt::UserRole+1).toString(); - emit selectionClicked(filename, pixmap); + emit sceneChanged(filename, pixmap); } void PagesWidget::addPixmap(const QString& filename, const QPixmap &pixmap) @@ -49,6 +49,7 @@ void PagesWidget::removeSelection() for(int i = indexes.count()-1; i > -1; i--) model.removePixmap(indexes[i]); + // Draw new pixmap on the scene. getPixmap(model.index(indexes[0].row())); clearSelection(); } diff --git a/GScribo/PagesViewer/pageswidget.h b/GScribo/PagesViewer/pageswidget.h index 07d32ac..60ea9b6 100644 --- a/GScribo/PagesViewer/pageswidget.h +++ b/GScribo/PagesViewer/pageswidget.h @@ -24,8 +24,7 @@ class PagesWidget: void removeSelection(); signals: - void clicked(const QModelIndex &index); - void selectionClicked(const QString& filename, const QPixmap& pixmap); + void sceneChanged(const QString& filename, const QPixmap& pixmap); }; #endif // PAGESWIDGET_H diff --git a/GScribo/Rendering/polygonitem.cpp b/GScribo/Rendering/polygonitem.cpp index 48dbad0..b447e28 100644 --- a/GScribo/Rendering/polygonitem.cpp +++ b/GScribo/Rendering/polygonitem.cpp @@ -27,11 +27,6 @@ void PolygonItem::init() unselectedBrush.setStyle(Qt::SolidPattern); } -QColor PolygonItem::color() const -{ - return selectedBrush.color(); -} - void PolygonItem::setColor(const QColor &color) { selectedPen.setColor(QColor::fromRgb(color.red(), color.green(), color.blue(), 255)); @@ -43,29 +38,3 @@ void PolygonItem::setColor(const QColor &color) setPen(unselectedPen); setBrush(unselectedBrush); } - -bool PolygonItem::repaint(const QRectF& rect, bool clic) -{ - bool isSel = isSelected(rect, clic); - - // Change items brush and pen if it's selectionned or not. - if(isSel) - { - if(pen() != selectedPen) - { - setPen(selectedPen); - setBrush(selectedBrush); - } - } - - else - { - if(pen() != unselectedPen) - { - setPen(unselectedPen); - setBrush(unselectedBrush); - } - } - - return isSel; -} diff --git a/GScribo/Rendering/polygonitem.h b/GScribo/Rendering/polygonitem.h index 112da15..ca32774 100644 --- a/GScribo/Rendering/polygonitem.h +++ b/GScribo/Rendering/polygonitem.h @@ -16,14 +16,14 @@ class PolygonItem : explicit PolygonItem(const QPolygonF& path, QGraphicsItem *parent = 0, QGraphicsScene *scene = 0); void setColor(const QColor& color); - QColor color() const; + inline QColor color() const; - inline bool isSelected(const QRectF& rect, bool clic); - bool repaint(const QRectF &rect, bool clic); inline void loadData(const GraphicRegion::Data& data); + inline bool isSelected(const QRectF& rect, bool clic); inline void unselect(); inline void select(); + inline void setSelected(bool selected); private: void init(); @@ -34,12 +34,11 @@ class PolygonItem : QBrush unselectedBrush; }; +inline QColor PolygonItem::color() const +{ return selectedBrush.color(); } + inline void PolygonItem::loadData(const GraphicRegion::Data &data) -{ - setData(0, data.region); - setColor(data.color); - setZValue(data.zValue); -} +{ setData(0, data.region); setColor(data.color); setZValue(data.zValue); } inline bool PolygonItem::isSelected(const QRectF &rect, bool clic) { @@ -50,15 +49,12 @@ inline bool PolygonItem::isSelected(const QRectF &rect, bool clic) } inline void PolygonItem::select() -{ - setPen(selectedPen); - setBrush(selectedBrush); -} +{ if(pen() != selectedPen) { setPen(selectedPen); setBrush(selectedBrush); } } inline void PolygonItem::unselect() -{ - setPen(unselectedPen); - setBrush(unselectedBrush); -} +{ if(pen() != unselectedPen) { setPen(unselectedPen); setBrush(unselectedBrush); } } + +inline void PolygonItem::setSelected(bool selected) +{ if(selected) select(); else unselect(); } #endif // POLYGONITEM_H diff --git a/GScribo/Rendering/scene.cpp b/GScribo/Rendering/scene.cpp index eb86c6c..3b4c70b 100644 --- a/GScribo/Rendering/scene.cpp +++ b/GScribo/Rendering/scene.cpp @@ -1,7 +1,5 @@ #include "scene.h" -/******************************************* Run through item childs run through LINES ! TODO ****************************************/ -/******************************************* Center */ Scene::Scene(QObject *parent): QGraphicsScene(parent) { @@ -28,15 +26,12 @@ void Scene::init() // Disable the scene size adaptation to items rect with a non null rect. setSceneRect(0, 0, 0, 1); - addItem(&selection); -} -QString Scene::backgroundPath() const -{ - return path; + selection.setRect(0, 0, 0, 0); + addItem(&selection); } -void Scene::reset() +void Scene::clear() { if(item) delete item; @@ -83,11 +78,11 @@ void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) // If no selection, store the click position in the selection rectangle. if(clic) - selection.setRect(QRectF(QPointF(0, 0), event->scenePos())); + selection.setRect(QRectF(QPointF(0, 0), event->scenePos())); // Redraw all items in selection. if(item) - repaintSelection(selection.rect(), clic); + selectItems(selection.rect(), clic); selection.setRect(0, 0, 0, 0); selection.hide(); @@ -101,62 +96,84 @@ void Scene::selectItem(PolygonItem *graphicalItem) QGraphicsItem *child; PolygonItem *polygonItem; + // Unselect all items. foreach(child, item->childItems()) { polygonItem = static_cast<PolygonItem *>(child); polygonItem->unselect(); - if(polygonItem->data(0).toInt() == GraphicRegion::Text) + // Unselect lines. + foreach(child, polygonItem->childItems()) { - foreach(child, polygonItem->childItems()) - { - polygonItem = static_cast<PolygonItem *>(child); - polygonItem->unselect(); - } + polygonItem = static_cast<PolygonItem *>(child); + polygonItem->unselect(); } } + // Select the good item. graphicalItem->select(); + views()[0]->centerOn(graphicalItem); } } -void Scene::repaintSelection(const QRectF &rect, bool clic) +void Scene::selectItems(const QRectF &rect, bool clic) { QGraphicsItem *child; PolygonItem *polygonItem; + QList<QTreeWidgetItem *> selectionTree; + QTreeWidgetItem *treeItem; bool isSel; - emit clearTreeSelection(); - // Redraw all items in the scene except selection. foreach(child, item->childItems()) { polygonItem = static_cast<PolygonItem *>(child); - isSel = polygonItem->repaint(rect, clic); + isSel = polygonItem->isSelected(rect, clic); - // If item selectionned, select it on the xml tree. + // If item selectionned, select it on the xml tree and the scene. if(isSel) - emit selectTreeItem(VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1))); + { + polygonItem->select(); + treeItem = VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1)); + treeItem = new QTreeWidgetItem(*treeItem); + selectionTree << treeItem; + } + else + polygonItem->unselect(); - // If the item is a text region. if(polygonItem->data(0).toInt() == GraphicRegion::Text) { - // Run through each child lines items. + // Run through each child lines items and do the same. foreach(child, polygonItem->childItems()) { polygonItem = static_cast<PolygonItem *>(child); - isSel = polygonItem->repaint(rect, clic); + isSel = polygonItem->isSelected(rect, clic); if(isSel) - emit selectTreeItem(VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1))); + { + polygonItem->select(); + + // Check if the corresponding text region has been clicked. + if(treeItem) + treeItem->addChild(new QTreeWidgetItem(*VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1)))); + else + selectionTree << new QTreeWidgetItem(*VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1))); + } + else + polygonItem->unselect(); } } + + treeItem = 0; } + + emit selectTreeItems(selectionTree); } void Scene::addPolygonItem(QGraphicsItem *item) { - reset(); + // Delete all items in the scene. + clear(); this->item = item; addItem(item); @@ -164,16 +181,15 @@ void Scene::addPolygonItem(QGraphicsItem *item) void Scene::changeScene(const QString& filename, const QPixmap& pixmap, QGraphicsItem *item) { - if(path != filename) - { - reset(); + path = filename; - path = filename; + // Delete all items in the scene. + clear(); - setSceneRect(pixmap.rect()); - setBackgroundBrush(QBrush(pixmap)); + setSceneRect(pixmap.rect()); + setBackgroundBrush(QBrush(pixmap)); - if(item) - addPolygonItem(item); - } + // Add new items. + if(item) + addPolygonItem(item); } diff --git a/GScribo/Rendering/scene.h b/GScribo/Rendering/scene.h index 0bd5d56..ac63f7f 100644 --- a/GScribo/Rendering/scene.h +++ b/GScribo/Rendering/scene.h @@ -2,6 +2,7 @@ #define SCENE_H #include <QGraphicsSceneMouseEvent> +#include <QGraphicsView> #include <QGraphicsScene> #include <QFileDialog> @@ -18,11 +19,12 @@ class Scene : explicit Scene(const QRectF &sceneRect, QObject *parent = 0); explicit Scene(qreal x, qreal y, qreal width, qreal height, QObject *parent = 0); - QString backgroundPath() const; - void reset(); + inline QString backgroundPath() const; + + void clear(); void addPolygonItem(QGraphicsItem *item); void changeScene(const QString& filename, const QPixmap& pixmap, QGraphicsItem *item = 0); - void repaintSelection(const QRectF& rect, bool clic); + void selectItems(const QRectF& rect, bool clic); protected: void mousePressEvent(QGraphicsSceneMouseEvent *event); @@ -36,15 +38,17 @@ class Scene : Selection selection; QPointF pressPos; bool isPressing; - QString path; bool clic; + QString path; public slots: void selectItem(PolygonItem *graphicalItem); signals: - void selectTreeItem(QTreeWidgetItem *treeItem); - void clearTreeSelection(); - }; + void selectTreeItems(const QList<QTreeWidgetItem *>& selectionTree); +}; + +inline QString Scene::backgroundPath() const +{ return path; } #endif // SCENE_H diff --git a/GScribo/mainwindow.cpp b/GScribo/mainwindow.cpp index 6b098fc..c048456 100644 --- a/GScribo/mainwindow.cpp +++ b/GScribo/mainwindow.cpp @@ -84,11 +84,22 @@ void MainWindow::initMenuBar() connect(preferences, SIGNAL(triggered()), SLOT(onPreferences())); } -void MainWindow::onPagesSelection(const QString &filename, const QPixmap &pixmap) +void MainWindow::onFileChanged(const QString &filename, const QPixmap &pixmap) { - xml = processTmpXml(filename); - scene.changeScene(filename, pixmap, xml.graphicItem()); - xmlWidget.changeView(xml.treeItem()); + // If it's not the current scene. + if(scene.backgroundPath() != filename) + { + QString xmlPath = Xml::getPath(filename); + // Check if the xml file exists to draw data in the scene. + if(QFile(xmlPath).exists()) + { + xml.load(xmlPath); + scene.changeScene(filename, pixmap, xml.graphicItem()); + xmlWidget.changeView(xml.treeItem()); + } + else + scene.changeScene(filename, pixmap); + } } void MainWindow::onOpen() @@ -110,43 +121,10 @@ void MainWindow::onOpen() pagesWidget.addPixmap(path, pixmap); } - // Seek if xml file already exists and in that case, add it to the scene. - xml = processTmpXml(path); - scene.changeScene(path, pixmap, xml.graphicItem()); - xmlWidget.changeView(xml.treeItem()); + onFileChanged(path, pixmap); } } -Xml MainWindow::processTmpXml(const QString &filename) const -{ - QString path = filename; - - // Get instance of the configuration settings. - Configs * const conf = Configs::getInstance(); - - // Get xml filename from image path. - path.remove(0, path.lastIndexOf('/')+1); - int pos = path.lastIndexOf('.'); - path.remove(pos, path.length()-pos); - path += "_gui.xml"; - - // Get full path of xml file. - if(QDir::temp().exists(path)) - path = QDir::tempPath() + "/" + path; - else if(QDir(conf->generalSaveXmlCustomDirPath()).exists(path)) - path = conf->generalSaveXmlCustomDirPath() + "/" + path; - else - path = QString(); - - // Get xml file informations if it exists. - if(path.isNull()) - return Xml(); - else - - return Xml(path); -} - - void MainWindow::onSegment() { if(scene.backgroundPath() != "") @@ -180,12 +158,12 @@ void MainWindow::onPreferences() void MainWindow::connectWidgets() { // If double click on a picture of the page widget -> draw it on background scene. - connect(&pagesWidget, SIGNAL(selectionClicked(QString,QPixmap)), this, SLOT(onPagesSelection(QString,QPixmap))); + connect(&pagesWidget, SIGNAL(sceneChanged(QString,QPixmap)), this, SLOT(onFileChanged(QString,QPixmap))); // Connect scene selection with xml tree and vice versa. - connect(&scene, SIGNAL(selectTreeItem(QTreeWidgetItem*)), &xmlWidget, SLOT(selectItem(QTreeWidgetItem*))); - connect(&scene, SIGNAL(clearTreeSelection()), &xmlWidget, SLOT(clearSelection())); + connect(&scene, SIGNAL(selectTreeItems(QList<QTreeWidgetItem*>)), &xmlWidget, SLOT(selectItems(QList<QTreeWidgetItem*>))); connect(&xmlWidget, SIGNAL(selectGraphicalItem(PolygonItem*)), &scene, SLOT(selectItem(PolygonItem*))); + connect(&pagesWidget, SIGNAL(removeTreeSelection()), &xmlWidget, SLOT(clear())); connect(&runner, SIGNAL(progress()), &progressDialog, SLOT(run())); connect(&runner, SIGNAL(new_progress_max_value(int)), &progressDialog, SLOT(setMaximum(int))); diff --git a/GScribo/mainwindow.h b/GScribo/mainwindow.h index 9baab40..456ec65 100644 --- a/GScribo/mainwindow.h +++ b/GScribo/mainwindow.h @@ -64,7 +64,7 @@ class MainWindow: void onSegment(); void onXmlSaved(const QString& filename); void onPreferences(); - void onPagesSelection(const QString& filename, const QPixmap& pixmap); + void onFileChanged(const QString& filename, const QPixmap& pixmap); }; #endif // MAINWINDOW_H diff --git a/GScribo/xml.cpp b/GScribo/xml.cpp index 59a3963..994d788 100644 --- a/GScribo/xml.cpp +++ b/GScribo/xml.cpp @@ -21,9 +21,26 @@ Xml::Xml(const QString &filename) gItem = 0; tItem = 0; + path = filename; load(filename); } +QString Xml::getPath(const QString &filename) +{ + // Get instance of the configuration settings. + Configs *const conf = Configs::getInstance(); + + QString xmlPath = filename; + + // Get xml filename from image path. + xmlPath.remove(0, xmlPath.lastIndexOf('/')+1); + int pos = xmlPath.lastIndexOf('.'); + xmlPath.remove(pos, xmlPath.length()-pos); + xmlPath += "_gui.xml"; + + return conf->generalSaveXmlCustomDirPath() + "/" + xmlPath; +} + void Xml::load(const QString &filename) { if(!filename.isEmpty()) diff --git a/GScribo/xml.h b/GScribo/xml.h index 81b7583..67f460c 100644 --- a/GScribo/xml.h +++ b/GScribo/xml.h @@ -10,6 +10,7 @@ #include "Rendering/polygonitem.h" #include "variantpointer.h" +#include "configs.h" #include "region.h" class Xml @@ -17,10 +18,13 @@ class Xml public: explicit Xml(const QString& filename = QString()); - void load(const QString& filename); inline QTreeWidgetItem *treeItem(); inline QGraphicsItem *graphicItem(); - inline QDomDocument xmlDocument() const; + inline QDomDocument document() const; + inline QString filename() const; + + static QString getPath(const QString& filename); + void load(const QString& filename); private: QTreeWidgetItem *init(const QDomElement& root, QTreeWidgetItem *rootTreeItem); @@ -32,6 +36,7 @@ class Xml QGraphicsPolygonItem *gItem; QTreeWidgetItem *tItem; QDomDocument xml; + QString path; }; inline QTreeWidgetItem *Xml::treeItem() @@ -40,9 +45,12 @@ inline QTreeWidgetItem *Xml::treeItem() inline QGraphicsItem *Xml::graphicItem() { return gItem; } -inline QDomDocument Xml::xmlDocument() const +inline QDomDocument Xml::document() const { return xml; } +inline QString Xml::filename() const +{ return path; } + inline QTreeWidgetItem *Xml::fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem) { QTreeWidgetItem *treeItem = new QTreeWidgetItem(rootTreeItem, QStringList(tagName)); diff --git a/GScribo/xmlwidget.cpp b/GScribo/xmlwidget.cpp index 34ec266..a128b95 100644 --- a/GScribo/xmlwidget.cpp +++ b/GScribo/xmlwidget.cpp @@ -3,33 +3,71 @@ XmlWidget::XmlWidget(QWidget *parent) : QWidget(parent) { - viewer.setHeaderHidden(true); - QHBoxLayout *hLayout = new QHBoxLayout; QStringList headerNames; headerNames << tr("Name") << tr("Value"); property.setHeaderItem(new QTreeWidgetItem(headerNames)); + viewer.setHeaderItem(new QTreeWidgetItem(QStringList("Tree"))); + selection.setHeaderItem(new QTreeWidgetItem(QStringList("Selection"))); hLayout->addWidget(&viewer); + hLayout->addWidget(&selection); hLayout->addWidget(&property); setLayout(hLayout); - connect(&viewer, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(setSelectItem(QTreeWidgetItem*))); + connect(&viewer, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(selectTreeItem(QTreeWidgetItem*))); + connect(&selection, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(selectSelectedItem(QTreeWidgetItem*))); +} + +XmlWidget::~XmlWidget() +{ + clear(); } -void XmlWidget::setSelectItem(QTreeWidgetItem *treeItem) +void XmlWidget::selectItem(QTreeWidgetItem *treeItem, bool fromSelection) { + // Get graphical item corresponding to the tree item. + PolygonItem *graphicalItem = VariantPointer<PolygonItem>::fromQVariant(treeItem->data(0, Qt::UserRole+1)); + + if(!fromSelection) + { + clearSelection(); + + QTreeWidgetItem *selectionedItem = new QTreeWidgetItem(*treeItem); + selectionedItems << selectionedItem; + selection.addTopLevelItem(selectionedItem); + } + + // Told to the scene to select the corresponding graphical item. + emit selectGraphicalItem(graphicalItem); + viewer.setCurrentItem(treeItem, 0); - treeItem->setExpanded(true); // Fill property tree view. fillProperty(treeItem); +} - // Emit signal to select corresponding graphical item on the scene. - emit selectGraphicalItem(VariantPointer<PolygonItem>::fromQVariant(treeItem->data(0, Qt::UserRole+1))); +void XmlWidget::selectItems(const QList<QTreeWidgetItem *>& selectionTree) +{ + clearSelection(); + + if(!selectionTree.isEmpty()) + { + selectionedItems = selectionTree; + + QTreeWidgetItem *treeItem; + foreach(treeItem, selectionTree) + { + selection.addTopLevelItem(treeItem); + /*selection.setCurrentItem(treeItem, 0); + treeItem->setExpanded(true);*/ + } + + fillProperty(treeItem); + } } void XmlWidget::fillProperty(QTreeWidgetItem *treeItem) @@ -60,23 +98,56 @@ void XmlWidget::changeView(QTreeWidgetItem *treeItem) if(treeItem != viewer.topLevelItem(0)) { // Delete all dom nodes pointers inside items data. - QTreeWidgetItem *topLevelItem = viewer.takeTopLevelItem(0); - if(topLevelItem) - { - deleteItemsNode(topLevelItem); - delete VariantPointer<QDomNamedNodeMap>::fromQVariant(topLevelItem->data(0, Qt::UserRole)); - delete topLevelItem; - } + clear(); // Reset tree widgets. - property.clear(); viewer.reset(); if(treeItem != 0) + { viewer.addTopLevelItem(treeItem); + viewer.setCurrentItem(treeItem->child(1), 0); + treeItem->child(1)->setExpanded(true); + } } } +void XmlWidget::clear() +{ + QTreeWidgetItem *topLevelItem = viewer.takeTopLevelItem(0); + + // Delete top level item, all its childs and datas. + if(topLevelItem) + { + deleteItemsNode(topLevelItem); + delete VariantPointer<QDomNamedNodeMap>::fromQVariant(topLevelItem->data(0, Qt::UserRole)); + delete topLevelItem; + + clearSelection(); + } +} + +void XmlWidget::clearSelection() +{ + property.clear(); + + // Delete all selectionned items. + QTreeWidgetItem *item, *child; + foreach(item, selectionedItems) + { + // Delete selectionned lines. + for(int i = 0; i < item->childCount(); i++) + { + child = item->child(i); + delete child; + } + + delete item; + } + + selectionedItems = QList<QTreeWidgetItem *>(); +} + void XmlWidget::deleteItemsNode(QTreeWidgetItem *topLevelItem) { QTreeWidgetItem *item; diff --git a/GScribo/xmlwidget.h b/GScribo/xmlwidget.h index d6d8fe3..e1f23cc 100644 --- a/GScribo/xmlwidget.h +++ b/GScribo/xmlwidget.h @@ -1,6 +1,7 @@ #ifndef XMLWIDGET_H #define XMLWIDGET_H +#include <QGraphicsView> #include <QTreeWidget> #include <QVBoxLayout> #include <QDomElement> @@ -17,25 +18,38 @@ class XmlWidget : public: explicit XmlWidget(QWidget *parent = 0); + ~XmlWidget(); void changeView(QTreeWidgetItem *treeItem); + void selectItem(QTreeWidgetItem *treeItem, bool fromSelection = false); private: void fillProperty(QTreeWidgetItem *treeItem); void deleteItemsNode(QTreeWidgetItem *topLevelItem); QTreeWidget viewer; + QTreeWidget selection; QTreeWidget property; + QList<QTreeWidgetItem *> selectionedItems; public slots: - void setSelectItem(QTreeWidgetItem *treeItem); - inline void clearSelection(); + void selectItems(const QList<QTreeWidgetItem *>& selectionTree); + + void clear(); + void clearSelection(); + + private slots: + inline void selectTreeItem(QTreeWidgetItem *treeItem); + inline void selectSelectedItem(QTreeWidgetItem *selectedItem); signals: void selectGraphicalItem(PolygonItem *polygonItem); }; -inline void XmlWidget::clearSelection() -{ viewer.reset(); property.clear(); } +inline void XmlWidget::selectTreeItem(QTreeWidgetItem *treeItem) +{ selectItem(treeItem, false); } + +inline void XmlWidget::selectSelectedItem(QTreeWidgetItem *selectedItem) +{ selectItem(selectedItem, true); } #endif // XMLWIDGET_H -- 1.7.2.5

11 years, 10 months

bf4dcc2 Finished selection from tree view to select on the scene.

by Antoine Froger

--- GScribo/GScribo.pro.user | 19 ++-- GScribo/Rendering/polygonitem.cpp | 2 - GScribo/Rendering/polygonitem.h | 15 +++ GScribo/Rendering/scene.cpp | 42 +++++++- GScribo/Rendering/scene.h | 7 +- GScribo/mainwindow.cpp | 214 +++++++++++++++++++++++++++++++++++++ GScribo/mainwindow.h | 70 ++++++++++++ GScribo/xml.cpp | 58 ++++------- GScribo/xml.h | 5 +- GScribo/xmlwidget.cpp | 60 +++++++++-- GScribo/xmlwidget.h | 18 ++-- 11 files changed, 435 insertions(+), 75 deletions(-) create mode 100644 GScribo/mainwindow.cpp create mode 100644 GScribo/mainwindow.h diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index 5c5dcd4..b6ad263 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -168,36 +168,35 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-OdVBhpC8Q3,guid=12f5a3829adfbb5c05f6273d007125c0</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-epygWB</value> - <value type="QString">GNOME_KEYRING_PID=7156</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> + <value type="QString">GNOME_KEYRING_PID=8443</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=7231</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-poGlEz7165/agent.7165</value> + <value type="QString">SSH_AGENT_PID=8518</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmH3DGRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359463044.389005-635867443</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> diff --git a/GScribo/Rendering/polygonitem.cpp b/GScribo/Rendering/polygonitem.cpp index d11d482..48dbad0 100644 --- a/GScribo/Rendering/polygonitem.cpp +++ b/GScribo/Rendering/polygonitem.cpp @@ -55,7 +55,6 @@ bool PolygonItem::repaint(const QRectF& rect, bool clic) { setPen(selectedPen); setBrush(selectedBrush); - update(rect); } } @@ -65,7 +64,6 @@ bool PolygonItem::repaint(const QRectF& rect, bool clic) { setPen(unselectedPen); setBrush(unselectedBrush); - update(rect); } } diff --git a/GScribo/Rendering/polygonitem.h b/GScribo/Rendering/polygonitem.h index 9715872..112da15 100644 --- a/GScribo/Rendering/polygonitem.h +++ b/GScribo/Rendering/polygonitem.h @@ -22,6 +22,9 @@ class PolygonItem : bool repaint(const QRectF &rect, bool clic); inline void loadData(const GraphicRegion::Data& data); + inline void unselect(); + inline void select(); + private: void init(); @@ -46,4 +49,16 @@ inline bool PolygonItem::isSelected(const QRectF &rect, bool clic) return (boundingRect().width() == 0 || boundingRect().height() == 0 || boundingRect().intersects(rect)) && shape().intersects(rect); } +inline void PolygonItem::select() +{ + setPen(selectedPen); + setBrush(selectedBrush); +} + +inline void PolygonItem::unselect() +{ + setPen(unselectedPen); + setBrush(unselectedBrush); +} + #endif // POLYGONITEM_H diff --git a/GScribo/Rendering/scene.cpp b/GScribo/Rendering/scene.cpp index f58227f..eb86c6c 100644 --- a/GScribo/Rendering/scene.cpp +++ b/GScribo/Rendering/scene.cpp @@ -1,5 +1,7 @@ #include "scene.h" +/******************************************* Run through item childs run through LINES ! TODO ****************************************/ +/******************************************* Center */ Scene::Scene(QObject *parent): QGraphicsScene(parent) { @@ -92,13 +94,39 @@ void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } } +void Scene::selectItem(PolygonItem *graphicalItem) +{ + if(graphicalItem) + { + QGraphicsItem *child; + PolygonItem *polygonItem; + + foreach(child, item->childItems()) + { + polygonItem = static_cast<PolygonItem *>(child); + polygonItem->unselect(); + + if(polygonItem->data(0).toInt() == GraphicRegion::Text) + { + foreach(child, polygonItem->childItems()) + { + polygonItem = static_cast<PolygonItem *>(child); + polygonItem->unselect(); + } + } + } + + graphicalItem->select(); + } +} + void Scene::repaintSelection(const QRectF &rect, bool clic) { QGraphicsItem *child; PolygonItem *polygonItem; bool isSel; - emit clearTreeItemSelection(); + emit clearTreeSelection(); // Redraw all items in the scene except selection. foreach(child, item->childItems()) @@ -106,14 +134,22 @@ void Scene::repaintSelection(const QRectF &rect, bool clic) polygonItem = static_cast<PolygonItem *>(child); isSel = polygonItem->repaint(rect, clic); + // If item selectionned, select it on the xml tree. if(isSel) emit selectTreeItem(VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1))); - // If the item is a text region, run through childs line items. + // If the item is a text region. if(polygonItem->data(0).toInt() == GraphicRegion::Text) { + // Run through each child lines items. foreach(child, polygonItem->childItems()) - static_cast<PolygonItem *>(child)->repaint(rect, clic); + { + polygonItem = static_cast<PolygonItem *>(child); + isSel = polygonItem->repaint(rect, clic); + + if(isSel) + emit selectTreeItem(VariantPointer<QTreeWidgetItem>::fromQVariant(polygonItem->data(1))); + } } } } diff --git a/GScribo/Rendering/scene.h b/GScribo/Rendering/scene.h index 2ea559f..0bd5d56 100644 --- a/GScribo/Rendering/scene.h +++ b/GScribo/Rendering/scene.h @@ -39,9 +39,12 @@ class Scene : QString path; bool clic; + public slots: + void selectItem(PolygonItem *graphicalItem); + signals: - void selectTreeItem(QTreeWidgetItem *item); - void clearTreeItemSelection(); + void selectTreeItem(QTreeWidgetItem *treeItem); + void clearTreeSelection(); }; #endif // SCENE_H diff --git a/GScribo/mainwindow.cpp b/GScribo/mainwindow.cpp new file mode 100644 index 0000000..6b098fc --- /dev/null +++ b/GScribo/mainwindow.cpp @@ -0,0 +1,214 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) +{ + ui->setupUi(this); + + setWindowTitle(tr("GScribo")); + + initGraphicsRegion(); + initTextRegion(); + initXmlWidget(); + initPageWidget(); + initToolBar(); + initMenuBar(); + + connectWidgets(); + connectShortcuts(); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + +void MainWindow::initGraphicsRegion() +{ + // Cache backgroud to speed up its repaint. + graphicsView.setCacheMode(QGraphicsView::CacheBackground); + graphicsView.setViewportUpdateMode(QGraphicsView::SmartViewportUpdate); + graphicsView.setScene(&scene); + + setCentralWidget(&graphicsView); +} + +void MainWindow::initPageWidget() +{ + dockPages.setWindowTitle(tr("Pages")); + dockPages.setFeatures(QDockWidget::DockWidgetClosable); + dockPages.setMaximumWidth(190); + dockPages.setMinimumWidth(190); + dockPages.setWidget(&pagesWidget); + + addDockWidget(Qt::LeftDockWidgetArea, &dockPages); +} + +void MainWindow::initXmlWidget() +{ + dockXml.setWindowTitle(tr("Xml")); + dockXml.setFeatures(QDockWidget::DockWidgetClosable); + dockXml.setWidget(&xmlWidget); + + addDockWidget(Qt::BottomDockWidgetArea, &dockXml); +} + +void MainWindow::initTextRegion() +{ + dockText.setWindowTitle(tr("Text")); + dockText.setAllowedAreas(Qt::AllDockWidgetAreas); + dockText.setFeatures(QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable); + dockText.setWidget(&textEdit); + + addDockWidget(Qt::RightDockWidgetArea, &dockText); + dockText.hide(); +} + +void MainWindow::initToolBar() +{ + QAction *open = ui->mainToolBar->addAction(tr("Open")); + connect(open, SIGNAL(triggered()), this, SLOT(onOpen())); + + QAction *segment = ui->mainToolBar->addAction(tr("Segment")); + connect(segment, SIGNAL(triggered()), this, SLOT(onSegment())); + + QAction *del = ui->mainToolBar->addAction(tr("Delete")); + connect(del, SIGNAL(triggered()), &pagesWidget, SLOT(removeSelection())); +} + +void MainWindow::initMenuBar() +{ + QAction *preferences = ui->menuBar->addAction(tr("Preferences")); + connect(preferences, SIGNAL(triggered()), SLOT(onPreferences())); +} + +void MainWindow::onPagesSelection(const QString &filename, const QPixmap &pixmap) +{ + xml = processTmpXml(filename); + scene.changeScene(filename, pixmap, xml.graphicItem()); + xmlWidget.changeView(xml.treeItem()); +} + +void MainWindow::onOpen() +{ + QStringList paths = QFileDialog::getOpenFileNames(this, "Open Image(s)", QDir::homePath(), "Images (*.png *.jpg *.ppm *.bmp)"); + + if(paths.count() > 0) + { + QString path = paths[0]; + QPixmap pixmap(path); + + pagesWidget.addPixmap(path, pixmap); + + // If more than one file, we store it in the page widget. + for(int i = 1; i < paths.count(); i++) + { + path = paths[i]; + pixmap.load(path); + pagesWidget.addPixmap(path, pixmap); + } + + // Seek if xml file already exists and in that case, add it to the scene. + xml = processTmpXml(path); + scene.changeScene(path, pixmap, xml.graphicItem()); + xmlWidget.changeView(xml.treeItem()); + } +} + +Xml MainWindow::processTmpXml(const QString &filename) const +{ + QString path = filename; + + // Get instance of the configuration settings. + Configs * const conf = Configs::getInstance(); + + // Get xml filename from image path. + path.remove(0, path.lastIndexOf('/')+1); + int pos = path.lastIndexOf('.'); + path.remove(pos, path.length()-pos); + path += "_gui.xml"; + + // Get full path of xml file. + if(QDir::temp().exists(path)) + path = QDir::tempPath() + "/" + path; + else if(QDir(conf->generalSaveXmlCustomDirPath()).exists(path)) + path = conf->generalSaveXmlCustomDirPath() + "/" + path; + else + path = QString(); + + // Get xml file informations if it exists. + if(path.isNull()) + return Xml(); + else + + return Xml(path); +} + + +void MainWindow::onSegment() +{ + if(scene.backgroundPath() != "") + { + QStringList filenames; + + if(!pagesWidget.isVisible()) + filenames << scene.backgroundPath(); + else + filenames = pagesWidget.filenames(); + + // Run segmentation of page(s). + progressDialog.reset(); + runner.start_demat(filenames); + } +} + +void MainWindow::onXmlSaved(const QString& filename) +{ + xml.load(filename); + xmlWidget.changeView(xml.treeItem()); + scene.addPolygonItem(xml.graphicItem()); +} + +void MainWindow::onPreferences() +{ + PreferencesDialog *preferenceDialog = new PreferencesDialog(this); + preferenceDialog->show(); +} + +void MainWindow::connectWidgets() +{ + // If double click on a picture of the page widget -> draw it on background scene. + connect(&pagesWidget, SIGNAL(selectionClicked(QString,QPixmap)), this, SLOT(onPagesSelection(QString,QPixmap))); + + // Connect scene selection with xml tree and vice versa. + connect(&scene, SIGNAL(selectTreeItem(QTreeWidgetItem*)), &xmlWidget, SLOT(selectItem(QTreeWidgetItem*))); + connect(&scene, SIGNAL(clearTreeSelection()), &xmlWidget, SLOT(clearSelection())); + connect(&xmlWidget, SIGNAL(selectGraphicalItem(PolygonItem*)), &scene, SLOT(selectItem(PolygonItem*))); + + connect(&runner, SIGNAL(progress()), &progressDialog, SLOT(run())); + connect(&runner, SIGNAL(new_progress_max_value(int)), &progressDialog, SLOT(setMaximum(int))); + connect(&runner, SIGNAL(new_progress_label(QString)), &progressDialog, SLOT(setLabelText(QString))); + connect(&runner, SIGNAL(finished()), &progressDialog, SLOT(close())); + connect(&runner, SIGNAL(xml_saved(QString)), this, SLOT(onXmlSaved(QString))); +} + +void MainWindow::connectShortcuts() +{ + QShortcut *del = new QShortcut(Qt::Key_Delete, &pagesWidget); + connect(del, SIGNAL(activated()), &pagesWidget, SLOT(removeSelection())); +} + +void MainWindow::changeEvent(QEvent *e) +{ + QMainWindow::changeEvent(e); + switch (e->type()) + { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } +} diff --git a/GScribo/mainwindow.h b/GScribo/mainwindow.h new file mode 100644 index 0000000..9baab40 --- /dev/null +++ b/GScribo/mainwindow.h @@ -0,0 +1,70 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include <QGraphicsView> +#include <QPlainTextEdit> +#include <QMainWindow> +#include <QHBoxLayout> +#include <QDockWidget> +#include <QFileDialog> +#include <QGroupBox> + +#include "Preferences/preferencesdialog.h" +#include "Processing/progressdialog.h" +#include "PagesViewer/pageswidget.h" +#include "Processing/runner.h" +#include "Rendering/scene.h" +#include "xmlwidget.h" +#include "xml.h" + +namespace Ui +{ + class MainWindow; +} + +class MainWindow: + public QMainWindow +{ + Q_OBJECT + + public: + MainWindow(QWidget *parent = 0); + ~MainWindow(); + + protected: + void changeEvent(QEvent *e); + + private: + void initGraphicsRegion(); + void initTextRegion(); + void initToolBar(); + void initPageWidget(); + void initXmlWidget(); + void initMenuBar(); + void connectWidgets(); + void connectShortcuts(); + + Xml processTmpXml(const QString& filename) const; + + Ui::MainWindow *ui; + QDockWidget dockText; + QDockWidget dockPages; + QDockWidget dockXml; + QGraphicsView graphicsView; + Scene scene; + QPlainTextEdit textEdit; + PagesWidget pagesWidget; + Runner runner; + ProgressDialog progressDialog; + Xml xml; + XmlWidget xmlWidget; + + private slots: + void onOpen(); + void onSegment(); + void onXmlSaved(const QString& filename); + void onPreferences(); + void onPagesSelection(const QString& filename, const QPixmap& pixmap); +}; + +#endif // MAINWINDOW_H diff --git a/GScribo/xml.cpp b/GScribo/xml.cpp index 143e4a7..59a3963 100644 --- a/GScribo/xml.cpp +++ b/GScribo/xml.cpp @@ -18,6 +18,9 @@ static const GraphicRegion::Data itemsData[] = Xml::Xml(const QString &filename) { + gItem = 0; + tItem = 0; + load(filename); } @@ -32,6 +35,7 @@ void Xml::load(const QString &filename) QFile xmlFile(filename); xmlFile.open(QIODevice::ReadOnly); + // Fill new xml tree. xml.clear(); xml.setContent(&xmlFile); @@ -93,40 +97,30 @@ void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, { if(!root.isNull()) { - QDomElement node = root; - // Create corresponding tree item. - QTreeWidgetItem *parentTreeItem = fillWidgetItem(root.tagName(), rootTreeItem); - parentTreeItem->parent()->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); - QTreeWidgetItem *treeItem; + QTreeWidgetItem *parentTreeItem = new QTreeWidgetItem(rootTreeItem, QStringList(root.tagName())); + parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); QPolygon polygon; - QString sx, sy; // Run through all points data. - node = node.firstChild().firstChild().toElement(); + QDomElement node = root.firstChild().firstChild().toElement(); while(!node.isNull()) { - sx = node.attribute("x", "null"); - sy = node.attribute("y", "null"); - - treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); - treeItem->setText(0, node.tagName() + " = " + sx + ", " + sy); - // Store the xml node in the item. - treeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(node.attributes()))); - - polygon << QPoint(sx.toInt(), sy.toInt()); + polygon << QPoint(node.attribute("x", "null").toInt(), node.attribute("y", "null").toInt()); node = node.nextSibling().toElement(); } // Create the graphical item from data structure. PolygonItem *polygonItem = new PolygonItem(polygon, gItem); polygonItem->loadData(data); - // Store tree object in the graphical object. - polygonItem->setData(0, VariantPointer<QTreeWidgetItem>::toQVariant(parentTreeItem)); + + // Store tree object in the graphical object an vice versa. + polygonItem->setData(1, VariantPointer<QTreeWidgetItem>::toQVariant(parentTreeItem)); + parentTreeItem->setData(0, Qt::UserRole+1, VariantPointer<PolygonItem>::toQVariant(polygonItem)); if(data.region == GraphicRegion::Text) - processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, parentTreeItem->parent()); + processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, parentTreeItem); // Run through all nodes from the same data structure recursively. processNode(root.nextSiblingElement(data.name), data, rootTreeItem); @@ -137,34 +131,22 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte { if(!root.isNull()) { - QDomElement node = root; - // Create corresponding tree item. - QTreeWidgetItem *parentTreeItem = fillWidgetItem(root.tagName(), rootTreeItem); - parentTreeItem->parent()->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(node.attributes()))); - QTreeWidgetItem *treeItem; + QTreeWidgetItem *parentTreeItem = new QTreeWidgetItem(rootTreeItem, QStringList(root.tagName())); + parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); QPolygon polygon; - QString sx, sy; int x, y; int xMin = INT_MAX; int xMax = INT_MIN; // Run through all points data. - node = node.firstChild().firstChild().toElement(); + QDomElement node = root.firstChild().firstChild().toElement(); while(!node.isNull()) { - sx = node.attribute("x", "null"); - sy = node.attribute("y", "null"); - - treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); - treeItem->setText(0, node.tagName() + " = " + sx + ", " + sy); - // Store xml node attributes in the item. - treeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(node.attributes()))); - - x = sx.toInt(); - y = sy.toInt(); + x = node.attribute("x", "null").toInt(); + y = node.attribute("y", "null").toInt(); // Get beginning and end of line. if(xMin > x) @@ -179,8 +161,10 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte // Create the graphical item from data structure. PolygonItem *polygonItem = new PolygonItem(polygon, parentPolygonItem); polygonItem->loadData(itemsData[0]); - // Store tree object in the graphical object. + + // Store tree object in the graphical object and vice versa. polygonItem->setData(1, VariantPointer<QTreeWidgetItem>::toQVariant(parentTreeItem)); + parentTreeItem->setData(0, Qt::UserRole+1, VariantPointer<PolygonItem>::toQVariant(polygonItem)); // Get meanline and baseline. processTypoNode(root, QPoint(xMin, xMax), polygonItem); diff --git a/GScribo/xml.h b/GScribo/xml.h index 3141eb3..81b7583 100644 --- a/GScribo/xml.h +++ b/GScribo/xml.h @@ -12,11 +12,8 @@ #include "variantpointer.h" #include "region.h" -class Xml : - QObject +class Xml { - Q_OBJECT - public: explicit Xml(const QString& filename = QString()); diff --git a/GScribo/xmlwidget.cpp b/GScribo/xmlwidget.cpp index 9c4c867..34ec266 100644 --- a/GScribo/xmlwidget.cpp +++ b/GScribo/xmlwidget.cpp @@ -17,7 +17,19 @@ XmlWidget::XmlWidget(QWidget *parent) : setLayout(hLayout); - connect(&viewer, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(fillProperty(QTreeWidgetItem*))); + connect(&viewer, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(setSelectItem(QTreeWidgetItem*))); +} + +void XmlWidget::setSelectItem(QTreeWidgetItem *treeItem) +{ + viewer.setCurrentItem(treeItem, 0); + treeItem->setExpanded(true); + + // Fill property tree view. + fillProperty(treeItem); + + // Emit signal to select corresponding graphical item on the scene. + emit selectGraphicalItem(VariantPointer<PolygonItem>::fromQVariant(treeItem->data(0, Qt::UserRole+1))); } void XmlWidget::fillProperty(QTreeWidgetItem *treeItem) @@ -31,18 +43,50 @@ void XmlWidget::fillProperty(QTreeWidgetItem *treeItem) { QStringList values; - //if(node.hasAttributes()) - //{ - QDomNamedNodeMap attributes = *node;/*.attributes();*/ - - for(int i = 0; i < attributes.count(); i++) + // Fill tree widget with all property of a node. + for(int i = 0; i < node->count(); i++) { - values << attributes.item(i).toAttr().name() << attributes.item(i).toAttr().value(); + values << node->item(i).toAttr().name() << node->item(i).toAttr().value(); property.addTopLevelItem(new QTreeWidgetItem(values)); values.clear(); } - //} } property.resizeColumnToContents(0); } + +void XmlWidget::changeView(QTreeWidgetItem *treeItem) +{ + if(treeItem != viewer.topLevelItem(0)) + { + // Delete all dom nodes pointers inside items data. + QTreeWidgetItem *topLevelItem = viewer.takeTopLevelItem(0); + if(topLevelItem) + { + deleteItemsNode(topLevelItem); + delete VariantPointer<QDomNamedNodeMap>::fromQVariant(topLevelItem->data(0, Qt::UserRole)); + delete topLevelItem; + } + + // Reset tree widgets. + property.clear(); + viewer.reset(); + + if(treeItem != 0) + viewer.addTopLevelItem(treeItem); + } +} + +void XmlWidget::deleteItemsNode(QTreeWidgetItem *topLevelItem) +{ + QTreeWidgetItem *item; + + // Delete recursively all childs of an item and the child of the child item etc ... + for(int i = 0; i < topLevelItem->childCount(); i++) + { + item = topLevelItem->child(i); + deleteItemsNode(item); + delete VariantPointer<QDomNamedNodeMap>::fromQVariant(item->data(0, Qt::UserRole)); + delete item; + } +} diff --git a/GScribo/xmlwidget.h b/GScribo/xmlwidget.h index 3f42db2..d6d8fe3 100644 --- a/GScribo/xmlwidget.h +++ b/GScribo/xmlwidget.h @@ -7,6 +7,7 @@ #include <QWidget> #include <QLabel> +#include "Rendering/polygonitem.h" #include "variantpointer.h" class XmlWidget : @@ -17,23 +18,22 @@ class XmlWidget : public: explicit XmlWidget(QWidget *parent = 0); - inline void changeView(QTreeWidgetItem *treeItem); + void changeView(QTreeWidgetItem *treeItem); private: + void fillProperty(QTreeWidgetItem *treeItem); + void deleteItemsNode(QTreeWidgetItem *topLevelItem); + QTreeWidget viewer; QTreeWidget property; public slots: - void fillProperty(QTreeWidgetItem *treeItem); - inline void selectItem(QTreeWidgetItem *item); + void setSelectItem(QTreeWidgetItem *treeItem); inline void clearSelection(); -}; - -inline void XmlWidget::changeView(QTreeWidgetItem *treeItem) -{ viewer.takeTopLevelItem(0); viewer.reset(); if(treeItem != 0) viewer.addTopLevelItem(treeItem); } -inline void XmlWidget::selectItem(QTreeWidgetItem *item) -{ viewer.setCurrentItem(item, 0); item->setExpanded(true); } + signals: + void selectGraphicalItem(PolygonItem *polygonItem); +}; inline void XmlWidget::clearSelection() { viewer.reset(); property.clear(); } -- 1.7.2.5

11 years, 10 months

a928f7e Finish link between item tagName and item attribute.

by Antoine Froger

--- GScribo/GScribo.pro.user | 38 +++++++++++++--------------- GScribo/PagesViewer/listmodel.cpp | 8 +++--- GScribo/xml.cpp | 49 +++++++++++++++++++------------------ GScribo/xml.h | 5 ++++ GScribo/xmlwidget.cpp | 13 +++++++--- 5 files changed, 61 insertions(+), 52 deletions(-) diff --git a/GScribo/GScribo.pro.user b/GScribo/GScribo.pro.user index fdf1f0c..5c5dcd4 100644 --- a/GScribo/GScribo.pro.user +++ b/GScribo/GScribo.pro.user @@ -67,36 +67,35 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-OdVBhpC8Q3,guid=12f5a3829adfbb5c05f6273d007125c0</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-epygWB</value> - <value type="QString">GNOME_KEYRING_PID=7156</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> + <value type="QString">GNOME_KEYRING_PID=8443</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=7231</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-poGlEz7165/agent.7165</value> + <value type="QString">SSH_AGENT_PID=8518</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmH3DGRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359463044.389005-635867443</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> @@ -120,36 +119,35 @@ <valuemap type="QVariantMap"> <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value> <valuelist key="abstractProcess.Environment" type="QVariantList"> - <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-OdVBhpC8Q3,guid=12f5a3829adfbb5c05f6273d007125c0</value> + <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-VUZT78qyIG,guid=a51566d968c6324fbe10159500728107</value> <value type="QString">DESKTOP_SESSION=fluxbox</value> <value type="QString">DISPLAY=:0.0</value> <value type="QString">GDMSESSION=fluxbox</value> <value type="QString">GDM_LANG=fr_FR.UTF-8</value> <value type="QString">GDM_XSERVER_LOCATION=local</value> - <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-epygWB</value> - <value type="QString">GNOME_KEYRING_PID=7156</value> + <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-E8RI9F</value> + <value type="QString">GNOME_KEYRING_PID=8443</value> <value type="QString">GTK_MODULES=canberra-gtk-module</value> <value type="QString">HOME=/lrde/home/stage/froger_a</value> <value type="QString">LANG=fr_FR.UTF-8</value> - <value type="QString">LANGUAGE=</value> <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value> <value type="QString">LOGNAME=froger_a</value> - <value type="QString">OLDPWD=/lrde/home/stage/froger_a</value> + <value type="QString">OLDPWD=/lrde/home/stage/froger_a/qt</value> <value type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games</value> <value type="QString">PWD=/lrde/home/stage/froger_a/qt/GScribo</value> <value type="QString">QTDIR=/usr/share/qt4</value> <value type="QString">SHELL=/bin/bash</value> <value type="QString">SHLVL=2</value> - <value type="QString">SSH_AGENT_PID=7231</value> - <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-poGlEz7165/agent.7165</value> + <value type="QString">SSH_AGENT_PID=8518</value> + <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-FvhujW8452/agent.8452</value> <value type="QString">TERM=xterm</value> <value type="QString">USER=froger_a</value> <value type="QString">USERNAME=froger_a</value> <value type="QString">WINDOWID=10485796</value> - <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> - <value type="QString">XAUTHORITY=/tmp/.gdmH3DGRW</value> + <value type="QString">WINDOWPATH=7:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8:8</value> + <value type="QString">XAUTHORITY=/tmp/.gdmOKGZRW</value> <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value> - <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359463044.389005-635867443</value> + <value type="QString">XDG_SESSION_COOKIE=b24883b9b4dbfb80ea83575b00000a11-1359551947.439559-1116819102</value> <value type="QString">XPSERVERLIST=:64 </value> <value type="QString">XTERM_LOCALE=fr_FR.UTF-8</value> <value type="QString">XTERM_SHELL=/bin/bash</value> diff --git a/GScribo/PagesViewer/listmodel.cpp b/GScribo/PagesViewer/listmodel.cpp index 9748e76..0a57f97 100644 --- a/GScribo/PagesViewer/listmodel.cpp +++ b/GScribo/PagesViewer/listmodel.cpp @@ -12,7 +12,7 @@ QStringList ListModel::filenames() const int ListModel::rowCount(const QModelIndex&) const { - return pixmaps.size(); + return pixmaps.count(); } QVariant ListModel::data(const QModelIndex& index, int role) const @@ -25,18 +25,18 @@ QVariant ListModel::data(const QModelIndex& index, int role) const // Store the original pixmap in a custom place. if(role == Qt::UserRole) - return pixmaps.value(index.row()); + return pixmaps[index.row()]; // Store the path of the pixmap in an other custom place. if(role == Qt::UserRole+1) - return paths.value(index.row()); + return paths[index.row()]; return QVariant(); } void ListModel::addPixmap(const QString& filename, const QPixmap& pixmap) { - int row = pixmaps.size(); + int row = rowCount(); beginInsertRows(QModelIndex(), row, row); diff --git a/GScribo/xml.cpp b/GScribo/xml.cpp index 23ac2b6..143e4a7 100644 --- a/GScribo/xml.cpp +++ b/GScribo/xml.cpp @@ -3,17 +3,17 @@ static const GraphicRegion::Data itemsData[] = { /* COLOR | NAME | REGION | ZVALUE */ - { QColor::fromRgb(255, 0, 0, 90), "Line", (int)GraphicRegion::Line, 2 }, - { QColor::fromRgb(0, 100, 0, 90), "TextRegion", (int)GraphicRegion::Text, 1 }, - { QColor::fromRgb(0, 0, 255, 90), "VerticalSeparatorRegion", (int)GraphicRegion::VerticalSeparator, 2 }, - { QColor::fromRgb(0, 0, 255, 90), "HorizontalSeparatorRegion", (int)GraphicRegion::HorizontalSeparator, 2 }, - { QColor::fromRgb(0, 0, 128, 90), "WhitespaceSeparatorRegion", (int)GraphicRegion::WhiteSpaceSeparator, 2 }, - { QColor::fromRgb(255, 120, 0, 90), "ImageRegion", (int)GraphicRegion::Image, 1 }, - { QColor::fromRgb(43, 39, 128, 90), "NoiseRegion", (int)GraphicRegion::Noise, 2 }, - { QColor::fromRgb(220, 246, 0, 90), "TableRegion", (int)GraphicRegion::Table, 2 }, - { QColor::fromRgb(170, 0, 255, 90), "MathsRegion", (int)GraphicRegion::Maths, 2 }, - { QColor::fromRgb(255, 0, 144, 90), "GraphicRegion", (int)GraphicRegion::Graphic, 2 }, - { QColor::fromRgb(0, 204, 255, 90), "ChartRegion", (int)GraphicRegion::Chart, 2 } + { QColor::fromRgb(255, 0, 0, 90), "Line", (int)GraphicRegion::Line, 2 }, + { QColor::fromRgb(0, 100, 0, 90), "TextRegion", (int)GraphicRegion::Text, 1 }, + { QColor::fromRgb(0, 0, 255, 90), "VerticalSeparatorRegion", (int)GraphicRegion::VerticalSeparator, 2 }, + { QColor::fromRgb(0, 0, 255, 90), "HorizontalSeparatorRegion", (int)GraphicRegion::HorizontalSeparator, 2 }, + { QColor::fromRgb(0, 0, 128, 90), "WhitespaceSeparatorRegion", (int)GraphicRegion::WhiteSpaceSeparator, 2 }, + { QColor::fromRgb(255, 120, 0, 90), "ImageRegion", (int)GraphicRegion::Image, 1 }, + { QColor::fromRgb(43, 39, 128, 90), "NoiseRegion", (int)GraphicRegion::Noise, 2 }, + { QColor::fromRgb(220, 246, 0, 90), "TableRegion", (int)GraphicRegion::Table, 2 }, + { QColor::fromRgb(170, 0, 255, 90), "MathsRegion", (int)GraphicRegion::Maths, 2 }, + { QColor::fromRgb(255, 0, 144, 90), "GraphicRegion", (int)GraphicRegion::Graphic, 2 }, + { QColor::fromRgb(0, 204, 255, 90), "ChartRegion", (int)GraphicRegion::Chart, 2 } }; Xml::Xml(const QString &filename) @@ -32,18 +32,18 @@ void Xml::load(const QString &filename) QFile xmlFile(filename); xmlFile.open(QIODevice::ReadOnly); - QDomDocument xml; + xml.clear(); xml.setContent(&xmlFile); xmlFile.close(); QDomElement root = xml.documentElement(); tItem->setText(0, root.tagName()); - tItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&root)); + tItem->setData(1, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); root = root.firstChild().toElement(); QTreeWidgetItem *parentTreeItem = init(root, tItem); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&root)); + parentTreeItem->setData(1, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(0)); // Run through the xml file structure by structure. root = root.nextSibling().firstChild().toElement(); @@ -59,19 +59,19 @@ QTreeWidgetItem *Xml::init(const QDomElement& root, QTreeWidgetItem *rootTreeIte QTreeWidgetItem *parentTreeItem = new QTreeWidgetItem(rootTreeItem); parentTreeItem->setText(0, root.tagName()); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&node)); + parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(0)); QString nodeText; QTreeWidgetItem *treeItem, *childTreeItem; // Run through "METADATA" node and subnodes. - node = root.firstChild().toElement(); + node = node.firstChild().toElement(); while(!node.isNull()) { treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); treeItem->setText(0, node.tagName()); // Store the xml node in the item. - treeItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&node)); + treeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(0)); // Add widget item child with text content. nodeText = node.text(); @@ -84,6 +84,7 @@ QTreeWidgetItem *Xml::init(const QDomElement& root, QTreeWidgetItem *rootTreeIte // Add "PAGE" root node and return it. parentTreeItem = new QTreeWidgetItem(rootTreeItem, parentTreeItem); parentTreeItem->setText(0, root.nextSibling().toElement().tagName()); + parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.nextSibling().attributes()))); return parentTreeItem; } @@ -96,14 +97,14 @@ void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, // Create corresponding tree item. QTreeWidgetItem *parentTreeItem = fillWidgetItem(root.tagName(), rootTreeItem); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&node)); + parentTreeItem->parent()->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(root.attributes()))); QTreeWidgetItem *treeItem; QPolygon polygon; QString sx, sy; // Run through all points data. - node = root.firstChild().firstChild().toElement(); + node = node.firstChild().firstChild().toElement(); while(!node.isNull()) { sx = node.attribute("x", "null"); @@ -112,7 +113,7 @@ void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); treeItem->setText(0, node.tagName() + " = " + sx + ", " + sy); // Store the xml node in the item. - treeItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&node)); + treeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(node.attributes()))); polygon << QPoint(sx.toInt(), sy.toInt()); node = node.nextSibling().toElement(); @@ -122,7 +123,7 @@ void Xml::processNode(const QDomElement& root, const GraphicRegion::Data& data, PolygonItem *polygonItem = new PolygonItem(polygon, gItem); polygonItem->loadData(data); // Store tree object in the graphical object. - polygonItem->setData(1, VariantPointer<QTreeWidgetItem>::toQVariant(parentTreeItem)); + polygonItem->setData(0, VariantPointer<QTreeWidgetItem>::toQVariant(parentTreeItem)); if(data.region == GraphicRegion::Text) processLineNode(root.firstChild().nextSiblingElement("Line"), polygonItem, parentTreeItem->parent()); @@ -140,7 +141,7 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte // Create corresponding tree item. QTreeWidgetItem *parentTreeItem = fillWidgetItem(root.tagName(), rootTreeItem); - parentTreeItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&node)); + parentTreeItem->parent()->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(node.attributes()))); QTreeWidgetItem *treeItem; QPolygon polygon; @@ -151,7 +152,7 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte int xMax = INT_MIN; // Run through all points data. - node = root.firstChild().firstChild().toElement(); + node = node.firstChild().firstChild().toElement(); while(!node.isNull()) { sx = node.attribute("x", "null"); @@ -160,7 +161,7 @@ void Xml::processLineNode(const QDomElement& root, PolygonItem *parentPolygonIte treeItem = new QTreeWidgetItem(parentTreeItem, treeItem); treeItem->setText(0, node.tagName() + " = " + sx + ", " + sy); // Store xml node attributes in the item. - treeItem->setData(0, Qt::UserRole, VariantPointer<QDomElement>::toQVariant(&node)); + treeItem->setData(0, Qt::UserRole, VariantPointer<QDomNamedNodeMap>::toQVariant(new QDomNamedNodeMap(node.attributes()))); x = sx.toInt(); y = sy.toInt(); diff --git a/GScribo/xml.h b/GScribo/xml.h index d60abd6..3141eb3 100644 --- a/GScribo/xml.h +++ b/GScribo/xml.h @@ -23,6 +23,7 @@ class Xml : void load(const QString& filename); inline QTreeWidgetItem *treeItem(); inline QGraphicsItem *graphicItem(); + inline QDomDocument xmlDocument() const; private: QTreeWidgetItem *init(const QDomElement& root, QTreeWidgetItem *rootTreeItem); @@ -33,6 +34,7 @@ class Xml : QGraphicsPolygonItem *gItem; QTreeWidgetItem *tItem; + QDomDocument xml; }; inline QTreeWidgetItem *Xml::treeItem() @@ -41,6 +43,9 @@ inline QTreeWidgetItem *Xml::treeItem() inline QGraphicsItem *Xml::graphicItem() { return gItem; } +inline QDomDocument Xml::xmlDocument() const +{ return xml; } + inline QTreeWidgetItem *Xml::fillWidgetItem(const QString& tagName, QTreeWidgetItem *rootTreeItem) { QTreeWidgetItem *treeItem = new QTreeWidgetItem(rootTreeItem, QStringList(tagName)); diff --git a/GScribo/xmlwidget.cpp b/GScribo/xmlwidget.cpp index b5299c1..9c4c867 100644 --- a/GScribo/xmlwidget.cpp +++ b/GScribo/xmlwidget.cpp @@ -25,12 +25,15 @@ void XmlWidget::fillProperty(QTreeWidgetItem *treeItem) property.clear(); // Get node from the tree item. - QDomElement *node = VariantPointer<QDomElement>::fromQVariant(treeItem->data(0, Qt::UserRole)); - QStringList values; + QDomNamedNodeMap *node = VariantPointer<QDomNamedNodeMap>::fromQVariant(treeItem->data(0, Qt::UserRole)); - if(node->hasAttributes()) + if(node) { - QDomNamedNodeMap attributes = node->attributes(); + QStringList values; + + //if(node.hasAttributes()) + //{ + QDomNamedNodeMap attributes = *node;/*.attributes();*/ for(int i = 0; i < attributes.count(); i++) { @@ -38,6 +41,8 @@ void XmlWidget::fillProperty(QTreeWidgetItem *treeItem) property.addTopLevelItem(new QTreeWidgetItem(values)); values.clear(); } + //} } + property.resizeColumnToContents(0); } -- 1.7.2.5

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches February 2013