SMS sending

3 files changed, 307 insertions, 68 deletions

diff --git a/noncore/unsupported/gsmtool/gsmtool.cpp b/noncore/unsupported/gsmtool/gsmtool.cpp
index 8273461..6fea596 100644
--- a/noncore/unsupported/gsmtool/gsmtool.cpp
+++ b/noncore/unsupported/gsmtool/gsmtool.cpp
@@ -31,6 +31,11 @@ GSMTool::GSMTool( QWidget* parent,  const char* name, WFlags fl )
 	setConnected(FALSE);
 	/* FIXME: Persistent settings for device/baudrate */
 	connect(ConnectButton, SIGNAL(clicked()), this, SLOT(doConnectButton()));
+	connect(SMSDeleteButton, SIGNAL(clicked()), this, SLOT(doSMSDeleteButton()));
+	connect(SMSSendButton, SIGNAL(clicked()), this, SLOT(doSMSSendButton()));
+	connect(NewSMSClearButton, SIGNAL(clicked()), this, SLOT(doNewSMSClearButton()));
+	connect(NewSMSSaveButton, SIGNAL(clicked()), this, SLOT(doNewSMSSaveButton()));
+	connect(NewSMSSendButton, SIGNAL(clicked()), this, SLOT(doNewSMSSendButton()));
 	connect(ScanButton, SIGNAL(clicked()), this, SLOT(doScanButton()));
 	connect(TabWidget2, SIGNAL(currentChanged(QWidget *)), this, SLOT(doTabChanged()));
 	connect(SMSStoreList, SIGNAL(activated(int)), this, SLOT(doSMSStoreChanged()));
@@ -69,6 +74,7 @@ void GSMTool::setConnected( bool conn )
 {
 	TabWidget2->setTabEnabled(tab_2, conn);
 	TabWidget2->setTabEnabled(tab_3, conn);
+	TabWidget2->setTabEnabled(tab_4, conn);
 	MfrLabel->setEnabled(conn);
 	MfrText->setEnabled(conn);
 	ModelLabel->setEnabled(conn);
@@ -144,7 +150,8 @@ void GSMTool::doSMSStoreChanged()
 	if (!strcmp(storename, "None")) {
 		sms_store = NULL;
 	} else try {
-		sms_store = me->getSMSStore(storename);
+		sms_store = new SortedSMSStore(me->getSMSStore(storename));
+		sms_store->setSortOrder(ByIndex);
 
 		qDebug("got store of size %d", sms_store->size());
 	} catch (GsmException) {
@@ -153,6 +160,7 @@ void GSMTool::doSMSStoreChanged()
 	}
 	
 	SMSList->setEnabled(!(sms_store == NULL));
+	NewSMSSaveButton->setEnabled(!(sms_store == NULL));
 	doSMSTypeChanged();
 }
 
@@ -160,27 +168,32 @@ void GSMTool::doSMSTypeChanged()
 {
 	int direction = SMSViewType->currentItem();
 	qDebug("direction %s\n", direction?"outgoing":"incoming");
+	if (direction)
+		SMSSendButton->setText("Send");
+	else 
+		SMSSendButton->setText("Reply");
 
 	SMSList->clear();
 	doSelectedSMSChanged(NULL);
 
 	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())
+	for (SortedSMSStore::iterator e = sms_store->begin();
+	     e != sms_store->end(); e++) {
+		//		qDebug("Message %d", i);
+		qDebug("Is%sempty", e->empty()?" ":" not ");
+		if (e->empty())
 			continue;
 
-		qDebug("Status %d", sms_store()[i].status());
-		SMSMessageRef message = sms_store()[i].message();
+		qDebug("Status %d", e->status());
+		SMSMessageRef message = e->message();
 		qDebug("Got message.");
 		
 		//		qDebug(message->toString().c_str());
 		if (direction == message->messageType()) {
 			qDebug("yes\n");
 			char buf[3];
-			snprintf(buf, 3,  "%d", i);
+			snprintf(buf, 3,  "%d", e->index());
 			new QListViewItem(SMSList, message->address()._number.c_str(), message->serviceCentreTimestamp().toString().c_str(), buf);
 		} 
 	}		
@@ -207,7 +220,7 @@ void GSMTool::doSelectedSMSChanged(QListViewItem *item)
 	qDebug("text(2) is %s\n", item->text(2).ascii());
 	int index = atoi(item->text(2).ascii());
 	qDebug("index %d\n", index);
-	SMSMessageRef message = sms_store()[index].message();
+	SMSMessageRef message = sms_store->find(index)->message();
 
 	SMSText->setText(message->userData().c_str());
 	SMSText->setEnabled(TRUE);
