[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasmate/terietor/tools] engineexplorer: Add request servicefor source to engineexplorer.
From: Shaun Reich <shaun.reich () kdemail ! net>
Date: 2012-08-16 18:41:51
Message-ID: 20120816184151.95D93A60EE () git ! kde ! org
[Download RAW message or body]
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/engineexplorer.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(QString)));
connect(m_sourceRequesterButton, SIGNAL(clicked(bool)), this, SLOT(requestSource()));
+ connect(m_serviceRequesterButton, SIGNAL(clicked(bool)), this, SLOT(requestServiceForSource()));
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 = new ServiceViewer(m_engine, m_serviceRequester->text());
+ viewer->show();
+}
+
void EngineExplorer::requestSource(const QString &source)
{
if (!m_engine || source.isEmpty()) {
diff --git a/engineexplorer/engineexplorer.h b/engineexplorer/engineexplorer.h
index bd17efd..b61776e 100644
--- a/engineexplorer/engineexplorer.h
+++ b/engineexplorer/engineexplorer.h
@@ -56,6 +56,7 @@ class EngineExplorer : public KDialog, public Ui::EngineExplorer
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/engineexplorer.ui
index a0a8972..fea44f9 100644
--- a/engineexplorer/engineexplorer.ui
+++ b/engineexplorer/engineexplorer.ui
@@ -1,92 +1,135 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>EngineExplorer</class>
- <widget class="QWidget" name="EngineExplorer" >
- <property name="geometry" >
+ <widget class="QWidget" name="EngineExplorer">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>513</width>
- <height>300</height>
+ <width>374</width>
+ <height>207</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="KTitleWidget" name="m_title" >
- <property name="text" >
+ <widget class="KTitleWidget" name="m_title">
+ <property name="text">
<string>Plasma DataEngine Explorer</string>
</property>
</widget>
</item>
<item>
- <widget class="TitleComboBox" name="m_engines" />
+ <widget class="TitleComboBox" name="m_engines"/>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="KLineEdit" name="m_sourceRequester" >
- <property name="enabled" >
+ <widget class="KLineEdit" name="m_sourceRequester">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="clickMessage" >
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="clickMessage">
<string>Source name</string>
</property>
- <property name="showClearButton" stdset="0" >
+ <property name="showClearButton" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="KIntSpinBox" name="m_updateInterval" >
- <property name="enabled" >
+ <widget class="KIntSpinBox" name="m_updateInterval">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="specialValueText" >
+ <property name="minimumSize">
+ <size>
+ <width>130</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="specialValueText">
<string>Update on demand</string>
</property>
- <property name="suffix" >
+ <property name="suffix">
<string>ms</string>
</property>
- <property name="prefix" >
+ <property name="prefix">
<string>Update every </string>
</property>
- <property name="minimum" >
+ <property name="minimum">
<number>0</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>10000000</number>
</property>
- <property name="singleStep" >
+ <property name="singleStep">
<number>50</number>
</property>
- <property name="value" >
+ <property name="value">
<number>0</number>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="m_sourceRequesterButton" >
- <property name="enabled" >
+ <widget class="QPushButton" name="m_sourceRequesterButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Request Source</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="KLineEdit" name="m_serviceRequester">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>120</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="clickMessage">
+ <string>Service for source</string>
+ </property>
+ <property name="showClearButton" stdset="0">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="m_serviceRequesterButton">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="text" >
- <string>Request</string>
+ <property name="text">
+ <string>Request Service for Source</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
- <widget class="KTreeViewSearchLine" native="1" name="m_searchLine" />
+ <widget class="KTreeViewSearchLine" name="m_searchLine" native="true"/>
</item>
<item>
- <widget class="QTreeView" name="m_data" >
- <property name="editTriggers" >
+ <widget class="QTreeView" name="m_data">
+ <property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
- <property name="allColumnsShowFocus" >
+ <property name="allColumnsShowFocus">
<bool>true</bool>
</property>
</widget>
@@ -95,16 +138,16 @@
</widget>
<customwidgets>
<customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
+ </customwidget>
+ <customwidget>
<class>KTitleWidget</class>
<extends>QWidget</extends>
<header>ktitlewidget.h</header>
@@ -136,11 +179,11 @@
<receiver>m_sourceRequesterButton</receiver>
<slot>animateClick()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>375</x>
<y>91</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>447</x>
<y>94</y>
</hint>
diff --git a/engineexplorer/serviceviewer.cpp b/engineexplorer/serviceviewer.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 = KStringHandler::capwords(m_engine->name());
+ kDebug() << "########### CALLING SERVICE FOR SOURCE: " << m_source;
m_service = m_engine->serviceForSource(m_source);
if (m_service != 0) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic