layout improvements

svn path=/trunk/KDE/kdebase/apps/; revision=1048820

diff --git a/src/search/dolphinsearchoptionsconfigurator.cpp b/src/search/dolphinsearchoptionsconfigurator.cpp
index db51f2c4276a9005fc8c73812e28193f243cb043..073aa1b4961f6285071ca675096bd90ed5fc2eda 100644 (file)
--- a/src/search/dolphinsearchoptionsconfigurator.cpp
+++ b/src/search/dolphinsearchoptionsconfigurator.cpp
@@ -62,6 +62,13 @@ DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* pare
     m_searchWhatBox->addItem(i18nc("@label", "Text"));
     m_searchWhatBox->addItem(i18nc("@label", "Filenames"));
 
+    // add "Add selector" button
+    m_addSelectorButton = new QPushButton(this);
+    m_addSelectorButton->setIcon(KIcon("list-add"));
+    m_addSelectorButton->setToolTip(i18nc("@info", "Add search option"));
+    m_addSelectorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    connect(m_addSelectorButton, SIGNAL(clicked()), this, SLOT(slotAddSelectorButtonClicked()));
+
     // add button "Search"
     QPushButton* searchButton = new QPushButton(this);
     searchButton->setIcon(KIcon("edit-find"));
@@ -83,22 +90,15 @@ DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* pare
     closeButton->setToolTip(i18nc("@info", "Close search options"));
     connect(closeButton, SIGNAL(clicked()), this, SLOT(hide()));
 
-    // add "Add selector" button
-    m_addSelectorButton = new QPushButton(this);
-    m_addSelectorButton->setIcon(KIcon("list-add"));
-    m_addSelectorButton->setToolTip(i18nc("@info", "Add search option"));
-    m_addSelectorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    connect(m_addSelectorButton, SIGNAL(clicked()), this, SLOT(slotAddSelectorButtonClicked()));
-
     QHBoxLayout* firstLineLayout = new QHBoxLayout();
     firstLineLayout->addWidget(searchLabel);
     firstLineLayout->addWidget(m_searchFromBox);
     firstLineLayout->addWidget(whatLabel);
     firstLineLayout->addWidget(m_searchWhatBox);
     firstLineLayout->addWidget(new QWidget(this), 1); // filler
-    firstLineLayout->addWidget(m_addSelectorButton);
 
     QHBoxLayout* lastLineLayout = new QHBoxLayout();
+    lastLineLayout->addWidget(m_addSelectorButton);
     lastLineLayout->addWidget(new QWidget(this), 1); // filler
     lastLineLayout->addWidget(searchButton);
     lastLineLayout->addWidget(saveButton);

diff --git a/src/search/searchcriterionselector.cpp b/src/search/searchcriterionselector.cpp
index a0d7b73e736175ddebbe656a1b9e3f0d8fdd4655..8b08d545ebe3c0689e2b571a8e3817caaa0887c4 100644 (file)
--- a/src/search/searchcriterionselector.cpp
+++ b/src/search/searchcriterionselector.cpp
@@ -59,10 +59,10 @@ SearchCriterionSelector::SearchCriterionSelector(Type type, QWidget* parent) :
 
     m_layout = new QHBoxLayout(this);
     m_layout->setMargin(0);
+    m_layout->addWidget(m_removeButton);
     m_layout->addWidget(m_descriptionsBox);
     m_layout->addWidget(m_comparatorBox);
     m_layout->addWidget(filler);
-    m_layout->addWidget(m_removeButton);
 
     setLayout(m_layout);
 
@@ -124,7 +124,7 @@ void SearchCriterionSelector::slotDescriptionChanged(int index)
 
     // add value widget
     m_valueWidget = description.valueWidget();
-    m_layout->insertWidget(2, m_valueWidget);
+    m_layout->insertWidget(3, m_valueWidget);
 
     m_comparatorBox->setCurrentIndex(0);
     slotComparatorChanged(0);