Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

dxirc.changes Changed

dxirc.spec Changed

@@ -1,37 +1,28 @@
-# norootforbuild
-
-Name:		dxirc
-Version:	0.80.0
-Release:	1
-
-Summary:	A simple IRC client
-License:	GPLv3
-Group:		Productivity/Networking/IRC
-URL:		http://www.dxirc.org/
-
-Source0:	%{name}-%{version}.tar.gz
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-BuildRequires:	fox16-devel gcc-c++ lua-devel update-desktop-files
-
+# vim: set ts=4 sw=4 et:
+
+Name:           dxirc
+Version:        0.90.0
+Release:        1
+Summary:        A simple IRC client
+License:        GPLv3
+Group:          Productivity/Networking/IRC
+URL:            http://www.dxirc.org/
+Source0:        http://dxirc.googlecode.com/files/dxirc-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  fox16-devel gcc-c++ lua-devel update-desktop-files
 
 %description
 Dxirc is simple IRC client. dxirc is desktop independent and is written with
 the C++ Fox Toolkit.
 
-
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q
 
 %build
 %configure --with-included-gettext --enable-release
-%__make %{?jobs:-j%{jobs}}
-
+%__make %{?_smp_flags}
 
 %install
-
 %makeinstall
 %__rm -rf %{buildroot}/%{_datadir}/locale/locale.alias
 %find_lang %{name}
@@ -39,8 +30,7 @@
 %suse_update_desktop_file -r %{name} Network IRCClient
 
 %clean
