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
@@ -1,91 +1,94 @@
 <!DOCTYPE UI><UI>
 <class>MainWindow</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>MainWindow</cstring>
     </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>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tabWidget</cstring>
             </property>
             <property stdset="1">
                 <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>
                 <attribute>
                     <name>title</name>
                     <string>Connections</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>0</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
                         <class>QListView</class>
                         <column>
                             <property>
                                 <name>text</name>
                                 <string>s</string>
                             </property>
                             <property>
                                 <name>clickable</name>
                                 <bool>true</bool>
                             </property>
                             <property>
                                 <name>resizeable</name>
                                 <bool>true</bool>
                             </property>
                         </column>
                         <column>
                             <property>
                                 <name>text</name>
                                 <string>t</string>
                             </property>
                             <property>
                                 <name>clickable</name>
                                 <bool>true</bool>
                             </property>
                             <property>
                                 <name>resizeable</name>
                                 <bool>true</bool>
                             </property>
@@ -387,65 +390,164 @@
                             <cstring>Layout6</cstring>
                         </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>TextLabel1_3</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>New Profile</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>newProfile</cstring>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>newProfileButton</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <bool>false</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>&amp;Add</string>
                                 </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>
     <tabstop>removeConnectionButton</tabstop>
     <tabstop>profilesList</tabstop>
     <tabstop>setCurrentProfileButton</tabstop>
     <tabstop>removeProfileButton</tabstop>
     <tabstop>newProfile</tabstop>
     <tabstop>newProfileButton</tabstop>
 </tabstops>
 </UI>
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
@@ -1,172 +1,181 @@
 
 #include "mainwindowimp.h"
 #include "addconnectionimp.h"
 #include "interfaceinformationimp.h"
 #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>
 
 /* QT */
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #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>
 #endif
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 /* STD */
 #include <net/if.h>
 #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()));
 
     //remove tab with no function
     tabWidget->removePage( tab );
 
     // Load connections.
     // /usr/local/kde/lib/libinterfaces.la
     loadModules(QPEApplication::qpeDir() + "plugins/networksettings");
     getAllInterfaces();
 
     Interfaces i;
     QStringList list = i.getInterfaceList();
     QMap<QString, Interface*>::Iterator it;
     for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni )
     {
         /*
          * we skipped it in getAllInterfaces now
          * we need to ignore it as well
          */
         if (m_handledIfaces.contains( *ni) )
         {
             odebug << "Not up iface handled by module" << oendl;
             continue;
         }
         bool found = false;
         for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it )
         {
             if(it.key() == (*ni))
                 found = true;
         }
         if(!found)
         {
             if(!(*ni).contains("_"))
             {
                 Interface *i = new Interface(this, *ni, false);
                 i->setAttached(false);
                 i->setHardwareName(tr("Disconnected"));
                 interfaceNames.insert(i->getInterfaceName(), i);
                 updateInterface(i);
                 connect(i, SIGNAL(updateInterface(Interface*)), this, SLOT(updateInterface(Interface*)));
             }
         }
     }
 
     //getInterfaceList();
     connectionList->header()->hide();
 
     Config cfg("NetworkSetup");
     profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
     for ( QStringList::Iterator it = profiles.begin();
             it != profiles.end(); ++it)
         profilesList->insertItem((*it));
     currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All"));
     advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);
     scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME);
 
     QFile file(scheme);
     if ( file.open(IO_ReadOnly) )
     {    // file opened successfully
         QTextStream stream( &file );        // use a text stream
         while ( !stream.eof() )
         {        // until end of file...
             QString line = stream.readLine();       // line of text excluding '\n'
             if(line.contains("SCHEME"))
             {
                 line = line.mid(7, line.length());
                 currentProfileLabel->setText(line);
                 break;
             }
         }
         file.close();
     }
     makeChannel();
+    initHostname();
 }
 
 /**
  * Deconstructor. Save profiles.  Delete loaded libraries.
  */
 MainWindowImp::~MainWindowImp()
 {
     // Save profiles.
     Config cfg("NetworkSetup");
     cfg.setGroup("General");
     cfg.writeEntry("Profiles", profiles.join(" "));
 
     // Delete all interfaces that don't have owners.
     QMap<Interface*, QListViewItem*>::Iterator iIt;
     for( iIt = items.begin(); iIt != items.end(); ++iIt )
     {
         if(iIt.key()->getModuleOwner() == NULL)
             delete iIt.key();
     }
 
     // Delete Modules and Libraries
     QMap<Module*, QLibrary*>::Iterator it;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         delete it.key();
         // I wonder why I can't delete the libraries
         // What fucking shit this is.
         //delete it.data();
     }
 }
 
 /**
  * Query the kernel for all of the interfaces.
  */
 void MainWindowImp::getAllInterfaces()
 {
     int sockfd = socket(PF_INET, SOCK_DGRAM, 0);
     if(sockfd == -1)
         return;
 
     struct ifreq ifr;
     QStringList ifaces;
     QFile procFile(QString(_PROCNETDEV));
     int result;
     Interface *i;
 
     if (! procFile.exists())
     {
@@ -669,48 +678,98 @@ void MainWindowImp::changeProfile()
             for( it = items.begin(); it != items.end(); ++it )
             {
                 if(it.key()->getStatus() == true)
                     it.key()->restart();
             }
         }
     }
     // TODO change the profile in the modules
 }
 
 
 void MainWindowImp::makeChannel()
 {
     channel = new QCopChannel( "QPE/Application/networksettings", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
              this, SLOT(receive(const QCString&,const QByteArray&)) );
 }
 
 void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
 {
     bool found = false;
     odebug << "MainWindowImp::receive QCop msg >"+msg+"<" << oendl;
     if (msg == "raise")
     {
         raise();
         return;
     }
 
     QString dest = msg.left(msg.find("("));
     QCString param = msg.right(msg.length() - msg.find("(") - 1);
     param = param.left( param.length() - 1 );
     odebug << "dest >" << dest.latin1() << "< param >"+param+"<" << oendl;
 
     QMap<Module*, QLibrary*>::Iterator it;
     for( it = libraries.begin(); it != libraries.end(); ++it )
     {
         odebug << "plugin >" << it.key()->type().latin1() << "<" << oendl;
         if(it.key()->type() == dest)
         {
             it.key()->receive( param, arg );
             found = true;
         }
     }
 
 
     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
@@ -1,75 +1,86 @@
 #ifndef MAINWINOWIMP_H
 #define MAINWINOWIMP_H
 
 #include "mainwindow.h"
 #include <qmap.h>
 #include <qstringlist.h>
 
 class Module;
 class Interface;
 class QLibrary;
 class KProcess;
 class QCopChannel;
 #ifdef QWS
 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"); }
   MainWindowImp(QWidget *parent=0, const char *name=0, WFlags fl = 0);
   ~MainWindowImp();
 
   QCopChannel *channel;
 
 private slots:
   void getAllInterfaces();
 
   void addClicked();
   void removeClicked();
   void configureClicked();
   void informationClicked();
 
   void addProfile();
   void removeProfile();
   void changeProfile();
 
   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;
   QMap<QListViewItem*, Interface*> interfaceItems;
   QStringList m_handledIfaces;
 
   QMap<KProcess*, QString> threads;
   QStringList profiles;
 
   bool advancedUserMode;
   QString scheme;
+  QString _procTemp;
 #ifndef QWS
   KLibLoader *loader;
 #endif
 };
 
 #endif // MAINWINOWIMP_H