← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/quassel/jaunty-backports

~ubuntu-branches/ubuntu/jaunty/quassel/jaunty-backports

« back to all changes in this revision

Viewing changes to src/qtui/settingspages/generalsettingspage.cpp

Committer: Bazaar Package Importer
Author(s): Scott Kitterman
Date: 2009-01-14 01:28:49 UTC
mfrom: (1.1.5 upstream)
Revision ID: james.westby@ubuntu.com-20090114012849-38celzez3y3wpai9

Tags: 0.4.0~git090113-0ubuntu1

* New upstream git snapshot
  - Use networks.ini to provide default network/channel
  - Provide presets for common IRC networks
* Add kubuntu_01_default_network_channel.patch to set Freenode, port
  8001, and #kubuntu as defaults
* Add build-dep on quilt

files added:
data/networks.ini

debian/patches

debian/patches/kubuntu_01_default_network_channel.patch

debian/patches/series

scripts/convert_mirc_servers_ini.pl

src/qtui/settingspages/networkadddlg.ui

files modified:
data/CMakeLists.txt

debian/changelog

debian/control

debian/quassel-data.install

src/client/abstractmessageprocessor.cpp

src/client/abstractmessageprocessor.h

src/client/backlogrequester.cpp

src/client/backlogrequester.h

src/client/backlogsettings.h

src/client/buffermodel.cpp

src/client/buffermodel.h

src/client/buffersettings.cpp

src/client/buffersettings.h

src/client/client.cpp

src/client/client.h

src/client/clientbacklogmanager.cpp

src/client/clientbacklogmanager.h

src/client/clientcoreinfo.h

src/client/clientidentity.cpp

src/client/clientidentity.h

src/client/clientirclisthelper.cpp

src/client/clientirclisthelper.h

src/client/clientsettings.cpp

src/client/clientsettings.h

src/client/clientsyncer.cpp

src/client/clientsyncer.h

src/client/irclistmodel.cpp

src/client/irclistmodel.h

src/client/messagefilter.cpp

src/client/messagefilter.h

src/client/messagemodel.cpp

src/client/messagemodel.h

src/client/modelpropertymapper.cpp

src/client/modelpropertymapper.h

src/client/networkmodel.cpp

src/client/networkmodel.h

src/client/quasselui.cpp

src/client/quasselui.h

src/client/selectionmodelsynchronizer.cpp

src/client/selectionmodelsynchronizer.h

src/client/treemodel.cpp

src/client/treemodel.h

src/common/abstractcliparser.h

src/common/aliasmanager.cpp

src/common/aliasmanager.h

src/common/backlogmanager.cpp

src/common/backlogmanager.h

src/common/bufferinfo.cpp

src/common/bufferinfo.h

src/common/buffersyncer.cpp

src/common/buffersyncer.h

src/common/bufferviewconfig.cpp

src/common/bufferviewconfig.h

src/common/bufferviewmanager.cpp

src/common/bufferviewmanager.h

src/common/cliparser.cpp

src/common/cliparser.h

src/common/coreinfo.h

src/common/genversion.cpp

src/common/identity.cpp

src/common/identity.h

src/common/ircchannel.cpp

src/common/irclisthelper.h

src/common/ircuser.cpp

src/common/ircuser.h

src/common/logbacktrace_unix.cpp

src/common/logbacktrace_win.cpp

src/common/main.cpp

src/common/message.cpp

src/common/message.h

src/common/network.cpp

src/common/network.h

src/common/quassel.cpp

src/common/quassel.h

src/common/settings.cpp

src/common/settings.h

src/common/signalproxy.cpp

src/common/signalproxy.h

src/common/syncableobject.cpp

src/common/syncableobject.h

src/common/types.h

src/common/util.cpp

src/common/util.h

src/core/abstractsqlstorage.cpp

src/core/abstractsqlstorage.h

src/core/basichandler.cpp

src/core/basichandler.h

src/core/core.cpp

src/core/core.h

src/core/corealiasmanager.cpp

src/core/corealiasmanager.h

src/core/coreapplication.cpp

src/core/coreapplication.h

src/core/corebacklogmanager.cpp

src/core/corebacklogmanager.h

src/core/corebuffersyncer.cpp

src/core/corebuffersyncer.h

src/core/corebufferviewconfig.cpp

src/core/corebufferviewconfig.h

src/core/corebufferviewmanager.cpp

src/core/corebufferviewmanager.h

src/core/corecoreinfo.cpp

src/core/corecoreinfo.h