-%__rm -rf "%{buildroot}"
-
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -61,6 +51,3 @@
 %dir %{_datadir}/%{name}/sounds
 %{_datadir}/%{name}/sounds/*.wav
 
-
-%changelog
-

dxirc-0.80.0.tar.gz/ChangeLog -> dxirc-0.90.0.tar.gz/ChangeLog Changed

dxirc-0.80.0.tar.gz/aclocal.m4 -> dxirc-0.90.0.tar.gz/aclocal.m4 Changed

@@ -47,7 +47,8 @@
 # ----------------------------------
 AC_DEFUN(PKG_PROG_PKG_CONFIG,
 m4_pattern_forbid(^_?PKG_A-Z_+$)
-m4_pattern_allow(^PKG_CONFIG(_PATH)?$)
+m4_pattern_allow(^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$)
+m4_pattern_allow(^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$)
 AC_ARG_VAR(PKG_CONFIG, path to pkg-config utility)
 AC_ARG_VAR(PKG_CONFIG_PATH, directories to add to pkg-config's search path)
 AC_ARG_VAR(PKG_CONFIG_LIBDIR, path overriding pkg-config's built-in search path)
@@ -93,7 +94,8 @@
     pkg_cv_$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS($3,
-                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`,
+                     pkg_cv_$1=`$PKG_CONFIG --$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ,
 		     pkg_failed=yes)
  else
     pkg_failed=untried
@@ -141,9 +143,9 @@
    	AC_MSG_RESULT(no)
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
         else 
-	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -156,7 +158,7 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT)
+_PKG_TEXT)dnl
         )
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT(no)
@@ -167,7 +169,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.)
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.)dnl
         )
 else
 	$1_CFLAGS=$pkg_cv_$1_CFLAGS

dxirc-0.80.0.tar.gz/config.guess -> dxirc-0.90.0.tar.gz/config.guess Changed

@@ -1,10 +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, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2011-05-11'
 
 # 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
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -180,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -394,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if  $UNAME_PROCESSOR = mc88100  ||  $UNAME_PROCESSOR = mc88110 
 	then
 	    if  ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx  || \
@@ -494,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:456)
+    *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +598,52 @@
 	    9000/6780-90-9)
 		if  -x /usr/bin/getconf ; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if  "${HP_ARCH}" = "" ; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

dxirc-0.80.0.tar.gz/config.h -> dxirc-0.90.0.tar.gz/config.h Changed

dxirc-0.80.0.tar.gz/config.sub -> dxirc-0.90.0.tar.gz/config.sub Changed

dxirc-0.80.0.tar.gz/configure -> dxirc-0.90.0.tar.gz/configure Changed

@@ -3130,7 +3130,7 @@
 
 # Define the identity of the package.
  PACKAGE=dxirc
- VERSION=0.80.0
+ VERSION=0.90.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11238,6 +11238,7 @@
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11366,6 +11367,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11382,6 +11384,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11401,9 +11404,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
+	        SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1`
         else
-	        SSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
+	        SSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SSL_PKG_ERRORS" >&5
@@ -11515,6 +11518,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11531,6 +11535,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11550,9 +11555,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -11575,6 +11580,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11591,6 +11597,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11610,9 +11617,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -11955,6 +11962,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11971,6 +11979,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -11990,9 +11999,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         else
-	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1" 2>&1`
+	        LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LUA_PKG_ERRORS" >&5
@@ -12354,6 +12363,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12370,6 +12380,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12389,9 +12400,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant" 2>&1`
+	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant" 2>&1`
         else
-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant" 2>&1`
+	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ENCHANT_PKG_ERRORS" >&5
@@ -12433,6 +12444,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12449,6 +12461,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12468,9 +12481,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1`
         else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11_PKG_ERRORS" >&5
@@ -12485,7 +12498,6 @@
 Alternatively, you may set the environment variables X11_CFLAGS
 and X11_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -12501,7 +12513,6 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
-
 else
 	X11_CFLAGS=$pkg_cv_X11_CFLAGS

dxirc-0.80.0.tar.gz/configure.in -> dxirc-0.90.0.tar.gz/configure.in Changed

dxirc-0.80.0.tar.gz/debian/changelog -> dxirc-0.90.0.tar.gz/debian/changelog Changed

dxirc-0.80.0.tar.gz/dxirc.spec -> dxirc-0.90.0.tar.gz/dxirc.spec Changed

dxirc-0.80.0.tar.gz/po/LINGUAS -> dxirc-0.90.0.tar.gz/po/LINGUAS Changed

dxirc-0.80.0.tar.gz/po/cs.gmo -> dxirc-0.90.0.tar.gz/po/cs.gmo Changed

dxirc-0.80.0.tar.gz/po/cs.po -> dxirc-0.90.0.tar.gz/po/cs.po Changed

@@ -3,8 +3,8 @@
 msgstr ""
 "Project-Id-Version: 0.01\n"
 "Report-Msgid-Bugs-To: david@konstrukce-cad.com\n"
-"POT-Creation-Date: 2011-09-11 18:34+0200\n"
-"PO-Revision-Date: 2011-08-30 19:30+0100\n"
+"POT-Creation-Date: 2011-10-21 18:28+0200\n"
+"PO-Revision-Date: 2011-10-20 20:00+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: dvx-alone <david@konstrukce-cad.com>\n"
 "Language: \n"
@@ -15,11 +15,11 @@
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,119,-1,-1\n"
 
-#: src/configdialog.cpp:125 src/configdialog.cpp:451 src/configdialog.cpp:1071
-#: src/configdialog.cpp:1109 src/configdialog.cpp:1149
-#: src/configdialog.cpp:1462 src/configdialog.cpp:1502 src/dxirc.cpp:1462
-#: src/irctabitem.cpp:84 src/irctabitem.cpp:4416 src/irctabitem.cpp:4437
-#: src/irctabitem.cpp:4462 src/irctabitem.cpp:4492 src/irctabitem.cpp:4515
+#: src/configdialog.cpp:125 src/configdialog.cpp:455 src/configdialog.cpp:1101
+#: src/configdialog.cpp:1139 src/configdialog.cpp:1179
+#: src/configdialog.cpp:1515 src/configdialog.cpp:1555 src/dxirc.cpp:1469
+#: src/irctabitem.cpp:90 src/irctabitem.cpp:4478 src/irctabitem.cpp:4499
+#: src/irctabitem.cpp:4524 src/irctabitem.cpp:4554 src/irctabitem.cpp:4577
 #: src/serverdialog.cpp:101 src/serverdialog.cpp:181 src/serverdialog.cpp:268
 #: src/aliasdialog.cpp:53 src/aliasdialog.cpp:84 src/aliasdialog.cpp:127
 #: src/dccdialog.cpp:177 src/fxext.cpp:927 src/fxext.cpp:940 src/fxext.cpp:946
@@ -39,11 +39,11 @@
 msgid "&Cancel"
 msgstr "&Zrušit"
 
-#: src/configdialog.cpp:126 src/configdialog.cpp:1072
-#: src/configdialog.cpp:1110 src/configdialog.cpp:1150
-#: src/configdialog.cpp:1463 src/configdialog.cpp:1503 src/dxirc.cpp:1463
-#: src/irctabitem.cpp:4417 src/irctabitem.cpp:4438 src/irctabitem.cpp:4463
-#: src/irctabitem.cpp:4493 src/irctabitem.cpp:4516 src/serverdialog.cpp:182
+#: src/configdialog.cpp:126 src/configdialog.cpp:1102
+#: src/configdialog.cpp:1140 src/configdialog.cpp:1180
+#: src/configdialog.cpp:1516 src/configdialog.cpp:1556 src/dxirc.cpp:1470
+#: src/irctabitem.cpp:4479 src/irctabitem.cpp:4500 src/irctabitem.cpp:4525
+#: src/irctabitem.cpp:4555 src/irctabitem.cpp:4578 src/serverdialog.cpp:182
 #: src/serverdialog.cpp:269 src/aliasdialog.cpp:85 src/aliasdialog.cpp:128
 #: src/fxext.cpp:921 src/fxext.cpp:926 src/fxext.cpp:1108 src/fxext.cpp:1245
 #: src/fxext.cpp:1501 ../../../fox-1.6/src/FXMessageBox.cpp:102
@@ -66,636 +66,620 @@
 msgid "Preview:"
 msgstr "Náhled:"
 
-#: src/configdialog.cpp:164 src/configdialog.cpp:1187
-#: src/configdialog.cpp:2138 src/irctabitem.cpp:97 src/irctabitem.cpp:107
+#: src/configdialog.cpp:164 src/configdialog.cpp:1217
+#: src/configdialog.cpp:2191 src/irctabitem.cpp:103 src/irctabitem.cpp:113
 msgid "Select file"
 msgstr "Vyberte soubor"
 
-#: src/configdialog.cpp:246
+#: src/configdialog.cpp:247
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: src/configdialog.cpp:449 src/serverdialog.cpp:102 src/aliasdialog.cpp:54
+#: src/configdialog.cpp:453 src/serverdialog.cpp:102 src/aliasdialog.cpp:54
 msgid "&Save&&Close"
 msgstr "&Uložit&&Zavřít"
 
-#: src/configdialog.cpp:458
-msgid "Irc text settings"
-msgstr "Nastavení Irc textu"
-
-#: src/configdialog.cpp:464
-msgid "Text backround color"
-msgstr "Barva pozadí textu"
-
-#: src/configdialog.cpp:466
-msgid "Text color"
-msgstr "Barva textu"
-
-#: src/configdialog.cpp:468
-msgid "User events text color"
-msgstr "Barva uživatelských zpráv"
-
-#: src/configdialog.cpp:470
-msgid "Actions message text color"
-msgstr "Barva textu akční zprávy"
-
-#: src/configdialog.cpp:472
-msgid "Notice text color"
-msgstr "Barva textu poznámky"
-
-#: src/configdialog.cpp:474
-msgid "Error text color"
-msgstr "Barva textu chyby"
-
-#: src/configdialog.cpp:476
-msgid "Highlight message text color"
-msgstr "Barva textu zvýrazněné zprávy"
-
-#: src/configdialog.cpp:478
-msgid "Link color"
-msgstr "Barva odkazu"
-
-#: src/configdialog.cpp:480
-msgid "My message color"
-msgstr "Barva textu vlastní zprávy"
-
-#: src/configdialog.cpp:482
-msgid "Log line color"
-msgstr "Barva řádku ze záznamu"
-
-#: src/configdialog.cpp:483 src/configdialog.cpp:715
-msgid "Font"
-msgstr "Font"
-
-#: src/configdialog.cpp:485
-msgid "Use same font for commandline"
-msgstr "Použít stejný font i pro příkazový řádek"
+#: src/configdialog.cpp:484
+msgid "&General"
+msgstr "&Obecné"
 
 #: src/configdialog.cpp:486
-msgid "Use same font for user list"
-msgstr "Použít stejný font i pro seznam uživatelů"
+msgid "Run one instance"
+msgstr "Pouze jedna instance"
 
 #: src/configdialog.cpp:487
-msgid "Use colored nick"
-msgstr "Používat barevné nicky"
+msgid "Disable tabs sorting"
+msgstr "Vypnout řazení záložek"
 
 #: src/configdialog.cpp:488
-msgid "Strip colors in text"
-msgstr "Odstranit barvy v textu"
-
-#: src/configdialog.cpp:489
-msgid "Load logged lines"
-msgstr "Načíst řádky ze záznamu"
-
-#: src/configdialog.cpp:492
-msgid "Load max. number lines"
-msgstr "Načíst max. počet řádků"
-
-#: src/configdialog.cpp:500
-msgid "Ignore commands and users"
-msgstr "Ignorované příkazy a uživatelé"
-
-#: src/configdialog.cpp:502
-msgid "Commands"
-msgstr "Příkazy"
-
-#: src/configdialog.cpp:504 src/configdialog.cpp:510 src/configdialog.cpp:538
-#: src/configdialog.cpp:755 src/configdialog.cpp:858
-msgid "Add"
-msgstr "Přidat"
-
-#: src/configdialog.cpp:505 src/configdialog.cpp:512 src/configdialog.cpp:539
-#: src/configdialog.cpp:757 src/configdialog.cpp:860 src/logviewer.cpp:434
-msgid "Delete"
-msgstr "Smazat"
-
-#: src/configdialog.cpp:508
-msgid "Users"
-msgstr "Uživatelé"
-
-#: src/configdialog.cpp:511 src/configdialog.cpp:756 src/configdialog.cpp:859
-msgid "Modify"
-msgstr "Upravit"
-
-#: src/configdialog.cpp:516 ../../../fox-1.6/src/FXFileList.cpp:196
-#: ../../../fox-1.6/src/FXFileSelector.cpp:731
-msgid "User"
-msgstr "Uživatel"
-
-#: src/configdialog.cpp:517 src/configdialog.cpp:762
-msgid "Channel(s)"
-msgstr "Kanál(y)"
-
-#: src/configdialog.cpp:518 src/configdialog.cpp:763
-msgid "Network"
-msgstr "Síť"
-
-#: src/configdialog.cpp:534
-msgid "General settings"
-msgstr "Obecné nastavení"
-
-#: src/configdialog.cpp:536
-msgid "Nick icons themes"
-msgstr "Téma ikon přezdívek"
-
-#: src/configdialog.cpp:553
-msgid "\tAdmin"
-msgstr "\tAdministrátor"
-
-#: src/configdialog.cpp:554
-msgid "\tOwner"
-msgstr "\tVlastník"
-

dxirc-0.80.0.tar.gz/po/dxirc.pot -> dxirc-0.90.0.tar.gz/po/dxirc.pot Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: david@konstrukce-cad.com\n"
-"POT-Creation-Date: 2011-09-11 18:34+0200\n"
+"POT-Creation-Date: 2011-10-21 18:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,11 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/configdialog.cpp:125 src/configdialog.cpp:451 src/configdialog.cpp:1071
-#: src/configdialog.cpp:1109 src/configdialog.cpp:1149
-#: src/configdialog.cpp:1462 src/configdialog.cpp:1502 src/dxirc.cpp:1462
-#: src/irctabitem.cpp:84 src/irctabitem.cpp:4416 src/irctabitem.cpp:4437
-#: src/irctabitem.cpp:4462 src/irctabitem.cpp:4492 src/irctabitem.cpp:4515
+#: src/configdialog.cpp:125 src/configdialog.cpp:455 src/configdialog.cpp:1101
+#: src/configdialog.cpp:1139 src/configdialog.cpp:1179
+#: src/configdialog.cpp:1515 src/configdialog.cpp:1555 src/dxirc.cpp:1469
+#: src/irctabitem.cpp:90 src/irctabitem.cpp:4478 src/irctabitem.cpp:4499
+#: src/irctabitem.cpp:4524 src/irctabitem.cpp:4554 src/irctabitem.cpp:4577
 #: src/serverdialog.cpp:101 src/serverdialog.cpp:181 src/serverdialog.cpp:268
 #: src/aliasdialog.cpp:53 src/aliasdialog.cpp:84 src/aliasdialog.cpp:127
 #: src/dccdialog.cpp:177 src/fxext.cpp:927 src/fxext.cpp:940 src/fxext.cpp:946
@@ -40,11 +40,11 @@
 msgid "&Cancel"
 msgstr ""
 
-#: src/configdialog.cpp:126 src/configdialog.cpp:1072
-#: src/configdialog.cpp:1110 src/configdialog.cpp:1150
-#: src/configdialog.cpp:1463 src/configdialog.cpp:1503 src/dxirc.cpp:1463
-#: src/irctabitem.cpp:4417 src/irctabitem.cpp:4438 src/irctabitem.cpp:4463
-#: src/irctabitem.cpp:4493 src/irctabitem.cpp:4516 src/serverdialog.cpp:182
+#: src/configdialog.cpp:126 src/configdialog.cpp:1102
+#: src/configdialog.cpp:1140 src/configdialog.cpp:1180
+#: src/configdialog.cpp:1516 src/configdialog.cpp:1556 src/dxirc.cpp:1470
+#: src/irctabitem.cpp:4479 src/irctabitem.cpp:4500 src/irctabitem.cpp:4525
+#: src/irctabitem.cpp:4555 src/irctabitem.cpp:4578 src/serverdialog.cpp:182
 #: src/serverdialog.cpp:269 src/aliasdialog.cpp:85 src/aliasdialog.cpp:128
 #: src/fxext.cpp:921 src/fxext.cpp:926 src/fxext.cpp:1108 src/fxext.cpp:1245
 #: src/fxext.cpp:1501 ../../../fox-1.6/src/FXMessageBox.cpp:102
@@ -67,634 +67,618 @@
 msgid "Preview:"
 msgstr ""
 
-#: src/configdialog.cpp:164 src/configdialog.cpp:1187
-#: src/configdialog.cpp:2138 src/irctabitem.cpp:97 src/irctabitem.cpp:107
+#: src/configdialog.cpp:164 src/configdialog.cpp:1217
+#: src/configdialog.cpp:2191 src/irctabitem.cpp:103 src/irctabitem.cpp:113
 msgid "Select file"
 msgstr ""
 
-#: src/configdialog.cpp:246
+#: src/configdialog.cpp:247
 msgid "Preferences"
 msgstr ""
 
-#: src/configdialog.cpp:449 src/serverdialog.cpp:102 src/aliasdialog.cpp:54
+#: src/configdialog.cpp:453 src/serverdialog.cpp:102 src/aliasdialog.cpp:54
 msgid "&Save&&Close"
 msgstr ""
 
-#: src/configdialog.cpp:458
-msgid "Irc text settings"
+#: src/configdialog.cpp:484
+msgid "&General"
 msgstr ""
 
-#: src/configdialog.cpp:464
-msgid "Text backround color"
+#: src/configdialog.cpp:486
+msgid "Run one instance"
 msgstr ""
 
-#: src/configdialog.cpp:466
-msgid "Text color"
+#: src/configdialog.cpp:487
+msgid "Disable tabs sorting"
 msgstr ""
 
-#: src/configdialog.cpp:468
-msgid "User events text color"
+#: src/configdialog.cpp:488
+msgid "Reconnect after disconnection"
 msgstr ""
 
-#: src/configdialog.cpp:470
-msgid "Actions message text color"
+#: src/configdialog.cpp:490
+msgid "Number of attempts (zero for unlimited)"
 msgstr ""
 
-#: src/configdialog.cpp:472
-msgid "Notice text color"
+#: src/configdialog.cpp:496
+msgid "Delay between two attempts in seconds"
 msgstr ""
 
-#: src/configdialog.cpp:474
-msgid "Error text color"
+#: src/configdialog.cpp:502
+msgid ""
+"Max. users number for checking away\tToo high number can be reason for ban"
 msgstr ""
 
-#: src/configdialog.cpp:476
-msgid "Highlight message text color"
+#: src/configdialog.cpp:505
+msgid "Use trayicon"
 msgstr ""
 
-#: src/configdialog.cpp:478
-msgid "Link color"
+#: src/configdialog.cpp:506
+msgid "Close button hides application"
 msgstr ""
 
-#: src/configdialog.cpp:480
-msgid "My message color"
+#: src/configdialog.cpp:510
+msgid "Use spellchecking"
 msgstr ""
 
-#: src/configdialog.cpp:482
-msgid "Log line color"
+#: src/configdialog.cpp:518
+msgid "Special tab for server messages"
 msgstr ""
 
-#: src/configdialog.cpp:483 src/configdialog.cpp:715
-msgid "Font"
+#: src/configdialog.cpp:519
+msgid "Logging chats"
 msgstr ""
 
-#: src/configdialog.cpp:485
-msgid "Use same font for commandline"
+#: src/configdialog.cpp:521
+msgid "Log path"
 msgstr ""
 
-#: src/configdialog.cpp:486
-msgid "Use same font for user list"
+#: src/configdialog.cpp:528
+msgid "Automatically load scripts"
 msgstr ""
 
-#: src/configdialog.cpp:487
-msgid "Use colored nick"
+#: src/configdialog.cpp:530
+msgid "Path"
 msgstr ""
 
-#: src/configdialog.cpp:488
-msgid "Strip colors in text"
+#: src/configdialog.cpp:548
+msgid "Loo&k"
 msgstr ""
 
-#: src/configdialog.cpp:489
-msgid "Load logged lines"
+#: src/configdialog.cpp:553
+msgid "Theme:"
 msgstr ""
 
-#: src/configdialog.cpp:492
-msgid "Load max. number lines"
+#: src/configdialog.cpp:560
+msgid "Base Color"
 msgstr ""
 
-#: src/configdialog.cpp:500
-msgid "Ignore commands and users"
+#: src/configdialog.cpp:562
+msgid "Border Color"
 msgstr ""
 
-#: src/configdialog.cpp:502
-msgid "Commands"
+#: src/configdialog.cpp:564
+msgid "Text Color"
 msgstr ""
 
-#: src/configdialog.cpp:504 src/configdialog.cpp:510 src/configdialog.cpp:538
-#: src/configdialog.cpp:755 src/configdialog.cpp:858
-msgid "Add"
+#: src/configdialog.cpp:566
+msgid "Background Color"
 msgstr ""
 
-#: src/configdialog.cpp:505 src/configdialog.cpp:512 src/configdialog.cpp:539
-#: src/configdialog.cpp:757 src/configdialog.cpp:860 src/logviewer.cpp:434
-msgid "Delete"
+#: src/configdialog.cpp:568
+msgid "Selected Text Color"
 msgstr ""
 
-#: src/configdialog.cpp:508

dxirc-0.90.0.tar.gz/po/sk.gmo Added

dxirc-0.90.0.tar.gz/po/sk.po Added

@@ -0,0 +1,4359 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+#
+# Translators:
+# Tomáš Vadina <kyberdev@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: dxirc\n"
+"Report-Msgid-Bugs-To: david@konstrukce-cad.com\n"
+"POT-Creation-Date: 2011-10-21 18:28+0200\n"
+"PO-Revision-Date: 2011-10-23 19:10+0100\n"
+"Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
+"Language-Team: Slovak (http://www.transifex.net/projects/p/dxirc/team/sk/)\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: src/configdialog.cpp:125 src/configdialog.cpp:455 src/configdialog.cpp:1101
+#: src/configdialog.cpp:1139 src/configdialog.cpp:1179
+#: src/configdialog.cpp:1515 src/configdialog.cpp:1555 src/dxirc.cpp:1469
+#: src/irctabitem.cpp:90 src/irctabitem.cpp:4478 src/irctabitem.cpp:4499
+#: src/irctabitem.cpp:4524 src/irctabitem.cpp:4554 src/irctabitem.cpp:4577
+#: src/serverdialog.cpp:101 src/serverdialog.cpp:181 src/serverdialog.cpp:268
+#: src/aliasdialog.cpp:53 src/aliasdialog.cpp:84 src/aliasdialog.cpp:127
+#: src/dccdialog.cpp:177 src/fxext.cpp:927 src/fxext.cpp:940 src/fxext.cpp:946
+#: src/fxext.cpp:953 src/fxext.cpp:960 src/fxext.cpp:968 src/fxext.cpp:1109
+#: src/fxext.cpp:1253 src/fxext.cpp:1502 src/fxext.cpp:1673 src/fxext.cpp:1820
+#: ../../../fox-1.6/src/FXMessageBox.cpp:107
+#: ../../../fox-1.6/src/FXMessageBox.cpp:118
+#: ../../../fox-1.6/src/FXMessageBox.cpp:123
+#: ../../../fox-1.6/src/FXMessageBox.cpp:129
+#: ../../../fox-1.6/src/FXMessageBox.cpp:135
+#: ../../../fox-1.6/src/FXMessageBox.cpp:142
+#: ../../../fox-1.6/src/FXColorSelector.cpp:169
+#: ../../../fox-1.6/src/FXFontSelector.cpp:114
+#: ../../../fox-1.6/src/FXDirSelector.cpp:135
+#: ../../../fox-1.6/src/FXFileSelector.cpp:205
+#: ../../../fox-1.6/src/FXReplaceDialog.cpp:113
+msgid "&Cancel"
+msgstr "&Zrušiť"
+
+#: src/configdialog.cpp:126 src/configdialog.cpp:1102
+#: src/configdialog.cpp:1140 src/configdialog.cpp:1180
+#: src/configdialog.cpp:1516 src/configdialog.cpp:1556 src/dxirc.cpp:1470
+#: src/irctabitem.cpp:4479 src/irctabitem.cpp:4500 src/irctabitem.cpp:4525
+#: src/irctabitem.cpp:4555 src/irctabitem.cpp:4578 src/serverdialog.cpp:182
+#: src/serverdialog.cpp:269 src/aliasdialog.cpp:85 src/aliasdialog.cpp:128
+#: src/fxext.cpp:921 src/fxext.cpp:926 src/fxext.cpp:1108 src/fxext.cpp:1245
+#: src/fxext.cpp:1501 ../../../fox-1.6/src/FXMessageBox.cpp:102
+#: ../../../fox-1.6/src/FXMessageBox.cpp:106
+#: ../../../fox-1.6/src/FXDirSelector.cpp:134
+#: ../../../fox-1.6/src/FXFileSelector.cpp:198
+msgid "&OK"
+msgstr "&OK"
+
+#: src/configdialog.cpp:130
+msgid "Smiley:"
+msgstr "Emotikon:"
+
+#: src/configdialog.cpp:133 src/scriptdialog.cpp:67 src/dccdialog.cpp:69
+msgid "Path:"
+msgstr "Cesta:"
+
+#: src/configdialog.cpp:139 src/fxext.cpp:1778
+#: ../../../fox-1.6/src/FXFontSelector.cpp:219
+msgid "Preview:"
+msgstr "Náhľad:"
+
+#: src/configdialog.cpp:164 src/configdialog.cpp:1217
+#: src/configdialog.cpp:2191 src/irctabitem.cpp:103 src/irctabitem.cpp:113
+msgid "Select file"
+msgstr "Vyberte súbor"
+
+#: src/configdialog.cpp:247
+msgid "Preferences"
+msgstr "Predvoľby"
+
+#: src/configdialog.cpp:453 src/serverdialog.cpp:102 src/aliasdialog.cpp:54
+msgid "&Save&&Close"
+msgstr "&Uložiť a &Zatvoriť"
+
+#: src/configdialog.cpp:484
+msgid "&General"
+msgstr "&Všeobecné"
+
+#: src/configdialog.cpp:486
+msgid "Run one instance"
+msgstr "Iba jedna inštancia"
+
+#: src/configdialog.cpp:487
+msgid "Disable tabs sorting"
+msgstr "Zakázať triedenie kariet"
+
+#: src/configdialog.cpp:488
+msgid "Reconnect after disconnection"
+msgstr "Znovu pripojiť po odpojení"
+
+#: src/configdialog.cpp:490
+msgid "Number of attempts (zero for unlimited)"
+msgstr "Počet pokusov (nula pre neobmedzený)"
+
+#: src/configdialog.cpp:496
+msgid "Delay between two attempts in seconds"
+msgstr "Oneskorenie medzi dvomi pokusmi v sekundách"
+
+#: src/configdialog.cpp:502
+msgid ""
+"Max. users number for checking away\tToo high number can be reason for ban"
+msgstr ""
+"Max. počet používateľov pre kontrolu stavu Preč \tPríliš vysoké číslo môže "
+"byť dôvodom k vykázaniu"
+
+#: src/configdialog.cpp:505
+msgid "Use trayicon"
+msgstr "Použiť ikonu v systémovej lište"
+
+#: src/configdialog.cpp:506
+msgid "Close button hides application"
+msgstr "Tlačidlo \"Zatvoriť\" skryje aplikáciu"
+
+#: src/configdialog.cpp:510
+msgid "Use spellchecking"
+msgstr "Používať kontrolu pravopisu"
+
+#: src/configdialog.cpp:518
+msgid "Special tab for server messages"
+msgstr "Zvláštna karta pre správy servera"
+
+#: src/configdialog.cpp:519
+msgid "Logging chats"
+msgstr "Zaznamenávanie rozhovorov"
+
+#: src/configdialog.cpp:521
+msgid "Log path"
+msgstr "Cesta k záznamom"
+
+#: src/configdialog.cpp:528
+msgid "Automatically load scripts"
+msgstr "Automaticky načítať skripty"
+
+#: src/configdialog.cpp:530
+msgid "Path"
+msgstr "Cesta"
+
+#: src/configdialog.cpp:548
+msgid "Loo&k"
+msgstr "Vz&hľad"
+
+#: src/configdialog.cpp:553
+msgid "Theme:"
+msgstr "Motív:"
+
+#: src/configdialog.cpp:560
+msgid "Base Color"
+msgstr "Základná farba"
+
+#: src/configdialog.cpp:562
+msgid "Border Color"
+msgstr "Farba okraja"
+
+#: src/configdialog.cpp:564
+msgid "Text Color"
+msgstr "Farba textu"
+
+#: src/configdialog.cpp:566
+msgid "Background Color"
+msgstr "Farba pozadia"
+
+#: src/configdialog.cpp:568
+msgid "Selected Text Color"
+msgstr "Farba vybraného textu"
+
+#: src/configdialog.cpp:570
+msgid "Selected Background Color"
+msgstr "Farba pozadia vybraného textu"
+
+#: src/configdialog.cpp:572
+msgid "Selected Menu Text Color"
+msgstr "Farba textu vybranej položky ponuky"
+
+#: src/configdialog.cpp:574
+msgid "Selected Menu Background Color"
+msgstr "Farba pozadia vybranej položky ponuky"
+
+#: src/configdialog.cpp:576
+msgid "Tip Text Color"
+msgstr "Farba textu plávajúcej nápovedy"
+
+#: src/configdialog.cpp:578
+msgid "Tip Background Color"
+msgstr "Farba pozadia plávajúcej nápovedy"
+
+#: src/configdialog.cpp:581
+msgid "Notify Text Color"
+msgstr "Farba textu upozornenia"
+
+#: src/configdialog.cpp:583

dxirc-0.80.0.tar.gz/src/Makefile.am -> dxirc-0.90.0.tar.gz/src/Makefile.am Changed

dxirc-0.80.0.tar.gz/src/configdialog.cpp -> dxirc-0.90.0.tar.gz/src/configdialog.cpp Changed

@@ -237,7 +237,8 @@
     FXMAPFUNC(SEL_COMMAND, ConfigDialog_DELETESMILEY, ConfigDialog::onDeleteSmiley),
     FXMAPFUNC(SEL_COMMAND, ConfigDialog_IMPORTSMILEY, ConfigDialog::onImportSmiley),
     FXMAPFUNC(SEL_COMMAND, ConfigDialog_EXPORTSMILEY, ConfigDialog::onExportSmiley),
-    FXMAPFUNC(SEL_COMMAND, ConfigDialog_LOADLOG, ConfigDialog::onLoadLog)
+    FXMAPFUNC(SEL_COMMAND, ConfigDialog_LOADLOG, ConfigDialog::onLoadLog),
+    FXMAPFUNC(SEL_MOUSEWHEEL, ConfigDialog_TABS, ConfigDialog::onMouseWheel)
 };
 
 FXIMPLEMENT(ConfigDialog, FXDialogBox, ConfigDialogMap, ARRAYNUMBER(ConfigDialogMap))
@@ -433,12 +434,15 @@
     m_targetHighlightColor.setSelector(ConfigDialog_TABCOLORS);
 
     m_targetOneInstance.connect(m_preferences.m_oneInstance);
+    m_targetDisableSortTabs.connect(m_preferences.m_disableSortTabs);
 
     m_targetLoadLog.connect(m_preferences.m_loadLog);
     m_targetLoadLog.setTarget(this);
     m_targetLoadLog.setSelector(ConfigDialog_LOADLOG);
     m_targetLoadLine.connect(m_preferences.m_loadLines);
 
+    m_targetSortUserMode.connect(m_preferences.m_sortUserMode);
+
     getApp()->getNormalFont()->create();
     FXFontDesc fontdescription;
     getApp()->getNormalFont()->getFontDesc(fontdescription);
@@ -450,142 +454,60 @@
     ok->addHotKey(KEY_Return);
     new dxEXButton(closeframe, _("&Cancel"), NULL, this, FXDialogBox::ID_CANCEL, LAYOUT_RIGHT|FRAME_RAISED|FRAME_THICK, 0,0,0,0, 10,10,2,2);
 
-    FXHorizontalFrame *contents = new FXHorizontalFrame(this, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    FXVerticalFrame *buttonframe = new FXVerticalFrame(contents, LAYOUT_FILL_Y|LAYOUT_LEFT|PACK_UNIFORM_WIDTH);
-    FXSwitcher *switcher = new FXSwitcher(contents, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT);
-
-    FXVerticalFrame *colorpane = new FXVerticalFrame(switcher, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    new FXLabel(colorpane, _("Irc text settings"), NULL, LAYOUT_LEFT);
-    new FXHorizontalSeparator(colorpane, SEPARATOR_LINE|LAYOUT_FILL_X);
-    FXHorizontalFrame *hframe = new FXHorizontalFrame(colorpane, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    FXVerticalFrame *cframe = new FXVerticalFrame(hframe, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    FXMatrix *colormatrix = new FXMatrix(cframe, 2, MATRIX_BY_COLUMNS, 0,0,0,0, DEFAULT_SPACING,DEFAULT_SPACING,DEFAULT_SPACING,DEFAULT_SPACING, 1,1);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsBack, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Text backround color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsText, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Text color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsUser, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("User events text color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsAction, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Actions message text color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsNotice, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Notice text color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsError, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Error text color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsHilight, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Highlight message text color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsLink, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Link color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsMymsg, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("My message color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXColorWell(colormatrix, FXRGB(0,0,255), &m_targetIrccolorsLog, FXDataTarget::ID_VALUE, COLORWELL_OPAQUEONLY|FRAME_SUNKEN|FRAME_THICK|LAYOUT_LEFT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW, 0,0,40,24);
-    new FXLabel(colormatrix, _("Log line color"), NULL, JUSTIFY_LEFT|LAYOUT_CENTER_Y|LAYOUT_FILL_X|LAYOUT_FILL_ROW);
-    new FXLabel(colormatrix, _("Font"));
-    m_ircfontButton = new dxEXButton(colormatrix, " ", NULL, this, ConfigDialog_IRCFONT, LAYOUT_CENTER_Y|FRAME_RAISED|JUSTIFY_CENTER_X|JUSTIFY_CENTER_Y|LAYOUT_FILL_X, 0,0,0,0, 10,10,2,2);
-    new FXCheckButton(cframe, _("Use same font for commandline"), &m_targetSameCmd, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    new FXCheckButton(cframe, _("Use same font for user list"), &m_targetSameList, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    new FXCheckButton(cframe, _("Use colored nick"), &m_targetColoredNick, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    new FXCheckButton(cframe, _("Strip colors in text"), &m_targetStripColors, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    m_loadLogButton = new FXCheckButton(cframe, _("Load logged lines"), &m_targetLoadLog, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    if(!m_preferences.m_logging) m_loadLogButton->disable();
-    FXHorizontalFrame *linepane = new FXHorizontalFrame(cframe, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    new FXLabel(linepane, _("Load max. number lines"), NULL, LAYOUT_LEFT);
-    m_loadLineSpinner = new FXSpinner(linepane, 4, &m_targetLoadLine, FXDataTarget::ID_VALUE, SPIN_NOMAX|FRAME_GROOVE);
-    if(!m_preferences.m_logging || !m_preferences.m_loadLog) m_loadLineSpinner->disable();
-    FXVerticalFrame *tframe = new FXVerticalFrame(hframe, FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    m_text = new FXText(tframe, NULL, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_READONLY);
-    m_text->setScrollStyle(HSCROLLING_OFF);
+    FXVerticalFrame *contents = new FXVerticalFrame(this, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+    m_tabbook = new dxTabBook(contents, this, ConfigDialog_TABS, PACK_UNIFORM_WIDTH|PACK_UNIFORM_HEIGHT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+    m_tabbook->setTabStyle(TABBOOK_LEFTTABS);
+
+    createGeneralTab(m_tabbook);
+    createLookTab(m_tabbook);
+    createIrctextTab(m_tabbook);
+    createNicklistTab(m_tabbook);
+    createIgnoreTab(m_tabbook);
+    createDccTab(m_tabbook);
+    createNotificationTab(m_tabbook);
+    createSmileysTab(m_tabbook);
 
-    FXVerticalFrame *ignorepane = new FXVerticalFrame(switcher, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    new FXLabel(ignorepane, _("Ignore commands and users"), NULL, LAYOUT_LEFT);
-    new FXHorizontalSeparator(ignorepane, SEPARATOR_LINE|LAYOUT_FILL_X);
-    FXGroupBox *commandsgroup = new FXGroupBox(ignorepane, _("Commands"), FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_SIDE_TOP);
-    FXVerticalFrame *commandsbuttons = new FXVerticalFrame(commandsgroup, LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y|PACK_UNIFORM_WIDTH);
-    m_addCommand = new dxEXButton(commandsbuttons, _("Add"), NULL, this, ConfigDialog_ADDCOMMAND, FRAME_RAISED|FRAME_THICK);
-    m_deleteCommand = new dxEXButton(commandsbuttons, _("Delete"), NULL, this, ConfigDialog_DELETECOMMAND, FRAME_RAISED|FRAME_THICK);
-    FXVerticalFrame *commandslist = new FXVerticalFrame(commandsgroup, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK);
-    m_commands = new FXList(commandslist, this, ConfigDialog_COMMAND, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    FXGroupBox *usersgroup = new FXGroupBox(ignorepane, _("Users"), FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    FXVerticalFrame *usersbuttons = new FXVerticalFrame(usersgroup, LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y|PACK_UNIFORM_WIDTH);
-    m_addUser = new dxEXButton(usersbuttons, _("Add"), NULL, this, ConfigDialog_ADDUSER, FRAME_RAISED|FRAME_THICK);
-    m_modifyUser = new dxEXButton(usersbuttons, _("Modify"), NULL, this, ConfigDialog_MODIFYUSER, FRAME_RAISED|FRAME_THICK);
-    m_deleteUser = new dxEXButton(usersbuttons, _("Delete"), NULL, this, ConfigDialog_DELETEUSER, FRAME_RAISED|FRAME_THICK);
-    FXVerticalFrame *userspane = new FXVerticalFrame(usersgroup, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK);
-    FXHorizontalFrame *usersframe = new FXHorizontalFrame(userspane, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    m_users = new FXIconList(usersframe, this, ConfigDialog_USER, ICONLIST_AUTOSIZE|ICONLIST_DETAILED|ICONLIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    m_users->appendHeader(_("User"), NULL, 200);
-    m_users->appendHeader(_("Channel(s)"), NULL, 150);
-    m_users->appendHeader(_("Network"), NULL, 150);
-    fillCommnads();
-    fillUsers();
-    m_commands->getNumItems() ? m_deleteCommand->enable() : m_deleteCommand->disable();
-    if(m_preferences.m_ignoreUsersList.no())
-    {
-        m_deleteUser->enable();
-        m_modifyUser->enable();
-    }
-    else
-    {
-        m_deleteUser->disable();
-        m_modifyUser->disable();
-    }
+    updateColors();
+    updateFont();
+    updateIrcFont();
+}
 
-    FXVerticalFrame *otherpane = new FXVerticalFrame(switcher, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    new FXLabel(otherpane, _("General settings"), NULL, LAYOUT_LEFT);
-    new FXHorizontalSeparator(otherpane, SEPARATOR_LINE|LAYOUT_FILL_X);
-    FXGroupBox *themesgroup = new FXGroupBox(otherpane, _("Nick icons themes"), FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_SIDE_TOP);
-    FXVerticalFrame *themesbuttons = new FXVerticalFrame(themesgroup, LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y|PACK_UNIFORM_WIDTH);
-    m_addTheme = new dxEXButton(themesbuttons, _("Add"), NULL, this, ConfigDialog_ADDICONS, FRAME_RAISED|FRAME_THICK);
-    m_deleteTheme = new dxEXButton(themesbuttons, _("Delete"), NULL, this, ConfigDialog_DELETEICONS, FRAME_RAISED|FRAME_THICK);
-    FXVerticalFrame *themeslist = new FXVerticalFrame(themesgroup, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK);
-    m_icons = new FXList(themeslist, this, ConfigDialog_ICONS, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    fillIcons();
-    for(FXint i=0; i<m_icons->getNumItems(); i++)
-    {
-        if(m_icons->getItemText(i) == m_preferences.m_themePath)
-        {
-            m_icons->setCurrentItem(i);
-            break;
-        }
-    }
-    m_icons->getNumItems()>1 ? m_deleteTheme->enable() : m_deleteTheme->disable();
-    m_iconsBar = new FXToolBar(themeslist, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    m_icon1 = new dxEXButton(m_iconsBar, _("\tAdmin"), NULL, NULL, 0, BUTTON_TOOLBAR);
-    m_icon2 = new dxEXButton(m_iconsBar, _("\tOwner"), NULL, NULL, 0, BUTTON_TOOLBAR);
-    m_icon3 = new dxEXButton(m_iconsBar, _("\tOp"), NULL, NULL, 0, BUTTON_TOOLBAR);
-    m_icon4 = new dxEXButton(m_iconsBar, _("\tHalfop"), NULL, NULL, 0, BUTTON_TOOLBAR);
-    m_icon5 = new dxEXButton(m_iconsBar, _("\tVoice"), NULL, NULL, 0, BUTTON_TOOLBAR);
-    m_icon6 = new dxEXButton(m_iconsBar, _("\tNormal"), NULL, NULL, 0, BUTTON_TOOLBAR);
-    m_icon7 = new dxEXButton(m_iconsBar, _("\tAway"), NULL, NULL, 0, BUTTON_TOOLBAR);
-    updateNickIcons();
-    new FXCheckButton(otherpane, _("Run one instance"), &m_targetOneInstance, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    new FXCheckButton(otherpane, _("Reconnect after disconnection"), &m_targetReconnect, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    FXHorizontalFrame *napane = new FXHorizontalFrame(otherpane, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    m_numberAttemptLabel = new FXLabel(napane, _("Number of attempts"), NULL, LAYOUT_LEFT);
+
+ConfigDialog::~ConfigDialog()
+{
+    delete m_font;
+    delete m_ircFont;
+}
+
+void ConfigDialog::createGeneralTab(dxTabBook *tabbook)
+{
+    new dxEXTabItem(tabbook, _("&General"), NULL, TAB_LEFT);
+    FXVerticalFrame *generalpane = new FXVerticalFrame(tabbook, FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y);
+    new FXCheckButton(generalpane, _("Run one instance"), &m_targetOneInstance, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
+    new FXCheckButton(generalpane, _("Disable tabs sorting"), &m_targetDisableSortTabs, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
+    new FXCheckButton(generalpane, _("Reconnect after disconnection"), &m_targetReconnect, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
+    FXHorizontalFrame *napane = new FXHorizontalFrame(generalpane, LAYOUT_FILL_X);
+    m_numberAttemptLabel = new FXLabel(napane, _("Number of attempts (zero for unlimited)"), NULL, LAYOUT_LEFT);
     if(!m_preferences.m_reconnect) m_numberAttemptLabel->disable();
     m_numberAttemptSpinner = new FXSpinner(napane, 4, &m_targetNumberAttempt, FXDataTarget::ID_VALUE, SPIN_CYCLIC|FRAME_GROOVE);
-    m_numberAttemptSpinner->setRange(1,20);
+    m_numberAttemptSpinner->setRange(0,20);
     if(!m_preferences.m_reconnect) m_numberAttemptSpinner->disable();
-    FXHorizontalFrame *dapane = new FXHorizontalFrame(otherpane, LAYOUT_FILL_X|LAYOUT_FILL_Y);
+    FXHorizontalFrame *dapane = new FXHorizontalFrame(generalpane, LAYOUT_FILL_X);
     m_delayAttemptLabel = new FXLabel(dapane, _("Delay between two attempts in seconds"), NULL, LAYOUT_LEFT);
     if(!m_preferences.m_reconnect) m_delayAttemptLabel->disable();
     m_delayAttemptSpinner = new FXSpinner(dapane, 4, &m_targetDelayAttempt, FXDataTarget::ID_VALUE, SPIN_CYCLIC|FRAME_GROOVE);
-    m_delayAttemptSpinner->setRange(10,120);
+    m_delayAttemptSpinner->setRange(5,120);
     if(!m_preferences.m_reconnect) m_delayAttemptSpinner->disable();
-    FXHorizontalFrame *maxpane = new FXHorizontalFrame(otherpane, LAYOUT_FILL_X|LAYOUT_FILL_Y);
+    FXHorizontalFrame *maxpane = new FXHorizontalFrame(generalpane, LAYOUT_FILL_X);
     new FXLabel(maxpane, _("Max. users number for checking away\tToo high number can be reason for ban"), NULL, LAYOUT_LEFT);
     new FXSpinner(maxpane, 4, &m_targetMaxAway, FXDataTarget::ID_VALUE, SPIN_NOMAX|FRAME_GROOVE);
-    FXHorizontalFrame *nickpane = new FXHorizontalFrame(otherpane, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    new FXLabel(nickpane, _("Nick completion char"), NULL, LAYOUT_LEFT);
-    m_nickCharField = new FXTextField(nickpane, 1, this, ConfigDialog_NICK, TEXTFIELD_LIMITED|FRAME_THICK|FRAME_SUNKEN/*|LAYOUT_FILL_X*/);
-    m_nickCharField->setText(m_preferences.m_nickCompletionChar);
 #ifdef HAVE_TRAY
