store the search-query in the places model

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

diff --git a/src/search/dolphinsearchoptionsconfigurator.cpp b/src/search/dolphinsearchoptionsconfigurator.cpp
index e7f5e8656783f3d2cc88f83cdb68dba1d674195e..ec1c30a82aa9b230fa1b3d5b6281d14f4c001df1 100644 (file)
--- a/src/search/dolphinsearchoptionsconfigurator.cpp
+++ b/src/search/dolphinsearchoptionsconfigurator.cpp
@@ -20,19 +20,23 @@
 #include "dolphinsearchoptionsconfigurator.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinsearchoptionsconfigurator.h"
 
 #include "dolphin_searchsettings.h"

-#include "searchcriterionselector.h"
+#include <settings/dolphinsettings.h>

 
 

+#define DISABLE_NEPOMUK_LEGACY

 #include <nepomuk/andterm.h>
 #include <nepomuk/query.h>
 #include <nepomuk/term.h>
 
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <nepomuk/andterm.h>
 #include <nepomuk/query.h>
 #include <nepomuk/term.h>
 
 #include <kcombobox.h>
 #include <kdialog.h>

+#include <kfileplacesmodel.h>

 #include <kicon.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kseparator.h>
 
 #include <kicon.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kseparator.h>
 

+#include "searchcriterionselector.h"
+

 #include <QButtonGroup>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QButtonGroup>
 #include <QHBoxLayout>
 #include <QLabel>


@@ -275,9 +279,12 @@ void DolphinSearchOptionsConfigurator::updateSelectorButton()
 
 void DolphinSearchOptionsConfigurator::saveQuery()
 {
 
 void DolphinSearchOptionsConfigurator::saveQuery()
 {

-    KDialog dialog(0, Qt::Dialog);
+    // TODO: provide a custom dialog class for KDE 4.5, which
+    // enables/disables the OK button depend on whether a text
+    // has been entered.
+    QPointer<KDialog> dialog = new KDialog(0, Qt::Dialog);

 
 

-    QWidget* container = new QWidget(&dialog);
+    QWidget* container = new QWidget(dialog);

 
     QLabel* label = new QLabel(i18nc("@label", "Name:"), container);
     KLineEdit* lineEdit = new KLineEdit(container);
 
     QLabel* label = new QLabel(i18nc("@label", "Name:"), container);
     KLineEdit* lineEdit = new KLineEdit(container);


@@ -287,16 +294,20 @@ void DolphinSearchOptionsConfigurator::saveQuery()
     layout->addWidget(label, Qt::AlignRight);
     layout->addWidget(lineEdit);
 
     layout->addWidget(label, Qt::AlignRight);
     layout->addWidget(lineEdit);
 

-    dialog.setMainWidget(container);
-    dialog.setCaption(i18nc("@title:window", "Save Search Options"));
-    dialog.setButtons(KDialog::Ok | KDialog::Cancel);
-    dialog.setDefaultButton(KDialog::Ok);
-    dialog.setButtonText(KDialog::Ok, i18nc("@action:button", "Save"));
+    dialog->setMainWidget(container);
+    dialog->setCaption(i18nc("@title:window", "Save Search Options"));
+    dialog->setButtons(KDialog::Ok | KDialog::Cancel);
+    dialog->setDefaultButton(KDialog::Ok);
+    dialog->setButtonText(KDialog::Ok, i18nc("@action:button", "Save"));

 
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                               "SaveSearchOptionsDialog");
 
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                               "SaveSearchOptionsDialog");

-    dialog.restoreDialogSize(dialogConfig);
-    dialog.exec(); // TODO...
+    dialog->restoreDialogSize(dialogConfig);
+    if ((dialog->exec() == QDialog::Accepted) && !lineEdit->text().isEmpty()) {
+        KFilePlacesModel* model = DolphinSettings::instance().placesModel();
+        model->addPlace(lineEdit->text(), nepomukUrl());
+    }
+    delete dialog;

 }
 
 void DolphinSearchOptionsConfigurator::addCriterion(SearchCriterionSelector* criterion)
 }
 
 void DolphinSearchOptionsConfigurator::addCriterion(SearchCriterionSelector* criterion)