From: Manuel Nickschas Date: Sun, 3 Feb 2008 14:38:04 +0000 (+0000) Subject: Added some new attributes to NetworkInfo. Note that these are not used yet. X-Git-Tag: 0.2.0-alpha1~130 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=61f42c7c9d0e5428512287f97ded31448741f2da Added some new attributes to NetworkInfo. Note that these are not used yet. --- diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h index 1087fce6..3b03c4c9 100644 --- a/src/client/clientsettings.h +++ b/src/client/clientsettings.h @@ -33,6 +33,8 @@ class ClientSettings : public Settings { }; +// TODO accountid, account-specific settings + class CoreAccountSettings : public ClientSettings { public: diff --git a/src/common/network.h b/src/common/network.h index 25b02bc7..19694302 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -239,9 +239,25 @@ struct NetworkInfo { NetworkId networkId; QString networkName; IdentityId identity; + + bool useCustomEncodings; QByteArray codecForEncoding; QByteArray codecForDecoding; + + // Server entry: QString "Host", uint "Port", QString "Password", bool "UseSSL" QVariantList serverList; + bool useRandomServer; + + QStringList perform; + + bool useAutoIdentify; + QString autoIdentifyService; + QString autoIdentifyPassword; + + bool useAutoReconnect; + quint32 autoReconnectInterval; + qint16 autoReconnectRetries; // -1 => Unlimited + bool rejoinChannels; bool operator==(const NetworkInfo &other) const; bool operator!=(const NetworkInfo &other) const; diff --git a/src/qtui/guisettings.cpp b/src/qtui/guisettings.cpp deleted file mode 100644 index 88f169a7..00000000 --- a/src/qtui/guisettings.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * - * 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) version 3. * - * * - * 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 "guisettings.h" - -GuiSettings::GuiSettings() : ClientSettings("GUI") { - - -} diff --git a/src/qtui/guisettings.h b/src/qtui/guisettings.h deleted file mode 100644 index 529a2270..00000000 --- a/src/qtui/guisettings.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * - * 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) version 3. * - * * - * 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 _GUISETTINGS_H_ -#define _GUISETTINGS_H_ - -#include "clientsettings.h" - -class GuiSettings : public ClientSettings { - - public: - GuiSettings(); - - -}; - -class GuiProfile : public ClientSettings { - - public: - GuiProfile(); - - static QStringList availableProfiles(); - static GuiProfile *profile(QString name); - - - -}; - -#endif diff --git a/src/qtui/qtui.pri b/src/qtui/qtui.pri index bffc1088..d1d6da2a 100644 --- a/src/qtui/qtui.pri +++ b/src/qtui/qtui.pri @@ -1,14 +1,13 @@ DEPMOD = uisupport common client QT_MOD = core gui network -SRCS += bufferwidget.cpp chatline-old.cpp \ - chatwidget.cpp coreconnectdlg.cpp configwizard.cpp \ - guisettings.cpp mainwin.cpp nicklistwidget.cpp qtui.cpp qtuistyle.cpp settingsdlg.cpp settingspagedlg.cpp \ - topicwidget.cpp debugconsole.cpp inputwidget.cpp verticaldock.cpp +SRCS += bufferwidget.cpp chatline-old.cpp chatwidget.cpp coreconnectdlg.cpp configwizard.cpp debugconsole.cpp inputwidget.cpp \ + mainwin.cpp nicklistwidget.cpp qtui.cpp qtuistyle.cpp settingsdlg.cpp settingspagedlg.cpp \ + topicwidget.cpp verticaldock.cpp -HDRS += bufferwidget.h chatline-old.h chatwidget.h configwizard.h \ +HDRS += bufferwidget.h chatline-old.h chatwidget.h configwizard.h debugconsole.h inputwidget.h \ coreconnectdlg.h mainwin.h nicklistwidget.h qtui.h qtuistyle.h settingsdlg.h settingspagedlg.h \ - topicwidget.h debugconsole.h inputwidget.h verticaldock.h + topicwidget.h verticaldock.h FORMNAMES = mainwin.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \ settingspagedlg.ui topicwidget.ui debugconsole.ui inputwidget.ui diff --git a/version.inc b/version.inc index 4a3ac035..5b7a434a 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-pre"; quasselDate = "2008-02-03"; - quasselBuild = 447; + quasselBuild = 449; //! Minimum client build number the core needs clientBuildNeeded = 437;