-    new FXCheckButton(otherpane, _("Use trayicon"), &m_targetUseTray, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
-    m_closeToTrayButton = new FXCheckButton(otherpane, _("Close button hides application"), &m_targetCloseToTray, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
+    new FXCheckButton(generalpane, _("Use trayicon"), &m_targetUseTray, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);
+    m_closeToTrayButton = new FXCheckButton(generalpane, _("Close button hides application"), &m_targetCloseToTray, FXDataTarget::ID_VALUE, CHECKBUTTON_NORMAL|LAYOUT_FILL_X|LAYOUT_SIDE_LEFT|JUSTIFY_LEFT);

dxirc-0.80.0.tar.gz/src/configdialog.h -> dxirc-0.90.0.tar.gz/src/configdialog.h Changed

@@ -131,24 +131,25 @@
         long onImportSmiley(FXObject*,FXSelector,void*);
         long onExportSmiley(FXObject*,FXSelector,void*);
         long onLoadLog(FXObject*,FXSelector,void*);
+        long onMouseWheel(FXObject*,FXSelector,void*);
     private:
         ConfigDialog() {}
         ConfigDialog(const ConfigDialog&);
 
         Preferences m_preferences;
+        dxTabBook *m_tabbook;
         FXList *m_commands, *m_icons, *m_smileys;
         FXIconList *m_users, *m_friends;
         dxEXButton *m_addCommand, *m_deleteCommand, *m_addUser, *m_modifyUser, *m_deleteUser;
         dxEXButton *m_addTheme, *m_deleteTheme, *m_selectPath, *m_selectAutoloadPath;
         dxEXButton *m_addSmiley, *m_modifySmiley, *m_deleteSmiley, *m_importSmiley, *m_exportSmiley;
-        dxEXButton *m_icon1, *m_icon2, *m_icon3, *m_icon4, *m_icon5, *m_icon6, *m_icon7;
+        FXLabel *m_icon1, *m_icon2, *m_icon3, *m_icon4, *m_icon5, *m_icon6, *m_icon7;
         dxEXButton *m_fontButton, *m_ircfontButton, *m_addFriend, *m_modifyFriend, *m_deleteFriend;
         FXCheckButton *m_closeToTrayButton, *m_checkConnect, *m_checkDisconnect, *m_checkMessage;
         FXCheckButton *m_checkNotifyConnect, *m_checkNotifyDisconnect, *m_checkNotifyMessage;
         FXTextField *m_textTest, *m_nickCharField;
         FXString m_dccIP1, m_dccIP2, m_dccIP3, m_dccIP4;
         FXbool m_showImportwarning;
-        FXToolBar *m_iconsBar;
         FXSpinner *m_numberAttemptSpinner, *m_delayAttemptSpinner;
         FXLabel *m_numberAttemptLabel, *m_delayAttemptLabel;
         FXDataTarget m_targetIrccolorsText, m_targetIrccolorsBack, m_targetIrccolorsUser;
@@ -170,7 +171,7 @@
         FXDataTarget m_targetNotify, m_targetNotifyConnect, m_targetNotifyDisconnect, m_targetNotifyMessage, m_targetOneInstance;
         FXDataTarget m_targetPathConnect, m_targetPathDisconnect, m_targetPathMessage, m_targetStripColors;
         FXDataTarget m_targetUseSmileys, m_targetAutoDccChat, m_targetAutoDccFile, m_targetTrayColor;
-        FXDataTarget m_targetUnreadColor, m_targetHighlightColor;
+        FXDataTarget m_targetUnreadColor, m_targetHighlightColor, m_targetDisableSortTabs;
         dxEXButton *m_selectConnect, *m_selectDisconnect, *m_selectMessage, *m_playConnect, *m_playDisconnect, *m_playMessage;
         FXLabel *m_labelSelected, *m_labelNocurrent, *m_labelTip, *m_label;
         FXVerticalFrame *m_vframe2, *m_menuFrame;
@@ -184,7 +185,7 @@
         dxEXTabItem *m_tab, *m_unread, *m_highlight;
         FXVerticalFrame *m_tabframe1, *m_tabframe2, *m_tabframe3;
         FXMainWindow *m_owner;
-        FXDataTarget m_targetUseSpell, m_targetLoadLog, m_targetLoadLine;
+        FXDataTarget m_targetUseSpell, m_targetLoadLog, m_targetLoadLine, m_targetSortUserMode;
         FXCheckButton *m_loadLogButton;
         FXSpinner *m_loadLineSpinner;
 #ifndef HAVE_LIBNOTIFY
@@ -211,6 +212,14 @@
         FXbool smileyExist(const FXString &ckdSmiley);
         FXchar* enquote(FXchar* result, const FXchar* text);
         FXchar* dequote(FXchar* text) const;
+        void createGeneralTab(dxTabBook *tabbook);
+        void createLookTab(dxTabBook *tabbook);
+        void createIrctextTab(dxTabBook *tabbook);
+        void createNicklistTab(dxTabBook *tabbook);
+        void createIgnoreTab(dxTabBook *tabbook);
+        void createDccTab(dxTabBook *tabbook);
+        void createNotificationTab(dxTabBook *tabbook);
+        void createSmileysTab(dxTabBook *tabbook);
 };
 
 class SmileyDialog: public FXDialogBox

dxirc-0.80.0.tar.gz/src/dcctabitem.cpp -> dxirc-0.90.0.tar.gz/src/dcctabitem.cpp Changed

@@ -219,6 +219,7 @@
     m_socket->setHost(m_address, m_portD, m_portH);
     if(m_listen) m_socket->listenOn();
     else m_socket->connectTo();
+    loadLogLines();
 }
 
 void DccTabItem::clearChat()
@@ -246,6 +247,8 @@
 {
     reparent(m_parent);
     m_mainframe->reparent(m_parent);
+    recalc();
+    m_mainframe->recalc();
 }
 
 void DccTabItem::preferencesUpdated()
@@ -923,6 +926,34 @@
     {
         return showHelp(commandtext.after(' ').lower().trim());
     }
