From d1f2e1324046ad4108d30434c92fc0a2d688ef09 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 2 Jan 2008 17:27:29 +0000 Subject: [PATCH] Various smaller stuff, some parts of the new identity settingspage, plus Quassel now understands -p to let the core listen to a different port than the standard 4242. --- Quassel.kdevelop.filelist | 4 +- build/targets/target.pri | 4 +- i18n/quassel_de.qm | Bin 28880 -> 28864 bytes i18n/quassel_de.ts | 11 +- src/common/global.cpp | 2 + src/common/global.h | 3 +- src/common/main.cpp | 11 + src/core/core.h | 2 +- src/core/coresettings.h | 2 +- src/qtopia/coreconnectdlg.cpp | 2 +- src/qtopia/qtopiamainwin.cpp | 1 + src/qtui/coreconnectdlg.cpp | 2 +- src/qtui/mainwin.cpp | 3 +- src/qtui/settingsdlg.cpp | 2 +- .../settingspages/identitiessettingspage.cpp | 45 ++ .../settingspages/identitiessettingspage.h | 46 ++ .../settingspages/identitiessettingspage.ui | 589 ++++++++++++++++++ src/qtui/settingspages/settingspages.pri | 2 +- src/qtui/ui/mainwin.ui | 9 +- 19 files changed, 718 insertions(+), 22 deletions(-) create mode 100644 src/qtui/settingspages/identitiessettingspage.cpp create mode 100644 src/qtui/settingspages/identitiessettingspage.h create mode 100644 src/qtui/settingspages/identitiessettingspage.ui diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist index b444efe9..cb57658f 100644 --- 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 764bacec..1441f63c 100644 --- 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 dbfafb6a1102755709f75aadfa00a4e0d945c559..39d37d07635559683d4c164c88723e534c682acd 100644 GIT binary patch delta 5680 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 K7>;^={eJ;^Jg*D@ delta 5610 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 dQVq_jDYe*<;kEb + AboutDlg @@ -1351,7 +1352,7 @@ Networks using this identity will be reset to use the default identity. - + MainWidget @@ -1464,7 +1465,7 @@ p, li { white-space: pre-wrap; } Disconnect - + Trennen @@ -1906,9 +1907,6 @@ p, li { white-space: pre-wrap; } - - Server - ServerEditDlg @@ -1993,9 +1991,6 @@ p, li { white-space: pre-wrap; } - - SignalProxy - SqliteStorage diff --git a/src/common/global.cpp b/src/common/global.cpp index 9ecef3c6..53178dff 100644 --- 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 4b337d5c..da531859 100644 --- 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 f6da8f57..9f6f066b 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -65,6 +65,7 @@ int main(int argc, char **argv) { qRegisterMetaTypeStreamOperators("Message"); qRegisterMetaTypeStreamOperators("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 fc20772c..1ceaec44 100644 --- 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 ea1b51b0..7b958b93 100644 --- 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 860f43e8..cb23d520 100644 --- 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 63880587..68b2ef1e 100644 --- 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"); 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 3ba9c297..7e112db2 100644 --- 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 5e97426f..940fbb46 100644 --- 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 3945cd15..1750fa47 100644 --- 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 index 00000000..a961712a --- /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 index 00000000..5d6dd232 --- /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 index 00000000..0a221675 --- /dev/null +++ b/src/qtui/settingspages/identitiessettingspage.ui @@ -0,0 +1,589 @@ + + IdentitiesSettingsPage + + + + 0 + 0 + 422 + 380 + + + + Form + + + + + + + + + + + Add... + + + :/22x22/actions/oxygen/22x22/actions/list-add-user.png + + + + 22 + 22 + + + + Qt::ToolButtonIconOnly + + + + + + + ... + + + :/22x22/actions/oxygen/22x22/actions/user-properties.png + + + + 22 + 22 + + + + + + + + ... + + + :/22x22/actions/oxygen/22x22/actions/list-remove-user.png + + + + 22 + 22 + + + + + + + + + + 0 + + + + General + + + + + + + + Real Name: + + + + + + + + + + + + Nicknames + + + + + + + 1 + 0 + + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + &Add... + + + :/16x16/actions/oxygen/16x16/actions/list-add.png + + + + 16 + 16 + + + + + + + + + 0 + 0 + + + + Re&name... + + + :/16x16/actions/oxygen/16x16/actions/edit-rename.png + + + + + + + + 0 + 0 + + + + De&lete + + + :/16x16/actions/oxygen/16x16/actions/edit-delete.png + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 0 + 20 + + + + + + + + Move upwards in list + + + ... + + + :/16x16/actions/oxygen/16x16/actions/go-up.png + + + + + + + Move downwards in list + + + ... + + + :/16x16/actions/oxygen/16x16/actions/go-down.png + + + + + + + Qt::Horizontal + + + + 0 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + A&way + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + + + + Away Reason + + + + + + + + + + Return Message + + + + + + + + + + Away Nick + + + + + + + + + Auto Away + + + true + + + false + + + + 6 + + + 8 + + + 8 + + + 8 + + + 8 + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Auto away after + + + + + + + + + + minutes + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + Return Message + + + + + + + Away Reason + + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Advanced + + + + + + + + Ident: + + + + + + + + + + + + Messages + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + + + Part Reason: + + + + + + + + + + + + + Quit Reason: + + + + + + + + + + Kick Reason: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + diff --git a/src/qtui/settingspages/settingspages.pri b/src/qtui/settingspages/settingspages.pri index 01a78418..8aec6ed3 100644 --- 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 4a92932f..5d5e5adf 100644 --- a/src/qtui/ui/mainwin.ui +++ b/src/qtui/ui/mainwin.ui @@ -46,7 +46,7 @@ 0 0 800 - 22 + 26 @@ -170,6 +170,9 @@ + + :/16x16/actions/oxygen/16x16/actions/configure.png + Configure Quassel... @@ -244,7 +247,9 @@
bufferwidget.h
- + + + actionQuit -- 2.20.1