Quassel now uses proper default messages for part, quit, kick and away (/away toggles...

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 68f3127..4b47121 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -23,6 +23,7 @@
 #include "core.h"
 #include "coresession.h"
 #include "networkconnection.h"
 #include "core.h"
 #include "coresession.h"
 #include "networkconnection.h"

+#include "userinputhandler.h"

 
 #include "signalproxy.h"
 #include "buffersyncer.h"
 
 #include "signalproxy.h"
 #include "buffersyncer.h"


@@ -205,8 +206,11 @@ void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
 }
 
 void CoreSession::disconnectFromNetwork(NetworkId id) {
 }
 
 void CoreSession::disconnectFromNetwork(NetworkId id) {

-  if(!_connections.contains(id)) return;
-  _connections[id]->disconnectFromIrc();
+  if(!_connections.contains(id))
+    return;
+  
+  //_connections[id]->disconnectFromIrc();
+  _connections[id]->userInputHandler()->handleQuit(BufferInfo(), QString());

 }
 
 void CoreSession::networkStateRequested() {
 }
 
 void CoreSession::networkStateRequested() {

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 530ee32..3d9fcc7 100644 (file)
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -45,6 +45,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     _userInputHandler(new UserInputHandler(this)),
     _ctcpHandler(new CtcpHandler(this)),
     _autoReconnectCount(0),
     _userInputHandler(new UserInputHandler(this)),
     _ctcpHandler(new CtcpHandler(this)),
     _autoReconnectCount(0),

+    _quitRequested(false),

 
     _previousConnectionAttemptFailed(false),
     _lastUsedServerlistIndex(0),
 
     _previousConnectionAttemptFailed(false),
     _lastUsedServerlistIndex(0),


@@ -54,7 +55,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     _autoWhoInterval(90),
     _autoWhoNickLimit(0), // unlimited
     _autoWhoDelay(3),
     _autoWhoInterval(90),
     _autoWhoNickLimit(0), // unlimited
     _autoWhoDelay(3),

-    
+

     // TokenBucket to avaid sending too much at once
     _messagesPerSecond(1),
     _burstSize(5),
     // TokenBucket to avaid sending too much at once
     _messagesPerSecond(1),
     _burstSize(5),


@@ -66,14 +67,13 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     _maxMsgSize(450)
 {
   _autoReconnectTimer.setSingleShot(true);
     _maxMsgSize(450)
 {
   _autoReconnectTimer.setSingleShot(true);

-
+  _socketCloseTimer.setSingleShot(true);
+  connect(&_socketCloseTimer, SIGNAL(timeout()), this, SLOT(socketCloseTimeout()));
+  

   _autoWhoTimer.setInterval(_autoWhoDelay * 1000);
   _autoWhoTimer.setInterval(_autoWhoDelay * 1000);

-  _autoWhoTimer.setSingleShot(false);

   _autoWhoCycleTimer.setInterval(_autoWhoInterval * 1000);
   _autoWhoCycleTimer.setInterval(_autoWhoInterval * 1000);

-  _autoWhoCycleTimer.setSingleShot(false);
-
+  

   _tokenBucketTimer.start(_messagesPerSecond * 1000);
   _tokenBucketTimer.start(_messagesPerSecond * 1000);

-  _tokenBucketTimer.setSingleShot(false);

 
   QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
   foreach(QString chan, channels.keys()) {
 
   QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
   foreach(QString chan, channels.keys()) {


@@ -260,12 +260,13 @@ void NetworkConnection::disconnectFromIrc(bool requested) {
     setConnectionState(Network::Disconnected);
     socketDisconnected();
   } else {
     setConnectionState(Network::Disconnected);
     socketDisconnected();
   } else {

-    socket.disconnectFromHost();
+    _socketCloseTimer.start(10000); // the irc server has 10 seconds to close the socket

   }
 
   }
 

-  if(requested) {
-    emit quitRequested(networkId());
-  }
+  // this flag triggers quitRequested() once the socket is closed
+  // it is needed to determine whether or not the connection needs to be
+  // in the automatic session restore.
+  _quitRequested = requested;

 }
 
 void NetworkConnection::socketHasData() {
 }
 
 void NetworkConnection::socketHasData() {


@@ -369,18 +370,26 @@ void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState socketSt
   setConnectionState(state);
 }
 
   setConnectionState(state);
 }
 

+void NetworkConnection::socketCloseTimeout() {
+  socket.disconnectFromHost();
+}
+

 void NetworkConnection::socketDisconnected() {
   _autoWhoCycleTimer.stop();
   _autoWhoTimer.stop();
   _autoWhoQueue.clear();
   _autoWhoInProgress.clear();
 
 void NetworkConnection::socketDisconnected() {
   _autoWhoCycleTimer.stop();
   _autoWhoTimer.stop();
   _autoWhoQueue.clear();
   _autoWhoInProgress.clear();
 

+  _socketCloseTimer.stop();
+  

   network()->setConnected(false);
   emit disconnected(networkId());
   if(_autoReconnectCount != 0) {
     setConnectionState(Network::Reconnecting);
     if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate
     else _autoReconnectTimer.start();
   network()->setConnected(false);
   emit disconnected(networkId());
   if(_autoReconnectCount != 0) {
     setConnectionState(Network::Reconnecting);
     if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate
     else _autoReconnectTimer.start();

+  } else if(_quitRequested) {
+    emit quitRequested(networkId());

   }
 }
 
   }
 }
 

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index 8654bd8..16bfccc 100644 (file)
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -130,6 +130,7 @@ private slots:
   void socketError(QAbstractSocket::SocketError);
   void socketConnected();
   void socketInitialized();
   void socketError(QAbstractSocket::SocketError);
   void socketConnected();
   void socketInitialized();

+  void socketCloseTimeout();

   void socketDisconnected();
   void socketStateChanged(QAbstractSocket::SocketState);
   void setConnectionState(Network::ConnectionState);
   void socketDisconnected();
   void socketStateChanged(QAbstractSocket::SocketState);
   void setConnectionState(Network::ConnectionState);


@@ -169,8 +170,13 @@ private:
   QHash<QString, QString> _channelKeys;  // stores persistent channels and their passwords, if any
 
   QTimer _autoReconnectTimer;
   QHash<QString, QString> _channelKeys;  // stores persistent channels and their passwords, if any
 
   QTimer _autoReconnectTimer;

+  

   int _autoReconnectCount;
 
   int _autoReconnectCount;
 

+  QTimer _socketCloseTimer;
+
+  bool _quitRequested;
+

   bool _previousConnectionAttemptFailed;
   int _lastUsedServerlistIndex;
 
   bool _previousConnectionAttemptFailed;
   int _lastUsedServerlistIndex;
 

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 9c7e03b..550e168 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -55,7 +55,16 @@ void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QStri
 
 void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)
 
 void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)