+    if(command == "log")
+    {
+        FXString logcommand = commandtext.after(' ').before(' ');
+        FXString logfile = commandtext.after(' ').after(' ');
+        if(comparecase(logcommand, "list")==0)
+        {
+            listLogFiles();
+            return TRUE;
+        }
+        else if(comparecase(logcommand, "show")==0)
+        {
+            if(logfile.empty())
+                logfile = FXSystem::time("%Y-%m-%d", FXSystem::now());
+            FXString logpath = preferences.m_logPath+PATHSEPSTRING+getServerName()+PATHSEPSTRING+getText()+PATHSEPSTRING+logfile;
+            if(!FXStat::exists(logpath))
+            {
+                appendIrcStyledText(FXStringFormat(_("Log file %s doesn't exist"), logfile.text()), 4, FXSystem::now(), FALSE, FALSE);
+                return FALSE;
+            }
+            m_parent->getParent()->getParent()->handle(this, FXSEL(SEL_COMMAND, IrcTabItem_SHOWLOG), &logpath);
+            return TRUE;
+        }
+        else
+        {
+            appendIrcStyledText(FXStringFormat(_("'%s' isn't <list|show>"), logcommand.text()), 4, FXSystem::now(), FALSE, FALSE);
+            return FALSE;
+        }
+    }
     if(command == "lua")
     {
 #ifdef HAVE_LUA
@@ -1027,6 +1058,14 @@
         appendIrcStyledText(_("HELP <command>, shows help for command."), 3, FXSystem::now(), FALSE, FALSE);
         return TRUE;
     }
+    if(command == "log")
+    {
+        appendIrcStyledText(_("LOG list, shows list of log files for current tab"), 3, FXSystem::now(), FALSE, FALSE);
+        appendIrcStyledText(_("LOG show date, shows last log file for current tab, if date is empty"), 3, FXSystem::now(), FALSE, FALSE);
+        appendIrcStyledText(_("else file for given date"), 3, FXSystem::now(), FALSE, FALSE);
+        appendIrcStyledText(_("date example: 2011-01-31"), 3, FXSystem::now(), FALSE, FALSE);
+        return TRUE;
+    }
 #ifdef HAVE_LUA
     if(command == "lua")
     {
@@ -1110,6 +1149,11 @@
                 }
                 return 1;
             case KEY_Up:
+                if(event->state&CONTROLMASK)
+                {
+                    m_parent->getParent()->getParent()->handle(this, FXSEL(SEL_COMMAND, dxirc_MOVETAB), event);
+                    return 1;
+                }
                 if(m_currentPosition!=-1 && m_currentPosition<m_commandsHistory.no())
                 {
                     if(!line.empty() && line!=m_commandsHistorym_currentPosition)
@@ -1125,6 +1169,11 @@
                 }
                 return 1;
             case KEY_Down:
+                if(event->state&CONTROLMASK)
+                {
+                    m_parent->getParent()->getParent()->handle(this, FXSEL(SEL_COMMAND, dxirc_MOVETAB), event);
+                    return 1;
+                }
                 if(m_currentPosition!=-1 && m_currentPosition<m_commandsHistory.no())
                 {
                     if(!line.empty() && line!=m_commandsHistorym_currentPosition)
@@ -1208,7 +1257,7 @@
         if(!getApp()->hasTimeout(this, DccTabItem_PTIME)) getApp()->addTimeout(this, DccTabItem_PTIME);
         m_pipeStrings.append(text);
     }
-    else appendMyMsg(text, FXSystem::now());
+    else appendIrcText(text, FXSystem::now(), TRUE, FALSE);
     return 1;
 }
 
@@ -1697,7 +1746,7 @@
 {
     if(!preferences.m_loadLog)
         return;
-    FXString path = preferences.m_logPath+PATHSEPSTRING+m_engine->getNetworkName()+PATHSEPSTRING+getText();
+    FXString path = preferences.m_logPath+PATHSEPSTRING+getServerName()+PATHSEPSTRING+getText();
     if(!FXStat::exists(path))
         return;
     FXDir dir;
@@ -1759,3 +1808,87 @@
     for(FXint i=0; i<lines.no(); i++)
         appendLinkText(stripColors(linesi, TRUE), 11);
 }
+
+//List log files for tab
+void DccTabItem::listLogFiles()
+{
+    FXString path = preferences.m_logPath+PATHSEPSTRING+getServerName()+PATHSEPSTRING+getText();
+    if(!FXStat::exists(path))
+    {
+        appendIrcStyledText(FXStringFormat(_("No log files for %s-%s."), getServerName().text(), getText().text()), 4, FXSystem::now(), FALSE, FALSE);
+        return;
+    }
+    FXDir dir;
+    FXString name;
+    FXStat info;
+#ifndef WIN32
+    FXint islink;
+#endif
+    dxStringArray files;
+    // Managed to open directory
+    if(dir.open(path))
+    {
+        // Process directory entries
+        while (dir.next())
+        {
+            // Get name of entry
+            name = dir.name();
+            // A dot special file?
+            if(name0 == '.' && (name1 == 0 || (name1 == '.' && name2 == 0))) continue;
+            // Hidden file or directory normally not shown
+            if(name0 == '.') continue;
+#ifndef WIN32
+            // Get file/link info
+            if(!FXStat::statLink(path, info)) continue;
+            // If its a link, get the info on file itself
+            islink = info.isLink();
+            if(islink && !FXStat::statFile(path, info)) continue;
+#else
+            // Get file/link info
+            if(!FXStat::statFile(path, info)) continue;
+            // Hidden file or directory normally not shown
+            if(info.isHidden()) continue;
+#endif
+            // If it is not a directory, and not showing files and matching pattern skip it
+            if(!info.isDirectory() && !utils::isRightLogFile(path, name)) continue;
+            else files.append(name);
+        }
+        // Close it
+        dir.close();
+    }
+    if(!files.no())
+    {
+        appendIrcStyledText(FXStringFormat(_("No log files for %s-%s."), getServerName().text(), getText().text()), 4, FXSystem::now(), FALSE, FALSE);
+        return;
+    }
+    utils::sortStringArray(files);
+    appendIrcStyledText(_("Log files:"), 7, FXSystem::now(), FALSE, FALSE);
+    FXString lastYear = utils::getParam(files0, 1, FALSE, '-');
+    FXint lastMonth = FXIntVal(utils::getParam(files0, 2, FALSE, '-'));
+    appendIrcStyledText(FXStringFormat("%s:", lastYear.text()), 5, FXSystem::now(), FALSE, FALSE);
+    appendIrcStyledText(FXStringFormat("%s:", utils::getMonth(lastMonth).text()), 5, FXSystem::now(), FALSE, FALSE);
+    FXString list = "";
+    for(FXint i=0; i<files.no(); i++)
+    {
+        if(lastYear!=utils::getParam(filesi, 1, FALSE, '-'))
+        {
+            lastYear = utils::getParam(filesi, 1, FALSE, '-');
+            lastMonth = FXIntVal(utils::getParam(filesi, 2, FALSE, '-'));
+            appendIrcText(list.rbefore(','), FXSystem::now(), FALSE, FALSE);
+            appendIrcStyledText(FXStringFormat("%s:", lastYear.text()), 5, FXSystem::now(), FALSE, FALSE);
+            appendIrcStyledText(FXStringFormat("%s:", utils::getMonth(lastMonth).text()), 5, FXSystem::now(), FALSE, FALSE);
+            list.clear();
+            list.append(utils::getParam(filesi, 3, FALSE, '-')+", ");
+        }
+        else if(lastMonth!=FXIntVal(utils::getParam(filesi, 2, FALSE, '-')))
+        {
+            lastMonth = FXIntVal(utils::getParam(filesi, 2, FALSE, '-'));
+            appendIrcText(list.rbefore(','), FXSystem::now(), FALSE, FALSE);
+            appendIrcStyledText(FXStringFormat("%s:", utils::getMonth(lastMonth).text()), 5, FXSystem::now(), FALSE, FALSE);
+            list.clear();
+            list.append(utils::getParam(filesi, 3, FALSE, '-')+", ");
+        }
+        else list.append(utils::getParam(filesi, 3, FALSE, '-')+", ");
+    }
+    if(!list.empty()) appendIrcText(list.rbefore(','), FXSystem::now(), FALSE, FALSE);
+}

dxirc-0.80.0.tar.gz/src/dcctabitem.h -> dxirc-0.90.0.tar.gz/src/dcctabitem.h Changed

@@ -37,99 +37,101 @@
 {
     FXDECLARE(DccTabItem)
     friend class dxirc;
-    public:
-        DccTabItem(dxTabBook *tab, const FXString &mynick, const FXString &nick, const FXString &address="0", FXint portD=0, FXint portH=0, FXbool listen=FALSE, FXIcon *icon=0, FXuint opts=TAB_TOP_NORMAL, FXint id=0, FXFont *font=NULL, IrcEngine *engine=NULL);
-        virtual ~DccTabItem();
+public:
+    DccTabItem(dxTabBook *tab, const FXString &mynick, const FXString &nick, const FXString &address="0", FXint portD=0, FXint portH=0, FXbool listen=FALSE, FXIcon *icon=0, FXuint opts=TAB_TOP_NORMAL, FXint id=0, FXFont *font=NULL, IrcEngine *engine=NULL);
+    virtual ~DccTabItem();
 
-        void createGeom();
-        void clearChat();
-        FXString getServerName() { return m_address; }
-        FXint getServerPort() { return m_portD; }
-        FXString getNickName() { return m_mynick; }
-        FXString getRealServerName() { return m_address; }
-        void reparentTab();
-        void preferencesUpdated();
-        void setIrcFont(FXFont*);
-        void setCommandFocus();
-        void setSmileys(FXbool smiley, dxSmileyArray nsmileys);
-        void removeSmileys();
-        void makeLastRowVisible();
-        FXString getSpellLang();
-        FXbool getConnected() { return m_socket->isConnected(); }
-        void disconnect() { m_socket->disconnect(); }
+    void createGeom();
+    void clearChat();
+    FXString getServerName() { return m_address; }
+    FXint getServerPort() { return m_portD; }
+    FXString getNickName() { return m_mynick; }
+    FXString getRealServerName() { return m_address; }
+    TYPE getType() { return DCC; }
+    void reparentTab();
+    void preferencesUpdated();
+    void setIrcFont(FXFont*);
+    void setCommandFocus();
+    void setSmileys(FXbool smiley, dxSmileyArray nsmileys);
+    void removeSmileys();
+    void makeLastRowVisible();
+    FXString getSpellLang();
+    FXbool getConnected() { return m_socket->isConnected(); }
+    void disconnect() { m_socket->disconnect(); }
 
-        long onCommandline(FXObject *, FXSelector, void*);
-        long onKeyPress(FXObject *, FXSelector, void*);
-        long onPipeTimeout(FXObject *, FXSelector, void*);
-        long onCloseTimeout(FXObject *, FXSelector, void*);
-        long onPipe(FXObject *, FXSelector, void*);
-        long onSpellLang(FXObject *, FXSelector, void*);
-        long onSocketCanRead(FXObject*, FXSelector, void*);
-        long onSocketConnected(FXObject*, FXSelector, void*);
-        long onSocketDisconnected(FXObject*, FXSelector, void*);
-        long onSocketError(FXObject*, FXSelector, void*);
-        long onSocketStartAccept(FXObject*, FXSelector, void*);
-        long onSocketListen(FXObject*, FXSelector, void*);
-        long onIrcEvent(FXObject*, FXSelector, void*);
+    long onCommandline(FXObject *, FXSelector, void*);
+    long onKeyPress(FXObject *, FXSelector, void*);
+    long onPipeTimeout(FXObject *, FXSelector, void*);
+    long onCloseTimeout(FXObject *, FXSelector, void*);
+    long onPipe(FXObject *, FXSelector, void*);
+    long onSpellLang(FXObject *, FXSelector, void*);
+    long onSocketCanRead(FXObject*, FXSelector, void*);
+    long onSocketConnected(FXObject*, FXSelector, void*);
+    long onSocketDisconnected(FXObject*, FXSelector, void*);
+    long onSocketError(FXObject*, FXSelector, void*);
+    long onSocketStartAccept(FXObject*, FXSelector, void*);
+    long onSocketListen(FXObject*, FXSelector, void*);
+    long onIrcEvent(FXObject*, FXSelector, void*);
 
-    protected:        
-        void appendText(FXString msg, FXbool highlight, FXbool logLine=TRUE);
-        void appendStyledText(FXString text, FXint style, FXbool highlight, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
-        FXbool processLine(const FXString &);
-        void hasAllCommand(FXbool);
-        void hasMyMsg(FXbool);
+protected:
+    void appendText(FXString msg, FXbool highlight, FXbool logLine=TRUE);
+    void appendStyledText(FXString text, FXint style, FXbool highlight, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
+    FXbool processLine(const FXString &);
+    void hasAllCommand(FXbool);
+    void hasMyMsg(FXbool);
 
-    private:
-        DccTabItem(){}
+private:
+    DccTabItem(){}
 
-        dxTabBook *m_parent;
-        dxSocket *m_server;
-        dxPipe *m_pipe;
-        FXVerticalFrame *m_textframe, *m_mainframe;
-        FXHorizontalFrame *m_commandframe;
-        dxTextField *m_commandline;
-        FXint m_currentPosition, m_historyMax, m_dccTimeout;
-        FXbool m_sendPipe, m_listen;
-        FXbool m_scriptHasAll, m_scriptHasMyMsg;
-        dxStringArray m_commandsHistory, m_pipeStrings;
-        dxHiliteArray m_textStyleList;
-        std::ofstream *m_logstream;
-        FXComboBox *m_spellLangs;
-        FXString m_mynick, m_nick, m_address, m_receiveRest, m_dccIP;
-        FXint m_portD, m_portH;
-        dxSocket *m_socket;
-        IrcEngine *m_engine;
-        
-        FXString stripColors(const FXString &text, const FXbool stripOther);
-        void appendIrcText(FXString msg, FXTime time, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
-        void appendIrcStyledText(FXString styled, FXint stylenum, FXTime time, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
-        void appendIrcNickText(FXString nick, FXString msg, FXint style, FXTime time, FXbool logLine=TRUE);
-        void appendLinkText(const FXString &, FXint);
-        void appendMyMsg(FXString msg, FXTime time);
-        void startLogging();
-        void stopLogging();
-        void logLine(const FXString &line, const FXTime &time);
-        void setTextForeColor(FXColor);
-        void setTextBackColor(FXColor);
-        void setUserColor(FXColor);
-        void setActionsColor(FXColor);
-        void setNoticeColor(FXColor);
-        void setErrorColor(FXColor);
-        void setHilightColor(FXColor);
-        void setLinkColor(FXColor);
-        void setMymsgColor(FXColor);
-        void setLogColor(FXColor);
-        FXbool processCommand(const FXString &);
-        FXbool showHelp(FXString);
-        FXint getNickColor(const FXString &);
-        FXColor getIrcColor(FXint code);
-        FXint hiliteStyleExist(FXColor foreColor, FXColor backColor, FXuint style);
-        void createHiliteStyle(FXColor foreColor, FXColor backColor, FXuint style);
-        dxStringArray cutText(FXString, FXint);
-        FXbool highlightNeeded(const FXString &);
-        FXbool sendLine(const FXString &line);
-        void writeIrcEvent(IrcEvent event);
-        void loadLogLines();
+    dxTabBook *m_parent;
+    dxSocket *m_server;
+    dxPipe *m_pipe;
+    FXVerticalFrame *m_textframe, *m_mainframe;
+    FXHorizontalFrame *m_commandframe;
+    dxTextField *m_commandline;
+    FXint m_currentPosition, m_historyMax, m_dccTimeout;
+    FXbool m_sendPipe, m_listen;
+    FXbool m_scriptHasAll, m_scriptHasMyMsg;
+    dxStringArray m_commandsHistory, m_pipeStrings;
+    dxHiliteArray m_textStyleList;
+    std::ofstream *m_logstream;
+    FXComboBox *m_spellLangs;
+    FXString m_mynick, m_nick, m_address, m_receiveRest, m_dccIP;
+    FXint m_portD, m_portH;
+    dxSocket *m_socket;
+    IrcEngine *m_engine;
+
+    FXString stripColors(const FXString &text, const FXbool stripOther);
+    void appendIrcText(FXString msg, FXTime time, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
+    void appendIrcStyledText(FXString styled, FXint stylenum, FXTime time, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
+    void appendIrcNickText(FXString nick, FXString msg, FXint style, FXTime time, FXbool logLine=TRUE);
+    void appendLinkText(const FXString &, FXint);
+    void appendMyMsg(FXString msg, FXTime time);
+    void startLogging();
+    void stopLogging();
+    void logLine(const FXString &line, const FXTime &time);
+    void setTextForeColor(FXColor);
+    void setTextBackColor(FXColor);
+    void setUserColor(FXColor);
+    void setActionsColor(FXColor);
+    void setNoticeColor(FXColor);
+    void setErrorColor(FXColor);
+    void setHilightColor(FXColor);
+    void setLinkColor(FXColor);
+    void setMymsgColor(FXColor);
+    void setLogColor(FXColor);
+    FXbool processCommand(const FXString &);
+    FXbool showHelp(FXString);
+    FXint getNickColor(const FXString &);
+    FXColor getIrcColor(FXint code);
+    FXint hiliteStyleExist(FXColor foreColor, FXColor backColor, FXuint style);
+    void createHiliteStyle(FXColor foreColor, FXColor backColor, FXuint style);
+    dxStringArray cutText(FXString, FXint);
+    FXbool highlightNeeded(const FXString &);
+    FXbool sendLine(const FXString &line);
+    void writeIrcEvent(IrcEvent event);
+    void loadLogLines();
+    void listLogFiles();
 };
 
 #endif // DCCCTABITEM_H

dxirc-0.80.0.tar.gz/src/defs.h -> dxirc-0.90.0.tar.gz/src/defs.h Changed

@@ -33,6 +33,7 @@
 #endif
 
 #define LUA_HELP_PATH "http://www.dxirc.org/dxirc-lua.html"
+#define TAB (FXString)"\t"
 
 class IrcEngine;
 class DccEngine;
@@ -42,7 +43,8 @@
     SERVER,
     CHANNEL,
     QUERY,
-    OTHER
+    OTHER,
+    DCC
 };
 
 enum DCCTYPE {
@@ -118,11 +120,11 @@
 };
 
 enum UserMode {
+    OWNER = 0,
     ADMIN,
-    OWNER,
     OP,
-    HALFOP,
     VOICE,
+    HALFOP,
     NONE
 };
 
@@ -135,6 +137,7 @@
     dxirc_CLOSETAB,
     dxirc_SELECTTAB,
     dxirc_NEXTTAB,
+    dxirc_MOVETAB,
     dxirc_NEXTUNREAD,
     dxirc_CLEAR,
     dxirc_CLEARALL,
@@ -216,10 +219,15 @@
     ConfigDialog_EXPORTSMILEY,
     ConfigDialog_NOTIFYPOS,
     ConfigDialog_LOADLOG,
+    ConfigDialog_TABS,
+    ConfigDialog_MODIFYBINDINGS,
+    ConfigDialog_REFRESHBINDINGS,
     SmileyDialog_ACCEPT,
     SmileyDialog_CANCEL,
     SmileyDialog_PATH,
     dxTabItem_TEXT,
+    dxTabItem_OPENLINK,
+    dxTabItem_COPYLINK,
     DccDialog_CLOSE,
     DccDialog_CLEAR,
     DccDialog_CANCELED,
@@ -242,6 +250,7 @@
     DccTabItem_LUA,
     DccTabItem_NEWTETRIS,
     DccTabItem_NEWMSG,
+    DccTabItem_SHOWLOG,
     IrcEngine_DXSOCKET,
     IrcEngine_SERVER,
     IrcEngine_RTIME, //reconnect
@@ -283,6 +292,7 @@
     IrcTabItem_AWAY, //set away on right click
     IrcTabItem_DEAWAY, //remove away on right click
     IrcTabItem_SPELL,
+    IrcTabItem_SHOWLOG,
     LogViewer_ADD,
     LogViewer_CLOSE,
     LogViewer_TREE,
@@ -313,7 +323,10 @@
     TetrisTabItem_TETRISTIMEOUT,
     TetrisTabItem_NEW,
     TetrisTabItem_PAUSE,
-    HelpDialog_VIEWLICENSE
+    HelpDialog_VIEWLICENSE,
+    KeybindingsDialog_CANCEL,
+    KeybindingsDialog_SAVECLOSE,
+    KeybindingsDialog_TABLE
 };
 
 struct NickInfo {

dxirc-0.80.0.tar.gz/src/dxirc.cpp -> dxirc-0.90.0.tar.gz/src/dxirc.cpp Changed

@@ -166,6 +166,7 @@
     FXMAPFUNC(SEL_COMMAND,          dxirc_NEXTTAB,          dxirc::onCmdNextTab),
     FXMAPFUNC(SEL_COMMAND,          IrcTabItem_NEXTTAB,     dxirc::onCmdNextTab),
     FXMAPFUNC(SEL_COMMAND,          DccTabItem_NEXTTAB,     dxirc::onCmdNextTab),
+    FXMAPFUNC(SEL_COMMAND,          dxirc_MOVETAB,          dxirc::onCmdMoveTab),
     FXMAPFUNC(SEL_MOUSEWHEEL,       dxirc_TABS,             dxirc::onMouseWheel),
     FXMAPFUNC(SEL_COMMAND,          dxirc_NEXTUNREAD,       dxirc::onCmdNextUnread),
     FXMAPFUNC(SEL_COMMAND,          dxirc_ALIAS,            dxirc::onCmdAlias),
@@ -202,6 +203,8 @@
     FXMAPFUNC(SOCKET_CONNECTED,     dxirc_VERSIONSOCKET,    dxirc::onVersionSocketConnected),
     FXMAPFUNC(SOCKET_CANREAD,       dxirc_VERSIONSOCKET,    dxirc::onVersionSocketCanRead),
     FXMAPFUNC(SOCKET_ERR,           dxirc_VERSIONSOCKET,    dxirc::onVersionSocketError),
+    FXMAPFUNC(SEL_COMMAND,          DccTabItem_SHOWLOG,     dxirc::onShowLog),
+    FXMAPFUNC(SEL_COMMAND,          IrcTabItem_SHOWLOG,     dxirc::onShowLog)
 };
 
 FXIMPLEMENT(dxirc, FXMainWindow, dxircMap, ARRAYNUMBER(dxircMap))
@@ -371,6 +374,8 @@
     getAccelTable()->addAccel(MKUINT(KEY_8, ALTMASK), this, FXSEL(SEL_COMMAND, dxirc_SELECTTAB));
     getAccelTable()->addAccel(MKUINT(KEY_9, ALTMASK), this, FXSEL(SEL_COMMAND, dxirc_SELECTTAB));
     getAccelTable()->addAccel(MKUINT(KEY_Tab, CONTROLMASK), this, FXSEL(SEL_COMMAND, dxirc_NEXTTAB));
+    getAccelTable()->addAccel(MKUINT(KEY_Up, CONTROLMASK), this, FXSEL(SEL_COMMAND, dxirc_MOVETAB));
+    getAccelTable()->addAccel(MKUINT(KEY_Down, CONTROLMASK), this, FXSEL(SEL_COMMAND, dxirc_MOVETAB));
     getAccelTable()->addAccel(MKUINT(KEY_n, CONTROLMASK), this, FXSEL(SEL_COMMAND, dxirc_NEXTUNREAD));
     getAccelTable()->addAccel(MKUINT(KEY_N, CONTROLMASK), this, FXSEL(SEL_COMMAND, dxirc_NEXTUNREAD));
     getAccelTable()->addAccel(MKUINT(KEY_f, CONTROLMASK), this, FXSEL(SEL_COMMAND, dxirc_FORCEFOCUS));
@@ -440,6 +445,8 @@
     delete ICO_COPY;
     delete ICO_SELECTALL;
     delete ICO_FIND;
+    delete ICO_REFRESH;
+    delete ICO_KEYBINDINGS;
     while(m_smileys.no())
     {
         delete m_smileys0.icon;
@@ -2662,6 +2669,23 @@
     return 1;
 }
 
+//handle move tab
+long dxirc::onCmdMoveTab(FXObject*, FXSelector, void *ptr)
+{
+    if(!m_preferences.m_disableSortTabs)
+        return 1;
+    FXEvent* event = (FXEvent*)ptr;
+    if(event->code == KEY_Up)
+    {
+        moveTab(true);
+    }
+    else if(event->code == KEY_Down)
+    {
+        moveTab(false);
+    }
+    return 1;
+}
+
 //Handle mousewheel for change currenttab
 long dxirc::onMouseWheel(FXObject *, FXSelector, void *ptr)
 {
@@ -2797,7 +2821,7 @@
                     delete m_tabbook->childAtIndex(index);
                     delete m_tabbook->childAtIndex(index);
                     m_tabbook->recalc();
-                    
+
                 }
                 sortTabs();
                 if(m_tabbook->numChildren())
@@ -3308,6 +3332,25 @@
     return 1;
 }
 
+//fired from tab command /log show
+long dxirc::onShowLog(FXObject *sender, FXSelector, void *data)
+{
+    dxTabItem *tab = static_cast<dxTabItem*>(sender);
+    FXString path = static_cast<FXString*>(data)->text();
+    FXString name = FXPath::name(path);
+    FXint id = getTabId(tab->getText());
+    if(id==-1) id = createIrcTab(tab->getText(), ICO_LOGS, OTHER, NULL);
+    IrcTabItem *logtab = static_cast<IrcTabItem*>(getTabItemById(id));
+    logtab->clearChat();
+    logtab->appendStyledText(FXStringFormat(_("Log from %s:"), name.text()), 7, FALSE, FALSE, FALSE);
+    std::ifstream file(path.text());
+    std::string line;
+    while(getline(file, line))
+        logtab->appendText(line.c_str(), FALSE, FALSE);
+    setCurrentTabById(id);
+    return 1;
+}
+
 //Handle for entered text in IrcTab for mymsg in lua scripting
 long dxirc::onIrcMyMsg(FXObject *sender, FXSelector, void *data)
 {
@@ -3415,6 +3458,12 @@
                                     lua_pushstring(m_scriptsj.L, "other");
                                     lua_settable(m_scriptsj.L, -3);
                                 }break;
+                                case DCC:
+                                {
+                                    lua_pushstring(m_scriptsj.L, "type");
+                                    lua_pushstring(m_scriptsj.L, "dcc");
+                                    lua_settable(m_scriptsj.L, -3);
+                                }break;
                             }
                         }
                         lua_pushstring(m_scriptsj.L, "servername");
@@ -3494,7 +3543,7 @@
 {
     for(FXint i = 0; i < m_tabbook->numChildren(); i+=2)
     {
-        if(server->findTarget(static_cast<IrcTabItem*>(m_tabbook->childAtIndex(i))) && comparecase(static_cast<FXTabItem*>(m_tabbook->childAtIndex(i))->getText(), name) == 0) return TRUE;
+        if(server && server->findTarget(static_cast<IrcTabItem*>(m_tabbook->childAtIndex(i))) && comparecase(static_cast<FXTabItem*>(m_tabbook->childAtIndex(i))->getText(), name) == 0) return TRUE;
     }
     return FALSE;
 }
@@ -3531,7 +3580,7 @@
     return -1;
 }
 
-//usefull mainly for tetristab, othertab
+//usefull only for tetristab, othertab
 FXint dxirc::getTabId(FXString name)
 {
     for(FXint i = 0; i < m_tabbook->numChildren(); i+=2)
@@ -3541,7 +3590,7 @@
             if(m_tabbook->childAtIndex(i)->getMetaClass()==&TetrisTabItem::metaClass)
                 return static_cast<TetrisTabItem*>(m_tabbook->childAtIndex(i))->getID();
             else
-                return static_cast<dxTabItem*>(m_tabbook->childAtIndex(i))->getID();
+                if(static_cast<dxTabItem*>(m_tabbook->childAtIndex(i))->getType()==OTHER) return static_cast<dxTabItem*>(m_tabbook->childAtIndex(i))->getID();
         }
     }
     return -1;
@@ -3699,7 +3748,7 @@
 
 void dxirc::createDccTab(const FXString &mynick, const FXString &nick, const FXString &address, FXint portD, FXint portH, FXbool listen, IrcEngine *engine)
 {
-FXuint style;
+    FXuint style;
     switch(m_preferences.m_tabPosition) {
         case 0: //bottom
             {
@@ -3723,7 +3772,7 @@
             }
     }
     DccTabItem *tabitem = new DccTabItem(m_tabbook, mynick, nick, address, portD, portH, listen, ICO_DCC, style, m_lastID, m_ircFont, engine);
-    sendNewTab(NULL, nick, m_lastID, FALSE, TRUE, OTHER);
+    sendNewTab(NULL, nick, m_lastID, FALSE, TRUE, DCC);
     m_lastID++;
     tabitem->create();
     tabitem->createGeom();
@@ -3758,15 +3807,17 @@
 
 void dxirc::sortTabs()
 {
-    if(m_tabbook->numChildren()/2 > 1)
+    if(m_preferences.m_disableSortTabs)
+        return;
+    if(m_tabbook->numTabs() > 1)
     {
         FXint id = getCurrentTabId();
         if(hasTetrisTab())
         {
             FXint index = 0;
             TetrisTabItem *tetristab = NULL;
-            dxTabItem* *tabpole = new dxTabItem*m_tabbook->numChildren()/2-1;
-            for(FXint i = 0; i < m_tabbook->numChildren()/2; i++)
+            dxTabItem* *tabpole = new dxTabItem*m_tabbook->numTabs()-1;
+            for(FXint i = 0; i < m_tabbook->numTabs(); i++)
             {
                 if(m_tabbook->childAtIndex(i*2)->getMetaClass()!=&TetrisTabItem::metaClass)
                 {
@@ -3775,8 +3826,8 @@
                 }
                 else tetristab = static_cast<TetrisTabItem*>(m_tabbook->childAtIndex(i*2));
             }
-            qsort(tabpole, m_tabbook->numChildren()/2-1, sizeof(tabpole0), (int(*)(const void*, const void*))&CompareTabs);
-            for(FXint i = 0; i < m_tabbook->numChildren()/2-1; i++)
+            qsort(tabpole, m_tabbook->numTabs()-1, sizeof(tabpole0), (int(*)(const void*, const void*))&CompareTabs);
+            for(FXint i = 0; i < m_tabbook->numTabs()-1; i++)
             {
                 tabpolei->reparentTab();
             }
@@ -3786,13 +3837,13 @@
         }
         else
         {
-            dxTabItem* *tabpole = new dxTabItem*m_tabbook->numChildren()/2;
-            for(FXint i = 0; i < m_tabbook->numChildren()/2; i++)
+            dxTabItem* *tabpole = new dxTabItem*m_tabbook->numTabs();
+            for(FXint i = 0; i < m_tabbook->numTabs(); i++)
             {
                 tabpolei = (dxTabItem*)m_tabbook->childAtIndex(i*2);
             }
-            qsort(tabpole, m_tabbook->numChildren()/2, sizeof(tabpole0), (int(*)(const void*, const void*))&CompareTabs);
-            for(int i=0; i < m_tabbook->numChildren()/2; i++)
+            qsort(tabpole, m_tabbook->numTabs(), sizeof(tabpole0), (int(*)(const void*, const void*))&CompareTabs);
+            for(int i=0; i < m_tabbook->numTabs(); i++)
             {

dxirc-0.80.0.tar.gz/src/dxirc.h -> dxirc-0.90.0.tar.gz/src/dxirc.h Changed

@@ -72,6 +72,7 @@
         long onCmdCloseTab(FXObject*, FXSelector, void*);
         long onCmdSelectTab(FXObject*, FXSelector, void*);
         long onCmdNextTab(FXObject*, FXSelector, void*);
+        long onCmdMoveTab(FXObject*, FXSelector, void*);
         long onCmdNextUnread(FXObject*, FXSelector, void*);
         long onCmdUsers(FXObject*, FXSelector, void*);
         long onCmdStatus(FXObject*, FXSelector, void*);
@@ -103,6 +104,7 @@
         long onVersionSocketConnected(FXObject*, FXSelector, void*);
         long onVersionSocketCanRead(FXObject*, FXSelector, void*);
         long onVersionSocketError(FXObject*, FXSelector, void*);
+        long onShowLog(FXObject*, FXSelector, void*);
         static int onLuaAddCommand(lua_State*);
         static int onLuaAddEvent(lua_State*);
         static int onLuaAddMyMsg(lua_State*);
@@ -203,6 +205,7 @@
         void updateServerWindow();
         FXbool hasTetrisTab();
         void sortTabs();
+        void moveTab(bool up);
         void appendIrcText(FXString text, FXbool logLine=TRUE);
         void appendIrcStyledText(FXString text, FXint style, FXbool logLine=TRUE);
         FXbool hasLuaAll(const FXString &);

dxirc-0.80.0.tar.gz/src/dxtabitem.cpp -> dxirc-0.90.0.tar.gz/src/dxtabitem.cpp Changed

@@ -30,11 +30,16 @@
 #include "config.h"
 #include "i18n.h"
 #include "utils.h"
+#include <FX88591Codec.h>
+#include <FXUTF16Codec.h>
 
 FXDEFMAP(dxTabItem) dxTabItemMap = {
     FXMAPFUNC(SEL_TEXTLINK,             dxTabItem_TEXT,     dxTabItem::onTextLink),
     FXMAPFUNC(SEL_RIGHTBUTTONRELEASE,   dxTabItem_TEXT,     dxTabItem::onTextRightMouse),
-    FXMAPFUNC(SEL_MIDDLEBUTTONRELEASE,  dxTabItem_TEXT,     dxTabItem::onTextMiddleMouse)
+    FXMAPFUNC(SEL_MIDDLEBUTTONRELEASE,  dxTabItem_TEXT,     dxTabItem::onTextMiddleMouse),
+    FXMAPFUNC(SEL_COMMAND,              dxTabItem_OPENLINK, dxTabItem::onOpenLink),
+    FXMAPFUNC(SEL_COMMAND,              dxTabItem_COPYLINK, dxTabItem::onCopyLink),
+    FXMAPFUNC(SEL_CLIPBOARD_REQUEST,    0,                  dxTabItem::onClipboardRequest)
 };
 
 FXIMPLEMENT(dxTabItem, dxEXTabItem, dxTabItemMap, ARRAYNUMBER(dxTabItemMap))
@@ -43,6 +48,7 @@
         FXint id)
     : dxEXTabItem(tab, tabtext, icon, opts), m_id(id)
 {
+    m_link = "";
     this->setIconPosition(ICON_BEFORE_TEXT);
 
     m_text = new dxText(tab, this, dxTabItem_TEXT, FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_READONLY|TEXT_WORDWRAP|TEXT_SHOWACTIVE|TEXT_AUTOSCROLL);
@@ -62,7 +68,15 @@
 {
     FXEvent* event=(FXEvent*)ptr;
     if(event->moved) return 1;
+    FXbool link = m_text->isXYLink(event->win_x, event->win_y);
     FXMenuPane popupmenu(this);
+    if(link)
+    {
+        m_link = m_text->getLinkTextXY(event->win_x, event->win_y);
+        new FXMenuCommand(&popupmenu, _("Open in a web browser"), NULL, this, dxTabItem_OPENLINK);
+        new FXMenuCommand(&popupmenu, _("Copy the link"), NULL, this, dxTabItem_COPYLINK);
+        new FXMenuSeparator(&popupmenu);
+    }
     FXMenuCommand *clear = new FXMenuCommand(&popupmenu, _("Clear window"), ICO_CLEAR, m_text, dxText::ID_CLEAR);
     new FXMenuSeparator(&popupmenu);
     FXMenuCommand *selectall = new FXMenuCommand(&popupmenu, _("Select All"), ICO_SELECTALL, m_text, dxText::ID_SELECT_ALL);
@@ -95,3 +109,60 @@
 #endif
     return 1;
 }
+
+long dxTabItem::onOpenLink(FXObject*, FXSelector, void*)
+{
+    utils::launchLink(m_link);
+    return 1;
+}
+
+long dxTabItem::onCopyLink(FXObject*, FXSelector, void*)
+{
+    FXDragType types4;
+    types0=stringType;
+    types1=textType;
+    types2=utf8Type;
+    types3=utf16Type;
+    acquireClipboard(types,4);
+    return 1;
+}
+
+// Somebody wants our selection
+long dxTabItem::onClipboardRequest(FXObject *sender, FXSelector sel, void *ptr)
+{
+    FXEvent *event = (FXEvent*)ptr;
+    // Try handling it in base class first
+    if(FXWindow::onClipboardRequest(sender, sel, ptr)) return 1;
+    // Requested data from clipboard
+    if(event->target==stringType || event->target==textType || event->target==utf8Type || event->target==utf16Type)
+    {
+        // Expand newlines to CRLF on Windows
+#ifdef WIN32
+        unixToDos(m_link);
+#endif
+        // Return clipped text as as UTF-8
+        if(event->target==utf8Type)
+        {
+            FXTRACE((100, "Request UTF8\n"));
+            setDNDData(FROM_CLIPBOARD, event->target, m_link);
+            return 1;
+        }
+        // Return clipped text translated to 8859-1
+        if(event->target==stringType || event->target==textType)
+        {
+            FX88591Codec ascii;
+            FXTRACE((100, "Request ASCII\n"));
+            setDNDData(FROM_CLIPBOARD, event->target, ascii.utf2mb(m_link));
+            return 1;
+        }
+        // Return text of the selection translated to UTF-16
+        if(event->target==utf16Type)
+        {
+            FXUTF16LECodec unicode;             // FIXME maybe other endianness for unix
+            FXTRACE((100, "Request UTF16\n"));
+            setDNDData(FROM_CLIPBOARD, event->target, unicode.utf2mb(m_link));
+            return 1;
+        }
+    }
+    return 0;
+}

dxirc-0.80.0.tar.gz/src/dxtabitem.h -> dxirc-0.90.0.tar.gz/src/dxtabitem.h Changed

@@ -35,50 +35,53 @@
 
 class dxTabItem: public dxEXTabItem
 {
-    FXDECLARE(dxTabItem)
-    friend class dxirc;
-    public:
-        dxTabItem(dxTabBook *tab, const FXString &tabtext, FXIcon *icon=0, FXuint opts=TAB_TOP_NORMAL, FXint id=0);
-        virtual ~dxTabItem();
+FXDECLARE(dxTabItem)
+friend class dxirc;
+public:
+    dxTabItem(dxTabBook *tab, const FXString &tabtext, FXIcon *icon=0, FXuint opts=TAB_TOP_NORMAL, FXint id=0);
+    virtual ~dxTabItem();
 
-        virtual void createGeom() {}
-        virtual void clearChat() {}
-        virtual void hideUsers() {}
-        virtual void showUsers() {}
-        virtual FXString getServerName() { return ""; }
-        virtual FXString getRealServerName() { return ""; }
-        virtual FXint getServerPort() { return 0; }
-        virtual FXString getNickName() { return "";}
-        virtual void setType(const TYPE &typ, const FXString &tabtext) {}
-        virtual TYPE getType() { return OTHER; }
-        FXint getID() { return m_id; }
-        virtual void reparentTab() {}
-        virtual void preferencesUpdated() {}
-        virtual void setIrcFont(FXFont*) {}
-        virtual void setCommandFocus() {}
-        virtual void setSmileys(FXbool smiley, dxSmileyArray nsmileys) {}
-        virtual void showSpellComboUpdated() {}
-        virtual void removeSmileys() {}
-        virtual void makeLastRowVisible() {}
-        virtual FXString getSpellLang() {return ""; }
+    virtual void createGeom() {}
+    virtual void clearChat() {}
+    virtual void hideUsers() {}
+    virtual void showUsers() {}
+    virtual FXString getServerName() { return ""; }
+    virtual FXString getRealServerName() { return ""; }
+    virtual FXint getServerPort() { return 0; }
+    virtual FXString getNickName() { return "";}
+    virtual void setType(const TYPE &typ, const FXString &tabtext) {}
+    virtual TYPE getType() { return OTHER; }
+    FXint getID() { return m_id; }
+    virtual void reparentTab() {}
+    virtual void preferencesUpdated() {}
+    virtual void setIrcFont(FXFont*) {}
+    virtual void setCommandFocus() {}
+    virtual void setSmileys(FXbool smiley, dxSmileyArray nsmileys) {}
+    virtual void showSpellComboUpdated() {}
+    virtual void removeSmileys() {}
+    virtual void makeLastRowVisible() {}
+    virtual FXString getSpellLang() {return ""; }
 
-        long onTextLink(FXObject *, FXSelector, void *);
-        long onTextRightMouse(FXObject *, FXSelector, void *);
-        long onTextMiddleMouse(FXObject *, FXSelector, void *);
+    long onTextLink(FXObject *, FXSelector, void *);
+    long onTextRightMouse(FXObject *, FXSelector, void *);
+    long onTextMiddleMouse(FXObject *, FXSelector, void *);
+    long onOpenLink(FXObject *, FXSelector, void *);
+    long onCopyLink(FXObject *, FXSelector, void *);
+    long onClipboardRequest(FXObject *, FXSelector, void *);
+protected:
+    dxTabItem(){}
 
-    protected:
-        dxTabItem(){}
+    dxText *m_text;
+    FXString m_link;
 
-        dxText *m_text;
-        
-        virtual void appendText(FXString msg, FXbool highlight, FXbool logLine=TRUE) {}
-        virtual void appendStyledText(FXString text, FXint style, FXbool highlight, FXbool disableStrip=FALSE, FXbool logLine=TRUE) {}
-        virtual FXbool processLine(const FXString &) { return FALSE; }
-        virtual void hasAllCommand(FXbool) {}
-        virtual void hasMyMsg(FXbool) {}
+    virtual void appendText(FXString msg, FXbool highlight, FXbool logLine=TRUE) {}
+    virtual void appendStyledText(FXString text, FXint style, FXbool highlight, FXbool disableStrip=FALSE, FXbool logLine=TRUE) {}
+    virtual FXbool processLine(const FXString &) { return FALSE; }
+    virtual void hasAllCommand(FXbool) {}
+    virtual void hasMyMsg(FXbool) {}
 
-    private:
-        FXint m_id;
+private:
+    FXint m_id;
 };
 
 #endif // DXTABITEM_H

dxirc-0.80.0.tar.gz/src/dxtext.cpp -> dxirc-0.90.0.tar.gz/src/dxtext.cpp Changed

@@ -1036,7 +1036,7 @@
     if(ch == '\n') return s;
     // Get special style for control codes
     if((FXuchar)ch < ' ') return s|STYLE_CONTROL|STYLE_TEXT;
-    
+
     return s|STYLE_TEXT;
     //return s;
 }
@@ -1785,4 +1785,45 @@
     }
 }
 
+//Is link on position x,y
+FXbool dxText::isXYLink(FXint x, FXint y) const
+{
+    FXuint index=styleOfXY(x, y)&STYLE_MASK;
+    if(hilitestyles && index && hilitestylesindex-1.link)
+        return true;
+    return false;
+}
+
+//Get link text
+FXString dxText::getLinkTextXY(FXint x, FXint y)
+{
+    FXuint index=styleOfXY(x, y)&STYLE_MASK;
+    if(hilitestyles && index && hilitestylesindex-1.link)
+    {
+        FXint line = getIndexOfY(y);
+        FXint start=getPosOfXY(x, y);
+        FXint length=0;
+        for(FXint i=start; i>=0; i--)
+        {
+            if(!(styleOf(line, i)&STYLE_MASK)) break;
+            if(hilitestyles(styleOf(line, i)&STYLE_MASK)-1.link) start = i;
+            else break;
+        }
+        for(FXint i=start; i<contentsline.length(); i++)
+        {
+            if(!(styleOf(line, i)&STYLE_MASK))
+            {
+                if(styleOf(line, i)&STYLE_SMILEY)
+                {
+                    if(i+1<contentsline.length() && hilitestyles(styleOf(line, i+1)&STYLE_MASK)-1.link) length++;
+                }
+                else break;
+            }
+            else if(hilitestyles(styleOf(line, i)&STYLE_MASK)-1.link) length++;
+            else break;
+        }
+        return clearSmiley(line, start, length);
+    }
+    return "";
+}

dxirc-0.80.0.tar.gz/src/dxtext.h -> dxirc-0.90.0.tar.gz/src/dxtext.h Changed

dxirc-0.80.0.tar.gz/src/icons.cpp -> dxirc-0.90.0.tar.gz/src/icons.cpp Changed

@@ -32,7 +32,7 @@
 FXIcon *ICO_SERVER, *ICO_CHANNEL, *ICO_QUERY, *ICO_CLEAR, *ICO_FLAG, *ICO_TRAY, *ICO_NEWMSG, *ICO_NEWFILE, *ICO_QUERYNEWMSG, *ICO_CHANNELNEWMSG, *ICO_CLOSEFOLDER, *ICO_OPENFOLDER, *ICO_FILE;
 FXIcon *ICO_CANCEL, *ICO_FINISH, *ICO_DOWN, *ICO_UP;
 FXIcon *ICO_DCC, *ICO_DCCNEWMSG, *ICO_LOGS, *ICO_SCRIPT, *ICO_TRANSFER, *ICO_PLAY;
-FXIcon *ICO_COPY, *ICO_SELECTALL, *ICO_FIND;
+FXIcon *ICO_COPY, *ICO_SELECTALL, *ICO_FIND, *ICO_REFRESH, *ICO_KEYBINDINGS;
 FXColor menuColor, textBackColor;
 
 /* created by reswrap from file empty.png */
@@ -471,6 +471,8 @@
     success = ((ICO_COPY = makeIcon(app, mainpath, "copy.png", TRUE)) != NULL) &success;
     success = ((ICO_SELECTALL = makeIcon(app, mainpath, "select_all.png", TRUE)) != NULL) &success;
     success = ((ICO_FIND = makeIcon(app, mainpath, "find.png", TRUE)) != NULL) &success;
+    success = ((ICO_REFRESH = makeIcon(app, mainpath, "arrow_refresh.png", TRUE)) != NULL) &success;
+    success = ((ICO_KEYBINDINGS = makeIcon(app, mainpath, "keyboard.png", TRUE)) != NULL) &success;
 
     return success;
 }

dxirc-0.80.0.tar.gz/src/icons.h -> dxirc-0.90.0.tar.gz/src/icons.h Changed

dxirc-0.80.0.tar.gz/src/ircengine.cpp -> dxirc-0.90.0.tar.gz/src/ircengine.cpp Changed

@@ -87,7 +87,7 @@
 
 long IrcEngine::onReconnectTimeout(FXObject*, FXSelector, void*)
 {
-    if(m_attempts < preferences.m_numberAttempt && !m_connected)
+    if(hasReconnectAttempt() && !m_connected)
     {
         if(m_connecting)
         {
@@ -132,7 +132,7 @@
         m_connected = FALSE;
         m_ping = 0;
         sendEvent(IRC_ERROR, _("Ping timeout"));
-        if(preferences.m_reconnect && m_attempts < preferences.m_numberAttempt)
+        if(preferences.m_reconnect && hasReconnectAttempt())
         {
             sendEvent(IRC_RECONNECT, FXStringFormat(_("Server %s was disconnected"), m_serverName.text()));
             m_application->addTimeout(this, IrcEngine_RTIME, preferences.m_delayAttempt*1000);
@@ -178,7 +178,7 @@
     m_connected = FALSE;
     m_connecting = FALSE;
     m_ping = 0;
-    if(preferences.m_reconnect && m_attempts < preferences.m_numberAttempt)
+    if(preferences.m_reconnect && hasReconnectAttempt())
     {
         sendEvent(IRC_RECONNECT, FXStringFormat(_("Server %s was disconnected"), m_serverName.text()));
         m_application->addTimeout(this, IrcEngine_RTIME, preferences.m_delayAttempt*1000);
@@ -355,7 +355,7 @@
     m_connected = FALSE;
     m_connecting = FALSE;
     m_ping = 0;
-    if(preferences.m_reconnect && m_attempts < preferences.m_numberAttempt && !disableReconnect)
+    if(preferences.m_reconnect && hasReconnectAttempt() && !disableReconnect)
     {
         sendEvent(IRC_RECONNECT, FXStringFormat(_("Server %s was disconnected"), m_serverName.text()));
         m_application->addTimeout(this, IrcEngine_RTIME, preferences.m_delayAttempt*1000);
@@ -1739,7 +1739,7 @@
 
 void IrcEngine::clearChannelsCommands(FXbool disableReconnect)
 {
-    if(preferences.m_reconnect && m_attempts < preferences.m_numberAttempt && !disableReconnect)
+    if(preferences.m_reconnect && hasReconnectAttempt() && !disableReconnect)
     {
         makeStartChannels();
     }
@@ -1941,7 +1941,7 @@
         m_application->addTimeout(this, IrcEngine_RTIME, preferences.m_delayAttempt*1000);
         return;
     }
-    if(preferences.m_reconnect && m_attempts < preferences.m_numberAttempt)
+    if(preferences.m_reconnect && hasReconnectAttempt())
     {
         m_application->addTimeout(this, IrcEngine_RTIME, preferences.m_delayAttempt*1000);
     }
@@ -1958,3 +1958,11 @@
     }
 }
 
+//can we reconnect attempt
+bool IrcEngine::hasReconnectAttempt()
+{
+    if(!preferences.m_numberAttempt) return true;
+    if(m_attempts < preferences.m_numberAttempt) return true;
+    return false;
+}
+

dxirc-0.80.0.tar.gz/src/ircengine.h -> dxirc-0.90.0.tar.gz/src/ircengine.h Changed

dxirc-0.80.0.tar.gz/src/irctabitem.cpp -> dxirc-0.90.0.tar.gz/src/irctabitem.cpp Changed

@@ -57,12 +57,18 @@
     return FXRGB(r,g,b);
 }
 
+//Sort by UserMode and nick
+FXint sortNick(const FXListItem *a, const FXListItem *b)
+{
+    return comparecase((FXchar)((NickListItem*)a)->getUserMode()+a->getText(), (FXchar)((NickListItem*)b)->getUserMode()+b->getText());
+}
+
 FXDEFMAP(DccSendDialog) DccSendDialogMap = {
     FXMAPFUNC(SEL_COMMAND,  DccSendDialog_FILE,     DccSendDialog::onFile),
     FXMAPFUNC(SEL_COMMAND,  DccSendDialog_SEND,     DccSendDialog::onSend),
     FXMAPFUNC(SEL_COMMAND,  DccSendDialog_CANCEL,   DccSendDialog::onCancel),
-    FXMAPFUNC(SEL_CLOSE,    0,                          DccSendDialog::onCancel),
-    FXMAPFUNC(SEL_KEYPRESS, 0,                          DccSendDialog::onKeyPress)
+    FXMAPFUNC(SEL_CLOSE,    0,                      DccSendDialog::onCancel),
+    FXMAPFUNC(SEL_KEYPRESS, 0,                      DccSendDialog::onKeyPress)
 };
 
 FXIMPLEMENT(DccSendDialog, FXDialogBox, DccSendDialogMap, ARRAYNUMBER(DccSendDialogMap))
@@ -363,7 +369,7 @@
 
     m_usersframe = new FXVerticalFrame(m_splitter, FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_FIX_WIDTH);
     m_users = new NickList(m_usersframe, this, IrcTabItem_USERS, LAYOUT_FILL_X|LAYOUT_FILL_Y);
-    m_users->setSortFunc(FXList::ascendingCase);
+    m_users->setSortFunc(preferences.m_sortUserMode ? sortNick : FXList::ascendingCase);
     m_users->setScrollStyle(HSCROLLING_OFF);
     if(preferences.m_sameList) m_users->setFont(font);
     if(m_type != CHANNEL || !preferences.m_usersShown)
@@ -492,6 +498,8 @@
 {
     reparent(m_parent);
     m_mainframe->reparent(m_parent);
+    recalc();
+    m_mainframe->recalc();
 }
 
 void IrcTabItem::hideUsers()
@@ -605,6 +613,8 @@
         m_commandline->setTipText("");
         m_spellLangs->hide();
     }
+    m_users->setSortFunc(preferences.m_sortUserMode ? sortNick : FXList::ascendingCase);
+    m_users->sortItems();
     m_commandframe->recalc();
 }
 
@@ -1934,6 +1944,39 @@
                 return TRUE;
             }
         }
+        if(command == "log")
+        {
+            if(m_type == SERVER)
+            {
+                appendIrcStyledText(_("Server tab hasn't log files"), 4, FXSystem::now(), FALSE, FALSE);
+                return TRUE;
+            }
+            FXString logcommand = commandtext.after(' ').before(' ');
+            FXString logfile = commandtext.after(' ').after(' ');
+            if(comparecase(logcommand, "list")==0)
+            {
+                listLogFiles();
+                return TRUE;
+            }
+            else if(comparecase(logcommand, "show")==0)
+            {
+                if(logfile.empty())
+                    logfile = FXSystem::time("%Y-%m-%d", FXSystem::now());
+                FXString logpath = preferences.m_logPath+PATHSEPSTRING+m_engine->getNetworkName()+PATHSEPSTRING+getText()+PATHSEPSTRING+logfile;
+                if(!FXStat::exists(logpath))
+                {
+                    appendIrcStyledText(FXStringFormat(_("Log file %s doesn't exist"), logfile.text()), 4, FXSystem::now(), FALSE, FALSE);
+                    return FALSE;
+                }
+                m_parent->getParent()->getParent()->handle(this, FXSEL(SEL_COMMAND, IrcTabItem_SHOWLOG), &logpath);
+                return TRUE;
+            }
+            else
+            {
+                appendIrcStyledText(FXStringFormat(_("'%s' isn't <list|show>"), logcommand.text()), 4, FXSystem::now(), FALSE, FALSE);
+                return FALSE;
+            }
+        }
         if(command == "lua")
         {
 #ifdef HAVE_LUA
@@ -2883,6 +2926,14 @@
         appendIrcStyledText(_("LIST channel, lists channels and their topics."), 3, FXSystem::now(), FALSE, FALSE);
         return TRUE;
     }