src/core/coreidentity.cpp

src/core/coreidentity.h

src/core/coreircchannel.cpp

src/core/coreircchannel.h

src/core/coreirclisthelper.cpp

src/core/coreirclisthelper.h

src/core/corenetwork.cpp

src/core/corenetwork.h

src/core/coresession.cpp

src/core/coresession.h

src/core/coresettings.cpp

src/core/coresettings.h

src/core/coreusersettings.cpp

src/core/coreusersettings.h

src/core/ctcphandler.cpp

src/core/ctcphandler.h

src/core/ircserverhandler.cpp

src/core/ircserverhandler.h

src/core/sessionthread.cpp

src/core/sessionthread.h

src/core/sqlitestorage.cpp

src/core/sqlitestorage.h

src/core/sslserver.cpp

src/core/sslserver.h

src/core/storage.cpp

src/core/storage.h

src/core/userinputhandler.cpp

src/core/userinputhandler.h

src/qtui/aboutdlg.cpp

src/qtui/aboutdlg.h

src/qtui/bufferwidget.cpp

src/qtui/bufferwidget.h

src/qtui/channellistdlg.cpp

src/qtui/channellistdlg.h

src/qtui/chatitem.cpp

src/qtui/chatitem.h

src/qtui/chatline.cpp

src/qtui/chatline.h

src/qtui/chatlinemodel.cpp

src/qtui/chatlinemodel.h

src/qtui/chatlinemodelitem.cpp

src/qtui/chatlinemodelitem.h

src/qtui/chatmonitorfilter.cpp

src/qtui/chatmonitorfilter.h

src/qtui/chatmonitorview.cpp

src/qtui/chatmonitorview.h

src/qtui/chatscene.cpp

src/qtui/chatscene.h

src/qtui/chatview.cpp

src/qtui/chatview.h

src/qtui/chatviewsearchbar.cpp

src/qtui/chatviewsearchbar.h

src/qtui/chatviewsearchcontroller.cpp

src/qtui/chatviewsearchcontroller.h

src/qtui/chatviewsettings.cpp

src/qtui/chatviewsettings.h

src/qtui/columnhandleitem.cpp

src/qtui/columnhandleitem.h

src/qtui/coreconfigwizard.cpp

src/qtui/coreconfigwizard.h

src/qtui/coreconnectdlg.cpp

src/qtui/coreconnectdlg.h

src/qtui/coreinfodlg.cpp

src/qtui/coreinfodlg.h

src/qtui/debugconsole.cpp

src/qtui/debugconsole.h

src/qtui/debuglogwidget.cpp

src/qtui/debuglogwidget.h

src/qtui/debugmessagemodelfilter.cpp

src/qtui/debugmessagemodelfilter.h

src/qtui/desktopnotificationbackend.cpp

src/qtui/desktopnotificationbackend.h

src/qtui/inputwidget.cpp

src/qtui/inputwidget.h

src/qtui/jumpkeyhandler.cpp

src/qtui/jumpkeyhandler.h

src/qtui/knotificationbackend.cpp

src/qtui/knotificationbackend.h

src/qtui/mainwin.cpp

src/qtui/mainwin.h

src/qtui/monoapplication.cpp

src/qtui/monoapplication.h

src/qtui/msgprocessorstatuswidget.cpp

src/qtui/msgprocessorstatuswidget.h

src/qtui/nicklistwidget.cpp

src/qtui/nicklistwidget.h

src/qtui/phononnotificationbackend.cpp

src/qtui/phononnotificationbackend.h

src/qtui/qtui.cpp

src/qtui/qtui.h

src/qtui/qtuiapplication.cpp

src/qtui/qtuiapplication.h

src/qtui/qtuimessageprocessor.cpp

src/qtui/qtuimessageprocessor.h

src/qtui/qtuisettings.cpp

src/qtui/qtuisettings.h

src/qtui/qtuistyle.cpp

src/qtui/qtuistyle.h

src/qtui/sessionsettings.cpp

src/qtui/sessionsettings.h

src/qtui/settingsdlg.cpp

src/qtui/settingsdlg.h

src/qtui/settingspagedlg.cpp

src/qtui/settingspagedlg.h

src/qtui/settingspages/aliasesmodel.cpp

src/qtui/settingspages/aliasesmodel.h

src/qtui/settingspages/aliasessettingspage.cpp

src/qtui/settingspages/aliasessettingspage.h

src/qtui/settingspages/appearancesettingspage.cpp