-  putCmd("AWAY", serverEncode(msg));
+
+  QString awayMsg;
+  // if there is no message supplied we have to check if we are already away or not
+  if(msg.isEmpty()) {
+    IrcUser *me = network()->me();
+    if(me && !me->isAway())
+      awayMsg = networkConnection()->identity()->awayReason();
+  }
+
+  putCmd("AWAY", serverEncode(awayMsg));

 }
 
 void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) {
 }
 
 void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) {


@@ -161,7 +170,9 @@ void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &m
 void UserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) {
   QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty);
   QString reason = msg.section(' ', 1, -1, QString::SectionSkipEmpty).trimmed();
 void UserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) {
   QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty);
   QString reason = msg.section(' ', 1, -1, QString::SectionSkipEmpty).trimmed();

-  if(reason.isEmpty()) reason = networkConnection()->identity()->kickReason();
+  if(reason.isEmpty())
+    reason = networkConnection()->identity()->kickReason();
+

   QList<QByteArray> params;
   params << serverEncode(bufferInfo.bufferName()) << serverEncode(nick) << channelEncode(bufferInfo.bufferName(), reason);
   emit putCmd("KICK", params);
   QList<QByteArray> params;
   params << serverEncode(bufferInfo.bufferName()) << serverEncode(nick) << channelEncode(bufferInfo.bufferName(), reason);
   emit putCmd("KICK", params);


@@ -229,7 +240,21 @@ void UserInputHandler::handleOper(const BufferInfo &bufferInfo, const QString &m
 
 void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &msg) {
   QList<QByteArray> params;
 
 void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &msg) {
   QList<QByteArray> params;

-  params << serverEncode(bufferInfo.bufferName()) << channelEncode(bufferInfo.bufferName(), msg);
+  QString partReason;
+
+  // msg might contain either a channel name and/or a reaon, so we have to check if the first word is a known channel
+  QString channelName = msg.section(' ', 0, 0);
+  if(channelName.isEmpty() || !network()->ircChannel(channelName)) {
+    channelName = bufferInfo.bufferName();
+    partReason = msg;
+  } else {
+    partReason = msg.mid(channelName.length() + 1);
+  }
+  
+  if(partReason.isEmpty())
+    partReason = networkConnection()->identity()->partReason();
+
+  params << serverEncode(channelName) << channelEncode(bufferInfo.bufferName(), partReason);

   emit putCmd("PART", params);
 }
 
   emit putCmd("PART", params);
 }
 


