3 files changed, 174 insertions, 2 deletions

diff --git a/noncore/settings/networksettings/mainwindow/mainwindow.ui b/noncore/settings/networksettings/mainwindow/mainwindow.ui
index a730dd5..185b345 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow/mainwindow.ui
@@ -8,13 +8,13 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>240</width>
+            <width>340</width>
             <height>289</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Network Settings</string>
@@ -38,12 +38,15 @@
                 <name>enabled</name>
                 <bool>true</bool>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
+            <property>
+                <name>layoutSpacing</name>
+            </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Widget3</cstring>
                 </property>
@@ -429,15 +432,114 @@
                                 </property>
                             </widget>
                         </hbox>
                     </widget>
                 </grid>
             </widget>
+            <widget>
+                <class>QWidget</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>devicenametab</cstring>
+                </property>
+                <attribute>
+                    <name>title</name>
+                    <string>Device name</string>
+                </attribute>
+                <vbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>11</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>6</number>
+                    </property>
+                    <widget>
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>m_NameHead</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>&lt;b&gt;Name of the device&lt;/b&gt;</string>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QLineEdit</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>m_Nameinput</cstring>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>m_setButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Set value</string>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>m_Infolabel</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>sizePolicy</name>
+                            <sizepolicy>
+                                <hsizetype>3</hsizetype>
+                                <vsizetype>3</vsizetype>
+                            </sizepolicy>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>The name here is that one your device identifying with on 
+console or infrared.</string>
+                        </property>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer5</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</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>
+                </vbox>
+            </widget>
         </widget>
     </vbox>
 </widget>
+<connections>
+    <connection>
+        <sender>m_setButton</sender>
+        <signal>clicked()</signal>
+        <receiver>MainWindow</receiver>
+        <slot>setHostname()</slot>
+    </connection>
+    <slot access="protected">setHostname()</slot>
+</connections>
 <tabstops>
     <tabstop>tabWidget</tabstop>
     <tabstop>connectionList</tabstop>
     <tabstop>informationConnectionButton</tabstop>
     <tabstop>configureConnectionButton</tabstop>
     <tabstop>addConnectionButton</tabstop>
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index f83e370..0a3312c 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -5,12 +5,13 @@
 #include "interfacesetupimp.h"
 #include "interfaces.h"
 #include "module.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oprocess.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/qlibrary.h>
 #include <qpe/resource.h>
@@ -21,12 +22,13 @@
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qtabwidget.h> // in order to disable the profiles tab
 #include <qmessagebox.h>
+#include <qtextstream.h>
 
 
 #if QT_VERSION < 0x030000
 #include <qlist.h>
 #else
 #include <qptrlist.h>
@@ -41,12 +43,18 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
 #define _PROCNETDEV "/proc/net/dev"
 
+// is this always right?
+#define _HOSTFILE "/etc/hostname"
+#define _IRDANAME "/proc/sys/net/irda/devname"
+
+using namespace Opie::Core;
+
 MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME)
 {
     connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
     connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
     connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
     connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked()));
@@ -119,12 +127,13 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi
                 break;
             }
         }
         file.close();
     }
     makeChannel();
+    initHostname();
 }
 
 /**
  * Deconstructor. Save profiles.  Delete loaded libraries.
  */
 MainWindowImp::~MainWindowImp()
@@ -711,6 +720,56 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
     }
 
 
     if (found) QPEApplication::setKeepRunning();
     else odebug << "Huh what do ya want" << oendl;
 }
+
+void MainWindowImp::setHostname()
+{
+    QFile f(_HOSTFILE);
+
+    OProcess*h = new OProcess;
+    _procTemp="";
+    *h << "hostname" << m_Nameinput->text();
+    connect(h,SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),this,SLOT(slotHostname(Opie::Core::OProcess*,char*,int)));
+    h->start(OProcess::Block,OProcess::Stderr);
+    odebug << "Got " << _procTemp << " - " << h->exitStatus() << oendl;
+    _procTemp="";
+    delete h;
+
+    if (f.open(IO_Truncate|IO_WriteOnly))
+    {
+        QTextStream s(&f);
+        s << m_Nameinput->text();
+    }
+    f.close();
+    f.setName(_IRDANAME);
+    if (f.open(IO_WriteOnly))
+    {
+        QTextStream s(&f);
+        s << m_Nameinput->text();
+    }
+}
+
+void MainWindowImp::initHostname()
+{
+    OProcess h;
+    _procTemp="";
+
+    h << "hostname";
+    connect(&h,SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),this,SLOT(slotHostname(Opie::Core::OProcess*,char*,int)));
+    h.start(OProcess::Block,OProcess::AllOutput);
+    odebug << "Got " << _procTemp <<oendl;
+    m_Nameinput->setText(_procTemp);
+    _procTemp="";
+}
+
+void MainWindowImp::slotHostname(Opie::Core::OProcess *proc, char *buffer, int buflen)
+{
+    if (buflen < 1 || buffer==0) return;
+    char*_t = new char[buflen+1];
+    ::memset(_t,0,buflen+1);
+    ::memcpy(_t,buffer,buflen);
+    _procTemp+=_t;
+    delete[]_t;
+}
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.h b/noncore/settings/networksettings/mainwindow/mainwindowimp.h
index f211d6e..da1bb8f 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.h
@@ -15,12 +15,17 @@ class QLibrary;
 #else
 class KLibrary;
 class KLibLoader;
 #define QLibrary KLibrary
 #endif
 
+namespace Opie {
+namespace Core {
+    class OProcess;
+}
+}
 
 class MainWindowImp : public MainWindow {
   Q_OBJECT
 
 public:
   static QString appName() { return QString::fromLatin1("networksettings"); }
@@ -43,18 +48,23 @@ private slots:
 
   void updateInterface(Interface *i);
   void newProfileChanged(const QString& newText);
 
   void receive (const QCString &, const QByteArray &);
 
+protected slots:
+  virtual void setHostname();
+  virtual void slotHostname(Opie::Core::OProcess *proc, char *buffer, int buflen);
+
 private:
   void makeChannel();
   void loadModules(const QString &path);
+  void initHostname();
 
   Module* loadPlugin(const QString &pluginFileName,
-                     const QString &resolveString = "create_plugin");
+             const QString &resolveString = "create_plugin");
 
   // For our local list of names
   QMap<QString, Interface*> interfaceNames;
 
   QMap<Module*, QLibrary*> libraries;
   QMap<Interface*, QListViewItem*> items;
@@ -63,12 +73,13 @@ private:
 
   QMap<KProcess*, QString> threads;
   QStringList profiles;
 
   bool advancedUserMode;
   QString scheme;
+  QString _procTemp;
 #ifndef QWS
   KLibLoader *loader;
 #endif
 };
 
 #endif // MAINWINOWIMP_H