diff --git a/Medialib.cpp b/Medialib.cpp index 9c267c5..6263759 100644 --- a/Medialib.cpp +++ b/Medialib.cpp @@ -24,7 +24,7 @@ MedialibWindow::MedialibWindow (QWidget *parent) : QMainWindow (parent) resize (500, 550); - m_dummy = new QWidget (parent); + m_dummy = new QWidget (this); setCentralWidget (m_dummy); m_vbox = new QVBoxLayout (m_dummy); @@ -35,7 +35,7 @@ MedialibWindow::MedialibWindow (QWidget *parent) : QMainWindow (parent) m_tab = new QTabWidget (m_dummy); m_vbox->addWidget (m_tab); - m_progress = new QProgressBar (m_dummy); + m_progress = new QProgressBar (statusBar ()); statusBar ()->addPermanentWidget (m_progress, 1); m_progress->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); @@ -43,10 +43,10 @@ MedialibWindow::MedialibWindow (QWidget *parent) : QMainWindow (parent) m_status->setFrameStyle (QFrame::NoFrame); statusBar ()->addPermanentWidget (m_status, 2); - m_list = new MedialibList (m_tab); - m_tab->addTab (new QWidget (m_tab), tr ("Artists")); + m_list = new MedialibList (this); + m_tab->addTab (new QWidget (), tr ("Artists")); m_tab->addTab (m_list, tr ("Albums")); - m_tab->addTab (new QWidget (m_tab), tr ("Songs")); + m_tab->addTab (new QWidget (), tr ("Songs")); for (int i = 0; i < m_tab->count() ; i++) { if (s.value("selected").toString () == m_tab->tabText (i)) { @@ -60,12 +60,12 @@ MedialibWindow::MedialibWindow (QWidget *parent) : QMainWindow (parent) connect (m_search, SIGNAL (textEdited (QString)), m_list, SLOT (search (QString))); } -MedialibList::MedialibList (QWidget *parent) : QListWidget (parent) +MedialibList::MedialibList (QWidget *parent) : QListWidget () { XMMSHandler *xmmsh = XMMSHandler::getInstance (); m_http = new QHttp (this); m_httpmap = new QHash; - m_win = dynamic_cast(window ()); + m_win = dynamic_cast (parent); setIconSize (QSize (85, 85)); setDragEnabled (true); @@ -189,7 +189,7 @@ MedialibList::queryCallback (QList >l) MedialibListItem *item = new MedialibListItem (h.value("artist"), h.value("album"), this); item->setSizeHint (QSize (90, 90)); - item->setIcon (QIcon (":nocover.jpg")); + item->setIcon (QIcon (":nocover.png")); item->setFont (font); item->setTextAlignment (Qt::AlignVCenter); diff --git a/SettingsWindow.cpp b/SettingsWindow.cpp index 153303a..993ff23 100644 --- a/SettingsWindow.cpp +++ b/SettingsWindow.cpp @@ -36,9 +36,9 @@ SettingsWindow::SettingsWindow (QWidget *parent) : QMainWindow (parent) hbox->addWidget (cancel); hbox->addWidget (ok); - m_mainwindow = new SettingsTabMain (tab); - m_playlistwin = new SettingsTabPlaylist (tab); - m_medialib = new SettingsTabMedialib (tab); + m_mainwindow = new SettingsTabMain (NULL); + m_playlistwin = new SettingsTabPlaylist (NULL); + m_medialib = new SettingsTabMedialib (NULL); tab->addTab (m_mainwindow, tr ("Main Window")); tab->addTab (m_playlistwin, tr ("Playlist Window")); @@ -211,7 +211,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) vbox->addWidget (c, 1); - m_mainttf = new QCheckBox (tr ("Draw text with TrueType fonts"), dummy); + m_mainttf = new QCheckBox (tr ("Draw text with TrueType fonts"), c); m_mainttf->setCheckState (s.value ("ttf").toBool () ? Qt::Checked : Qt::Unchecked); h->addWidget (m_mainttf); @@ -262,7 +262,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) vbox->addWidget (c, 1); - m_shadettf = new QCheckBox (tr ("Draw text with TrueType fonts"), dummy); + m_shadettf = new QCheckBox (tr ("Draw text with TrueType fonts"), c); m_shadettf->setCheckState (s.value ("ttf").toBool () ? Qt::Checked : Qt::Unchecked); h->addWidget (m_shadettf); diff --git a/nocover.jpg b/nocover.jpg deleted file mode 100644 index f022c94..0000000 Binary files a/nocover.jpg and /dev/null differ diff --git a/nocover.png b/nocover.png new file mode 100644 index 0000000..37c5098 Binary files /dev/null and b/nocover.png differ diff --git a/promoe.qrc b/promoe.qrc index 1c652ad..f6d2d02 100644 --- a/promoe.qrc +++ b/promoe.qrc @@ -1,7 +1,7 @@ icon.png - nocover.jpg + nocover.png CleanAMP/Eq_ex.png CleanAMP/GENEX.png CleanAMP/Gen.png