Added performlist support.

diff --git a/Makefile b/Makefile
index 694bd06..81821bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,11 @@ default:
 run_cmake:
        cd build && cmake .. && make
 
 run_cmake:
        cd build && cmake .. && make
 

+build_mono_windows:
+       cd build && cmake -DBUILD="mono" .. -G "MinGW Makefiles" && mingw32-make
+       

 build_windows:
 build_windows:

-       cd build && cmake .. -G "MinGW Makefiles" && mingw32-make
+       cd build && cmake -DBUILD="core gui" .. -G "MinGW Makefiles" && mingw32-make

 
 clean:
        rm -rf build/*
 
 clean:
        rm -rf build/*

diff --git a/core/server.cpp b/core/server.cpp
index eeb4693..541816b 100644 (file)
--- a/core/server.cpp
+++ b/core/server.cpp
@@ -565,6 +565,14 @@ void Server::handleServer001(QString prefix, QStringList params) {
   emit ownNickSet(network, ownNick);
   emit nickAdded(network, ownNick, VarMap());
   emit displayMsg(Message::server("", params[1], prefix));
   emit ownNickSet(network, ownNick);
   emit nickAdded(network, ownNick, VarMap());
   emit displayMsg(Message::server("", params[1], prefix));

+  // send performlist
+  QStringList performList = networkSettings["Perform"].toString().split( "\n" );
+  int count = performList.count();
+  for ( int a = 0; a < count; a++ ) {
+       if ( !performList[a].isEmpty() ) {
+               userInput( network, "", performList[a] ); 
+       }
+  }

 }
 
 /* RPL_ISUPPORT */
 }
 
 /* RPL_ISUPPORT */

diff --git a/gui/serverlist.cpp b/gui/serverlist.cpp
index 146203e..55200e8 100644 (file)
--- a/gui/serverlist.cpp
+++ b/gui/serverlist.cpp
@@ -231,6 +231,8 @@ void NetworkEditDlg::updateWidgets() {
     //if(server["Exclude"].toBool()) item->setCheckState(Qt::Checked);
     ui.serverList->addItem(item);
   }
     //if(server["Exclude"].toBool()) item->setCheckState(Qt::Checked);
     ui.serverList->addItem(item);
   }

+  ui.performEdit->clear();
+  ui.performEdit->setText( network["Perform"].toString() );

   updateServerButtons();
 }
 
   updateServerButtons();
 }
 


@@ -258,6 +260,7 @@ void NetworkEditDlg::accept() {
     /*if(ui.networkGroup->currentText() == "<none>") network["Group"] = "";
     else */ network["Group"] = ui.networkGroup->currentText();
     network["AutoConnect"] = ui.enableAutoConnect->isChecked();
     /*if(ui.networkGroup->currentText() == "<none>") network["Group"] = "";
     else */ network["Group"] = ui.networkGroup->currentText();
     network["AutoConnect"] = ui.enableAutoConnect->isChecked();

+    network["Perform"] = ui.performEdit->toPlainText();

     if(ui.identityList->currentIndex()) network["Identity"] = ui.identityList->currentText();
     else network["Identity"] = "Default";
     QDialog::accept();
     if(ui.identityList->currentIndex()) network["Identity"] = ui.identityList->currentText();
     else network["Identity"] = "Default";
     QDialog::accept();

diff --git a/gui/ui/networkeditdlg.ui b/gui/ui/networkeditdlg.ui
index 178df87..e069ec1 100644 (file)
--- a/gui/ui/networkeditdlg.ui
+++ b/gui/ui/networkeditdlg.ui
@@ -114,7 +114,7 @@
       <bool>true</bool>
      </property>
      <property name="currentIndex" >
       <bool>true</bool>
      </property>
      <property name="currentIndex" >

-      <number>0</number>
+      <number>1</number>

      </property>
      <widget class="QWidget" name="serversTab" >
       <property name="enabled" >
      </property>
      <widget class="QWidget" name="serversTab" >
       <property name="enabled" >


@@ -215,13 +215,10 @@
          <item>
           <widget class="QTextEdit" name="performEdit" >
            <property name="enabled" >
          <item>
           <widget class="QTextEdit" name="performEdit" >
            <property name="enabled" >

-            <bool>false</bool>
+            <bool>true</bool>

            </property>
            </property>

-           <property name="html" >
-            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-style:italic;">Not implemented yet&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+           <property name="lineWrapMode" >
+            <enum>QTextEdit::NoWrap</enum>

            </property>
           </widget>
          </item>
            </property>
           </widget>
          </item>