Various smaller stuff, some parts of the new identity settingspage, plus Quassel

now understands -p <port> to let the core listen to a different port than the
standard 4242.

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index b444efe..cb57658 100644 (file)
--- a/Quassel.kdevelop.filelist
+++ b/Quassel.kdevelop.filelist
@@ -29,8 +29,6 @@ src
 src/client
 src/client/buffer.cpp
 src/client/buffer.h
-src/client/buffertreemodel.cpp
-src/client/buffertreemodel.h
 src/client/client.cpp
 src/client/client.h
 src/client/client.pri
@@ -166,6 +164,8 @@ src/qtui/settingsdlg.h
 src/qtui/settingspages
 src/qtui/settingspages.cpp
 src/qtui/settingspages.h
+src/qtui/settingspages/identitiessettingspage.cpp
+src/qtui/settingspages/identitiessettingspage.h
 src/qtui/settingspages/settingspages.pri
 src/qtui/topicwidget.cpp
 src/qtui/topicwidget.h

diff --git a/build/targets/target.pri b/build/targets/target.pri
index 764bace..1441f63 100644 (file)
--- a/build/targets/target.pri
+++ b/build/targets/target.pri
@@ -3,8 +3,8 @@ TEMPLATE = app
 include(../buildconf.pri)
 
 RESOURCES   *= ../../i18n/i18n.qrc
-TRANSLATIONS = quassel_de.ts \
-               quassel_da.ts
+TRANSLATIONS = quassel_da.ts \
+               quassel_de.ts
 
 SRCPATH = ../../src
 OBJECTS_DIR = .$$TARGET

diff --git a/i18n/quassel_de.qm b/i18n/quassel_de.qm
index dbfafb6..39d37d0 100644 (file)
Binary files a/i18n/quassel_de.qm and b/i18n/quassel_de.qm differ

diff --git a/i18n/quassel_de.ts b/i18n/quassel_de.ts
index 6f15e92..7335a4e 100644 (file)
--- a/i18n/quassel_de.ts
+++ b/i18n/quassel_de.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
+<defaultcodec></defaultcodec>
 <context>
     <name>AboutDlg</name>
     <message>
@@ -1351,7 +1352,7 @@ Networks using this identity will be reset to use the default identity.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context encoding="UTF-8">
+<context>
     <name>MainWidget</name>
     <message>
         <location filename="../src/qtopia/ui/mainwidget.ui" line="13"/>
@@ -1464,7 +1465,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="209"/>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Trennen</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="142"/>
@@ -1906,9 +1907,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Server</name>
-</context>
 <context>
     <name>ServerEditDlg</name>
     <message>
@@ -1993,9 +1991,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>SignalProxy</name>
-</context>
 <context>
     <name>SqliteStorage</name>
     <message>

