summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/gsmtool/gsmtool.cpp63
-rw-r--r--noncore/unsupported/gsmtool/gsmtool.h4
-rw-r--r--noncore/unsupported/gsmtool/gsmtoolbase.ui109
3 files changed, 136 insertions, 40 deletions
diff --git a/noncore/unsupported/gsmtool/gsmtool.cpp b/noncore/unsupported/gsmtool/gsmtool.cpp
index 38baf45..c3f9482 100644
--- a/noncore/unsupported/gsmtool/gsmtool.cpp
+++ b/noncore/unsupported/gsmtool/gsmtool.cpp
@@ -5,11 +5,13 @@
#include <qlabel.h>
#include <qtabwidget.h>
#include <qlistview.h>
-
+#include <qtextbrowser.h>
#include <termios.h>
#include <gsmlib/gsm_me_ta.h>
#include <gsmlib/gsm_unix_serial.h>
+#include <gsmlib/gsm_sms.h>
+#include <gsmlib/gsm_sorted_sms_store.h>
using namespace gsmlib;
@@ -23,11 +25,15 @@ GSMTool::GSMTool( QWidget* parent, const char* name, WFlags fl )
{
devicelocked = 0;
me = NULL;
+ sms_store = NULL;
setConnected(FALSE);
/* FIXME: Persistent settings for device/baudrate */
connect(ConnectButton, SIGNAL(clicked()), this, SLOT(doConnectButton()));
connect(ScanButton, SIGNAL(clicked()), this, SLOT(doScanButton()));
connect(TabWidget2, SIGNAL(currentChanged(QWidget *)), this, SLOT(doTabChanged()));
+ connect(SMSStoreList, SIGNAL(activated(int)), this, SLOT(doSMSStoreChanged()));
+ connect(SMSViewType, SIGNAL(activated(int)), this, SLOT(doSMSTypeChanged()));
+
timerid = -1; // Is this not possible normally?
}
@@ -129,6 +135,49 @@ void GSMTool::timerEvent( QTimerEvent * )
}
}
+void GSMTool::doSMSStoreChanged()
+{
+ const char *storename = SMSStoreList->currentText().ascii();
+ qDebug("Store Changed to '%s'", storename);
+ try {
+ sms_store = me->getSMSStore(storename);
+
+ qDebug("got store of size %d", sms_store->size());
+ } catch (GsmException) {
+ sms_store = NULL;
+ qDebug("get store failed");
+ }
+ doSMSTypeChanged();
+}
+
+void GSMTool::doSMSTypeChanged()
+{
+ int direction = SMSViewType->currentItem();
+ qDebug("direction %s\n", direction?"outgoing":"incoming");
+
+ SMSList->clear();
+ if (sms_store == NULL)
+ return;
+ for (int i = 0; i < sms_store->size(); i++) {
+ qDebug("Message %d", i);
+ qDebug("Is%sempty", sms_store()[i].empty()?" ":" not ");
+ if (sms_store()[i].empty())
+ continue;
+
+ qDebug("Status %d", sms_store()[i].status());
+ SMSMessageRef message = sms_store()[i].message();
+ qDebug("Got message.");
+
+#if 0 // WTF does this die? Did I mention that gsmlib needs rewriting in a sane language?
+ qDebug(message->toString().c_str());
+ if (direction == message->messageType()) {
+ qDebug("yes\n");
+ new QListViewItem(SMSList, "xx", message->address()._number.c_str());
+ } else qDebug("no. dir %d, type %d\n", direction, message->messageType());
+#endif
+ }
+}
+
void GSMTool::doScanButton()
{
qDebug("ScanButton");
@@ -248,4 +297,16 @@ void GSMTool::doConnectButton()
RevisionText->setText(ifo._revision.c_str());
SerialText->setText(ifo._serialNumber.c_str());
setConnected(TRUE);
+
+ SMSStoreList->clear();
+ SMSStoreList->insertItem("None");
+
+ vector<string> storenames = me->getSMSStoreNames();
+
+ for (vector<string>::iterator i = storenames.begin(); i != storenames.end(); ++i) {
+ SMSStoreList->insertItem(i->c_str());
+ }
+ SMSList->clear();
+ SMSText->setText("");
+ sms_store = NULL;
}
diff --git a/noncore/unsupported/gsmtool/gsmtool.h b/noncore/unsupported/gsmtool/gsmtool.h
index 1625cb1..49387d9 100644
--- a/noncore/unsupported/gsmtool/gsmtool.h
+++ b/noncore/unsupported/gsmtool/gsmtool.h
@@ -21,12 +21,16 @@ private slots:
void doConnectButton();
void doScanButton();
void doTabChanged();
+ void doSMSStoreChanged();
+ void doSMSTypeChanged();
+
private:
static const speed_t baudrates[];
int devicelocked;
int timerid;
gsmlib::MeTa *me;
+ gsmlib::SMSStoreRef sms_store;
char *devicename;
speed_t baudrate;
diff --git a/noncore/unsupported/gsmtool/gsmtoolbase.ui b/noncore/unsupported/gsmtool/gsmtoolbase.ui
index 72c943a..340f26c 100644
--- a/noncore/unsupported/gsmtool/gsmtoolbase.ui
+++ b/noncore/unsupported/gsmtool/gsmtoolbase.ui
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>388</width>
- <height>502</height>
+ <width>309</width>
+ <height>390</height>
</rect>
</property>
<property stdset="1">
@@ -739,56 +739,91 @@
<name>title</name>
<string>SMS</string>
</attribute>
- <grid>
+ <vbox>
<property stdset="1">
<name>margin</name>
- <number>2</number>
+ <number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>1</number>
+ <number>6</number>
</property>
- <widget row="0" column="1" >
- <class>QComboBox</class>
- <item>
- <property>
- <name>text</name>
- <string>None</string>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout6</cstring>
</property>
- </item>
- <item>
- <property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>SMSStoreLabel</cstring>
+ </property>
+ <property stdset="1">
<name>text</name>
- <string>Incoming</string>
+ <string>Store:</string>
</property>
- </item>
+ </widget>
+ <widget>
+ <class>QComboBox</class>
<item>
<property>
<name>text</name>
- <string>Outgoing</string>
+ <string>None</string>
</property>
</item>
<property stdset="1">
<name>name</name>
- <cstring>ComboBox11</cstring>
+ <cstring>SMSStoreList</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
</widget>
- <widget row="0" column="0" >
+ <widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel4</cstring>
+ <cstring>SMSTypeLabel</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Message Collection:</string>
+ <string>Type:</string>
</property>
</widget>
- <widget row="1" column="0" rowspan="1" colspan="2" >
+ <widget>
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>Incoming</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>Outgoing</string>
+ </property>
+ </item>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>SMSViewType</cstring>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget>
<class>QListView</class>
<column>
<property>
@@ -820,21 +855,10 @@
</column>
<property stdset="1">
<name>name</name>
- <cstring>ListView3</cstring>
- </property>
- </widget>
- <widget row="3" column="0" rowspan="1" colspan="2" >
- <class>QMultiLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>MultiLineEdit3</cstring>
- </property>
- <property stdset="1">
- <name>readOnly</name>
- <bool>true</bool>
+ <cstring>SMSList</cstring>
</property>
</widget>
- <widget row="2" column="0" rowspan="1" colspan="2" >
+ <widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
@@ -856,7 +880,7 @@
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>PushButton11</cstring>
+ <cstring>SMSDeleteButton</cstring>
</property>
<property stdset="1">
<name>text</name>
@@ -867,7 +891,7 @@
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>PushButton12</cstring>
+ <cstring>SMSSendButton</cstring>
</property>
<property stdset="1">
<name>text</name>
@@ -878,7 +902,7 @@
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>PushButton13</cstring>
+ <cstring>SMSNewButton</cstring>
</property>
<property stdset="1">
<name>text</name>
@@ -887,7 +911,14 @@
</widget>
</hbox>
</widget>
- </grid>
+ <widget>
+ <class>QTextBrowser</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>SMSText</cstring>
+ </property>
+ </widget>
+ </vbox>
</widget>
</widget>
</vbox>