src/qtui/settingspages/appearancesettingspage.h

src/qtui/settingspages/backlogsettingspage.cpp

src/qtui/settingspages/backlogsettingspage.h

src/qtui/settingspages/bufferviewsettingspage.cpp

src/qtui/settingspages/bufferviewsettingspage.h

src/qtui/settingspages/chatmonitorsettingspage.cpp

src/qtui/settingspages/chatmonitorsettingspage.h

src/qtui/settingspages/colorsettingspage.cpp

src/qtui/settingspages/colorsettingspage.h

src/qtui/settingspages/fontssettingspage.cpp

src/qtui/settingspages/fontssettingspage.h

src/qtui/settingspages/generalsettingspage.cpp

src/qtui/settingspages/generalsettingspage.h

src/qtui/settingspages/highlightsettingspage.cpp

src/qtui/settingspages/highlightsettingspage.h

src/qtui/settingspages/identitiessettingspage.cpp

src/qtui/settingspages/identitiessettingspage.h

src/qtui/settingspages/networkssettingspage.cpp

src/qtui/settingspages/networkssettingspage.h

src/qtui/settingspages/networkssettingspage.ui

src/qtui/settingspages/notificationssettingspage.cpp

src/qtui/settingspages/notificationssettingspage.h

src/qtui/settingspages/previewbufferview.h

src/qtui/settingspages/settingspages.inc

src/qtui/systraynotificationbackend.cpp

src/qtui/systraynotificationbackend.h

src/qtui/taskbarnotificationbackend.cpp

src/qtui/taskbarnotificationbackend.h

src/qtui/titlesetter.cpp

src/qtui/titlesetter.h

src/qtui/ui/settingspagedlg.ui

src/qtui/webpreviewitem.cpp

src/qtui/webpreviewitem.h

src/uisupport/abstractbuffercontainer.cpp

src/uisupport/abstractbuffercontainer.h

src/uisupport/abstractitemview.cpp

src/uisupport/abstractitemview.h

src/uisupport/abstractnotificationbackend.cpp

src/uisupport/abstractnotificationbackend.h

src/uisupport/action.cpp

src/uisupport/action.h

src/uisupport/actioncollection.cpp

src/uisupport/actioncollection.h

src/uisupport/bufferview.cpp

src/uisupport/bufferview.h

src/uisupport/bufferviewfilter.cpp

src/uisupport/bufferviewfilter.h

src/uisupport/clickablelabel.cpp

src/uisupport/clickablelabel.h

src/uisupport/colorbutton.cpp

src/uisupport/colorbutton.h

src/uisupport/icon.cpp

src/uisupport/icon.h

src/uisupport/iconloader.cpp

src/uisupport/iconloader.h

src/uisupport/inputline.cpp

src/uisupport/inputline.h

src/uisupport/kcmdlinewrapper.cpp

src/uisupport/kcmdlinewrapper.h

src/uisupport/networkmodelactionprovider.cpp

src/uisupport/networkmodelactionprovider.h

src/uisupport/nickview.cpp

src/uisupport/nickview.h

src/uisupport/nickviewfilter.cpp

src/uisupport/nickviewfilter.h

src/uisupport/settingspage.cpp

src/uisupport/settingspage.h

src/uisupport/uisettings.cpp

src/uisupport/uisettings.h

src/uisupport/uistyle.cpp

src/uisupport/uistyle.h

version.inc

Show diffs side-by-side

added added

removed removed

src/qtui/settingspages/generalsettingspage.cpp

1

1