diff --git a/src/common/global.cpp b/src/common/global.cpp
index 9ecef3c..53178df 100644 (file)
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -57,3 +57,5 @@ void Global::initIconMap() {
 //}
 
 Global::RunMode Global::runMode;
+uint Global::defaultPort;
+

diff --git a/src/common/global.h b/src/common/global.h
index 4b337d5..da53185 100644 (file)
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -30,13 +30,14 @@
 /** The protocol version we use fo the communication between core and GUI */
 #define GUI_PROTOCOL 3
 
-#define DEFAULT_PORT 4242
+//#define DEFAULT_PORT 4242
 
 /* Some global stuff */
 
 namespace Global {
   enum RunMode { Monolithic, ClientOnly, CoreOnly };
   extern RunMode runMode;
+  extern unsigned int defaultPort;
 }
 
 #endif

diff --git a/src/common/main.cpp b/src/common/main.cpp
index f6da8f5..9f6f066 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -65,6 +65,7 @@ int main(int argc, char **argv) {
   qRegisterMetaTypeStreamOperators<Message>("Message");
   qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
 
+
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
@@ -86,6 +87,16 @@ int main(int argc, char **argv) {
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel IRC Development Team");  // FIXME
 
+  // Check if a non-standard core port is requested
+  QStringList args = QCoreApplication::arguments();
+
+  Global::defaultPort = 4242;
+  int idx;
+  if((idx = args.indexOf("-p")) > 0 && idx < args.count() - 1) {
+    int port = args[idx+1].toInt();
+    if(port >= 1024 && port < 65536) Global::defaultPort = port;
+  }
+
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif

diff --git a/src/core/core.h b/src/core/core.h
index fc20772..1ceaec4 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -50,7 +50,7 @@ class Core : public QObject {
     static void restoreState();
 
   private slots:
-    bool startListening(uint port = DEFAULT_PORT);
+    bool startListening(uint port = Global::defaultPort);
     void stopListening();
     void incomingConnection();
     void clientHasData();

diff --git a/src/core/coresettings.h b/src/core/coresettings.h
index ea1b51b..7b958b9 100644 (file)
--- a/src/core/coresettings.h
+++ b/src/core/coresettings.h
@@ -34,7 +34,7 @@ class CoreSettings : public Settings {
     QVariant databaseSettings(const QVariant &def = QVariant());
 
     void setPort(const uint &port);
-    uint port(const uint &def = DEFAULT_PORT);
+    uint port(const uint &def = Global::defaultPort);
 
     void setCoreState(const QVariant &data);
     QVariant coreState(const QVariant &def = QVariant());

diff --git a/src/qtopia/coreconnectdlg.cpp b/src/qtopia/coreconnectdlg.cpp
index 860f43e..cb23d52 100644 (file)
--- a/src/qtopia/coreconnectdlg.cpp
+++ b/src/qtopia/coreconnectdlg.cpp
@@ -169,7 +169,7 @@ EditCoreAcctDlg::EditCoreAcctDlg(QString accname, QDialog *parent) : QDialog(par
 
   ui.accountEdit->setText(accountName());
   if(accName.isEmpty()) {
-    ui.port->setValue(DEFAULT_PORT);
+    ui.port->setValue(Global::defaultPort);
     ui.accountEdit->setFocus();
   } else {
     ui.hostEdit->setFocus();

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index 6388058..68b2ef1 100644 (file)
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -47,6 +47,7 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
   qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
 
   Global::runMode = Global::ClientOnly;
+  Global::defaultPort = 4242;
 
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 3ba9c29..7e112db 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -71,7 +71,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo
     if(!newacc.isEmpty()) {
       ui.accountList->addItem(newacc);
       ui.hostEdit->setText("localhost");
-      ui.port->setValue(DEFAULT_PORT);
+      ui.port->setValue(Global::defaultPort);
       ui.internalCore->setChecked(false);
       setAccountEditEnabled(true);
     }

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 5e97426..940fbb4 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -36,6 +36,7 @@
 #include "mappedselectionmodel.h"
 
 #include "settingspages/fontssettingspage.h"
+#include "settingspages/identitiessettingspage.h"
 
 #include "debugconsole.h"
 
@@ -133,7 +134,6 @@ void MainWin::init() {
 
   //showSettingsDlg();
 
-
 }
 
 MainWin::~MainWin() {
@@ -198,6 +198,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model,
 
 void MainWin::setupSettingsDlg() {
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+  settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
 
 }
 

diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
index 3945cd1..1750fa4 100644 (file)
--- a/src/qtui/settingsdlg.cpp
+++ b/src/qtui/settingsdlg.cpp
@@ -47,7 +47,7 @@ void SettingsDlg::registerSettingsPage(SettingsPage *sp) {
   pages[QString("%1$%2").arg(sp->category(), sp->title())] = sp;
   updateGeometry();
   // TESTING
-  //selectPage(sp->category(), sp->title());
+  selectPage(sp->category(), sp->title());
 }
 
 void SettingsDlg::selectPage(const QString &cat, const QString &title) {

diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
new file mode 100644 (file)
index 0000000..a961712
--- /dev/null
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -0,0 +1,45 @@
+/***************************************************************************
+ *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "identitiessettingspage.h"
+
+IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
+  : SettingsPage(tr("General"), tr("Identities"), parent) {
+
+  ui.setupUi(this);
+
+
+}
+
+bool IdentitiesSettingsPage::hasChanged() const {
+
+}
+
+void IdentitiesSettingsPage::save() {
+
+}
+
+void IdentitiesSettingsPage::load() {
+
+}
+
+void IdentitiesSettingsPage::defaults() {
+
+}

diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h
new file mode 100644 (file)
index 0000000..5d6dd23
--- /dev/null
+++ b/src/qtui/settingspages/identitiessettingspage.h
@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _IDENTITIESSETTINGSPAGE_H_
+#define _IDENTITIESSETTINGSPAGE_H_
+
+#include "settingspage.h"
+
+#include "ui_identitiessettingspage.h"
+
+class IdentitiesSettingsPage : public SettingsPage {
+  Q_OBJECT
+
+  public:
+    IdentitiesSettingsPage(QWidget *parent = 0);
+
+    bool hasChanged() const;
+
+  public slots:
+    void save();
+    void load();
+    void defaults();
+
+  private:
+    Ui::IdentitiesSettingsPage ui;
+
+};
+
+#endif

diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui
new file mode 100644 (file)
index 0000000..0a22167
--- /dev/null
+++ b/src/qtui/settingspages/identitiessettingspage.ui
@@ -0,0 +1,589 @@
+<ui version="4.0" >
+ <class>IdentitiesSettingsPage</class>
+ <widget class="QWidget" name="IdentitiesSettingsPage" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>422</width>
+    <height>380</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QComboBox" name="comboBox" />
+     </item>
+     <item>
+      <widget class="QToolButton" name="addIdentity" >
+       <property name="text" >
+        <string>Add...</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-add-user.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
+       <property name="toolButtonStyle" >
+        <enum>Qt::ToolButtonIconOnly</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="renameIdentity" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/user-properties.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="deleteIdentity" >
+       <property name="text" >
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>22</width>
+         <height>22</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="generalTab" >
+      <attribute name="title" >
+       <string>General</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <item>
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLabel" name="label" >
+           <property name="text" >
+            <string>Real Name:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="realName" />
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Nicknames</string>
+         </property>
+         <layout class="QHBoxLayout" >
+          <item>
+           <widget class="QListWidget" name="nicknameList" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+              <horstretch>1</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" >
+            <item>
+             <layout class="QVBoxLayout" >
+              <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" >
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QPushButton" name="addNick" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text" >
+                 <string>&amp;Add...</string>
+                </property>
+                <property name="icon" >
+                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+                </property>
+                <property name="iconSize" >
+                 <size>
+                  <width>16</width>
+                  <height>16</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="renameNick" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text" >
+                 <string>Re&amp;name...</string>
+                </property>
+                <property name="icon" >
+                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="deleteNick" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text" >
+                 <string>De&amp;lete</string>
+                </property>
+                <property name="icon" >
+                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" >
+                <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" >
+                 <number>0</number>
+                </property>
+                <item>
+                 <spacer>
+                  <property name="orientation" >
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" >
+                   <size>
+                    <width>0</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item>
+                 <widget class="QToolButton" name="upNick" >
+                  <property name="toolTip" >
+                   <string>Move upwards in list</string>
+                  </property>
+                  <property name="text" >
+                   <string>...</string>
+                  </property>
+                  <property name="icon" >
+                   <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QToolButton" name="downNick" >
+                  <property name="toolTip" >
+                   <string>Move downwards in list</string>
+                  </property>
+                  <property name="text" >
+                   <string>...</string>
+                  </property>
+                  <property name="icon" >
+                   <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation" >
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" >
+                   <size>
+                    <width>0</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <spacer>
+                <property name="orientation" >
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" >
+                 <size>
+                  <width>20</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" >
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="awayTab" >
+      <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" >
+          <number>0</number>
+         </property>
+         <property name="horizontalSpacing" >
+          <number>6</number>
+         </property>
+         <property name="verticalSpacing" >
+          <number>6</number>
+         </property>
+         <item row="0" column="1" >
+          <widget class="QLineEdit" name="awayNick" />
+         </item>
+         <item row="1" column="0" >
+          <widget class="QCheckBox" name="enableAwayReason" >
+           <property name="text" >
+            <string>Away Reason</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" >
+          <widget class="QLineEdit" name="awayReason" />
+         </item>
+         <item row="2" column="0" >
+          <widget class="QCheckBox" name="enableReturnMessage" >
+           <property name="text" >
+            <string>Return Message</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1" >
+          <widget class="QLineEdit" name="returnMessage" />
+         </item>
+         <item row="0" column="0" >
+          <widget class="QCheckBox" name="enableAwayNick" >
+           <property name="text" >
+            <string>Away Nick</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="autoAway" >
+         <property name="title" >
+          <string>Auto Away</string>
+         </property>
+         <property name="checkable" >
+          <bool>true</bool>
+         </property>
+         <property name="checked" >
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" >
+          <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" >
+           <number>8</number>
+          </property>
+          <item>
+           <layout class="QHBoxLayout" >
+            <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" >
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="autoAwayLabel_1" >
+              <property name="text" >
+               <string>Auto away after</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="autoAwayTime" />
+            </item>
+            <item>
+             <widget class="QLabel" name="autoAwayLabel_2" >
+              <property name="text" >
+               <string>minutes</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <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" >
+             <number>0</number>
+            </property>
+            <property name="horizontalSpacing" >
+             <number>6</number>
+            </property>
+            <property name="verticalSpacing" >
+             <number>6</number>
+            </property>
+            <item row="1" column="0" >
+             <widget class="QCheckBox" name="enableAutoAwayReturn" >
+              <property name="text" >
+               <string>Return Message</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0" >
+             <widget class="QCheckBox" name="enableAutoAwayReason" >
+              <property name="text" >
+               <string>Away Reason</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1" >
+             <widget class="QLineEdit" name="autoAwayReturn" />
+            </item>
+            <item row="0" column="1" >
+             <widget class="QLineEdit" name="autoAwayReason" />
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="advancedTab" >
+      <attribute name="title" >
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <item>
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLabel" name="label_2" >
+           <property name="text" >
+            <string>Ident:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="ident" />
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_3" >
+         <property name="title" >
+          <string>Messages</string>
+         </property>
+         <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" >
+             <number>0</number>
+            </property>
+            <property name="horizontalSpacing" >
+             <number>6</number>
+            </property>
+            <property name="verticalSpacing" >
+             <number>6</number>
+            </property>
+            <item row="1" column="0" >
+             <widget class="QLabel" name="label_3" >
+              <property name="text" >
+               <string>Part Reason:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1" >
+             <widget class="QLineEdit" name="partReason" />
+            </item>
+            <item row="0" column="1" >
+             <widget class="QLineEdit" name="kickReason" />
+            </item>
+            <item row="2" column="0" >
+             <widget class="QLabel" name="label_5" >
+              <property name="text" >
+               <string>Quit Reason:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1" >
+             <widget class="QLineEdit" name="quitReason" />
+            </item>
+            <item row="0" column="0" >
+             <widget class="QLabel" name="label_4" >
+              <property name="text" >
+               <string>Kick Reason:</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../icons/icons.qrc" />
+ </resources>
+ <connections/>
+</ui>

diff --git a/src/qtui/settingspages/settingspages.pri b/src/qtui/settingspages/settingspages.pri
index 01a7841..8aec6ed 100644 (file)
--- a/src/qtui/settingspages/settingspages.pri
+++ b/src/qtui/settingspages/settingspages.pri
@@ -1,4 +1,4 @@
-SETTINGSPAGES = fonts
+SETTINGSPAGES = fonts identities
 
 # Specify additional files here!
 

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 4a92932..5d5e5ad 100644 (file)
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -46,7 +46,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>22</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuConnection" >
@@ -170,6 +170,9 @@
    </property>
   </action>
   <action name="actionSettingsDlg" >
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/configure.png</iconset>
+   </property>
    <property name="text" >
     <string>Configure Quassel...</string>
    </property>
@@ -244,7 +247,9 @@
    <header>bufferwidget.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../icons/icons.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>actionQuit</sender>