@@ -215,6 +228,104 @@ void GSMTool::doSelectedSMSChanged(QListViewItem *item)
 	SMSSendButton->setEnabled(TRUE);
 
 }
+
+void GSMTool::doSMSSendButton()
+{
+	qDebug("SMSSendButton");
+
+	QListViewItem *item = SMSList->currentItem();
+	if (!item)
+		return;
+
+	int index = atoi(item->text(2).ascii());
+	qDebug("index %d\n", index);
+
+	int direction = SMSViewType->currentItem();
+	qDebug("direction %s\n", direction?"outgoing":"incoming");
+
+	SMSMessageRef message = sms_store->find(index)->message();
+
+	if (direction)
+		NewSMSText->setText(message->userData().c_str());
+	else 
+		NewSMSText->setText("");
+	NewSMSToBox->insertItem(message->address()._number.c_str(), 0);
+	TabWidget2->setCurrentPage(3);
+
+}
+
+void GSMTool::doNewSMSClearButton()
+{
+	NewSMSText->setText("");
+}
+
+void GSMTool::doNewSMSSaveButton()
+{
+	qDebug("NewSMSSaveButton");
+	const char *msgtext = strdup(NewSMSText->text().local8Bit());
+	const char *dest = NewSMSToBox->currentText().ascii();
+
+	NewSMSStatusLabel->setText("Sending...");
+	me->setMessageService(1);
+
+	qDebug("NewSMSSendButton: '%s' to '%s'", msgtext, dest);
+
+        SMSMessageRef m = new SMSSubmitMessage (msgtext, dest);
+	sms_store->insert(m);
+	free((void *)msgtext);
+		
+}
+void GSMTool::doNewSMSSendButton()
+{
+	const char *msgtext = strdup(NewSMSText->text().local8Bit());
+	const char *dest = NewSMSToBox->currentText().ascii();
+
+	NewSMSStatusLabel->setText("Sending...");
+	me->setMessageService(1);
+
+	qDebug("NewSMSSendButton: '%s' to '%s'", msgtext, dest);
+
+        SMSSubmitMessage m(msgtext, dest);
+	try {
+		Ref<SMSMessage> ackPDU;
+		m.setAt(new GsmAt(*me));
+		m.send(ackPDU);
+		
+		// print acknowledgement if available
+		if (! ackPDU.isnull())
+			cout << ackPDU->toString();
+		NewSMSStatusLabel->setText("Message sent.");
+	} catch (GsmException &ge) {
+		NewSMSStatusLabel->setText("Failed.");
+		qDebug(ge.what());
+	}
+	free((void *)msgtext);
+		
+
+}
+
+
+void GSMTool::doSMSDeleteButton()
+{
+	QListViewItem *item = SMSList->currentItem();
+	if (!item)
+		return;
+
+	int index = atoi(item->text(2).ascii());
+	qDebug("delete SMS with index %d\n", index);
+
+
+
+	SortedSMSStore::iterator e = sms_store->find(index);
+
+	if (e != sms_store->end()) {
+		qDebug("message is %s\n", e->message()->userData().c_str());
+			sms_store->erase(e);
+		
+	}
+	doSMSTypeChanged();
+}
+
 void GSMTool::doScanButton()
 {
 	qDebug("ScanButton");
diff --git a/noncore/unsupported/gsmtool/gsmtool.h b/noncore/unsupported/gsmtool/gsmtool.h
index b8d9a86..b38ff88 100644
--- a/noncore/unsupported/gsmtool/gsmtool.h
+++ b/noncore/unsupported/gsmtool/gsmtool.h
@@ -5,6 +5,7 @@
 #include <termios.h>
 
 #include <gsmlib/gsm_me_ta.h>
+#include <gsmlib/gsm_sorted_sms_store.h>
 
 class GSMTool : public GSMToolBase
 { 
@@ -24,14 +25,18 @@ private slots:
 	void doSMSStoreChanged();
 	void doSMSTypeChanged();
 	void doSelectedSMSChanged(QListViewItem *);
-
+	void doSMSSendButton();
+	void doSMSDeleteButton();
+	void doNewSMSClearButton();
+	void doNewSMSSaveButton();
+	void doNewSMSSendButton();
 private:
  static const speed_t baudrates[];
  int devicelocked;
  int timerid;
 
  gsmlib::MeTa *me;
- gsmlib::SMSStoreRef sms_store;
+ gsmlib::SortedSMSStoreRef sms_store;
 
  char *devicename; 
  speed_t baudrate;
diff --git a/noncore/unsupported/gsmtool/gsmtoolbase.ui b/noncore/unsupported/gsmtool/gsmtoolbase.ui
index 2cca852..65e75ec 100644
--- a/noncore/unsupported/gsmtool/gsmtoolbase.ui
+++ b/noncore/unsupported/gsmtool/gsmtoolbase.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>371</width>
+            <width>404</width>
             <height>390</height>
         </rect>
     </property>
@@ -25,7 +25,7 @@
     <property>
         <name>layoutSpacing</name>
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
             <number>2</number>
@@ -34,7 +34,7 @@
             <name>spacing</name>
             <number>1</number>
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -119,6 +119,10 @@
                             <name>currentItem</name>
                             <number>0</number>
                         </property>
+                        <property stdset="1">
+                            <name>duplicatesEnabled</name>
+                            <bool>false</bool>
+                        </property>
                     </widget>
                     <widget>
                         <class>QLabel</class>
@@ -746,13 +750,13 @@
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>-1</number>
+                        <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>-1</number>
+                        <number>1</number>
                     </property>
-                    <widget row="0"  column="0" >
+                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
@@ -830,7 +834,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget row="1"  column="0" >
+                    <widget row="1"  column="0"  rowspan="1"  colspan="3" >
                         <class>QListView</class>
                         <column>
                             <property>
@@ -873,68 +877,139 @@
                             <bool>true</bool>
                         </property>
                     </widget>
+                    <widget row="3"  column="0"  rowspan="1"  colspan="3" >
+                        <class>QMultiLineEdit</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>SMSText</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>hMargin</name>
+                            <number>1</number>
+                        </property>
+                        <property stdset="1">
+                            <name>wordWrap</name>
+                            <enum>WidgetWidth</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>readOnly</name>
+                            <bool>true</bool>
+                        </property>
+                    </widget>
                     <widget row="2"  column="0" >
-                        <class>QLayoutWidget</class>
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>SMSDeleteButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Delete</string>
+                        </property>
+                    </widget>
+                    <widget row="2"  column="2" >
+                        <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout15</cstring>
+                            <cstring>SMSSendButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Send</string>
                         </property>
+                    </widget>
+                    <spacer row="2"  column="1" >
                         <property>
-                            <name>layoutMargin</name>
+                            <name>name</name>
+                            <cstring>Spacer6_2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </grid>
+            </widget>
+            <widget>
+                <class>QWidget</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>tab</cstring>
+                </property>
+                <attribute>
+                    <name>title</name>
+                    <string>New</string>
+                </attribute>
+                <grid>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>2</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>1</number>
+                    </property>
+                    <widget row="0"  column="0"  rowspan="1"  colspan="3" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>NewSMSMessageLabel</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Message:</string>
                         </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>1</number>
-                            </property>
-                            <widget>
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>SMSDeleteButton</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Delete</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>SMSSendButton</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Send</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>SMSNewButton</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>New</string>
-                                </property>
-                            </widget>
-                        </hbox>
                     </widget>
                     <widget row="3"  column="0" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>NewSMSToLabel</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>To:</string>
+                        </property>
+                    </widget>
+                    <widget row="3"  column="1"  rowspan="1"  colspan="4" >
+                        <class>QComboBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>NewSMSToBox</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>editable</name>
+                            <bool>true</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>duplicatesEnabled</name>
+                            <bool>false</bool>
+                        </property>
+                    </widget>
+                    <widget row="1"  column="0"  rowspan="1"  colspan="5" >
                         <class>QMultiLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>SMSText</cstring>
+                            <cstring>NewSMSText</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
-                            <bool>false</bool>
+                            <bool>true</bool>
                         </property>
                         <property stdset="1">
                             <name>hMargin</name>
@@ -946,12 +1021,60 @@
                         </property>
                         <property stdset="1">
                             <name>readOnly</name>
-                            <bool>true</bool>
+                            <bool>false</bool>
+                        </property>
+                    </widget>
+                    <widget row="4"  column="4" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>NewSMSSendButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Send</string>
+                        </property>
+                    </widget>
+                    <widget row="0"  column="3"  rowspan="1"  colspan="2" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>NewSMSStatusLabel</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string></string>
+                        </property>
+                    </widget>
+                    <widget row="4"  column="2"  rowspan="1"  colspan="2" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>NewSMSSaveButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Save</string>
+                        </property>
+                    </widget>
+                    <widget row="4"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>NewSMSClearButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Clear</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
         </widget>
-    </vbox>
+    </grid>
 </widget>
 </UI>