[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/juk
From: Michael Pyne <michael.pyne () kdemail ! net>
Date: 2007-12-28 3:21:58
Message-ID: 1198812118.498677.10281.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 753657 by mpyne:
Fix crash in the search playlist dialog.
M +13 -15 advancedsearchdialog.cpp
M +2 -1 advancedsearchdialog.h
--- trunk/KDE/kdemultimedia/juk/advancedsearchdialog.cpp #753656:753657
@@ -58,11 +58,10 @@
QGroupBox *criteriaGroupBox = new QGroupBox(i18n("Search Criteria"), mw);
mw->setStretchFactor(criteriaGroupBox, 1);
- QVBoxLayout *criteriaLayout = new QVBoxLayout;
+ m_criteriaLayout = new QVBoxLayout;
QGroupBox *group = new QGroupBox();
-
m_matchAnyButton = new QRadioButton(i18n("Match any of the following"));
m_matchAllButton = new QRadioButton(i18n("Match all of the following"));
@@ -72,15 +71,15 @@
group->setLayout(hgroupbox);
- criteriaLayout->addWidget(group);
+ m_criteriaLayout->addWidget(group);
if(defaultSearch.isNull()) {
- SearchLine *newSearchLine = new SearchLine(0);
+ SearchLine *newSearchLine = new SearchLine(this);
m_searchLines.append(newSearchLine);
- criteriaLayout->addWidget(newSearchLine);
- newSearchLine = new SearchLine(0);
+ m_criteriaLayout->addWidget(newSearchLine);
+ newSearchLine = new SearchLine(this);
m_searchLines.append(newSearchLine);
- criteriaLayout->addWidget(newSearchLine);
+ m_criteriaLayout->addWidget(newSearchLine);
m_matchAnyButton->setChecked(true);
}
else {
@@ -89,10 +88,10 @@
it != components.end();
++it)
{
- SearchLine *s = new SearchLine(0);
+ SearchLine *s = new SearchLine(this);
s->setSearchComponent(*it);
m_searchLines.append(s);
- criteriaLayout->addWidget(s);
+ m_criteriaLayout->addWidget(s);
}
if(defaultSearch.searchMode() == PlaylistSearch::MatchAny)
m_matchAnyButton->setChecked(true);
@@ -100,7 +99,7 @@
m_matchAllButton->setChecked(true);
}
- QWidget *buttons = new QWidget();
+ QWidget *buttons = new QWidget(mw);
QHBoxLayout *l = new QHBoxLayout(buttons);
l->setSpacing(5);
l->setMargin(0);
@@ -119,12 +118,10 @@
connect(m_fewerButton, SIGNAL(clicked()), SLOT(fewer()));
l->addWidget(m_fewerButton);
- criteriaLayout->addWidget(buttons);
+ m_criteriaLayout->addStretch(1);
- criteriaLayout->addStretch(1);
+ criteriaGroupBox->setLayout(m_criteriaLayout);
- criteriaGroupBox->setLayout(criteriaLayout);
-
m_playlistNameLineEdit->setFocus();
}
@@ -178,7 +175,8 @@
void AdvancedSearchDialog::more()
{
- SearchLine *searchLine = new SearchLine(m_criteria);
+ SearchLine *searchLine = new SearchLine(this);
+ m_criteriaLayout->addWidget(searchLine);
m_searchLines.append(searchLine);
searchLine->show();
updateButtons();
--- trunk/KDE/kdemultimedia/juk/advancedsearchdialog.h #753656:753657
@@ -25,6 +25,7 @@
class KPushButton;
class QRadioButton;
class SearchLine;
+class QBoxLayout;
class AdvancedSearchDialog : public KDialog
{
@@ -57,7 +58,7 @@
private:
void updateButtons();
- QWidget *m_criteria;
+ QBoxLayout *m_criteriaLayout;
PlaylistSearch m_search;
QString m_playlistName;
QList<SearchLine *> m_searchLines;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic