Merging r730:732 from trunk to branches/0.3. Forwardports fancy bufferviews.
authorManuel Nickschas <sputnick@quassel-irc.org>
Sun, 13 Apr 2008 20:28:08 +0000 (20:28 +0000)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sun, 13 Apr 2008 20:28:08 +0000 (20:28 +0000)
commit997a62b68d7469a93f373476dd955c44eb051be0
treec0155b5f927a640569a50c71caa0bf2216285473
parentad801015af3afad53e0b245afc3a2214373a1b44
Merging r730:732 from trunk to branches/0.3. Forwardports fancy bufferviews.
95 files changed:
src/client/client.cpp
src/client/networkmodel.cpp
src/client/treemodel.cpp
src/client/treemodel.h
src/common/bufferviewconfig.cpp
src/common/bufferviewconfig.h
src/common/bufferviewmanager.cpp
src/common/bufferviewmanager.h
src/common/syncableobject.cpp
src/common/syncableobject.h
src/core/SQL/SQLite/10/setup_999_version.sql [deleted file]
src/core/SQL/SQLite/11/delete_backlog_by_uid.sql [moved from src/core/SQL/SQLite/10/delete_backlog_by_uid.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_backlog_for_buffer.sql [moved from src/core/SQL/SQLite/10/delete_backlog_for_buffer.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_backlog_for_network.sql [moved from src/core/SQL/SQLite/10/delete_backlog_for_network.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_buffer_for_bufferid.sql [moved from src/core/SQL/SQLite/10/delete_buffer_for_bufferid.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_buffers_by_uid.sql [moved from src/core/SQL/SQLite/10/delete_buffers_by_uid.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_buffers_for_network.sql [moved from src/core/SQL/SQLite/10/delete_buffers_for_network.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_ircservers_for_network.sql [moved from src/core/SQL/SQLite/10/delete_ircservers_for_network.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_network.sql [moved from src/core/SQL/SQLite/10/delete_network.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_networks_by_uid.sql [moved from src/core/SQL/SQLite/10/delete_networks_by_uid.sql with 100% similarity]
src/core/SQL/SQLite/11/delete_quasseluser.sql [moved from src/core/SQL/SQLite/10/delete_quasseluser.sql with 100% similarity]
src/core/SQL/SQLite/11/insert_buffer.sql [moved from src/core/SQL/SQLite/10/insert_buffer.sql with 100% similarity]
src/core/SQL/SQLite/11/insert_message.sql [moved from src/core/SQL/SQLite/10/insert_message.sql with 100% similarity]
src/core/SQL/SQLite/11/insert_network.sql [moved from src/core/SQL/SQLite/10/insert_network.sql with 100% similarity]
src/core/SQL/SQLite/11/insert_quasseluser.sql [moved from src/core/SQL/SQLite/10/insert_quasseluser.sql with 100% similarity]
src/core/SQL/SQLite/11/insert_sender.sql [moved from src/core/SQL/SQLite/10/insert_sender.sql with 100% similarity]
src/core/SQL/SQLite/11/insert_server.sql [moved from src/core/SQL/SQLite/10/insert_server.sql with 100% similarity]
src/core/SQL/SQLite/11/insert_user_setting.sql [new file with mode: 0644]
src/core/SQL/SQLite/11/select_authuser.sql [moved from src/core/SQL/SQLite/10/select_authuser.sql with 100% similarity]
src/core/SQL/SQLite/11/select_bufferByName.sql [moved from src/core/SQL/SQLite/10/select_bufferByName.sql with 100% similarity]
src/core/SQL/SQLite/11/select_bufferExists.sql [moved from src/core/SQL/SQLite/10/select_bufferExists.sql with 100% similarity]
src/core/SQL/SQLite/11/select_buffer_by_id.sql [moved from src/core/SQL/SQLite/10/select_buffer_by_id.sql with 100% similarity]
src/core/SQL/SQLite/11/select_buffer_lastseen_messages.sql [moved from src/core/SQL/SQLite/10/select_buffer_lastseen_messages.sql with 100% similarity]
src/core/SQL/SQLite/11/select_buffers.sql [moved from src/core/SQL/SQLite/10/select_buffers.sql with 100% similarity]
src/core/SQL/SQLite/11/select_connected_networks.sql [moved from src/core/SQL/SQLite/10/select_connected_networks.sql with 100% similarity]
src/core/SQL/SQLite/11/select_messageRange.sql [moved from src/core/SQL/SQLite/10/select_messageRange.sql with 100% similarity]
src/core/SQL/SQLite/11/select_messages.sql [moved from src/core/SQL/SQLite/10/select_messages.sql with 100% similarity]
src/core/SQL/SQLite/11/select_messagesOffset.sql [moved from src/core/SQL/SQLite/10/select_messagesOffset.sql with 100% similarity]
src/core/SQL/SQLite/11/select_messagesSince.sql [moved from src/core/SQL/SQLite/10/select_messagesSince.sql with 100% similarity]
src/core/SQL/SQLite/11/select_messagesSinceOffset.sql [moved from src/core/SQL/SQLite/10/select_messagesSinceOffset.sql with 100% similarity]
src/core/SQL/SQLite/11/select_networkExists.sql [moved from src/core/SQL/SQLite/10/select_networkExists.sql with 100% similarity]
src/core/SQL/SQLite/11/select_networks_for_user.sql [moved from src/core/SQL/SQLite/10/select_networks_for_user.sql with 100% similarity]
src/core/SQL/SQLite/11/select_persistent_channels.sql [moved from src/core/SQL/SQLite/10/select_persistent_channels.sql with 100% similarity]
src/core/SQL/SQLite/11/select_servers_for_network.sql [moved from src/core/SQL/SQLite/10/select_servers_for_network.sql with 100% similarity]
src/core/SQL/SQLite/11/select_user_setting.sql [new file with mode: 0644]
src/core/SQL/SQLite/11/select_userid.sql [moved from src/core/SQL/SQLite/10/select_userid.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_000_quasseluser.sql [moved from src/core/SQL/SQLite/10/setup_000_quasseluser.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_010_sender.sql [moved from src/core/SQL/SQLite/10/setup_010_sender.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_020_network.sql [moved from src/core/SQL/SQLite/10/setup_020_network.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_030_buffer.sql [moved from src/core/SQL/SQLite/10/setup_030_buffer.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_040_buffer_idx.sql [moved from src/core/SQL/SQLite/10/setup_040_buffer_idx.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_050_buffer_cname_idx.sql [moved from src/core/SQL/SQLite/10/setup_050_buffer_cname_idx.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_060_backlog.sql [moved from src/core/SQL/SQLite/10/setup_060_backlog.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_070_coreinfo.sql [moved from src/core/SQL/SQLite/10/setup_070_coreinfo.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_080_ircservers.sql [moved from src/core/SQL/SQLite/10/setup_080_ircservers.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_090_create_backlog_idx.sql [moved from src/core/SQL/SQLite/10/setup_090_create_backlog_idx.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_100_create_backlog_idx2.sql [moved from src/core/SQL/SQLite/10/setup_100_create_backlog_idx2.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_110_create_buffer_idx.sql [moved from src/core/SQL/SQLite/10/setup_110_create_buffer_idx.sql with 100% similarity]
src/core/SQL/SQLite/11/setup_120_create_user_setting.sql [new file with mode: 0644]
src/core/SQL/SQLite/11/setup_999_version.sql [new file with mode: 0644]
src/core/SQL/SQLite/11/update_buffer_lastseen.sql [moved from src/core/SQL/SQLite/10/update_buffer_lastseen.sql with 100% similarity]
src/core/SQL/SQLite/11/update_buffer_name.sql [moved from src/core/SQL/SQLite/10/update_buffer_name.sql with 100% similarity]
src/core/SQL/SQLite/11/update_buffer_persistent_channel.sql [moved from src/core/SQL/SQLite/10/update_buffer_persistent_channel.sql with 100% similarity]
src/core/SQL/SQLite/11/update_buffer_set_channel_key.sql [moved from src/core/SQL/SQLite/10/update_buffer_set_channel_key.sql with 100% similarity]
src/core/SQL/SQLite/11/update_network.sql [moved from src/core/SQL/SQLite/10/update_network.sql with 100% similarity]
src/core/SQL/SQLite/11/update_network_connected.sql [moved from src/core/SQL/SQLite/10/update_network_connected.sql with 100% similarity]
src/core/SQL/SQLite/11/update_user_setting.sql [new file with mode: 0644]
src/core/SQL/SQLite/11/update_username.sql [moved from src/core/SQL/SQLite/10/update_username.sql with 100% similarity]
src/core/SQL/SQLite/11/update_userpassword.sql [moved from src/core/SQL/SQLite/10/update_userpassword.sql with 100% similarity]
src/core/SQL/SQLite/11/upgrade_000_create_user_setting.sql [new file with mode: 0644]
src/core/SQL/SQLite/11/upgrade_999_version.sql [new file with mode: 0644]
src/core/SQL/upgradeSchema.sh [new file with mode: 0755]
src/core/core.cpp
src/core/core.h
src/core/corebufferviewconfig.cpp
src/core/corebufferviewconfig.h
src/core/corebufferviewmanager.cpp
src/core/corebufferviewmanager.h
src/core/sql.qrc
src/core/sqlitestorage.cpp
src/core/sqlitestorage.h
src/core/storage.h
src/qtui/coreconnectdlg.cpp
src/qtui/mainwin.cpp
src/qtui/mainwin.h
src/qtui/settingspagedlg.cpp
src/qtui/settingspages/bufferviewsettingspage.cpp
src/qtui/settingspages/bufferviewsettingspage.h
src/qtui/settingspages/bufferviewsettingspage.ui
src/qtui/ui/mainwin.ui
src/uisupport/bufferview.cpp
src/uisupport/bufferview.h
src/uisupport/bufferviewfilter.cpp
src/uisupport/bufferviewfilter.h
version.inc