diff options
131 files changed, 1817 insertions, 572 deletions
@@ -1,3 +1,19 @@ +05 Feb 2007 + [Pragma] + - The KVIrc executable now compiles and starts with Qt4. With Qt3 everythin + should work just like it did before. + + No modules are ported yet so a lot of functionality is not available... + ... but it CAN connect to a server :) + It tends to crash once in a while, has nasty problems with + graphics and size of certain widgets: will need some hours of debugging. + + When testing the Qt4 port make sure you (re)move your old binary + modules from /usr/local/share/kvirc/3.2/. KVIrc will attempt to load + some modules from there and since they're linked to Qt3 the runtime + (loader) is likely to go nuts with two Qt versions in memory. + You have been warned... :) + 30 Jan 2007 [Alexey] - Introduced option "using identd only on connect" diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index c8ef476b4..6c9a3e97c 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -2394,7 +2394,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], if test "$SS_USE_QT4" = "no"; then SS_LIBLINK="-l$SS_QTLIB_NAME" else - SS_LIBLINK="-lQtCore -lQtGui" + SS_LIBLINK="-lQtCore -lQtGui -lQt3Support" fi if test -n "$SS_X_LIBLINK"; then diff --git a/admin/config.guess b/admin/config.guess index 917bbc50f..d870848e0 100755 --- a/admin/config.guess +++ b/admin/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2006-02-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -138,6 +139,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +if [ "${UNAME_SYSTEM}" = "Linux" ] ; then + eval $set_cc_for_build + cat << EOF > $dummy.c + #include <features.h> + #ifdef __UCLIBC__ + # ifdef __UCLIBC_CONFIG_VERSION__ + LIBC=uclibc __UCLIBC_CONFIG_VERSION__ + # else + LIBC=uclibc + # endif + #else + LIBC=gnu + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` +fi + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -206,6 +224,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; @@ -764,7 +785,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -772,6 +798,9 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS_NT-*:*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -779,8 +808,11 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:[345]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[345]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -794,7 +826,7 @@ EOF i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -815,25 +847,25 @@ EOF echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo cris-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo crisv32-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:*) eval $set_cc_for_build @@ -851,8 +883,12 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -870,14 +906,21 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-${LIBC} + exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -890,34 +933,37 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo x86_64-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -932,20 +978,22 @@ EOF p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" + echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" exit ;; coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" + echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" exit ;; esac + # This should get integrated into the C code below, but now we hack + if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi # Determine whether the default compiler is a.out or elf eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -961,7 +1009,7 @@ EOF LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else LIBC=gnuaout @@ -971,7 +1019,11 @@ EOF LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1182,7 +1234,6 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1261,6 +1312,9 @@ EOF i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/admin/config.sub b/admin/config.sub index 1c366dfde..bb394190f 100755 --- a/admin/config.sub +++ b/admin/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2006-02-27' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +120,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +173,10 @@ case $os in -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +193,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -234,12 +244,12 @@ case $basic_machine in | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ + | d10v | d30v | dlx | dsp16xx | dvp \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,17 +267,18 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | sheb | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -286,6 +297,9 @@ case $basic_machine in ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -336,19 +350,20 @@ case $basic_machine in | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | shbe-* | sheb-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -678,6 +693,24 @@ case $basic_machine in basic_machine=m68k-atari os=-mint ;; + mipsEE* | ee | ps2) + basic_machine=mips64r5900el-scei + case $os in + -linux*) + ;; + *) + os=-elf + ;; + esac + ;; + iop) + basic_machine=mipsel-scei + os=-irx + ;; + dvp) + basic_machine=dvp-scei + os=-elf + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -696,6 +729,9 @@ case $basic_machine in basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +839,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +901,10 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -1101,7 +1147,7 @@ case $basic_machine in sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1174,21 +1220,23 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos* | -irx*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/admin/ltmain.sh b/admin/ltmain.sh index 06823e057..8f7a6ac10 100644 --- a/admin/ltmain.sh +++ b/admin/ltmain.sh @@ -33,6 +33,9 @@ basename="s,^.*/,,g" # function. progpath="$0" +# define SED for historic ltconfig's generated by Libtool 1.3 +test -z "$SED" && SED=sed + # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" @@ -51,6 +54,13 @@ TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi +# Same for EGREP, and just to be sure, do LTCC as well +if test "X$EGREP" = X ; then + EGREP=egrep +fi +if test "X$LTCC" = X ; then + LTCC=${CC-gcc} +fi # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -137,6 +147,30 @@ preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +if test -z "$max_cmd_len"; then + i=0 + testring="ABCD" + new_result= + + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ + = "XX$testring") >/dev/null 2>&1 && + new_result=`expr "X$testring" : ".*" 2>&1` && + max_cmd_len="$new_result" && + test "$i" != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + testring="$testring$testring" + done + testring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + max_cmd_len=`expr $max_cmd_len \/ 2` +fi + ##################################### # Shell function definitions: # This seems to be the best place for them @@ -257,7 +291,21 @@ func_infer_tag () esac CC_quoted="$CC_quoted $arg" done + # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc' + trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"` + # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc + extendcc=${host}-${CC} + # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc + # (Gentoo-specific hack because we always export $CHOST) + mungedcc=${CHOST-${host}}-${trimedcc} case "$@ " in + "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\ + "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) + tagname=CC + break ;; + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\ + "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\ + "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) # The compiler in the base compile command matches # the one in the tagged configuration. @@ -851,7 +899,7 @@ if test -z "$show_help"; then # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do + until $run ln "$srcfile" "$lockfile" 2>/dev/null; do $show "Waiting for $lockfile to be removed" sleep 2 done @@ -3642,6 +3690,13 @@ EOF *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done + # It is ok to link against an archive when + # building a shared library. + if $AR -t $potlib > /dev/null 2>&1; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ | ${SED} 10q \ | $EGREP "$file_magic_regex" > /dev/null; then @@ -5379,6 +5434,11 @@ else $echo >> $output "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. + + # Make sure env LD_LIBRARY_PATH does not mess us up + if test -n \"\${LD_LIBRARY_PATH+set}\"; then + export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH + fi " case $host in # Backslashes separate directories on plain windows @@ -5606,9 +5666,53 @@ fi\ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit $EXIT_FAILURE fi - newdependency_libs="$newdependency_libs $libdir/$name" + if test "X$EGREP" = X ; then + EGREP=egrep + fi + # We do not want portage's install root ($D) present. Check only for + # this if the .la is being installed. + if test "$installed" = yes && test "$D"; then + eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else + mynewdependency_lib="$libdir/$name" + fi + # Do not add duplicates + if test "$mynewdependency_lib"; then + my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` + if test -z "$my_little_ninja_foo_1"; then + newdependency_libs="$newdependency_libs $mynewdependency_lib" + fi + fi + ;; + *) + if test "$installed" = yes; then + # Rather use S=WORKDIR if our version of portage supports it. + # This is because some ebuild (gcc) do not use $S as buildroot. + if test "$PWORKDIR"; then + S="$PWORKDIR" + fi + # We do not want portage's build root ($S) present. + my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` + # We do not want portage's install root ($D) present. + my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` + if test -n "$my_little_ninja_foo_2" && test "$S"; then + mynewdependency_lib="" + elif test -n "$my_little_ninja_foo_3" && test "$D"; then + eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + else + mynewdependency_lib="$deplib" + fi + else + mynewdependency_lib="$deplib" + fi + # Do not add duplicates + if test "$mynewdependency_lib"; then + my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` + if test -z "$my_little_ninja_foo_4"; then + newdependency_libs="$newdependency_libs $mynewdependency_lib" + fi + fi ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -5660,6 +5764,10 @@ fi\ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac + # Do not add duplicates + if test "$installed" = yes && test "$D"; then + install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` + fi $echo > $output "\ # $outputname - a libtool library file # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP diff --git a/src/config.h.in b/src/config.h.in index e79ea040e..0608196e3 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -190,31 +190,31 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* The size of `int', as computed by sizeof. */ +/* The size of a `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of `long int', as computed by sizeof. */ +/* The size of a `long int', as computed by sizeof. */ #undef SIZEOF_LONG_INT -/* The size of `long long int', as computed by sizeof. */ +/* The size of a `long long int', as computed by sizeof. */ #undef SIZEOF_LONG_LONG_INT -/* The size of `short int', as computed by sizeof. */ +/* The size of a `short int', as computed by sizeof. */ #undef SIZEOF_SHORT_INT -/* The size of `unsigned int', as computed by sizeof. */ +/* The size of a `unsigned int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_INT -/* The size of `unsigned long int', as computed by sizeof. */ +/* The size of a `unsigned long int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG_INT -/* The size of `unsigned long long int', as computed by sizeof. */ +/* The size of a `unsigned long long int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG_LONG_INT -/* The size of `unsigned short int', as computed by sizeof. */ +/* The size of a `unsigned short int', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_SHORT_INT -/* The size of `void *', as computed by sizeof. */ +/* The size of a `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P /* Define to 1 if you have the ANSI C header files. */ diff --git a/src/kvi_configstatus.h b/src/kvi_configstatus.h index 68620ba92..f5ecf59a2 100644 --- a/src/kvi_configstatus.h +++ b/src/kvi_configstatus.h @@ -8,10 +8,10 @@ /* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */ /* this is the build date (configure date rather) */ -#define BUILD_DATE "Mon Jan 29 01:42:01 UTC 2007" +#define BUILD_DATE "Sat Feb 3 03:34:24 UTC 2007" /* these are the build flags */ -#define BUILD_FLAGS "x86_64-cefgiopsAGTZ" +#define BUILD_FLAGS "x86_64-cefgikopsAGTZ" /* define if you want to enable the Arts daemon support */ /* #undef COMPILE_ARTS_SUPPORT */ @@ -41,7 +41,7 @@ #define COMPILE_IPV6_SUPPORT 1 /* define if you want to compile the KDE 3.x support */ -/* #undef COMPILE_KDE_SUPPORT */ +#define COMPILE_KDE_SUPPORT 1 /* define if you want the memory checks */ /* #undef COMPILE_MEMORY_CHECKS */ diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am index 7cd16ae65..250de5317 100644 --- a/src/kvilib/build/Makefile.am +++ b/src/kvilib/build/Makefile.am @@ -82,6 +82,7 @@ libkvilib_la_SOURCES = \ ../tal/kvi_tal_application.cpp \ ../tal/kvi_tal_filedialog.cpp \ ../tal/kvi_tal_grid.cpp \ + ../tal/kvi_tal_groupbox.cpp \ ../tal/kvi_tal_hbox.cpp \ ../tal/kvi_tal_iconview.cpp \ ../tal/kvi_tal_listbox.cpp \ @@ -128,11 +129,13 @@ headers_HEADERS = \ ../core/kvi_string.h \ ../core/kvi_stringarray.h \ ../core/kvi_valuelist.h \ + ../ext/kvi_accel.h \ ../ext/kvi_cmdformatter.h \ ../ext/kvi_config.h \ ../ext/kvi_crypt.h \ ../ext/kvi_databuffer.h \ ../ext/kvi_doublebuffer.h \ + ../ext/kvi_draganddrop.h \ ../ext/kvi_osinfo.h \ ../ext/kvi_garbage.h \ ../ext/kvi_imagelib.h \ @@ -170,6 +173,7 @@ headers_HEADERS = \ ../system/kvi_env.h \ ../system/kvi_library.h \ ../system/kvi_locale.h \ + ../system/kvi_process.h \ ../system/kvi_stdarg.h \ ../system/kvi_thread.h \ ../system/kvi_time.h \ @@ -183,6 +187,9 @@ headers_HEADERS = \ ../tal/kvi_tal_grid.h \ ../tal/kvi_tal_grid_qt3.h \ ../tal/kvi_tal_grid_qt4.h \ + ../tal/kvi_tal_groupbox.h \ + ../tal/kvi_tal_groupbox_qt3.h \ + ../tal/kvi_tal_groupbox_qt4.h \ ../tal/kvi_tal_hbox.h \ ../tal/kvi_tal_hbox_qt3.h \ ../tal/kvi_tal_hbox_qt4.h \ @@ -197,7 +204,8 @@ headers_HEADERS = \ ../tal/kvi_tal_listview_qt4.h \ ../tal/kvi_tal_mainwindow.h \ ../tal/kvi_tal_mainwindow_kde.h \ - ../tal/kvi_tal_mainwindow_qt.h \ + ../tal/kvi_tal_mainwindow_qt3.h \ + ../tal/kvi_tal_mainwindow_qt4.h \ ../tal/kvi_tal_menubar.h \ ../tal/kvi_tal_menubar_kde.h \ ../tal/kvi_tal_menubar_qt.h \ @@ -209,7 +217,8 @@ headers_HEADERS = \ ../tal/kvi_tal_scrollview_qt4.h \ ../tal/kvi_tal_toolbar.h \ ../tal/kvi_tal_toolbar_kde.h \ - ../tal/kvi_tal_toolbar_qt.h \ + ../tal/kvi_tal_toolbar_qt3.h \ + ../tal/kvi_tal_toolbar_qt4.h \ ../tal/kvi_tal_toolbardocktype.h \ ../tal/kvi_tal_tooltip.h \ ../tal/kvi_tal_vbox.h \ @@ -240,8 +249,6 @@ headers_HEADERS = \ $(SS_QT_MOC) $< -o $@ - - %.moc: %.h $(SS_QT_MOC) $< -o $@ @@ -254,16 +261,17 @@ headers_HEADERS = \ ../tal/kvi_tal_application.cpp: ../tal/kvi_tal_application_kde.moc ../tal/kvi_tal_application.cpp: ../tal/kvi_tal_application_qt.moc ../tal/kvi_tal_mainwindow.cpp: ../tal/kvi_tal_mainwindow_kde.moc -../tal/kvi_tal_mainwindow.cpp: ../tal/kvi_tal_mainwindow_qt.moc +../tal/kvi_tal_mainwindow.cpp: ../tal/kvi_tal_mainwindow_qt3.moc +../tal/kvi_tal_mainwindow.cpp: ../tal/kvi_tal_mainwindow_qt4.moc ../tal/kvi_tal_menubar.cpp: ../tal/kvi_tal_menubar_kde.moc ../tal/kvi_tal_menubar.cpp: ../tal/kvi_tal_menubar_qt.moc -../tal/kvi_tal_toolbar.cpp: ../tal/kvi_tal_toolbar_kde.moc -../tal/kvi_tal_toolbar.cpp: ../tal/kvi_tal_toolbar_qt.moc ../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_kde.moc ../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_qt.moc ../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_qt4.moc ../tal/kvi_tal_grid.cpp: ../tal/kvi_tal_grid_qt3.moc ../tal/kvi_tal_grid.cpp: ../tal/kvi_tal_grid_qt4.moc +../tal/kvi_tal_groupbox.cpp: ../tal/kvi_tal_groupbox_qt3.moc +../tal/kvi_tal_groupbox.cpp: ../tal/kvi_tal_groupbox_qt4.moc ../tal/kvi_tal_hbox.cpp: ../tal/kvi_tal_hbox_qt3.moc ../tal/kvi_tal_hbox.cpp: ../tal/kvi_tal_hbox_qt4.moc ../tal/kvi_tal_vbox.cpp: ../tal/kvi_tal_vbox_qt3.moc @@ -280,6 +288,9 @@ headers_HEADERS = \ ../tal/kvi_tal_iconview.cpp: ../tal/kvi_tal_iconview_qt4.moc ../tal/kvi_tal_scrollview.cpp: ../tal/kvi_tal_scrollview_qt3.moc ../tal/kvi_tal_scrollview.cpp: ../tal/kvi_tal_scrollview_qt4.moc +../tal/kvi_tal_toolbar.cpp: ../tal/kvi_tal_toolbar_qt3.moc +../tal/kvi_tal_toolbar.cpp: ../tal/kvi_tal_toolbar_qt4.moc +../tal/kvi_tal_toolbar.cpp: ../tal/kvi_tal_toolbar_kde.moc # diff --git a/src/kvilib/ext/kvi_accel.h b/src/kvilib/ext/kvi_accel.h new file mode 100644 index 000000000..4500cb3c8 --- /dev/null +++ b/src/kvilib/ext/kvi_accel.h @@ -0,0 +1,38 @@ +#ifndef _KVI_ACCEL_H_ +#define _KVI_ACCEL_H_ + +//============================================================================= +// +// File : kvi_accel.h +// Creation date : Wed Feb 01 2007 01:45:21 CEST by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 "kvi_settings.h" + +#ifdef COMPILE_USE_QT4 + #include <q3accel.h> + #define KviAccel Q3Accel +#else + #include <qaccel.h> + #define KviAccel QAccel +#endif + +#endif //!_KVI_ACCEL_H_ diff --git a/src/kvilib/ext/kvi_draganddrop.h b/src/kvilib/ext/kvi_draganddrop.h new file mode 100644 index 000000000..13bb1b2c5 --- /dev/null +++ b/src/kvilib/ext/kvi_draganddrop.h @@ -0,0 +1,45 @@ +#ifndef _KVI_DRAGANDDROP_H_ +#define _KVI_DRAGANDDROP_H_ + +//============================================================================= +// +// File : kvi_draganddrop.h +// Creation date : Wed Feb 01 2007 01:45:21 CEST by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 "kvi_settings.h" + + +#ifdef COMPILE_USE_QT4 + #include <q3dragobject.h> + #define KviDragObject Q3DragObject + #define KviUriDrag Q3UriDrag + #define KviTextDrag Q3TextDrag + #define KviImageDrag Q3ImageDrag +#else + #include <qdragobject.h> + #define KviDragObject QDragObject + #define KviUriDrag QUriDrag + #define KviTextDrag QTextDrag + #define KviImageDrag QImageDrag +#endif + +#endif //!_KVI_DRAGANDDROP_H_ diff --git a/src/kvilib/system/kvi_process.h b/src/kvilib/system/kvi_process.h new file mode 100644 index 000000000..5b4a1ffb9 --- /dev/null +++ b/src/kvilib/system/kvi_process.h @@ -0,0 +1,37 @@ +#ifndef _KVI_PROCESS_H_ +#define _KVI_PROCESS_H_ +//============================================================================= +// +// File : kvi_process.h +// Creation date : Tue Jan 30 2007 04:05:41 CEST by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 "kvi_settings.h" + +#ifdef COMPILE_USE_QT4 + #include <q3process.h> + #define KviProcess Q3Process +#else + #include <qprocess.h> + #define KviProcess QProcess +#endif + +#endif //!_KVI_PROCESS_H_ diff --git a/src/kvilib/tal/kvi_tal_groupbox.cpp b/src/kvilib/tal/kvi_tal_groupbox.cpp new file mode 100644 index 000000000..830df938e --- /dev/null +++ b/src/kvilib/tal/kvi_tal_groupbox.cpp @@ -0,0 +1,34 @@ +//============================================================================= +// +// File : kvi_tal_groupbox.cpp +// Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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. +// +//============================================================================= + +#define __KVILIB__ +#include "kvi_tal_groupbox.h" + + +#ifdef COMPILE_USE_QT4 + #include "kvi_tal_groupbox_qt4.moc" +#else + #include "kvi_tal_groupbox_qt3.moc" +#endif + diff --git a/src/kvilib/tal/kvi_tal_groupbox.h b/src/kvilib/tal/kvi_tal_groupbox.h new file mode 100644 index 000000000..c13660e1e --- /dev/null +++ b/src/kvilib/tal/kvi_tal_groupbox.h @@ -0,0 +1,36 @@ +#ifndef _KVI_TAL_GROUPBOX_H_ +#define _KVI_TAL_GROUPBOX_H_ + +//============================================================================= +// +// File : kvi_tal_groupbox.h +// Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 "kvi_settings.h" + +#ifdef COMPILE_USE_QT4 + #include "kvi_tal_groupbox_qt4.h" +#else + #include "kvi_tal_groupbox_qt3.h" +#endif + +#endif // _KVI_TAL_GROUPBOX_H_ diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt3.h b/src/kvilib/tal/kvi_tal_groupbox_qt3.h new file mode 100644 index 000000000..d11ffe842 --- /dev/null +++ b/src/kvilib/tal/kvi_tal_groupbox_qt3.h @@ -0,0 +1,47 @@ +#ifndef _KVI_TAL_GROUPBOX_QT3_H_ +#define _KVI_TAL_GROUPBOX_QT3_H_ + +//============================================================================= +// +// File : kvi_tal_groupbox_qt3.h +// Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 <qgroupbox.h> + +class KVILIB_API KviTalGroupBox : public QGroupBox +{ + Q_OBJECT +public: + KviTalGroupBox(QWidget * parent = 0) + : QGroupBox(parent) {}; + KviTalGroupBox(const QString & title,QWidget * parent = 0) + : QGroupBox(title,parent) {}; + KviTalGroupBox(int strips,Qt::Orientation orientation,QWidget * parent = 0) + : QGroupBox(strips,orientation,parent) {}; + KviTalGroupBox(int strips,Qt::Orientation orientation,const QString & title,QWidget * parent = 0) + : QGroupBox(strips,orientation,title,parent) {}; + ~KviTalGroupBox() {}; +}; + + + +#endif // _KVI_TAL_GROUPBOX_QT3_H_ diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt4.h b/src/kvilib/tal/kvi_tal_groupbox_qt4.h new file mode 100644 index 000000000..f795ee3d3 --- /dev/null +++ b/src/kvilib/tal/kvi_tal_groupbox_qt4.h @@ -0,0 +1,47 @@ +#ifndef _KVI_TAL_GROUPBOX_QT4_H_ +#define _KVI_TAL_GROUPBOX_QT4_H_ + +//============================================================================= +// +// File : kvi_tal_groupbox_qt4.h +// Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 <q3groupbox.h> + +class KVILIB_API KviTalGroupBox : public Q3GroupBox +{ + Q_OBJECT +public: + KviTalGroupBox(QWidget * parent = 0) + : Q3GroupBox(parent) {}; + KviTalGroupBox(const QString & title,QWidget * parent = 0) + : Q3GroupBox(title,parent) {}; + KviTalGroupBox(int strips,Qt::Orientation orientation,QWidget * parent = 0) + : Q3GroupBox(strips,orientation,parent) {}; + KviTalGroupBox(int strips,Qt::Orientation orientation,const QString & title,QWidget * parent = 0) + : Q3GroupBox(strips,orientation,title,parent) {}; + ~KviTalGroupBox() {}; +}; + + + +#endif // _KVI_TAL_GROUPBOX_QT4_H_ diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp index db3bbc8c2..1381ddef3 100644 --- a/src/kvilib/tal/kvi_tal_listview.cpp +++ b/src/kvilib/tal/kvi_tal_listview.cpp @@ -35,6 +35,7 @@ #include <qapplication.h> #include <qhash.h> #include <qstyleoption.h> + #include <qaccessible.h> static QStyleOptionQ3ListView getStyleOption(const Q3ListView *lv, const Q3ListViewItem *item) { @@ -441,12 +442,12 @@ else on = false; - #ifndef QT_NO_ACCESSIBILITY - if (old != d->currentState && listView()) - QAccessible::updateAccessibility(listView()->viewport(), indexOfItem(this), QAccessible::StateChanged); - #else - Q_UNUSED(old); - #endif + //#ifndef QT_NO_ACCESSIBILITY + // if (old != d->currentState && listView()) + // QAccessible::updateAccessibility(listView()->viewport(), indexOfItem(this), QAccessible::StateChanged); + //#else + // Q_UNUSED(old); + //#endif } void KviTalCheckListItem::setStoredState(ToggleState newState, KviTalCheckListItem *key) diff --git a/src/kvilib/tal/kvi_tal_mainwindow.cpp b/src/kvilib/tal/kvi_tal_mainwindow.cpp index d7348b6b6..48294e427 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.cpp +++ b/src/kvilib/tal/kvi_tal_mainwindow.cpp @@ -40,19 +40,23 @@ #else - KviTalMainWindow::KviTalMainWindow(QWidget * par,const char * nam) -#ifdef COMPILE_USE_QT4 - : QMainWindow(par) -#else - : QMainWindow(par,nam) -#endif - { - } - + #ifdef COMPILE_USE_QT4 + KviTalMainWindow::KviTalMainWindow(QWidget * par,const char * nam) + : Q3MainWindow(par,nam) + { + } + #include "kvi_tal_mainwindow_qt4.moc" + #else + KviTalMainWindow::KviTalMainWindow(QWidget * par,const char * nam) + : QMainWindow(par,nam) + { + } + #include "kvi_tal_mainwindow_qt3.moc" + #endif + KviTalMainWindow::~KviTalMainWindow() { } - #include "kvi_tal_mainwindow_qt.moc" #endif diff --git a/src/kvilib/tal/kvi_tal_mainwindow.h b/src/kvilib/tal/kvi_tal_mainwindow.h index b73470cfc..a1ca4d790 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.h +++ b/src/kvilib/tal/kvi_tal_mainwindow.h @@ -28,7 +28,11 @@ #ifdef COMPILE_KDE_SUPPORT #include "kvi_tal_mainwindow_kde.h" #else - #include "kvi_tal_mainwindow_qt.h" + #ifdef COMPILE_USE_QT4 + #include "kvi_tal_mainwindow_qt4.h" + #else + #include "kvi_tal_mainwindow_qt3.h" + #endif #endif #endif // _KVI_TAL_MAINWINDOW_H_ diff --git a/src/kvilib/tal/kvi_tal_mainwindow_qt.h b/src/kvilib/tal/kvi_tal_mainwindow_qt3.h index 9e80abf70..9e80abf70 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow_qt.h +++ b/src/kvilib/tal/kvi_tal_mainwindow_qt3.h diff --git a/src/kvilib/tal/kvi_tal_mainwindow_qt4.h b/src/kvilib/tal/kvi_tal_mainwindow_qt4.h new file mode 100644 index 000000000..840b613ee --- /dev/null +++ b/src/kvilib/tal/kvi_tal_mainwindow_qt4.h @@ -0,0 +1,36 @@ +#ifndef _KVI_TAL_MAINWINDOW_QT_H_ +#define _KVI_TAL_MAINWINDOW_QT_H_ + +// +// File : kvi_tal_mainwindow_qt.h +// Creation date : Sun Aug 12 2001 04:43:58 by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 <q3mainwindow.h> + +class KVILIB_API KviTalMainWindow : public Q3MainWindow +{ + Q_OBJECT +public: + KviTalMainWindow(QWidget * par,const char * nam); + ~KviTalMainWindow(); +}; + +#endif // _KVI_TAL_MAINWINDOW_QT_H_ diff --git a/src/kvilib/tal/kvi_tal_popupmenu_qt4.h b/src/kvilib/tal/kvi_tal_popupmenu_qt4.h index 1a6e58b2b..514a51183 100644 --- a/src/kvilib/tal/kvi_tal_popupmenu_qt4.h +++ b/src/kvilib/tal/kvi_tal_popupmenu_qt4.h @@ -49,6 +49,14 @@ public: { return Q3PopupMenu::insertItem(QIcon(pix),szText,-1,-1); } + int insertItem(const QString &szText,int id) + { + return Q3PopupMenu::insertItem(szText,id); + } + int insertItem(const QPixmap &pix,const QString &szText,int id) + { + return Q3PopupMenu::insertItem(QIcon(pix),szText,id,-1); + } int insertItem(const QString &szText,const QObject * pReceiver,const char * szSlot) { return Q3PopupMenu::insertItem(szText,pReceiver,szSlot); diff --git a/src/kvilib/tal/kvi_tal_scrollview_qt4.h b/src/kvilib/tal/kvi_tal_scrollview_qt4.h index 68ad803c9..d3d3562cf 100644 --- a/src/kvilib/tal/kvi_tal_scrollview_qt4.h +++ b/src/kvilib/tal/kvi_tal_scrollview_qt4.h @@ -27,14 +27,14 @@ #include "kvi_settings.h" -#include <qscrollarea.h> +#include <q3scrollview.h> -class KVILIB_API KviTalScrollView : public QScrollArea +class KVILIB_API KviTalScrollView : public Q3ScrollView { Q_OBJECT public: KviTalScrollView(QWidget * pParent) - : QScrollArea(pParent) {}; + : Q3ScrollView(pParent) {}; virtual ~KviTalScrollView() {}; }; diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp index 14c465912..822281fe9 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.cpp +++ b/src/kvilib/tal/kvi_tal_toolbar.cpp @@ -41,23 +41,26 @@ #else - KviTalToolBar::KviTalToolBar(const QString &label,QMainWindow *w,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) -#ifdef COMPILE_USE_QT4 - : QToolBar(label,w) -#else - : QToolBar(label,w,dock,bNewLine,nam) -#endif - { -#ifdef COMPILE_USE_QT4 - if(bNewLine)w->addToolBarBreak(dock); - w->addToolBar(dock,this); -#endif - } + #ifdef COMPILE_USE_QT4 + KviTalToolBar::KviTalToolBar(const QString &label,Q3MainWindow *w,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) + : Q3ToolBar(label,w,dock,bNewLine,nam) + { + } + + #include "kvi_tal_toolbar_qt4.moc" + + #else + KviTalToolBar::KviTalToolBar(const QString &label,QMainWindow *w,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) + : QToolBar(label,w,dock,bNewLine,nam) + { + } + + #include "kvi_tal_toolbar_qt.moc" + #endif KviTalToolBar::~KviTalToolBar() { } - #include "kvi_tal_toolbar_qt.moc" #endif diff --git a/src/kvilib/tal/kvi_tal_toolbar.h b/src/kvilib/tal/kvi_tal_toolbar.h index c7c0c573b..48bf0a233 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.h +++ b/src/kvilib/tal/kvi_tal_toolbar.h @@ -27,7 +27,11 @@ #ifdef COMPILE_KDE_SUPPORT #include "kvi_tal_toolbar_kde.h" #else - #include "kvi_tal_toolbar_qt.h" + #ifdef COMPILE_USE_QT4 + #include "kvi_tal_toolbar_qt4.h" + #else + #include "kvi_tal_toolbar_qt3.h" + #endif #endif #endif //_KVI_TAL_TOOLBAR_H_ diff --git a/src/kvilib/tal/kvi_tal_toolbar_qt.h b/src/kvilib/tal/kvi_tal_toolbar_qt3.h index bcde34eb7..bcde34eb7 100644 --- a/src/kvilib/tal/kvi_tal_toolbar_qt.h +++ b/src/kvilib/tal/kvi_tal_toolbar_qt3.h diff --git a/src/kvilib/tal/kvi_tal_toolbar_qt4.h b/src/kvilib/tal/kvi_tal_toolbar_qt4.h new file mode 100644 index 000000000..f04819ea9 --- /dev/null +++ b/src/kvilib/tal/kvi_tal_toolbar_qt4.h @@ -0,0 +1,38 @@ +#ifndef _KVI_TAL_TOOLBAR_QT4_H_ +#define _KVI_TAL_TOOLBAR_QT4_H_ +// +// File : kvi_tal_toolbar_qt4.h +// Creation date : Wed Feb 1 2007 04:11:11 2001 GMT by Szymon Stefanek +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// 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 <q3toolbar.h> +#include <q3mainwindow.h> + +#include "kvi_tal_toolbardocktype.h" + +class KVILIB_API KviTalToolBar : public Q3ToolBar +{ + Q_OBJECT +public: + KviTalToolBar(const QString &label,Q3MainWindow *w,QT_TOOLBARDOCK_TYPE dock = QT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); + ~KviTalToolBar(); +}; + +#endif //_KVI_TAL_TOOLBAR_QT_H_ diff --git a/src/kvilib/tal/kvi_tal_toolbardocktype.h b/src/kvilib/tal/kvi_tal_toolbardocktype.h index 93314ceae..8aa2b3f89 100644 --- a/src/kvilib/tal/kvi_tal_toolbardocktype.h +++ b/src/kvilib/tal/kvi_tal_toolbardocktype.h @@ -25,6 +25,16 @@ #include "kvi_settings.h" #ifdef COMPILE_USE_QT4 + #define QT_TOOLBARDOCK_TYPE Qt::Dock + #define QT_DOCK_TOP Qt::DockTop + #define QT_DOCK_LEFT Qt::DockLeft + #define QT_DOCK_RIGHT Qt::DockRight + #define QT_DOCK_BOTTOM Qt::DockBottom + #define QT_DOCK_MINIMIZED Qt::DockMinimized + #define QT_DOCK_TORNOFF Qt::DockTornOff + #define QT_DOCK_UNMANAGED Qt::DockUnmanaged + /* + // We will need these when we'll use the real QToolBar in Qt 4.x #define QT_TOOLBARDOCK_TYPE Qt::ToolBarArea #define QT_DOCK_TOP Qt::TopToolBarArea #define QT_DOCK_LEFT Qt::LeftToolBarArea @@ -34,6 +44,7 @@ #define QT_DOCK_MINIMIZED Qt::TopToolBarArea #define QT_DOCK_TORNOFF Qt::TopToolBarArea #define QT_DOCK_UNMANAGED Qt::TopToolBarArea + */ #else #if QT_VERSION >= 300 #define QT_TOOLBARDOCK_TYPE Qt::Dock diff --git a/src/kvilib/tal/kvi_tal_widgetstack_qt4.h b/src/kvilib/tal/kvi_tal_widgetstack_qt4.h index 1e58ef370..724228d38 100644 --- a/src/kvilib/tal/kvi_tal_widgetstack_qt4.h +++ b/src/kvilib/tal/kvi_tal_widgetstack_qt4.h @@ -27,14 +27,15 @@ #include "kvi_settings.h" -#include <qstackedwidget.h> +//#include <qstackedwidget.h> +#include <q3widgetstack.h> -class KviTalWidgetStack : public QStackedWidget +class KviTalWidgetStack : public Q3WidgetStack { Q_OBJECT public: KviTalWidgetStack(QWidget * pParent) - : QStackedWidget(pParent) {}; + : Q3WidgetStack(pParent) {}; virtual ~KviTalWidgetStack() {}; }; diff --git a/src/kvirc/build/Makefile.am b/src/kvirc/build/Makefile.am index 69308d2f0..9d8675db9 100644 --- a/src/kvirc/build/Makefile.am +++ b/src/kvirc/build/Makefile.am @@ -238,6 +238,7 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ ../ui/kvi_mdimanager.cpp \ ../ui/kvi_menubar.cpp \ ../ui/kvi_modeeditor.cpp \ +../ui/kvi_modew.cpp \ ../ui/kvi_msgbox.cpp \ ../ui/kvi_optionswidget.cpp \ ../ui/kvi_query.cpp \ @@ -251,12 +252,11 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \ ../ui/kvi_texticonwin.cpp \ ../ui/kvi_themedlabel.cpp \ ../ui/kvi_toolbar.cpp \ +../ui/kvi_toolwindows_container.cpp \ ../ui/kvi_topicw.cpp \ -../ui/kvi_modew.cpp \ ../ui/kvi_styled_controls.cpp \ ../ui/kvi_userlistview.cpp \ -../ui/kvi_window.cpp \ -../ui/kvi_toolwindows_container.cpp +../ui/kvi_window.cpp # # Command useful to find out all the headers diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 568ddca4f..e01eb9d8b 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -757,7 +757,9 @@ QWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) this,SLOT(activate()),t,name()); b->setPopup(m_pPopup); b->setPopupDelay(1); +#ifndef COMPILE_USE_QT4 b->setShowSubmenuIndicator(true); +#endif registerWidget(b); if(!isEnabled())b->setEnabled(false); return b; diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index 69a49398b..9dd08087f 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -4,7 +4,7 @@ // Created on Wed 07 Apr 2004 03:03:52 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2004-2005 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2004-2007 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -90,19 +90,19 @@ bool KviKvsProcessAsyncOperation::start() args.append(m_pData->szCommandline); } - m_pProcess = new QProcess(args); - int c = QProcess::Stdin; + m_pProcess = new KviProcess(args); + int c = KviProcess::Stdin; if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT) { connect(m_pProcess,SIGNAL(readyReadStdout()),this,SLOT(readStdout())); - c |= QProcess::Stdout; + c |= KviProcess::Stdout; } if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR) { connect(m_pProcess,SIGNAL(readyReadStderr()),this,SLOT(readStderr())); - c |= QProcess::Stderr; + c |= KviProcess::Stderr; } m_pProcess->setCommunication(c); diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.h b/src/kvirc/kvs/kvi_kvs_processmanager.h index 9d0ed997e..21dab5e6d 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.h +++ b/src/kvirc/kvs/kvi_kvs_processmanager.h @@ -38,7 +38,8 @@ #undef Unsorted #endif -#include <qprocess.h> +#include "kvi_process.h" + #include <qtimer.h> #define KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT 1 @@ -78,14 +79,14 @@ public: protected: enum CallbackEvent { EventStarted,EventTerminated,EventStdout,EventStderr,EventPing }; private: - QProcess * m_pProcess; - KviKvsExtendedRunTimeData * m_pExtendedRunTimeData; - QString m_szStdoutBuffer; - QString m_szStderrBuffer; + KviProcess * m_pProcess; + KviKvsExtendedRunTimeData * m_pExtendedRunTimeData; + QString m_szStdoutBuffer; + QString m_szStderrBuffer; KviKvsProcessDescriptorData * m_pData; - QTimer * m_pPingTimer; - QTimer * m_pRunTimeTimer; - bool m_bDeletePending; + QTimer * m_pPingTimer; + QTimer * m_pRunTimeTimer; + bool m_bDeletePending; public: bool start(); private slots: diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp index 93705ccfa..95cd8cee1 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp @@ -118,13 +118,13 @@ const QString & KviKvsScriptAddon::uninstallCallbackCode() const QString & KviKvsScriptAddon::configureCallbackCode() { if(m_pConfigureCallback)return m_pConfigureCallback->code(); - return QString::null; + return KviQString::empty; } const QString & KviKvsScriptAddon::helpCallbackCode() { if(m_pHelpCallback)return m_pHelpCallback->code(); - return QString::null; + return KviQString::empty; } bool KviKvsScriptAddon::load(KviConfig * cfg,const QString &szName) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp index 535c0100f..07e2fe4c1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp @@ -33,6 +33,7 @@ #include "kvi_irccontext.h" #include "kvi_window.h" #include "kvi_ircconnection.h" +#include "kvi_qcstring.h" #include "kvi_out.h" @@ -80,7 +81,7 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c) if(!szAll.isEmpty())szAll.prepend(" "); szAll.prepend(m_szCmdName); - QCString szData; + KviQCString szData; if(!c->window()->context()) goto no_way_to_send_as_raw; diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 021d50b56..1e915bf38 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -1761,13 +1761,15 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) bool bNeedToUpdateUserlist = false; KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->find(msg->pSource->nick()); - if(e){ + if(e) + { int pos = decoded.find("Gender=",0,false); if(pos>=0) { QChar c = decoded[pos+7]; - switch(c) { + switch(c.unicode()) + { case 'F': case 'f': bNeedToUpdateUserlist = true; @@ -1782,7 +1784,8 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) } } - if(bNeedToUpdateUserlist) { + if(bNeedToUpdateUserlist) + { if(KviQString::equalCS(g_pActiveWindow->className(),QString("KviChannel"))) { ((KviChannel*)g_pActiveWindow)->userListView()->updateArea(); diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index 122bc3b3a..7c17e07c1 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -57,6 +57,7 @@ #include "kvi_lagmeter.h" #include "kvi_ircserver.h" #include "kvi_kvs_eventtriggers.h" +#include "kvi_qcstring.h" #include "kvi_settings.h" @@ -182,13 +183,13 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) // nick!user@host JOIN :#channel\x07[o|v] const QChar * pExt = KviQString::nullTerminatedArray(channel); char chExtMode = 0; - while(*pExt && (pExt->unicode() != 0x07))pExt++; - if(*pExt) + while(pExt->unicode() && (pExt->unicode() != 0x07))pExt++; + if(pExt->unicode()) { ++pExt; - if(*pExt) + if(pExt->unicode()) { - chExtMode = (*pExt); + chExtMode = (char)pExt->unicode(); channel.remove(channel.length() - 2,2); // assuming that we're at the end (we should be) } // else { senseless 0x07 in channel name ? } @@ -633,10 +634,10 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg) { if(_OUTPUT_VERBOSE) console->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Attempting to rejoin \r!c\r%Q\r..."),&szChan); - QCString szC = msg->connection()->encodeText(szChan); + KviQCString szC = msg->connection()->encodeText(szChan); if(!szPass.isEmpty()) { - QCString szP = msg->connection()->encodeText(szChan); + KviQCString szP = msg->connection()->encodeText(szChan); msg->connection()->sendFmtData("JOIN %s %s",szC.data(),szP.data()); } else msg->connection()->sendFmtData("JOIN %s",szC.data()); } diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index 861beb97b..ce4782148 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -4,7 +4,7 @@ // Creation date : Thu Aug 3 2000 01:30:45 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2004 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 1999-2007 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -49,6 +49,7 @@ #include "kvi_ircconnectiontarget.h" #include "kvi_time.h" #include "kvi_lagmeter.h" +#include "kvi_qcstring.h" #include <qpixmap.h> #include <qdatetime.h> @@ -396,7 +397,7 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) // [=|*|@] is the type of the channel: // = --> public * --> private @ --> secret // ...but we ignore it - //QString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- QCString::data() is implicitly unsafe: it CAN return 0 + //QString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- KviQCString::data() is implicitly unsafe: it CAN return 0 QString szChan = msg->connection()->decodeText(msg->safeParam(2)); KviChannel * chan = msg->connection()->findChannel(szChan); // and run to the first nickname @@ -870,7 +871,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) &szActual,msg->numeric(),&szWText,&nextNick); } - QCString d = msg->connection()->encodeText(nextNick); + KviQCString d = msg->connection()->encodeText(nextNick); msg->connection()->sendFmtData("NICK %s",d.data()); } @@ -1636,7 +1637,7 @@ void KviServerParser::parseNumericBackFromAway(KviIrcMessage * msg) { if(_OUTPUT_PARANOIC) msg->console()->output(KVI_OUT_AWAY,__tr2qs("Restoring pre-away nickname (%Q)"),&szNickBeforeAway); - QCString szDat = msg->connection()->encodeText(szNickBeforeAway); + KviQCString szDat = msg->connection()->encodeText(szNickBeforeAway); msg->connection()->sendFmtData("NICK %s",szDat.data()); } @@ -1674,7 +1675,7 @@ void KviServerParser::parseNumericAway(KviIrcMessage * msg) if(_OUTPUT_PARANOIC) msg->console()->output(KVI_OUT_AWAY,__tr2qs("Setting away nickname (%Q)"),&szNewNick); - QCString dat = msg->connection()->encodeText(szNewNick); + KviQCString dat = msg->connection()->encodeText(szNewNick); msg->connection()->sendFmtData("NICK %s",dat.data()); } } diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index cefd7fd34..1149728d1 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -32,12 +32,20 @@ #include <qlayout.h> #include <qlabel.h> -#include <qscrollview.h> -#include <qheader.h> +//#include <qscrollview.h> #include <qpainter.h> #include <qpixmap.h> -#include <qsimplerichtext.h> -#include <qdragobject.h> +#ifdef COMPILE_USE_QT4 + #include <q3header.h> + #include <q3simplerichtext.h> + #include <qmime.h> + #include <qevent.h> +#else + #include <qheader.h> + #include <qsimplerichtext.h> +#endif + +#include "kvi_draganddrop.h" #define LVI_ICON_SIZE 32 #define LVI_BORDER 4 @@ -56,7 +64,11 @@ KviActionDrawerPageListViewItem::KviActionDrawerPageListViewItem(KviTalListView t += " <font color=\"#a0a0a0\">[" + __tr2qs("Script") + "]</font>"; t += "<br><font size=\"-1\">" + a->description()+ "</font>"; m_szKey = a->visibleName().upper(); +#ifdef COMPILE_USE_QT4 + m_pText = new Q3SimpleRichText(t,v->font()); +#else m_pText = new QSimpleRichText(t,v->font()); +#endif QPixmap * p = a->bigIcon(); m_pIcon = p ? new QPixmap(*p) : new QPixmap(LVI_ICON_SIZE,LVI_ICON_SIZE); } @@ -127,9 +139,9 @@ void KviActionDrawerPageListView::contentsMousePressEvent(QMouseEvent * e) KviListView::contentsMousePressEvent(e); KviActionDrawerPageListViewItem * i = (KviActionDrawerPageListViewItem *)itemAt(QPoint(5,contentsToViewport(e->pos()).y())); if(!i)return; - QTextDrag * d = new QTextDrag(i->name(),this); // does this leak memory ? - if(i->icon())d->setPixmap(*(i->icon()),QPoint(3,3)); - d->dragCopy(); + KviTextDrag * dr = new KviTextDrag(i->name(),this); // does this leak memory ? + if(i->icon())dr->setPixmap(*(i->icon()),QPoint(3,3)); + dr->dragCopy(); } void KviActionDrawerPageListView::resizeEvent(QResizeEvent * e) diff --git a/src/kvirc/ui/kvi_actiondrawer.h b/src/kvirc/ui/kvi_actiondrawer.h index 386307742..581d00390 100644 --- a/src/kvirc/ui/kvi_actiondrawer.h +++ b/src/kvirc/ui/kvi_actiondrawer.h @@ -34,7 +34,11 @@ class KviActionDrawerPage; class QPixmap; -class QSimpleRichText; +#ifdef COMPILE_USE_QT4 + class Q3SimpleRichText; +#else + class QSimpleRichText; +#endif class KviAction; class KVIRC_API KviActionDrawerPageListViewItem : public KviTalListViewItem @@ -44,7 +48,11 @@ public: ~KviActionDrawerPageListViewItem(); protected: QString m_szName; +#ifdef COMPILE_USE_QT4 + Q3SimpleRichText * m_pText; +#else QSimpleRichText * m_pText; +#endif QPixmap * m_pIcon; KviTalListView * m_pListView; QString m_szKey; diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index 748311583..bbd8844c7 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -72,6 +72,7 @@ #include <qsplitter.h> #include <qtoolbutton.h> #include <qlabel.h> +#include <qevent.h> #include <qpalette.h> #include "kvi_tal_popupmenu.h" @@ -84,6 +85,7 @@ #endif + // FIXME: #warning "+a Anonymous channel mode!" // FIXME: #warning "+r channel mode (reop)" // FIXME: #warning "OnChannelFlood event...." @@ -114,7 +116,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // Button box m_pButtonBox = new KviTalHBox(this); - m_pTopSplitter = new QSplitter(QSplitter::Horizontal,m_pButtonBox,"top_splitter"); + m_pTopSplitter = new QSplitter(Qt::Horizontal,m_pButtonBox); m_pButtonBox->setStretchFactor(m_pTopSplitter,1); @@ -132,10 +134,9 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name createTextEncodingButton(m_pButtonContainer); // Central splitter - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this); // Spitted vertially on the left - m_pVertSplitter = new QSplitter(QSplitter::Vertical,m_pSplitter, - "vertical_splitter"); + m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); // With the IRC view over m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); @@ -283,7 +284,15 @@ void KviChannel::saveProperties(KviConfig *cfg) KviWindow::saveProperties(cfg); cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes()); cfg->writeEntry("Splitter",m_pSplitter->sizes()); +#ifdef COMPILE_USE_QT4 + QList<int> tmp = m_pVertSplitter->sizes(); + KviValueList<int> tmp2; + for(QList<int>::Iterator it = tmp.begin();it != tmp.end();++it) + tmp2.append(*it); + cfg->writeEntry("VertSplitter",m_pMessageView ? tmp2 : m_VertSplitterSizesList); +#else cfg->writeEntry("VertSplitter",m_pMessageView ? m_pVertSplitter->sizes() : m_VertSplitterSizesList); +#endif cfg->writeEntry("PrivateBackground",m_privateBackground); cfg->writeEntry("DoubleView",m_pMessageView ? true : false); if(m_pUserListView) @@ -404,7 +413,7 @@ void KviChannel::modeSelectorDone() void KviChannel::setMode(const char * mode) { if(!connection())return; - QCString tmp = connection()->encodeText(m_szName); + KviQCString tmp = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s %s",tmp.data(),mode); } @@ -464,7 +473,7 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p { if(connection()) { - QCString szName = connection()->encodeText(m_szName); + KviQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s %c",szName.data(),flag); } } @@ -494,7 +503,7 @@ void KviChannel::removeMasks(KviMaskEditor *ed,KviPtrList<KviMaskEntry> *l) { if(connection()) { - QCString szName = connection()->encodeText(m_szName); + KviQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(QString(masks)).data()); } flags = ""; @@ -506,7 +515,7 @@ void KviChannel::removeMasks(KviMaskEditor *ed,KviPtrList<KviMaskEntry> *l) { if(connection()) { - QCString szName = connection()->encodeText(m_szName); + KviQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(QString(masks)).data()); } } @@ -1018,8 +1027,8 @@ void KviChannel::ownMessage(const QString &buffer) { if(!connection())return; - QCString szName = connection()->encodeText(windowName()); - QCString szData = encodeText(buffer); + KviQCString szName = connection()->encodeText(windowName()); + KviQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; @@ -1081,8 +1090,8 @@ void KviChannel::ownMessage(const QString &buffer) void KviChannel::ownAction(const QString &buffer) { if(!connection())return; - QCString szName = connection()->encodeText(m_szName); - QCString szData = encodeText(buffer); + KviQCString szName = connection()->encodeText(m_szName); + KviQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",szName.data(),0x01,d,0x01))return; @@ -1330,8 +1339,8 @@ void KviChannel::userAction(KviIrcMask * user,unsigned int uActionType) void KviChannel::topicSelected(const QString & topic) { if(!connection())return; - QCString szEncoded = encodeText(topic); - QCString szName = connection()->encodeText(m_szName); + KviQCString szEncoded = encodeText(topic); + KviQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("TOPIC %s :%s",szName.data(),szEncoded.length() ? szEncoded.data() : ""); } @@ -1353,9 +1362,9 @@ void KviChannel::closeEvent(QCloseEvent *e) if(KviKvsScript::evaluate(tmp,this,0,&vRet))vRet.asString(tmp); - QCString dat = encodeText(tmp); + KviQCString dat = encodeText(tmp); partMessageSent(); - QCString szName = connection()->encodeText(m_szName); + KviQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("PART %s :%s",szName.data(),dat.data() ? dat.data() : ""); // be sure to not reference ourselves here.. we could be disconnected! } else { @@ -1429,7 +1438,7 @@ void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy } e = new KviMaskEntry; e->szMask = mask; - e->szSetBy = setBy ? setBy : __tr2qs("(Unknown)"); + e->szSetBy = (!setBy.isEmpty()) ? setBy : __tr2qs("(Unknown)"); e->uSetAt = setAt; l->append(e); if(*ppEd)(*ppEd)->addMask(e); diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp index 392b6196f..18e0751bc 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : kvi_colorwin.cpp // Creation date : Wed Jan 6 1999 04:30:20 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 1999-2007 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #define __KVIRC__ @@ -30,13 +32,18 @@ #include <qnamespace.h> #include <qpainter.h> #include <qstring.h> +#include <qevent.h> KviColorWindow::KviColorWindow() :QWidget(0,"toplevel_color_window",Qt::WType_Popup) { +#ifdef COMPILE_USE_QT4 + setFocusPolicy(Qt::NoFocus); +#else setFocusPolicy(QWidget::NoFocus); - setBackgroundMode(NoBackground); +#endif + setBackgroundMode(Qt::NoBackground); setFixedSize(146,38); m_pOwner = 0; QFont fnt = QFont(); @@ -44,11 +51,13 @@ KviColorWindow::KviColorWindow() fnt.setPointSize(10); //QFont fnt("fixed",10); setFont(fnt); + m_iTimerId = -1; } KviColorWindow::~KviColorWindow() { - killTimers(); + if(m_iTimerId != -1) + killTimer(m_iTimerId); // if(m_pOwner)m_pOwner->setFocus(); } @@ -75,7 +84,8 @@ void KviColorWindow::paintEvent(QPaintEvent *) void KviColorWindow::keyPressEvent(QKeyEvent *e) { - killTimers(); + if(m_iTimerId != -1) + killTimer(m_iTimerId); hide(); if(m_pOwner)g_pApp->sendEvent(m_pOwner,e); } @@ -91,18 +101,20 @@ void KviColorWindow::mousePressEvent(QMouseEvent *e) if (e->x()>36 && e->y()>18) if(m_pOwner) g_pApp->sendEvent(m_pOwner,new QKeyEvent(QEvent::KeyPress,Qt::Key_1,49,Qt::NoButton,"1")); if(m_pOwner) g_pApp->sendEvent(m_pOwner,new QKeyEvent(QEvent::KeyPress,key,ascii,Qt::NoButton,str)); - killTimers(); + if(m_iTimerId != -1) + killTimer(m_iTimerId); hide(); } void KviColorWindow::show() { - startTimer(10000); //10 sec ...seems enough + m_iTimerId = startTimer(10000); //10 sec ...seems enough QWidget::show(); } void KviColorWindow::timerEvent(QTimerEvent *) { - killTimers(); + if(m_iTimerId != -1) + killTimer(m_iTimerId); hide(); } diff --git a/src/kvirc/ui/kvi_colorwin.h b/src/kvirc/ui/kvi_colorwin.h index 1d836f737..f879cec59 100644 --- a/src/kvirc/ui/kvi_colorwin.h +++ b/src/kvirc/ui/kvi_colorwin.h @@ -33,6 +33,7 @@ public: ~KviColorWindow(); private: QWidget *m_pOwner; + int m_iTimerId; public: void popup(QWidget *owner); private: diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 7546ecf35..90af7bc5d 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -90,6 +90,10 @@ #include <qmessagebox.h> #include <qstringlist.h> +#ifdef COMPILE_USE_QT4 + #include <q3mimefactory.h> +#endif + #define __KVI_DEBUG__ #include "kvi_debug.h" @@ -135,7 +139,7 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) connect(g_pApp,SIGNAL(recentUrlsChanged()),this,SLOT(recentUrlsChanged())); - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); @@ -339,7 +343,11 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & } if(e->avatar()) { +#ifdef COMPILE_USE_QT4 + Q3MimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); +#else QMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); +#endif buffer += "<tr><td><center><img src=\"ulv_avatar\"></center></td></tr>"; } @@ -450,10 +458,10 @@ void KviConsole::showNotifyList(bool bShow) void KviConsole::loadProperties(KviConfig *cfg) { int w = width(); - QValueList<int> def; + KviValueList<int> def; def.append((w * 85) / 100); def.append((w * 15) / 100); - QValueList<int> cur = cfg->readIntListEntry("Splitter",def); + KviValueList<int> cur = cfg->readIntListEntry("Splitter",def); // check the size correctness if(cur.count() != 2)cur = def; else { diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 15085b0f3..578ff5503 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -78,7 +78,11 @@ m_pWindow = wnd; +#ifdef COMPILE_USE_QT4 + setFocusPolicy(Qt::ClickFocus); +#else setFocusPolicy(QWidget::ClickFocus); +#endif QGridLayout *g = new QGridLayout(this,10,4,2,2); @@ -102,7 +106,11 @@ m_pDescriptionLabel = new QLabel(this); m_pDescriptionLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); +#ifdef COMPILE_USE_QT4 + m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft); +#else m_pDescriptionLabel->setAlignment(AlignTop | AlignLeft); +#endif g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3); m_pAuthorLabel = new QLabel(this); diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index bc1e41b63..2bb21f92d 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -1,6 +1,6 @@ #ifndef _KVI_CRYPTCONTROLLER_H_ #define _KVI_CRYPTCONTROLLER_H_ - +//============================================================================= // // File : kvi_cryptcontroller.h // Creation date : Fri Nov 03 2000 14:11:03 CEST by Szymon Stefanek @@ -22,13 +22,15 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_settings.h" -#ifdef COMPILE_CRYPT_SUPPORT +// Qt4 moc bails out on this ?????? +#if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN) #include <qwidget.h> #include "kvi_tal_listbox.h" #include <qpushbutton.h> @@ -52,7 +54,6 @@ bool bDoDecrypt; }; - class KVIRC_API KviEngineListBoxItem : public KviTalListBoxText { friend class KviCryptController; diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index fb8a21c2c..fde9bc149 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -34,12 +34,20 @@ #include <qlabel.h> #include <qpixmap.h> +#ifdef COMPILE_USE_QT4 + #include <qdesktopwidget.h> +#endif + // kvi_app.cpp extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog; KviCtcpPageDialog::KviCtcpPageDialog() : QWidget(0,"kvirc_ctcppage_dialog", +#ifdef COMPILE_USE_QT4 + Qt::WindowStaysOnTopHint | Qt::Tool | Qt::Dialog | Qt::Window) +#else WStyle_StaysOnTop | WStyle_Tool | WType_Dialog | WType_TopLevel) +#endif { QGridLayout * g = new QGridLayout(this,4,1,6,0); m_pWidgetStack = new KviTalWidgetStack(this); @@ -87,7 +95,11 @@ void KviCtcpPageDialog::tabSelected(int id) void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,const QString &szHost,const QString &szMsg) { +#ifdef COMPILE_USE_QT4 + int id = m_pTabBar->addTab(szNick); +#else int id = m_pTabBar->addTab(new QTab(szNick)); +#endif QLabel * l = new QLabel(this); l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); //l->setMaximumWidth(600); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 9262b8ee6..6faa5bae4 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -34,14 +34,26 @@ #include <qcursor.h> #include "kvi_tal_popupmenu.h" #include <qlayout.h> -#include <qdragobject.h> #include <qpixmap.h> #include <qcursor.h> #include <qtoolbutton.h> -#include <qobjectlist.h> #include <qpainter.h> #include <qstyle.h> +#ifdef COMPILE_USE_QT4 + #include <qevent.h> + #include <q3dragobject.h> + + #define QDragObject Q3DragObject + #define QTextDrag Q3TextDrag + #define QIconDrag Q3IconDrag + + #include <qstyleoption.h> +#else + #include <qobjectlist.h> + #include <qdragobject.h> +#endif + KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name) @@ -55,17 +67,29 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c QSize KviCustomToolBarSeparator::sizeHint() const { +#ifdef COMPILE_USE_QT4 + QStyleOption opt; + opt.initFrom(this); + int extent = style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent,&opt,this); +#else int extent = style().pixelMetric(QStyle::PM_DockWindowSeparatorExtent,this); - if(m_pToolBar->orientation() == Horizontal)return QSize(extent,0); +#endif + if(m_pToolBar->orientation() == Qt::Horizontal)return QSize(extent,0); else return QSize(0,extent); } void KviCustomToolBarSeparator::paintEvent(QPaintEvent *) { QPainter p(this); +#ifdef COMPILE_USE_QT4 + QStyleOption opt; + opt.initFrom(this); + style()->drawPrimitive(QStyle::PE_Q3DockWindowSeparator,&opt,&p,this); +#else QStyle::SFlags flags = QStyle::Style_Default; - if(m_pToolBar->orientation() == Horizontal)flags |= QStyle::Style_Horizontal; + if(m_pToolBar->orientation() == Qt::Horizontal)flags |= QStyle::Style_Horizontal; style().drawPrimitive(QStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags); +#endif } @@ -146,6 +170,14 @@ void KviCustomToolBar::beginCustomize() m_pFilteredChildren = new KviPtrDict<bool>; m_pFilteredChildren->setAutoDelete(true); // filter the events for all the children +#ifdef COMPILE_USE_QT4 + QList<QObject*> l = children(); + for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it) + { + if((*it)->isWidgetType()) + filterChild(*it); + } +#else const QObjectList * l = children(); QObjectListIterator it(*l); while(QObject * o = it.current()) @@ -154,11 +186,20 @@ void KviCustomToolBar::beginCustomize() filterChild(o); ++it; } +#endif } void KviCustomToolBar::endCustomize() { // stop filtering events +#ifdef COMPILE_USE_QT4 + QList<QObject*> l = children(); + for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it) + { + if((*it)->isWidgetType()) + unfilterChild(*it); + } +#else const QObjectList * l = children(); QObjectListIterator it(*l); while(QObject * o = it.current()) @@ -167,6 +208,7 @@ void KviCustomToolBar::endCustomize() unfilterChild(o); ++it; } +#endif // FIXME: We SHOULD MAKE SURE that the children are re-enabled... // this could be done by calling setEnabled(isEnabled()) on each action ? if(m_pFilteredChildren) @@ -336,7 +378,7 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl if(!pMinDistW) { // ops.. not found at all (empty toolbar or really far from any button) - if(orientation() == Horizontal) + if(orientation() == Qt::Horizontal) { if(pnt.x() < (width() / 2))iMinDistIdx = 0; // insert at position 0 else iMinDistIdx = idx; @@ -353,7 +395,7 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl { // would not put it over exclude idx // check if we have to stay on right or left of the widget found - if(orientation() == Horizontal) + if(orientation() == Qt::Horizontal) { if(pnt.x() > (pMinDistW->x() + (pMinDistW->width() / 2))) iMinDistIdx++; // need to put it on the right @@ -369,7 +411,7 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl // got the exclude idx by the way and wouldn't put exactly over it // check if exclude idx is "before" the current possible insert position // if it is , then lower down the index by one - if(orientation() == Horizontal) + if(orientation() == Qt::Horizontal) { if(pnt.x() > pntExclude.x()) iMinDistIdx--; // removing exclude will move everything one step back @@ -387,7 +429,7 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl /* - if(orientation() == Horizontal) + if(orientation() == Qt::Horizontal) { while((i = it.current())) { @@ -513,7 +555,7 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) { KviActionManager::instance()->setCurrentToolBar(this); QMouseEvent * ev = (QMouseEvent *)e; - if(ev->button() & LeftButton) + if(ev->button() & Qt::LeftButton) { if(o->isWidgetType()) { diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index 9326397b8..0b2e7f12d 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -34,6 +34,7 @@ #include "kvi_parameterlist.h" #include "kvi_frame.h" +#include "kvi_valuelist.h" #include <qpixmap.h> #include <qsplitter.h> @@ -46,7 +47,7 @@ KviDebugWindow::KviDebugWindow() : KviWindow(KVI_WINDOW_TYPE_DEBUG,g_pFrame,__tr2qs("Debug Messages"),0) { m_pInstance = this; - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pInput = new KviInput(this,0); updateCaption(); @@ -84,7 +85,7 @@ void KviDebugWindow::loadProperties(KviConfig *cfg) { int w = width(); KviWindow::loadProperties(cfg); - QValueList<int> def; + KviValueList<int> def; def.append((w * 80) / 100); def.append((w * 20) / 100); m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 631fcf82e..1e20ceb89 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -211,8 +211,7 @@ bool KviFileDialog::askForOpenFileNames(QStringList &buffer,const QString & capt } #endif - KviFileDialog * d = new KviFileDialog(initial ? QString(initial) : QString::null, - filter ? QString(filter) : QString::null,0,"open_file_names_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter ? QString(filter) : QString::null,0,"open_file_names_dialog",true); d->setCaption(caption); d->setMode(QFileDialog::ExistingFiles); //d->setShowHiddenFiles(showHidden); diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 82ac3fe37..609d67628 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -65,14 +65,27 @@ #include <qlineedit.h> #include <qmessagebox.h> #include <qcheckbox.h> -#include <qaccel.h> + #include <qtimer.h> #include <qlayout.h> #if QT_VERSION >= 300 #include <qfile.h> #include <qtextstream.h> - #include <qdockarea.h> + #ifdef COMPILE_USE_QT4 + #include <q3dockarea.h> + #define QDockArea Q3DockArea + #else + #include <qdockarea.h> + #endif +#endif + + +#ifdef COMPILE_USE_QT4 + #include <qdesktopwidget.h> + #include <qevent.h> +#else + #include <qaccel.h> #endif #include <time.h> @@ -106,7 +119,7 @@ KviFrame::KviFrame() m_pDockExtension = 0; - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); // m_pSplitter->setFrameShape(QFrame::NoFrame); setCentralWidget(m_pSplitter); @@ -149,7 +162,8 @@ KviFrame::KviFrame() applyOptions(); - m_pAccel = new QAccel(this); + + m_pAccel = new KviAccel(this); installAccelerators(this); @@ -231,7 +245,7 @@ void KviFrame::restoreModuleExtensionToolBars() { QString szMod = szEntry.left(idx); szEntry.remove(0,idx + 1); - g_pModuleExtensionManager->allocateExtension("toolbar",szEntry,firstConsole(),0,0,szMod); + g_pModuleExtensionManager->allocateExtension("toolbar",KviStr(szEntry),firstConsole(),0,0,szMod); } } } @@ -322,53 +336,53 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId) </example> */ -QAccel * KviFrame::installAccelerators(QWidget * wnd) +KviAccel * KviFrame::installAccelerators(QWidget * wnd) { - QAccel *ac = new QAccel(wnd ? (QWidget *)wnd : (QWidget *)this); + KviAccel *ac = new KviAccel(wnd ? (QWidget *)wnd : (QWidget *)this); static int accel_table[] = { - Key_Left + ALT , // prev window - Key_Right + ALT , // next window - Key_Up + CTRL , // maximize window - Key_Down + CTRL , // minimize window - Key_Escape +CTRL, // minimize window - Key_Left + ALT + SHIFT , // prev window in context - Key_Right + ALT + SHIFT, // next window in context - Key_F4 + CTRL , // close current window - Key_1 + CTRL , // script accels... - Key_2 + CTRL , - Key_3 + CTRL , - Key_4 + CTRL , - Key_5 + CTRL , - Key_6 + CTRL , - Key_7 + CTRL , - Key_8 + CTRL , - Key_9 + CTRL , - Key_0 + CTRL , - Key_F1 , // reserved for context sensitive help - Key_F2 , - Key_F3 , - Key_F4 , - Key_F5 , - Key_F6 , - Key_F7 , - Key_F8 , - Key_F9 , - Key_F10 , - Key_F11 , - Key_F12 , -/* Key_F1 + SHIFT , // window select... - Key_F2 + SHIFT , - Key_F3 + SHIFT , - Key_F4 + SHIFT , - Key_F5 + SHIFT , - Key_F6 + SHIFT , - Key_F7 + SHIFT , - Key_F8 + SHIFT , - Key_F9 + SHIFT , - Key_F10 + SHIFT , - Key_F11 + SHIFT , - Key_F12 + SHIFT ,*/ + Qt::Key_Left + Qt::ALT , // prev window + Qt::Key_Right + Qt::ALT , // next window + Qt::Key_Up + Qt::CTRL , // maximize window + Qt::Key_Down + Qt::CTRL , // minimize window + Qt::Key_Escape +Qt::CTRL, // minimize window + Qt::Key_Left + Qt::ALT + Qt::SHIFT , // prev window in context + Qt::Key_Right + Qt::ALT + Qt::SHIFT, // next window in context + Qt::Key_F4 + Qt::CTRL , // close current window + Qt::Key_1 + Qt::CTRL , // script accels... + Qt::Key_2 + Qt::CTRL , + Qt::Key_3 + Qt::CTRL , + Qt::Key_4 + Qt::CTRL , + Qt::Key_5 + Qt::CTRL , + Qt::Key_6 + Qt::CTRL , + Qt::Key_7 + Qt::CTRL , + Qt::Key_8 + Qt::CTRL , + Qt::Key_9 + Qt::CTRL , + Qt::Key_0 + Qt::CTRL , + Qt::Key_F1 , // reserved for context sensitive help + Qt::Key_F2 , + Qt::Key_F3 , + Qt::Key_F4 , + Qt::Key_F5 , + Qt::Key_F6 , + Qt::Key_F7 , + Qt::Key_F8 , + Qt::Key_F9 , + Qt::Key_F10 , + Qt::Key_F11 , + Qt::Key_F12 , +/* Qt::Key_F1 + Qt::SHIFT , // window select... + Qt::Key_F2 + Qt::SHIFT , + Qt::Key_F3 + Qt::SHIFT , + Qt::Key_F4 + Qt::SHIFT , + Qt::Key_F5 + Qt::SHIFT , + Qt::Key_F6 + Qt::SHIFT , + Qt::Key_F7 + Qt::SHIFT , + Qt::Key_F8 + Qt::SHIFT , + Qt::Key_F9 + Qt::SHIFT , + Qt::Key_F10 + Qt::SHIFT , + Qt::Key_F11 + Qt::SHIFT , + Qt::Key_F12 + Qt::SHIFT ,*/ 0 }; @@ -386,21 +400,21 @@ QAccel * KviFrame::installAccelerators(QWidget * wnd) void KviFrame::accelActivated(int id) { - QAccel * acc = (QAccel *)sender(); + KviAccel * acc = (KviAccel *)sender(); int keys = (int)(acc->key(id)); KviTaskBarItem *item = 0; switch(keys) { - case (Key_Left+ALT): switchToPrevWindow(); break; - case (Key_Right+ALT): switchToNextWindow(); break; - case (Key_Up+CTRL): maximizeWindow(); break; - case (Key_Escape+CTRL): - case (Key_Down+CTRL): minimizeWindow(); break; - case (Key_Left+ALT+SHIFT): switchToPrevWindowInContext(); break; - case (Key_Right+ALT+SHIFT): switchToNextWindowInContext(); break; - case (Key_F4+CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; - case (Key_F1): g_pApp->contextSensitiveHelp(); break; + case (Qt::Key_Left+Qt::ALT): switchToPrevWindow(); break; + case (Qt::Key_Right+Qt::ALT): switchToNextWindow(); break; + case (Qt::Key_Up+Qt::CTRL): maximizeWindow(); break; + case (Qt::Key_Escape+Qt::CTRL): + case (Qt::Key_Down+Qt::CTRL): minimizeWindow(); break; + case (Qt::Key_Left+Qt::ALT+Qt::SHIFT): switchToPrevWindowInContext(); break; + case (Qt::Key_Right+Qt::ALT+Qt::SHIFT): switchToNextWindowInContext(); break; + case (Qt::Key_F4+Qt::CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; + case (Qt::Key_F1): g_pApp->contextSensitiveHelp(); break; /* case(Key_F1 + SHIFT): item = m_pTaskBar->item(0); if(item) setActiveWindow(item->window()); @@ -1128,7 +1142,11 @@ bool KviFrame::focusNextPrevChild(bool next) QWidget * w = focusWidget(); if(w) { +#ifdef COMPILE_USE_QT4 + if(w->focusPolicy() == Qt::StrongFocus)return false; +#else if(w->focusPolicy() == QWidget::StrongFocus)return false; +#endif //QVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index d05dd90d0..c39241328 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -45,13 +45,14 @@ class KviConsole; class KviTaskBarBase; class QSplitter; class KviConfig; -class QAccel; class KviMexToolBar; class KviIrcContext; class KviIrcConnection; class KviStatusBar; class KviTalPopupMenu; +#include "kvi_accel.h" // we need this :/ + #ifdef COMPILE_ON_WINDOWS // MSCV has problems with KviPtrList<KviWindow> otherwise #include "kvi_window.h" @@ -106,7 +107,7 @@ protected: KviIrcContext * m_pActiveContext; // the context of the m_pActiveWindow // other KviDockExtension * m_pDockExtension; // the frame's dock extension: this should be prolly moved ? - QAccel * m_pAccel; // the global accelelrator + KviAccel * m_pAccel; // the global accelelrator public: // the mdi manager: handles mdi children KviMdiManager * mdiManager(){ return m_pMdi; }; @@ -216,8 +217,8 @@ protected: virtual void windowActivationChange(bool bOldActive); void updatePseudoTransparency(); - - QAccel * installAccelerators(QWidget * wnd); + + KviAccel * installAccelerators(QWidget * wnd); void switchToNextWindow(); void switchToPrevWindow(); diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp index 1e6d98a89..83b53af20 100644 --- a/src/kvirc/ui/kvi_historywin.cpp +++ b/src/kvirc/ui/kvi_historywin.cpp @@ -33,6 +33,10 @@ #include <qnamespace.h> +#ifdef COMPILE_USE_QT4 + #include <qevent.h> +#endif + #include <ctype.h> extern KviInputHistory * g_pInputHistory; @@ -45,13 +49,23 @@ KviHistoryWindow::KviHistoryWindow() #endif { m_pOwner = 0; +#ifdef COMPILE_USE_QT4 + setHScrollBarMode(Q3ScrollView::AlwaysOff); +#else setHScrollBarMode(QScrollView::AlwaysOff); +#endif connect(this,SIGNAL(selected(const QString &)),this,SLOT(itemSelected(const QString &))); + + m_iTimerId = -1; } KviHistoryWindow::~KviHistoryWindow() { - killTimers(); + if(m_iTimerId != -1) + { + killTimer(m_iTimerId); + m_iTimerId = -1; + } } void KviHistoryWindow::fill() @@ -198,7 +212,7 @@ void KviHistoryWindow::ownerDead() void KviHistoryWindow::show() { - startTimer(100000); //100 sec ...seems enough + m_iTimerId = startTimer(100000); //100 sec ...seems enough QWidget::show(); } @@ -209,7 +223,11 @@ void KviHistoryWindow::timerEvent(QTimerEvent *) void KviHistoryWindow::doHide() { - killTimers(); + if(m_iTimerId != -1) + { + killTimer(m_iTimerId); + m_iTimerId = -1; + } hide(); if(m_pOwner)m_pOwner->setFocus(); } diff --git a/src/kvirc/ui/kvi_historywin.h b/src/kvirc/ui/kvi_historywin.h index bc3c29a30..e166a40ae 100644 --- a/src/kvirc/ui/kvi_historywin.h +++ b/src/kvirc/ui/kvi_historywin.h @@ -40,6 +40,7 @@ public: ~KviHistoryWindow(); private: KviInput * m_pOwner; + int m_iTimerId; public: void popup(KviInput *owner); // KviInput * owner(){ return m_pOwner; }; diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index b379ad3db..9f0b52756 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -117,7 +117,7 @@ KviImageDialog::KviImageDialog(QWidget * par, g->addMultiCellWidget(m_pTypeComboBox,0,0,0,2); - m_pTypeList = new QValueList<int>; + m_pTypeList = new KviValueList<int>; QString bi = __tr2qs("Builtin images"); @@ -281,7 +281,11 @@ void KviImageDialog::heartbeat() QImage i(szPath); if(i.isNull())continue; QPixmap pix; +#ifdef COMPILE_USE_QT4 + if((i.width() > 80) || (i.height() > 80))pix = i.scaled(80,80,Qt::KeepAspectRatio); +#else if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,QImage::ScaleMin); +#endif else pix = i; QString tip = szFile; diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h index 3ffd44287..27737fb82 100644 --- a/src/kvirc/ui/kvi_imagedialog.h +++ b/src/kvirc/ui/kvi_imagedialog.h @@ -30,7 +30,7 @@ #include <qdialog.h> #include <qcombobox.h> #include "kvi_tal_listbox.h" -#include <qvaluelist.h> +#include "kvi_valuelist.h" #include <qtimer.h> #include <qstringlist.h> @@ -74,7 +74,7 @@ public: virtual ~KviImageDialog(); protected: QComboBox * m_pTypeComboBox; - QValueList<int> * m_pTypeList; + KviValueList<int> * m_pTypeList; KviTalListBox * m_pListBox; QTimer * m_pTimer; int m_iJobType; diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 06903cc3a..b4d03e945 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -53,6 +53,7 @@ #include "kvi_doublebuffer.h" #include "kvi_styled_controls.h" #include "kvi_texticonmanager.h" +#include "kvi_draganddrop.h" #include <qlabel.h> #include <ctype.h> @@ -61,7 +62,6 @@ #include "kvi_tal_popupmenu.h" #include <qpainter.h> #include <qclipboard.h> -#include <qdragobject.h> #include <qstringlist.h> #include "kvi_list.h" #include <qapplication.h> @@ -70,6 +70,8 @@ #include "kvi_tal_hbox.h" #include <qlayout.h> #include <qstyle.h> +#include <qevent.h> + #ifndef ACCEL_KEY #define ACCEL_KEY(k) "\t" + QString(QKeySequence( Qt::CTRL | Qt::Key_ ## k )) @@ -201,8 +203,12 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi m_bReadOnly = FALSE; setInputMethodEnabled(true); - setBackgroundMode(NoBackground); - setFocusPolicy(StrongFocus); + setBackgroundMode(Qt::NoBackground); +#ifdef COMPILE_USE_QT4 + setFocusPolicy(Qt::StrongFocus); +#else + setFocusPolicy(QWidget::StrongFocus); +#endif setAcceptDrops(true); setFrameStyle( LineEditPanel ); setFrameShadow( Plain ); @@ -211,7 +217,11 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi m_pIconMenu = new KviTalPopupMenu(); connect(m_pIconMenu,SIGNAL(activated(int)),this,SLOT(iconPopupActivated(int))); - setCursor( IbeamCursor ); +#ifdef COMPILE_USE_QT4 + setCursor(Qt::IBeamCursor); +#else + setCursor(IbeamCursor); +#endif } KviInputEditor::~KviInputEditor() @@ -247,7 +257,7 @@ void KviInputEditor::applyOptions() void KviInputEditor::dragEnterEvent(QDragEnterEvent *e) { - if(QUriDrag::canDecode(e)) + if(KviUriDrag::canDecode(e)) { e->accept(true); // FIXME: #warning "FIX THIS COMMENTED STUFF" @@ -260,7 +270,7 @@ void KviInputEditor::dragEnterEvent(QDragEnterEvent *e) void KviInputEditor::dropEvent(QDropEvent *e) { QStringList list; - if(QUriDrag::decodeLocalFiles(e,list)) + if(KviUriDrag::decodeLocalFiles(e,list)) { //debug("Local files decoded"); if(!list.isEmpty()) @@ -298,9 +308,17 @@ QSize KviInputEditor::sizeHint() const int h = QMAX(fm.lineSpacing(), 14) + 2*2; /* innerMargin */ int w = fm.width( 'x' ) * 17; // "some" int m = frameWidth() * 2; +#ifdef COMPILE_USE_QT4 + QStyleOption opt; + opt.initFrom(this); + return (style()->sizeFromContents(QStyle::CT_LineEdit,&opt, + QSize( w + m, h + m ). + expandedTo(QApplication::globalStrut()),this)); +#else return (style().sizeFromContents(QStyle::CT_LineEdit, this, QSize( w + m, h + m ). expandedTo(QApplication::globalStrut()))); +#endif } #define KVI_INPUT_DEF_BACK 100 @@ -330,7 +348,7 @@ void KviInputEditor::drawContents(QPainter *p) pa.fillRect(0,0,widgetWidth,widgetHeight,KVI_OPTION_COLOR(KviOption_colorInputBackground)); if(pix) - KviPixmapUtils::drawPixmapWithPainter(&pa,pix,(Qt::AlignmentFlags)(KVI_OPTION_UINT(KviOption_uintInputPixmapAlign)),rect,widgetWidth,widgetHeight); + KviPixmapUtils::drawPixmapWithPainter(&pa,pix,KVI_OPTION_UINT(KviOption_uintInputPixmapAlign),rect,widgetWidth,widgetHeight); #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif @@ -721,7 +739,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() void KviInputEditor::mousePressEvent(QMouseEvent *e) { - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { m_iCursorPosition = charIndexFromXPosition(e->pos().x()); //move the cursor to @@ -734,7 +752,7 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) killDragTimer(); m_iDragTimer = startTimer(KVI_INPUT_DRAG_TIMEOUT); - } else if(e->button() & RightButton) + } else if(e->button() & Qt::RightButton) { int type = g_pActiveWindow->type(); @@ -747,8 +765,12 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) if(c) { szClip = c->text(QClipboard::Clipboard); - + +#ifdef COMPILE_USE_QT4 + int occ = szClip.count(QChar('\n')); +#else int occ = szClip.contains(QChar('\n')); +#endif if(!szClip.isEmpty()) { @@ -779,8 +801,12 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) QLabel * l = new QLabel(label,g_pInputPopup); l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); l->setMargin(5); - + // FIXME: This does NOT work under Qt 4.x (they seem to consider it as bad UI design) +#ifndef COMPILE_USE_QT4 g_pInputPopup->insertItem(l); +#else + delete l; +#endif } } @@ -1185,7 +1211,10 @@ void KviInputEditor::focusInEvent(QFocusEvent *) update(); } // XIM handling... +#ifndef COMPILE_USE_QT4 + // THIS SEEMS TO BE GONE IN Qt4.x ? (even if the documentation states that it *should* be there) setMicroFocusHint(1,1,width() - 2,height() - 2,true,0); +#endif } void KviInputEditor::focusOutEvent(QFocusEvent *) @@ -1250,12 +1279,24 @@ void KviInputEditor::imComposeEvent(QIMEvent *e) { // replace the old pre-edit string with e->text() m_bUpdatesEnabled = false; +#ifdef COMPILE_USE_QT4 + // Qt 4.x ?????????? + m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->commitString()); + + // update selection inside the pre-edit + m_iIMSelectionBegin = m_iIMStart + e->replacementStart(); + m_iIMSelectionLength = e->replacementLength(); + moveCursorTo(m_iIMSelectionBegin); + +#else m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->text()); // update selection inside the pre-edit m_iIMSelectionBegin = m_iIMStart + e->cursorPos(); m_iIMSelectionLength = e->selectionLength(); moveCursorTo(m_iIMSelectionBegin); +#endif + // repaint m_bUpdatesEnabled = true; @@ -1269,7 +1310,12 @@ void KviInputEditor::imEndEvent(QIMEvent *e) { // replace the preedit area with the IM result text m_bUpdatesEnabled = false; +#ifdef COMPILE_USE_QT4 + // Qt 4.x ?????????? + m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->commitString()); +#else m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->text()); +#endif // move cursor to after the IM result text moveCursorTo(m_iIMStart + m_iIMLength); @@ -1299,7 +1345,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) { if((e->key() == Qt::Key_Tab) || (e->key() == Qt::Key_BackTab)) { - completion(e->state() & ShiftButton); + completion(e->state() & Qt::ShiftButton); return; } else { m_bLastCompletionFinished=1; @@ -1315,9 +1361,9 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) //Make CtrlKey and CommandKey ("Apple") behave equally on MacOSX. //This way typical X11 and Apple shortcuts can be used simultanously within the input line. #ifndef Q_OS_MACX - if(e->state() & ControlButton) + if(e->state() & Qt::ControlButton) #else - if((e->state() & ControlButton) || (e->state() & MetaButton)) + if((e->state() & Qt::ControlButton) || (e->state() & MetaButton)) #endif { switch(e->key()) @@ -1329,13 +1375,13 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) while(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { if(!m_szTextBuffer.at(m_iCursorPosition).isSpace())break; - internalCursorRight(e->state() & ShiftButton); + internalCursorRight(e->state() & Qt::ShiftButton); } // skip nonwhitespace while(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { if(m_szTextBuffer.at(m_iCursorPosition).isSpace())break; - internalCursorRight(e->state() & ShiftButton); + internalCursorRight(e->state() & Qt::ShiftButton); } repaintWithCursorOn(); } @@ -1347,13 +1393,13 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) while(m_iCursorPosition > 0) { if(!m_szTextBuffer.at(m_iCursorPosition - 1).isSpace())break; - internalCursorLeft(e->state() & ShiftButton); + internalCursorLeft(e->state() & Qt::ShiftButton); } // skip nonwhitespace while(m_iCursorPosition > 0) { if(m_szTextBuffer.at(m_iCursorPosition - 1).isSpace())break; - internalCursorLeft(e->state() & ShiftButton); + internalCursorLeft(e->state() & Qt::ShiftButton); } repaintWithCursorOn(); } @@ -1469,7 +1515,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) return; } - if((e->state() & AltButton) && (e->state() & Keypad)) + if((e->state() & Qt::AltButton) && (e->state() & Qt::Keypad)) { // Qt::Key_Meta seems to substitute Key_Alt on some keyboards if((e->key() == Qt::Key_Alt) || (e->key() == Qt::Key_Meta)) @@ -1487,7 +1533,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) return; } - if(e->state() & ShiftButton) + if(e->state() & Qt::ShiftButton) { switch(e->key()) { @@ -1507,7 +1553,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) break; } } - if(e->state() & AltButton) + if(e->state() & Qt::AltButton) { switch(e->key()) { @@ -1526,14 +1572,14 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) case Qt::Key_Right: if(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { - internalCursorRight(e->state() & ShiftButton); + internalCursorRight(e->state() & Qt::ShiftButton); repaintWithCursorOn(); } break; case Qt::Key_Left: if(m_iCursorPosition > 0) { - internalCursorLeft(e->state() & ShiftButton); + internalCursorLeft(e->state() & Qt::ShiftButton); repaintWithCursorOn(); } break; @@ -1570,7 +1616,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) case Qt::Key_Home: if(m_iCursorPosition > 0) { - if(e->state() & ShiftButton) + if(e->state() & Qt::ShiftButton) { if((m_iSelectionBegin == -1)&&(m_iSelectionEnd == -1))m_iSelectionEnd = m_iCursorPosition - 1; m_iSelectionBegin = 0; @@ -1581,7 +1627,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } break; case Qt::Key_End://we should call it even the cursor is at the end for deselecting - if(e->state() & ShiftButton) + if(e->state() & Qt::ShiftButton) { if((m_iSelectionBegin == -1)&&(m_iSelectionEnd == -1))m_iSelectionBegin = m_iCursorPosition; m_iSelectionEnd = m_szTextBuffer.length()-1; @@ -2301,7 +2347,7 @@ void KviInput::keyPressEvent(QKeyEvent *e) { //debug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().utf8().data()); - if(e->state() & ControlButton) + if(e->state() & Qt::ControlButton) { switch(e->key()) { @@ -2312,7 +2358,7 @@ void KviInput::keyPressEvent(QKeyEvent *e) } } - if(e->state() & ControlButton) + if(e->state() & Qt::ControlButton) { switch(e->key()) { @@ -2330,7 +2376,11 @@ void KviInput::keyPressEvent(QKeyEvent *e) { if(szText[0] != '/') { +#ifdef COMPILE_USE_QT4 + int nLines = szText.count('\n') + 1; +#else int nLines = szText.contains('\n') + 1; +#endif if(nLines > 15) { int nRet = QMessageBox::question( diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 8ddcdfe9e..951b0a3af 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -21,12 +21,14 @@ // #define __KVIRC__ #include "kvi_ipeditor.h" +#include "kvi_qcstring.h" + #include <qapplication.h> #include <qlineedit.h> #include <qlabel.h> #include <qframe.h> -#include <qcstring.h> #include <ctype.h> +#include <qevent.h> // FIXME: #warning "THIS COULD GO INTO libkvioptions ?" @@ -42,7 +44,12 @@ KviIpEditor::KviIpEditor(QWidget * parent,AddressType addrType,const QString &ip } m_pEdit[7] = 0; setFrameStyle(QFrame::Sunken|QFrame::StyledPanel); + +#ifdef COMPILE_USE_QT4 + setBackgroundRole(QPalette::Base); +#else setBackgroundMode(QWidget::PaletteBase); +#endif setAddressType(addrType); @@ -60,13 +67,22 @@ void KviIpEditor::setEnabled(bool bEnabled) for(int i=0;i<8;i++) { if(m_pEdit[i])m_pEdit[i]->setEnabled(bEnabled); - if(i<7)if(m_pLabel[i]){ + if(i<7)if(m_pLabel[i]) + { // Is this the right way ? +#ifdef COMPILE_USE_QT4 + m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); +#else m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); +#endif m_pLabel[i]->setEnabled(bEnabled); } } +#ifdef COMPILE_USE_QT4 + setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); +#else setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); +#endif } void KviIpEditor::setAddressType(AddressType addrType) @@ -110,7 +126,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr) // is valid before effectively setting the fields clear(); - QCString ip = ipAddr.ascii(); // ip addresses are digits & latin letters abcdef (IpV6) + KviQCString ip = ipAddr.ascii(); // ip addresses are digits & latin letters abcdef (IpV6) ip = ip.stripWhiteSpace(); const char * c = ip.data(); @@ -124,7 +140,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr) const char *anchor = c; while(isdigit(*c))c++; if(c == anchor)return false; // Invalid empty field - QCString str(anchor,(c - anchor) + 1); + KviQCString str(anchor,(c - anchor) + 1); bool bOk; int num = str.toInt(&bOk); if(!bOk)return false; // should never happen , but just to be sure @@ -140,7 +156,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr) { const char *anchor = c; while(isdigit(*c) || ((tolower(*c) >= 'a') && (tolower(*c) <= 'f')) || ((tolower(*c) >= 'A') && (tolower(*c) <= 'F')))c++; - QCString str(anchor,(c - anchor) + 1); + KviQCString str(anchor,(c - anchor) + 1); if(str.length() > 4)return false; // Too long m_pEdit[i]->setText(str.data()); if(i < 7){ @@ -203,7 +219,11 @@ void KviIpEditor::recreateChildren() m_pLabel[i]->setText(bIpV4 ? "." : ":"); m_pLabel[i]->show(); // Is this the right way ? setBackgroundMode seems to not work well +#ifdef COMPILE_USE_QT4 + m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); +#else m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); +#endif } } // Kill the unused widgets , if any diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index a309ed57a..c69b323c0 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -46,6 +46,9 @@ #include "kvi_tal_popupmenu.h" #include <qlayout.h> +#ifdef COMPILE_USE_QT4 + #include <qevent.h> +#endif #ifdef COMPILE_PSEUDO_TRANSPARENCY extern QPixmap * g_pShadedChildGlobalDesktopBackground; @@ -65,7 +68,11 @@ KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par,const char * } g_pToolBarGraphicalAppletList->append(this); +#ifdef COMPILE_USE_QT4 + setAutoFillBackground(false); +#else setBackgroundMode(QWidget::NoBackground); +#endif setMouseTracking(true); m_bResizeMode = false; @@ -113,7 +120,7 @@ toolbar.define(default) void KviToolBarGraphicalApplet::mouseMoveEvent(QMouseEvent * e) { - if(e->state() & LeftButton) + if(e->state() & Qt::LeftButton) { if(m_bResizeMode) { @@ -126,15 +133,15 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(QMouseEvent * e) } } else { if(e->pos().x() > width() - 4) - setCursor(sizeHorCursor); + setCursor(Qt::sizeHorCursor); else - setCursor(arrowCursor); + setCursor(Qt::arrowCursor); } } void KviToolBarGraphicalApplet::mousePressEvent(QMouseEvent * e) { - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { m_bResizeMode = (e->pos().x() > (width() - 4)); } @@ -208,7 +215,12 @@ void KviToolBarGraphicalApplet::paintEvent(QPaintEvent *e) pa.drawLine(1,height() - 1,width() - 1,height() - 1); pa.drawLine(width() - 1,1,width() - 1,height()); +#ifdef COMPILE_USE_QT4 + QPainter qt4SucksBecauseItNeedsAnAdditionalQPainter(this); + qt4SucksBecauseItNeedsAnAdditionalQPainter.drawPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height()); +#else bitBlt(this,e->rect().left(),e->rect().top(),g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),Qt::CopyROP); +#endif } void KviToolBarGraphicalApplet::drawContents(QPainter *) diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 92b195ff1..47a2ebe4d 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -104,6 +104,8 @@ #include "kvi_kvs_eventtriggers.h" #include "kvi_doublebuffer.h" #include "kvi_ircurl.h" +#include "kvi_draganddrop.h" +#include "kvi_qcstring.h" // FIXME: #warning "There should be an option to preserve control codes in copied text (clipboard) (mIrc = CTRL+Copy->with colors)" #include <qbitmap.h> @@ -117,6 +119,7 @@ #include <qmessagebox.h> #include <qtextcodec.h> #include <qdatetime.h> +#include <qevent.h> //#include <qcolor.h> // needed @@ -137,13 +140,17 @@ #include <qclipboard.h> #include <qdatetime.h> -#include <qdragobject.h> #include <qmessagebox.h> #include <qscrollbar.h> #include <qfontdialog.h> #include <time.h> +#ifdef COMPILE_USE_QT4 + #include <q3mimefactory.h> + #define QMimeSourceFactory Q3MimeSourceFactory +#endif + #ifdef COMPILE_ON_WINDOWS #pragma warning(disable: 4102) @@ -338,14 +345,22 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pMessagesStoppedWhileSelecting->setAutoDelete(false); // say qt to avoid erasing on repaint +#ifdef COMPILE_USE_QT4 + setAutoFillBackground(false); +#else setBackgroundMode(NoBackground); +#endif m_pFm = new QFontMetrics(font()); m_pToolTip = new KviIrcViewToolTip(this); // Create the scroll bar +#ifdef COMPILE_USE_QT4 + m_pScrollBar = new QScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); +#else m_pScrollBar = new QScrollBar(0,0,1,10,0,QScrollBar::Vertical,this,"irc_view_scrollbar"); +#endif m_pScrollBar->setTracking(true); m_pScrollBar->show(); m_pScrollBar->setFocusProxy(this); @@ -353,7 +368,11 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pToolsButton = new KviStyledToolButton(this,"btntools"); #if QT_VERSION >= 300 +#ifdef COMPILE_USE_QT4 + QIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); +#else QIconSet is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU)),QIconSet::Small); +#endif m_pToolsButton->setIconSet(is1); #else m_pToolsButton->setOnIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); @@ -470,7 +489,7 @@ void KviIrcView::enableDnd(bool bEnable) void KviIrcView::dragEnterEvent(QDragEnterEvent *e) { if(!m_bAcceptDrops)return; - e->accept(QUriDrag::canDecode(e)); + e->accept(KviUriDrag::canDecode(e)); emit dndEntered(); } @@ -478,7 +497,7 @@ void KviIrcView::dropEvent(QDropEvent *e) { if(!m_bAcceptDrops)return; QStringList list; - if(QUriDrag::decodeLocalFiles(e,list)) + if(KviUriDrag::decodeLocalFiles(e,list)) { if(!list.isEmpty()) { @@ -611,12 +630,12 @@ const QString & KviIrcView::lastMessageText() } pCur=pCur->pPrev; } - return QString::null; + return KviQString::empty; } const QString & KviIrcView::lastLineOfText() { - if(!m_pLastLine)return QString::null; + if(!m_pLastLine)return KviQString::empty; return m_pLastLine->szText; } @@ -702,7 +721,7 @@ bool KviIrcView::startLogging(const char *filename,bool bPrependCurBuffer) void KviIrcView::add2Log(const QString &szBuffer,int iMsgType) { QString szToWrite=QString("%1 %2\n").arg(iMsgType).arg(szBuffer); - QCString szTmp = szToWrite.utf8(); + KviQCString szTmp = KviQString::toUtf8(szToWrite); if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file."); } @@ -740,7 +759,7 @@ bool KviIrcView::saveBuffer(const char *filename) if(!f.open(IO_WriteOnly|IO_Truncate))return false; QString tmp; getTextBuffer(tmp); - QCString tmpx = tmp.utf8(); + KviQCString tmpx = KviQString::toUtf8(tmp); f.writeBlock(tmpx.data(),tmpx.length()); f.close(); return true; @@ -2768,7 +2787,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) pa.fillRect(rectLeft,rectTop,rectWidth,rectHeight,KVI_OPTION_COLOR(KviOption_colorIrcViewBackground)); if(pix) - KviPixmapUtils::drawPixmapWithPainter(&pa,pix,(Qt::AlignmentFlags)(KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign)),r,widgetWidth,widgetHeight); + KviPixmapUtils::drawPixmapWithPainter(&pa,pix,KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign),r,widgetWidth,widgetHeight); #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif @@ -3246,9 +3265,17 @@ no_selection_paint: { // paint the cursor line int iH = lineWrapsHeight + m_iFontLineSpacing; +#ifdef COMPILE_USE_QT4 + pa.setCompositionMode(QPainter::CompositionMode_SourceOut); +#else pa.setRasterOp(NotROP); +#endif pa.fillRect(0,curBottomCoord - iH,widgetWidth,iH + (m_iFontDescent << 1),Qt::black); +#ifdef COMPILE_USE_QT4 + pa.setCompositionMode(QPainter::CompositionMode_SourceOver); +#else pa.setRasterOp(CopyROP); +#endif } if(m_bMouseIsDown) @@ -3270,7 +3297,11 @@ no_selection_paint: // visible! bLineMarkPainted = true; //pa.setRasterOp(NotROP); +#ifdef COMPILE_USE_QT4 + pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,Qt::DotLine)); +#else pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,QPen::DotLine)); +#endif pa.drawLine(0,curBottomCoord,widgetWidth,curBottomCoord); //pa.setRasterOp(CopyROP); } // else was partially visible only @@ -3312,7 +3343,11 @@ no_selection_paint: // need to mark it! //pa.setRasterOp(NotROP); //pa.setPen(Qt::black); +#ifdef COMPILE_USE_QT4 + pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,Qt::DotLine)); +#else pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,QPen::DotLine)); +#endif int x = widgetWidth - 8; int y = KVI_IRCVIEW_VERTICAL_BORDER; pa.drawLine(x,y,x,y); @@ -3335,7 +3370,13 @@ no_selection_paint: pa.drawLine(widgetWidth,1,widgetWidth,widgetHeight); // COPY TO THE DISPLAY +#ifdef COMPILE_USE_QT4 + setAttribute(Qt::WA_PaintOutsidePaintEvent); + QPainter qt4SucksBecauseItNeedsAnAdditionalQPainter(this); + qt4SucksBecauseItNeedsAnAdditionalQPainter.drawPixmap(rectLeft,rectTop,rectWidth,rectHeight,*pDoubleBufferPixmap,rectLeft,rectTop,rectWidth,rectHeight); +#else bitBlt(this,rectLeft,rectTop,pDoubleBufferPixmap,rectLeft,rectTop,rectWidth,rectHeight,Qt::CopyROP); +#endif } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -4499,7 +4540,7 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) { if(m_pKviWindow->input()) m_pKviWindow->input()->setFocus(); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { // This is the beginning of a selection... // We just set the mouse to be "down" and @@ -4516,12 +4557,12 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) m_bMouseIsDown = true; - m_bShiftPressed = (e->state() & ShiftButton); + m_bShiftPressed = (e->state() & Qt::ShiftButton); calculateSelectionBounds(); } - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { if(m_iMouseTimer) { @@ -4554,7 +4595,7 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) pParams->append(szCmd); - if(!(e->state() & ControlButton))//(e->button() & RightButton) && ( + if(!(e->state() & Qt::ControlButton))//(e->button() & Qt::RightButton) && ( { if(!linkCmd.isEmpty()) { @@ -4568,9 +4609,9 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) case KVI_WINDOW_TYPE_CHANNEL: if(((KviChannel *)m_pKviWindow)->isOn(linkText)) { - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnChannelNickPopupRequest,m_pKviWindow,pParams); - if(e->button() & LeftButton) { + if(e->button() & Qt::LeftButton) { KVS_TRIGGER_EVENT(KviEvent_OnChannelNickLinkClick,m_pKviWindow,pParams); if(m_pKviWindow) { @@ -4587,9 +4628,9 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) case KVI_WINDOW_TYPE_QUERY: if(KviQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) { - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnQueryNickPopupRequest,m_pKviWindow,pParams); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnQueryNickLinkClick,m_pKviWindow,pParams); } else bTrigger = true; break; @@ -4601,41 +4642,41 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) { if(console()) { - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnNickLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnConsoleNickLinkClick,m_pKviWindow,pParams); } else emit rightClicked(); } } break; case 'h': - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnHostLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnHostLinkClick,m_pKviWindow,pParams); break; case 'u': - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnUrlLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnUrlLinkClick,m_pKviWindow,pParams); break; case 'c': - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnChannelLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnChannelLinkClick,m_pKviWindow,pParams); break; case 's': - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnServerLinkPopupRequest,m_pKviWindow,pParams); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) KVS_TRIGGER_EVENT(KviEvent_OnServerLinkClick,m_pKviWindow,pParams); break; default: { - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) { QString tmp; getLinkEscapeCommand(tmp,linkCmd,"[!rbt]"); @@ -4647,9 +4688,9 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) } break; } - } else if(e->button() & RightButton) emit rightClicked(); + } else if(e->button() & Qt::RightButton) emit rightClicked(); - } else if((e->button() & MidButton) || ((e->button() & RightButton) && (e->state() & ControlButton))) + } else if((e->button() & Qt::MidButton) || ((e->button() & Qt::RightButton) && (e->state() & Qt::ControlButton))) { QString tmp; getLinkEscapeCommand(tmp,linkCmd,QString("[!mbt]")); @@ -4701,7 +4742,7 @@ void KviIrcView::mouseReleaseEvent(QMouseEvent *) void KviIrcView::mouseMoveEvent(QMouseEvent *e) { // debug("Pos : %d,%d",e->pos().x(),e->pos().y()); - if(m_bMouseIsDown && (e->state() & LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?) + if(m_bMouseIsDown && (e->state() & Qt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?) { if(m_iSelectTimer == 0)m_iSelectTimer = startTimer(KVI_IRCVIEW_SELECT_REPAINT_INTERVAL); diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index 2438f69ce..d8aa2cf67 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -42,10 +42,15 @@ #include <qlabel.h> #include <qcheckbox.h> #include <qpushbutton.h> -#include <qheader.h> +#ifdef COMPILE_USE_QT4 + #include <q3header.h> +#else + #include <qheader.h> +#endif #include <qlineedit.h> #include <qcursor.h> -#include <qaccel.h> +#include "kvi_accel.h" +#include <qevent.h> /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -55,7 +60,7 @@ KviIrcMessageCheckListItem::KviIrcMessageCheckListItem(KviTalListView * par,KviIrcViewToolWidget * w,int id) -: QCheckListItem(par,QString::null,QCheckListItem::CheckBox) +: KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox) { m_iId = id; m_pToolWidget = 0; @@ -70,7 +75,7 @@ KviIrcMessageCheckListItem::~KviIrcMessageCheckListItem() void KviIrcMessageCheckListItem::stateChange(bool bOn) { - QCheckListItem::stateChange(bOn); + KviTalCheckListItem::stateChange(bOn); if(!m_pToolWidget)return; m_pToolWidget->forceRepaint(); } @@ -90,7 +95,7 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) l->setBackgroundColor(Qt::black); gl->addWidget(l,0,0); - QToolButton *tb = new QToolButton(DownArrow,this); + QToolButton *tb = new QToolButton(Qt::DownArrow,this,"hum"); tb->setFixedSize(14,14); tb->setAutoRepeat(false); connect(tb,SIGNAL(clicked()),m_pIrcView,SLOT(toggleToolWidget())); @@ -181,8 +186,8 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) gl->setResizeMode(QGridLayout::Fixed); m_pStringToFind->setFocus(); tw->showPage(w); - QAccel *a = new QAccel( this ); - a->connectItem( a->insertItem(Key_Escape), this,SLOT(close()) ); + KviAccel *a = new KviAccel( this ); + a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) ); } KviIrcViewToolWidget::~KviIrcViewToolWidget() diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h index f17183f12..e3f848728 100644 --- a/src/kvirc/ui/kvi_ircviewtools.h +++ b/src/kvirc/ui/kvi_ircviewtools.h @@ -32,7 +32,8 @@ #include <qstring.h> class QLabel; -class KviStyledCheckBox; +//class KviStyledCheckBox; +#include "kvi_styled_controls.h" class QLineEdit; class KviIrcView; @@ -56,7 +57,7 @@ public: class KviIrcViewToolWidget; -class KviIrcMessageCheckListItem : public QCheckListItem +class KviIrcMessageCheckListItem : public KviTalCheckListItem { public: KviIrcMessageCheckListItem(KviTalListView * par,KviIrcViewToolWidget * w,int id); diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index 6dea4b02e..6e935ef60 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -48,7 +48,11 @@ KviListView::~KviListView() void KviListView::setBackgroundOverlayPixmap(QPixmap * pix,int iAlignmentFlags) { setStaticBackground(TRUE); +#ifdef COMPILE_USE_QT4 + viewport()->setAutoFillBackground(false); +#else viewport()->setBackgroundMode(QWidget::NoBackground); +#endif m_pBackgroundOverlayPixmap=new QPixmap(*pix); m_iBackgroundOverlayAlignment= Qt::AlignRight | Qt::AlignBottom; repaintContents(); diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index bc1116dde..8c1620745 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -136,8 +136,12 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPt } w = w->parent(); } - + +#ifdef COMPILE_USE_QT4 + setFocusPolicy(Qt::ClickFocus); +#else setFocusPolicy(QWidget::ClickFocus); +#endif QGridLayout *g = new QGridLayout(this,3,3,2,2); @@ -176,7 +180,11 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPt g->addMultiCellWidget(l,1,1,0,1); m_pMaskBox = new KviTalListView(this); +#ifdef COMPILE_USE_QT4 + m_pMaskBox->setFocusPolicy(Qt::ClickFocus); +#else m_pMaskBox->setFocusPolicy(QWidget::ClickFocus); +#endif m_pMaskBox->setFocusProxy(this); m_pMaskBox->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); m_pMaskBox->addColumn(__tr2qs("Mask")); @@ -191,7 +199,11 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPt m_pRemoveMask = new QPushButton(__tr2qs("Re&move"),this); m_pRemoveMask->setEnabled(isEnabled); +#ifdef COMPILE_USE_QT4 + m_pRemoveMask->setFocusPolicy(Qt::ClickFocus); +#else m_pRemoveMask->setFocusPolicy(QWidget::ClickFocus); +#endif m_pRemoveMask->setFocusProxy(this); g->addWidget(m_pRemoveMask,3,1); connect(m_pRemoveMask,SIGNAL(clicked()),this,SLOT(removeClicked())); @@ -199,7 +211,11 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPt m_pAddButton = new QPushButton(__tr2qs("Add"),this); m_pAddButton->setEnabled(isEnabled); +#ifdef COMPILE_USE_QT4 + m_pAddButton->setFocusPolicy(Qt::ClickFocus); +#else m_pAddButton->setFocusPolicy(QWidget::ClickFocus); +#endif m_pAddButton->setFocusProxy(this); g->addWidget(m_pAddButton,3,0); connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index ce553ae22..3c788da57 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -45,8 +45,15 @@ #include <qstyle.h> #include <qpainter.h> #include "kvi_tal_popupmenu.h" -#include <qsimplerichtext.h> +#ifdef COMPILE_USE_QT4 + #include <q3simplerichtext.h> + #define QSimpleRichText Q3SimpleRichText + #include <qstyleoption.h> +#else + #include <qsimplerichtext.h> +#endif #include <qdrawutil.h> +#include <qevent.h> KviMdiCaptionButton::KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name) : QToolButton(parent,name) @@ -61,6 +68,14 @@ KviMdiCaptionButton::~KviMdiCaptionButton() } +#ifdef COMPILE_USE_QT4 +void KviMdiCaptionButton::paintEvent(QPaintEvent *e) +{ + QPainter painter(this); + drawButton(&painter); +} +#endif + void KviMdiCaptionButton::drawButton(QPainter *p) { QBrush b(parentWidget()->colorGroup().background()); @@ -69,8 +84,14 @@ void KviMdiCaptionButton::drawButton(QPainter *p) qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b); else p->fillRect(0,0,width(),height(),b); - + +#ifdef COMPILE_USE_QT4 + QStyleOptionButton opt; + opt.initFrom(this); + style()->drawControl(QStyle::CE_PushButtonLabel,&opt,p,this); +#else drawButtonLabel(p); +#endif } @@ -145,7 +166,11 @@ void KviMdiCaption::mousePressEvent(QMouseEvent *e) debug("mouse press"); m_bMouseGrabbed = true; m_lastMousePos = QCursor::pos(); +#ifdef COMPILE_USE_QT4 + setCursor(Qt::SizeAllCursor); +#else setCursor(QCursor::sizeAllCursor); +#endif //grabMouse(Qt::sizeAllCursor); //e->ignore(); } @@ -205,7 +230,11 @@ void KviMdiCaption::paintEvent(QPaintEvent * e) void KviMdiCaption::mouseReleaseEvent(QMouseEvent *) { m_bMouseGrabbed = false; +#ifdef COMPILE_USE_QT4 + setCursor(Qt::arrowCursor); +#else setCursor(QCursor::arrowCursor); +#endif // releaseMouse(); } diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index 78ee7db6e..5b31dcfeb 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -42,6 +42,9 @@ public: ~KviMdiCaptionButton(); protected: virtual void drawButton(QPainter * p); +#ifdef COMPILE_USE_QT4 + virtual void paintEvent(QPaintEvent *e); +#endif }; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index ce147d112..efadd08e9 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -42,7 +42,10 @@ #include <qstyle.h> #include <qpainter.h> #include "kvi_tal_popupmenu.h" -#include <qobjectlist.h> +#ifndef COMPILE_USE_QT4 + #include <qobjectlist.h> +#endif +#include <qevent.h> #ifdef Q_OS_MACX #include "kvi_app.h" //Needed for g_pApp @@ -104,11 +107,19 @@ QRect KviMdiChild::restoredGeometry() } +#ifdef COMPILE_USE_QT4 +void KviMdiChild::setBackgroundRole(QPalette::ColorRole) +{ + // hack + QFrame::setBackgroundRole(QPalette::Window); +} +#else void KviMdiChild::setBackgroundMode(QWidget::BackgroundMode) { // hack QFrame::setBackgroundMode(QWidget::PaletteBackground); } +#endif void KviMdiChild::setIcon(const QPixmap &pix) { @@ -328,7 +339,7 @@ QCursor KviMdiChild::getResizeCursor(int resizeCorner) void KviMdiChild::mouseMoveEvent(QMouseEvent *e) { - if(e->state() & LeftButton) + if(e->state() & Qt::LeftButton) { if(m_iResizeCorner && (m_state != Maximized))resizeWindowOpaque(m_iResizeCorner); } else { diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h index d035da668..6f1189792 100644 --- a/src/kvirc/ui/kvi_mdichild.h +++ b/src/kvirc/ui/kvi_mdichild.h @@ -93,7 +93,11 @@ public slots: signals: void systemPopupRequest(const QPoint & pnt); protected: +#ifdef COMPILE_USE_QT4 + virtual void setBackgroundRole(QPalette::ColorRole); +#else virtual void setBackgroundMode(QWidget::BackgroundMode bgmd); +#endif virtual void resizeEvent(QResizeEvent *e); virtual void mousePressEvent(QMouseEvent *e); virtual void mouseMoveEvent(QMouseEvent *e); diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 46c163c78..8d90eba49 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -43,6 +43,7 @@ #include <math.h> #include <qcursor.h> #include <qdrawutil.h> +#include <qevent.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY @@ -77,12 +78,21 @@ KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name) m_pTileMethodPopup = new KviTalPopupMenu(this); connect(m_pTileMethodPopup,SIGNAL(activated(int)),this,SLOT(tileMethodMenuActivated(int))); +#ifdef COMPILE_USE_QT4 + viewport()->setAutoFillBackground(false); +#else viewport()->setBackgroundMode(QWidget::NoBackground); +#endif setStaticBackground(true); resizeContents(width(),height()); +#ifdef COMPILE_USE_QT4 + setFocusPolicy(Qt::NoFocus); + viewport()->setFocusPolicy(Qt::NoFocus); +#else setFocusPolicy(QWidget::NoFocus); viewport()->setFocusPolicy(QWidget::NoFocus); +#endif connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); } @@ -281,7 +291,7 @@ QPoint KviMdiManager::getCascadePoint(int indexOfWindow) void KviMdiManager::mousePressEvent(QMouseEvent *e) { //Popup the window menu - if(e->button() & RightButton)m_pWindowPopup->popup(mapToGlobal(e->pos())); + if(e->button() & Qt::RightButton)m_pWindowPopup->popup(mapToGlobal(e->pos())); } void KviMdiManager::childMoved(KviMdiChild *) @@ -324,7 +334,7 @@ void KviMdiManager::maximizeChild(KviMdiChild * lpC) void KviMdiManager::resizeEvent(QResizeEvent *e) { //If we have a maximized children at the top , adjust its size - QScrollView::resizeEvent(e); + KviTalScrollView::resizeEvent(e); KviMdiChild *lpC=m_pZ->last(); if(lpC) { @@ -470,18 +480,18 @@ void KviMdiManager::updateContentsSize() void KviMdiManager::updateSDIMode() { - __range_valid(m_pSdiCloseButton); KviMdiChild * lpC = m_pZ->last(); - m_pSdiCloseButton->setEnabled(lpC ? lpC->closeEnabled() : false); + if(m_pSdiCloseButton) + m_pSdiCloseButton->setEnabled(lpC ? lpC->closeEnabled() : false); - - // This would result in an addictional main menu bar entry on MacOSX which would trigger a popup menu and not // a submenu. Due to the optical reasons it is removed here. // The same popup is triggered by right clicking on the window name in the channel window list. #ifndef Q_OS_MACX +#ifndef COMPILE_USE_QT4 +// FIXME: Adding widgets to menus is not supported KviMenuBar * b = m_pFrm->mainMenuBar(); const QPixmap * pix = lpC ? lpC->icon() : 0; @@ -497,6 +507,7 @@ void KviMdiManager::updateSDIMode() } else { m_pSdiIconButton->setPixmap(*pix); } +#endif #endif //Q_OS_MACX } @@ -524,6 +535,8 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) { KviMenuBar * b = m_pFrm->mainMenuBar(); +#ifndef COMPILE_USE_QT4 + // FIXME: This is NOT supported under QT4.. it sux if(!m_pSdiCloseButton) { m_pSdiMinimizeButton = new KviMenuBarToolButton(b,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),"btnminimize"); @@ -547,10 +560,10 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) emit enteredSdiMode(); - setVScrollBarMode(QScrollView::AlwaysOff); - setHScrollBarMode(QScrollView::AlwaysOff); + setVScrollBarMode(KviTalScrollView::AlwaysOff); + setHScrollBarMode(KviTalScrollView::AlwaysOff); } - +#endif updateSDIMode(); } @@ -587,8 +600,8 @@ void KviMdiManager::leaveSDIMode() if(m_iSdiRestoreItemId != 0)m_pFrm->mainMenuBar()->removeItem(m_iSdiRestoreItemId); if(m_iSdiMinimizeItemId != 0)m_pFrm->mainMenuBar()->removeItem(m_iSdiMinimizeItemId); - setVScrollBarMode(QScrollView::Auto); - setHScrollBarMode(QScrollView::Auto); + setVScrollBarMode(KviTalScrollView::Auto); + setHScrollBarMode(KviTalScrollView::Auto); emit leftSdiMode(); } diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 9775f9dfe..6db6eaf73 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -31,10 +31,10 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_styled_controls.h" #include "kvi_toolwindows_container.h" +#include "kvi_tal_scrollview.h" #include <qlayout.h> #include <qlabel.h> -#include <qscrollview.h> ////////////////////////////////////////////////////////////////////// @@ -44,7 +44,7 @@ //static char checkable_modes_table[KVI_NUM_CHECKABLE_MODES] = { 'p','s','t','n','m','i'}; -// FIXME: This widget should use a QScrollView! +// FIXME: This widget should use a KviTalScrollView! KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit) : KviWindowToolWidget(par,button) @@ -68,10 +68,18 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const QGridLayout *pMasterLayout = new QGridLayout(this,2,1,2,2); +#ifdef COMPILE_USE_QT4 + setFocusPolicy(Qt::ClickFocus); +#else setFocusPolicy(QWidget::ClickFocus); +#endif - QScrollView *pScrollView = new QScrollView(this); + KviTalScrollView *pScrollView = new KviTalScrollView(this); +#ifdef COMPILE_USE_QT4 + pScrollView->viewport()->setBackgroundRole(QPalette::Background); +#else pScrollView->viewport()->setBackgroundMode(QWidget::PaletteBackground); +#endif pMasterLayout->addWidget(pScrollView,0,0); @@ -117,7 +125,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains(ccc)); + cb->setChecked(m_szMode.contains((char)ccc.unicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index ac37fdb89..ceffe8087 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -27,10 +27,12 @@ #include "kvi_options.h" #include "kvi_ircconnectionserverinfo.h" #include "kvi_ircconnectionuserinfo.h" +#include "kvi_qcstring.h" #include <qframe.h> #include <qlineedit.h> #include "kvi_tal_hbox.h" +#include <qevent.h> KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name) :QFrame(par,name) @@ -38,7 +40,11 @@ KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name) m_pChannel=chan; m_pLabel=0; m_pLineEdit=0; +#ifdef COMPILE_USE_QT4 + setAutoFillBackground(false); +#else setBackgroundMode(QWidget::NoBackground); +#endif reset(); } @@ -147,7 +153,7 @@ void KviModeWidget::editorReturnPressed() if(!szNewModes.isEmpty()) mode+=QString("+"+szNewModes); if(!mode.isEmpty()) { - QCString chan = m_pChannel->connection()->encodeText(m_pChannel->name()); + KviQCString chan = m_pChannel->connection()->encodeText(m_pChannel->name()); m_pChannel->connection()->sendFmtData("MODE %s %s",chan.data(),mode.utf8().data()); } reset(); diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index d1107679c..e3dc89a3b 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -73,7 +73,11 @@ void KviOptionsWidget::mergeTip(QWidget * w,const QString &tip) static QString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\">"; static QString mid = "</td></tr><tr><td>"; static QString end = "</td></tr></table>"; +#ifdef COMPILE_USE_QT4 + QString s = w->toolTip(); +#else QString s = KviTalToolTip::textFor(w); +#endif if(s.isEmpty())KviTalToolTip::add(w,tip); else { QString tmp = begin; @@ -652,9 +656,13 @@ QFrame * KviOptionsWidget::addSeparator(int x1,int y1,int x2,int y2) return f; } -QGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,QGroupBox::Orientation o,const QString &txt,bool bEnabled) +#ifdef COMPILE_USE_QT4 +KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const QString &txt,bool bEnabled) +#else +KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const QString &txt,bool bEnabled) +#endif { - QGroupBox * g = new QGroupBox(nStrips,o,txt,this); + KviTalGroupBox * g = new KviTalGroupBox(nStrips,o,txt,this); g->setEnabled(bEnabled); addWidgetToLayout(g,x1,y1,x2,y2); return g; diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 67d861881..c81cd4f10 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -31,9 +31,9 @@ #include <qlayout.h> #include "kvi_list.h" #include <qlineedit.h> -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include <qtabwidget.h> - +#include "kvi_tal_groupbox.h" #include "kvi_selectors.h" class KVIRC_API KviOptionsWidget : public QFrame, public KviSelectorInterface @@ -134,7 +134,11 @@ public: QLabel * addLabel(int x1,int y1,int x2,int y2,const QString & text,bool bEnabled = true); QLabel * addLabel(QWidget * pParent,const QString & text,bool bEnabled = true); QLineEdit * addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled = true); - QGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,QGroupBox::Orientation o,const QString &txt,bool bEnabled = true); +#ifdef COMPILE_USE_QT4 + KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const QString &txt,bool bEnabled = true); +#else + KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const QString &txt,bool bEnabled = true); +#endif QFrame * addSeparator(int x1,int y1,int x2,int y2); void addRowSpacer(int x1,int y1,int x2,int y2); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 44e40098b..5484e54b9 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -46,6 +46,7 @@ #include "kvi_ircuserdb.h" #include "kvi_mirccntrl.h" #include "kvi_toolwindows_container.h" +#include "kvi_qcstring.h" #ifdef COMPILE_CRYPT_SUPPORT #include "kvi_crypt.h" @@ -58,8 +59,8 @@ #include <qsplitter.h> #include "kvi_tal_hbox.h" #include <qtoolbutton.h> -#include <qdragobject.h> -#include <qgrid.h> +#include "kvi_draganddrop.h" +#include "kvi_valuelist.h" KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) : KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,nick,lpConsole) @@ -85,7 +86,11 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) createTextEncodingButton(m_pButtonGrid); +#ifdef COMPILE_USE_QT4 + m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); +#else m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); +#endif m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); @@ -302,7 +307,7 @@ void KviQuery::loadProperties(KviConfig *cfg) { int w = width(); KviWindow::loadProperties(cfg); - QValueList<int> def; + KviValueList<int> def; def.append((w * 80) / 100); def.append((w * 20) / 100); m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); @@ -577,8 +582,8 @@ void KviQuery::ownMessage(const QString &buffer) return; } - QCString szName = connection()->encodeText(windowName()); - QCString szData = encodeText(buffer); + KviQCString szName = connection()->encodeText(windowName()); + KviQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; @@ -642,9 +647,9 @@ void KviQuery::ownAction(const QString &buffer) { outputNoFmt(KVI_OUT_SYSTEMWARNING,__tr2qs("This query has no active targets, no message sent")); } else { - QCString szBuffer = encodeText(buffer); + KviQCString szBuffer = encodeText(buffer); if(!szBuffer.data())return; - QCString sz = connection()->encodeText(windowName()); + KviQCString sz = connection()->encodeText(windowName()); if(sz.isEmpty())return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c", sz.data(),0x01,szBuffer.data(),0x01))return; diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp index 222533aa2..a873bf049 100644 --- a/src/kvirc/ui/kvi_scripteditor.cpp +++ b/src/kvirc/ui/kvi_scripteditor.cpp @@ -43,16 +43,16 @@ KviScriptEditor::~KviScriptEditor() void KviScriptEditor::setText(const char * txt) { - setText(QCString(txt)); + setText(KviQCString(txt)); } -void KviScriptEditor::setText(const QCString &txt) +void KviScriptEditor::setText(const KviQCString &txt) { } void KviScriptEditor::setText(const QString &txt) { - setText(QCString(txt.utf8())); + setText(KviQCString(txt.utf8())); } void KviScriptEditor::setFindText(const QString &text) @@ -66,7 +66,7 @@ void KviScriptEditor::setFindLineeditReadOnly(bool b) { } -void KviScriptEditor::getText(QCString &txt) +void KviScriptEditor::getText(KviQCString &txt) { } @@ -85,7 +85,7 @@ QPoint KviScriptEditor::getCursor() } void KviScriptEditor::getText(QString &txt) { - QCString tmp; + KviQCString tmp; getText(tmp); txt = QString::fromUtf8(tmp.data()); } diff --git a/src/kvirc/ui/kvi_scripteditor.h b/src/kvirc/ui/kvi_scripteditor.h index 01b4aacf2..37237a431 100644 --- a/src/kvirc/ui/kvi_scripteditor.h +++ b/src/kvirc/ui/kvi_scripteditor.h @@ -25,8 +25,8 @@ #include "kvi_settings.h" #include <qwidget.h> -#include <qcstring.h> #include <qlineedit.h> +#include "kvi_qcstring.h" // // This is the basic interface of a script editor widget @@ -49,9 +49,9 @@ protected: QLineEdit * m_pFindLineedit; public: virtual void setText(const char * txt); - virtual void setText(const QCString &txt); + virtual void setText(const KviQCString &txt); virtual void setText(const QString &txt); - virtual void getText(QCString &txt); + virtual void getText(KviQCString &txt); virtual void getText(QString &txt); virtual void setInfoText(const QString &text); virtual void setFindText(const QString &text); diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index a0ef190d5..bee6cfe67 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -169,7 +169,7 @@ KviPasswordSelector::KviPasswordSelector(QWidget * par,const QString & txt,QStri KviPixmapPreview::KviPixmapPreview(QWidget * par) -: QScrollView(par) +: KviTalScrollView(par) { m_pPixmap = 0; resizeContents(0,0); @@ -621,7 +621,11 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString & { QPixmap tmp(120,16); tmp.fill(KVI_OPTION_MIRCCOLOR(i)); +#ifdef COMPILE_USE_QT4 + int id = m_pForePopup->insertItem(tmp,QString("x")); +#else int id = m_pForePopup->insertItem(tmp); +#endif m_pForePopup->setItemParameter(id,i); } m_pContextPopup->insertItem(__tr2qs("Foreground"),m_pForePopup); @@ -634,7 +638,11 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString & { QPixmap tmp(120,16); tmp.fill(KVI_OPTION_MIRCCOLOR(i)); +#ifdef COMPILE_USE_QT4 + int id = m_pForePopup->insertItem(tmp,QString("x")); +#else int id = m_pBackPopup->insertItem(tmp); +#endif m_pBackPopup->setItemParameter(id,i); } m_pContextPopup->insertItem(__tr2qs("Background"),m_pBackPopup); diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 173c64dc7..70d215f35 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -33,7 +33,7 @@ #include "kvi_tal_vbox.h" #include <qlineedit.h> #include <qlabel.h> -#include <qscrollview.h> +#include "kvi_tal_scrollview.h" #include <qpushbutton.h> #include <qcolor.h> #include <qfont.h> @@ -117,7 +117,7 @@ public: ~KviPasswordSelector(){}; }; -class KVIRC_API KviPixmapPreview : public QScrollView +class KVIRC_API KviPixmapPreview : public KviTalScrollView { Q_OBJECT public: diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index 0fc79b65e..09c2a8349 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -31,6 +31,10 @@ #include "kvi_fileutils.h" #include <qsplashscreen.h> +#ifdef COMPILE_USE_QT4 + #include <qdesktopwidget.h> +#endif + #include <qpixmap.h> #include <qpainter.h> #include <qlayout.h> @@ -132,10 +136,19 @@ void KviSplashScreen::hideEvent(QHideEvent *e) void KviSplashScreen::setProgress(int progress) { +#ifdef COMPILE_USE_QT4 + QPixmap slowQt4Copy = pixmap(); + QPainter painter(&slowQt4Copy); + QSize size = slowQt4Copy.size(); + painter.drawPixmap(0,size.height() - m_pOverlay->height(),*m_pOverlay,0,0,(m_pOverlay->width() * progress) / 100,m_pOverlay->height()); + painter.end(); + setPixmap(slowQt4Copy); +#else QPainter painter(pixmap()); QSize size = pixmap()->size(); painter.drawPixmap(0,size.height() - m_pOverlay->height(),*m_pOverlay,0,0,(m_pOverlay->width() * progress) / 100,m_pOverlay->height()); painter.end(); +#endif //raise(); repaint(); g_pApp->processEvents(); //damn... diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 1dccde750..cc9603ec3 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -49,6 +49,10 @@ #include "kvi_tal_popupmenu.h" #include <qpixmap.h> +#ifdef COMPILE_USE_QT4 + #include <qevent.h> +#endif + // This class COULD be derived also from KStatusBar but in fact // it adds no graphic functionality and it has only useless methods for us. // ... for now let's keep it simple :) @@ -101,7 +105,11 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pMessageLabel = new QLabel("<b>[x]</b> x",this,"msgstatuslabel"); m_pMessageLabel->setMargin(1); +#ifdef COMPILE_USE_QT4 + m_pMessageLabel->setAlignment(Qt::AlignVCenter | Qt::AlignLeft); +#else m_pMessageLabel->setAlignment(SingleLine | AlignVCenter | AlignLeft); +#endif m_pMessageLabel->setMinimumWidth(350); m_iLastMinimumHeight = 0; @@ -333,10 +341,13 @@ void KviStatusBar::contextPopupAboutToShow() QString tmp; KviQString::sprintf(tmp,"<center><b>%Q</b></center>",&app); +#ifndef COMPILE_USE_QT4 + // FIXME: This is not supported under Qt4.. :( QLabel * l = new QLabel(tmp,m_pContextPopup); l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); m_pContextPopup->insertItem(l); - +#endif + m_pClickedApplet->fillContextPopup(m_pContextPopup); KviQString::sprintf(tmp,__tr2qs("Remove %Q"),&app); @@ -464,18 +475,22 @@ void KviStatusBar::paintEvent(QPaintEvent * e) void KviStatusBar::mousePressEvent(QMouseEvent * e) { m_pClickedApplet = 0; - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) { contextPopup()->popup(QCursor::pos()); return; } - if((e->button() & LeftButton) && (e->state() & (ShiftButton | ControlButton))) + if((e->button() & Qt::LeftButton) && (e->state() & (Qt::ShiftButton | Qt::ControlButton))) { // move! m_pClickedApplet = appletAt(mapToGlobal(e->pos())); if(!m_pClickedApplet)return; m_pClickedApplet->select(); +#ifdef COMPILE_USE_QT4 + g_pApp->setOverrideCursor(Qt::SizeAllCursor); +#else g_pApp->setOverrideCursor(sizeAllCursor); +#endif } } @@ -515,7 +530,7 @@ void KviStatusBar::mouseMoveEvent(QMouseEvent * e) void KviStatusBar::mouseReleaseEvent(QMouseEvent * e) { - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { if(m_pClickedApplet && appletExists(m_pClickedApplet)) { diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 9b0ed29c4..dfa0b2d86 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -47,6 +47,9 @@ #include <qcursor.h> #include "kvi_tal_popupmenu.h" #include <qpixmap.h> +#ifdef COMPILE_USE_QT4 + #include <qevent.h> +#endif // This class COULD be derived also from KStatusBar but in fact // it adds no graphic functionality and it has only useless methods for us. @@ -135,9 +138,15 @@ void KviStatusBarApplet::paintEvent(QPaintEvent * e) if(m_bSelected) { QPainter p(this); +#ifdef COMPILE_USE_QT4 + p.setCompositionMode(QPainter::CompositionMode_SourceOut); + p.fillRect(rect(),Qt::black); + p.setCompositionMode(QPainter::CompositionMode_SourceOver); +#else p.setRasterOp(Qt::NotROP); p.fillRect(rect(),Qt::black); p.setRasterOp(Qt::CopyROP); +#endif } } @@ -222,7 +231,7 @@ void KviStatusBarAwayIndicator::selfRegister(KviStatusBar * pBar) // FIXME: Away on all context should know where user is not away/back before toggling status void KviStatusBarAwayIndicator::mouseDoubleClickEvent(QMouseEvent * e) { - if(!(e->button() & LeftButton))return; + if(!(e->button() & Qt::LeftButton))return; KviIrcConnection * c = statusBar()->frame()->activeConnection(); if(!c)return; if(c->state() != KviIrcConnection::Connected)return; @@ -286,7 +295,7 @@ KviStatusBarLagIndicator::~KviStatusBarLagIndicator() void KviStatusBarLagIndicator::mouseDoubleClickEvent(QMouseEvent *e) { - if(!(e->button() & LeftButton))return; + if(!(e->button() & Qt::LeftButton))return; KviIrcConnection * c = statusBar()->frame()->activeConnection(); if(!c)return; diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index a58edab90..e250c11c6 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -26,6 +26,9 @@ #define __KVIRC__ #include "kvi_styled_controls.h" + +#ifndef COMPILE_USE_QT4 + #include "kvi_iconmanager.h" #include "kvi_app.h" #include "kvi_options.h" @@ -366,3 +369,5 @@ void KviStyledToolButton::resizeEvent ( QResizeEvent * e) } #include "kvi_styled_controls.moc" + +#endif diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h index a462a0c1e..b2bdf599f 100644 --- a/src/kvirc/ui/kvi_styled_controls.h +++ b/src/kvirc/ui/kvi_styled_controls.h @@ -25,6 +25,17 @@ // /////////////////////////////////////////////////////////////////////////////// +#include "kvi_settings.h" + +#ifdef COMPILE_USE_QT4 + // we use internal Qt4 styles for now + #include <qcheckbox.h> + #include <qtoolbutton.h> + + #define KviStyledCheckBox QCheckBox + #define KviStyledToolButton QToolButton +#else + #include <qcheckbox.h> #include <qtoolbutton.h> #include <qevent.h> @@ -98,3 +109,5 @@ protected: }; #endif + +#endif diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index a62344bc7..6a306b1dd 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -51,11 +51,17 @@ #include <qfontmetrics.h> #include <qpainter.h> #include <qpixmap.h> -#include <qheader.h> #include <qimage.h> #include "kvi_tal_popupmenu.h" #include <qcursor.h> +#ifdef COMPILE_USE_QT4 + #include <q3header.h> +#else + #include <qheader.h> +#endif +#include <qevent.h> + #ifdef COMPILE_PSEUDO_TRANSPARENCY extern QPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -137,13 +143,13 @@ void KviTaskBarBase::switchWindow(bool bNext,bool bInContextOnly) { if(bInContextOnly) { - if(it->window()->console() == cons) + if(it->kviWindow()->console() == cons) { - g_pFrame->setActiveWindow(it->window()); + g_pFrame->setActiveWindow(it->kviWindow()); return; } } else { - g_pFrame->setActiveWindow(it->window()); + g_pFrame->setActiveWindow(it->kviWindow()); return; } } @@ -202,9 +208,9 @@ void KviTaskBarButton::tipRequest(KviDynamicToolTip *,const QPoint &pnt) void KviTaskBarButton::mousePressEvent(QMouseEvent *e) { - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { - if(e->state() & ShiftButton) + if(e->state() & Qt::ShiftButton) { m_pWindow->delayedClose(); } else { @@ -349,9 +355,9 @@ void KviTaskBarButton::drawButtonLabel ( QPainter * painter) QString tmp = QChar('('); tmp += szText; tmp += QChar(')'); - p.drawText(cRect,AlignLeft | AlignTop,tmp,-1,&bRect); + p.drawText(cRect,Qt::AlignLeft | Qt::AlignTop,tmp,-1,&bRect); } else { - p.drawText(cRect,AlignLeft | AlignTop,szText,-1,&bRect); + p.drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1,&bRect); } if(bRect.width() > cRect.width()) @@ -362,12 +368,12 @@ void KviTaskBarButton::drawButtonLabel ( QPainter * painter) base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); p.setPen(base); cRect.setWidth(cRect.width() + 10); - p.drawText(cRect,AlignLeft | AlignVCenter,szText,-1); + p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,szText,-1); p.setClipRect(cRect.right(),cRect.y(),5,cRect.height()); base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); p.setPen(base); cRect.setWidth(cRect.width() + 10); - p.drawText(cRect,AlignLeft | AlignVCenter,szText,-1); + p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,szText,-1); } p.setClipping(FALSE); painter->drawPixmap(0,0,*pMemBuffer,distRect.x(),distRect.y(),iWidth,iHeight); @@ -454,7 +460,11 @@ KviClassicTaskBar::KviClassicTaskBar() setMinimumHeight(m_iButtonHeight+5); setResizeEnabled( true ); +#ifdef COMPILE_USE_QT4 + connect(this,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(orientationChangedSlot(Qt::Orientation))); +#else connect(this,SIGNAL(orientationChanged(Orientation)),this,SLOT(orientationChangedSlot(Orientation))); +#endif } KviClassicTaskBar::~KviClassicTaskBar() @@ -463,9 +473,9 @@ KviClassicTaskBar::~KviClassicTaskBar() m_pButtonList = 0; } -void KviClassicTaskBar::orientationChangedSlot(Orientation o) +void KviClassicTaskBar::orientationChangedSlot(Qt::Orientation o) { - if (orientation() == Horizontal) m_pBase->setMinimumHeight(m_iButtonHeight); + if (orientation() == Qt::Horizontal) m_pBase->setMinimumHeight(m_iButtonHeight); doLayout(); } @@ -504,23 +514,23 @@ void KviClassicTaskBar::insertButton(KviTaskBarButton * b) // first sort by irc context for(KviTaskBarButton * btn = m_pButtonList->first();btn;btn = m_pButtonList->next()) { - if(btn->window()->console() == b->window()->console()) + if(btn->kviWindow()->console() == b->kviWindow()->console()) { // same irc context (or none) // sort by type now for(;btn;btn = m_pButtonList->next()) { - if((btn->window()->type() > b->window()->type()) || - (btn->window()->console() != b->window()->console())) + if((btn->kviWindow()->type() > b->kviWindow()->type()) || + (btn->kviWindow()->console() != b->kviWindow()->console())) { // greater type or another irc context m_pButtonList->insert(idx,b); return; - } else if(btn->window()->type() == b->window()->type()) + } else if(btn->kviWindow()->type() == b->kviWindow()->type()) { // same type! // sort by name - if(!KVI_OPTION_BOOL(KviOption_boolSortTaskBarItemsByName) || (KviQString::cmpCI(btn->window()->windowName(),b->window()->windowName()) > 0)) + if(!KVI_OPTION_BOOL(KviOption_boolSortTaskBarItemsByName) || (KviQString::cmpCI(btn->kviWindow()->windowName(),b->kviWindow()->windowName()) > 0)) { // got a "higher one" m_pButtonList->insert(idx,b); @@ -533,10 +543,10 @@ void KviClassicTaskBar::insertButton(KviTaskBarButton * b) m_pButtonList->append(b); return; } else { - if(!(btn->window()->console()) && b->window()->console()) + if(!(btn->kviWindow()->console()) && b->kviWindow()->console()) { // this must be a new console...insert before the contextless windows - __range_valid(b->window()->console() == b->window()); + __range_valid(b->kviWindow()->console() == b->kviWindow()); m_pButtonList->insert(idx,b); return; } else idx++; // wrong irc contet...go on searching @@ -608,7 +618,7 @@ void KviClassicTaskBar::doLayout() totCount -= btnsInRow; } - if ((orientation() == Horizontal) && + if ((orientation() == Qt::Horizontal) && (((unsigned int)rows) > m_pBase->height() / m_iButtonHeight )) { rows = m_pBase->height() / m_iButtonHeight; @@ -638,7 +648,7 @@ void KviClassicTaskBar::doLayout() if((btnInRow == btnsInRow) || (totCount == 1))theWidth = baseWidth - theX; } - if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && (orientation() == Horizontal)) + if( KVI_OPTION_BOOL(KviOption_boolClassicTaskBarSetMaximumButtonWidth) && (theWidth > KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth)) && (orientation() == Qt::Horizontal)) theWidth = KVI_OPTION_UINT(KviOption_uintClassicTaskBarMaximumButtonWidth); b->setGeometry(theX,theY,theWidth,m_iButtonHeight); @@ -664,7 +674,7 @@ void KviClassicTaskBar::applyOptions() void KviClassicTaskBar::resizeEvent(QResizeEvent *e) { - if(orientation() == Horizontal) + if(orientation() == Qt::Horizontal) { int iRows = height()/m_iButtonHeight; if(!iRows) iRows=1; @@ -840,7 +850,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c //p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y()); // debug("%i %i",pnt.x(),pnt.y()); p.translate(-pnt.x(),-pnt.y()); - KviPixmapUtils::drawPixmapWithPainter(&p,pix,(Qt::AlignmentFlags)(KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign)),QRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height()); + KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),QRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height()); p.translate(pnt.x(),pnt.y()); } } else { @@ -968,9 +978,9 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c QString tmp = QChar('('); tmp += szText; tmp += QChar(')'); - p.drawText(cRect,AlignLeft | AlignVCenter,tmp,-1,0); + p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,tmp,-1,0); } else { - p.drawText(cRect,AlignLeft | AlignVCenter,szText,-1,0); + p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,szText,-1,0); } painter->drawPixmap(0,0,*pMemBuffer,0,0,width,height()); @@ -1035,7 +1045,7 @@ KviTreeTaskBarListView::KviTreeTaskBarListView(QWidget * par) setFrameShape(NoFrame); viewport()->setMouseTracking(TRUE); m_pPrevItem=0; - setHScrollBarMode(QScrollView::AlwaysOff); + setHScrollBarMode(KviTalListView::AlwaysOff); } KviTreeTaskBarListView::~KviTreeTaskBarListView() @@ -1069,10 +1079,10 @@ void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e) KviTalListViewItem * it = (KviTalListViewItem *)itemAt(contentsToViewport(e->pos())); if(it) { - if(e->button() & LeftButton)emit leftMousePress(it); - else if(e->button() & RightButton)emit rightMousePress(it); + if(e->button() & Qt::LeftButton)emit leftMousePress(it); + else if(e->button() & Qt::RightButton)emit rightMousePress(it); } else { - if(e->button() & RightButton) + if(e->button() & Qt::RightButton) { KviTalPopupMenu* pPopup=new KviTalPopupMenu(); pPopup->insertItem(__tr2qs("Sort"),this,SLOT(sort())); @@ -1123,7 +1133,7 @@ void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct) { QPoint pnt = viewportToContents(QPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); //p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*pix,pnt.x(),pnt.y()); - KviPixmapUtils::drawPixmapWithPainter(p,pix,(Qt::AlignmentFlags)(KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign)),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y()); + KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y()); } } @@ -1157,9 +1167,17 @@ KviTreeTaskBar::KviTreeTaskBar() //setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); //m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)); //m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); +#ifdef COMPILE_USE_QT4 + m_pListView->setFocusPolicy(Qt::NoFocus); +#else m_pListView->setFocusPolicy(QWidget::NoFocus); +#endif m_pListView->setStaticBackground(true); +#ifdef COMPILE_USE_QT4 + m_pListView->viewport()->setAutoFillBackground(false); +#else m_pListView->viewport()->setBackgroundMode(QWidget::NoBackground); +#endif if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader)) { m_pListView->header()->hide(); @@ -1220,12 +1238,12 @@ bool KviTreeTaskBar::eventFilter(QObject * o,QEvent *e) QMouseEvent * ev = (QMouseEvent *)e; KviTreeTaskBarItem * it = (KviTreeTaskBarItem *)m_pListView->itemAt(ev->pos()); if(!it)return false; - KviWindow * wnd = it->window(); + KviWindow * wnd = it->kviWindow(); if(wnd) { - if(ev->button() & LeftButton) + if(ev->button() & Qt::LeftButton) { - if(ev->state() & ShiftButton) + if(ev->state() & Qt::ShiftButton) { wnd->delayedClose(); } else { diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h index f38f1e4d6..24022a82c 100644 --- a/src/kvirc/ui/kvi_taskbar.h +++ b/src/kvirc/ui/kvi_taskbar.h @@ -59,7 +59,7 @@ protected: int m_iHighlightLevel; int m_iProgress; public: - KviWindow * window(){ return m_pWindow; }; + KviWindow * kviWindow(){ return m_pWindow; }; virtual void captionChanged(){}; virtual void highlight(int iLevel = 1){}; virtual void setProgress(int progress){}; diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index 39550653b..a5b25a1b0 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -36,6 +36,9 @@ #include <qnamespace.h> #include <qlineedit.h> #include <ctype.h> +#ifdef COMPILE_USE_QT4 + #include <qevent.h> +#endif KviTextIconWindow::KviTextIconWindow() #ifdef COMPILE_USE_QT4 @@ -44,6 +47,7 @@ KviTextIconWindow::KviTextIconWindow() : KviTalIconView(0,Qt::WType_Popup) #endif { + m_iTimerId = -1; setGridX ( 40 ); setFixedSize(KVI_TEXTICON_WIN_WIDTH,KVI_TEXTICON_WIN_HEIGHT); m_pOwner = 0; @@ -57,7 +61,12 @@ KviTextIconWindow::KviTextIconWindow() KviTextIconWindow::~KviTextIconWindow() { - killTimers(); + if(m_iTimerId != -1) + { + killTimer(m_iTimerId); + m_iTimerId = -1; + } +// killTimers(); // if(m_pOwner)m_pOwner->setFocus(); } @@ -213,7 +222,7 @@ void KviTextIconWindow::ownerDead() void KviTextIconWindow::show() { - startTimer(50000); //50 sec ...seems enough + m_iTimerId = startTimer(50000); //50 sec ...seems enough QWidget::show(); } @@ -224,7 +233,11 @@ void KviTextIconWindow::timerEvent(QTimerEvent *) void KviTextIconWindow::doHide() { - killTimers(); + if(m_iTimerId != -1) + { + killTimer(m_iTimerId); + m_iTimerId = -1; + } hide(); if(m_pOwner)m_pOwner->setFocus(); } diff --git a/src/kvirc/ui/kvi_texticonwin.h b/src/kvirc/ui/kvi_texticonwin.h index b2d26dc42..541125ff2 100644 --- a/src/kvirc/ui/kvi_texticonwin.h +++ b/src/kvirc/ui/kvi_texticonwin.h @@ -45,6 +45,7 @@ private: QString m_szCurFullSeq; bool m_bAltMode; // in alt mode the itemSelected() string contains // also the CTRL+I escape code + int m_iTimerId; public: void popup(QWidget *owner,bool bAltMode = false); private: diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index ce10d3e5d..966a6bab8 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -32,6 +32,10 @@ #include <qcursor.h> #include "kvi_tal_popupmenu.h" +#ifdef COMPILE_USE_QT4 + #include <qevent.h> +#endif + static KviTalPopupMenu * g_pToolBarContextPopup = 0; static KviTalPopupMenu * g_pToolBarWindowsPopup = 0; static KviTalPopupMenu * g_pToolBarIconSizesPopup = 0; @@ -58,7 +62,7 @@ KviToolBar::~KviToolBar() void KviToolBar::mousePressEvent(QMouseEvent *e) { - if(!(e->button() & RightButton)) + if(!(e->button() & Qt::RightButton)) { KviTalToolBar::mousePressEvent(e); return; diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 50a18f845..61da95f96 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -54,6 +54,7 @@ static int g_iInputFontCharWidth[256]; #include <qregexp.h> #include <qclipboard.h> #include "kvi_tal_popupmenu.h" +#include <qevent.h> // FIXME: #warning "The combo should disappear when it looses focus!...(how to do it ?)" @@ -88,7 +89,11 @@ KviTopicWidget::KviTopicWidget(QWidget * par,const char * name) m_pContextPopup = 0; m_iCursorPosition = 0; m_pInput = 0; +#ifdef COMPILE_USE_QT4 + setAutoFillBackground(false); +#else setBackgroundMode(QWidget::NoBackground); +#endif reset(); #ifdef COMPILE_USE_QT4 m_pCompletionBox=new KviTalListBox(this,Qt::Popup); @@ -598,7 +603,7 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *) void KviTopicWidget::mousePressEvent(QMouseEvent * e) { - if(!(e->button() & RightButton))return; + if(!(e->button() & Qt::RightButton))return; if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); @@ -649,12 +654,12 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e) break; case QEvent::KeyPress: switch( ((QKeyEvent *)e)->key() ) { - case Key_Up: - case Key_Down: - if ( !(((QKeyEvent *)e)->state() & AltButton) ) + case Qt::Key_Up: + case Qt::Key_Down: + if ( !(((QKeyEvent *)e)->state() & Qt::AltButton) ) break; - case Key_F4: - case Key_Escape: + case Qt::Key_F4: + case Qt::Key_Escape: if ( m_pCompletionBox->isVisible() ) { popDownListBox(); return TRUE; diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index ec05f30f7..b60782980 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -55,6 +55,8 @@ #include <qfontmetrics.h> #include <qdatetime.h> #include <qmime.h> +#include "kvi_styled_controls.h" +#include <qevent.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY extern QPixmap * g_pShadedChildGlobalDesktopBackground; @@ -839,7 +841,7 @@ int KviUserListView::getUserModeLevel(const QString &szNick) char KviUserListView::getUserFlag(KviUserListEntry * e) { if(!e)return 0; - return m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags); + return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).unicode(); } void KviUserListView::prependUserFlag(const QString &nick,QString &buffer) @@ -1308,8 +1310,16 @@ KviUserListViewArea::KviUserListViewArea(KviUserListView * par) : QWidget(par) { m_pListView = par; +#ifdef COMPILE_USE_QT4 + setAutoFillBackground(false); +#else setBackgroundMode(QWidget::NoBackground); +#endif +#ifdef COMPILE_USE_QT4 + m_pScrollBar = new QScrollBar(Qt::Vertical,this,"scrollbar"); +#else m_pScrollBar = new QScrollBar(QScrollBar::Vertical,this,"scrollbar"); +#endif m_pScrollBar->setRange(0,0); m_pScrollBar->setValue(0); connect(m_pScrollBar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarMoved(int))); @@ -1421,7 +1431,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) QPixmap *pix = KVI_OPTION_PIXMAP(KviOption_pixmapUserListViewBackground).pixmap(); p.fillRect(r.left(),r.top(),r.width(),r.height(),KVI_OPTION_COLOR(KviOption_colorUserListViewBackground)); if(pix) - KviPixmapUtils::drawPixmapWithPainter(&p,pix,(Qt::AlignmentFlags)(KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign)),r,width(),height()); + KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign),r,width(),height()); #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif @@ -1510,7 +1520,11 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) case KVI_USERLISTVIEW_GRIDTYPE_PLAINGRID: case KVI_USERLISTVIEW_GRIDTYPE_DOTGRID: p.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0, +#ifdef COMPILE_USE_QT4 + (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? Qt::DotLine : Qt::SolidLine)); +#else (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? QPen::DotLine : QPen::SolidLine)); +#endif p.drawLine(0,bottom - 1,wdth,bottom - 1); if(bShowState || bShowIcons) p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY); @@ -1671,7 +1685,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) p.drawPixmap(theX,theY,*ico); } theX +=18; - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,AlignLeft|AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); } else { char flag = m_pListView->getUserFlag(e); @@ -1679,9 +1693,9 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) { QString ttt = QChar(flag); ttt += e->m_szNick; - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,AlignLeft|AlignVCenter,ttt); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,ttt); } else { - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,AlignLeft|AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); } } if(bColorAllocated) delete pClrFore; @@ -1698,7 +1712,12 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) p.drawLine(1,height()-1,wdth,height()-1); p.drawLine(wdth - 1,1,wdth - 1,height()); +#ifdef COMPILE_USE_QT4 + QPainter qt4SuxBecauseOfThisAdditionalPainter(this); + qt4SuxBecauseOfThisAdditionalPainter.drawPixmap(r.left(),r.top(),r.width(),r.height(),*pMemBuffer,r.left(),r.top(),r.width(),r.height()); +#else bitBlt(this,r.left(),r.top(),pMemBuffer,r.left(),r.top(),r.width(),r.height(),Qt::CopyROP,false); +#endif } void KviUserListViewArea::resizeEvent(QResizeEvent *) @@ -1712,19 +1731,19 @@ void KviUserListViewArea::resizeEvent(QResizeEvent *) void KviUserListViewArea::mousePressEvent(QMouseEvent *e) { setFocus(); - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry) { - if(e->state() & ShiftButton) + if(e->state() & Qt::ShiftButton) { // Multiselect mode if(!entry->m_bSelected)m_pListView->m_iSelectedCount++; entry->m_bSelected = true; if(m_pListView->m_iSelectedCount == 1)g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); - } else if(e->state() & ControlButton) + } else if(e->state() & Qt::ControlButton) { // Invert mode if(!entry->m_bSelected)m_pListView->m_iSelectedCount++; @@ -1753,7 +1772,7 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e) } } m_pLastEntryUnderMouse = entry; - } else if(e->button() & RightButton) + } else if(e->button() & Qt::RightButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry) @@ -1817,12 +1836,12 @@ void KviUserListViewArea::mouseDoubleClickEvent(QMouseEvent *e) void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) { - if(e->state() & LeftButton) + if(e->state() & Qt::LeftButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry && (entry != m_pLastEntryUnderMouse)) { - if(e->state() & ControlButton) + if(e->state() & Qt::ControlButton) { if(entry->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1847,7 +1866,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) m_pScrollBar->setValue(m_pScrollBar->value() - top->m_iHeight); if(m_pListView->m_pTopItem != top) { - if(e->state() & ControlButton) + if(e->state() & Qt::ControlButton) { if(m_pListView->m_pTopItem->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1880,7 +1899,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) m_pScrollBar->setValue(m_pScrollBar->value() + bottom->m_iHeight); if(bottom != m_pLastEntryUnderMouse) { - if(e->state() & ControlButton) + if(e->state() & Qt::ControlButton) { if(bottom->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 8e4ebd117..3ce23f964 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -61,15 +61,22 @@ #include <qmetaobject.h> #include <qdatetime.h> #include <qtextcodec.h> +#include <qevent.h> +// it looks they can't decide :D +#ifndef COMPILE_USE_QT4 #if QT_VERSION >= 0x030005 #include <qobjectlist.h> #else #include <qobjcoll.h> #endif +#endif + +#ifdef COMPILE_USE_QT4 + #include <qdesktopwidget.h> +#endif #include <qvariant.h> -#include <qaccel.h> #include <qtoolbutton.h> #include "kvi_tal_tooltip.h" #include <qmessagebox.h> @@ -141,8 +148,13 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * m_pTaskBarItem = 0; setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT); +#ifdef COMPILE_USE_QT4 + setAutoFillBackground(false); + setFocusPolicy(Qt::StrongFocus); +#else setBackgroundMode(NoBackground); setFocusPolicy(StrongFocus); +#endif connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); } @@ -281,13 +293,21 @@ bool KviWindow::focusNextPrevChild(bool next) QWidget * w = focusWidget(); if(w) { +#ifdef COMPILE_USE_QT4 + if(w->focusPolicy() == Qt::StrongFocus)return false; +#else if(w->focusPolicy() == QWidget::StrongFocus)return false; +#endif //QVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! if(w->parent()) { +#ifdef COMPILE_USE_QT4 + if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) +#else if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) +#endif return false; // Do NOT change the focus widget! } } @@ -462,14 +482,14 @@ const QString & KviWindow::lastLineOfText() { if(m_pIrcView) return m_pIrcView->lastLineOfText(); - return QString::null; + return KviQString::empty; } const QString & KviWindow::lastMessageText() { if(m_pIrcView) return m_pIrcView->lastMessageText(); - return QString::null; + return KviQString::empty; } // The following three have to be here even if the crypt support is disabled...moc does not support conditional compilations @@ -612,7 +632,13 @@ void KviWindow::saveProperties(KviConfig *cfg) QString szCodec = m_szTextEncoding; QTextCodec * c = defaultTextCodec(); if(c && m_pTextCodec) - if(KviQString::equalCI(szCodec,c->name()))szCodec = QString::null; // store "default" + { +#ifdef COMPILE_USE_QT4 + if(KviQString::equalCI(szCodec,c->name().data()))szCodec = KviQString::empty; // store "default" +#else + if(KviQString::equalCI(szCodec,c->name()))szCodec = KviQString::empty; // store "default" +#endif + } QString szKey = "TextEncoding_"; szKey += m_szName; cfg->writeEntry(szKey,szCodec); @@ -626,7 +652,7 @@ void KviWindow::loadProperties(KviConfig *cfg) { QString szKey = "TextEncoding_"; szKey += m_szName; - setTextEncoding(cfg->readQStringEntry(szKey,QString::null).utf8().data()); + setTextEncoding(cfg->readQStringEntry(szKey,KviQString::empty).utf8().data()); if(m_pInput) m_pInput->setButtonsHidden(cfg->readBoolEntry("inputToolButtonsHidden",KVI_OPTION_BOOL(KviOption_boolHideInputToolButtons))); /* if(m_pIrcView && m_iType==KVI_WINDOW_TYPE_CHANNEL) { @@ -981,8 +1007,21 @@ void KviWindow::focusInEvent(QFocusEvent *) { // must find one NOW // we probably have no KviInput since it would have been grabbed anyway + if(m_pIrcView)m_pFocusHandler = m_pIrcView; else { +#ifdef COMPILE_USE_QT4 + QList<QObject *> list = children(); + for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + { + QObject * c = *it; + if(c->isWidgetType()) + { + m_pFocusHandler = (QWidget *)c; + break; + } + } +#else QObjectList *list = (QObjectList *)(children()); if(list) { @@ -995,6 +1034,7 @@ void KviWindow::focusInEvent(QFocusEvent *) } } } +#endif } if(m_pFocusHandler)m_pFocusHandler->setFocus(); else { @@ -1029,8 +1069,13 @@ bool KviWindow::eventFilter(QObject *o,QEvent *e) QApplication::restoreOverrideCursor(); break; case QEvent::MouseButtonPress: +#ifdef COMPILE_USE_QT4 + if( (((QWidget *)o)->focusPolicy() == Qt::NoFocus) || + (((QWidget *)o)->focusPolicy() == Qt::TabFocus)) +#else if( (((QWidget *)o)->focusPolicy() == QWidget::NoFocus) || (((QWidget *)o)->focusPolicy() == QWidget::TabFocus)) +#endif { // this will not focus our window // set the focus to the focus handler @@ -1072,12 +1117,27 @@ void KviWindow::childInserted(QWidget * o) m_pFocusHandler = o; else { +#ifdef COMPILE_USE_QT4 + if(!m_pFocusHandler && (o->focusPolicy() == Qt::StrongFocus)) +#else if(!m_pFocusHandler && (o->focusPolicy() == QWidget::StrongFocus)) +#endif { m_pFocusHandler = o; } } +#ifdef COMPILE_USE_QT4 + QList<QObject *> list = o->children(); + for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + { + QObject * c = *it; + if(c->isWidgetType()) + { + childInserted((QWidget *)c); + } + } +#else QObjectList *list = (QObjectList *)(o->children()); if(list) { @@ -1087,6 +1147,7 @@ void KviWindow::childInserted(QWidget * o) childInserted((QWidget *)c); } } +#endif } void KviWindow::childDestroyed() @@ -1104,6 +1165,17 @@ void KviWindow::childRemoved(QWidget * o) if(o == m_pLastFocusedChild) m_pLastFocusedChild = 0; +#ifdef COMPILE_USE_QT4 + QList<QObject *> list = o->children(); + for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + { + QObject * c = *it; + if(c->isWidgetType()) + { + childRemoved((QWidget *)c); + } + } +#else QObjectList *list = (QObjectList *)(o->children()); if(list) { @@ -1113,7 +1185,7 @@ void KviWindow::childRemoved(QWidget * o) childRemoved((QWidget *)c); } } //else debug("The removed object has no children"); - +#endif } void KviWindow::childEvent(QChildEvent *e) @@ -1148,6 +1220,15 @@ void KviWindow::updateBackgrounds(QObject * obj) { if(!obj) obj = this; +#ifdef COMPILE_USE_QT4 + QList<QObject *> list = obj->children(); + for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + { + QObject * child = *it; + if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1) + ((QWidget *)child)->update(); + } +#else QObjectList * list = (QObjectList *)(obj->children()); if(list) { @@ -1168,6 +1249,7 @@ void KviWindow::updateBackgrounds(QObject * obj) updateBackgrounds(child); } } +#endif } void KviWindow::moveEvent(QMoveEvent *e) @@ -1397,7 +1479,12 @@ void KviWindow::unhighlight() void KviWindow::preprocessMessage(QString & szMessage) { + // slow +#ifdef COMPILE_USE_QT4 + QStringList strings = szMessage.split(" "); +#else QStringList strings = QStringList::split(" ",szMessage, TRUE); +#endif for ( QStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { QString tmp(*it); if(tmp.contains('\r')) continue; diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index 821bd9cd7..2fad7e2e1 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -52,13 +52,13 @@ class KviTalPopupMenu; class QPixmap; class QSplitter; class KviTalHBox; -class QAccel; class QToolButton; class QTextCodec; class KviTalWidgetStack; #include "kvi_tal_hbox.h" #include "kvi_tal_widgetstack.h" +#include "kvi_accel.h" #ifdef COMPILE_CRYPT_SUPPORT class KviCryptController; @@ -167,7 +167,7 @@ protected: // almost private: don't touch :D QToolButton * m_pTextEncodingButton; QToolButton * m_pHideToolsButton; QWidget * m_pLastFocusedChild; - QAccel * m_pAccel; + KviAccel * m_pAccel; static const char * m_typeTable[KVI_WINDOW_NUM_TYPES + 1]; // text encoding and decoding //unsigned int m_uTextEncoding; diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 5299e63a3..0bde7db8a 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -58,7 +58,7 @@ #include <qpainter.h> #include <qheader.h> #include <qtabwidget.h> -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include <qvaluelist.h> #include <qlabel.h> diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index ce46cbe79..01f4ab52f 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -38,7 +38,7 @@ #include <qlabel.h> #include <qlineedit.h> #include "kvi_tal_listview.h" -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include <qlayout.h> #include <qcheckbox.h> #include <qpushbutton.h> @@ -69,7 +69,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name) connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem *)),this,SLOT(itemDoubleClicked(KviTalListViewItem *))); - m_pGroupBox = new QGroupBox(2,QGroupBox::Horizontal,__tr2qs("Channel" ),this); + m_pGroupBox = new KviTalGroupBox(2,KviTalGroupBox::Horizontal,__tr2qs("Channel" ),this); QString szMsg = __tr2qs("Name"); szMsg.append(":"); QLabel * l = new QLabel(szMsg,m_pGroupBox); diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h index 5e76791a2..c2f6df70a 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.h +++ b/src/modules/channelsjoin/channelsjoinwindow.h @@ -29,7 +29,7 @@ #include <qdialog.h> class KviConsole; -class QGroupBox; +class KviTalGroupBox; class QPushButton; class KviStyledCheckBox; class QLineEdit; @@ -45,7 +45,7 @@ public: protected: QLineEdit * m_pChannelEdit; KviTalListView * m_pListView; - QGroupBox * m_pGroupBox; + KviTalGroupBox * m_pGroupBox; QLineEdit * m_pPass; KviStyledCheckBox * m_pShowAtStartupCheck; KviStyledCheckBox * m_pCloseAfterJoinCheck; diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index e8ba76cb5..a82879a6c 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1099,7 +1099,7 @@ void KviCanvasView::contentsMouseMoveEvent(QMouseEvent *e) { // QPoint p = inverseWorldMatrix().map(e->pos()); QPoint p = e->pos(); - if(e->state() & LeftButton) + if(e->state() & Qt::LeftButton) { if((m_dragMode != None) && (m_pSelectedItem)) { @@ -1173,7 +1173,7 @@ void KviCanvasView::contentsMouseReleaseEvent(QMouseEvent *e) void KviCanvasView::contentsMousePressEvent(QMouseEvent *e) { - if(e->button() & LeftButton) + if(e->button() & Qt::LeftButton) { // QPoint p = inverseWorldMatrix().map(e->pos()); QPoint p = e->pos(); diff --git a/src/modules/dockwidget/libkvidockwidget.cpp b/src/modules/dockwidget/libkvidockwidget.cpp index b15842c46..332b98fd8 100644 --- a/src/modules/dockwidget/libkvidockwidget.cpp +++ b/src/modules/dockwidget/libkvidockwidget.cpp @@ -370,8 +370,8 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const QPoint &pnt) void KviDockWidget::mousePressEvent(QMouseEvent *e) { - if(e->button() & LeftButton)toggleParentFrame(); - else if(e->button() & RightButton) + if(e->button() & Qt::LeftButton)toggleParentFrame(); + else if(e->button() & Qt::RightButton) m_pContextPopup->popup(mapToGlobal(e->pos())); } diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index c2068daa4..9fac05923 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -27,7 +27,7 @@ #include <qlayout.h> #include <qtoolbutton.h> -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include "kvi_tal_popupmenu.h" #include <qmessagebox.h> #include <qtimer.h> @@ -166,7 +166,7 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * p KviFontSelector * f = new KviFontSelector(this,__tr2qs_ctx("Font:","editor"),&g_fntNormal,true); g->addMultiCellWidget(f,0,0,0,2); m_pSelectorInterfaceList->append(f); - QGroupBox * gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs("Colors" ),this); + KviTalGroupBox * gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Colors" ),this); g->addMultiCellWidget(gbox,1,1,0,2); KviColorSelector * s = addColorSelector(gbox,__tr2qs_ctx("Background:","editor"),&g_clrBackground,true); s = addColorSelector(gbox,__tr2qs_ctx("Normal text:","editor"),&g_clrNormalText,true); diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 798c61d15..265faf5f5 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -21,7 +21,7 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include "class_groupbox.h" #include "kvi_error.h" #include "kvi_debug.h" @@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox) bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { - setObject(new QGroupBox(parentScriptWidget(), name()), true); + setObject(new KviTalGroupBox(parentScriptWidget(), name()), true); return true; } @@ -195,12 +195,12 @@ bool KviKvsObject_groupbox::functionSetTitle(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("title",KVS_PT_STRING,0,szTitle) KVSO_PARAMETERS_END(c) if (widget()) - ((QGroupBox *)widget())->setTitle(szTitle); + ((KviTalGroupBox *)widget())->setTitle(szTitle); return true; } bool KviKvsObject_groupbox::functionTitle(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setString(((QGroupBox *)widget())->title()); + if (widget()) c->returnValue()->setString(((KviTalGroupBox *)widget())->title()); return true; } bool KviKvsObject_groupbox::functionSetFlat(KviKvsObjectFunctionCall *c) @@ -210,12 +210,12 @@ bool KviKvsObject_groupbox::functionSetFlat(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QGroupBox *)widget())->setFlat(bEnabled); + ((KviTalGroupBox *)widget())->setFlat(bEnabled); return true; } bool KviKvsObject_groupbox::functionIsFlat(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setBoolean(((QGroupBox *)widget())->isFlat()); + if (widget()) c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isFlat()); return true; } bool KviKvsObject_groupbox::functionSetCheckable(KviKvsObjectFunctionCall *c) @@ -225,12 +225,12 @@ bool KviKvsObject_groupbox::functionSetCheckable(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QGroupBox *)widget())->setCheckable(bEnabled); + ((KviTalGroupBox *)widget())->setCheckable(bEnabled); return true; } bool KviKvsObject_groupbox::functionIsCheckable(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setBoolean(((QGroupBox *)widget())->isCheckable()); + if (widget()) c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isCheckable()); return true; } bool KviKvsObject_groupbox::functionSetChecked(KviKvsObjectFunctionCall *c) @@ -240,12 +240,12 @@ bool KviKvsObject_groupbox::functionSetChecked(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QGroupBox *)widget())->setChecked(bEnabled); + ((KviTalGroupBox *)widget())->setChecked(bEnabled); return true; } bool KviKvsObject_groupbox::functionIsChecked(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setBoolean(((QGroupBox *)widget())->isChecked()); + if (widget()) c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isChecked()); return true; } bool KviKvsObject_groupbox::functionSetInsideMargin(KviKvsObjectFunctionCall *c) @@ -254,12 +254,12 @@ bool KviKvsObject_groupbox::functionSetInsideMargin(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin) KVSO_PARAMETERS_END(c) - if (widget()) ((QGroupBox *)widget())->setInsideMargin(uMargin); + if (widget()) ((KviTalGroupBox *)widget())->setInsideMargin(uMargin); return true; } bool KviKvsObject_groupbox::functionInsideMargin(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setInteger(((QGroupBox *)widget())->insideMargin()); + if (widget()) c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideMargin()); return true; } bool KviKvsObject_groupbox::functionSetInsideSpacing(KviKvsObjectFunctionCall *c) @@ -268,12 +268,12 @@ bool KviKvsObject_groupbox::functionSetInsideSpacing(KviKvsObjectFunctionCall *c KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing) KVSO_PARAMETERS_END(c) - if (widget()) ((QGroupBox *)widget())->setInsideSpacing(uSpacing); + if (widget()) ((KviTalGroupBox *)widget())->setInsideSpacing(uSpacing); return true; } bool KviKvsObject_groupbox::functionInsideSpacing(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setInteger(((QGroupBox *)widget())->insideSpacing()); + if (widget()) c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideSpacing()); return true; } bool KviKvsObject_groupbox::functionSetColumns(KviKvsObjectFunctionCall *c) @@ -282,12 +282,12 @@ bool KviKvsObject_groupbox::functionSetColumns(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("colums",KVS_PT_UNSIGNEDINTEGER,0,uColums) KVSO_PARAMETERS_END(c) - if (widget()) ((QGroupBox *)widget())->setColumns(uColums); + if (widget()) ((KviTalGroupBox *)widget())->setColumns(uColums); return true; } bool KviKvsObject_groupbox::functionColumns(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setInteger(((QGroupBox *)widget())->columns()); + if (widget()) c->returnValue()->setInteger(((KviTalGroupBox *)widget())->columns()); return true; } bool KviKvsObject_groupbox::functionAddSpace(KviKvsObjectFunctionCall *c) @@ -296,7 +296,7 @@ bool KviKvsObject_groupbox::functionAddSpace(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("colums",KVS_PT_UNSIGNEDINTEGER,0,iSpace) KVSO_PARAMETERS_END(c) - if (widget()) (((QGroupBox *)widget())->addSpace(iSpace)); + if (widget()) (((KviTalGroupBox *)widget())->addSpace(iSpace)); return true; } @@ -311,7 +311,7 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c) { if(KviQString::equalCI(szAlign, align_tbl[i])) { - ((QGroupBox *)widget())->setAlignment(align_cod[i]); + ((KviTalGroupBox *)widget())->setAlignment(align_cod[i]); return true; } } @@ -320,7 +320,7 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c) } bool KviKvsObject_groupbox::functionAlignment(KviKvsObjectFunctionCall *c) { - int mode = ((QGroupBox *)widget())->alignment(); + int mode = ((KviTalGroupBox *)widget())->alignment(); QString szAlignment=""; for(unsigned int i = 0; i < align_num; i++) { @@ -342,10 +342,10 @@ bool KviKvsObject_groupbox::functionSetOrientation(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget())return true; if(KviQString::equalCI(szMode, "Horizontal")) - ((QGroupBox *)widget())->setOrientation(Qt::Horizontal); + ((KviTalGroupBox *)widget())->setOrientation(Qt::Horizontal); else if(KviQString::equalCI(szMode, "Vertical")) - ((QGroupBox *)widget())->setOrientation(Qt::Vertical); + ((KviTalGroupBox *)widget())->setOrientation(Qt::Vertical); else c->warning( __tr2qs("Unknown orientation: ")); return true; } @@ -360,10 +360,10 @@ bool KviKvsObject_groupbox::functionSetColumnLayout(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget())return true; if(szMode=="Horizontal") - ((QGroupBox *)widget())->setColumnLayout(uCol,Qt::Horizontal); + ((KviTalGroupBox *)widget())->setColumnLayout(uCol,Qt::Horizontal); else if(szMode=="Vertical") - ((QGroupBox *)widget())->setColumnLayout(uCol,Qt::Vertical); + ((KviTalGroupBox *)widget())->setColumnLayout(uCol,Qt::Vertical); else c->warning( __tr2qs("Unknown orientation: ")); return true; } diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/class_groupbox.h index d1a9a38d6..08329dd64 100644 --- a/src/modules/objects/class_groupbox.h +++ b/src/modules/objects/class_groupbox.h @@ -25,7 +25,7 @@ -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include "class_widget.h" #include "object_macros.h" diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index c20de62dc..a78e62306 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -732,27 +732,27 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e) } break; case QEvent::MouseButtonPress: - if(((QMouseEvent *)e)->button() & LeftButton)aparam = 0; + if(((QMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0; else { - if(((QMouseEvent *)e)->button() & RightButton)aparam = 1; + if(((QMouseEvent *)e)->button() & Qt::RightButton)aparam = 1; else aparam = 2; } if(!callFunction(this,"mousePressEvent",new KviKvsVariant(ret),new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y()) ))) ret = ""; // ignore results of a broken event handler break; case QEvent::MouseButtonRelease: - if(((QMouseEvent *)e)->button() & LeftButton)aparam = 0; + if(((QMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0; else { - if(((QMouseEvent *)e)->button() & RightButton)aparam = 1; + if(((QMouseEvent *)e)->button() & Qt::RightButton)aparam = 1; else aparam = 2; } if(!callFunction(this,"mouseReleaseEvent",new KviKvsVariant(ret),new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y()) ))) ret = ""; // ignore results of a broken event handler break; case QEvent::MouseButtonDblClick: - if(( (QMouseEvent *)e)->button() & LeftButton)aparam = 0; + if(( (QMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0; else { - if(((QMouseEvent *)e)->button() & RightButton)aparam = 1; + if(((QMouseEvent *)e)->button() & Qt::RightButton)aparam = 1; else aparam = 2; } if(!callFunction(this,"mouseDoubleClickEvent",new KviKvsVariant(ret),new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y()) @@ -760,13 +760,13 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e) break; case QEvent::MouseMove: - if( (((QMouseEvent *)e)->state()) & LeftButton) aparam = 0; + if( (((QMouseEvent *)e)->state()) & Qt::LeftButton) aparam = 0; else { - if(((QMouseEvent *)e)->state() & RightButton)aparam = 1; + if(((QMouseEvent *)e)->state() & Qt::RightButton)aparam = 1; else { - if(((QMouseEvent *)e)->state() & MidButton)aparam = 2; + if(((QMouseEvent *)e)->state() & Qt::MidButton)aparam = 2; else aparam = -1; } } diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 7a938f665..010c06b58 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -45,7 +45,7 @@ #include "kvi_tal_popupmenu.h" #include <qtoolbutton.h> #include <qcheckbox.h> -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include <qtooltip.h> #include <qobjectlist.h> #include <qpainter.h> @@ -325,7 +325,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr QString szText; if(o->inherits("QLabel"))szText = ((QLabel *)o)->text(); else if(o->inherits("QCheckBox"))szText = ((QCheckBox *)o)->text(); - else if(o->inherits("QGroupBox"))szText = ((QGroupBox *)o)->title(); + else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title(); #ifdef COMPILE_INFO_TIPS if(o->inherits("QWidget")) szText.append(QToolTip::textFor((QWidget*)o)); diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index b7b63cb8b..a087a769b 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -36,7 +36,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent) { createLayout(3,1); - QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options")); m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg); connect(m_b1,SIGNAL(toggled(bool)),this,SLOT(reenableStuff(bool))); m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice); diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index fd009bf77..57e5e1302 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -37,7 +37,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) // AVATAR // 1st Box - QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Scaling","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Scaling","options")); KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images (recommended)","options"),KviOption_boolScaleAvatars); #ifdef COMPILE_INFO_TIPS QToolTip::add(b,__tr2qs_ctx("<center>This option will force KVIrc to scale avatars" \ @@ -53,7 +53,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); // 2st Box - QGroupBox *gs = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Request CTCP","options")); + KviTalGroupBox *gs = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Request CTCP","options")); KviBoolSelector * bs = addBoolSelector(g,__tr2qs_ctx("Request missing avatars","options"),KviOption_boolRequestMissingAvatars); KviUIntSelector * us = addUIntSelector(g,__tr2qs_ctx("Maximum requested file size:","options"),KviOption_uintMaximumRequestedAvatarSize,0,1048576,102400,KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars)); diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index ef312fd82..abf6bc52a 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -40,7 +40,7 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent) addBoolSelector(0,1,0,1, __tr2qs_ctx("User input exits away mode","options"), KviOption_boolExitAwayOnInput); - QGroupBox *g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Away Nickname","options")); + KviTalGroupBox *g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Away Nickname","options")); m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool))); diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 1a9b3f786..def9bc658 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -35,7 +35,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent) { createLayout(2,1); - QGroupBox *gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Disconnect","options")); + KviTalGroupBox *gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Disconnect","options")); KviBoolSelector *b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnDisconnect,true); @@ -48,7 +48,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent) mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to keep queries open after disconnect.</center>","options")); #endif - gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); + gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnUnexpectedDisconnect,true); @@ -70,7 +70,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent) mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to reopen query windows after a successful reconnect attempt.</center>","options")); #endif -// gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); +// gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); KviBoolSelector * b = addBoolSelector(gbox,__tr2qs_ctx("Automatically reconnect","options"),KviOption_boolAutoReconnectOnUnexpectedDisconnect); #ifdef COMPILE_INFO_TIPS mergeTip(b,__tr2qs_ctx("<center>This option will enable auto-reconnecting after an unexpected disconnect. " \ @@ -119,7 +119,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent) #ifdef COMPILE_SSL_SUPPORT createLayout(3,1); - QGroupBox * gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Certificate","options")); + KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Certificate","options")); KviBoolSelector * b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL certificate (PEM format only)","options"), &(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)),true); @@ -130,7 +130,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent) &(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool))); - gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Private Key","options")); + gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Private Key","options")); b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL private key","options"), &(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)),true); f = addFileSelector(gbox,__tr2qs_ctx("Private key location:","options"), @@ -161,7 +161,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent) createLayout(5,1); KviUIntSelector * u; - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Timeout Values","options"),this); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Timeout Values","options"),this); u = addUIntSelector(g,__tr2qs_ctx("Connect timeout:","options"),KviOption_uintIrcSocketTimeout,5,6000,60); u->setSuffix(__tr2qs_ctx(" sec","options")); u = addUIntSelector(g,__tr2qs_ctx("Outgoing data queue flush timeout:","options"),KviOption_uintSocketQueueFlushTimeout,100,2000,500); @@ -175,7 +175,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent) #endif connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - g = addGroupBox(0,3,0,3,2,QGroupBox::Horizontal,__tr2qs_ctx("Network Interfaces","options")); + g = addGroupBox(0,3,0,3,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Network Interfaces","options")); b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress); KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress)); @@ -209,7 +209,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent) m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService); connect(m_pEnableIdent,SIGNAL(toggled(bool)),this,SLOT(enableIpv4InIpv6(bool))); - QGroupBox * gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect); connect(m_pEnableIdent,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); @@ -223,7 +223,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent) connect(m_pEnableIdent,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool))); - gbox = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + gbox = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"), KviOption_boolIdentdEnableIpV6, KVI_OPTION_BOOL(KviOption_boolUseIdentService)); diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index d46398616..0476f2eb8 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -44,7 +44,7 @@ KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent) "<br><br></p>","options")); - QGroupBox *gs = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("CTCP Replies","options")); + KviTalGroupBox *gs = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("CTCP Replies","options")); KviStringSelector * s = addStringSelector(gs, __tr2qs_ctx("Append to VERSION reply:","options"),KviOption_stringCtcpVersionPostfix); #ifdef COMPILE_INFO_TIPS diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 59d5f57de..736bef317 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -93,7 +93,7 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget #endif connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - QGroupBox * g = addGroupBox(0,2,1,2,2,QGroupBox::Horizontal,__tr2qs_ctx("Ignored Requests","options")); + KviTalGroupBox * g = addGroupBox(0,2,1,2,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Ignored Requests","options")); addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing); addBoolSelector(g,__tr2qs_ctx("FINGER","options"),KviOption_boolIgnoreCtcpFinger); addBoolSelector(g,__tr2qs_ctx("CLIENTINFO","options"),KviOption_boolIgnoreCtcpClientinfo); diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 86c1801ab..356e15d60 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -70,7 +70,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent) { createLayout(5,1); - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Network Properties","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Network Properties","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Use user-defined address or network interface","options"),KviOption_boolDccListenOnSpecifiedInterfaceByDefault); @@ -195,18 +195,18 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent) KviBoolSelector * b; - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Incoming File","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Incoming File","options")); KviBoolSelector * b2 = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccSend); KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Open transfer window as minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccSendWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend)); KviBoolSelector * b4 = addBoolSelector(g,__tr2qs_ctx("Automatically resume when auto-accepted","options"),KviOption_boolAutoResumeDccSendWhenAutoAccepted,KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend)); - g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Save Location","options")); + g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Save Location","options")); addDirectorySelector(g,__tr2qs_ctx("Download folder:","options"),KviOption_stringIncomingPath); addBoolSelector(g,__tr2qs_ctx("Sort saved files by nicknames (create subfolders)","options"),KviOption_boolSortReceivedByDccFilesByNicks); addBoolSelector(g,__tr2qs_ctx("Guess save path from media type","options"),KviOption_boolUseIncomingDccMediaTypeSavePath); - g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("On Download Completion","options")); + g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Download Completion","options")); addBoolSelector(g,__tr2qs_ctx("Notify completion in console","options"),KviOption_boolNotifyDccSendSuccessInConsole); addBoolSelector(g,__tr2qs_ctx("Notify completion in notifier","options"),KviOption_boolNotifyDccSendSuccessInNotifier); b = addBoolSelector(g,__tr2qs_ctx("Automatically clear transfer","options"),KviOption_boolAutoCloseDccSendOnSuccess); @@ -235,7 +235,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren { createLayout(4,1); - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Bug Compatibility","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Bug Compatibility","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Send ACK for byte 0","options"),KviOption_boolSendZeroAckInDccRecv); #ifdef COMPILE_INFO_TIPS mergeTip(b, @@ -259,7 +259,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren #endif //COMPILE_INFO_TIPS - g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Limits","options")); + g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Limits","options")); KviTalHBox * hb = new KviTalHBox(g); b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed); @@ -280,7 +280,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren "KVIrc will refuse the requests when this limit is reached.</center>","options")); #endif - g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Tweaks","options")); + g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Tweaks","options")); b = addBoolSelector(g,__tr2qs_ctx("Use fast send (send ahead)","options"),KviOption_boolUseFastDccSend); #ifdef COMPILE_INFO_TIPS @@ -346,7 +346,7 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent) { createLayout(3,1); - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Chat Request","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Chat Request","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat); b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat)); @@ -367,7 +367,7 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget( createLayout(8, 1); KviBoolSelector * b1 = addBoolSelector(0,0,0,0,__tr2qs_ctx("Open all minimized","options"),KviOption_boolCreateMinimizedDccVoice); - QGroupBox * g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Voice Request","options")); + KviTalGroupBox * g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Voice Request","options")); KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice); b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice)); diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index ac4aab973..950453c1d 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -88,7 +88,7 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent) KviBoolSelector * b; - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Alert Restrictions","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Alert Restrictions","options")); KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Restrict alert","options"),KviOption_boolHighlightOnlyNormalMsg); #ifdef COMPILE_INFO_TIPS mergeTip(b3, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the taskbar only if a normal message is received in a channel.<br>Actions like joins, parts and mode changes will be ignored.<br> This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.</center>","options")); diff --git a/src/modules/options/optw_ident.cpp b/src/modules/options/optw_ident.cpp index 9644b9897..5a393a695 100644 --- a/src/modules/options/optw_ident.cpp +++ b/src/modules/options/optw_ident.cpp @@ -24,7 +24,7 @@ #include "optw_ident.h" -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index fb56518e9..65ff00b63 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -313,7 +313,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren createLayout(3,1); layout()->setMargin(10); - QGroupBox * gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Basic Properties","options")); + KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Basic Properties","options")); KviTalHBox * hb = new KviTalHBox(gbox); hb->setSpacing(3); @@ -353,7 +353,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren QString szCenterEnd("</center>"); QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd; - gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Profile","options")); + gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Profile","options")); hb = new KviTalHBox(gbox); hb->setSpacing(4); @@ -677,12 +677,12 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * par createLayout(2,1); layout()->setMargin(10); - QGroupBox * gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("User Mode","options")); + KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("User Mode","options")); m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI); m_pSSelector = addBoolSelector(gbox,__tr2qs_ctx("Server notices (+s)","options"),&m_bS); m_pWSelector = addBoolSelector(gbox,__tr2qs_ctx("Wallops (+w)","options"),&m_bW); - gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Default Messages","options")); + gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Default Messages","options")); KviStringSelector * sel = addStringSelector(gbox, __tr2qs_ctx("Part message:","options"),KviOption_stringPartMessage); diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index 43eef61ce..7435ebe97 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -35,7 +35,7 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent) { createLayout(3,1); - QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Enable Ignore For","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Enable Ignore For","options")); m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg); m_pIgnoreNotice = addBoolSelector(g,__tr2qs_ctx("Private/channel notices","options"),KviOption_boolEnableIgnoreOnNotice); diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index 7ab383297..569d14f81 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -141,7 +141,7 @@ KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent) addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd); addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable the input history window and it's log memory.","options"),KviOption_boolDisableInputHistory); //G&N 2005 addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input toolbuttons by default","options"),KviOption_boolHideInputToolButtons); - QGroupBox * g = addGroupBox(0,3,0,3,1,QGroupBox::Horizontal,__tr2qs_ctx("Nick completion","options")); + KviTalGroupBox * g = addGroupBox(0,3,0,3,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nick completion","options")); addBoolSelector(g,__tr2qs_ctx("Use bash-like nick completion","options"),KviOption_boolBashLikeNickCompletion); addStringSelector(g,__tr2qs_ctx("Nick completion postfix string","options"),KviOption_stringNickCompletionPostfix); addBoolSelector(g,__tr2qs_ctx("Use the completion postfix string for the first word only","options"),KviOption_boolUseNickCompletionPostfixForFirstWordOnly); diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 48b77997a..1be849e81 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -54,7 +54,7 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects); addBoolSelector(0,5,0,5,__tr2qs_ctx("Hide Channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons); - QGroupBox * g = addGroupBox(0,6,0,6,1,QGroupBox::Horizontal,__tr2qs_ctx("Open Dialog Window For","options")); + KviTalGroupBox * g = addGroupBox(0,6,0,6,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Open Dialog Window For","options")); addBoolSelector(g,__tr2qs_ctx("Preferences","options"),KviOption_boolShowGeneralOptionsDialogAsToplevel); addBoolSelector(g,__tr2qs_ctx("Registered Users","options"),KviOption_boolShowRegisteredUsersDialogAsToplevel); addBoolSelector(g,__tr2qs_ctx("Identity","options"),KviOption_boolShowIdentityDialogAsToplevel); diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 1a6396126..2864b1341 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -107,7 +107,7 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent { createLayout(5,1); - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Kick","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Kick","options")); KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Rejoin channel","options"),KviOption_boolRejoinChannelOnKick); #ifdef COMPILE_INFO_TIPS @@ -124,7 +124,7 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent "\"Rejoin channel\" option.</center>","options")); #endif - g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Part","options")); + g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Part","options")); b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnPart); #ifdef COMPILE_INFO_TIPS @@ -185,7 +185,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare } m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); - QGroupBox * g = addGroupBox(0,2,4,2,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options")); + KviTalGroupBox * g = addGroupBox(0,2,4,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options")); addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban list","options"),KviOption_boolDisableBanListRequestOnJoin); addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin); @@ -199,7 +199,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare "your IRC bandwidth.</center>","options")); #endif - g = addGroupBox(0,4,4,4,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options")); + g = addGroupBox(0,4,4,4,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options")); addBoolSelector(g,__tr2qs_ctx("Echo channel topic","options"),KviOption_boolEchoNumericTopic); addBoolSelector(g,__tr2qs_ctx("Show channel sync time","options"),KviOption_boolShowChannelSyncTime); diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index c912295f5..d674eb4bc 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -56,7 +56,7 @@ KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent) KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL; m_pVerbosityCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel)); - QGroupBox * g = addGroupBox(0,1,1,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Show in active window","options")); + KviTalGroupBox * g = addGroupBox(0,1,1,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Show in active window","options")); addBoolSelector(g,__tr2qs_ctx("External messages","options"),KviOption_boolExternalMessagesToActiveWindow); addBoolSelector(g,__tr2qs_ctx("External CTCP replies","options"),KviOption_boolCtcpRepliesToActiveWindow); addBoolSelector(g,__tr2qs_ctx("Whois replies","options"),KviOption_boolWhoisRepliesToActiveWindow); diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 9f4382a59..c40d35e4c 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -41,7 +41,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent) #ifdef COMPILE_INFO_TIPS mergeTip(pUse,__tr2qs_ctx("<center>This enables the lag meter engine, which checks at regular intervals how much lag (latency) the server has.</center>","options")); #endif - QGroupBox *g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); + KviTalGroupBox *g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); KviUIntSelector * pInterval = addUIntSelector(g, __tr2qs_ctx("Lag meter heartbeat:","options"),KviOption_uintLagMeterHeartbeat,2000,10000,5000,KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); pInterval->setSuffix(__tr2qs_ctx(" msec","options")); #ifdef COMPILE_INFO_TIPS diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index ae5a5fcf2..648078c7a 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -36,7 +36,7 @@ KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent) { createLayout(4,1); - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Automatically Log","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Automatically Log","options")); addBoolSelector(g,__tr2qs_ctx("Query windows","options"),KviOption_boolAutoLogQueries); addBoolSelector(g,__tr2qs_ctx("Channel windows","options"),KviOption_boolAutoLogChannels); addBoolSelector(g,__tr2qs_ctx("DCC Chat windows","options"),KviOption_boolAutoLogDccChat); diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 316aa18a1..f3e6ffad5 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -76,7 +76,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent) KviBoolSelector * b1; KviBoolSelector * b2; - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("General","options")); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("General","options")); addBoolSelector(g,__tr2qs_ctx("Show message icons","options"),KviOption_boolIrcViewShowImages); addBoolSelector(g,__tr2qs_ctx("Draw some emoticons (smileys) as pictures","options"),KviOption_boolDrawEmoticons); @@ -85,7 +85,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent) - g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Nicknames","options")); + g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nicknames","options")); b1 = addBoolSelector(g,__tr2qs_ctx("\"Smart\" nickname colors","options"),KviOption_boolColorNicks); b2 = addBoolSelector(g,__tr2qs_ctx("Use same colors as in the userlist","options"),KviOption_boolUseUserListColorsAsNickColors,!KVI_OPTION_BOOL(KviOption_boolColorNicks)); @@ -119,7 +119,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent) - g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Timestamp","options")); + g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Timestamp","options")); m_pUseTimestampSelector = addBoolSelector(g,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp); diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 40841868a..3d70c9f7c 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -37,7 +37,7 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent) createLayout(5,1); KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList); - QGroupBox *g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options")); + KviTalGroupBox *g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options")); connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); connect(b, @@ -56,7 +56,7 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent) KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), SLOT(setEnabled(bool))); - g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Advanced configuration","options")); + g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Advanced configuration","options")); connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); connect(b, diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index 3aeb8dfc9..aeb35f559 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -34,7 +34,7 @@ #include <qlineedit.h> #include <qcombobox.h> #include <qcheckbox.h> -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include "kvi_tal_popupmenu.h" #include <qcursor.h> #include <qtooltip.h> @@ -103,7 +103,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent) vbox->setStretchFactor(lll,100); - QGroupBox * gbox = addGroupBox(0,2,1,2,2,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),this); + KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),this); //QGridLayout * gl = new QGridLayout(gbox->layout()); //gl->setMargin(2); //gl->setSpacing(4); diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index 270494d71..4426fdd6a 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -39,7 +39,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent) { createLayout(8,1); - QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Open Query For","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Open Query For","options")); KviBoolSelector *b = addBoolSelector(g, __tr2qs_ctx("Private messages","options"),KviOption_boolCreateQueryOnPrivmsg); #ifdef COMPILE_INFO_TIPS mergeTip(b, diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index c2ffae5e8..2c11230d3 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -124,7 +124,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n QWidget * tab = new QWidget(tw); QGridLayout * gl = new QGridLayout(tab,4,2,10,4); - QGroupBox *gbox = new QGroupBox(2,QGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab); + KviTalGroupBox *gbox = new KviTalGroupBox(2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab); gl->addMultiCellWidget(gbox,0,0,0,1); l = new QLabel(__tr2qs_ctx("Username:","options"),gbox); @@ -474,7 +474,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) QWidget * tab = new QWidget(tw); QGridLayout * gl = new QGridLayout(tab,3,1,10,4); - QGroupBox *gbox = new QGroupBox(2,QGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab); + KviTalGroupBox *gbox = new KviTalGroupBox(2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab); gl->addWidget(gbox,0,0); l = new QLabel(__tr2qs_ctx("Username:","options"),gbox); @@ -514,7 +514,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) "If you leave this field empty (most common case), KVIrc will first look if a real name is specified " \ "for the network that this server belongs to, and if that is empty the default \"real name\" (specified in the \"Identity\" settings) will be used.</center>","options")); #endif - gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs_ctx("User Mode","options"),tab); + gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs_ctx("User Mode","options"),tab); gl->addWidget(gbox,1,0); m_pUseDefaultInitUMode = new KviStyledCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox); @@ -1122,7 +1122,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) QFrame * lll = new QFrame(vbox); vbox->setStretchFactor(lll,100); - QGroupBox *gbox = addGroupBox(0,1,1,1,3,QGroupBox::Horizontal,__tr2qs_ctx("Active Configuration","options")); + KviTalGroupBox *gbox = addGroupBox(0,1,1,1,3,KviTalGroupBox::Horizontal,__tr2qs_ctx("Active Configuration","options")); m_pSrvNetLabel = new QLabel(__tr2qs_ctx("Server:","options"),gbox); m_pSrvNetEdit = new QLineEdit(gbox); diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index f66ed4800..8ced47d50 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -61,7 +61,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) #else createLayout(3,1); #endif - QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Sound System","options"),true); + KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Sound System","options"),true); QToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options")); @@ -76,7 +76,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) connect(m_pSoundTestButton,SIGNAL(clicked()),this,SLOT(soundTest())); - g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Media Player","options"),true); + g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Media Player","options"),true); QToolTip::add(g,__tr2qs_ctx("This allows you to select the preferred media player to be used with " \ "the mediaplayer.* module commands and functions.","options")); @@ -99,7 +99,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) m_pSoundTestButton->setEnabled(false); m_pMediaTestButton->setEnabled(false); - g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true); + g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true); QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options")); @@ -122,7 +122,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) m_pTagsEncodingCombo->setCurrentItem(iMatch); #ifdef COMPILE_ON_WINDOWS - g = addGroupBox(0,3,0,3,1,QGroupBox::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true); + g = addGroupBox(0,3,0,3,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true); QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options")); diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp index 6368653d1..6242c3c4b 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -23,7 +23,7 @@ #include "optw_ssl.h" #include <qlayout.h> -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 9037c4bf0..32e9ff40b 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -77,7 +77,7 @@ KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWi { createLayout(3,1); - QGroupBox *g = addGroupBox(0,0,0,0,2,QGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); + KviTalGroupBox *g = addGroupBox(0,0,0,0,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarForeground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveForeground); @@ -107,7 +107,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi { createLayout(4,2); - QGroupBox * g = addGroupBox(0,0,1,0,2,QGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options")); + KviTalGroupBox * g = addGroupBox(0,0,1,0,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarBackground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveBackground); @@ -230,7 +230,7 @@ KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent) { createLayout(8,1); addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar); - QGroupBox *g = addGroupBox(0,1,0,1,2,QGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); + KviTalGroupBox *g = addGroupBox(0,1,0,1,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTaskBarNormalText); addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorTaskBarMinimizedText); addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTaskBarHighlight1Text); diff --git a/src/modules/options/optw_transport.cpp b/src/modules/options/optw_transport.cpp index 432eacd94..656debbbf 100644 --- a/src/modules/options/optw_transport.cpp +++ b/src/modules/options/optw_transport.cpp @@ -22,7 +22,7 @@ #include "optw_transport.h" -#include <qgroupbox.h> +#include <kvi_tal_groupbox.h> #include "kvi_options.h" #include "kvi_locale.h" diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 0a8205d99..08c5d58f3 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -44,7 +44,7 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent) m_pEnableFlashing = addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing); m_pLevelBasedNotify = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification); - m_pLevelsGroup = addGroupBox(0,5,0,5,1,QGroupBox::Horizontal,__tr2qs_ctx("Select message levels to notify","options")); + m_pLevelsGroup = addGroupBox(0,5,0,5,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Select message levels to notify","options")); addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"), KviOption_uintMinTrayLowLevelMessage, diff --git a/src/modules/options/optw_tray.h b/src/modules/options/optw_tray.h index 596459cf0..f6a87fd67 100644 --- a/src/modules/options/optw_tray.h +++ b/src/modules/options/optw_tray.h @@ -42,7 +42,7 @@ protected: KviBoolSelector * m_pLevelBasedNotify; KviBoolSelector * m_pMinimizeInTray; KviBoolSelector * m_pCloseInTray; - QGroupBox * m_pLevelsGroup; + KviTalGroupBox * m_pLevelsGroup; protected slots: void setEnabled(bool); }; diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index 5dd4881a0..df37f74b8 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -50,7 +50,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontUserListView); - QGroupBox * g = addGroupBox(0,1,1,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Nickname Colors","options")); + KviTalGroupBox * g = addGroupBox(0,1,1,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nickname Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewNormalForeground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionForeground); addColorSelector(g,__tr2qs_ctx("Channel owner:","options"),KviOption_colorUserListViewChanOwnerForeground); @@ -67,7 +67,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick)); connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); - g = addGroupBox(0,3,1,3,1,QGroupBox::Horizontal,__tr2qs_ctx("Nickname Grid","options")); + g = addGroupBox(0,3,1,3,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nickname Grid","options")); b = addBoolSelector(g,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid); s = addColorSelector(g,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); @@ -113,7 +113,7 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q { createLayout(3,2); - QGroupBox * g = addGroupBox(0,0,1,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options")); + KviTalGroupBox * g = addGroupBox(0,0,1,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewBackground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionBackground); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index c265d8aad..475debf85 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -311,7 +311,7 @@ KviSetupWizard::KviSetupWizard() if(nick.isEmpty())nick = "newbie"; if(nick == "root")nick = "newbie"; //m_pIdentity->m_pVBox - QGroupBox * gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox); + KviTalGroupBox * gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox); m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true); m_pNickSelector->setMinimumLabelWidth(120); @@ -328,7 +328,7 @@ KviSetupWizard::KviSetupWizard() QString szCenterEnd("</center>"); QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd; - gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox); + gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox); KviTalHBox* hb = new KviTalHBox(gbox); hb->setSpacing(4); |