summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2013-02-07 14:46:43 +0100
committerArno <am@disconnect.de>2013-02-07 14:46:43 +0100
commit91750c1a4247ab436ffff5a518efd7004c01b98d (patch)
tree2fb12dc9d72345e84d67003cef0f0af8f0ee5180
parent9fbf13241d8a2aa0698f23c8e8f0626f3f237fb3 (diff)
downloadSheMov-91750c1a4247ab436ffff5a518efd7004c01b98d.tar.gz
SheMov-91750c1a4247ab436ffff5a518efd7004c01b98d.tar.bz2
SheMov-91750c1a4247ab436ffff5a518efd7004c01b98d.zip
Change sort order
Change sort order when selecting files for burning... Alphabetically is not very useful here...
-rw-r--r--filestreemodel.cpp2
-rw-r--r--filestreewidget.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/filestreemodel.cpp b/filestreemodel.cpp
index 96f1ba4..729a4fc 100644
--- a/filestreemodel.cpp
+++ b/filestreemodel.cpp
@@ -95,7 +95,7 @@ void FilesTreeModel::setIds(const QList<int> &seriesPartIds){
void FilesTreeModel::setForBurn(){
mDisplayMode = Burn;
- QString query = QString("SELECT iseriespart_id, tfilename, cmd5sum, bisize, idvd, sifiletype, sifileno, siquality, ifiles_id, series.tseries_name, seriesparts.iseriespart, seriesparts.bfavorite FROM files, seriesparts, series WHERE iseriespart_id IN (SELECT iseriesparts_id from seriesparts where bfavorite = false) AND files.iseriespart_id = seriesparts.iseriesparts_id AND seriesparts.iseries_id = series.iseries_id AND sifiletype = 1 AND idvd < 0 ORDER BY tfilename, sifileno ASC");
+ QString query = QString("SELECT iseriespart_id, tfilename, cmd5sum, bisize, idvd, sifiletype, sifileno, siquality, ifiles_id, series.tseries_name, seriesparts.iseriespart, seriesparts.bfavorite FROM files, seriesparts, series WHERE iseriespart_id IN (SELECT iseriesparts_id from seriesparts where bfavorite = false) AND files.iseriespart_id = seriesparts.iseriesparts_id AND seriesparts.iseries_id = series.iseries_id AND sifiletype = 1 AND idvd < 0 ORDER BY iseriespart_id");
QSqlQuery filesQuery(mDb);
filesQuery.prepare(query);
populate(filesQuery);
diff --git a/filestreewidget.cpp b/filestreewidget.cpp
index c2a5d5f..cb253b3 100644
--- a/filestreewidget.cpp
+++ b/filestreewidget.cpp
@@ -523,8 +523,8 @@ const QString FilesTreeView::fileNameText(const QModelIndex &idx) const{
return QString();
}
FilesTreeModel *filesModel = qobject_cast<FilesTreeModel*>(SmGlobals::instance()->model("FilesModel"));
- QHash<QString, QString> files = filesModel->filesBySeriesPartId(idx.data(FilesTreeModel::SeriesPartIdRole).toInt());
- QModelIndex seriesPartIdx = seriesModel->findValue(idx.data(FilesTreeModel::SeriesPartIdRole), seriesIdx, SeriesTreeModel::SeriesPartId);
+ QHash<QString, QString> files = filesModel->filesBySeriesPartId(idx.data(FilesTreeModel::SeriesPartIdRole).toInt());
+ QModelIndex seriesPartIdx = seriesModel->findValue(idx.data(FilesTreeModel::SeriesPartIdRole), seriesIdx, SeriesTreeModel::SeriesPartId);
QString retval = QString(tr("<p style=\"text-decoration: underline; font-weight: bold\">%1 %2</p>")).arg(seriesPartIdx.data(SeriesTreeModel::NameRole).toString()).arg(QString::number(seriesPartIdx.data(SeriesTreeModel::SeriesPartRole).toInt()));
retval.append(QString(tr("<p style=\"margin-bottom: 0px; padding-bottom: 0px\">Files:</p>")));
retval.append(tr("<ul style=\"margin-top: 0px\">"));