/***************************************************************************

2

* Copyright (C) 2005-08 by the Quassel IRC Team *

2

* Copyright (C) 2005-09 by the Quassel Project *

3

3

* devel@quassel-irc.org *

4

4

* *

5

5

* This program is free software; you can redistribute it and/or modify *

109

109

110

110

// bufferSettings:

111

111

BufferSettings bufferSettings;

112

SettingsPage::load(ui.userNoticesInDefaultBuffer, bufferSettings.value("UserNoticesInDefaultBuffer", QVariant(true)).toBool());

113

SettingsPage::load(ui.userNoticesInStatusBuffer, bufferSettings.value("UserNoticesInStatusBuffer", QVariant(false)).toBool());

114

SettingsPage::load(ui.userNoticesInCurrentBuffer, bufferSettings.value("UserNoticesInCurrentBuffer", QVariant(false)).toBool());

115

116

SettingsPage::load(ui.serverNoticesInDefaultBuffer, bufferSettings.value("ServerNoticesInDefaultBuffer", QVariant(false)).toBool());

117

SettingsPage::load(ui.serverNoticesInStatusBuffer, bufferSettings.value("ServerNoticesInStatusBuffer", QVariant(true)).toBool());

118

SettingsPage::load(ui.serverNoticesInCurrentBuffer, bufferSettings.value("ServerNoticesInCurrentBuffer", QVariant(false)).toBool());

119

120

SettingsPage::load(ui.errorMsgsInDefaultBuffer, bufferSettings.value("ErrorMsgsInDefaultBuffer", QVariant(true)).toBool());

121

SettingsPage::load(ui.errorMsgsInStatusBuffer, bufferSettings.value("ErrorMsgsInStatusBuffer", QVariant(false)).toBool());

122

SettingsPage::load(ui.errorMsgsInCurrentBuffer, bufferSettings.value("ErrorMsgsInCurrentBuffer", QVariant(false)).toBool());

112

int redirectTarget = bufferSettings.userNoticesTarget();

113

SettingsPage::load(ui.userNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer);

114

SettingsPage::load(ui.userNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);

115

SettingsPage::load(ui.userNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);

116

117

redirectTarget = bufferSettings.serverNoticesTarget();

118

SettingsPage::load(ui.serverNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer);

119

SettingsPage::load(ui.serverNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);

120

SettingsPage::load(ui.serverNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);

121

122

redirectTarget = bufferSettings.errorMsgsTarget();

123

SettingsPage::load(ui.errorMsgsInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer);

124

SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);

125

SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);

123

126

124

127

125

128

settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));

142

145

uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked());

143

146

144

147

BufferSettings bufferSettings;

145

bufferSettings.setValue("UserNoticesInDefaultBuffer", ui.userNoticesInDefaultBuffer->isChecked());

146

bufferSettings.setValue("UserNoticesInStatusBuffer", ui.userNoticesInStatusBuffer->isChecked());

147

bufferSettings.setValue("UserNoticesInCurrentBuffer", ui.userNoticesInCurrentBuffer->isChecked());

148

149

bufferSettings.setValue("ServerNoticesInDefaultBuffer", ui.serverNoticesInDefaultBuffer->isChecked());

150

bufferSettings.setValue("ServerNoticesInStatusBuffer", ui.serverNoticesInStatusBuffer->isChecked());

151

bufferSettings.setValue("ServerNoticesInCurrentBuffer", ui.serverNoticesInCurrentBuffer->isChecked());

152

153

bufferSettings.setValue("ErrorMsgsInDefaultBuffer", ui.errorMsgsInDefaultBuffer->isChecked());

154

bufferSettings.setValue("ErrorMsgsInStatusBuffer", ui.errorMsgsInStatusBuffer->isChecked());

155

bufferSettings.setValue("ErrorMsgsInCurrentBuffer", ui.errorMsgsInCurrentBuffer->isChecked());

148

int redirectTarget = 0;

149

if(ui.userNoticesInDefaultBuffer->isChecked())

150

redirectTarget |= BufferSettings::DefaultBuffer;

151

if(ui.userNoticesInStatusBuffer->isChecked())

152

redirectTarget |= BufferSettings::StatusBuffer;

153

if(ui.userNoticesInCurrentBuffer->isChecked())

154

redirectTarget |= BufferSettings::CurrentBuffer;

155

bufferSettings.setUserNoticesTarget(redirectTarget);

156

157

redirectTarget = 0;

158

if(ui.serverNoticesInDefaultBuffer->isChecked())

159

redirectTarget |= BufferSettings::DefaultBuffer;

160

if(ui.serverNoticesInStatusBuffer->isChecked())

161

redirectTarget |= BufferSettings::StatusBuffer;

162

if(ui.serverNoticesInCurrentBuffer->isChecked())

163

redirectTarget |= BufferSettings::CurrentBuffer;

164

bufferSettings.setServerNoticesTarget(redirectTarget);

165

166

redirectTarget = 0;

167

if(ui.errorMsgsInDefaultBuffer->isChecked())

168

redirectTarget |= BufferSettings::DefaultBuffer;

169

if(ui.errorMsgsInStatusBuffer->isChecked())

170

redirectTarget |= BufferSettings::StatusBuffer;

171

if(ui.errorMsgsInCurrentBuffer->isChecked())

172

redirectTarget |= BufferSettings::CurrentBuffer;

173

bufferSettings.setErrorMsgsTarget(redirectTarget);

156

174

157

175

bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());

158

176

Older »