fixed cover editor issues

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8355 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 15 insertions, 17 deletions

diff --git a/src/qmmp/metadatamodel.cpp b/src/qmmp/metadatamodel.cpp
index 440524c54..0d75b9049 100644
--- a/src/qmmp/metadatamodel.cpp
+++ b/src/qmmp/metadatamodel.cpp
@@ -54,10 +54,10 @@ void MetaDataItem::setSuffix(const QString &suffix)
     m_suffix = suffix;
 }
 
-MetaDataModel::MetaDataModel(bool readOnly) : m_readOnly(readOnly)
-{
-    m_dialogHints = NO_HINTS;
-}
+MetaDataModel::MetaDataModel(bool readOnly, DialogHints hints) :
+    m_readOnly(readOnly),
+    m_dialogHints(hints)
+{}
 
 MetaDataModel::~MetaDataModel()
 {}
@@ -82,12 +82,12 @@ QPixmap MetaDataModel::cover() const
     return QPixmap();
 }
 
-void MetaDataModel::setCover(const QPixmap &pix) const
+void MetaDataModel::setCover(const QPixmap &pix)
 {
     Q_UNUSED(pix);
 }
 
-void MetaDataModel::removeCover() const
+void MetaDataModel::removeCover()
 {}
 
 QString MetaDataModel::coverPath() const
@@ -95,11 +95,6 @@ QString MetaDataModel::coverPath() const
     return QString();
 }
 
-void MetaDataModel::setCover(const QPixmap &cover)
-{
-    Q_UNUSED(cover);
-}
-
 bool MetaDataModel::isReadOnly() const
 {
     return m_readOnly;
diff --git a/src/qmmp/metadatamodel.h b/src/qmmp/metadatamodel.h
index 40e48b421..e9d409c30 100644
--- a/src/qmmp/metadatamodel.h
+++ b/src/qmmp/metadatamodel.h
@@ -64,7 +64,7 @@ public:
     /*!
      * Constructor.
      */
-    MetaDataModel(bool readOnly);
+    MetaDataModel(bool readOnly, DialogHints hints = NO_HINTS);
     /*!
      * Destructor.
      */
@@ -82,13 +82,12 @@ public:
      * Subclass should reimplement this function. Default implementation returns empty pixmap.
      */
     virtual QPixmap cover() const;
-    virtual void setCover(const QPixmap &pix) const;
-    virtual void removeCover() const;
+    virtual void setCover(const QPixmap &pix);
+    virtual void removeCover();
     /*!
      * Returns path to cover pixmap.
      */
     virtual QString coverPath() const;
-    void setCover(const QPixmap &cover);
     bool isReadOnly() const;
     const DialogHints &dialogHints() const;
 
diff --git a/src/qmmpui/covereditor.cpp b/src/qmmpui/covereditor.cpp
index 12d538dda..3d23fce54 100644
--- a/src/qmmpui/covereditor.cpp
+++ b/src/qmmpui/covereditor.cpp
@@ -38,7 +38,7 @@ CoverEditor::CoverEditor(MetaDataModel *model, const QString &coverPath, QWidget
     layout->addWidget(m_viewer);
     m_ui.frame->setLayout(layout);
 
-    if(m_model && !m_model->cover().isNull())
+    if(m_model && (!m_model->cover().isNull() || m_editable))
         m_ui.sourceComboBox->setCurrentIndex(1);
     else
         m_ui.sourceComboBox->setCurrentIndex(0);
@@ -80,11 +80,15 @@ void CoverEditor::on_sourceComboBox_activated(int index)
 void CoverEditor::on_loadButton_clicked()
 {
     m_viewer->load();
+    m_ui.deleteButton->setEnabled(m_viewer->hasPixmap());
+    m_ui.saveAsButton->setEnabled(m_viewer->hasPixmap());
 }
 
 void CoverEditor::on_deleteButton_clicked()
 {
     m_viewer->clear();
+    m_ui.deleteButton->setEnabled(m_viewer->hasPixmap());
+    m_ui.saveAsButton->setEnabled(m_viewer->hasPixmap());
 }
 
 void CoverEditor::on_saveAsButton_clicked()
diff --git a/src/qmmpui/coverviewer.cpp b/src/qmmpui/coverviewer.cpp
index bec263bf0..1b8306f8c 100644
--- a/src/qmmpui/coverviewer.cpp
+++ b/src/qmmpui/coverviewer.cpp
@@ -86,7 +86,7 @@ void CoverViewer::load()
         m_lastDir = QFileInfo(path).absoluteDir().path();
         m_pixmap.load(path);
         if(m_pixmap.width() > 512)
-            m_pixmap = m_pixmap.scaled(512, 512, Qt::KeepAspectRatio);
+            m_pixmap = m_pixmap.scaled(512, 512, Qt::KeepAspectRatio, Qt::SmoothTransformation);
     }
     update();
 }