iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cd details dialog editors

Browse Source
This commit is contained in:
craig.p.drummond
2014-01-08 20:08:07 +00:00
committed by craig.p.drummond
parent d91f8807d2
commit 0387b74b2b
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
devices/albumdetailsdialog.cpp
View File

@@ -33,8 +33,9 @@
#include "icons.h"
#include "coverdialog.h"
#include "basicitemdelegate.h"
#include "lineedit.h"
#include <QMenu>
#include <QItemDelegate>
#include <QStyledItemDelegate>
#include <QMouseEvent>
#include <QSpinBox>
@@ -44,10 +45,10 @@ enum Columns {
COL_TITLE
};
class EditorDelegate : public QItemDelegate
class EditorDelegate : public BasicItemDelegate
{
public:
EditorDelegate(QObject *parent=0) : QItemDelegate(parent) { }
EditorDelegate(QObject *parent=0) : BasicItemDelegate(parent) { }
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const {
Q_UNUSED(option);
@@ -57,26 +58,27 @@ public:
editor->setMaximum(500);
return editor;
} else {
return new QLineEdit(parent);
parent->setProperty("cantata-delegate", true);
return new LineEdit(parent);
}
}
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const {
return QItemDelegate::sizeHint(option, index)+QSize(0, 4);
return QStyledItemDelegate::sizeHint(option, index)+QSize(0, 4);
}
void setEditorData(QWidget *editor, const QModelIndex &index) const {
if (COL_TRACK==index.column()) {
static_cast<QSpinBox*>(editor)->setValue(index.model()->data(index, Qt::EditRole).toInt());
} else {
static_cast<QLineEdit*>(editor)->setText(index.model()->data(index, Qt::EditRole).toString());
static_cast<LineEdit*>(editor)->setText(index.model()->data(index, Qt::EditRole).toString());
}
}
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const {
if (COL_TRACK==index.column()) {
model->setData(index, static_cast<QSpinBox*>(editor)->value(), Qt::EditRole);
} else {
model->setData(index, static_cast<QLineEdit*>(editor)->text().trimmed(), Qt::EditRole);
model->setData(index, static_cast<LineEdit*>(editor)->text().trimmed(), Qt::EditRole);
}
}
@@ -141,7 +143,6 @@ AlbumDetailsDialog::AlbumDetailsDialog(QWidget *parent)
setButtonMenu(User1, toolsMenu, InstantPopup);
setButtonGuiItem(User1, GuiItem(i18n("Tools"), "tools-wizard"));
connect(singleArtist, SIGNAL(toggled(bool)), SLOT(hideArtistColumn(bool)));
tracks->setItemDelegate(new EditorDelegate);
resize(600, 600);
int size=fontMetrics().height()*5;
@@ -149,7 +150,7 @@ AlbumDetailsDialog::AlbumDetailsDialog(QWidget *parent)
cover->setMaximumSize(size, size);
setCover();
cover->installEventFilter(this);
tracks->setItemDelegate(new BasicItemDelegate(tracks));
tracks->setItemDelegate(new EditorDelegate(tracks));
}
AlbumDetailsDialog::~AlbumDetailsDialog()

2
support/lineedit.cpp
View File

@@ -81,7 +81,7 @@ LineEdit::LineEdit(QWidget *parent)
QLatin1String(": %1px; ")+QLatin1String(onCombo ? "background: transparent " : "")+QChar('}');
setStyleSheet(styleSheet.arg(clearButton->sizeHint().width() + frameWidth + 1));
if (!onCombo) {
if (!onCombo && (!parent || !parent->property("cantata-delegate").isValid())) {
QSize msz = minimumSizeHint();
setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2 + 2),
qMax(msz.height(), clearButton->sizeHint().height() + frameWidth * 2 + 2));