summaryrefslogtreecommitdiffstats
path: root/pictureswidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pictureswidget.cpp')
-rw-r--r--pictureswidget.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/pictureswidget.cpp b/pictureswidget.cpp
index 287c493..9c9d393 100644
--- a/pictureswidget.cpp
+++ b/pictureswidget.cpp
@@ -5,21 +5,21 @@
2 of the License, or (at your option) any later version.
*/
-#include <QtWidgets/QSplitter>
-#include <QtWidgets/QHBoxLayout>
+#include <QSplitter>
+#include <QHBoxLayout>
#include <QSqlQuery>
#include <QSortFilterProxyModel>
#include <QLocale>
#include <QHideEvent>
#include <QHoverEvent>
#include <QEvent>
-#include <QtWidgets/QHeaderView>
+#include <QHeaderView>
#include <QSettings>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QMenu>
+#include <QMessageBox>
+#include <QMenu>
#include <QFile>
#include <QSettings>
-#include <QtWidgets/QActionGroup>
+#include <QActionGroup>
#include <QHash>
#include "pictureswidget.h"
@@ -29,6 +29,7 @@
#include "helper.h"
#include "hoverwindow.h"
#include "mappingtreemodel.h"
+#include "delegates.h"
#include "smglobals.h"
PicturesWidget::PicturesWidget(QWidget *parent) : QWidget(parent), mWindowTitleBase(tr("Picture archive")), mPicViewerA(0) {
@@ -36,6 +37,7 @@ PicturesWidget::PicturesWidget(QWidget *parent) : QWidget(parent), mWindowTitleB
QSplitter *splitter = new QSplitter;
mMappingTree = new MappingTreeWidget;
mPictureView = new PictureView;
+ mPictureView->setItemDelegateForColumn(PicFilesModel::Size, new SizeDelegate(this));
connect(mMappingTree, SIGNAL(mappingChanged(int)), mPictureView, SLOT(mappingChanged(int)));
//change window title when mapping selection changes
connect(mMappingTree, SIGNAL(mappingChanged(int)), this, SLOT(constructWindowTitle()));
@@ -174,11 +176,11 @@ void PictureView::deletePics(){
if(retval == QMessageBox::No){
return;
}
- QList<QPersistentModelIndex> real;
+ QList<QPair<int, QString> > files;
foreach(QModelIndex i, sel){
- real << QPersistentModelIndex(mProxy->mapToSource(i));
+ files << qMakePair(i.data(PicFilesModel::IdRole).toInt(), i.data(PicFilesModel::FullPathRole).toString());
}
- mModel->removeFiles(real);
+ mModel->removeFiles(files);
}
void PictureView::refresh(){