From 3df7f3562b23ce9ea28ce9fd94799f9a237c58ab Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 13 Aug 2009 10:45:41 +0000
Subject: hide cover widget if cover pixmap is not available

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1138 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/mad/coverwidget.cpp   |   1 -
 src/plugins/Input/mad/detailsdialog.cpp |   9 +-
 src/plugins/Input/mad/detailsdialog.ui  | 195 +++++++++++++++++---------------
 src/qmmp/abstractdetailsdialog.cpp      |   6 +-
 src/qmmp/coverwidget.cpp                |   1 +
 src/qmmp/forms/abstractdetailsdialog.ui | 119 ++++++++++---------
 6 files changed, 183 insertions(+), 148 deletions(-)

(limited to 'src')

diff --git a/src/plugins/Input/mad/coverwidget.cpp b/src/plugins/Input/mad/coverwidget.cpp
index 88379ad50..6ce4eebc1 100644
--- a/src/plugins/Input/mad/coverwidget.cpp
+++ b/src/plugins/Input/mad/coverwidget.cpp
@@ -27,7 +27,6 @@ CoverWidget::CoverWidget(QWidget *parent)
         : QWidget(parent)
 {}
 
-
 CoverWidget::~CoverWidget()
 {}
 
diff --git a/src/plugins/Input/mad/detailsdialog.cpp b/src/plugins/Input/mad/detailsdialog.cpp
index 3048e908b..b103b5c78 100644
--- a/src/plugins/Input/mad/detailsdialog.cpp
+++ b/src/plugins/Input/mad/detailsdialog.cpp
@@ -87,7 +87,14 @@ DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
     connect(ui.id3v1RadioButton, SIGNAL(clicked()), SLOT(loadTag()));
     connect(ui.id3v2RadioButton, SIGNAL(clicked()), SLOT(loadTag()));
     connect(ui.apeRadioButton, SIGNAL(clicked()), SLOT(loadTag()));
-    ui.coverWidget->setPixmap(Decoder::findCover(path));
+    QPixmap pix = Decoder::findCover(m_path);
+    if(pix.isNull())
+    {
+        ui.coverWidget->hide();
+        qobject_cast <QBoxLayout *> (ui.groupBox->layout ())->setDirection(QBoxLayout::LeftToRight);
+    }
+    else
+        ui.coverWidget->setPixmap(pix);
 }
 
 
diff --git a/src/plugins/Input/mad/detailsdialog.ui b/src/plugins/Input/mad/detailsdialog.ui
index 83975e1b6..720fd97d2 100644
--- a/src/plugins/Input/mad/detailsdialog.ui
+++ b/src/plugins/Input/mad/detailsdialog.ui
@@ -14,66 +14,114 @@
    <string>Details</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="7">
+   <item row="0" column="0" colspan="6">
     <widget class="QLineEdit" name="pathLineEdit">
      <property name="readOnly">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="CoverWidget" name="coverWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>110</width>
-       <height>110</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>110</width>
-       <height>110</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Tags</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <widget class="QRadioButton" name="id3v1RadioButton">
-        <property name="text">
-         <string>ID3v1</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="id3v2RadioButton">
-        <property name="text">
-         <string>ID3v2</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="apeRadioButton">
-        <property name="text">
-         <string>APE</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
+   <item row="1" column="0" rowspan="2">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMinAndMaxSize</enum>
+       </property>
+       <item>
+        <widget class="CoverWidget" name="coverWidget" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>110</width>
+           <height>110</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>110</width>
+           <height>110</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Tags</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QRadioButton" name="id3v1RadioButton">
+            <property name="text">
+             <string>ID3v1</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="id3v2RadioButton">
+            <property name="text">
+             <string>ID3v2</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="apeRadioButton">
+            <property name="text">
+             <string>APE</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="title">
+        <string>Audio Properties</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="propertiesLabel">
+          <property name="text">
+           <string>-</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="1" column="2" rowspan="2" colspan="5">
+   <item row="1" column="1" colspan="5">
     <widget class="QGroupBox" name="tagGroupBox">
      <property name="title">
       <string>ID3v1</string>
