diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp index 79f035e23c63886d5073ece982e6ac97d7c17f0c..9b9d5df6b7222ef3e3d8697ecf5493670cc61fc4 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp @@ -70,5 +70,13 @@ QVariant MaemoPackageContents::data(const QModelIndex &index, int role) const return index.column() == 0 ? d.localFilePath : d.remoteFilePath; } +QVariant MaemoPackageContents::headerData(int section, + Qt::Orientation orientation, int role) const +{ + if (orientation == Qt::Vertical || role != Qt::DisplayRole) + return QVariant(); + return section == 0 ? tr("Local File Path") : tr("Remote File Path"); +} + } // namespace Qt4ProjectManager } // namespace Internal diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h index 0901129f53b0991146d8f8654b78fc28c5175405..0551aa6f06aa694e342bb1e2c127b95144fed78b 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h @@ -64,6 +64,8 @@ private: virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + virtual QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const; // TODO: setData diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h index a38a5025c4c8fecac90b7a8babe6d75e0625fa9a..18b1cca983e3926f05e931310c122bd7bd868024 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h @@ -66,6 +66,7 @@ public: QString packageFilePath() const; QString remoteExecutableFilePath() const; QString localExecutableFilePath() const; + MaemoPackageContents *packageContents() const { return m_packageContents; } private: MaemoPackageCreationStep(ProjectExplorer::BuildConfiguration *buildConfig, diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp index aabcf8d302ee5c3b957ae859df98147de38811e2..97cc1057cc6fbbcef5df9db8351a0b721009bbc9 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp @@ -40,15 +40,28 @@ ****************************************************************************/ #include "maemopackagecreationwidget.h" +#include "ui_maemopackagecreationwidget.h" +#include "maemopackagecontents.h" #include "maemopackagecreationstep.h" namespace Qt4ProjectManager { namespace Internal { MaemoPackageCreationWidget::MaemoPackageCreationWidget(MaemoPackageCreationStep *step) - : ProjectExplorer::BuildStepConfigWidget(), m_step(step) + : ProjectExplorer::BuildStepConfigWidget(), + m_step(step), + m_ui(new Ui::MaemoPackageCreationWidget) { + m_ui->setupUi(this); + m_ui->packageContentsView->setModel(step->packageContents()); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + connect(step->packageContents(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), + m_ui->packageContentsView, SLOT(resizeColumnsToContents())); + connect(step->packageContents(), SIGNAL(rowsInserted(QModelIndex, int, int)), + m_ui->packageContentsView, SLOT(resizeColumnsToContents())); + m_ui->packageContentsView->resizeColumnsToContents(); + m_ui->packageContentsView->horizontalHeader()->setStretchLastSection(true); } void MaemoPackageCreationWidget::init() @@ -57,7 +70,7 @@ void MaemoPackageCreationWidget::init() QString MaemoPackageCreationWidget::summaryText() const { - return tr("Package Creation"); + return tr("<b>Create Package:</b> ") + m_step->packageFilePath(); } QString MaemoPackageCreationWidget::displayName() const diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h index b03331ff79585e6bfd41b95fb758cc747ef61e65..9b01b1fa298338c8d0e8fcc715d820963b7c151f 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h @@ -44,6 +44,10 @@ #include <projectexplorer/buildstep.h> +QT_BEGIN_NAMESPACE +namespace Ui { class MaemoPackageCreationWidget; } +QT_END_NAMESPACE + namespace Qt4ProjectManager { namespace Internal { @@ -60,6 +64,7 @@ public: virtual QString displayName() const; private: MaemoPackageCreationStep * const m_step; + Ui::MaemoPackageCreationWidget * const m_ui; }; } // namespace Internal diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui new file mode 100644 index 0000000000000000000000000000000000000000..eb54cde71e8c747b75de86bd011fd2dae1e29be4 --- /dev/null +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MaemoPackageCreationWidget</class> + <widget class="QWidget" name="MaemoPackageCreationWidget"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>741</width> + <height>574</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="contentsLabel"> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Package contents:</span></p></body></html></string> + </property> + </widget> + </item> + <item> + <widget class="QTableView" name="packageContentsView"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="selectionBehavior"> + <enum>QAbstractItemView::SelectRows</enum> + </property> + <property name="showGrid"> + <bool>false</bool> + </property> + <attribute name="horizontalHeaderVisible"> + <bool>true</bool> + </attribute> + <attribute name="horizontalHeaderCascadingSectionResizes"> + <bool>false</bool> + </attribute> + <attribute name="verticalHeaderVisible"> + <bool>false</bool> + </attribute> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri index 95501f184d0535292bb1d0a8a255c82595a2ad21..15b9e6cb154024005718ed69f211a525f9289e9a 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri +++ b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri @@ -38,6 +38,7 @@ SOURCES += \ FORMS += \ $$PWD/maemoconfigtestdialog.ui \ $$PWD/maemosettingswidget.ui \ - $$PWD/maemosshconfigdialog.ui + $$PWD/maemosshconfigdialog.ui \ + $$PWD/maemopackagecreationwidget.ui RESOURCES += $$PWD/qt-maemo.qrc