[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/nepomuk-kde/nepomuksearchgui
From: Oszkar Ambrus <aoszkar () gmail ! com>
Date: 2010-06-22 14:13:27
Message-ID: 20100622141327.8E3DAAC8DA () svn ! kde ! org
[Download RAW message or body]
SVN commit 1141322 by aoszkar:
Fixed property saving problem in PropertyEditWidget. Fixed some \
QueryBuilderSearchWidget querying problems. Some minor fixes.
M +1 -1 gui/mainwindow.cpp
M +0 -32 plugins/taskresourceeditplugin.cpp
M +1 -2 src/genericresourceeditplugin.cpp
M +1 -17 src/nepomukdataaccess.cpp
M +0 -1 src/nepomukdataaccess.h
M +2 -5 src/propertyeditwidget.cpp
M +37 -34 src/querybuildersearchwidget.cpp
M +8 -0 src/querybuildersearchwidget.h
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/gui/mainwindow.cpp \
#1141321:1141322 @@ -34,7 +34,7 @@
fileMenu->addAction(tr("&Quit"), this, SLOT(close()));
Nepomuk::QueryBuilderSearchWidget *w = new Nepomuk::QueryBuilderSearchWidget();
Nepomuk::Query::ComparisonTerm coreTerm(Soprano::Vocabulary::NAO::hasTag(),
- Nepomuk::Query::LiteralTerm("testtag"),
+ Nepomuk::Query::LiteralTerm(),
Nepomuk::Query::ComparisonTerm::Contains);
w->setCoreQueryTerm(coreTerm);
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/plugins/taskresourceeditplugin.cpp \
#1141321:1141322 @@ -158,10 +158,6 @@
else if (action == SaveChanges) {
foreach(PropertyEditWidget* pew, d->propertyEditWidgets) {
pew->setEditingEnabled(false);
- kDebug() << "=========== Trying to save:"
- << pew->nepomukProperty().uri().toString() << ", "
- << pew->value();
- //FIXME: properties don't always get saved (e.g. due date)
resource().setProperty(pew->nepomukProperty().uri(), pew->value());
}
@@ -176,7 +172,6 @@
}
else if (action == CancelChanges) {
foreach(PropertyEditWidget* pew, d->propertyEditWidgets) {
- pew->setEditingEnabled(false);
pew->setValue(resource().property(pew->nepomukProperty().uri()));
}
Nepomuk::Resource taskState = \
resource().property(Nepomuk::Vocabulary::TMO::taskState()).toResource(); @@ -185,30 \
+180,3 @@ d->stateComboBox->setEnabled(false);
}
}
-
-/*
-void Nepomuk::TaskEditWidget::saveProperties()
-{
- //FIXME: some properties do not get saved (e.g. date, rating)
- foreach(PropertyEditWidget *pew, d->propertyEditWidgets) {
- kDebug() << "=========== Trying to save:" << \
pew->nepomukProperty().uri().toString() << ", " << pew->value();
- resource().setProperty(pew->nepomukProperty().uri(), pew->value());
- }
-
- QStringList currentKeys = d->stateStrings.keys(d->stateComboBox->currentText());
- if(!currentKeys.isEmpty()) {
- QString uriString = currentKeys.first();
- resource().setProperty(Nepomuk::Vocabulary::TMO::taskState(), \
QUrl(uriString));
- }
-}
-
-void Nepomuk::TaskEditWidget::restoreProperties()
-{
- foreach(PropertyEditWidget *pew, d->propertyEditWidgets) {
- pew->setValue(resource().property(pew->nepomukProperty().uri()));
- }
- Nepomuk::Resource taskState = resource().property("tmo:taskState").toResource();
- d->stateComboBox->setCurrentItem(d->stateStrings.value(taskState.uri()));
-}
-*/
-
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/src/genericresourceeditplugin.cpp \
#1141321:1141322 @@ -125,8 +125,7 @@
}
else if (action == CancelChanges) {
foreach(PropertyEditWidget* pew, d->propertyEditWidgets) {
- pew->setEditingEnabled(false);
- pew->setValue(resource().property(pew->nepomukProperty().uri()));
+ pew->setValue(resource().property(pew->nepomukProperty().uri()));//disables \
editing as well }
}
}
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/src/nepomukdataaccess.cpp \
#1141321:1141322 @@ -40,8 +40,7 @@
". { ?p nrl:cardinality ?c . } UNION { ?p \
nrl:minCardinality ?c . } . }")
.arg(typeUrl.toString());
- Soprano::Client::DBusClient client("org.kde.NepomukServer");
- Soprano::Model* m = client.createModel("main");
+ Soprano::Model* m = Nepomuk::ResourceManager::instance()->mainModel();
Soprano::QueryResultIterator it = m->executeQuery( query, \
Soprano::Query::QueryLanguageSparql ); QList<Soprano::BindingSet> allStatements = \
it.allBindings(); @@ -55,18 +54,3 @@
}
return res;
}
-
-static Soprano::Model *s_model = 0;
-
-Soprano::Model* Nepomuk::NepomukDataAccess::nepomukMainModel()
-{
- if (!s_model) {
- s_model = Nepomuk::ResourceManager::instance()->mainModel();
- }
-
- if (!s_model) {
- s_model = new Soprano::Util::DummyModel();
- }
-
- return s_model;
-}
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/src/nepomukdataaccess.h \
#1141321:1141322 @@ -46,7 +46,6 @@
* Returns a list of the properties with cardinality>=1 for the type @p \
typeUrl
*/
static QList<QUrl> mandatoryPropertiesForType(const QUrl &typeUrl);
- static Soprano::Model* nepomukMainModel();
};
}
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/src/propertyeditwidget.cpp \
#1141321:1141322 @@ -245,13 +245,13 @@
void Nepomuk::PropertyEditWidget::updateValue()
{
- //kDebug() << "value changed() " << d->property.label();
if (d->type == Private::ResourceType) { //Resource
Nepomuk::Resource resource = \
qobject_cast<ResourceCreateAndSearchWidget*>(d->editor)->resource(); \
if(resource.isValid()) { d->value = Nepomuk::Variant(resource);
}
+ }
else { //Literal
@@ -268,7 +268,6 @@
}
else if (d->type == Private::IntType) {
- //FIXME: adjust spinbox limits properly
d->value = \
Nepomuk::Variant(QVariant(qobject_cast<QSpinBox*>(d->editor)->value())); }
@@ -277,14 +276,11 @@
}
else if (d->type == Private::BoolType) {
- //FIXME: adjust spinbox limits properly
d->value = \
Nepomuk::Variant(QVariant(qobject_cast<QCheckBox*>(d->editor)->isChecked())); }
}
}
-}
-
void Nepomuk::PropertyEditWidget::Private::initResourceType()
{
if (property.literalRangeType().isValid()) {
@@ -317,6 +313,7 @@
type = ResourceType;
} else { //invalid
type = UndefinedType;
+ //kDebug() << "*** Undefined Type";
}
}
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/src/querybuildersearchwidget.cpp \
#1141321:1141322 @@ -18,7 +18,6 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-
#include "querybuildersearchwidget.h"
#include "resourceitemview.h"
@@ -34,6 +33,7 @@
#include <QMenuBar>
#include <QDockWidget>
#include <QSizePolicy>
+#include <QShowEvent>
#include <KLineEdit>
#include <KDebug>
@@ -72,6 +72,41 @@
initGui();
}
+void Nepomuk::QueryBuilderSearchWidget::setCoreQueryTerm(const Nepomuk::Query::Term \
&term) +{
+ d->coreTerm = term;
+ //runQuery();
+}
+
+
+Nepomuk::Resource Nepomuk::QueryBuilderSearchWidget::currentResource() const
+{
+ int index = d->view->currentIndex().row();
+
+ if(index >= 0 && index < d->resources.count()) {
+ return d->resources.at(index).resource();
+ }
+ else {
+ return Nepomuk::Resource();
+ }
+}
+
+
+Nepomuk::Query::Query Nepomuk::QueryBuilderSearchWidget::currentQuery()
+{
+ Nepomuk::Query::Query \
editQuery(Nepomuk::Query::QueryParser::parseQuery(d->queryEdit->text())); + \
Nepomuk::Query::AndTerm andTerm(d->coreTerm, editQuery.term()); +
+ Nepomuk::Query::Query query(andTerm);
+ return query;
+}
+
+void Nepomuk::QueryBuilderSearchWidget::showEvent(QShowEvent *event)
+{
+ QWidget::showEvent(event);
+ runQuery();
+}
+
void Nepomuk::QueryBuilderSearchWidget::initGui()
{
//query client
@@ -84,8 +119,6 @@
//querying widget
d->queryEdit = new KLineEdit();
d->queryButton = new KPushButton("Run");
- //d->queryEdit->setText("SELECT ?s WHERE { ?s nao:hasTag ?t . ?t nao:prefLabel \
?l . FILTER regex(?l, 'testtag', 'i') }");
- //connect(d->queryEdit, SIGNAL(returnPressed(QString)), this, SLOT(runQuery()));
connect(d->queryButton, SIGNAL(clicked()), this, SLOT(runQuery()));
QHBoxLayout *queryLayout = new QHBoxLayout();
queryLayout->addWidget(d->queryEdit, 7);
@@ -106,39 +139,9 @@
setLayout(mainLayout);
}
-void Nepomuk::QueryBuilderSearchWidget::setCoreQueryTerm(const Nepomuk::Query::Term \
&term)
-{
- d->coreTerm = term;
- runQuery();
-}
-
-
-Nepomuk::Resource Nepomuk::QueryBuilderSearchWidget::currentResource() const
-{
- int index = d->view->currentIndex().row();
-
- if(index >= 0 && index < d->resources.count()) {
- return d->resources.at(index).resource();
- }
- else {
- return Nepomuk::Resource();
- }
-}
-
-
-Nepomuk::Query::Query Nepomuk::QueryBuilderSearchWidget::currentQuery()
-{
- //TODO: construct query from coreTerm and the lineEdit text
- Nepomuk::Query::Query \
editQuery(Nepomuk::Query::QueryParser::parseQuery(d->queryEdit->text()));
- Nepomuk::Query::AndTerm andTerm(d->coreTerm, editQuery.term());
-
- Nepomuk::Query::Query query(andTerm);
- return query;
-}
-
-
void Nepomuk::QueryBuilderSearchWidget::runQuery()
{
+ //kDebug() << "*********** running query: " << currentQuery().toSparqlQuery();
d->view->reset();
d->resources.clear();
d->queryClient->query(currentQuery());
--- trunk/playground/base/nepomuk-kde/nepomuksearchgui/src/querybuildersearchwidget.h \
#1141321:1141322 @@ -25,6 +25,8 @@
#include <nepomuk/nepomuk_export.h>
+class QShowEvent;
+
namespace Nepomuk
{
namespace Query
@@ -67,6 +69,12 @@
*/
Nepomuk::Query::Query currentQuery();
+ public Q_SLOTS:
+ /**
+ * @reimp
+ */
+ void showEvent(QShowEvent * event);
+
private:
void initGui();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic