← Back to branch summary

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

« back to all changes in this revision

Viewing changes to src/irc/serverlistdialog.h

Committer: Bazaar Package Importer
Author(s): Jonathan Thomas
Date: 2010-02-11 14:52:14 UTC
mto: This revision was merged to the branch mainline in revision 43.
Revision ID: james.westby@ubuntu.com-20100211145214-xsbd3hmrnu5fmb8f

Tags: upstream-1.2.2

Import upstream version 1.2.2

files added:
doc-translations

doc-translations/CMakeLists.txt

doc-translations/et_konversation

doc-translations/et_konversation/konversation

doc-translations/et_konversation/konversation/CMakeLists.txt

doc-translations/et_konversation/konversation/index.docbook

doc-translations/it_konversation

doc-translations/it_konversation/konversation

doc-translations/it_konversation/konversation/CMakeLists.txt

doc-translations/it_konversation/konversation/index.docbook

doc-translations/pt_BR_konversation

doc-translations/pt_BR_konversation/konversation

doc-translations/pt_BR_konversation/konversation/CMakeLists.txt

doc-translations/pt_BR_konversation/konversation/index.docbook

doc-translations/sv_konversation

doc-translations/sv_konversation/konversation

doc-translations/sv_konversation/konversation/CMakeLists.txt

doc-translations/sv_konversation/konversation/addchannel.png

doc-translations/sv_konversation/konversation/addnetwork_co.png

doc-translations/sv_konversation/konversation/addserver_co.png

doc-translations/sv_konversation/konversation/channel_screen_tour_co.png

doc-translations/sv_konversation/konversation/channellist_screen_co.png

doc-translations/sv_konversation/konversation/checkidentities.png

doc-translations/sv_konversation/konversation/colorchooser_screen.png

doc-translations/sv_konversation/konversation/dccstatus_screen_co.png

doc-translations/sv_konversation/konversation/first_channel_co.png

doc-translations/sv_konversation/konversation/first_serverlist_co.png

doc-translations/sv_konversation/konversation/highlighting_screen_co.png

doc-translations/sv_konversation/konversation/identities_adv_co.png

doc-translations/sv_konversation/konversation/identities_away_co.png

doc-translations/sv_konversation/konversation/identities_gen_co.png

doc-translations/sv_konversation/konversation/index.docbook

doc-translations/sv_konversation/konversation/kimproxy_create_screen2.png

doc-translations/sv_konversation/konversation/kimproxy_create_screen_co.png

doc-translations/sv_konversation/konversation/logviewer_co.png

doc-translations/sv_konversation/konversation/nicksonline_co.png

doc-translations/sv_konversation/konversation/nickthemes_screen_co.png

doc-translations/sv_konversation/konversation/notification_screen_co.png

doc-translations/sv_konversation/konversation/notifylist_screen_co.png

doc-translations/sv_konversation/konversation/osd_demo.png

doc-translations/sv_konversation/konversation/osd_screen_co.png

doc-translations/sv_konversation/konversation/quickbuttons_screen.png

doc-translations/sv_konversation/konversation/quickconnect_screen.png

doc-translations/sv_konversation/konversation/serverlist_co.png

doc-translations/sv_konversation/konversation/urlcatcher_screen_co.png

doc-translations/sv_konversation/konversation/webbrowser_screen_co.png

doc-translations/uk_konversation

doc-translations/uk_konversation/konversation

doc-translations/uk_konversation/konversation/CMakeLists.txt

doc-translations/uk_konversation/konversation/index.docbook

doc/channel_screen_co.png

doc/colorize.png

doc/configure.png

doc/editserver_screen_co.png

doc/led_blue_off.png

doc/led_green_off.png

doc/led_red_off.png

doc/led_yellow_off.png

doc/prefs_identity_screen_co.png

doc/serverlist_screen_co.png

po

po/CMakeLists.txt

po/bg

po/bg/CMakeLists.txt

po/bg/konversation.po

po/ca

po/ca/CMakeLists.txt

po/ca/konversation.po

po/cs

po/cs/CMakeLists.txt

po/cs/konversation.po

po/da

po/da/CMakeLists.txt

po/da/konversation.po

po/de

po/de/CMakeLists.txt

po/de/konversation.po

po/el

po/el/CMakeLists.txt

po/el/konversation.po

po/en_GB

po/en_GB/CMakeLists.txt

po/en_GB/konversation.po

po/es

po/es/CMakeLists.txt

po/es/konversation.po

po/et

po/et/CMakeLists.txt

po/et/konversation.po

po/fi

po/fi/CMakeLists.txt

po/fi/konversation.po

po/fr

po/fr/CMakeLists.txt

po/fr/konversation.po

po/gl

po/gl/CMakeLists.txt

po/gl/konversation.po

po/he

po/he/CMakeLists.txt

po/he/konversation.po

po/hu

po/hu/CMakeLists.txt

po/hu/konversation.po

po/it

po/it/CMakeLists.txt

po/it/konversation.po

po/ja

po/ja/CMakeLists.txt

po/ja/konversation.po

po/nb

po/nb/CMakeLists.txt

po/nb/konversation.po

po/nds

po/nds/CMakeLists.txt

po/nds/konversation.po

po/nl

po/nl/CMakeLists.txt

po/nl/konversation.po

po/pl

po/pl/CMakeLists.txt

po/pl/konversation.po

po/pt

po/pt/CMakeLists.txt

po/pt/konversation.po

po/pt_BR

po/pt_BR/CMakeLists.txt

po/pt_BR/konversation.po

po/ru

po/ru/CMakeLists.txt

po/ru/konversation.po

po/sk

po/sk/CMakeLists.txt

po/sk/konversation.po

po/sv

po/sv/CMakeLists.txt

po/sv/konversation.po

po/tr

po/tr/CMakeLists.txt

po/tr/konversation.po

po/uk

po/uk/CMakeLists.txt

po/uk/konversation.po

po/zh_CN

po/zh_CN/CMakeLists.txt

po/zh_CN/konversation.po

po/zh_TW

po/zh_TW/CMakeLists.txt

po/zh_TW/konversation.po

src/urlcatcherui.ui

src/viewer/trayicon.cpp

files removed:
.gitignore

data/konvircs.protocol

doc/format-text-color.png

src/abstractawaymanager.cpp

src/abstractawaymanager.h

src/awaymanagerkidletime.cpp

src/awaymanagerkidletime.h

src/dcc/whiteboard.cpp

src/dcc/whiteboard.h

src/dcc/whiteboardcolorchooser.cpp

src/dcc/whiteboardcolorchooser.h

src/dcc/whiteboardfontchooser.cpp

src/dcc/whiteboardfontchooser.h

src/dcc/whiteboardfontchooserui.ui

src/dcc/whiteboardglobals.cpp

src/dcc/whiteboardglobals.h

src/dcc/whiteboardpaintarea.cpp

src/dcc/whiteboardpaintarea.h

src/dcc/whiteboardtoolbar.cpp

src/dcc/whiteboardtoolbar.h

src/dcc/whiteboardtoolbarui.ui

src/viewer/irccontextmenus.cpp

src/viewer/irccontextmenus.h

files modified:
CMakeLists.txt

ChangeLog

NEWS

config-konversation.h.cmake

data/CMakeLists.txt

data/images/nickicons/alternative/index.desktop

data/images/nickicons/christmas/index.desktop

data/images/nickicons/classic/index.desktop

data/images/nickicons/default/index.desktop

data/images/nickicons/simplistic/index.desktop

data/images/nickicons/smiling/index.desktop

data/images/nickicons/square/index.desktop

data/konversation.desktop

data/konversation.notifyrc

data/konversationui.rc

data/scripts/media

doc/addchannel.png

doc/addnetwork_co.png

doc/addserver_co.png

doc/channel_screen_tour_co.png

doc/channellist_screen_co.png

doc/checkidentities.png

doc/colorchooser_screen.png

doc/dccstatus_screen_co.png

doc/first_channel_co.png

doc/first_serverlist_co.png

doc/highlighting_screen_co.png

doc/identities_adv_co.png

doc/identities_away_co.png

doc/identities_gen_co.png

doc/index.docbook

doc/irc_admin.png

doc/irc_away.png

doc/irc_halfop.png

doc/irc_normal.png

doc/irc_op.png

doc/irc_owner.png

doc/irc_voice.png

doc/kimproxy_create_screen2.png

doc/kimproxy_create_screen_co.png

doc/led_blue_on.png

doc/led_green_on.png

doc/led_red_on.png

doc/led_yellow_on.png

doc/logviewer_co.png

doc/nicksonline_co.png

doc/nickthemes_screen_co.png

doc/notification_screen_co.png

doc/notifylist_screen_co.png

doc/osd_demo.png

doc/osd_screen_co.png

doc/quickbuttons_screen.png

doc/quickconnect_screen.png

doc/serverlist_co.png

doc/urlcatcher_screen_co.png

doc/webbrowser_screen_co.png

src/CMakeLists.txt

src/application.cpp

src/application.h

src/awaymanager.cpp

src/awaymanager.h

src/commit.h

src/common.cpp

src/common.h

src/config/chatwindowbehaviour_config.ui

src/config/configdialog.cpp

src/config/connectionbehavior_config.cpp

src/config/connectionbehavior_config.ui

src/config/dcc_config.cpp

src/config/dcc_configui.ui

src/config/generalbehavior_configui.ui

src/config/konversation.kcfg

src/config/osd_config.cpp

src/config/preferences.cpp

src/config/preferences.h

src/config/quickbuttons_config.cpp

src/config/settingsdialog.cpp

src/config/warnings_config.cpp

src/config/warnings_configui.ui

src/config/watchednicknames_config.cpp

src/config/watchednicknames_configui.ui

src/connectionmanager.cpp

src/connectionmanager.h

src/dbus.cpp

src/dbus.h

src/dcc/chat.cpp

src/dcc/chat.h

src/dcc/chatcontainer.cpp

src/dcc/chatcontainer.h

src/dcc/dcccommon.cpp

src/dcc/recipientdialog.h

src/dcc/resumedialog.cpp

src/dcc/resumedialog.h

src/dcc/transfer.cpp

src/dcc/transfer.h

src/dcc/transferdetailedinfopanel.cpp

src/dcc/transferlistmodel.cpp

src/dcc/transferlistmodel.h

src/dcc/transferpanel.cpp

src/dcc/transferpanel.h

src/dcc/transferrecv.cpp

src/dcc/transferrecv.h

src/dcc/transfersend.cpp

src/dcc/transfersend.h

src/dcc/transferview.cpp

src/dcc/transferview.h

src/identity.cpp

src/identity.h

src/identitydialog.cpp

src/identitydialog.ui

src/irc/channel.cpp

src/irc/channel.h

src/irc/channellistpanel.cpp

src/irc/channellistpanel.h

src/irc/channellistpanelui.ui

src/irc/channelnick.cpp

src/irc/channeloptionsdialog.cpp

src/irc/channeloptionsdialog.h

src/irc/channeloptionsui.ui

src/irc/inputfilter.cpp

src/irc/ircqueue.cpp

src/irc/ircqueue.h

src/irc/joinchanneldialog.cpp

src/irc/joinchanneldialog.h

src/irc/nick.cpp

src/irc/nick.h

src/irc/nickinfo.cpp

src/irc/nickinfo.h

src/irc/nicklistview.cpp

src/irc/nicklistview.h

src/irc/nicksonline.cpp

src/irc/nicksonline.h

src/irc/outputfilter.cpp

src/irc/outputfilter.h

src/irc/query.cpp

src/irc/query.h

src/irc/replycodes.h

src/irc/server.cpp

src/irc/server.h

src/irc/servergroupdialog.cpp

src/irc/servergroupdialogui.ui

src/irc/serverlistdialog.cpp

src/irc/serverlistdialog.h

src/linkaddressbook/addressbook_base.cpp

src/linkaddressbook/addressbook_base.h

src/main.cpp

src/mainwindow.cpp

src/mainwindow.h

src/notificationhandler.cpp

src/notificationhandler.h

src/quickconnectdialog.cpp

src/scriptlauncher.cpp

src/scriptlauncher.h

src/statusbar.cpp

src/statusbar.h

src/upnp/upnprouter.cpp

src/urlcatcher.cpp

src/urlcatcher.h

src/version.h

src/viewer/chatwindow.cpp

src/viewer/chatwindow.h

src/viewer/editnotifydialog.cpp

src/viewer/emoticons.cpp

src/viewer/emoticons.h

src/viewer/images.cpp

src/viewer/images.h

src/viewer/insertchardialog.cpp

src/viewer/irccolorchooser.cpp

src/viewer/ircinput.cpp

src/viewer/ircinput.h

src/viewer/ircview.cpp

src/viewer/ircview.h

src/viewer/ircviewbox.cpp

src/viewer/ircviewbox.h

src/viewer/logfilereader.cpp

src/viewer/logfilereader.h

src/viewer/osd.cpp

src/viewer/pasteeditor.cpp

src/viewer/rawlog.cpp

src/viewer/rawlog.h

src/viewer/searchbar.cpp

src/viewer/searchbar.h

src/viewer/statuspanel.cpp

src/viewer/statuspanel.h

src/viewer/topiclabel.cpp

src/viewer/topiclabel.h

src/viewer/trayicon.h

src/viewer/trayiconkstatusnotifieritem.cpp

src/viewer/trayiconksystemtray.cpp

src/viewer/viewcontainer.cpp

src/viewer/viewcontainer.h

src/viewer/viewtree.cpp

src/viewer/viewtree.h

src/viewer/viewtreeitem.cpp

src/viewer/viewtreeitem.h

Show diffs side-by-side

added added

removed removed

src/irc/serverlistdialog.h

59

59

60

60

signals:

61

61

void connectTo(Konversation::ConnectionFlag flag, int serverGroupId);

62

void connectTo(Konversation::ConnectionFlag flag, ConnectionSettings connectionSettings);

62

void connectTo(Konversation::ConnectionFlag flag, ConnectionSettings& connectionSettings);

63

63

void serverGroupsChanged(const Konversation::ServerGroupSettingsPtr serverGroup = Konversation::ServerGroupSettingsPtr());

64

64

65

65

protected slots:

82

82

protected:

83

83

QTreeWidgetItem* insertServerGroup(ServerGroupSettingsPtr serverGroup);

84

84

void addServerGroup(ServerGroupSettingsPtr serverGroup);

85

85

86

86

int m_lastSortColumn;

87

87

Qt::SortOrder m_lastSortOrder;

88

88

Older »