Marcus Eggenberger [Mon, 23 Jun 2008 11:30:23 +0000 (13:30 +0200)]
fixing some merge weirdness
Marcus Eggenberger [Sun, 22 Jun 2008 18:57:21 +0000 (20:57 +0200)]
Fixing BR #147. Needs core update.
Marcus Eggenberger [Sun, 22 Jun 2008 18:37:09 +0000 (20:37 +0200)]
It is now possible to remove a BufferViewConfig from a BufferViewFilter by calling BufferViewFilter::setConfig(0);
Marcus Eggenberger [Sun, 22 Jun 2008 14:31:32 +0000 (16:31 +0200)]
Fixing BR #167 (Key down now puts the content of inputline into the history (doing it irssi's and seezer's way))
Marcus Eggenberger [Mon, 23 Jun 2008 11:07:34 +0000 (13:07 +0200)]
Fixing BR #39 (splitting long messages)
Conflicts:
src/core/basichandler.cpp
src/core/basichandler.h
Marcus Eggenberger [Mon, 23 Jun 2008 10:44:15 +0000 (12:44 +0200)]
Implemented a channel browser (BR #176).
The Channel Browser is currently only via contextmenu of the networks accessible.
Some minor fixes.
Conflicts:
src/client/client.cpp
src/client/client.pri
src/qtui/CMakeLists.txt
src/qtui/mainwin.cpp
src/qtui/qtui.pri
Manuel Nickschas [Sat, 21 Jun 2008 15:34:33 +0000 (17:34 +0200)]
Make STATIC an option; disable building of mono client by default
Manuel Nickschas [Sat, 21 Jun 2008 15:12:40 +0000 (17:12 +0200)]
Update button state in NetworksSettingsPage correctly, fix #163. Thanks seezer!
Manuel Nickschas [Sat, 21 Jun 2008 14:27:36 +0000 (16:27 +0200)]
Use qsrand initialization from Qt examples
Since for some bizarre (and locally unreproducable) reason the default
nick for newly created identities seems to be "quassel251" for many people,
we try a different way of seeding the random generator. No idea why localtime
wouldn't work...
Manuel Nickschas [Wed, 18 Jun 2008 17:44:09 +0000 (19:44 +0200)]
Put selections in both clipboard and X selection buffer on Linux again.
Not all users seem to be able to access the clipboard, so we'd rather put
it in both and allow copying for everybody. I guess in the new ChatView we'll
have something more sensible at some point.
Marcus Eggenberger [Wed, 18 Jun 2008 17:21:28 +0000 (19:21 +0200)]
removing debug output
Marcus Eggenberger [Sat, 14 Jun 2008 14:34:26 +0000 (16:34 +0200)]
Added Debuging output to the SignalProxy to test on the fly compression.
Maybe this commit already fixes the bug some users experienced.
Marcus Eggenberger [Wed, 18 Jun 2008 17:01:15 +0000 (19:01 +0200)]
Merge branch 'master' of git@git.quassel-irc.org:quassel
Marcus Eggenberger [Wed, 18 Jun 2008 15:32:39 +0000 (17:32 +0200)]
fixing BR #145 (moving items in custom view off by one)
Alexander von Renteln [Wed, 18 Jun 2008 15:05:53 +0000 (17:05 +0200)]
Fix static building on Win32 yet again...
Marcus Eggenberger [Wed, 18 Jun 2008 14:58:09 +0000 (16:58 +0200)]
Fixing BR #157 (default argument to /mode)
Marcus Eggenberger [Wed, 18 Jun 2008 14:39:15 +0000 (16:39 +0200)]
fixing BR #18
Marcus Eggenberger [Wed, 18 Jun 2008 14:06:22 +0000 (16:06 +0200)]
fixing BR #100 and #187
Manuel Nickschas [Tue, 17 Jun 2008 23:13:33 +0000 (01:13 +0200)]
Adding Qt library deps and Qt config information back to FindQt4
to make Quassel properly build with static Qt.
Manuel Nickschas [Tue, 17 Jun 2008 21:43:44 +0000 (23:43 +0200)]
Adding some CMake modules from KDE, since the original versions are buggy
Manuel Nickschas [Tue, 17 Jun 2008 19:21:50 +0000 (21:21 +0200)]
Make our CMake options properly cached values.
This way, CMake will remember the values we specify on the command
line, plus it is possible to edit them via cmake -i or various GUIs.
Manuel Nickschas [Tue, 17 Jun 2008 18:31:07 +0000 (20:31 +0200)]
Merge branch 'cmake'
Mangled the CMakeLists.txt a bit to make WIN32 support less fugly
Manuel Nickschas [Tue, 17 Jun 2008 17:33:00 +0000 (19:33 +0200)]
Fix static building on Linux/gcc
unknown [Tue, 17 Jun 2008 15:10:40 +0000 (17:10 +0200)]
windows works now with cmake
Manuel Nickschas [Tue, 17 Jun 2008 11:52:45 +0000 (13:52 +0200)]
Revert "Allow user to provide a key/certificate pair for outgoing IRC connections."
This implementation uses one cert for all users, which is not correct.
Reverting this until we have found a sane solution to allow key-based auth
in a multi-user setting.
This reverts commit
e91445dfdb33704e5daafa8631bc9a1419251c1c.
Manuel Nickschas [Tue, 17 Jun 2008 08:56:11 +0000 (10:56 +0200)]
Bump cmake requirement to 2.4.7
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 17:56:13 +0000 (19:56 +0200)]
Allow user to provide a key/certificate pair for outgoing IRC connections.
OFTC supports a way to identify clients based on the fingerprint of
the SSL certificated used to initialise the connection.
This patch allows to make use of the CertFP identification by creating
a ~/.quassel/quasselClientCert.pem key/certificate file, which will be
used for all the outgoing SSL connections to IRC servers.
At the moment the message sent by the server at the connection is not
displayed by quassel, so you'll have to find the certificate's
fingerprint through OpenSSL (or any other method).
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 17:55:58 +0000 (19:55 +0200)]
Fix warnings about non-string-literals on printf()-like functions.
qWarning() and similar functions expect a format string as first
parameter.
Using QString's formatting, you should not pass it as first parameter,
but use the "%s" format instead. It's very difficult but it might lead
to format string vulnerabilities.
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 15:49:46 +0000 (17:49 +0200)]
Use options to choose which targets to build, instead of the BUILD variable.
Instead of a single space-separated list of targets to build, use
options to decide whether to enable the targets or not.
This also simplifies writing ebuilds for quassel.
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 14:56:08 +0000 (16:56 +0200)]
Fix permissions for icons, they should not be executable.
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Marcus Eggenberger [Mon, 16 Jun 2008 14:38:55 +0000 (16:38 +0200)]
Merge branch 'master' of git@git.quassel-irc.org:quassel
Marcus Eggenberger [Mon, 16 Jun 2008 14:38:15 +0000 (16:38 +0200)]
Fixing BR #149 (high cpu load in settings)
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 14:21:06 +0000 (16:21 +0200)]
Provide an install for the built clients.
Instead of having to install the files manually in the ebuild, with
this patch it's possible to just call "make install" for them to be
copied properly.
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 14:14:21 +0000 (16:14 +0200)]
Fix warnings from GCC 4.3 about suggested parentheses.
In GCC 4.3 there are further cases that are suggested to be given
parentheses, to make sure that the result is the actuall behaviour
looked for.
Fix the cases so that warnings are not reported for these.
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 14:13:59 +0000 (16:13 +0200)]
Provide a .desktop file for quasselclient too.
The current quassel.desktop file only work with the monolithic
application (client and core in one file).
Provide a desktop file for the client-only application too.
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Diego 'Flameeyes' Pettenò [Mon, 16 Jun 2008 13:40:10 +0000 (15:40 +0200)]
Rename the cmake information from README.cmake to INSTALL.cmake.
As cmake is not used after building, it's more an INSTALL document,
which is usually ignored from installing by distributions (while
README files are).
Signed-off-by: Manuel Nickschas <sputnick@quassel-irc.org>
Manuel Nickschas [Sun, 15 Jun 2008 17:50:51 +0000 (19:50 +0200)]
Master branch still only requires Qt 4.3, though that's likely to change soon
Marcus Eggenberger [Sun, 15 Jun 2008 14:03:39 +0000 (16:03 +0200)]
Merge branch 'master' of git@git.quassel-irc.org:quassel
Marcus Eggenberger [Sun, 15 Jun 2008 12:48:21 +0000 (14:48 +0200)]
fixed a bug in /away command
Manuel Nickschas [Sun, 15 Jun 2008 01:24:25 +0000 (03:24 +0200)]
Make qmake still build with the new version stuff
Manuel Nickschas [Sun, 15 Jun 2008 00:50:57 +0000 (02:50 +0200)]
Post-merge fix of CMake files
Manuel Nickschas [Sun, 15 Jun 2008 00:39:17 +0000 (02:39 +0200)]
Merge branch 'cmake'
Manuel Nickschas [Sun, 15 Jun 2008 00:29:36 +0000 (02:29 +0200)]
Enable warnings on gcc
Manuel Nickschas [Sat, 14 Jun 2008 23:46:52 +0000 (01:46 +0200)]
IF out apple stuffz on non-Apple systems
Marcus Eggenberger [Sat, 14 Jun 2008 12:33:42 +0000 (14:33 +0200)]
quassel and quasselclient targets now generate a bundle on Mac OS X
Manuel Nickschas [Thu, 12 Jun 2008 10:16:40 +0000 (12:16 +0200)]
Trying to fix CMake for Mac. Does this work now?
Manuel Nickschas [Wed, 11 Jun 2008 09:22:44 +0000 (11:22 +0200)]
FindOpenSSL.cmake fails on Win32 -_-
Manuel Nickschas [Tue, 10 Jun 2008 15:31:03 +0000 (17:31 +0200)]
Use the provided CMake variables rather than hardcoding names for the SSL libs
Manuel Nickschas [Tue, 10 Jun 2008 15:10:45 +0000 (17:10 +0200)]
Fix OpenSSL on Windows
Manuel Nickschas [Tue, 10 Jun 2008 14:33:30 +0000 (16:33 +0200)]
Disable disabling of cmake-2.4 related warnings in cmake-2.6 -_-
unknown [Tue, 10 Jun 2008 14:18:48 +0000 (16:18 +0200)]
Add windows application icon
Manuel Nickschas [Tue, 10 Jun 2008 13:58:39 +0000 (15:58 +0200)]
Adjust CMakeLists.txt to new icon arrangement.
Manuel Nickschas [Tue, 10 Jun 2008 13:49:47 +0000 (15:49 +0200)]
Merge branch 'cmake' of git@git.quassel-irc.org:quassel into cmake
Marcus Eggenberger [Sat, 7 Jun 2008 17:58:40 +0000 (19:58 +0200)]
Added missing icon... oops
Marcus Eggenberger [Sat, 7 Jun 2008 15:24:17 +0000 (17:24 +0200)]
Cleaning up the icon dir
There are now separate resource files for
oxygen icons (same old icons.qrc) and quassel only icons
(quassel-icons.qrc) from which all sizes are accessible.
Added the new logo to the default page of the bufferwidget
unknown [Tue, 10 Jun 2008 12:26:31 +0000 (14:26 +0200)]
Updated cmake-based buildsys to make it work with Windows.
This works for me with a static Qt, but YMMV. Updated
README.cmake with build instructions for Windows as well.
App icons will follow after we have merged cmake into trunk.
Manuel Nickschas [Mon, 9 Jun 2008 23:00:17 +0000 (01:00 +0200)]
Add README.cmake
Marcus Eggenberger [Mon, 9 Jun 2008 21:33:29 +0000 (23:33 +0200)]
replaced a Qt 4.4 function call so Quassel can compile with Qt 4.3 again
Marcus Eggenberger [Mon, 9 Jun 2008 20:56:36 +0000 (22:56 +0200)]
sometimes I hate git... forgot stupid -a for git commit
Marcus Eggenberger [Mon, 9 Jun 2008 20:54:38 +0000 (22:54 +0200)]
CAN I HAS CHANNEL MODES PLZ?
Oh jeah Baby!
Manuel Nickschas [Sun, 8 Jun 2008 15:28:41 +0000 (17:28 +0200)]
HEADERS -> MOC_HDRS and adding non-moccable files to HEADERS
Manuel Nickschas [Sun, 8 Jun 2008 15:08:48 +0000 (17:08 +0200)]
Fixing parallel makes.
Manuel Nickschas [Sun, 8 Jun 2008 13:02:47 +0000 (15:02 +0200)]
Autogenerate version.gen - no more outdated versions!
We now generate a file containing the current git revision, or alternatively,
the contents of a version.dist (for tarballs), on every make.
To do that in a crossplatform way, we compile a small binary for that first...
Manuel Nickschas [Sun, 8 Jun 2008 11:38:06 +0000 (13:38 +0200)]
Keeping cmake-based version.gen generating in history
Marcus Eggenberger [Sun, 8 Jun 2008 11:07:11 +0000 (13:07 +0200)]
Some clarifications in the terminology of the core config wizard.
Added the manageusers.py script to git.
Manuel Nickschas [Sat, 7 Jun 2008 22:14:57 +0000 (00:14 +0200)]
Introduce new format for version.inc.
This switches from build-number-based versioning to a ProtocolVersion and a version
string that is merely descriptive. version.inc can be overriden by version.gen, which
is supposed to be generated by build scripts.
In addition, we now create a build date automatically.
Marcus Eggenberger [Sat, 7 Jun 2008 17:58:40 +0000 (19:58 +0200)]
Added missing icon... oops
Marcus Eggenberger [Sat, 7 Jun 2008 15:24:17 +0000 (17:24 +0200)]
Cleaning up the icon dir
There are now separate resource files for
oxygen icons (same old icons.qrc) and quassel only icons
(quassel-icons.qrc) from which all sizes are accessible.
Added the new logo to the default page of the bufferwidget
Manuel Nickschas [Sat, 7 Jun 2008 01:38:00 +0000 (03:38 +0200)]
Look for OpenSSL.
Apparently we can't easily check if Qt has SSL support, so we check for
an installed OpenSSL to at least catch some cases where we have to disable support.
Apparently, stuff still compiles even if SSL is not there, since all is #ifdef'd out...
Manuel Nickschas [Sat, 7 Jun 2008 01:36:31 +0000 (03:36 +0200)]
Fix static building (on Linux at least).
Besides using a statically built Qt (and pointing to it using -DQT=/path/to/qt),
you need to pass -DSTATIC=1 to cmake to enable proper linking. It also makes sense
to put static versions of libstdc++ and openssl into ${BUILD_DIR}/staticlibs.
NOTE that ${BUILD_DIR} is the dir you run cmake from, NOT the source dir.
Manuel Nickschas [Sat, 7 Jun 2008 00:28:17 +0000 (02:28 +0200)]
Uhm, we should include FindQt4 only after setting /usr/kde/svn/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/i686-pc-linux-gnu/gcc-bin/4.2.4:/usr/qt/3/bin... -_-
Manuel Nickschas [Fri, 6 Jun 2008 23:18:18 +0000 (01:18 +0200)]
Add -DQT=/path/to/qt to select a non-system Qt4 installation
Manuel Nickschas [Fri, 6 Jun 2008 22:51:04 +0000 (00:51 +0200)]
Say hello (again) to CMake!
After struggling way too long with qmake and its lack of features and documentation,
CMake is back in our sources. This is the first sorta working version of our new
shiny CMake-based build system. It seems to work for dynamic builds on Linux at least...
More stuff is to come to allow selection of Qt sources, and we probably need to add a lot
of stuff for Windows and Mac builds. Anyway, this is a start!
Marcus Eggenberger [Thu, 5 Jun 2008 12:49:52 +0000 (14:49 +0200)]
Quassel now uses proper default messages for part, quit, kick and away (/away toggles now between away and unaway state)
Alexander von Renteln [Thu, 5 Jun 2008 12:08:29 +0000 (14:08 +0200)]
beautified icon (16x16, ..., 256x256)
Marcus Eggenberger [Wed, 4 Jun 2008 17:22:18 +0000 (19:22 +0200)]
Say hello to compression!
This feature doesn't break protocol and is automagically enabled if both client and core support compression.
Distclean is needed!
Marcus Eggenberger [Wed, 4 Jun 2008 14:36:26 +0000 (16:36 +0200)]
fixed a bug that could crash the core on exit
Marcus Eggenberger [Wed, 4 Jun 2008 10:36:32 +0000 (12:36 +0200)]
some minor fixes:
- strange behavior of disabled autoadd for custom views
- permanently remvoed buffers disappear now instantly
- fixed a gcc warning BR #162
Manuel Nickschas [Tue, 3 Jun 2008 23:40:27 +0000 (01:40 +0200)]
Yeah, I know. I want this to get done though. And git-svn is being a bitch.
Manuel Nickschas [Tue, 3 Jun 2008 23:21:49 +0000 (01:21 +0200)]
One more little change to test the git workflow.
Manuel Nickschas [Tue, 3 Jun 2008 22:51:18 +0000 (00:51 +0200)]
More git testing
Manuel Nickschas [Tue, 3 Jun 2008 14:22:00 +0000 (16:22 +0200)]
Testing CIA for git
Manuel Nickschas [Fri, 30 May 2008 12:36:11 +0000 (12:36 +0000)]
Update aboutdlg for new contributors
Marcus Eggenberger [Fri, 30 May 2008 12:02:27 +0000 (12:02 +0000)]
Merging branches/new-icons with trunk
Big big thanks to nox-Hand for those great Icons!
Marcus Eggenberger [Fri, 30 May 2008 11:38:28 +0000 (11:38 +0000)]
Merging -r 859:865 branches/0.2/ with trunk
Alexander von Renteln [Tue, 27 May 2008 13:30:32 +0000 (13:30 +0000)]
#BR39 - long messages will now be divided in several messages.
Marcus Eggenberger [Mon, 26 May 2008 15:21:58 +0000 (15:21 +0000)]
Merging branches/0.2/@r859 with trunk
Marcus Eggenberger [Fri, 23 May 2008 15:28:28 +0000 (15:28 +0000)]
Merging branches/0.2/@r857 with trunk
Manuel Nickschas [Thu, 22 May 2008 19:09:14 +0000 (19:09 +0000)]
ChatView now uses MessageFilter to display only messages for its buffer.
QSortFilterProxyModel goodness! \o/
Manuel Nickschas [Thu, 22 May 2008 19:08:55 +0000 (19:08 +0000)]
Say hello to MessageFilter!
Manuel Nickschas [Thu, 22 May 2008 19:08:29 +0000 (19:08 +0000)]
Quassel now handles even huge ChatScenes without slowing to a crawl.
For some bizarre reason, setting the scene's rect myself (which should save Qt from
computing bounding rects) causes huge mem consumption and slows down everything.
I have no idea why that would be.
Manuel Nickschas [Thu, 22 May 2008 19:08:09 +0000 (19:08 +0000)]
Some optimizations... QGraphicsScene has some weird issues here
Manuel Nickschas [Thu, 22 May 2008 19:04:36 +0000 (19:04 +0000)]
Add -config profile to enable a gprof-capable build.
Marcus Eggenberger [Thu, 22 May 2008 14:52:04 +0000 (14:52 +0000)]
Merging branches/0.2/@r849 with trunk
Manuel Nickschas [Wed, 21 May 2008 09:09:44 +0000 (09:09 +0000)]
Make BufferView compile
Manuel Nickschas [Wed, 21 May 2008 09:09:41 +0000 (09:09 +0000)]
Handle rowsInserted() and add new messages to the scene.
Marcus Eggenberger [Tue, 20 May 2008 20:47:08 +0000 (20:47 +0000)]
merging branches/0.2/0.2@r44 with trunk
Manuel Nickschas [Mon, 19 May 2008 23:15:18 +0000 (23:15 +0000)]
Make ChatLine/-Items and ChatScene honor ChatView width.
The items now fill out the available space and automatically re-adjust to size changes.
Manuel Nickschas [Mon, 19 May 2008 20:46:12 +0000 (20:46 +0000)]
Remove .gitignore for good. I hope.
Manuel Nickschas [Mon, 19 May 2008 20:46:09 +0000 (20:46 +0000)]
Merge branch 'master' of sputnick@git.quassel-irc.org:quassel