diff --git a/classes/data/alignmodproxy.cpp b/classes/data/alignmodproxy.cpp index 7f9fb0f..3ed1097 100644 --- a/classes/data/alignmodproxy.cpp +++ b/classes/data/alignmodproxy.cpp @@ -43,9 +43,7 @@ QVariant AlignModProxy::headerData(int section, Qt::Orientation orientation, int if (orientation == Qt::Horizontal) { if (section == sourceColumns + 0) { - result = tr("Original size"); - } else if (section == sourceColumns + 1) { - result = tr("New size"); + result = tr("Size"); } } } @@ -60,7 +58,7 @@ int AlignModProxy::columnCount(const QModelIndex &parent) const } int sourceColumns = this->sourceModel()->columnCount(parent); - return sourceColumns + 2; + return sourceColumns + 1; } QVariant AlignModProxy::data(const QModelIndex &index, int role) const @@ -106,14 +104,6 @@ QVariant AlignModProxy::data(const QModelIndex &index, int role) const if (columnIndex == sourceColumns + 0) { QVariant varSize = this->sourceModel()->data(index, Data::Models::ImagesModel::ImageSizeRole); QSize size = varSize.toSize(); - result = QString("%1x%2").arg(size.width()).arg(size.height()); - } else if (columnIndex == sourceColumns + 1) { - QVariant varKey = this->sourceModel()->data(index, Data::Models::ImagesModel::KeyRole); - QString key = varKey.toString(); - - QVariant varSize = this->sourceModel()->data(index, Data::Models::ImagesModel::ImageSizeRole); - QSize size = varSize.toSize(); - result = QString("%1x%2").arg(size.width()).arg(size.height()); } diff --git a/controls/align/dialogalign.cpp b/controls/align/dialogalign.cpp index eac6ec0..89f5408 100644 --- a/controls/align/dialogalign.cpp +++ b/controls/align/dialogalign.cpp @@ -68,7 +68,7 @@ DialogAlign::DialogAlign(Data::Containers::DataContainer *container, this->mReorderProxy = new Data::Models::ColumnsReorderProxy(); this->mReorderProxy->setSourceModel(this->mFilter); - this->mReorderProxy->setReorder(1, 3); + this->mReorderProxy->setReorder(1, 2); this->mTranspose = new Data::Models::TransposeProxy(this); this->mTranspose->setSourceModel(this->mReorderProxy);