@@ -247,7 +272,15 @@ void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &
 
 void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)
 
 void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo)

-  emit putCmd("QUIT", serverEncode(msg));
+
+  QString quitReason;
+  if(msg.isEmpty())
+    quitReason = networkConnection()->identity()->quitReason();
+  else
+    quitReason = msg;
+
+  emit putCmd("QUIT", serverEncode(quitReason));
+  networkConnection()->disconnectFromIrc();

 }
 
 void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) {
 }
 
 void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) {

diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui
index a5fd9d1..3dfcb64 100644 (file)
--- a/src/qtui/settingspages/identitiessettingspage.ui
+++ b/src/qtui/settingspages/identitiessettingspage.ui
@@ -36,7 +36,8 @@
           <string>...</string>
          </property>
          <property name="icon" >
           <string>...</string>
          </property>
          <property name="icon" >

-          <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/edit-rename.png</iconset>
+          <iconset resource="../../icons/icons.qrc" >
+           <normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</iconset>

          </property>
          <property name="iconSize" >
           <size>
          </property>
          <property name="iconSize" >
           <size>


@@ -55,7 +56,8 @@
           <string>Add...</string>
          </property>
          <property name="icon" >
           <string>Add...</string>
          </property>
          <property name="icon" >

-          <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-add-user.png</iconset>
+          <iconset resource="../../icons/icons.qrc" >
+           <normaloff>:/22x22/actions/oxygen/22x22/actions/list-add-user.png</normaloff>:/22x22/actions/oxygen/22x22/actions/list-add-user.png</iconset>

          </property>
          <property name="iconSize" >
           <size>
          </property>
          <property name="iconSize" >
           <size>


@@ -77,7 +79,8 @@
           <string>...</string>
          </property>
          <property name="icon" >
           <string>...</string>
          </property>
          <property name="icon" >

-          <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</iconset>
+          <iconset resource="../../icons/icons.qrc" >
+           <normaloff>:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</normaloff>:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</iconset>

          </property>
          <property name="iconSize" >
           <size>
          </property>
          <property name="iconSize" >
           <size>


@@ -92,9 +95,17 @@
      <item>
       <widget class="QTabWidget" name="tabWidget" >
        <property name="currentIndex" >
      <item>
       <widget class="QTabWidget" name="tabWidget" >
        <property name="currentIndex" >

-        <number>0</number>
+        <number>2</number>

        </property>
        <widget class="QWidget" name="generalTab" >
        </property>
        <widget class="QWidget" name="generalTab" >

+        <property name="geometry" >
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>463</width>
+          <height>314</height>
+         </rect>
+        </property>

         <attribute name="title" >
          <string>General</string>
         </attribute>
         <attribute name="title" >
          <string>General</string>
         </attribute>


@@ -162,7 +173,8 @@
                  <string>&amp;Add...</string>
                 </property>
                 <property name="icon" >
                  <string>&amp;Add...</string>
                 </property>
                 <property name="icon" >

-                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+                 <iconset resource="../../icons/icons.qrc" >
+                  <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>

                 </property>
                 <property name="iconSize" >
                  <size>
                 </property>
                 <property name="iconSize" >
                  <size>


@@ -187,7 +199,8 @@
                  <string>Remove</string>
                 </property>
                 <property name="icon" >
                  <string>Remove</string>
                 </property>
                 <property name="icon" >

-                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+                 <iconset resource="../../icons/icons.qrc" >
+                  <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>

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


@@ -206,7 +219,8 @@
                  <string>Re&amp;name...</string>
                 </property>
                 <property name="icon" >
                  <string>Re&amp;name...</string>
                 </property>
                 <property name="icon" >

-                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
+                 <iconset resource="../../icons/icons.qrc" >
+                  <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>

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


@@ -215,16 +229,7 @@
                 <property name="spacing" >
                  <number>6</number>
                 </property>
                 <property name="spacing" >
                  <number>6</number>
                 </property>

-                <property name="leftMargin" >
-                 <number>0</number>
-                </property>
-                <property name="topMargin" >
-                 <number>0</number>
-                </property>
-                <property name="rightMargin" >
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin" >
+                <property name="margin" >

                  <number>0</number>
                 </property>
                 <item>
                  <number>0</number>
                 </property>
                 <item>


@@ -232,7 +237,7 @@
                   <property name="orientation" >
                    <enum>Qt::Horizontal</enum>
                   </property>
                   <property name="orientation" >
                    <enum>Qt::Horizontal</enum>
                   </property>

-                  <property name="sizeHint" >
+                  <property name="sizeHint" stdset="0" >

                    <size>
                     <width>0</width>
                     <height>20</height>
                    <size>
                     <width>0</width>
                     <height>20</height>


@@ -249,7 +254,8 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
                    <string>...</string>
                   </property>
                   <property name="icon" >

-                   <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
+                   <iconset resource="../../icons/icons.qrc" >
+                    <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>

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


@@ -262,7 +268,8 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
                    <string>...</string>
                   </property>
                   <property name="icon" >

-                   <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
+                   <iconset resource="../../icons/icons.qrc" >
+                    <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>

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


@@ -271,7 +278,7 @@
                   <property name="orientation" >
                    <enum>Qt::Horizontal</enum>
                   </property>
                   <property name="orientation" >
                    <enum>Qt::Horizontal</enum>
                   </property>

-                  <property name="sizeHint" >
+                  <property name="sizeHint" stdset="0" >

                    <size>
                     <width>0</width>
                     <height>20</height>
                    <size>
                     <width>0</width>
                     <height>20</height>


@@ -286,7 +293,7 @@
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>

-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >

                  <size>
                   <width>124</width>
                   <height>76</height>
                  <size>
                   <width>124</width>
                   <height>76</height>


@@ -302,28 +309,24 @@
         </layout>
        </widget>
        <widget class="QWidget" name="awayTab" >
         </layout>
        </widget>
        <widget class="QWidget" name="awayTab" >

+        <property name="geometry" >
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>100</width>
+          <height>30</height>
+         </rect>
+        </property>

         <attribute name="title" >
          <string>A&amp;way</string>
         </attribute>
         <layout class="QVBoxLayout" >
          <item>
           <layout class="QGridLayout" >
         <attribute name="title" >
          <string>A&amp;way</string>
         </attribute>
         <layout class="QVBoxLayout" >
          <item>
           <layout class="QGridLayout" >

-           <property name="leftMargin" >
-            <number>0</number>
-           </property>
-           <property name="topMargin" >
-            <number>0</number>
-           </property>
-           <property name="rightMargin" >
-            <number>0</number>
-           </property>
-           <property name="bottomMargin" >
+           <property name="margin" >

             <number>0</number>
            </property>
             <number>0</number>
            </property>

-           <property name="horizontalSpacing" >
-            <number>6</number>
-           </property>
-           <property name="verticalSpacing" >
+           <property name="spacing" >

             <number>6</number>
            </property>
            <item row="0" column="1" >
             <number>6</number>
            </property>
            <item row="0" column="1" >


@@ -385,16 +388,7 @@
             <property name="spacing" >
              <number>6</number>
             </property>
             <property name="spacing" >
              <number>6</number>
             </property>

-            <property name="leftMargin" >
-             <number>8</number>
-            </property>
-            <property name="topMargin" >
-             <number>8</number>
-            </property>
-            <property name="rightMargin" >
-             <number>8</number>
-            </property>
-            <property name="bottomMargin" >
+            <property name="margin" >

              <number>8</number>
             </property>
             <item>
              <number>8</number>
             </property>
             <item>


@@ -402,16 +396,7 @@
               <property name="spacing" >
                <number>6</number>
               </property>
               <property name="spacing" >
                <number>6</number>
               </property>

-              <property name="leftMargin" >
-               <number>0</number>
-              </property>
-              <property name="topMargin" >
-               <number>0</number>
-              </property>
-              <property name="rightMargin" >
-               <number>0</number>
-              </property>
-              <property name="bottomMargin" >
+              <property name="margin" >

                <number>0</number>
               </property>
               <item>
                <number>0</number>
               </property>
               <item>


@@ -436,7 +421,7 @@
                 <property name="orientation" >
                  <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="orientation" >
                  <enum>Qt::Horizontal</enum>
                 </property>

-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >

                  <size>
                   <width>40</width>
                   <height>20</height>
                  <size>
                   <width>40</width>
                   <height>20</height>


@@ -448,22 +433,10 @@
             </item>
             <item>
              <layout class="QGridLayout" >
             </item>
             <item>
              <layout class="QGridLayout" >

-              <property name="leftMargin" >
-               <number>0</number>
-              </property>
-              <property name="topMargin" >
+              <property name="margin" >

                <number>0</number>
               </property>
                <number>0</number>
               </property>

-              <property name="rightMargin" >
-               <number>0</number>
-              </property>
-              <property name="bottomMargin" >
-               <number>0</number>
-              </property>
-              <property name="horizontalSpacing" >
-               <number>6</number>
-              </property>
-              <property name="verticalSpacing" >
+              <property name="spacing" >

                <number>6</number>
               </property>
               <item row="1" column="0" >
                <number>6</number>
               </property>
               <item row="1" column="0" >


@@ -496,7 +469,7 @@
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>

-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >

             <size>
              <width>20</width>
              <height>40</height>
             <size>
              <width>20</width>
              <height>40</height>


@@ -507,6 +480,14 @@
         </layout>
        </widget>
        <widget class="QWidget" name="advancedTab" >
         </layout>
        </widget>
        <widget class="QWidget" name="advancedTab" >

+        <property name="geometry" >
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>463</width>
+          <height>314</height>
+         </rect>
+        </property>

         <attribute name="title" >
          <string>Advanced</string>
         </attribute>
         <attribute name="title" >
          <string>Advanced</string>
         </attribute>


@@ -537,22 +518,10 @@
            <layout class="QVBoxLayout" >
             <item>
              <layout class="QGridLayout" >
            <layout class="QVBoxLayout" >
             <item>
              <layout class="QGridLayout" >

-              <property name="leftMargin" >
-               <number>0</number>
-              </property>
-              <property name="topMargin" >
-               <number>0</number>
-              </property>
-              <property name="rightMargin" >
+              <property name="margin" >

                <number>0</number>
               </property>
                <number>0</number>
               </property>

-              <property name="bottomMargin" >
-               <number>0</number>
-              </property>
-              <property name="horizontalSpacing" >
-               <number>6</number>
-              </property>
-              <property name="verticalSpacing" >
+              <property name="spacing" >

                <number>6</number>
               </property>
               <item row="1" column="0" >
                <number>6</number>
               </property>
               <item row="1" column="0" >


@@ -595,7 +564,7 @@
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>

-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >

             <size>
              <width>20</width>
              <height>40</height>
             <size>
              <width>20</width>
              <height>40</height>


@@ -611,6 +580,36 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

+ <tabstops>
+  <tabstop>identityList</tabstop>
+  <tabstop>renameIdentity</tabstop>
+  <tabstop>addIdentity</tabstop>
+  <tabstop>deleteIdentity</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>realName</tabstop>
+  <tabstop>nicknameList</tabstop>
+  <tabstop>addNick</tabstop>
+  <tabstop>deleteNick</tabstop>
+  <tabstop>renameNick</tabstop>
+  <tabstop>nickUp</tabstop>
+  <tabstop>nickDown</tabstop>
+  <tabstop>awayNick</tabstop>
+  <tabstop>awayReasonEnabled</tabstop>
+  <tabstop>awayReason</tabstop>
+  <tabstop>returnMessageEnabled</tabstop>
+  <tabstop>returnMessage</tabstop>
+  <tabstop>awayNickEnabled</tabstop>
+  <tabstop>autoAwayEnabled</tabstop>
+  <tabstop>autoAwayTime</tabstop>
+  <tabstop>autoReturnMessageEnabled</tabstop>
+  <tabstop>autoAwayReasonEnabled</tabstop>
+  <tabstop>autoReturnMessage</tabstop>
+  <tabstop>autoAwayReason</tabstop>
+  <tabstop>ident</tabstop>
+  <tabstop>kickReason</tabstop>
+  <tabstop>partReason</tabstop>
+  <tabstop>quitReason</tabstop>
+ </tabstops>

  <resources>
   <include location="../../icons/icons.qrc" />
  </resources>
  <resources>
   <include location="../../icons/icons.qrc" />
  </resources>

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index ed530ed..c11c6ad 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -478,7 +478,7 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) {
 
   if(result == &_partBufferAction) {
     BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
 
   if(result == &_partBufferAction) {
     BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();

-    Client::instance()->userInput(bufferInfo, QString("/PART %1").arg(bufferInfo.bufferName()));
+    Client::instance()->userInput(bufferInfo, QString("/PART"));

     return;
   }
   
     return;
   }