+    if(command == "log")
+    {
+        appendIrcStyledText(_("LOG list, shows list of log files for current tab"), 3, FXSystem::now(), FALSE, FALSE);
+        appendIrcStyledText(_("LOG show date, shows last log file for current tab, if date is empty"), 3, FXSystem::now(), FALSE, FALSE);
+        appendIrcStyledText(_("else file for given date"), 3, FXSystem::now(), FALSE, FALSE);
+        appendIrcStyledText(_("date example: 2011-01-31"), 3, FXSystem::now(), FALSE, FALSE);
+        return TRUE;
+    }
 #ifdef HAVE_LUA
     if(command == "lua")
     {
@@ -3075,7 +3126,7 @@
                     }
                     return 1;
                 }
-                if(line0 != '/' && line.after(' ').empty())
+                if(line0 != '/' && line.after(' ').empty() && m_type == CHANNEL)
                 {
                     if(line.empty())
                     {
@@ -3098,7 +3149,7 @@
                     }
                     return 1;
                 }
-                if(line.find(' ') != -1)
+                if(line.find(' ') != -1 && m_type == CHANNEL)
                 {
                     FXint curpos;
                     linem_commandline->getCursorPos() == ' ' ? curpos = m_commandline->getCursorPos()-1 : curpos = m_commandline->getCursorPos();
@@ -3132,6 +3183,11 @@
                 }
                 return 1;
             case KEY_Up:
+                if(event->state&CONTROLMASK)
+                {
+                    m_parent->getParent()->getParent()->handle(this, FXSEL(SEL_COMMAND, dxirc_MOVETAB), event);
+                    return 1;
+                }
                 if(m_currentPosition!=-1 && m_currentPosition<m_commandsHistory.no())
                 {
                     if(!line.empty() && line!=m_commandsHistorym_currentPosition)
@@ -3147,6 +3203,11 @@
                 }
                 return 1;
             case KEY_Down:
+                if(event->state&CONTROLMASK)
+                {
+                    m_parent->getParent()->getParent()->handle(this, FXSEL(SEL_COMMAND, dxirc_MOVETAB), event);
+                    return 1;
+                }
                 if(m_currentPosition!=-1 && m_currentPosition<m_commandsHistory.no())
                 {
                     if(!line.empty() && line!=m_commandsHistorym_currentPosition)
@@ -3908,6 +3969,7 @@
                 }
             }
         }
+        if(preferences.m_sortUserMode) m_users->sortItems();
     }
 }
 
@@ -4168,7 +4230,7 @@
         if(!getApp()->hasTimeout(this, IrcTabItem_PTIME)) getApp()->addTimeout(this, IrcTabItem_PTIME);
         m_pipeStrings.append(text);
     }
-    else appendMyMsg(text, FXSystem::now());
+    else appendIrcText(text, FXSystem::now(), TRUE, FALSE);
     return 1;
 }
 
@@ -4240,7 +4302,7 @@
         FXint max = rand()%30;
         for(FXint i=0; i<max; i++)
             replace.append(' ');
-        FXString pic = "\n                                  ©©  ©©\n                                   ©©©©\n\n©©©             ©©©©©©©©©©       ©©©©©©©©        ©©©©©©©©\n©©©             ©©©©©©©©©©      ©©©©©©©©©©      ©©©©©©©©©©\n©©©             ©©©             ©©©    ©©©      ©©©    ©©©\n©©©             ©©©©©©          ©©©             ©©©    ©©©\n©©©             ©©©©©©          ©©©             ©©©    ©©©\n©©©             ©©©             ©©©    ©©©      ©©©    ©©©\n©©©©©©©©©©      ©©©©©©©©©©      ©©©©©©©©©©      ©©©©©©©©©©\n©©©©©©©©©©      ©©©©©©©©©©       ©©©©©©©©        ©©©©©©©©\n";
+        FXString pic = "\nPráce\n  je\nLÁSKA";
         pic.substitute("\n", replace);
         pic.append('\n');
         m_text->clearText();
@@ -4645,7 +4707,8 @@
 
 FXString IrcTabItem::getNick(FXint i)
 {
-    return m_users->getItemText(i);
+    if(m_users->getNumItems()) return m_users->getItemText(i);
+    return "";
 }
 
 FXint IrcTabItem::getNickColor(const FXString &nick)
@@ -4777,6 +4840,10 @@
 //Load lines from logs
 void IrcTabItem::loadLogLines()
 {
+    if(m_type == OTHER)
+        return;
+    if(!m_engine)
+        return;
     if(!preferences.m_loadLog)
         return;
     FXString path = preferences.m_logPath+PATHSEPSTRING+m_engine->getNetworkName()+PATHSEPSTRING+getText();
@@ -4842,3 +4909,87 @@
         appendLinkText(stripColors(linesi, TRUE), 11);
 }
 
+//List log files for tab
+void IrcTabItem::listLogFiles()
+{
+    FXString path = preferences.m_logPath+PATHSEPSTRING+m_engine->getNetworkName()+PATHSEPSTRING+getText();

dxirc-0.80.0.tar.gz/src/irctabitem.h -> dxirc-0.90.0.tar.gz/src/irctabitem.h Changed

@@ -87,12 +87,12 @@
     NickListItem(const FXString& text, NickList *parent, UserMode mode=NONE, FXIcon* ic=NULL, void* ptr=NULL):FXListItem(text, ic, ptr),m_mode(mode),m_away(FALSE),m_parent(parent){}
 
     FXint getWidth(const FXList* list) const;
+    UserMode getUserMode() const { return m_mode; }
 protected:
     NickListItem() {}
 
     void draw(const FXList* list, FXDC& dc, FXint x, FXint y, FXint w, FXint h);
     void setUserMode(UserMode mode);
-    UserMode getUserMode() const { return m_mode; }
     void changeAway(FXbool away);
     void clearIcon();
     void restoreIcon();
@@ -109,165 +109,166 @@
     FXDECLARE(IrcTabItem)
     friend class dxirc;
     friend class NickList;
-    public:
-        IrcTabItem(dxTabBook *tab, const FXString &tabtext, FXIcon *icon=0, FXuint opts=TAB_TOP_NORMAL, FXint id=0, TYPE type=CHANNEL, IrcEngine *socket=NULL, FXFont *font=NULL, FXbool useNickIcon=FALSE);
-        virtual ~IrcTabItem();
+public:
+    IrcTabItem(dxTabBook *tab, const FXString &tabtext, FXIcon *icon=0, FXuint opts=TAB_TOP_NORMAL, FXint id=0, TYPE type=CHANNEL, IrcEngine *socket=NULL, FXFont *font=NULL, FXbool useNickIcon=FALSE);
+    virtual ~IrcTabItem();
 
-        void createGeom();
-        void clearChat();
-        void hideUsers();
-        void showUsers();
-        FXString getServerName() { return m_engine ? m_engine->getServerName() : ""; }
-        FXint getServerPort() { return m_engine ? m_engine->getServerPort() : 0; }
-        FXString getNickName() { return m_engine ? m_engine->getNickName() : ""; }
-        FXString getRealServerName() { return m_engine ? m_engine->getNetworkName() : ""; }
-        void setType(const TYPE &typ, const FXString &tabtext);
-        TYPE getType() { return m_type; }
-        void reparentTab();
-        void preferencesUpdated();
-        void setIrcFont(FXFont*);
-        void setCommandFocus();
-        void setSmileys(FXbool smiley, dxSmileyArray nsmileys);
-        void showSpellComboUpdated();
-        void removeSmileys();
-        void makeLastRowVisible();
-        FXString getSpellLang();
-        void checkAway();
-        void clearNickIcons();
-        void recreateNickIcons(FXbool useNickIcon);
+    void createGeom();
+    void clearChat();
+    void hideUsers();
+    void showUsers();
+    FXString getServerName() { return m_engine ? m_engine->getServerName() : ""; }
+    FXint getServerPort() { return m_engine ? m_engine->getServerPort() : 0; }
+    FXString getNickName() { return m_engine ? m_engine->getNickName() : ""; }
+    FXString getRealServerName() { return m_engine ? m_engine->getNetworkName() : ""; }
+    void setType(const TYPE &typ, const FXString &tabtext);
+    TYPE getType() { return m_type; }
+    void reparentTab();
+    void preferencesUpdated();
+    void setIrcFont(FXFont*);
+    void setCommandFocus();
+    void setSmileys(FXbool smiley, dxSmileyArray nsmileys);
+    void showSpellComboUpdated();
+    void removeSmileys();
+    void makeLastRowVisible();
+    FXString getSpellLang();
+    void checkAway();
+    void clearNickIcons();
+    void recreateNickIcons(FXbool useNickIcon);
 
-        long onCommandline(FXObject *, FXSelector, void*);
-        long onKeyPress(FXObject *, FXSelector, void*);
-        long onIrcEvent(FXObject *, FXSelector, void*);
-        long onEggTimeout(FXObject *, FXSelector, void*);
-        long onPipeTimeout(FXObject *, FXSelector, void*);
-        long onRightMouse(FXObject *, FXSelector, void*);
-        long onDoubleclick(FXObject *, FXSelector, void*);
-        long onNewQuery(FXObject *, FXSelector, void*);
-        long onWhois(FXObject *, FXSelector, void*);
-        long onOp(FXObject *, FXSelector, void*);
-        long onDeop(FXObject *, FXSelector, void*);
-        long onVoice(FXObject *, FXSelector, void*);
-        long onDevoice(FXObject *, FXSelector, void*);
-        long onKick(FXObject *, FXSelector, void*);
-        long onBan(FXObject *, FXSelector, void*);
-        long onKickban(FXObject *, FXSelector, void*);
-        long onIgnore(FXObject *, FXSelector, void*);
-        long onTopic(FXObject *, FXSelector, void*);
-        long onTopicLink(FXObject *, FXSelector, void*);
-        long onPipe(FXObject *, FXSelector, void*);
-        long onDccChat(FXObject *, FXSelector, void*);
-        long onDccSend(FXObject *, FXSelector, void*);
-        long onSetAway(FXObject *, FXSelector, void*);
-        long onRemoveAway(FXObject *, FXSelector, void*);
-        long onSpellLang(FXObject *, FXSelector, void*);
+    long onCommandline(FXObject *, FXSelector, void*);
+    long onKeyPress(FXObject *, FXSelector, void*);
+    long onIrcEvent(FXObject *, FXSelector, void*);
+    long onEggTimeout(FXObject *, FXSelector, void*);
+    long onPipeTimeout(FXObject *, FXSelector, void*);
+    long onRightMouse(FXObject *, FXSelector, void*);
+    long onDoubleclick(FXObject *, FXSelector, void*);
+    long onNewQuery(FXObject *, FXSelector, void*);
+    long onWhois(FXObject *, FXSelector, void*);
+    long onOp(FXObject *, FXSelector, void*);
+    long onDeop(FXObject *, FXSelector, void*);
+    long onVoice(FXObject *, FXSelector, void*);
+    long onDevoice(FXObject *, FXSelector, void*);
+    long onKick(FXObject *, FXSelector, void*);
+    long onBan(FXObject *, FXSelector, void*);
+    long onKickban(FXObject *, FXSelector, void*);
+    long onIgnore(FXObject *, FXSelector, void*);
+    long onTopic(FXObject *, FXSelector, void*);
+    long onTopicLink(FXObject *, FXSelector, void*);
+    long onPipe(FXObject *, FXSelector, void*);
+    long onDccChat(FXObject *, FXSelector, void*);
+    long onDccSend(FXObject *, FXSelector, void*);
+    long onSetAway(FXObject *, FXSelector, void*);
+    long onRemoveAway(FXObject *, FXSelector, void*);
+    long onSpellLang(FXObject *, FXSelector, void*);
 
-    protected:
-        void appendText(FXString msg, FXbool highlight, FXbool logLine=TRUE);
-        void appendStyledText(FXString text, FXint style, FXbool highlight, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
-        FXbool processLine(const FXString &);
-        void hasAllCommand(FXbool);
-        void hasMyMsg(FXbool);
+protected:
+    void appendText(FXString msg, FXbool highlight, FXbool logLine=TRUE);
+    void appendStyledText(FXString text, FXint style, FXbool highlight, FXbool disableStrip=FALSE, FXbool logLine=TRUE);
+    FXbool processLine(const FXString &);
+    void hasAllCommand(FXbool);
+    void hasMyMsg(FXbool);
 
-        IrcEngine *m_engine;
-    private:
-        IrcTabItem(){}
+    IrcEngine *m_engine;
+private:
+    IrcTabItem(){}
 
-        dxTabBook *m_parent;
-        dxPipe *m_pipe;
-        TYPE m_type;
-        FXVerticalFrame *m_textframe, *m_usersframe, *m_mainframe;
-        FXHorizontalFrame *m_commandframe;
-        FXSplitter *m_splitter;
-        NickList *m_users;
-        dxTextField *m_commandline;
-        dxTextField *m_topicline;
-        FXint m_currentPosition, m_historyMax, m_numberUsers, m_pics;
-        FXbool m_iamOp;
-        FXbool m_editableTopic;
-        FXbool m_sendPipe;
-        FXbool m_scriptHasAll, m_scriptHasMyMsg;
-        FXbool m_useNickIcon;
-        dxStringArray m_commandsHistory, m_pipeStrings;
-        dxHiliteArray m_textStyleList;
-        NickInfo m_nickOnRight;
-        FXString m_topic;
-        FXint m_maxLen;
-        std::ofstream *m_logstream;
-        FXComboBox *m_spellLangs;
+    dxTabBook *m_parent;
+    dxPipe *m_pipe;
+    TYPE m_type;
+    FXVerticalFrame *m_textframe, *m_usersframe, *m_mainframe;
+    FXHorizontalFrame *m_commandframe;
+    FXSplitter *m_splitter;
+    NickList *m_users;
+    dxTextField *m_commandline;
+    dxTextField *m_topicline;
+    FXint m_currentPosition, m_historyMax, m_numberUsers, m_pics;
+    FXbool m_iamOp;
+    FXbool m_editableTopic;
+    FXbool m_sendPipe;
+    FXbool m_scriptHasAll, m_scriptHasMyMsg;
+    FXbool m_useNickIcon;
+    dxStringArray m_commandsHistory, m_pipeStrings;
+    dxHiliteArray m_textStyleList;
+    NickInfo m_nickOnRight;
+    FXString m_topic;
+    FXint m_maxLen;
+    std::ofstream *m_logstream;
+    FXComboBox *m_spellLangs;
 
 
-        void onIrcPrivmsg(IrcEvent *ev);
-        void onIrcAction(IrcEvent *ev);
-        void onIrcCtpcReply(IrcEvent *ev);
-        void onIrcCtcpRequest(IrcEvent *ev);
-        void onIrcJoin(IrcEvent *ev);
-        void onIrcQuit(IrcEvent *ev);
-        void onIrcPart(IrcEvent *ev);
-        void onIrcChnotice(IrcEvent *ev);
-        void onIrcNotice(IrcEvent *ev);
-        void onIrcNick(IrcEvent *ev);
-        void onIrcTopic(IrcEvent *ev);
-        void onIrcKick(IrcEvent *ev);
-        void onIrcMode(IrcEvent *ev);

dxirc-0.80.0.tar.gz/src/preferences.cpp -> dxirc-0.90.0.tar.gz/src/preferences.cpp Changed

@@ -24,14 +24,12 @@
 #include "preferences.h"
 
 Preferences::Preferences() :
-    m_themePath(DXIRC_DATADIR PATHSEPSTRING "icons" PATHSEPSTRING "default"),
-    m_themesList(FXString(m_themePath+";")),
     m_oneInstance(FALSE),
+    m_disableSortTabs(FALSE),
     m_reconnect(FALSE),
     m_numberAttempt(1),
     m_delayAttempt(20),
     m_maxAway(200),
-    m_nickCompletionChar(":"),
 #ifdef HAVE_TRAY
     m_useTray(TRUE),
 #else
@@ -44,17 +42,21 @@
     m_logPath(""),
     m_autoload(FALSE),
     m_autoloadPath(""),
-    m_tabPosition(0),
     m_unreadColor(FXRGB(0,0,255)),
     m_highlightColor(FXRGB(255,0,0)),
+    m_tabPosition(0),
     m_font("Helvetica,90,normal,regular"),
     m_ircFont(""),
+    m_nickCompletionChar(":"),
     m_sameCmd(FALSE),
     m_sameList(FALSE),
     m_coloredNick(TRUE),
     m_stripColors(TRUE),
     m_loadLog(FALSE),
     m_loadLines(25),
+    m_themePath(DXIRC_DATADIR PATHSEPSTRING "icons" PATHSEPSTRING "default"),
+    m_themesList(FXString(m_themePath+";")),
+    m_sortUserMode(FALSE),
     m_ignoreCommandsList(""),
     m_dccPath(FXSystem::getHomeDirectory()),
     m_dccIP(""),
@@ -118,16 +120,12 @@
     set.parseFile(utils::instance().getIniFile(), TRUE);
 
     //General settings pane in Configdialog
-    m_themePath = utils::checkThemePath(set.readStringEntry("SETTINGS", "themePath", m_themePath.text()));
-    m_themesList = utils::checkThemesList(set.readStringEntry("SETTINGS", "themesList", FXString(m_themePath+";").text()));
-    if(m_themesList.before(';')!="internal") m_themesList.prepend("internal;");
-    if(!m_themesList.contains(m_themePath)) m_themesList.append(m_themePath+";");
     m_oneInstance = set.readBoolEntry("SETTINGS", "oneinstance", m_oneInstance);
+    m_disableSortTabs = set.readBoolEntry("SETTINGS", "disableSortTab", m_disableSortTabs);
     m_reconnect = set.readBoolEntry("SETTINGS", "reconnect", m_reconnect);
     m_numberAttempt = set.readIntEntry("SETTINGS", "numberAttempt", m_numberAttempt);
     m_delayAttempt = set.readIntEntry("SETTINGS", "delayAttempt", m_delayAttempt);
     m_maxAway = set.readIntEntry("SETTINGS", "maxAway", m_maxAway);
-    m_nickCompletionChar = FXString(set.readStringEntry("SETTINGS", "nickCompletionChar", m_nickCompletionChar.text())).left(1);
     m_useTray = set.readBoolEntry("SETTINGS", "tray", m_useTray);
     m_closeToTray = set.readBoolEntry("SETTINGS", "closeToTray", m_closeToTray);
     m_useSpell = set.readBoolEntry("SETTINGS", "useSpell", m_useSpell);
@@ -139,7 +137,6 @@
     m_autoload = set.readBoolEntry("SETTINGS", "autoload", m_autoload);
     m_autoloadPath = set.readStringEntry("SETTINGS", "autoloadPath");
     if(m_autoload && !FXStat::exists(utils::isUtf8(m_autoloadPath.text(), m_autoloadPath.length()) ? m_autoloadPath : utils::instance().localeToUtf8(m_autoloadPath))) m_autoload = FALSE;
-    m_tabPosition = set.readIntEntry("SETTINGS", "tabPosition", m_tabPosition);
 
     //Look settings pane in Configdialog
     m_appTheme.base = set.readColorEntry("SETTINGS", "basecolor", m_appTheme.base);
@@ -159,6 +156,7 @@
     m_trayColor = set.readColorEntry("SETTINGS", "traycolor", m_appTheme.base);
     m_unreadColor = set.readColorEntry("SETTINGS", "unreadcolor", m_unreadColor);
     m_highlightColor = set.readColorEntry("SETTINGS", "highlightcolor", m_highlightColor);
+    m_tabPosition = set.readIntEntry("SETTINGS", "tabPosition", m_tabPosition);
     m_font = set.readStringEntry("SETTINGS", "normalfont", m_font.text());
 
     //Irc Text settings pane in Configdialog
@@ -173,6 +171,7 @@
     m_colors.mymsg = set.readColorEntry("SETTINGS", "mymsgColor", m_colors.mymsg);
     m_colors.log = set.readColorEntry("SETTINGS", "logColor", m_colors.log);
     m_ircFont = set.readStringEntry("SETTINGS", "ircFont", m_ircFont.text());
+    m_nickCompletionChar = FXString(set.readStringEntry("SETTINGS", "nickCompletionChar", m_nickCompletionChar.text())).left(1);
     m_sameCmd = set.readBoolEntry("SETTINGS", "sameCmd", m_sameCmd);
     m_sameList = set.readBoolEntry("SETTINGS", "sameList", m_sameList);
     m_coloredNick = set.readBoolEntry("SETTINGS", "coloredNick", m_coloredNick);
@@ -180,6 +179,13 @@
     m_loadLog = set.readBoolEntry("SETTINGS", "loadLog", m_loadLog);
     m_loadLines = set.readIntEntry("SETTINGS", "loadLines", m_loadLines);
 
+    //NickList settings pane in Configdialog
+    m_themePath = utils::checkThemePath(set.readStringEntry("SETTINGS", "themePath", m_themePath.text()));
+    m_themesList = utils::checkThemesList(set.readStringEntry("SETTINGS", "themesList", FXString(m_themePath+";").text()));
+    if(m_themesList.before(';')!="internal") m_themesList.prepend("internal;");
+    if(!m_themesList.contains(m_themePath)) m_themesList.append(m_themePath+";");
+    m_sortUserMode = set.readBoolEntry("SETTINGS", "sortUserMode", m_sortUserMode);
+
     //Ignore settings pane in Configdialog
     m_ignoreCommandsList = set.readStringEntry("SETTINGS", "commandsList", m_ignoreCommandsList.text());
     FXint usersNum = set.readIntEntry("USERS", "number", 0);
@@ -296,6 +302,7 @@
                 m_langs.insert(StringPair(key, value));
         }
     }