@@ -321,38 +369,7 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" rowspan="2" colspan="2">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Audio Properties</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="propertiesLabel">
-        <property name="text">
-         <string>-</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="2">
+   <item row="2" column="1">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -365,28 +382,28 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-   <item row="3" column="3">
+   <item row="2" column="2">
     <widget class="QPushButton" name="createButton">
      <property name="text">
       <string>Create</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="4">
+   <item row="2" column="3">
     <widget class="QPushButton" name="deleteButton">
      <property name="text">
       <string>Delete</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="5">
+   <item row="2" column="4">
     <widget class="QPushButton" name="saveButton">
      <property name="text">
       <string>Save</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="6">
+   <item row="2" column="5">
     <widget class="QPushButton" name="closeButton">
      <property name="text">
       <string>Close</string>
diff --git a/src/qmmp/abstractdetailsdialog.cpp b/src/qmmp/abstractdetailsdialog.cpp
index cfb952efb..39f199e9a 100644
--- a/src/qmmp/abstractdetailsdialog.cpp
+++ b/src/qmmp/abstractdetailsdialog.cpp
@@ -83,7 +83,11 @@ void AbstractDetailsDialog::setMetaData(Qmmp::MetaData key, const QString &value
     case Qmmp::URL:
         ui->pathLineEdit->setText(value);
         setWindowTitle (value.section('/',-1));
-        ui->coverWidget->setPixmap(Decoder::findCover(value));
+        QPixmap pix = Decoder::findCover(value);
+        if(pix.isNull())
+            ui->coverWidget->hide();
+        else
+            ui->coverWidget->setPixmap(pix);
     }
 }
 
diff --git a/src/qmmp/coverwidget.cpp b/src/qmmp/coverwidget.cpp
index 88379ad50..b54e544e0 100644
--- a/src/qmmp/coverwidget.cpp
+++ b/src/qmmp/coverwidget.cpp
@@ -20,6 +20,7 @@
 #include <QPixmap>
 #include <QPainter>
 #include <QPaintEvent>
+#include <QPixmap>
 
 #include "coverwidget.h"
 
diff --git a/src/qmmp/forms/abstractdetailsdialog.ui b/src/qmmp/forms/abstractdetailsdialog.ui
index 3ed1f1235..447c28a81 100644
--- a/src/qmmp/forms/abstractdetailsdialog.ui
+++ b/src/qmmp/forms/abstractdetailsdialog.ui
@@ -14,36 +14,74 @@
    <string>Details</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="4">
+   <item row="0" column="0" colspan="3">
     <widget class="QLineEdit" name="pathLineEdit">
      <property name="readOnly">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="CoverWidget" name="coverWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>110</width>
-       <height>110</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>110</width>
-       <height>110</height>
-      </size>
-     </property>
-    </widget>
+   <item row="1" column="0" rowspan="2">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <widget class="CoverWidget" name="coverWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>110</width>
+         <height>110</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>110</width>
+         <height>110</height>
+        </size>
+       </property>
+       <property name="Visible" stdset="0">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="title">
+        <string>Audio Properties</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="propertiesLabel">
+          <property name="text">
+           <string>-</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="1" column="2" rowspan="2" colspan="2">
+   <item row="1" column="1" colspan="2">
     <widget class="QGroupBox" name="tagGroupBox">
      <property name="title">
       <string>Metadata</string>
@@ -291,38 +329,7 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" rowspan="2" colspan="2">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Audio Properties</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="propertiesLabel">
-        <property name="text">
-         <string>-</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="2">
+   <item row="2" column="1">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -335,7 +342,7 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-   <item row="3" column="3">
+   <item row="2" column="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Close|QDialogButtonBox::Save</set>
-- 
cgit v1.2.3-13-gbd6f