From kde-commits Thu Aug 16 18:41:51 2012 From: Shaun Reich Date: Thu, 16 Aug 2012 18:41:51 +0000 To: kde-commits Subject: [plasmate/terietor/tools] engineexplorer: Add request servicefor source to engineexplorer. Message-Id: <20120816184151.95D93A60EE () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=134514257227976 Git commit ea864d09ad25a3847cd875797bbea77f148a97b5 by Shaun Reich. Committed on 12/01/2012 at 23:09. Pushed by tsiapaliwkas into branch 'terietor/tools'. Add request servicefor source to engineexplorer. So I can do e.g. powermanagment, and "PowerDevil" source, which is not a source but only available through a serviceForSource() event. A lot of engines work this way too...only way to get a valid service from thin air. M +11 -0 engineexplorer/engineexplorer.cpp M +1 -0 engineexplorer/engineexplorer.h M +84 -41 engineexplorer/engineexplorer.ui M +1 -0 engineexplorer/serviceviewer.cpp http://commits.kde.org/plasmate/ea864d09ad25a3847cd875797bbea77f148a97b5 diff --git a/engineexplorer/engineexplorer.cpp b/engineexplorer/engineexplo= rer.cpp index 1ee0cd6..ccca8f5 100644 --- a/engineexplorer/engineexplorer.cpp +++ b/engineexplorer/engineexplorer.cpp @@ -63,6 +63,7 @@ EngineExplorer::EngineExplorer(QWidget* parent) m_title->setPixmap(pix.pixmap(size, size)); connect(m_engines, SIGNAL(activated(QString)), this, SLOT(showEngine(Q= String))); connect(m_sourceRequesterButton, SIGNAL(clicked(bool)), this, SLOT(req= uestSource())); + connect(m_serviceRequesterButton, SIGNAL(clicked(bool)), this, SLOT(re= questServiceForSource())); m_data->setModel(m_dataModel); m_data->setWordWrap(true); = @@ -154,6 +155,8 @@ void EngineExplorer::showEngine(const QString& name) { m_sourceRequester->setEnabled(false); m_sourceRequesterButton->setEnabled(false); + m_serviceRequester->setEnabled(false); + m_serviceRequesterButton->setEnabled(false); enableButton(KDialog::User1, false); enableButton(KDialog::User2, false); m_dataModel->clear(); @@ -194,6 +197,8 @@ void EngineExplorer::showEngine(const QString& name) m_updateInterval->setEnabled(true); m_sourceRequester->setEnabled(true); m_sourceRequester->setFocus(); + m_serviceRequester->setEnabled(true); + m_serviceRequesterButton->setEnabled(true); updateTitle(); } = @@ -245,6 +250,12 @@ void EngineExplorer::requestSource() requestSource(m_sourceRequester->text()); } = +void EngineExplorer::requestServiceForSource() +{ + ServiceViewer *viewer =3D new ServiceViewer(m_engine, m_serviceRequest= er->text()); + viewer->show(); +} + void EngineExplorer::requestSource(const QString &source) { if (!m_engine || source.isEmpty()) { diff --git a/engineexplorer/engineexplorer.h b/engineexplorer/engineexplore= r.h index bd17efd..b61776e 100644 --- a/engineexplorer/engineexplorer.h +++ b/engineexplorer/engineexplorer.h @@ -56,6 +56,7 @@ class EngineExplorer : public KDialog, public Ui::EngineE= xplorer void addSource(const QString& source); void removeSource(const QString& source); void requestSource(); + void requestServiceForSource(); void showDataContextMenu(const QPoint &point); void cleanUp(); = diff --git a/engineexplorer/engineexplorer.ui b/engineexplorer/engineexplor= er.ui index a0a8972..fea44f9 100644 --- a/engineexplorer/engineexplorer.ui +++ b/engineexplorer/engineexplorer.ui @@ -1,92 +1,135 @@ - + + EngineExplorer - - + + 0 0 - 513 - 300 + 374 + 207 - - - 0 - + - - + + Plasma DataEngine Explorer - + - + - - + + false - + + + 100 + 0 + + + Source name - + true - - + + false - + + + 130 + 0 + + + Update on demand - + ms - + Update every - + 0 - + 10000000 - + 50 - + 0 - - + + + false + + + Request Source + + + + + + + + + + + false + + + + 120 + 0 + + + + Service for source + + + true + + + + + + false - - Request + + Request Service for Source - + - - + + QAbstractItemView::NoEditTriggers - + true @@ -95,16 +138,16 @@ - KIntSpinBox - QSpinBox -
knuminput.h
-
- KLineEdit QLineEdit
klineedit.h
+ KIntSpinBox + QSpinBox +
knuminput.h
+
+ KTitleWidget QWidget
ktitlewidget.h
@@ -136,11 +179,11 @@ m_sourceRequesterButton animateClick() - + 375 91 - + 447 94 diff --git a/engineexplorer/serviceviewer.cpp b/engineexplorer/serviceviewe= r.cpp index 79388e5..75fc02e 100644 --- a/engineexplorer/serviceviewer.cpp +++ b/engineexplorer/serviceviewer.cpp @@ -55,6 +55,7 @@ ServiceViewer::ServiceViewer(Plasma::DataEngine *engine, = const QString &source, = if (m_engine) { engineName =3D KStringHandler::capwords(m_engine->name()); + kDebug() << "########### CALLING SERVICE FOR SOURCE: " << m_source; m_service =3D m_engine->serviceForSource(m_source); = if (m_service !=3D 0) {