+
 }
 
 void Preferences::save()
@@ -304,14 +311,12 @@
     //set.clear();
 
     //General settings pane in Configdialog
-    set.writeStringEntry("SETTINGS", "themePath", m_themePath.text());
-    set.writeStringEntry("SETTINGS", "themesList", m_themesList.text());
     set.writeBoolEntry("SETTINGS", "oneinstance", m_oneInstance);
+    set.writeBoolEntry("SETTINGS", "disableSortTab", m_disableSortTabs);
     set.writeBoolEntry("SETTINGS", "reconnect", m_reconnect);
     set.writeIntEntry("SETTINGS", "numberAttempt", m_numberAttempt);
     set.writeIntEntry("SETTINGS", "delayAttempt", m_delayAttempt);
     set.writeIntEntry("SETTINGS", "maxAway", m_maxAway);
-    set.writeStringEntry("SETTINGS", "nickCompletionChar", m_nickCompletionChar.left(1).text());
     set.writeBoolEntry("SETTINGS", "tray", m_useTray);
     set.writeBoolEntry("SETTINGS", "closeToTray", m_closeToTray);
     set.writeBoolEntry("SETTINGS", "useSpell", m_useSpell);
@@ -320,7 +325,6 @@
     set.writeStringEntry("SETTINGS", "logPath", m_logPath.text());
     set.writeBoolEntry("SETTINGS", "autoload", m_autoload);
     set.writeStringEntry("SETTINGS", "autoloadPath", m_autoloadPath.text());
-    set.writeIntEntry("SETTINGS", "tabPosition", m_tabPosition);
 
     //Look settings pane in Configdialog
     set.writeColorEntry("SETTINGS", "basecolor", m_appTheme.base);
@@ -340,6 +344,7 @@
     set.writeColorEntry("SETTINGS", "traycolor", m_trayColor);
     set.writeColorEntry("SETTINGS", "unreadcolor", m_unreadColor);
     set.writeColorEntry("SETTINGS", "highlightcolor", m_highlightColor);
+    set.writeIntEntry("SETTINGS", "tabPosition", m_tabPosition);
     set.writeStringEntry("SETTINGS", "normalfont", m_font.text());
 
     //Irc Text settings pane in Configdialog
@@ -354,6 +359,7 @@
     set.writeColorEntry("SETTINGS", "mymsgColor", m_colors.mymsg);
     set.writeColorEntry("SETTINGS", "logColor", m_colors.log);
     set.writeStringEntry("SETTINGS", "ircFont", m_ircFont.text());
+    set.writeStringEntry("SETTINGS", "nickCompletionChar", m_nickCompletionChar.left(1).text());
     set.writeBoolEntry("SETTINGS", "sameCmd", m_sameCmd);
     set.writeBoolEntry("SETTINGS", "sameList", m_sameList);
     set.writeBoolEntry("SETTINGS", "coloredNick", m_coloredNick);
@@ -361,6 +367,11 @@
     set.writeBoolEntry("SETTINGS", "loadLog", m_loadLog);
     set.writeIntEntry("SETTINGS", "loadLines", m_loadLines);
 
+    //NickList settings pane in Configdialog
+    set.writeStringEntry("SETTINGS", "themePath", m_themePath.text());
+    set.writeStringEntry("SETTINGS", "themesList", m_themesList.text());
+    set.writeBoolEntry("SETTINGS", "sortUserMode", m_sortUserMode);
+
     //Ignore settings pane in Configdialog
     set.writeStringEntry("SETTINGS", "commandsList", m_ignoreCommandsList.text());
     set.writeIntEntry("USERS", "number", m_ignoreUsersList.no());

dxirc-0.80.0.tar.gz/src/preferences.h -> dxirc-0.90.0.tar.gz/src/preferences.h Changed

@@ -23,94 +23,98 @@
 
 class Preferences
 {
-    public:
-        Preferences();
-        Preferences(const Preferences &p);
+public:
+    Preferences();
+    Preferences(const Preferences &p);
 
-        //Save to FXSettings
-        void save();
-        //Load from FXSettings
-        void load();
+    //Save to FXSettings
+    void save();
+    //Load from FXSettings
+    void load();
 
-        //General settings pane in Configdialog
-        FXString m_themePath;
-        FXString m_themesList;
-        FXbool m_oneInstance;
-        FXbool m_reconnect;
-        FXint m_numberAttempt;
-        FXint m_delayAttempt;
-        FXint m_maxAway;
-        FXString m_nickCompletionChar;
-        FXbool m_useTray;
-        FXbool m_closeToTray;
-        FXbool m_useSpell;
-        FXbool m_ownServerWindow;
-        FXbool m_logging;
-        FXString m_logPath;
-        FXbool m_autoload;
-        FXString m_autoloadPath;
-        FXint m_tabPosition;
+    //General settings pane in Configdialog
+    FXbool m_oneInstance;
+    FXbool m_disableSortTabs;
+    FXbool m_reconnect;
+    FXint m_numberAttempt;
+    FXint m_delayAttempt;
+    FXint m_maxAway;
+    FXbool m_useTray;
+    FXbool m_closeToTray;
+    FXbool m_useSpell;
+    FXbool m_ownServerWindow;
+    FXbool m_logging;
+    FXString m_logPath;
+    FXbool m_autoload;
+    FXString m_autoloadPath;
 
-        //Look settings pane in Configdialog
-        ColorTheme m_appTheme;
-        FXColor m_trayColor;
-        FXColor m_unreadColor;
-        FXColor m_highlightColor;
-        FXString m_font;
+    //Look settings pane in Configdialog
+    ColorTheme m_appTheme;
+    FXColor m_trayColor;
+    FXColor m_unreadColor;
+    FXColor m_highlightColor;
+    FXint m_tabPosition;
+    FXString m_font;
 
-        //Irc Text settings pane in Configdialog
-        IrcColor m_colors;
-        FXString m_ircFont;
-        FXbool m_sameCmd;
-        FXbool m_sameList;
-        FXbool m_coloredNick;
-        FXbool m_stripColors;
-        FXbool m_loadLog;
-        FXint m_loadLines;
+    //Irc Text settings pane in Configdialog
+    IrcColor m_colors;
+    FXString m_ircFont;
+    FXString m_nickCompletionChar;
+    FXbool m_sameCmd;
+    FXbool m_sameList;
+    FXbool m_coloredNick;
+    FXbool m_stripColors;
+    FXbool m_loadLog;
+    FXint m_loadLines;
 
-        //Ignore settings pane in Configdialog
-        FXString m_ignoreCommandsList;
-        dxUserInfoArray m_ignoreUsersList;
+    //NickList settings pane in Configdialog
+    FXString m_themePath;
+    FXString m_themesList;
+    FXbool m_sortUserMode;
 
-        //DCC settings pane in Configdialog
-        FXString m_dccPath;
-        FXString m_dccIP;
-        FXint m_dccPortD;
-        FXint m_dccPortH;
-        FXint m_dccTimeout;
-        FXbool m_autoDccChat;
-        FXbool m_autoDccFile;
+    //Ignore settings pane in Configdialog
+    FXString m_ignoreCommandsList;
+    dxUserInfoArray m_ignoreUsersList;
 
-        //Notification settings pane in Configdialog
-        dxUserInfoArray m_friendsList;
-        FXbool m_sounds;
-        FXbool m_soundConnect;
-        FXString m_pathConnect;
-        FXbool m_soundDisconnect;
-        FXString m_pathDisconnect;
-        FXbool m_soundMessage;
-        FXString m_pathMessage;
-        FXbool m_notify;
-        FXint m_notifyPosition;
-        FXbool m_notifyConnect;
-        FXbool m_notifyDisconnect;
-        FXbool m_notifyMessage;
+    //DCC settings pane in Configdialog
+    FXString m_dccPath;
+    FXString m_dccIP;
+    FXint m_dccPortD;
+    FXint m_dccPortH;
+    FXint m_dccTimeout;
+    FXbool m_autoDccChat;
+    FXbool m_autoDccFile;
 
-        //Smileys settings pane in Configdialog
-        FXbool m_useSmileys;
-        dxStringMap m_smileysMap;
+    //Notification settings pane in Configdialog
+    dxUserInfoArray m_friendsList;
+    FXbool m_sounds;
+    FXbool m_soundConnect;
+    FXString m_pathConnect;
+    FXbool m_soundDisconnect;
+    FXString m_pathDisconnect;
+    FXbool m_soundMessage;
+    FXString m_pathMessage;
+    FXbool m_notify;
+    FXint m_notifyPosition;
+    FXbool m_notifyConnect;
+    FXbool m_notifyDisconnect;
+    FXbool m_notifyMessage;
 
-        //Other settings value
-        dxServerInfoArray m_serverList;
-        FXbool m_usersShown;
-        FXbool m_statusShown;
-        FXint m_x;
-        FXint m_y;
-        FXint m_w;
-        FXint m_h;
-        FXbool m_maximized;
-        FXbool m_showSpellCombo;
-        dxStringMap m_langs; //map between channel and spelllang
+    //Smileys settings pane in Configdialog
+    FXbool m_useSmileys;
+    dxStringMap m_smileysMap;
+
+    //Other settings value
+    dxServerInfoArray m_serverList;
+    FXbool m_usersShown;
+    FXbool m_statusShown;
+    FXint m_x;
+    FXint m_y;
+    FXint m_w;
+    FXint m_h;
+    FXbool m_maximized;
+    FXbool m_showSpellCombo;
+    dxStringMap m_langs; //map between channel and spelllang
 };
 
 #endif /* PREFERENCES_H */

dxirc-0.80.0.tar.gz/src/tetristabitem.cpp -> dxirc-0.90.0.tar.gz/src/tetristabitem.cpp Changed

dxirc-0.80.0.tar.gz/src/utils.cpp -> dxirc-0.90.0.tar.gz/src/utils.cpp Changed

@@ -113,6 +113,8 @@
     m_commands.append("KICK");
     m_commands.append("KILL");
     m_commands.append("LIST");
+    m_commands.append("LOG");
+    m_dcccommands.append("LOG");
 #ifdef HAVE_LUA
     m_commands.append("LUA");
     m_dcccommands.append("LUA");
@@ -184,7 +186,7 @@
         }
     }
 }
-    
+
 FXTextCodec* utils::getCodec()
 {
     if(m_lcodec != NULL)
@@ -1777,3 +1779,23 @@
     return nline;
 }
 
+//get month string
+FXString utils::getMonth(FXint month)
+{
+    switch(month) {
+        case 1: return _("January");
+        case 2: return _("February");
+        case 3: return _("March");
+        case 4: return _("April");
+        case 5: return _("May");
+        case 6: return _("June");
+        case 7: return _("July");
+        case 8: return _("August");
+        case 9: return _("September");
+        case 10: return _("October");
+        case 11: return _("November");
+        case 12: return _("December");
+        default: return "Rok ma jen 12 mesicu:)";
+    }
+}
+

dxirc-0.80.0.tar.gz/src/utils.h -> dxirc-0.90.0.tar.gz/src/utils.h Changed

dxirc-0.80.0.tar.gz/win/config.h -> dxirc-0.90.0.tar.gz/win/config.h Changed

dxirc-0.80.0.tar.gz/win/dxirc.iss -> dxirc-0.90.0.tar.gz/win/dxirc.iss Changed

@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{11B40D37-A7C9-4720-8741-EEC36F2D07DB}
 AppName=dxirc
-AppVerName=dxirc 0.80.0
+AppVerName=dxirc 0.90.0
 AppPublisher=David Vachulka
 AppPublisherURL=http://www.dxirc.org
 AppSupportURL=http://www.dxirc.org
@@ -15,27 +15,37 @@
 DefaultDirName={pf}\dxirc
 DefaultGroupName=dxirc
 LicenseFile=COPYING
-OutputBaseFilename=dxirc-0.80.0-setup
+OutputBaseFilename=dxirc-0.90.0-setup
 Compression=lzma
 SolidCompression=yes
 
 Languages
 Name: "en"; MessagesFile: "compiler:Default.isl"
 Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl"
+Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl"
 
 CustomMessages
 en.Program=Program
 cs.Program=Program
+sk.Program=Program
 en.Spell=Spellchecking
 cs.Spell=Kontrola pravopisu
+sk.Spell=Kontrola pravopisu
 en.SpellEn=English
 cs.SpellEn=Angliètina
+sk.SpellEn=Angliètina
 en.SpellCs=Czech
 cs.SpellCs=Èetina
+sk.SpellCs=Èetina
+en.SpellSk=Slovak
+cs.SpellSk=Sloventina
+sk.SpellSk=Slovenèina
 en.FullInstallation=Full installation
 cs.FullInstallation=Úplná instalace
+sk.FullInstallation=Plná intalácia
 en.CustomInstallation=Custom installation
 cs.CustomInstallation=Volitelná instalace
+sk.CustomInstallation=Vlastná intalácia
 
 Tasks
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
@@ -50,6 +60,7 @@
 Name: "spell"; Description: "{cm:Spell}"; Types: full
 Name: "spell\en"; Description: "{cm:SpellEn}"; Types: full
 Name: "spell\cs"; Description: "{cm:SpellCs}"; Types: full
+Name: "spell\sk"; Description: "{cm:SpellSk}"; Types: full
 
 Files
 Source: "dxirc.exe"; DestDir: "{app}"; Components: program; Flags: ignoreversion
@@ -63,6 +74,7 @@
 Source: "lib\*.*"; DestDir: "{app}\lib"; Components: program; Flags: recursesubdirs
 Source: "share\enchant\myspell\*en_US*"; DestDir: "{app}\share\enchant\myspell"; Components: spell\en
 Source: "share\enchant\myspell\*cs_CZ*"; DestDir: "{app}\share\enchant\myspell"; Components: spell\cs
+Source: "share\enchant\myspell\*sk_SK*"; DestDir: "{app}\share\enchant\myspell"; Components: spell\sk
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 Icons

dxirc-0.80.0.tar.gz/win/dxirc.rc -> dxirc-0.90.0.tar.gz/win/dxirc.rc Changed