From: Manuel Nickschas Date: Fri, 8 Feb 2008 21:26:44 +0000 (+0000) Subject: Added a shiny new AboutDlg X-Git-Tag: 0.2.0-alpha1~91 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=42ed32344cdfcf2c4cd164ebd09782d7923b6547 Added a shiny new AboutDlg --- diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist index b6626fa9..b3cad7bd 100644 --- a/Quassel.kdevelop.filelist +++ b/Quassel.kdevelop.filelist @@ -138,6 +138,8 @@ src/qtopia/ui/editcoreacctdlg.ui src/qtopia/ui/mainwidget.ui src/qtopia/ui/nicklistwidget.ui src/qtui +src/qtui/aboutdlg.cpp +src/qtui/aboutdlg.h src/qtui/bufferwidget.cpp src/qtui/bufferwidget.h src/qtui/chatitem.cpp diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp new file mode 100644 index 00000000..32a23c3c --- /dev/null +++ b/src/qtui/aboutdlg.cpp @@ -0,0 +1,92 @@ +/*************************************************************************** + * 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) 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 "aboutdlg.h" +#include "global.h" + +AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent) { + ui.setupUi(this); + + ui.versionLabel->setText(QString("Version %1, Build >= %2 (%3)").arg(Global::quasselVersion).arg(Global::quasselBuild).arg(Global::quasselDate)); + ui.aboutTextBrowser->setHtml(about()); + ui.authorTextBrowser->setHtml(authors()); + ui.contributorTextBrowser->setHtml(contributors()); + ui.thanksToTextBrowser->setHtml(thanksTo()); + +} + +QString AboutDlg::about() const { + QString res; + res = tr("A modern, distributed IRC Client

" + "©2005-2008 by the Quassel Project
" + "http://quassel-irc.org
" + "#quassel on Freenode

" + "Quassel IRC is dual-licensed under GPLv2 and " + "GPLv3.
" + "Most icons are © by the Oxygen Team and used under the " + "LGPL.

" + "Please use http://bugs.quassel-irc.org to report bugs." + ); + + return res; +} + +QString AboutDlg::authors() const { + QString res; + res = tr("Quassel IRC is mainly developed by:") + + "
" + "
Manuel \"Sputnick\" Nickschas
sput@quassel-irc.org
" + "Project Founder, Lead Developer

" + "
Marcus \"EgS\" Eggenberger
egs@quassel-irc.org
" + "Project Motivator, Lead Developer, Mac Maintainer

" + "
Alexander \"phon\" von Renteln
alex@phon.name
" + "Developer, Windows Maintainer
" + "
"; + + return res; +} + +QString AboutDlg::contributors() const { + QString res; + res = tr("We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:") + "
" + "
" + "
Marco \"kaffeedoktor\" Genise
kaffeedoktor@quassel-irc.org
" + "Ideas, Hacking, Motivation

" + "
Jonas \"Dante\" Heese
Project Founder, ebuilder

" + "
Daniel \"son\" Steinmetz
Early Beta Tester and Bughunter (on Vista™!)

" + "
Adam \"adamt\" Tulinius
Early Beta Tester and Bughunter, Danish Translation

" + "
Pavel \"int\" Volkovitskiy
Early Beta Tester and Bughunter

" + "
"; + + return res; +} + +QString AboutDlg::thanksTo() const { + QString res; + res = tr("Special thanks goes to:
" + "
" + "
The Oxygen Team
" + "
for creating most of the shiny icons you see throughout Quassel

" + "
Trolltech
" + "
for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more
" + ); + + return res; +} diff --git a/src/qtui/aboutdlg.h b/src/qtui/aboutdlg.h new file mode 100644 index 00000000..d0141536 --- /dev/null +++ b/src/qtui/aboutdlg.h @@ -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) 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 ABOUTDLG_H_ +#define ABOUTDLG_H_ + +#include + +#include "ui_aboutdlg.h" + +class AboutDlg : public QDialog { + Q_OBJECT + + public: + AboutDlg(QWidget *parent = 0); + + private: + Ui::AboutDlg ui; + + QString about() const; + QString authors() const; + QString contributors() const; + QString thanksTo() const; + +}; + + +#endif diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index e9bb5512..e977c6f7 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -21,6 +21,7 @@ #include "mainwin.h" +#include "aboutdlg.h" #include "chatwidget.h" #include "bufferview.h" #include "chatline-old.h" @@ -104,7 +105,8 @@ void MainWin::init() { ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); #ifdef SPUTDEV - showSettingsDlg(); + //showSettingsDlg(); + //showAboutDlg(); #endif } @@ -123,6 +125,7 @@ void MainWin::setupMenus() { //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList())); connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole())); + connect(ui.actionAboutQuassel, SIGNAL(triggered()), this, SLOT(showAboutDlg())); connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this); @@ -335,6 +338,11 @@ void MainWin::showDebugConsole() { debugConsole->show(); } +void MainWin::showAboutDlg() { + AboutDlg dlg(this); + dlg.exec(); +} + void MainWin::closeEvent(QCloseEvent *event) { QtUiSettings s; if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) { diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index a78832d8..0e915cfc 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -63,6 +63,7 @@ class MainWin : public QMainWindow { private slots: void showSettingsDlg(); void showNetworkDlg(); + void showAboutDlg(); void showDebugConsole(); void showCoreConnectionDlg(bool autoConnect = false); diff --git a/src/qtui/qtui.pri b/src/qtui/qtui.pri index d7f0f834..f4304ed1 100644 --- a/src/qtui/qtui.pri +++ b/src/qtui/qtui.pri @@ -1,15 +1,15 @@ DEPMOD = uisupport common client QT_MOD = core gui network -SRCS += bufferwidget.cpp chatline-old.cpp chatwidget.cpp coreconfigwizard.cpp coreconnectdlg.cpp configwizard.cpp debugconsole.cpp inputwidget.cpp \ +SRCS += aboutdlg.cpp bufferwidget.cpp chatline-old.cpp chatwidget.cpp coreconfigwizard.cpp coreconnectdlg.cpp configwizard.cpp debugconsole.cpp inputwidget.cpp \ mainwin.cpp nicklistwidget.cpp qtui.cpp qtuisettings.cpp qtuistyle.cpp settingsdlg.cpp settingspagedlg.cpp \ topicwidget.cpp verticaldock.cpp -HDRS += bufferwidget.h chatline-old.h chatwidget.h coreconfigwizard.h configwizard.h debugconsole.h inputwidget.h \ +HDRS += aboutdlg.h bufferwidget.h chatline-old.h chatwidget.h coreconfigwizard.h configwizard.h debugconsole.h inputwidget.h \ coreconnectdlg.h mainwin.h nicklistwidget.h qtui.h qtuisettings.h qtuistyle.h settingsdlg.h settingspagedlg.h \ topicwidget.h verticaldock.h -FORMNAMES = mainwin.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \ +FORMNAMES = aboutdlg.ui mainwin.ui coreaccounteditdlg.ui coreconnectdlg.ui bufferviewwidget.ui bufferwidget.ui nicklistwidget.ui settingsdlg.ui \ settingspagedlg.ui topicwidget.ui debugconsole.ui inputwidget.ui \ coreconfigwizardintropage.ui coreconfigwizardadminuserpage.ui coreconfigwizardstorageselectionpage.ui coreconfigwizardsyncpage.ui diff --git a/src/qtui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui index 7448a6ca..17d6668e 100644 --- a/src/qtui/ui/aboutdlg.ui +++ b/src/qtui/ui/aboutdlg.ui @@ -8,85 +8,197 @@ 0 0 - 618 - 415 + 488 + 450 About Quassel - - - - 10 - 10 - 351 - 20 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + background:white; + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + + + + + + + :/icons/quassel-icon.png + + + false + + + + + + + 10 + + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Quassel IRC</p></body></html> + + + Qt::AutoText + + + + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Quassel IRC </span>(pre-release)</p></body></html> - - - - - - 200 - 360 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Close - - - - - - 20 - 40 - 581 - 301 - - - - 0 - - - - About - - - - - Authors - - - - - Licence Agreement - - - - - 10 - 10 - 561 - 251 - +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Version 0.2.0-pre, Build &gt;= 474 (2008-02-08)</p></body></html> + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + 0 + + + + &About + + + + + + QTextBrowser { background:transparent;} + + + QFrame::NoFrame + + + true + + + + + + + + A&uthors + + + + + + QTextBrowser { background:transparent;} + + + QFrame::NoFrame + + + true + + + + + + + + &Contributors + + + + + + QTextBrowser { background:transparent;} + + + QFrame::NoFrame + + + true + + + + + + + + &Thanks To + + + + + + QTextBrowser { background:transparent;} + + + QFrame::NoFrame + + + true + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close - - + + - + + + buttonBox diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui index 2152eb8b..8c55c8ac 100644 --- a/src/qtui/ui/mainwin.ui +++ b/src/qtui/ui/mainwin.ui @@ -202,7 +202,7 @@ - false + true :/icons/quassel-icon.png diff --git a/version.inc b/version.inc index d15b87de..129a7b33 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-pre"; quasselDate = "2008-02-08"; - quasselBuild = 486; + quasselBuild = 489; //! Minimum client build number the core needs clientBuildNeeded = 480;