Packman Build Service PMBS

dxirc.spec Changed

@@ -17,25 +17,27 @@
 
 
 Name: dxirc
-Version: 1.30.0
+Version: 1.40.1
 Release: 0
 Summary: A simple IRC client
 License: GPL-3.0
 Group: Productivity/Networking/IRC
 Url: http://www.dxirc.org/
-Source0: dxirc-%{version}.tar.xz
+Source0: %name-%version.tar.xz
+Patch0: %name.patch
 BuildRequires: cmake
 BuildRequires: fdupes
 BuildRequires: gcc-c++
 BuildRequires: gettext
 BuildRequires: hicolor-icon-theme
 BuildRequires: pkg-config
-BuildRequires: pkgconfig(Qt5Multimedia)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt6Multimedia)
+BuildRequires: pkgconfig(Qt6Network)
+BuildRequires: pkgconfig(Qt6Widgets)
+BuildRequires: pkgconfig(enchant-2)
+BuildRequires: pkgconfig(lua)
 BuildRequires: pkgconfig(openssl)
 BuildRequires: update-desktop-files
-BuildRequires: lua51-devel
 Provides: dxirc-data = %{version}-%{release}
 Obsoletes: dxirc-data < %{version}-%{release}
 Provides: dxirc-qt = %{version}-%{release}
@@ -54,6 +56,8 @@
 CXXFLAGS='%{optflags} -Wno-deprecated-declarations'
 %cmake \
 	-DBUILD_FOX=false \
+	-DQT6=true \
+	-DUSE_ENCHANT=true \
 	%{nil}
 %cmake_build

dxirc.patch Added

dxirc-1.30.0.tar.xz/CMakeLists.txt -> dxirc-1.40.1.tar.xz/CMakeLists.txt Changed

@@ -1,9 +1,26 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.7)
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version")
 project(dxirc-all)
-set(PROJECT_VERSION "1.30.0")
+set(PROJECT_VERSION "1.40.1")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+if(MSVC_VERSION LESS "1900")
+    message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+    return()
+endif()
+
+if(NOT MSVC)
+    include(CheckCXXCompilerFlag)
+    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+    if(COMPILER_SUPPORTS_CXX11)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    else()
+        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+        return()
+    endif()
+endif()
+
 find_package(PkgConfig)
 find_package(Libintl)
 find_package(Gettext)
@@ -14,9 +31,9 @@
 endif(LIBINTL_LIB_FOUND)
 
 if(NOT WIN32)
-    option(HAVE_ENCHANT "Enable spellchecking" FALSE)
+    option(USE_ENCHANT "Enable spellchecking" FALSE)
 else(NOT WIN32)
-    option(HAVE_ENCHANT "Enable spellchecking" TRUE)
+    option(USE_ENCHANT "Enable spellchecking" TRUE)
 endif(NOT WIN32)
 
 if(APPLE)
@@ -75,3 +92,11 @@
 if(BUILD_QT)
     add_subdirectory(qt)
 endif(BUILD_QT)
+
+# uninstall target
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/uninstall.cmake
+    IMMEDIATE @ONLY)
+add_custom_target(uninstall
+    ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/uninstall.cmake)

dxirc-1.30.0.tar.xz/ChangeLog -> dxirc-1.40.1.tar.xz/ChangeLog Changed

dxirc-1.40.1.tar.xz/cmake/uninstall.cmake.in Added

@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 2.8)
+
+message("Uninstall the project...")
+
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+    message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif()
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+list(REVERSE files)
+foreach (file ${files})
+    message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+    if(EXISTS "$ENV{DESTDIR}${file}")
+        execute_process(
+            COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}"
+            OUTPUT_VARIABLE rm_out
+            RESULT_VARIABLE rm_retval
+        )
+        if(NOT ${rm_retval} EQUAL 0)
+            message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+        endif (NOT ${rm_retval} EQUAL 0)
+    else(EXISTS "$ENV{DESTDIR}${file}")
+        message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+    endif()
+endforeach(file)

dxirc-1.30.0.tar.xz/data/CMakeLists.txt -> dxirc-1.40.1.tar.xz/data/CMakeLists.txt Changed

dxirc-1.30.0.tar.xz/data/dxirc-fox.desktop -> dxirc-1.40.1.tar.xz/data/dxirc-fox.desktop Changed

dxirc-1.30.0.tar.xz/data/dxirc-qt.desktop -> dxirc-1.40.1.tar.xz/data/dxirc-qt.desktop Changed

dxirc-1.40.1.tar.xz/data/icons/flags/ad.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/ae.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/af.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/ag.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/ai.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/al.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/am.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/an.png Added

dxirc-1.40.1.tar.xz/data/icons/flags/ao.png Added

dxirc-1.30.0.tar.xz/data/translations/cs.po -> dxirc-1.40.1.tar.xz/data/translations/cs.po Changed

@@ -3,9 +3,9 @@
 msgstr ""
 "Project-Id-Version: 0.01\n"
 "Report-Msgid-Bugs-To: arch_dvx@users.sourceforge.net\n"
-"POT-Creation-Date: 2016-06-04 19:15+0200\n"
-"PO-Revision-Date: 2015-11-16 15:25+0100\n"
-"Last-Translator: David Vachulka <arch_dvx@users.sourceforge.net>\n"
+"POT-Creation-Date: 2022-08-22 22:45+0200\n"
+"PO-Revision-Date: 2022-08-22 22:45+0200\n"
+"Last-Translator: David Vachulka <archdvx@dxsolutions.org>\n"
 "Language-Team: dvx-alone <arch_dvx@users.sourceforge.net>\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
@@ -13,1417 +13,421 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,119,-1,-1\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 3.0.1\n"
 
-#: ../../qt/preferences.cpp:541 ../../fox/preferences.cpp:512
-msgid "Server list"
-msgstr "Seznam serverů"
-
-#: ../../qt/preferences.cpp:543 ../../qt/dialogs/connectdialog.cpp:85
-#: ../../fox/preferences.cpp:514 ../../fox/dxirc.cpp:1513
-msgid "Quick connect"
-msgstr "Rychlé připojení"
-
-#: ../../qt/preferences.cpp:545 ../../fox/preferences.cpp:516
-msgid "Disconnect"
-msgstr "Odpojit"
-
-#: ../../qt/preferences.cpp:547 ../../qt/dxirc.cpp:1669
-#: ../../fox/preferences.cpp:518 ../../fox/dialogs/dccdialog.cpp:44
-msgid "DCC transfers"
-msgstr "DCC přenosy"
-
-#: ../../qt/preferences.cpp:549 ../../fox/preferences.cpp:520
-msgid "Scripts"
-msgstr "Skripty"
-
-#: ../../qt/preferences.cpp:551 ../../fox/preferences.cpp:522
-msgid "Log viewer"
-msgstr "Prohlížeč záznamů"
-
-#: ../../qt/preferences.cpp:557 ../../fox/preferences.cpp:528
-msgid "Quit"
-msgstr "Ukončit"
-
-#: ../../qt/preferences.cpp:559 ../../qt/dxirc.cpp:565
-#: ../../fox/preferences.cpp:530 ../../fox/dxirc.cpp:312
-msgid "Close current tab"
-msgstr "Zavřít aktuální záložku"
-
-#: ../../qt/preferences.cpp:561 ../../qt/dxirc.cpp:571
-#: ../../fox/preferences.cpp:532 ../../fox/dxirc.cpp:315
-#: ../../fox/tabitems/dxtabitem.cpp:80
-msgid "Clear window"
-msgstr "Vyčistit okno"
-
-#: ../../qt/preferences.cpp:563 ../../qt/dxirc.cpp:575
-#: ../../fox/preferences.cpp:534 ../../fox/dxirc.cpp:316
-msgid "Clear all windows"
-msgstr "Vyčistit všechna okna"
-
-#: ../../qt/preferences.cpp:565 ../../qt/dxirc.cpp:580
-#: ../../fox/preferences.cpp:536 ../../fox/dxirc.cpp:319
-msgid "Users list"
-msgstr "Seznam uživatelů"
-
-#: ../../qt/preferences.cpp:567 ../../qt/dxirc.cpp:587
-#: ../../qt/tabitems/irctabitem.cpp:99 ../../qt/tabitems/dcctabitem.cpp:63
-#: ../../fox/preferences.cpp:538 ../../fox/dxirc.cpp:322
-#: ../../fox/tabitems/irctabitem.cpp:388 ../../fox/tabitems/dcctabitem.cpp:84
-msgid "Spellchecking language list"
-msgstr "Seznam jazyků pro kontrolu pravopisu"
-
-#: ../../qt/preferences.cpp:569 ../../qt/dialogs/helpdialog.cpp:46
-#: ../../fox/preferences.cpp:540 ../../fox/dialogs/helpdialog.cpp:37
-msgid "Help"
-msgstr "Nápověda"
-
-#: ../../qt/preferences.cpp:575 ../../fox/preferences.cpp:542
-msgid "Switch between tabs"
-msgstr "Přepnout mezi záložkami"
-
-#: ../../qt/preferences.cpp:577 ../../fox/preferences.cpp:544
-msgid "Switch between unreaded tabs"
-msgstr "Přepnout mezi nepřečtenými záložkami"
-
-#: ../../qt/preferences.cpp:579 ../../fox/preferences.cpp:546
-msgid "Move tab up"
-msgstr "Posunout záložku nahoru"
-
-#: ../../qt/preferences.cpp:581 ../../fox/preferences.cpp:548
-msgid "Move tab down"
-msgstr "Posunout záložku dolu"
-
-#: ../../qt/preferences.cpp:583 ../../fox/preferences.cpp:550
-msgid "Force commandline focus in current tab"
-msgstr "Vynutit zaměření příkazové řádky aktuální záložky"
-
-#: ../../qt/preferences.cpp:585 ../../fox/preferences.cpp:552
-msgid "Insert bold control char"
-msgstr "Vložit kontrolní znak pro tučné písmo"
-
-#: ../../qt/preferences.cpp:587 ../../fox/preferences.cpp:554
-msgid "Insert color control char"
-msgstr "Vložit kontrolní znak pro barvy"
-
-#: ../../qt/preferences.cpp:589 ../../fox/preferences.cpp:556
-msgid "Insert underline control char"
-msgstr "Vložit kontrolní znak pro podtržené písmo"
-
-#: ../../qt/preferences.cpp:591 ../../fox/preferences.cpp:558
-msgid "Insert reverse control char"
-msgstr "Vložit kontrolní znak pro reverzní text"
-
-#: ../../qt/preferences.cpp:593 ../../fox/preferences.cpp:560
-msgid "Insert reset control char"
-msgstr "Vložit kontrolní znak ukončení formátování"
-
-#: ../../qt/preferences.cpp:595 ../../fox/preferences.cpp:562
-msgid "Go to 1. tab"
-msgstr "Jít na 1. záložku"
-
-#: ../../qt/preferences.cpp:597 ../../fox/preferences.cpp:564
-msgid "Go to 2. tab"
-msgstr "Jít na 2. záložku"
-
-#: ../../qt/preferences.cpp:599 ../../fox/preferences.cpp:566
-msgid "Go to 3. tab"
-msgstr "Jít na 3. záložku"
-
-#: ../../qt/preferences.cpp:601 ../../fox/preferences.cpp:568
-msgid "Go to 4. tab"
-msgstr "Jít na 4. záložku"
-
-#: ../../qt/preferences.cpp:603 ../../fox/preferences.cpp:570
-msgid "Go to 5. tab"
-msgstr "Jít na 5. záložku"
-
-#: ../../qt/preferences.cpp:605 ../../fox/preferences.cpp:572
-msgid "Go to 6. tab"
-msgstr "Jít na 6. záložku"
-
-#: ../../qt/preferences.cpp:607 ../../fox/preferences.cpp:574
-msgid "Go to 7. tab"
-msgstr "Jít na 7. záložku"
-
-#: ../../qt/preferences.cpp:609 ../../fox/preferences.cpp:576
-msgid "Go to 8. tab"
-msgstr "Jít na 8. záložku"
-
-#: ../../qt/preferences.cpp:611 ../../fox/preferences.cpp:578
-msgid "Go to 9. tab"
-msgstr "Jít na 9. záložku"
-
-#: ../../qt/preferences.cpp:613 ../../fox/preferences.cpp:580
-msgid "/LIST command"
-msgstr "Příkaz /LIST"
-
-#: ../../qt/engine/dccengine.cpp:66 ../../qt/tabitems/dcctabitem.cpp:688
-#: ../../fox/engine/dccengine.cpp:65 ../../fox/tabitems/dcctabitem.cpp:1376
-msgid "Connection closed. Client didn't connect in given timeout"
-msgstr "Připojení zavřeno. Klient se nepřipojil během daného času."
-
-#: ../../qt/engine/dxsocket.cpp:77
-msgid "The connection was refused by the peer (or timed out)."
-msgstr "Spojení bylo odmítnuto druhou stranou (nebo vypršel časový limit)."
-
-#: ../../qt/engine/dxsocket.cpp:79
-msgid ""
-"The remote host closed the connection. Note that the client socket (i.e., "
-"this socket) will be closed after the remote close notification has been "
-"sent."
-msgstr ""
-"Vzdálený hostitel ukončil připojení. Poznámka: klientský soket (tj. tento "
-"soket), bude uzavřen poté, co vzdálený hostitel pošle oznámení."
-
-#: ../../qt/engine/dxsocket.cpp:81
-msgid "The host address was not found."
-msgstr "Hostitel nenalezen."
-
-#: ../../qt/engine/dxsocket.cpp:83
-msgid ""
-"The socket operation failed because the application lacked the required "
-"privileges."
-msgstr ""
-"Operace soketu se nezdařila, protože aplikaci chyběla požadovaná oprávnění."
-
-#: ../../qt/engine/dxsocket.cpp:85
-msgid "The local system ran out of resources (e.g., too many sockets)."
-msgstr "Místnímu systému došly prostředky (např. příliš mnoho soketů)."
-
-#: ../../qt/engine/dxsocket.cpp:87
-msgid "The socket operation timed out."
-msgstr "Operace soketu vypršela."
-

dxirc-1.30.0.tar.xz/data/translations/dxirc.pot -> dxirc-1.40.1.tar.xz/data/translations/dxirc.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dxirc 1.20.0\n"
+"Project-Id-Version: dxirc 1.40.1\n"
 "Report-Msgid-Bugs-To: arch_dvx@users.sourceforge.net\n"
-"POT-Creation-Date: 2016-06-04 19:15+0200\n"
+"POT-Creation-Date: 2022-08-22 22:45+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"
@@ -18,2676 +18,2776 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../qt/preferences.cpp:541 ../../fox/preferences.cpp:512
-msgid "Server list"
+#: ../../qt/tabitems/tetristabitem.cpp:468 ../../qt/tabitems/dcctabitem.cpp:599
+#: ../../qt/tabitems/irctabitem.cpp:2974
+#: ../../fox/tabitems/tetristabitem.cpp:428
+#: ../../fox/tabitems/dcctabitem.cpp:1162
+#: ../../fox/tabitems/irctabitem.cpp:1801
+msgid "Keys for playing:"
 msgstr ""
 
-#: ../../qt/preferences.cpp:543 ../../qt/dialogs/connectdialog.cpp:85
-#: ../../fox/preferences.cpp:514 ../../fox/dxirc.cpp:1513
-msgid "Quick connect"
+#: ../../qt/tabitems/tetristabitem.cpp:469 ../../qt/tabitems/dcctabitem.cpp:600
+#: ../../qt/tabitems/irctabitem.cpp:2975
+#: ../../fox/tabitems/tetristabitem.cpp:429
+#: ../../fox/tabitems/dcctabitem.cpp:1163
+#: ../../fox/tabitems/irctabitem.cpp:1802
+msgid "n .. new game"
 msgstr ""
 
-#: ../../qt/preferences.cpp:545 ../../fox/preferences.cpp:516
-msgid "Disconnect"
+#: ../../qt/tabitems/tetristabitem.cpp:470 ../../qt/tabitems/dcctabitem.cpp:601
+#: ../../qt/tabitems/irctabitem.cpp:2976
+#: ../../fox/tabitems/tetristabitem.cpp:430
+#: ../../fox/tabitems/dcctabitem.cpp:1164
+#: ../../fox/tabitems/irctabitem.cpp:1803
+msgid "p .. pause game"
 msgstr ""
 
-#: ../../qt/preferences.cpp:547 ../../qt/dxirc.cpp:1669
-#: ../../fox/preferences.cpp:518 ../../fox/dialogs/dccdialog.cpp:44
-msgid "DCC transfers"
+#: ../../qt/tabitems/tetristabitem.cpp:471 ../../qt/tabitems/dcctabitem.cpp:602
+#: ../../qt/tabitems/irctabitem.cpp:2977
+#: ../../fox/tabitems/tetristabitem.cpp:431
+#: ../../fox/tabitems/dcctabitem.cpp:1165
+#: ../../fox/tabitems/irctabitem.cpp:1804
+msgid "i .. rotate piece"
 msgstr ""
 
-#: ../../qt/preferences.cpp:549 ../../fox/preferences.cpp:520
-msgid "Scripts"
+#: ../../qt/tabitems/tetristabitem.cpp:472 ../../qt/tabitems/dcctabitem.cpp:603
+#: ../../qt/tabitems/irctabitem.cpp:2978
+#: ../../fox/tabitems/tetristabitem.cpp:432
+#: ../../fox/tabitems/dcctabitem.cpp:1166
+#: ../../fox/tabitems/irctabitem.cpp:1805
+msgid "l .. move piece right"
 msgstr ""
 
-#: ../../qt/preferences.cpp:551 ../../fox/preferences.cpp:522
-msgid "Log viewer"
+#: ../../qt/tabitems/tetristabitem.cpp:473 ../../qt/tabitems/dcctabitem.cpp:604
+#: ../../qt/tabitems/irctabitem.cpp:2979
+#: ../../fox/tabitems/tetristabitem.cpp:433
+#: ../../fox/tabitems/dcctabitem.cpp:1167
+#: ../../fox/tabitems/irctabitem.cpp:1806
+msgid "k .. drop piece"
 msgstr ""
 
-#: ../../qt/preferences.cpp:557 ../../fox/preferences.cpp:528
-msgid "Quit"
+#: ../../qt/tabitems/tetristabitem.cpp:474 ../../qt/tabitems/dcctabitem.cpp:605
+#: ../../qt/tabitems/irctabitem.cpp:2980
+#: ../../fox/tabitems/tetristabitem.cpp:434
+#: ../../fox/tabitems/dcctabitem.cpp:1168
+#: ../../fox/tabitems/irctabitem.cpp:1807
+msgid "j .. move piece left"
 msgstr ""
 
-#: ../../qt/preferences.cpp:559 ../../qt/dxirc.cpp:565
-#: ../../fox/preferences.cpp:530 ../../fox/dxirc.cpp:312
-msgid "Close current tab"
+#: ../../qt/tabitems/tetristabitem.cpp:483
+#: ../../qt/tabitems/tetristabitem.cpp:485
+#: ../../qt/tabitems/tetristabitem.cpp:489
+#: ../../fox/tabitems/tetristabitem.cpp:439
+#: ../../fox/tabitems/tetristabitem.cpp:442
+msgid "GAME OVER"
 msgstr ""
 
-#: ../../qt/preferences.cpp:561 ../../qt/dxirc.cpp:571
-#: ../../fox/preferences.cpp:532 ../../fox/dxirc.cpp:315
-#: ../../fox/tabitems/dxtabitem.cpp:80
-msgid "Clear window"
+#: ../../qt/tabitems/tetristabitem.cpp:494
+#: ../../qt/tabitems/tetristabitem.cpp:496
+#: ../../qt/tabitems/tetristabitem.cpp:500
+#: ../../fox/tabitems/tetristabitem.cpp:446
+#: ../../fox/tabitems/tetristabitem.cpp:449
+msgid "PAUSED"
 msgstr ""
 
-#: ../../qt/preferences.cpp:563 ../../qt/dxirc.cpp:575
-#: ../../fox/preferences.cpp:534 ../../fox/dxirc.cpp:316
-msgid "Clear all windows"
+#: ../../qt/tabitems/tetristabitem.cpp:590
+#: ../../fox/tabitems/tetristabitem.cpp:181
+msgid "Next piece:"
 msgstr ""
 
-#: ../../qt/preferences.cpp:565 ../../qt/dxirc.cpp:580
-#: ../../fox/preferences.cpp:536 ../../fox/dxirc.cpp:319
-msgid "Users list"
+#: ../../qt/tabitems/tetristabitem.cpp:595
+#: ../../qt/tabitems/tetristabitem.cpp:632
+msgid "Level: %1"
 msgstr ""
 
-#: ../../qt/preferences.cpp:567 ../../qt/dxirc.cpp:587
-#: ../../qt/tabitems/irctabitem.cpp:99 ../../qt/tabitems/dcctabitem.cpp:63
-#: ../../fox/preferences.cpp:538 ../../fox/dxirc.cpp:322
-#: ../../fox/tabitems/irctabitem.cpp:388 ../../fox/tabitems/dcctabitem.cpp:84
-msgid "Spellchecking language list"
+#: ../../qt/tabitems/tetristabitem.cpp:597
+#: ../../qt/tabitems/tetristabitem.cpp:633
+msgid "Score: %1"
 msgstr ""
 
-#: ../../qt/preferences.cpp:569 ../../qt/dialogs/helpdialog.cpp:46
-#: ../../fox/preferences.cpp:540 ../../fox/dialogs/helpdialog.cpp:37
-msgid "Help"
+#: ../../qt/tabitems/tetristabitem.cpp:599
+#: ../../qt/tabitems/tetristabitem.cpp:634
+msgid "Lines: %1"
 msgstr ""
 
-#: ../../qt/preferences.cpp:575 ../../fox/preferences.cpp:542
-msgid "Switch between tabs"
+#: ../../qt/tabitems/tetristabitem.cpp:601
+#: ../../qt/tabitems/boatstabitem.cpp:504
+#: ../../fox/tabitems/tetristabitem.cpp:188
+#: ../../fox/tabitems/boatstabitem.cpp:57
+msgid "&New game"
 msgstr ""
 
-#: ../../qt/preferences.cpp:577 ../../fox/preferences.cpp:544
-msgid "Switch between unreaded tabs"
+#: ../../qt/tabitems/tetristabitem.cpp:603
+#: ../../qt/tabitems/tetristabitem.cpp:641
+#: ../../qt/tabitems/tetristabitem.cpp:649
+#: ../../fox/tabitems/tetristabitem.cpp:189
+#: ../../fox/tabitems/tetristabitem.cpp:305
+#: ../../fox/tabitems/tetristabitem.cpp:527
+msgid "&Pause game"
 msgstr ""
 
-#: ../../qt/preferences.cpp:579 ../../fox/preferences.cpp:546
-msgid "Move tab up"
+#: ../../qt/tabitems/tetristabitem.cpp:654
+#: ../../fox/tabitems/tetristabitem.cpp:533
+msgid "&Resume game"
 msgstr ""
 
-#: ../../qt/preferences.cpp:581 ../../fox/preferences.cpp:548
-msgid "Move tab down"
+#: ../../qt/tabitems/dcctabitem.cpp:63 ../../qt/tabitems/irctabitem.cpp:99
+#: ../../qt/dxirc.cpp:598 ../../qt/preferences.cpp:557
+#: ../../fox/tabitems/dcctabitem.cpp:84 ../../fox/tabitems/irctabitem.cpp:388
+#: ../../fox/dxirc.cpp:322 ../../fox/preferences.cpp:541
+msgid "Spellchecking language list"
 msgstr ""
 
-#: ../../qt/preferences.cpp:583 ../../fox/preferences.cpp:550
-msgid "Force commandline focus in current tab"
+#: ../../qt/tabitems/dcctabitem.cpp:77 ../../qt/tabitems/dcctabitem.cpp:199
+#: ../../qt/tabitems/dcctabitem.cpp:853 ../../qt/tabitems/irctabitem.cpp:113
+#: ../../qt/tabitems/irctabitem.cpp:245 ../../qt/tabitems/irctabitem.cpp:288
+#: ../../qt/tabitems/irctabitem.cpp:4126
+msgid "Current spellchecking language: %1"
 msgstr ""
 
-#: ../../qt/preferences.cpp:585 ../../fox/preferences.cpp:552
-msgid "Insert bold control char"
+#: ../../qt/tabitems/dcctabitem.cpp:121
+msgid "Listening on %1"
 msgstr ""
 
-#: ../../qt/preferences.cpp:587 ../../fox/preferences.cpp:554
-msgid "Insert color control char"
+#: ../../qt/tabitems/dcctabitem.cpp:126
+msgid "%1 isn't routable."

dxirc-1.40.1.tar.xz/data/translations/sk.mo Added

dxirc-1.30.0.tar.xz/data/translations/sk.po -> dxirc-1.40.1.tar.xz/data/translations/sk.po Changed

@@ -1,14 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# 
-# Translators:
-# Tomáš Vadina <kyberdev@gmail.com>, 2011, 2012.
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+#
+# Translators:
+# Tomáš Vadina <kyberdev@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: dxirc\n"
 "Report-Msgid-Bugs-To: arch_dvx@users.sourceforge.net\n"
-"POT-Creation-Date: 2016-06-04 19:15+0200\n"
-"PO-Revision-Date: 2012-07-19 21:23+0000\n"
+"POT-Creation-Date: 2022-08-22 22:45+0200\n"
+"PO-Revision-Date: 2021-07-05 16:45+0200\n"
 "Last-Translator: Tomáš Vadina <kyberdev@gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/dxirc/language/"
 "sk/)\n"
@@ -17,1318 +17,425 @@
 "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"
+"X-Generator: Poedit 2.3\n"
 
-#: ../../qt/preferences.cpp:541 ../../fox/preferences.cpp:512
-msgid "Server list"
-msgstr "Zoznam serverov"
-
-#: ../../qt/preferences.cpp:543 ../../qt/dialogs/connectdialog.cpp:85
-#: ../../fox/preferences.cpp:514 ../../fox/dxirc.cpp:1513
-msgid "Quick connect"
-msgstr "Rýchle pripojenie"
-
-#: ../../qt/preferences.cpp:545 ../../fox/preferences.cpp:516
-msgid "Disconnect"
-msgstr "Odpojiť"
-
-#: ../../qt/preferences.cpp:547 ../../qt/dxirc.cpp:1669
-#: ../../fox/preferences.cpp:518 ../../fox/dialogs/dccdialog.cpp:44
-msgid "DCC transfers"
-msgstr "DCC prenosy"
-
-#: ../../qt/preferences.cpp:549 ../../fox/preferences.cpp:520
-msgid "Scripts"
-msgstr "Skripty"
-
-#: ../../qt/preferences.cpp:551 ../../fox/preferences.cpp:522
-msgid "Log viewer"
-msgstr "Prehliadač záznamov"
-
-#: ../../qt/preferences.cpp:557 ../../fox/preferences.cpp:528
-msgid "Quit"
-msgstr "Ukončiť"
-
-#: ../../qt/preferences.cpp:559 ../../qt/dxirc.cpp:565
-#: ../../fox/preferences.cpp:530 ../../fox/dxirc.cpp:312
-msgid "Close current tab"
-msgstr "Zatvoriť aktuálnu kartu"
-
-#: ../../qt/preferences.cpp:561 ../../qt/dxirc.cpp:571
-#: ../../fox/preferences.cpp:532 ../../fox/dxirc.cpp:315
-#: ../../fox/tabitems/dxtabitem.cpp:80
-msgid "Clear window"
-msgstr "Vyčistiť okno"
-
-#: ../../qt/preferences.cpp:563 ../../qt/dxirc.cpp:575
-#: ../../fox/preferences.cpp:534 ../../fox/dxirc.cpp:316
-msgid "Clear all windows"
-msgstr "Vyčistiť všetky okná"
-
-#: ../../qt/preferences.cpp:565 ../../qt/dxirc.cpp:580
-#: ../../fox/preferences.cpp:536 ../../fox/dxirc.cpp:319
-msgid "Users list"
-msgstr "Zoznam používateľov"
-
-#: ../../qt/preferences.cpp:567 ../../qt/dxirc.cpp:587
-#: ../../qt/tabitems/irctabitem.cpp:99 ../../qt/tabitems/dcctabitem.cpp:63
-#: ../../fox/preferences.cpp:538 ../../fox/dxirc.cpp:322
-#: ../../fox/tabitems/irctabitem.cpp:388 ../../fox/tabitems/dcctabitem.cpp:84
-msgid "Spellchecking language list"
-msgstr "Zoznam jazykov pre kontrolu pravopisu"
-
-#: ../../qt/preferences.cpp:569 ../../qt/dialogs/helpdialog.cpp:46
-#: ../../fox/preferences.cpp:540 ../../fox/dialogs/helpdialog.cpp:37
-msgid "Help"
-msgstr "Pomocník"
-
-#: ../../qt/preferences.cpp:575 ../../fox/preferences.cpp:542
-msgid "Switch between tabs"
-msgstr "Prepínanie medzi kartami"
-
-#: ../../qt/preferences.cpp:577 ../../fox/preferences.cpp:544
-msgid "Switch between unreaded tabs"
-msgstr "Prepínanie medzi neprečítanými kartami"
-
-#: ../../qt/preferences.cpp:579 ../../fox/preferences.cpp:546
-msgid "Move tab up"
-msgstr "Presunúť kartu hore"
-
-#: ../../qt/preferences.cpp:581 ../../fox/preferences.cpp:548
-msgid "Move tab down"
-msgstr "Presunúť kartu dole"
-
-#: ../../qt/preferences.cpp:583 ../../fox/preferences.cpp:550
-msgid "Force commandline focus in current tab"
-msgstr "Vynútiť zameranie príkazového riadka v aktuálnej karte"
-
-#: ../../qt/preferences.cpp:585 ../../fox/preferences.cpp:552
-msgid "Insert bold control char"
-msgstr "Vložiť tučný controlný znak"
-
-#: ../../qt/preferences.cpp:587 ../../fox/preferences.cpp:554
-msgid "Insert color control char"
-msgstr "Vložiť farebný kontrolný znak"
-
-#: ../../qt/preferences.cpp:589 ../../fox/preferences.cpp:556
-msgid "Insert underline control char"
-msgstr "Vložiť podčiarknutý kontrolný znak"
-
-#: ../../qt/preferences.cpp:591 ../../fox/preferences.cpp:558
-msgid "Insert reverse control char"
-msgstr "Vložiť obrátený kontrolný znak"
-
-#: ../../qt/preferences.cpp:593 ../../fox/preferences.cpp:560
-msgid "Insert reset control char"
-msgstr "Vložiť obnovovací kontrolný znak"
-
-#: ../../qt/preferences.cpp:595 ../../fox/preferences.cpp:562
-msgid "Go to 1. tab"
-msgstr "Prejsť na 1. kartu"
-
-#: ../../qt/preferences.cpp:597 ../../fox/preferences.cpp:564
-msgid "Go to 2. tab"
-msgstr "Prejsť na 2. kartu"
-
-#: ../../qt/preferences.cpp:599 ../../fox/preferences.cpp:566
-msgid "Go to 3. tab"
-msgstr "Prejsť na 3. kartu"
-
-#: ../../qt/preferences.cpp:601 ../../fox/preferences.cpp:568
-msgid "Go to 4. tab"
-msgstr "Prejsť na 4. kartu"
-
-#: ../../qt/preferences.cpp:603 ../../fox/preferences.cpp:570
-msgid "Go to 5. tab"
-msgstr "Prejsť na 5. kartu"
-
-#: ../../qt/preferences.cpp:605 ../../fox/preferences.cpp:572
-msgid "Go to 6. tab"
-msgstr "Prejsť na 6. kartu"
-
-#: ../../qt/preferences.cpp:607 ../../fox/preferences.cpp:574
-msgid "Go to 7. tab"
-msgstr "Prejsť na 7. kartu"
-
-#: ../../qt/preferences.cpp:609 ../../fox/preferences.cpp:576
-msgid "Go to 8. tab"
-msgstr "Prejsť na 8. kartu"
-
-#: ../../qt/preferences.cpp:611 ../../fox/preferences.cpp:578
-msgid "Go to 9. tab"
-msgstr "Prejsť na 9. kartu"
-
-#: ../../qt/preferences.cpp:613 ../../fox/preferences.cpp:580
-#, fuzzy
-msgid "/LIST command"
-msgstr "Koniec /MOTD"
+#: ../../qt/tabitems/tetristabitem.cpp:468 ../../qt/tabitems/dcctabitem.cpp:599
+#: ../../qt/tabitems/irctabitem.cpp:2974
+#: ../../fox/tabitems/tetristabitem.cpp:428
+#: ../../fox/tabitems/dcctabitem.cpp:1162
+#: ../../fox/tabitems/irctabitem.cpp:1801
+msgid "Keys for playing:"
+msgstr "Klávesové skratky pre hranie:"
 
-#: ../../qt/engine/dccengine.cpp:66 ../../qt/tabitems/dcctabitem.cpp:688
-#: ../../fox/engine/dccengine.cpp:65 ../../fox/tabitems/dcctabitem.cpp:1376
-msgid "Connection closed. Client didn't connect in given timeout"
-msgstr "Pripojenie zatvorené. Klient sa nepripojil počas daného času."
+#: ../../qt/tabitems/tetristabitem.cpp:469 ../../qt/tabitems/dcctabitem.cpp:600
+#: ../../qt/tabitems/irctabitem.cpp:2975
+#: ../../fox/tabitems/tetristabitem.cpp:429
+#: ../../fox/tabitems/dcctabitem.cpp:1163
+#: ../../fox/tabitems/irctabitem.cpp:1802
+msgid "n .. new game"
+msgstr "n .. nová hra"
 
-#: ../../qt/engine/dxsocket.cpp:77
-msgid "The connection was refused by the peer (or timed out)."
-msgstr ""
+#: ../../qt/tabitems/tetristabitem.cpp:470 ../../qt/tabitems/dcctabitem.cpp:601
+#: ../../qt/tabitems/irctabitem.cpp:2976
+#: ../../fox/tabitems/tetristabitem.cpp:430
+#: ../../fox/tabitems/dcctabitem.cpp:1164
+#: ../../fox/tabitems/irctabitem.cpp:1803
+msgid "p .. pause game"

dxirc-1.30.0.tar.xz/data/translations/updatepo.sh -> dxirc-1.40.1.tar.xz/data/translations/updatepo.sh Changed

@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
 
-FOXDIR=../../../fox-1.6
+FOXDIR=../../../../../fox-1.6
 
 #qt sources
 INPUT=`find ../../qt -type f $ -name *.cpp -o -name *.h $`
 
 xgettext -C --from-code=UTF-8 --msgid-bugs-address=arch_dvx@users.sourceforge.net --package-name=dxirc\
-    --package-version=1.20.0 --copyright-holder="David Vachulka" --keyword=_ --keyword=N_ --keyword=_n:1,2\
+    --package-version=1.40.1 --copyright-holder="David Vachulka" --keyword=_ --keyword=N_ --keyword=_n:1,2\
     -o dxirc.pot $INPUT
 
 #fox sources
 INPUT=`find ../../fox -type f $ -name *.cpp -o -name *.h $`
 
 xgettext -C -j --from-code=UTF-8 --msgid-bugs-address=arch_dvx@users.sourceforge.net --package-name=dxirc\
-    --package-version=1.20.0 --copyright-holder="David Vachulka" --keyword=_ --keyword=N_ --keyword=tr:1 --keyword=_n:1,2\
+    --package-version=1.40.1 --copyright-holder="David Vachulka" --keyword=_ --keyword=N_ --keyword=tr:1 --keyword=_n:1,2\
     -o dxirc.pot $INPUT
 
 # FOX files
@@ -26,7 +26,7 @@
 $FOXDIR/src/FXSearchDialog.cpp \
 $FOXDIR/src/FXStatusLine.cpp"
 
-xgettext -C -j --from-code=UTF-8 --msgid-bugs-address=arch_dvx@users.sourceforge.net  --package-name=dxirc --package-version=1.20.0 --copyright-holder="David Vachulka" --keyword=tr:1 -o dxirc.pot $INPUT
+xgettext -C -j --from-code=UTF-8 --msgid-bugs-address=arch_dvx@users.sourceforge.net  --package-name=dxirc --package-version=1.40.1 --copyright-holder="David Vachulka" --keyword=tr:1 -o dxirc.pot $INPUT
 
 for i in *.po
 do

dxirc-1.30.0.tar.xz/debian/changelog -> dxirc-1.40.1.tar.xz/debian/changelog Changed

dxirc-1.30.0.tar.xz/debian/compat -> dxirc-1.40.1.tar.xz/debian/compat Changed

dxirc-1.30.0.tar.xz/debian/control -> dxirc-1.40.1.tar.xz/debian/control Changed

dxirc-1.30.0.tar.xz/dxirc.spec -> dxirc-1.40.1.tar.xz/dxirc.spec Changed

dxirc-1.30.0.tar.xz/fox/CMakeLists.txt -> dxirc-1.40.1.tar.xz/fox/CMakeLists.txt Changed

@@ -1,10 +1,6 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-if(COMMAND cmake_policy)
-    if(POLICY CMP0048)
-        cmake_policy(SET CMP0048 OLD)
-    endif(POLICY CMP0048)
-endif(COMMAND cmake_policy)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.7)
 project(dxirc-fox)
+set(PROJECT_VERSION "1.40.1")
 
 set(DXIRCFOX_LIBS "")
 set(DXIRCFOX_INCLUDE_DIRS "")
@@ -86,23 +82,43 @@
     list(APPEND DXIRCFOX_LIBS ${LUA_LIBRARIES})
 endif(HAVE_LUA)
 
-if(HAVE_ENCHANT)
+set(HAVE_ENCHANT FALSE)
+set(HAVE_ENCHANT2 FALSE)
+if(USE_ENCHANT)
     if(PKG_CONFIG_FOUND)
-        pkg_check_modules(ENCHANT enchant)
+        pkg_check_modules(ENCHANT enchant-2)
         list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
         list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
+        set(HAVE_ENCHANT TRUE)
+        if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+            set(HAVE_ENCHANT2 TRUE)
+        endif()
+        if(NOT ENCHANT_FOUND)
+            pkg_check_modules(ENCHANT enchant)
+            list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARIES})
+            list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
+            set(HAVE_ENCHANT TRUE)
+            if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+                set(HAVE_ENCHANT2 TRUE)
+            endif()
+        endif()
     endif(PKG_CONFIG_FOUND)
     if(NOT ENCHANT_FOUND)
         set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")
         set(ENCHANT_LIBRARY "" CACHE FILEPATH "Filepath to enchant library")
+        set(ENCHANT_VERSION "" CACHE STRING "Enchant verison")
         if(ENCHANT_INCLUDE_DIR)
             list(APPEND DXIRCFOX_LIBS ${ENCHANT_LIBRARY})
             list(APPEND DXIRCFOX_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
+            set(HAVE_ENCHANT TRUE)
+            if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+                set(HAVE_ENCHANT2 TRUE)
+            endif()
         else()
             set(HAVE_ENCHANT FALSE)
         endif()
     endif()
-endif(HAVE_ENCHANT)
+endif(USE_ENCHANT)
 
 include(CheckFunctionExists)
 CHECK_FUNCTION_EXISTS("inet_ntop" HAVE_INET_NTOP_EXISTS)
@@ -134,8 +150,10 @@
 
 add_definitions(-DHAVE_CONFIG_H)
 if(WIN32)
+add_definitions(-DWIN32)
 add_definitions(-DFOXDLL)
 add_definitions(-DUNICODE)
+add_definitions(-D_UNICODE)
 endif(WIN32)
 
 set(SOURCES
@@ -221,5 +239,9 @@
 message(STATUS "Build with lua scripting support:           ${HAVE_LUA}")
 endif(HAVE_LUA)
 message(STATUS "Build with SSL:                             ${HAVE_OPENSSL}")
+if(HAVE_ENCHANT)
+message(STATUS "Build with spellchecking support:           ${HAVE_ENCHANT}/${ENCHANT_VERSION}")
+else(HAVE_ENCHANT)
 message(STATUS "Build with spellchecking support:           ${HAVE_ENCHANT}")
+endif(HAVE_ENCHANT)

dxirc-1.30.0.tar.xz/fox/FXTrayApp.cpp -> dxirc-1.40.1.tar.xz/fox/FXTrayApp.cpp Changed

@@ -1,39 +1,29 @@
 /*
-FoxTray, system tray icon for the FOX Toolkit
-
-Copyright (c) 2008, Hendrik Rittich
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in 
- the documentation and/or other materials provided with the 
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
+ * FXTrayApp.cpp
+ *
+ * Copyright (c) 2008, Hendrik Rittich
+ * Copyright (C) 2006-2011 by Sander Jansen
+ * Copyright 2012 David Vachulka <david@konstrukce-cad.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <xincs.h>
 #include "FXTrayApp.h"
 #include "FXTrayIcon.h"
-#ifndef WIN32
-#include <X11/Xlib.h>
-#define XEMBED_EMBEDDED_NOTIFY 0
-#endif
 
 namespace FX {
 
@@ -43,28 +33,21 @@
 FXApp(name, vendor)
 {
 #ifndef WIN32
- mTrayAtom = None;
+ mXembed = 0;
 #endif
 }
 
 void FXTrayApp::create()
 {
 FXApp::create();
-
 #ifdef WIN32
 mTaskbarRestartId = RegisterWindowMessage(TEXT("TaskbarCreated"));
 #else
- Display* dpy = static_cast<Display*>(getDisplay() );
- int screen = DefaultScreen(dpy);
- Window root = RootWindow(dpy, screen);
-
- // notify new trays to us
- XSelectInput(dpy, root, StructureNotifyMask);
- 
- // register some atoms to save bandwidth
- mManagerAtom = XInternAtom(dpy, "MANAGER", False);
- mXembedAtom = XInternAtom(dpy, "_XEMBED", False);
- createTrayAtom();
+ FXString systemtray = FXStringFormat("_NET_SYSTEM_TRAY_S%d",DefaultScreen((Display*)getDisplay()));
+ mXembed = (FXID)XInternAtom((Display*)getDisplay(),"_XEMBED",False);
+ mXmanager = (FXID)XInternAtom((Display*)getDisplay(),"MANAGER",True);
+ mXsystemtray = (FXID)XInternAtom((Display*)getDisplay(),systemtray.text(),True);
+ XSelectInput((Display*)getDisplay(),getRootWindow()->id(),KeyPressMask|KeyReleaseMask|StructureNotifyMask);
 #endif
 }
 
@@ -85,105 +68,44 @@
 return FXApp::dispatchEvent(hwnd, iMsg, wParam, lParam);
 }
 #else
-void FXTrayApp::createTrayAtom()
-{
- if (mTrayAtom != None)
- return;
-
- Display* dpy = static_cast<Display*>(getDisplay() );
- int screen = DefaultScreen(dpy);
-
- // Search for tray manager
- char atom_str32;
- snprintf(atom_str, sizeof(atom_str),
- "_NET_SYSTEM_TRAY_S%d", screen);
- atom_strsizeof(atom_str)-1 = '\0';
-
- mTrayAtom = XInternAtom(dpy, atom_str, False);
-}
-
-FXID FXTrayApp::getTrayManager()
-{
- Display* dpy = static_cast<Display*>(getDisplay() );
-
- createTrayAtom();
-
- manager_id = XGetSelectionOwner(dpy, mTrayAtom);
- return manager_id;
-}
-
 bool FXTrayApp::dispatchEvent(FXRawEvent& ev)
 {
- Display* dpy = static_cast<Display*>(getDisplay() );
- int screen = DefaultScreen(dpy);
- Window root = RootWindow(dpy, screen);
-
- // return TRUE; // event dispached successful
- if (ev.xany.type == ClientMessage &&
- ev.xclient.message_type == mManagerAtom &&
- static_cast<Atom>(ev.xclient.data.l1) == mTrayAtom)
+ if (ev.xany.window == getRootWindow()->id() && ev.xany.type == ClientMessage)
 {
- manager_id = ev.xclient.data.l2;
- //printf("New Tray 0x%lX\n", manager_id);
-
- XSelectInput(dpy, manager_id, StructureNotifyMask);
-
- // remap icons to new tray manager
- for(int i=0; i < mIcons.no(); i++) 
+ if ((Atom) ev.xclient.message_type == (Atom) mXmanager && (Atom) ev.xclient.data.l1 == (Atom) mXsystemtray)
 {
- mIconsi->mapToManager();
+ if(mIcon)
+ mIcon->dock();
+ return true;
 }
-
- return TRUE;
 }
 
- // warning: fluxbox just maps the window instead of sending this msg
- if (ev.xany.type == ClientMessage &&
- ev.xclient.message_type == mXembedAtom &&
- static_cast<Atom>(ev.xclient.data.l1) == XEMBED_EMBEDDED_NOTIFY)
+ FXWindow * window = findWindowWithId(ev.xany.window);
+ if (window && ev.xany.type == ClientMessage && ev.xclient.message_type == mXembed)
 {
- //printf("Embeded\n");
-
- // the window was embed, so show it
- FXWindow* wnd = findWindowWithId(ev.xany.window);
- if (wnd) {
- wnd->show();
- }
-
- return TRUE;
- }
-
- if (ev.type == ReparentNotify)
- {
- FXWindow* wnd = findWindowWithId(ev.xreparent.window);
- if (wnd && wnd->isMemberOf(&FXTrayIcon::metaClass)) {
-
- if (ev.xreparent.parent == root) 
- {
- //printf("Icon lost\n");
-
- wnd->hide(); // doesn't work with fluxbox
- XUnmapWindow(dpy, ev.xreparent.window);
-
- return TRUE;
- } else {
- // tolerate non standard tray managers
- wnd->show();
- }
+ switch (ev.xclient.data.l1)
+ {
+ case XEMBED_EMBEDDED_NOTIFY: window->tryHandle(this, FXSEL(SEL_EMBED_NOTIFY, 0), (void*) (FXival) ev.xclient.data.l3);
+ break;
+ case XEMBED_MODALITY_ON: window->tryHandle(this, FXSEL(SEL_EMBED_MODAL_ON, 0), NULL);
+ break;

dxirc-1.30.0.tar.xz/fox/FXTrayApp.h -> dxirc-1.40.1.tar.xz/fox/FXTrayApp.h Changed

@@ -1,32 +1,26 @@
 /*
-FoxTray, system tray icon for the FOX Toolkit
+ * FXTrayApp.h
+ *
+ * Copyright (c) 2008, Hendrik Rittich
+ * Copyright (C) 2006-2011 by Sander Jansen
+ * Copyright 2012 David Vachulka <david@konstrukce-cad.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
 
-Copyright (c) 2008, Hendrik Rittich
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in 
- the documentation and/or other materials provided with the 
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
 #ifndef FX_TRAY_APP
 #define FX_TRAY_APP
 
@@ -34,38 +28,45 @@
 #include "FXArray.h"
 
 namespace FX {
+ 
+#ifndef WIN32
+enum {
+ SEL_EMBED_NOTIFY = SEL_LAST,
+ SEL_EMBED_MODAL_ON,
+ SEL_EMBED_MODAL_OFF
+ };
+#endif
 
 class FXTrayIcon;
 
 class FXTrayApp : public FXApp
 {
 FXDECLARE(FXTrayApp)
+ friend class FXTrayIcon;
 public:
 FXTrayApp(const FXString& name="Application",
 const FXString& vendor="FoxDefault");
 
 void create();
 #ifndef WIN32
- FXID getTrayManager();
- void createTrayAtom();
 void registerIcon(FXTrayIcon* ic);
- void unregisterIcon(FXTrayIcon* ic);
+ void unregisterIcon();
 #endif
 protected:
 #ifdef WIN32
 long dispatchEvent(FXID hwnd, unsigned int iMsg, unsigned int wParam,long lParam);
 #else
+ FXID mXembed;
+ FXID mXsystemtray;
+ FXID mXmanager;
+
 bool dispatchEvent(FXRawEvent& ev);
 #endif
 private:
 #ifdef WIN32
 unsigned int mTaskbarRestartId;
 #else
- FXObjectListOf<FXTrayIcon> mIcons;
- FXID manager_id;
- FXID mManagerAtom;
- FXID mTrayAtom;
- FXID mXembedAtom;
+ FXTrayIcon *mIcon;
 #endif
 };

dxirc-1.30.0.tar.xz/fox/FXTrayIcon.cpp -> dxirc-1.40.1.tar.xz/fox/FXTrayIcon.cpp Changed

@@ -1,39 +1,29 @@
 /*
-FoxTray, system tray icon for the FOX Toolkit
-
-Copyright (c) 2008, Hendrik Rittich
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in 
- the documentation and/or other materials provided with the 
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
+ * FXTrayIcon.cpp
+ *
+ * Copyright (c) 2008, Hendrik Rittich
+ * Copyright (C) 2006-2011 by Sander Jansen
+ * Copyright 2012 David Vachulka <david@konstrukce-cad.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <xincs.h>
 #include "FXTrayIcon.h"
-#ifndef WIN32
 #include "FXTrayApp.h"
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#endif
 
 namespace FX {
 
@@ -43,11 +33,29 @@
 FXMAPFUNC(SEL_MOTION, 0, FXTrayIcon::onEvent)
 };
 #else
+enum
+{
+ SYSTEM_TRAY_REQUEST_DOCK = 0,
+ SYSTEM_TRAY_BEGIN_MESSAGE = 1,
+ SYSTEM_TRAY_CANCEL_MESSAGE = 2,
+};
+
+enum
+{
+ SYSTEM_TRAY_HORIZONTAL = 0,
+ SYSTEM_TRAY_VERTICAL = 1,
+ SYSTEM_TRAY_UNKNOWN = 2
+};
+
+
 FXDEFMAP(FXTrayIcon) FXTrayIconMap = {
- FXMAPFUNC(SEL_LEFTBUTTONRELEASE, FXTrayIcon::ID_BUTTON, FXTrayIcon::onLeft),
- FXMAPFUNC(SEL_RIGHTBUTTONRELEASE, FXTrayIcon::ID_BUTTON, FXTrayIcon::onRight),
- FXMAPFUNC(SEL_TIMEOUT, FXTrayIcon::ID_POPTIMEOUT, FXTrayIcon::onTimeout),
- FXMAPFUNC(SEL_CLOSE, 0, FXTrayIcon::onClose)
+ FXMAPFUNC(SEL_PAINT, 0, FXTrayIcon::onPaint),
+ FXMAPFUNC(SEL_CONFIGURE, 0, FXTrayIcon::onConfigure),
+ FXMAPFUNC(SEL_LEFTBUTTONPRESS, 0, FXTrayIcon::onLeftBtnPress),
+ FXMAPFUNC(SEL_RIGHTBUTTONRELEASE, 0, FXTrayIcon::onRightBtnRelease),
+ FXMAPFUNC(SEL_QUERY_TIP, 0, FXTrayIcon::onQueryTip),
+ FXMAPFUNC(SEL_EMBED_NOTIFY, 0, FXTrayIcon::onEmbedded),
+ FXMAPFUNC(SEL_TIMEOUT, FXTrayIcon::ID_POPTIMEOUT, FXTrayIcon::onTimeout)
 };
 #endif
 
@@ -56,13 +64,13 @@
 #ifdef WIN32
 DWORD FXTrayIcon::sTrayIconCount = 1;
 
-FXTrayIcon::FXTrayIcon(FXApp* app, const FXString& text, FXIcon* icon, 
- FXPopup* pup, FXObject* target, FXSelector sel,
+FXTrayIcon::FXTrayIcon(FXApp* app, const FXString& text, FXIcon* icon,
+ FXPopup* popup, FXObject* target, FXSelector sel,
 FXuint opts) :
 FXTopWindow(app, text, 0, 0, 0, 0,0,0,0, 0,0,0,0, 0,0),
 mIcon(icon),
- mPup(pup),
- mOpts(opts),
+ m_popup(popup),
+ m_opts(opts),
 mTooltip(text)
 {
 mWIcon = 0;
@@ -74,7 +82,7 @@
 }
 
 FXTrayIcon::~FXTrayIcon() {
- if (mWIcon) 
+ if (mWIcon)
 {
 // Icon entfernen
 NOTIFYICONDATA tray_data;
@@ -103,11 +111,11 @@
 mapToManager();
 }
 
-void FXTrayIcon::mapToManager() 
+void FXTrayIcon::mapToManager()
 {
 NOTIFYICONDATA tray_data;
 setupNotifyData(&tray_data);
- 
+
 Shell_NotifyIcon(NIM_ADD, &tray_data);
 }
 
@@ -148,21 +156,21 @@
 
 FXEvent* event = static_cast<FXEvent*>(ptr);
 int lParam = event->root_x;
- 
- if ((lParam == WM_LBUTTONUP && (mOpts & TRAY_MENU_ON_LEFT)) ||
- (lParam == WM_RBUTTONUP && (mOpts & TRAY_MENU_ON_RIGHT)))
+
+ if ((lParam == WM_LBUTTONUP && (m_opts & TRAY_MENU_ON_LEFT)) ||
+ (lParam == WM_RBUTTONUP && (m_opts & TRAY_MENU_ON_RIGHT)))
 {
 POINT p;
 GetCursorPos(&p);
- mPup->popup(0, p.x, p.y);
+ m_popup->popup(0, p.x, p.y);
 getApp()->addTimeout(this, ID_POPTIMEOUT, 10000);
 
 return 1;
 }
 if (target &&
- (lParam == WM_LBUTTONUP && (mOpts & TRAY_CMD_ON_LEFT)) ||
- (lParam == WM_RBUTTONUP && (mOpts & TRAY_CMD_ON_RIGHT)))
- { 
+ (lParam == WM_LBUTTONUP && (m_opts & TRAY_CMD_ON_LEFT)) ||
+ (lParam == WM_RBUTTONUP && (m_opts & TRAY_CMD_ON_RIGHT)))
+ {
 return target->tryHandle(obj, FXSEL(SEL_COMMAND, message), ptr);
 }
 return 0;
@@ -197,218 +205,361 @@
 Shell_NotifyIcon(NIM_MODIFY, &tray_data);
 }
 #else
-static int trapped_error_code = 0;
-static int (*old_error_handler) (Display *, XErrorEvent *);
-
-static int 
-error_handler(
- Display *display, 
- XErrorEvent *error)
+FXTrayIcon::FXTrayIcon()
 {
- trapped_error_code = error->error_code;
- return 0;
+ m_icon = NULL;
+ flags |= FLAG_ENABLED;
 }
 
-void
-trap_errors()
+FXTrayIcon::FXTrayIcon(FXApp *app, const FXString& tip, FXIcon* icon,
+ FXPopup* popup, FXObject* target, FXSelector sel,
+ FXuint opts)
+: FXTopWindow(app, "test", NULL, NULL, DECOR_NONE, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0), m_xtraywindow(0),
+ m_xtrayopcode(0), m_socket(0), m_icon(icon), m_opaque(false), m_tip(tip), m_popup(popup), m_opts(opts), m_traycolor(getBackColor())
 {
- trapped_error_code = 0;
- old_error_handler = XSetErrorHandler(error_handler);
+ flags |= FLAG_ENABLED;
+ setTarget(target);
+ setSelector(sel);
+ static_cast<FXTrayApp*> (app)->registerIcon(this);

dxirc-1.30.0.tar.xz/fox/FXTrayIcon.h -> dxirc-1.40.1.tar.xz/fox/FXTrayIcon.h Changed

@@ -1,32 +1,25 @@
 /*
-FoxTray, system tray icon for the FOX Toolkit
-
-Copyright (c) 2008, Hendrik Rittich
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in 
- the documentation and/or other materials provided with the 
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * FXTrayIcon.h
+ *
+ * Copyright (c) 2008, Hendrik Rittich
+ * Copyright (C) 2006-2011 by Sander Jansen
+ * Copyright 2012 David Vachulka <david@konstrukce-cad.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
 
 #ifndef FX_TRAY_ICON_H
 #define FX_TRAY_ICON_H
@@ -41,6 +34,13 @@
 namespace FX {
 
 enum {
+ XEMBED_EMBEDDED_NOTIFY = 0,
+ XEMBED_MODALITY_ON = 10,
+ XEMBED_MODALITY_OFF = 11,
+ XEMBED_REQUEST_FOCUS = 3
+};
+
+enum {
 TRAY_MENU_ON_LEFT = 0x0001,
 TRAY_MENU_ON_RIGHT = 0x0002,
 TRAY_CMD_ON_LEFT = 0x0004,
@@ -56,7 +56,7 @@
 ID_POPTIMEOUT = FXTopWindow::ID_LAST,
 ID_LAST
 };
- FXTrayIcon(FXApp* app, const FXString& text, FXIcon* icon, 
+ FXTrayIcon(FXApp* app, const FXString& text, FXIcon* icon,
 FXPopup* pup = NULL, FXObject* target = 0, FXSelector sel = 0,
 FXuint opts = TRAY_MENU_ON_LEFT);
 ~FXTrayIcon();
@@ -68,28 +68,32 @@
 long onEvent(FXObject*, FXSelector, void* ptr);
 long onTimeout(FXObject*, FXSelector, void*);
 
- void setMenu(FXPopup* pup) { mPup = pup; }
- FXPopup* getMenu() const { return mPup; }
+ void setMenu(FXPopup* pup) { m_popup = pup; }
+ FXPopup* getMenu() const { return m_popup; }
 
 void setIcon(FXIcon* icon);
- inline FXIcon* getIcon() const { return mIcon; } 
+ inline FXIcon* getIcon() const { return mIcon; }
 
 void setText(const FXString& text);
 inline const FXString& getText() const { return mTooltip; }
 
 static HICON createMswIcon(FXIcon* icon);
+
+ FXbool getOpaque() const { return false; }
+
+ void setTrayColor(FXColor) {}
 private:
 HICON mWIcon;
 FXIcon* mIcon;
 DWORD mTrayID;
 
- FXPopup* mPup;
- FXuint mOpts;
+ FXPopup* m_popup;
+ FXuint m_opts;
 FXString mTooltip;
 
 static DWORD sTrayIconCount;
 
- FXTrayIcon():mIcon(NULL),mTrayID(0),mPup(NULL),mOpts(0)
+ FXTrayIcon()
 {}
 
 void setupNotifyData(NOTIFYICONDATA* data);
@@ -98,68 +102,69 @@
 class FXTrayIcon : public FXTopWindow
 {
 FXDECLARE(FXTrayIcon)
-public: 
- /** @cond DEV */
+private:
+ FXTrayIcon(const FXTrayIcon*);
+ FXTrayIcon& operator=(const FXTrayIcon&);
+
+ void popup(FXint x, FXint y);
+protected:
+ FXID m_xtraywindow;
+ FXID m_xtrayopcode;
+ FXID m_xtrayorientation;
+ FXID m_xtrayxfceorientation;
+ FXID m_xtrayvisual;
+ FXID m_socket;
+ FXIcon *m_icon;
+ FXbool m_opaque;
+ FXString m_tip;
+ FXPopup *m_popup;
+ FXuint m_opts;
+ FXColor m_traycolor;
+
+ FXTrayIcon();
+
+ FXbool findSystemTray();
+ void requestDock();
+ FXuint getTrayOrientation();
+ FXuint getTrayVisual();
+ virtual bool doesOverrideRedirect() const;
+public:
 enum {
- ID_BUTTON = FXTopWindow::ID_LAST,
- ID_POPTIMEOUT,
+ ID_POPTIMEOUT = FXTopWindow::ID_LAST,
 ID_LAST
 };
- /** @endcond */
-
- /** Create a tray icon.
- @param app the current FXApp instance
- @param text the tool tip text
- @param icon the icon to display in the tray
- @param pup the popup menu to display
- @param target send messages to
- @param sel id 
- @param opts options. See @ref tray_options .
- */
- FXTrayIcon(FXApp* app, const FXString& text, FXIcon* icon, 
- FXPopup* pup = NULL, FXObject* target = 0, FXSelector sel = 0,
- FXuint opts = TRAY_MENU_ON_LEFT);
-
- ~FXTrayIcon(); 
-
- /** Create the server side resource of the tray icon. */
- void create();
-
- /** @cond DEV */
- void mapToManager(); 
-
- long onLeft(FXObject*, FXSelector, void*);
- long onRight(FXObject* obj, FXSelector, void* ptr);
- long onClose(FXObject*, FXSelector, void*);
+ FXTrayIcon(FXApp* app, const FXString& text, FXIcon* icon,
+ FXPopup* popup = NULL, FXObject* target = 0, FXSelector sel = 0,
+ FXuint opts = TRAY_MENU_ON_RIGHT);
+ virtual ~FXTrayIcon();
+
+ long onPaint(FXObject*, FXSelector, void*);
+ long onConfigure(FXObject*, FXSelector, void*);
+ long onLeftBtnPress(FXObject*, FXSelector, void*);
+ long onRightBtnRelease(FXObject*, FXSelector, void*);
+ long onQueryTip(FXObject*, FXSelector, void*);
+ long onEmbedded(FXObject*, FXSelector, void*);
 long onTimeout(FXObject*, FXSelector, void*);
- /** @endcond */
 
+ virtual void create();
+ FXbool dock();
+ virtual void setFocus();
+ /** Change the tool tip text. */
+ void setText(const FXString & t) {

dxirc-1.30.0.tar.xz/fox/config.h.cmake -> dxirc-1.40.1.tar.xz/fox/config.h.cmake Changed

dxirc-1.30.0.tar.xz/fox/defs.h -> dxirc-1.40.1.tar.xz/fox/defs.h Changed

dxirc-1.30.0.tar.xz/fox/dialogs/aboutdialog.cpp -> dxirc-1.40.1.tar.xz/fox/dialogs/aboutdialog.cpp Changed

dxirc-1.30.0.tar.xz/fox/dialogs/configdialog.cpp -> dxirc-1.40.1.tar.xz/fox/dialogs/configdialog.cpp Changed

@@ -72,8 +72,8 @@
 // Check if quotes are needed
 static bool needquotes(const FXchar* text)
 {
- register const FXchar *ptr=text;
- register FXuchar c;
+ const FXchar *ptr=text;
+ FXuchar c;
 while((c=*ptr++)!='\0')
 {
 if(0x7f<=c || c<0x20 || c=='"' || c=='\'' || c=='\\' || (c==' ' && (ptr==(text+1) || *ptr=='\0'))) return true;
@@ -84,7 +84,7 @@
 // Read string
 static bool readString(FXFile& file, FXchar *buffer, FXint& bol, FXint& eol, FXint& end)
 {
- register FXint n;
+ FXint n;
 do
 {
 if(eol >= end)
@@ -107,7 +107,7 @@
 // Write string
 static bool writeString(FXFile& file, const FXchar* string)
 {
- register FXint len = strlen(string);
+ FXint len = strlen(string);
 return file.writeBlock(string, len) == len;
 }
 
@@ -277,6 +277,7 @@
 m_targetReconnect.setSelector(ConfigDialog_RECONNECT);
 m_targetNumberAttempt.connect(m_preferences.m_numberAttempt);
 m_targetDelayAttempt.connect(m_preferences.m_delayAttempt);
+ m_targetJoinDelay.connect(m_preferences.m_joinDelay);
 m_targetMaxAway.connect(m_preferences.m_maxAway);
 m_targetUseTray.connect(m_preferences.m_useTray);
 m_targetUseTray.setTarget(this);
@@ -498,6 +499,9 @@
 m_delayAttemptSpinner = new FXSpinner(dapane, 4, &m_targetDelayAttempt, FXDataTarget::ID_VALUE, SPIN_CYCLIC|FRAME_GROOVE);
 m_delayAttemptSpinner->setRange(5,120);
 if(!m_preferences.m_reconnect) m_delayAttemptSpinner->disable();
+ FXHorizontalFrame *jdpane = new FXHorizontalFrame(generalpane, LAYOUT_FILL_X);
+ new FXLabel(jdpane, _("Delay between join command and connection"), NULL, LAYOUT_LEFT);
+ new FXSpinner(jdpane, 4, &m_targetJoinDelay, FXDataTarget::ID_VALUE, SPIN_NOMAX|FRAME_GROOVE);
 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);
@@ -1371,9 +1375,9 @@
 // Enquote a value
 FXchar* ConfigDialog::enquote(FXchar* result, const FXchar* text)
 {
- register FXchar *end = result + MAXVALUE - 6;
- register FXchar *ptr = result;
- register FXuchar c;
+ FXchar *end = result + MAXVALUE - 6;
+ FXchar *ptr = result;
+ FXuchar c;
 if (needquotes(text))
 {
 *ptr++ = '"';
@@ -1451,9 +1455,9 @@
 // Dequote a value, in situ
 FXchar* ConfigDialog::dequote(FXchar* text) const
 {
- register FXchar *result = text;
- register FXchar *ptr = text;
- register FXuint v;
+ FXchar *result = text;
+ FXchar *ptr = text;
+ FXuint v;
 if(*text == '"')
 {
 text++;
@@ -1546,7 +1550,7 @@
 channel->setTipText(_("Channels need to be comma separated"));
 new FXLabel(matrix, _("Network:"), NULL,JUSTIFY_LEFT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW);
 FXTextField *network = new FXTextField(matrix, 25, NULL, 0, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW);
- network->setText("freenode");
+ network->setText("Libera.Chat");
 
 FXHorizontalFrame *buttonframe = new FXHorizontalFrame(contents,LAYOUT_FILL_X|LAYOUT_FILL_Y|PACK_UNIFORM_WIDTH);
 new dxEXButton(buttonframe, _("&Cancel"), NULL, &dialog, FXDialogBox::ID_CANCEL, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT, 0,0,0,0, 10,10,2,2);

dxirc-1.30.0.tar.xz/fox/dialogs/configdialog.h -> dxirc-1.40.1.tar.xz/fox/dialogs/configdialog.h Changed

dxirc-1.30.0.tar.xz/fox/dialogs/keybindingsdialog.cpp -> dxirc-1.40.1.tar.xz/fox/dialogs/keybindingsdialog.cpp Changed

dxirc-1.30.0.tar.xz/fox/dialogs/logviewer.cpp -> dxirc-1.40.1.tar.xz/fox/dialogs/logviewer.cpp Changed

@@ -1050,12 +1050,12 @@
 {
 if(FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+2,6)))
 {
- foreColor = FXRGB(FXIntVal(txt.mid(i+2,2),16),FXIntVal(txt.mid(i+4,2),16),FXIntVal(txt.mid(i+6,2),16));
+ foreColor = fxcolorfromname(txt.mid(i+1,7).text());
 colorLength +=7;
 }
 if(i+8 < length && txti+8 == ',' && FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+10,6)))
 {
- backColor = FXRGB(FXIntVal(txt.mid(i+10,2),16),FXIntVal(txt.mid(i+12,2),16),FXIntVal(txt.mid(i+14,2),16));
+ backColor = fxcolorfromname(txt.mid(i+9,7).text());
 colorLength +=8;
 }
 }
@@ -1078,7 +1078,7 @@
 }
 }
 if(code!=-1)
- foreColor = dxutils::getIrcColor(code%16);
+ foreColor = dxutils::getIrcColor(code, true);
 }
 if(i+colorLength+1 < length && txti+colorLength+1 == ',')
 {
@@ -1097,7 +1097,7 @@
 }
 }
 if(code!=-1)
- backColor = dxutils::getIrcColor(code%16);
+ backColor = dxutils::getIrcColor(code, false);
 }
 }
 lastStyle = hiliteStyleExist(foreColor, backColor, style);
@@ -1113,6 +1113,47 @@
 };
 i +=colorLength;
 }
+ else if(txti == '\004') // hex color
+ {
+ if(!normalText.empty())
+ {
+ m_text->appendStyledText(normalText, lastStyle);
+ normalText.clear();
+ }
+ FXuint style=0;
+ if(bold && under) style = FXText::STYLE_BOLD|FXText::STYLE_UNDERLINE;
+ else if(bold && !under) style = FXText::STYLE_BOLD;
+ else if(!bold && under) style = FXText::STYLE_UNDERLINE;
+ FXint colorLength = 0;
+ foreColor = preferences.m_colors.text;
+ backColor = preferences.m_colors.back;
+ if(FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+1,6)))
+ {
+ FXString color = "#";
+ color.append(txt.mid(i+1,6));
+ foreColor = fxcolorfromname(color.text());
+ colorLength +=6;
+ }
+ if(i+7 < length && txti+7 == ',' && FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+8,6)))
+ {
+ FXString color = "#";
+ color.append(txt.mid(i+8,6));
+ backColor = fxcolorfromname(color.text());
+ colorLength +=7;
+ }
+ lastStyle = hiliteStyleExist(foreColor, backColor, style);
+ if(lastStyle == -1)
+ {
+ //dxText has available max. 255 styles
+ if(m_textStyleList.no()<256)
+ {
+ createHiliteStyle(foreColor, backColor, style);
+ lastStyle = m_textStyleList.no();
+ }
+ else lastStyle = 0;
+ };
+ i +=colorLength;
+ }
 else if(txti == '\017') //reset
 {
 if(!normalText.empty())
@@ -1797,7 +1838,7 @@
 //get child of parent with text only first sublevel
 LogItem* LogViewer::getItem(LogItem *parent, FXString text)
 {
- register LogItem *item;
+ LogItem *item;
 item = (LogItem*)parent->getFirst();
 while(item!=NULL && item->getParent()==parent)
 {
@@ -1811,7 +1852,7 @@
 {
 dxStringArray array;
 array.no(0);
- register LogItem *item;
+ LogItem *item;
 item = (LogItem*)parent->first;
 while(item)
 {

dxirc-1.30.0.tar.xz/fox/dxirc-fox.rc -> dxirc-1.40.1.tar.xz/fox/dxirc-fox.rc Changed

dxirc-1.30.0.tar.xz/fox/dxirc.cpp -> dxirc-1.40.1.tar.xz/fox/dxirc.cpp Changed

@@ -504,6 +504,16 @@
     }
     autoloadScripts();
     m_app->addTimeout(this, dxirc_AWAYTIMEOUT, 180000);
+#ifndef WIN32
+#ifdef HAVE_TRAY
+    m_trayIcon->create();
+    if(!m_trayIcon->dock())
+    {
+        delete m_trayIcon;
+        m_trayIcon=NULL;
+    }
+#endif //HAVE_TRAY
+#endif
 }
 
 // Flash the window to get user's attention
@@ -762,7 +772,8 @@
     }
     updateStatus(_("Checking version in progress"));
     m_versionSocket->setTarget(this);
-    m_versionSocket->setHost("dxirc.org", 80);
+    m_versionSocket->setHost("dxsolutions.org", 443);
+    m_versionSocket->setIsSSL(TRUE);
     m_versionSocket->connectTo();
     return 1;
 }
@@ -771,7 +782,7 @@
 long dxirc::onVersionSocketConnected(FXObject*, FXSelector, void*)
 {
     if(m_versionSocket)
-        m_versionSocket->writeLine("GET http://www.dxirc.org/version HTTP/1.0\nUser-Agent: dxirc version\n\n", TRUE);
+        m_versionSocket->writeLine("GET /dxirc-version HTTP/1.0\r\nHost: dxsolutions.org\r\nAccept: */*\r\nConnection: close\r\n\r\n", TRUE);
     return 1;
 }
 
@@ -786,6 +797,7 @@
         FXchar *buffer = new FXcharread;
         read = m_versionSocket->read(buffer, read);
         FXString serverVersion = buffer;
+        dxutils::debugLine(serverVersion);
         serverVersion = serverVersion.after('\n', serverVersion.contains('\n')-(bufferread-1=='\n'?1:0)).before('\n');
         if(serverVersion.empty())
         {
@@ -917,7 +929,7 @@
 
 void dxirc::updateTheme(FXColor oldUnread, FXColor oldHighlight)
 {
-    register FXWindow *w = FXApp::instance()->getRootWindow();
+    FXWindow *w = FXApp::instance()->getRootWindow();
 
     FX7Segment * sevensegment;
     FXTextField * textfield;
@@ -1259,7 +1271,7 @@
 #ifndef WIN32
 #ifdef HAVE_TRAY
     if(m_preferences.m_useTray && m_trayIcon)
-        m_trayIcon->setColor(m_preferences.m_trayColor);
+        m_trayIcon->setTrayColor(m_preferences.m_trayColor);
 #endif //HAVE_TRAY
 #endif //WIN32
 }
@@ -1269,7 +1281,7 @@
     m_app->getNormalFont()->destroy();
     m_app->getNormalFont()->setFont(m_preferences.m_font);
     m_app->getNormalFont()->create();
-    register FXWindow *w = this;
+    FXWindow *w = this;
     while(w)
     {
         w->recalc();
@@ -1520,7 +1532,7 @@
 #ifdef DEBUG
     hostname->setText("localhost");
 #else
-    hostname->setText("irc.freenode.net");
+    hostname->setText("irc.libera.chat");
 #endif
 
     new FXLabel(matrix, _("Port:"), NULL, JUSTIFY_LEFT|LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW);

dxirc-1.30.0.tar.xz/fox/dxpipe.cpp -> dxirc-1.40.1.tar.xz/fox/dxpipe.cpp Changed

dxirc-1.30.0.tar.xz/fox/dxtext.cpp -> dxirc-1.40.1.tar.xz/fox/dxtext.cpp Changed

@@ -332,8 +332,8 @@
 
 void dxText::appendStyledText(FXString text, FXint style)
 {
- register FXint last = 0;
- register FXint len = 0;
+ FXint last = 0;
+ FXint len = 0;
 if((text.contains('\n') && texttext.length()-1!='\n') || text.contains('\n')>1)
 {
 if(texttext.length()-1=='\n') last=1;
@@ -549,11 +549,11 @@
 }
 wrapstart=0;
 wrapend=0;
- register FXint lw,cw;
- register FXint sp, sc;
- register FXint s=-1;
- register FXuint style;
- register FXint nwrap=0;
+ FXint lw,cw;
+ FXint sp, sc;
+ FXint s=-1;
+ FXuint style;
+ FXint nwrap=0;
 lw=0;
 for (sp = sc = 0; sp < contentsindex.length(); sp = contentsindex.inc(sp), sc++)
 {
@@ -613,8 +613,8 @@
 //Remove selection
 void dxText::clearSelection()
 {
- register FXint oldstartindex = selstartindex;
- register FXint oldendindex = selendindex;
+ FXint oldstartindex = selstartindex;
+ FXint oldendindex = selendindex;
 selstartindex = 0;
 selstartpos = 0;
 selendindex = 0;
@@ -625,9 +625,9 @@
 // Extend selection
 void dxText::setSelection(FXint index, FXint pos)
 {
- register FXint oldstartindex = selstartindex;
- register FXint oldendindex = selendindex;
- register FXint oldstartpos = selstartpos;
+ FXint oldstartindex = selstartindex;
+ FXint oldendindex = selendindex;
+ FXint oldstartpos = selstartpos;
 if(index<cursorindex)
 {
 selendindex = cursorindex;
@@ -669,8 +669,8 @@
 {
 if(startindex>endindex) return;
 if(startindex==endindex && startpos>endpos) return;
- register FXint oldstartindex = selstartindex;
- register FXint oldendindex = selendindex;
+ FXint oldstartindex = selstartindex;
+ FXint oldendindex = selendindex;
 selstartindex = startindex;
 selstartpos = startpos;
 selendindex = endindex;
@@ -711,11 +711,11 @@
 {
 if(beg>=lines.no()) return;
 if(end>=lines.no()) return;
- register FXint y, i, t;
+ FXint y, i, t;
 if(beg>end){t=beg;beg=end;end=t;}
 if(beg<0) return;
- register FXint hh=font->getFontHeight();
- register FXint h=0;
+ FXint hh=font->getFontHeight();
+ FXint h=0;
 y = pos_y+margintop;
 for(i=0; i<beg; i++)
 {
@@ -761,7 +761,7 @@
 //wordend for position
 FXint dxText::wordEnd(FXint index, FXint pos)
 {
- register FXint length = contentsindex.length();
+ FXint length = contentsindex.length();
 if(index<0 && index>contents.no()-1) return 0;
 if(pos<=0) return 0;
 if(pos>=length) pos=length-1;
@@ -803,10 +803,10 @@
 // Fill fragment of background in given style
 void dxText::fillBufferRect(FXDCWindow& dc, FXint x, FXint y, FXint w, FXint h, FXuint style) const
 {
- register FXuint index = (style & STYLE_MASK);
- register FXuint usedstyle = style; // Style flags from style buffer
- register FXColor bgcolor, fgcolor;
- register FXbool link = FALSE;
+ FXuint index = (style & STYLE_MASK);
+ FXuint usedstyle = style; // Style flags from style buffer
+ FXColor bgcolor, fgcolor;
+ FXbool link = FALSE;
 bgcolor = fgcolor = 0;
 if (hilitestyles && index) { // Get colors from style table
 usedstyle = hilitestylesindex - 1.style; // Style flags now from style table
@@ -853,8 +853,8 @@
 // Draw fragment of text in given style
 void dxText::drawTextFragment(FXDCWindow& dc, FXint x, FXint y, FXint /*w*/, FXint /*h*/, const FXchar* text, FXint n, FXuint style) const
 {
- register FXuint index=style&STYLE_MASK;
- register FXuint usedstyle=style;
+ FXuint index=style&STYLE_MASK;
+ FXuint usedstyle=style;
 if(hilitestyles && index)
 {
 if(style&STYLE_SELECTED) dc.setForeground(hilitestylesindex-1.selectForeColor);
@@ -874,12 +874,12 @@
 // Draw text line with correct style
 void dxText::drawTextLine(FXDCWindow& dc, FXint line, FXint left, FXint right) const
 {
- //register FXint index = (topline + line) % contents.no();
- register FXint index;
- register FXint i;
- register FXint n=0;
- register FXuint style;
- register FXint wrap=0;
+ //FXint index = (topline + line) % contents.no();
+ FXint index;
+ FXint i;
+ FXint n=0;
+ FXuint style;
+ FXint wrap=0;
 for(index=0; index<contents.no(); index++)
 {
 for(i=0, wrap=0; i<linesindex&&n<=line; i++)
@@ -889,15 +889,15 @@
 }
 if(n>line) break;
 }
- register FXint edge = pos_x + marginleft;
- register FXint h = font->getFontHeight();
- register FXint y = pos_y + margintop + line*h;
- register FXint x = 0;
- register FXint w = 0;
- register FXuint curstyle;
- register FXuint newstyle;
- register FXint numberSmiley = 0; //smiley number for one drawIcon
- register FXint cw, sp, ep, sc, ec;
+ FXint edge = pos_x + marginleft;
+ FXint h = font->getFontHeight();
+ FXint y = pos_y + margintop + line*h;
+ FXint x = 0;
+ FXint w = 0;
+ FXuint curstyle;
+ FXuint newstyle;
+ FXint numberSmiley = 0; //smiley number for one drawIcon
+ FXint cw, sp, ep, sc, ec;
 FXint wrapstart,wrapend;
 wrapIndex(index, wrap, wrapstart, wrapend);
 
@@ -985,11 +985,11 @@
 // Repaint lines of text
 void dxText::drawContents(FXDCWindow& dc, FXint x, FXint y, FXint w, FXint h) const
 {
- register FXint hh=font->getFontHeight();
- register FXint yy=pos_y+margintop;
- register FXint tl=(y-yy)/hh;
- register FXint bl=(y+h-yy)/hh;
- register FXint ln;
+ FXint hh=font->getFontHeight();
+ FXint yy=pos_y+margintop;
+ FXint tl=(y-yy)/hh;
+ FXint bl=(y+h-yy)/hh;
+ FXint ln;
 if(tl<0) tl=0;
 if(bl>=nlines) bl=nlines-1;
 FXTRACE((1,"tl=%d bl=%d\n",tl,bl));
@@ -1029,8 +1029,8 @@
 // Determine style
 FXuint dxText::styleOf(FXint line, FXint pos) const
 {
- register FXuint s=0;
- register FXchar ch;
+ FXuint s=0;
+ FXchar ch;
 // Line after contents
 if(line>contents.no()-1) return s;
 // Blank part of line
@@ -1060,13 +1060,13 @@
 FXuint dxText::styleOfXY(FXint x, FXint y) const
 {
 if(!contents.no()) return 0;
- register FXint line=(y-pos_y-margintop)/font->getFontHeight();
+ FXint line=(y-pos_y-margintop)/font->getFontHeight();
 if(line>=nlines) return 0;
- register FXint index, pos, sp, sc, i;
- register FXint cw=marginleft;
- register FXint n=0;
- register FXint wrap=0;
- register FXuint style;
+ FXint index, pos, sp, sc, i;
+ FXint cw=marginleft;
+ FXint n=0;

dxirc-1.30.0.tar.xz/fox/dxtextfield.cpp -> dxirc-1.40.1.tar.xz/fox/dxtextfield.cpp Changed

@@ -716,13 +716,13 @@
 
 // Automatic scroll
 long dxTextField::onAutoScroll(FXObject*,FXSelector,void* ptr){
- register FXEvent* event=(FXEvent*)ptr;
+ FXEvent* event=(FXEvent*)ptr;
 if(flags&FLAG_PRESSED){
- register FXint newcursor=cursor;
- register FXint ll=border+padleft;
- register FXint rr=width-border-padright;
- register FXint ww=rr-ll;
- register FXint tw;
+ FXint newcursor=cursor;
+ FXint ll=border+padleft;
+ FXint rr=width-border-padright;
+ FXint ww=rr-ll;
+ FXint tw;
 
 if(options&TEXTFIELD_PASSWD)
 tw=font->getTextWidth("*",1)*contents.count();
@@ -949,10 +949,10 @@
 
 // Fix scroll amount after text changes or widget resize
 void dxTextField::layout(){
- register FXint rr=width-border-padright;
- register FXint ll=border+padleft;
- register FXint ww=rr-ll;
- register FXint tw;
+ FXint rr=width-border-padright;
+ FXint ll=border+padleft;
+ FXint ww=rr-ll;
+ FXint tw;
 if(!xid) return;
 
 // Figure text width
@@ -990,11 +990,11 @@
 
 // Force position to become fully visible; we assume layout is correct
 void dxTextField::makePositionVisible(FXint pos){
- register FXint rr=width-border-padright;
- register FXint ll=border+padleft;
- register FXint ww=rr-ll;
- register FXint oldshift=shift;
- register FXint xx;
+ FXint rr=width-border-padright;
+ FXint ll=border+padleft;
+ FXint ww=rr-ll;
+ FXint oldshift=shift;
+ FXint xx;
 if(!xid) return;
 pos=contents.validate(FXCLAMP(0,pos,contents.length()));
 if(options&JUSTIFY_RIGHT){
@@ -1029,10 +1029,10 @@
 
 // Find index from coord
 FXint dxTextField::index(FXint x) const {
- register FXint rr=width-border-padright;
- register FXint ll=border+padleft;
- register FXint mm=(ll+rr)/2;
- register FXint pos,xx,cw;
+ FXint rr=width-border-padright;
+ FXint ll=border+padleft;
+ FXint mm=(ll+rr)/2;
+ FXint pos,xx,cw;
 if(options&TEXTFIELD_PASSWD){
 cw=font->getTextWidth("*",1);
 if(options&JUSTIFY_RIGHT) xx=rr-cw*contents.count();
@@ -1060,10 +1060,10 @@
 
 // Find coordinate from index
 FXint dxTextField::coord(FXint i) const {
- register FXint rr=width-border-padright;
- register FXint ll=border+padleft;
- register FXint mm=(ll+rr)/2;
- register FXint pos;
+ FXint rr=width-border-padright;
+ FXint ll=border+padleft;
+ FXint mm=(ll+rr)/2;
+ FXint pos;
 FXASSERT(0<=i && i<=contents.length());
 if(options&JUSTIFY_RIGHT){
 if(options&TEXTFIELD_PASSWD){
@@ -1096,7 +1096,7 @@
 // Return TRUE if position is visible
 FXbool dxTextField::isPosVisible(FXint pos) const {
 if(0<=pos && pos<=contents.length()){
- register FXint x=coord(contents.validate(pos));
+ FXint x=coord(contents.validate(pos));
 return border+padleft<=x && x<=width-border-padright;
 }
 return FALSE;
@@ -1118,8 +1118,8 @@
 
 // Draw text fragment in password mode
 void dxTextField::drawPWDTextFragment(FXDCWindow& dc,FXint x,FXint y,FXint fm,FXint to){
- register FXint cw=font->getTextWidth("*",1);
- register FXint i;
+ FXint cw=font->getTextWidth("*",1);
+ FXint i;
 y+=font->getFontAscent();
 x+=cw*contents.index(fm);
 for(i=fm; i<to; i=contents.inc(i),x+=cw){ dc.drawText(x,y,"*",1); }
@@ -1128,11 +1128,11 @@
 
 // Draw range of text
 void dxTextField::drawTextRange(FXDCWindow& dc,FXint fm,FXint to){
- register FXint sx,ex,xx,yy,cw,hh,ww,si,ei,lx,rx,t,i;
- register FXint rr=width-border-padright;
- register FXint ll=border+padleft;
- register FXint mm=(ll+rr)/2;
- register FXuint curstyle,newstyle;
+ FXint sx,ex,xx,yy,cw,hh,ww,si,ei,lx,rx,t,i;
+ FXint rr=width-border-padright;
+ FXint ll=border+padleft;
+ FXint mm=(ll+rr)/2;
+ FXuint curstyle,newstyle;
 
 if(to<=fm) return;
 
@@ -1352,10 +1352,10 @@
 // Draw spellline
 void dxTextField::drawSpellLine(FXDCWindow& dc, FXint x, FXint y, FXint w){
 dc.setForeground(spellColor);
- register FXint step=2;
- register FXint xx=x;
- register FXint yy=y;
- register FXbool down=FALSE;
+ FXint step=2;
+ FXint xx=x;
+ FXint yy=y;
+ FXbool down=FALSE;
 while(xx+step<=x+w){
 #ifdef WIN32
 if(down) {dc.drawLine(xx,yy,xx+step,yy);yy--;down=FALSE;}
@@ -1447,7 +1447,7 @@
 
 // Find end of previous word
 FXint dxTextField::leftWord(FXint pos) const {
- register FXint pp=pos,p;
+ FXint pp=pos,p;
 
 // Ensure input is valid
 FXASSERT(0<=pos && pos<=contents.length());
@@ -1467,7 +1467,7 @@
 
 // Find begin of next word
 FXint dxTextField::rightWord(FXint pos) const {
- register FXint pp=pos;
+ FXint pp=pos;
 
 // Ensure input is valid
 FXASSERT(0<=pos && pos<=contents.length());
@@ -1487,7 +1487,7 @@
 
 // Find begin of a word
 FXint dxTextField::wordStart(FXint pos) const {
- register FXint p;
+ FXint p;
 FXASSERT(0<=pos && pos<=contents.length());
 if(pos==contents.length() || Unicode::isSpace(contents.wc(pos))){
 while(0<=(p=contents.dec(pos)) && Unicode::isSpace(contents.wc(p))) pos=p;
@@ -1849,7 +1849,7 @@
 
 // Verify tentative input.
 long dxTextField::onVerify(FXObject*,FXSelector,void* ptr){
- register FXchar *p=(FXchar*)ptr;
+ FXchar *p=(FXchar*)ptr;
 
 // Limit number of columns
 if(options&TEXTFIELD_LIMITED){
@@ -2510,9 +2510,9 @@
 if(topic)
 {
 tip = contents;
- register FXint lw,cw;
- register FXint sp, sc;
- register FXint s=-1;
+ FXint lw,cw;
+ FXint sp, sc;
+ FXint s=-1;
 lw=0;
 for (sp = sc = 0; sp < tip.length(); sp = tip.inc(sp), sc++)
 {

dxirc-1.30.0.tar.xz/fox/dxutils.cpp -> dxirc-1.40.1.tar.xz/fox/dxutils.cpp Changed

@@ -26,6 +26,7 @@
 #include <ctime>
 #include <shellapi.h>
 #endif
+#include <random>
 #include "config.h"
 #include "i18n.h"
 #include "dxutils.h"
@@ -38,6 +39,7 @@
 #define preferences dxirc::instance()->getPreferences()
 
 #ifdef HAVE_ENCHANT
+static enchant::Broker *ebroker;
 typedef std::pair<Checkers*,dxStringArray*> CheckerPair;
 void enumerateDicts (const char * const lang_tag,
 const char * const /*provider_name*/,
@@ -71,6 +73,13 @@
 if(!FXPath::search(FXSystem::getExecPath(), "notify-send").empty())
 m_haveNotify = true;
 #endif // WIN32
+#ifdef HAVE_ENCHANT
+#ifdef HAVE_ENCHANT2
+ ebroker = new enchant::Broker();
+#else
+ ebroker = enchant::Broker::instance();
+#endif //HAVE_ENCHANT2
+#endif //HAVE_ENCHANT
 }
 
 dxutils::~dxutils()
@@ -82,6 +91,9 @@
 delete (*it).second;
 }
 #endif
+#ifdef HAVE_ENCHANT2
+ delete ebroker;
+#endif
 }
 
 dxutils &dxutils::instance()
@@ -160,7 +172,7 @@
 m_dcccommands.append(m_scriptCommandsi.name);
 }
 FXString v;
- register FXint i,j,h;
+ FXint i,j,h;
 for(h=1; h<=m_commands.no()/9; h=3*h+1);
 for(; h > 0; h /= 3)
 {
@@ -1186,11 +1198,14 @@
 FXString dxutils::encrypt(const FXString &text)
 {
 FXString result = "";
+ const std::string CHARACTERS = "0123456789!@#$%^&*ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+ std::random_device random_device;
+ std::mt19937 generator(random_device());
+ std::uniform_int_distribution<> distribution(0, CHARACTERS.size() - 1);
 for(FXint i=0; i<text.count(); i++)
 {
 result += texti;
- FXint r = rand()%127;
- result += FXchar(r<33 ? r+33 : r);
+ result += CHARACTERSdistribution(generator);
 }
 return result;
 }
@@ -1375,11 +1390,11 @@
 void dxutils::loadAvailableSpellLangs()
 {
 CheckerPair chpair(&m_checkers, &m_availableSpellLangs);
- enchant::Broker::instance()->list_dicts(enumerateDicts, &chpair);
+ ebroker->list_dicts(enumerateDicts, &chpair);
 if(m_availableSpellLangs.no())
 {
 FXString v;
- register FXint i,j,h;
+ FXint i,j,h;
 for(h=1; h<=m_availableSpellLangs.no()/9; h=3*h+1);
 for(; h > 0; h /= 3)
 {
@@ -1402,9 +1417,9 @@
 return;
 try
 {
- m_checkersm_availableSpellLangsi = enchant::Broker::instance()->request_dict(m_availableSpellLangsi.text());
+ m_checkersm_availableSpellLangsi = ebroker->request_dict(m_availableSpellLangsi.text());
 }
- catch(enchant::Exception &e)
+ catch(enchant::Exception &/*e*/)
 {
 }
 }
@@ -1694,7 +1709,7 @@
 void dxutils::sortStringArray(dxStringArray &array)
 {
 FXString v;
- register FXint i,j,h;
+ FXint i,j,h;
 for(h=1; h<=array.no()/9; h=3*h+1);
 for(; h > 0; h /= 3)
 {
@@ -1924,8 +1939,8 @@
 // Parse accelerator from string
 FXHotKey dxutils::parseAccel(const FXString& string)
 {
- register FXuint code=0,mods=0;
- register FXint pos=0;
+ FXuint code=0,mods=0;
+ FXint pos=0;
 // Parse leading space
 while(pos<string.length() && Ascii::isSpace(stringpos))
 pos++;
@@ -2059,6 +2074,10 @@
 {
 color = TRUE;
 }
+ else if(texti == '\004') //hex color
+ {
+ color = TRUE;
+ }
 else if(color && isdigit(texti) && numbers < 2)
 {
 numbers++;
@@ -2079,7 +2098,7 @@
 }
 
 //Return color for ircolor code
-FXColor dxutils::getIrcColor(FXint code)
+FXColor dxutils::getIrcColor(FXint code, bool foreground)
 {
 switch(code){
 case 0:
@@ -2114,8 +2133,174 @@
 return FXRGB(128,128,128); //grey
 case 15:
 return FXRGB(192,192,192); //lightgrey
+ case 16:
+ return fxcolorfromname("#470000");
+ case 17:
+ return fxcolorfromname("#472100");
+ case 18:
+ return fxcolorfromname("#474700");
+ case 19:
+ return fxcolorfromname("#324700");
+ case 20:
+ return fxcolorfromname("#004700");
+ case 21:
+ return fxcolorfromname("#00472c");
+ case 22:
+ return fxcolorfromname("#004747");
+ case 23:
+ return fxcolorfromname("#002747");
+ case 24:
+ return fxcolorfromname("#000047");
+ case 25:
+ return fxcolorfromname("#2e0047");
+ case 26:
+ return fxcolorfromname("#470047");
+ case 27:
+ return fxcolorfromname("#47002a");
+ case 28:
+ return fxcolorfromname("#740000");
+ case 29:
+ return fxcolorfromname("#743a00");
+ case 30:
+ return fxcolorfromname("#747400");
+ case 31:
+ return fxcolorfromname("#517400");
+ case 32:
+ return fxcolorfromname("#007400");
+ case 33:
+ return fxcolorfromname("#007449");
+ case 34:
+ return fxcolorfromname("#007474");
+ case 35:
+ return fxcolorfromname("#004074");
+ case 36:
+ return fxcolorfromname("#000074");
+ case 37:
+ return fxcolorfromname("#4b0074");
+ case 38:
+ return fxcolorfromname("#740074");
+ case 39:
+ return fxcolorfromname("#740045");
+ case 40:
+ return fxcolorfromname("#b50000");
+ case 41:
+ return fxcolorfromname("#b56300");
+ case 42:
+ return fxcolorfromname("#b5b500");
+ case 43:
+ return fxcolorfromname("#7db500");
+ case 44:
+ return fxcolorfromname("#00b500");
+ case 45:
+ return fxcolorfromname("#00b571");
+ case 46:
+ return fxcolorfromname("#00b5b5");
+ case 47:
+ return fxcolorfromname("#0063b5");

dxirc-1.30.0.tar.xz/fox/dxutils.h -> dxirc-1.40.1.tar.xz/fox/dxutils.h Changed

dxirc-1.30.0.tar.xz/fox/engine/ircengine.cpp -> dxirc-1.40.1.tar.xz/fox/engine/ircengine.cpp Changed

@@ -35,7 +35,8 @@
     FXMAPFUNC(SOCKET_ERR,           IrcEngine_DXSOCKET, IrcEngine::onSocketError),
     FXMAPFUNC(SEL_TIMEOUT,          IrcEngine_RTIME,    IrcEngine::onReconnectTimeout),
     FXMAPFUNC(SEL_TIMEOUT,          IrcEngine_TATIME,   IrcEngine::onTryAgainTimeout),
-    FXMAPFUNC(SEL_TIMEOUT,          IrcEngine_PTIME,    IrcEngine::onPingTimeout)
+    FXMAPFUNC(SEL_TIMEOUT,          IrcEngine_PTIME,    IrcEngine::onPingTimeout),
+    FXMAPFUNC(SEL_TIMEOUT,          IrcEngine_JDTIME,   IrcEngine::onJoinDelayTimeout)
 };
 
 FXIMPLEMENT(IrcEngine, FXObject, IrcEngineMap, ARRAYNUMBER(IrcEngineMap))
@@ -83,7 +84,7 @@
 
 void IrcEngine::setUserName(const FXString& user)
 {
-    //needed for freenode
+    //needed for freenode maybe others
     m_userName = dxutils::removeNonalphanumeric(user);
 }
 
@@ -152,6 +153,16 @@
     return 1;
 }
 
+long IrcEngine::onJoinDelayTimeout(FXObject *, FXSelector, void *)
+{
+    if(!m_startChannels.empty())
+    {
+        sendJoin(m_startChannels);
+        m_startChannels.clear();
+    }
+    return 1;
+}
+
 long IrcEngine::onSocketCanRead(FXObject *, FXSelector, void *)
 {
     if(m_connected)
@@ -678,8 +689,15 @@
             m_endmotd = TRUE;
             if(!m_startChannels.empty())
             {
-                sendJoin(m_startChannels);
-                m_startChannels.clear();
+                if(preferences.m_joinDelay)
+                {
+                    m_application->addTimeout(this, IrcEngine_JDTIME, preferences.m_joinDelay*1000);
+                }
+                else
+                {
+                    sendJoin(m_startChannels);
+                    m_startChannels.clear();
+                }
             }
             if(!m_startCommands.empty())
             {
@@ -762,8 +780,15 @@
             m_endmotd = TRUE;
             if(!m_startChannels.empty())
             {
-                sendJoin(m_startChannels);
-                m_startChannels.clear();
+                if(preferences.m_joinDelay)
+                {
+                    m_application->addTimeout(this, IrcEngine_JDTIME, preferences.m_joinDelay*1000);
+                }
+                else
+                {
+                    sendJoin(m_startChannels);
+                    m_startChannels.clear();
+                }
             }
             if(!m_startCommands.empty())
             {

dxirc-1.30.0.tar.xz/fox/engine/ircengine.h -> dxirc-1.40.1.tar.xz/fox/engine/ircengine.h Changed

dxirc-1.30.0.tar.xz/fox/fxext.cpp -> dxirc-1.40.1.tar.xz/fox/fxext.cpp Changed

dxirc-1.30.0.tar.xz/fox/preferences.cpp -> dxirc-1.40.1.tar.xz/fox/preferences.cpp Changed

@@ -30,6 +30,7 @@
     m_reconnect(FALSE),
     m_numberAttempt(1),
     m_delayAttempt(20),
+    m_joinDelay(2),
     m_maxAway(200),
 #ifdef HAVE_TRAY
     m_useTray(TRUE),
@@ -129,6 +130,7 @@
     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_joinDelay = set.readIntEntry("SETTINGS", "joinDelay", m_joinDelay);
     m_maxAway = set.readIntEntry("SETTINGS", "maxAway", m_maxAway);
     m_useTray = set.readBoolEntry("SETTINGS", "tray", m_useTray);
     m_closeToTray = set.readBoolEntry("SETTINGS", "closeToTray", m_closeToTray);
@@ -327,6 +329,7 @@
     set.writeBoolEntry("SETTINGS", "reconnect", m_reconnect);
     set.writeIntEntry("SETTINGS", "numberAttempt", m_numberAttempt);
     set.writeIntEntry("SETTINGS", "delayAttempt", m_delayAttempt);
+    set.writeIntEntry("SETTINGS", "joinDelay", m_joinDelay);
     set.writeIntEntry("SETTINGS", "maxAway", m_maxAway);
     set.writeBoolEntry("SETTINGS", "tray", m_useTray);
     set.writeBoolEntry("SETTINGS", "closeToTray", m_closeToTray);

dxirc-1.30.0.tar.xz/fox/preferences.h -> dxirc-1.40.1.tar.xz/fox/preferences.h Changed

dxirc-1.30.0.tar.xz/fox/tabitems/dcctabitem.cpp -> dxirc-1.40.1.tar.xz/fox/tabitems/dcctabitem.cpp Changed

@@ -80,7 +80,7 @@
 m_commandframe = new FXHorizontalFrame(m_mainframe, LAYOUT_FILL_X, 0,0,0,0, 0,0,0,0);
 m_commandline = new dxTextField(m_commandframe, 25, this, DccTabItem_COMMANDLINE, TEXTFIELD_ENTER_ONLY|FRAME_SUNKEN|JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_BOTTOM, 0, 0, 0, 0, 1, 1, 1, 1);
 if(preferences.m_sameCmd) m_commandline->setFont(font);
- m_spellLangs = new FXComboBox(m_commandframe, 6, this, DccTabItem_SPELL, COMBOBOX_STATIC);
+ m_spellLangs = new FXComboBox(m_commandframe, 6, this, DccTabItem_SPELL, FRAME_SUNKEN|COMBOBOX_STATIC);
 m_spellLangs->setTipText(_("Spellchecking language list"));
 m_spellLangs->hide();
 if(preferences.m_sameCmd) m_spellLangs->setFont(font);
@@ -714,12 +714,12 @@
 {
 if(FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+2,6)))
 {
- foreColor = FXRGB(FXIntVal(txt.mid(i+2,2),16),FXIntVal(txt.mid(i+4,2),16),FXIntVal(txt.mid(i+6,2),16));
+ foreColor = fxcolorfromname(txt.mid(i+1,7).text());
 colorLength +=7;
 }
 if(i+8 < length && txti+8 == ',' && FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+10,6)))
 {
- backColor = FXRGB(FXIntVal(txt.mid(i+10,2),16),FXIntVal(txt.mid(i+12,2),16),FXIntVal(txt.mid(i+14,2),16));
+ backColor = fxcolorfromname(txt.mid(i+9,7).text());
 colorLength +=8;
 }
 }
@@ -742,7 +742,7 @@
 }
 }
 if(code!=-1)
- foreColor = dxutils::getIrcColor(code%16);
+ foreColor = dxutils::getIrcColor(code, true);
 }
 if(i+colorLength+1 < length && txti+colorLength+1 == ',')
 {
@@ -761,7 +761,7 @@
 }
 }
 if(code!=-1)
- backColor = dxutils::getIrcColor(code%16);
+ backColor = dxutils::getIrcColor(code, false);
 }
 }
 lastStyle = hiliteStyleExist(foreColor, backColor, style);
@@ -777,6 +777,47 @@
 };
 i +=colorLength;
 }
+ else if(txti == '\004') // hex color
+ {
+ if(!normalText.empty())
+ {
+ m_text->appendStyledText(normalText, lastStyle);
+ normalText.clear();
+ }
+ FXuint style=0;
+ if(bold && under) style = FXText::STYLE_BOLD|FXText::STYLE_UNDERLINE;
+ else if(bold && !under) style = FXText::STYLE_BOLD;
+ else if(!bold && under) style = FXText::STYLE_UNDERLINE;
+ FXint colorLength = 0;
+ foreColor = preferences.m_colors.text;
+ backColor = preferences.m_colors.back;
+ if(FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+1,6)))
+ {
+ FXString color = "#";
+ color.append(txt.mid(i+1,6));
+ foreColor = fxcolorfromname(color.text());
+ colorLength +=6;
+ }
+ if(i+7 < length && txti+7 == ',' && FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+8,6)))
+ {
+ FXString color = "#";
+ color.append(txt.mid(i+8,6));
+ backColor = fxcolorfromname(color.text());
+ colorLength +=7;
+ }
+ lastStyle = hiliteStyleExist(foreColor, backColor, style);
+ if(lastStyle == -1)
+ {
+ //dxText has available max. 255 styles
+ if(m_textStyleList.no()<256)
+ {
+ createHiliteStyle(foreColor, backColor, style);
+ lastStyle = m_textStyleList.no();
+ }
+ else lastStyle = 0;
+ };
+ i +=colorLength;
+ }
 else if(txti == '\017') //reset
 {
 if(!normalText.empty())

dxirc-1.30.0.tar.xz/fox/tabitems/dxtabbook.cpp -> dxirc-1.40.1.tar.xz/fox/tabitems/dxtabbook.cpp Changed

@@ -63,8 +63,8 @@
 
 long dxTabBook::onHidden(FXObject*, FXSelector, void*)
 {
-    register FXint i;
-    register FXWindow *tab;
+    FXint i;
+    FXWindow *tab;
     FXMenuPane popup(m_buttonHidden->getParent());
     for(tab = getFirst(), i = 0; tab && tab->getNext(); tab = tab->getNext()->getNext(), i++)
     {
@@ -109,14 +109,14 @@
 
 // Recalculate layout
 void dxTabBook::layout() {
-    register FXint i, xx, yy, x, y, w, h, px, py, pw, ph, maxtabw, maxtabh;
-    register FXint currentWidth, currentHeight, tabsWidth, tabsHeight;
-    register FXint previoustabsWidth, previoustabsHeight;
-    register FXWindow *raisepane = NULL;
-    register FXWindow *raisetab = NULL;
-    register FXWindow *pane, *tab;
-    register FXuint hints;
-    register FXbool hidden = FALSE;
+    FXint i, xx, yy, x, y, w, h, px, py, pw, ph, maxtabw, maxtabh;
+    FXint currentWidth, currentHeight, tabsWidth, tabsHeight;
+    FXint previoustabsWidth, previoustabsHeight;
+    FXWindow *raisepane = NULL;
+    FXWindow *raisetab = NULL;
+    FXWindow *pane, *tab;
+    FXuint hints;
+    FXbool hidden = FALSE;
 
     // Measure tabs again
     maxtabw = maxtabh = currentWidth = currentHeight = tabsWidth = tabsHeight

dxirc-1.30.0.tar.xz/fox/tabitems/irctabitem.cpp -> dxirc-1.40.1.tar.xz/fox/tabitems/irctabitem.cpp Changed

@@ -175,8 +175,8 @@
 // Draw item
 void NickListItem::draw(const FXList* list, FXDC& dc, FXint xx, FXint yy, FXint ww, FXint hh)
 {
- register FXFont *font=list->getFont();
- register FXint ih=0,th=0;
+ FXFont *font=list->getFont();
+ FXint ih=0,th=0;
 if(icon) ih=icon->getHeight();
 if(!label.empty()) th=font->getFontHeight();
 dc.setForeground(list->getBackColor()); // FIXME maybe paint background in onPaint?
@@ -221,8 +221,8 @@
 // Get width of item
 FXint NickListItem::getWidth(const FXList* list) const
 {
- register FXFont *font=list->getFont();
- register FXint w=0;
+ FXFont *font=list->getFont();
+ FXint w=0;
 if(icon)
 {
 w=icon->getWidth();
@@ -384,7 +384,7 @@
 m_commandframe = new FXHorizontalFrame(m_mainframe, LAYOUT_FILL_X, 0,0,0,0, 0,0,0,0);
 m_commandline = new dxTextField(m_commandframe, 25, this, IrcTabItem_COMMANDLINE, TEXTFIELD_ENTER_ONLY|FRAME_SUNKEN|JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_BOTTOM, 0, 0, 0, 0, 1, 1, 1, 1);
 if(preferences.m_sameCmd) m_commandline->setFont(font);
- m_spellLangs = new FXComboBox(m_commandframe, 6, this, IrcTabItem_SPELL, COMBOBOX_STATIC);
+ m_spellLangs = new FXComboBox(m_commandframe, 6, this, IrcTabItem_SPELL, FRAME_SUNKEN|COMBOBOX_STATIC);
 m_spellLangs->setTipText(_("Spellchecking language list"));
 m_spellLangs->hide();
 if(preferences.m_sameCmd) m_spellLangs->setFont(font);
@@ -1075,12 +1075,12 @@
 {
 if(FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+2,6)))
 {
- foreColor = FXRGB(FXIntVal(txt.mid(i+2,2),16),FXIntVal(txt.mid(i+4,2),16),FXIntVal(txt.mid(i+6,2),16));
+ foreColor = fxcolorfromname(txt.mid(i+1,7).text());
 colorLength +=7;
 }
 if(i+8 < length && txti+8 == ',' && FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+10,6)))
 {
- backColor = FXRGB(FXIntVal(txt.mid(i+10,2),16),FXIntVal(txt.mid(i+12,2),16),FXIntVal(txt.mid(i+14,2),16));
+ backColor = fxcolorfromname(txt.mid(i+9,7).text());
 colorLength +=8;
 }
 }
@@ -1103,7 +1103,7 @@
 }
 }
 if(code!=-1)
- foreColor = dxutils::getIrcColor(code%16);
+ foreColor = dxutils::getIrcColor(code, true);
 }
 if(i+colorLength+1 < length && txti+colorLength+1 == ',')
 {
@@ -1122,7 +1122,7 @@
 }
 }
 if(code!=-1)
- backColor = dxutils::getIrcColor(code%16);
+ backColor = dxutils::getIrcColor(code, false);
 }
 }
 lastStyle = hiliteStyleExist(foreColor, backColor, style);
@@ -1138,6 +1138,47 @@
 };
 i +=colorLength;
 }
+ else if(txti == '\004') // hex color
+ {
+ if(!normalText.empty())
+ {
+ m_text->appendStyledText(normalText, lastStyle);
+ normalText.clear();
+ }
+ FXuint style=0;
+ if(bold && under) style = FXText::STYLE_BOLD|FXText::STYLE_UNDERLINE;
+ else if(bold && !under) style = FXText::STYLE_BOLD;
+ else if(!bold && under) style = FXText::STYLE_UNDERLINE;
+ FXint colorLength = 0;
+ foreColor = preferences.m_colors.text;
+ backColor = preferences.m_colors.back;
+ if(FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+1,6)))
+ {
+ FXString color = "#";
+ color.append(txt.mid(i+1,6));
+ foreColor = fxcolorfromname(color.text());
+ colorLength +=6;
+ }
+ if(i+7 < length && txti+7 == ',' && FXRex("^\\h\\h\\h\\h\\h\\h+$").match(txt.mid(i+8,6)))
+ {
+ FXString color = "#";
+ color.append(txt.mid(i+8,6));
+ backColor = fxcolorfromname(color.text());
+ colorLength +=7;
+ }
+ lastStyle = hiliteStyleExist(foreColor, backColor, style);
+ if(lastStyle == -1)
+ {
+ //dxText has available max. 255 styles
+ if(m_textStyleList.no()<256)
+ {
+ createHiliteStyle(foreColor, backColor, style);
+ lastStyle = m_textStyleList.no();
+ }
+ else lastStyle = 0;
+ };
+ i +=colorLength;
+ }
 else if(txti == '\017') //reset
 {
 if(!normalText.empty())
@@ -3546,9 +3587,9 @@
 
 dxStringArray IrcTabItem::cutText(FXString text, FXint len)
 {
- register FXint previous = 0;
- register FXint s = -1;
- register FXint lw = 0;
+ FXint previous = 0;
+ FXint s = -1;
+ FXint lw = 0;
 dxStringArray texts;
 for(FXint i = 0; i<text.length(); i++)
 {

dxirc-1.30.0.tar.xz/mac/create_dmg -> dxirc-1.40.1.tar.xz/mac/create_dmg Changed

dxirc-1.30.0.tar.xz/qt/CMakeLists.txt -> dxirc-1.40.1.tar.xz/qt/CMakeLists.txt Changed

@@ -1,16 +1,8 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW)
-    if(POLICY CMP0020)
-        cmake_policy(SET CMP0020 OLD)
-    endif(POLICY CMP0020)
-    if(POLICY CMP0048)
-        cmake_policy(SET CMP0048 OLD)
-    endif(POLICY CMP0048)
-endif(COMMAND cmake_policy)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.7)
 project(dxirc-qt)
+set(PROJECT_VERSION "1.40.1")
 
-option(QT5 "Compile with Qt 5" TRUE)
+option(QT6 "Compile with Qt6" FALSE)
 
 if(UNIX)
     if(BSD)
@@ -33,24 +25,44 @@
     list(APPEND DXIRCQT_LIBS ${LUA_LIBRARIES})
 endif(HAVE_LUA)
 
+set(HAVE_ENCHANT FALSE)
+set(HAVE_ENCHANT2 FALSE)
 if(NOT APPLE)
-    if(HAVE_ENCHANT)
+    if(USE_ENCHANT)
         if(PKG_CONFIG_FOUND)
-            pkg_check_modules(ENCHANT enchant)
+            pkg_check_modules(ENCHANT enchant-2)
             list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
             list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
+            set(HAVE_ENCHANT TRUE)
+            if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+                set(HAVE_ENCHANT2 TRUE)
+            endif()
+            if(NOT ENCHANT_FOUND)
+                pkg_check_modules(ENCHANT enchant)
+                list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARIES})
+                list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIRS})
+                set(HAVE_ENCHANT TRUE)
+                if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+                    set(HAVE_ENCHANT2 TRUE)
+                endif()
+            endif()
         endif(PKG_CONFIG_FOUND)
         if(NOT ENCHANT_FOUND)
             set(ENCHANT_INCLUDE_DIR "" CACHE PATH "Path to enchant include dir")
             set(ENCHANT_LIBRARY "" CACHE FILEPATH "Filepath to enchant library")
+            set(ENCHANT_VERSION "" CACHE STRING "Enchant verison")
             if(ENCHANT_INCLUDE_DIR)
                 list(APPEND DXIRCQT_LIBS ${ENCHANT_LIBRARY})
                 list(APPEND DXIRCQT_INCLUDE_DIRS ${ENCHANT_INCLUDE_DIR})
+                set(HAVE_ENCHANT TRUE)
+                if(${ENCHANT_VERSION} VERSION_GREATER "1.6")
+                    set(HAVE_ENCHANT2 TRUE)
+                endif()
             else()
                 set(HAVE_ENCHANT FALSE)
             endif()
         endif()
-    endif(HAVE_ENCHANT)
+    endif(USE_ENCHANT)
 endif(NOT APPLE)
 
 configure_file(config.h.cmake
@@ -131,54 +143,58 @@
 dxirc.qrc
 )
 
-if(QT5)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-find_package(Qt5Widgets)
-add_definitions(${Qt5Widgets_DEFINITIONS})
-list(APPEND DXIRCQT_LIBS ${Qt5Widgets_LIBRARIES})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-find_package(Qt5Network)
-add_definitions(${Qt5Network_DEFINITIONS})
-list(APPEND DXIRCQT_LIBS ${Qt5Network_LIBRARIES})
-find_package(Qt5Multimedia)
-add_definitions(${Qt5Multimedia_DEFINITIONS})
-list(APPEND DXIRCQT_LIBS ${Qt5Multimedia_LIBRARIES})
-include_directories(
-${Qt5Widgets_INCLUDE_DIRS}
-${Qt5Network_INCLUDE_DIRS}
-${Qt5Multimedia_INCLUDE_DIRS}
-${CMAKE_CURRENT_BINARY_DIR}
-${DXIRCQT_INCLUDE_DIRS}
- .
-)
-qt5_add_resources(RESOURCES_ADD ${RESOURCES})
-else(QT5)
-set(QT_MIN_VERSION "4.8.0")
-find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
-include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-include_directories(
-${QT_INCLUDE_DIR}
-${CMAKE_CURRENT_BINARY_DIR}
-${DXIRCQT_INCLUDE_DIRS}
- .
-)
-list(APPEND DXIRCQT_LIBS ${QT_LIBRARIES})
-qt4_add_resources(RESOURCES_ADD ${RESOURCES})
-qt4_wrap_cpp(MOC_SRCS ${HEADERS})
-endif(QT5)
+if(QT6)
+    find_package(Qt6Widgets)
+    add_definitions(${Qt6Widgets_DEFINITIONS})
+    list(APPEND DXIRCQT_LIBS ${Qt6Widgets_LIBRARIES})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt6Widgets_EXECUTABLE_COMPILE_FLAGS}")
+    find_package(Qt6Network)
+    add_definitions(${Qt6Network_DEFINITIONS})
+    list(APPEND DXIRCQT_LIBS ${Qt6Network_LIBRARIES})
+    include_directories(
+    ${Qt6Widgets_INCLUDE_DIRS}
+    ${Qt6Network_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${DXIRCQT_INCLUDE_DIRS}
+     .
+    )
+    qt6_add_resources(RESOURCES_ADD ${RESOURCES})
+else(QT6)
+    find_package(Qt5Widgets)
+    add_definitions(${Qt5Widgets_DEFINITIONS})
+    list(APPEND DXIRCQT_LIBS ${Qt5Widgets_LIBRARIES})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+    find_package(Qt5Network)
+    add_definitions(${Qt5Network_DEFINITIONS})
+    list(APPEND DXIRCQT_LIBS ${Qt5Network_LIBRARIES})
+    find_package(Qt5Multimedia)
+    add_definitions(${Qt5Multimedia_DEFINITIONS})
+    list(APPEND DXIRCQT_LIBS ${Qt5Multimedia_LIBRARIES})
+    include_directories(
+    ${Qt5Widgets_INCLUDE_DIRS}
+    ${Qt5Network_INCLUDE_DIRS}
+    ${Qt5Multimedia_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${DXIRCQT_INCLUDE_DIRS}
+     .
+    )
+    qt5_add_resources(RESOURCES_ADD ${RESOURCES})
+endif(QT6)
 
 if(APPLE)
     find_library(COCOA_LIBRARY Cocoa)
     if(ENABLE_OSX_BUNDLE)
         set(PROGNAME dxirc)
         set(MACOSX_BUNDLE_ICON_FILE dxirc.icns)
-        set(MACOSX_BUNDLE_SHORT_VERSION_STRING 1.30.0)
-        set(MACOSX_BUNDLE_VERSION 1.30.0)
-        set(MACOSX_BUNDLE_LONG_VERSION_STRING Version 1.30.0)
+        set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.dxirc.dxirc")
+        set(MACOSX_BUNDLE_SHORT_VERSION_STRING 1.40.1)
+        set(MACOSX_BUNDLE_VERSION 1.40.1)
+        set(MACOSX_BUNDLE_LONG_VERSION_STRING Version 1.40.1)
         set(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../data/icons/dxirc.icns)
         set(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/widgets/macspellcheck.mm)
+        set(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/notify/macnotify.mm)
         add_executable(dxirc MACOSX_BUNDLE ${SOURCES} ${MOC_SRCS} ${RESOURCES_ADD})
         target_link_libraries(dxirc ${DXIRCQT_LIBS} ${COCOA_LIBRARY})
         install(TARGETS dxirc DESTINATION bin)
@@ -213,6 +229,7 @@
     else()
         set(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../data/icons/dxirc.icns)
         set(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/widgets/macspellcheck.mm)
+        set(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/notify/macnotify.mm)
         add_executable(dxirc-qt ${SOURCES} ${MOC_SRCS} ${RESOURCES_ADD})
         target_link_libraries(dxirc-qt ${DXIRCQT_LIBS} ${COCOA_LIBRARY})
         install(TARGETS dxirc-qt DESTINATION bin)
@@ -252,5 +269,9 @@
 if(APPLE)
 message(STATUS "Build with spellchecking support:           ON")
 else()
+if(HAVE_ENCHANT)
+message(STATUS "Build with spellchecking support:           ${HAVE_ENCHANT}/${ENCHANT_VERSION}")
+else(HAVE_ENCHANT)
 message(STATUS "Build with spellchecking support:           ${HAVE_ENCHANT}")
+endif(HAVE_ENCHANT)
 endif(APPLE)

dxirc-1.30.0.tar.xz/qt/config.h.cmake -> dxirc-1.40.1.tar.xz/qt/config.h.cmake Changed

dxirc-1.30.0.tar.xz/qt/dialogs/aboutdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/aboutdialog.cpp Changed

@@ -20,13 +20,11 @@
 */
 
 #include <QtGui>
-#if(QT_VERSION > 0x050000)
 #include <QtWidgets>
-#endif
 #include <QApplication>
+#include <QSslSocket>
 #include "aboutdialog.h"
 #include "config.h"
-#include "dxutils.h"
 #include "i18n.h"
 #ifdef HAVE_LUA
 extern "C" {
@@ -47,14 +45,14 @@
 connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
 QVBoxLayout *mainLayout = new QVBoxLayout;
 QLabel *link = new QLabel;
- link->setText("<a href=\"http://dxirc.org\">http://dxirc.org</a>");
+ link->setText("<a href=\"https://dxirc.org\">https://dxirc.org</a>");
 link->setAlignment(Qt::AlignCenter);
 link->setOpenExternalLinks(true);
 QLabel *fam = new QLabel;
 fam->setText(_("Uses <a href=\"http://www.famfamfam.com/lab/icons/\">famfamfam icons</a>"));
 fam->setOpenExternalLinks(true);
 QLabel *license = new QLabel;
- license->setText(_("Released under the <a href=\"http://www.gnu.org/licenses/gpl.html\">GPL 3</a> license"));
+ license->setText(_("Released under the <a href=\"https://www.gnu.org/licenses/gpl.html\">GPL 3</a> license"));
 license->setOpenExternalLinks(true);
 mainLayout->addWidget(icon);
 mainLayout->addWidget(name);
@@ -64,6 +62,9 @@
 #ifdef HAVE_LUA
 mainLayout->addWidget(new QLabel(_("Built with %1").arg(LUA_RELEASE)));
 #endif
+#ifndef QT_NO_SSL
+ mainLayout->addWidget(new QLabel(_("Uses %1").arg(QSslSocket::sslLibraryVersionString())));
+#endif
 mainLayout->addWidget(fam);
 mainLayout->addWidget(link);
 mainLayout->addWidget(buttons);

dxirc-1.30.0.tar.xz/qt/dialogs/aliasdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/aliasdialog.cpp Changed

@@ -47,10 +47,8 @@
 }
 
 AliasDialog::AliasDialog(QWidget *parent)
-: QDialog(parent)
+: QDialog(parent), m_aliases(dxUtils.getAliases())
 {
- m_aliases = dxUtils.getAliases();
-
 QVBoxLayout *mainFrame = new QVBoxLayout(this);
 
 QStringList headers;
@@ -114,7 +112,7 @@
 return;
 }
 m_aliases.insert(dialog->alias(), dialog->command());
- updateTable(); 
+ updateTable();
 }
 }
 
@@ -169,8 +167,8 @@
 void AliasDialog::updateTable()
 {
 m_table->clear();
- QMap<QString,QString>::iterator it;
- for(it=m_aliases.begin(); it!=m_aliases.end(); it++)
+ QMap<QString,QString>::const_iterator it;
+ for(it=m_aliases.constBegin(); it!=m_aliases.constEnd(); ++it)
 {
 QTreeWidgetItem *item = new QTreeWidgetItem(m_table);
 item->setText(0, it.key());
@@ -186,8 +184,12 @@
 
 bool AliasDialog::commandExist(const QString &command)
 {
- QMap<QString,QString>::iterator it = m_aliases.find(command);
- if(it != m_aliases.end())
+ if(command.isEmpty())
+ {
+ return true; //empty command couldn't be added
+ }
+ QMap<QString,QString>::const_iterator it = m_aliases.constFind(command);
+ if(it != m_aliases.constEnd())
 {
 return true;
 }

dxirc-1.30.0.tar.xz/qt/dialogs/aliasdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/aliasdialog.h Changed

dxirc-1.30.0.tar.xz/qt/dialogs/configdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/configdialog.cpp Changed

@@ -117,6 +117,7 @@
 preferences.m_reconnect = m_reconnect->isChecked();
 preferences.m_numberAttempt = m_numberAttempt->value();
 preferences.m_delayAttempt = m_delayAttempt->value();
+ preferences.m_joinDelay = m_joinDelay->value();
 preferences.m_maxAway = m_maxAway->value();
 preferences.m_closeToTray = m_closeToTray->isChecked();
 #ifdef HAVE_ENCHANT
@@ -138,7 +139,6 @@
 //LookTab
 preferences.m_unreadColor = m_unreadtabColor->getColor();
 preferences.m_highlightColor = m_hltabColor->getColor();
- preferences.m_tabPosition = m_tabPosition->currentIndex();
 //IrcTextTab
 preferences.m_colors.text = m_textColor->getColor();
 preferences.m_colors.back = m_backroundColor->getColor();
@@ -225,6 +225,15 @@
 delay->addWidget(m_delayAttempt);
 delay->addStretch(1);
 main->addLayout(delay);
+ QHBoxLayout *jdelay = new QHBoxLayout;
+ QLabel *jdelayLabel = new QLabel(_("Delay between join command and connection"));
+ jdelay->addWidget(jdelayLabel);
+ m_joinDelay = new QSpinBox;
+ m_joinDelay->setRange(0, 1000);
+ m_joinDelay->setValue(preferences.m_joinDelay);
+ jdelay->addWidget(m_joinDelay);
+ jdelay->addStretch(1);
+ main->addLayout(jdelay);
 QHBoxLayout *away = new QHBoxLayout;
 QLabel *awayLabel = new QLabel(_("Max. users number for checking away"));
 away->addWidget(awayLabel);
@@ -247,7 +256,7 @@
 }
 m_useSpell->setChecked(preferences.m_useSpell);
 main->addWidget(m_useSpell);
-#endif
+#endif //HAVE_ENCHANT
 m_ownServerWindow = new QCheckBox(_("Special tab for server messages"));
 m_ownServerWindow->setChecked(preferences.m_ownServerWindow);
 main->addWidget(m_ownServerWindow);
@@ -260,13 +269,8 @@
 m_logPath = new QLabel;
 if(!QDir(preferences.m_logPath).exists())
 {
-#if(QT_VERSION > 0x050000)
 m_logPath->setText(QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0));
 m_logPath->setToolTip(QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0));
-#else
- m_logPath->setText(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
- m_logPath->setToolTip(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
-#endif
 }
 else
 {
@@ -290,13 +294,8 @@
 m_autoloadPath = new QLabel;
 if(!QDir(preferences.m_autoloadPath).exists())
 {
-#if(QT_VERSION > 0x050000)
 m_autoloadPath->setText(QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0));
 m_autoloadPath->setToolTip(QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0));
-#else
- m_autoloadPath->setText(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
- m_autoloadPath->setToolTip(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
-#endif
 }
 else
 {
@@ -310,7 +309,7 @@
 connect(m_setAutoloadPath, SIGNAL(clicked()), this, SLOT(slotAutoloadPath()));
 load->addWidget(m_setAutoloadPath);
 main->addLayout(load);
-#endif
+#endif //HAVE_LUA
 main->addStretch(1);
 tab->setLayout(main);
 tabbook->addTab(tab, _("&General"));
@@ -390,7 +389,11 @@
 QHBoxLayout *rolesLayout = new QHBoxLayout;
 QVBoxLayout *rolesListLayout = new QVBoxLayout;
 m_themesRoleList = new QListWidget;
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 m_themesRoleList->addItems(preferences.m_themesList.split(';', QString::SkipEmptyParts));
+#else
+ m_themesRoleList->addItems(preferences.m_themesList.split(';', Qt::SkipEmptyParts));
+#endif
 for(int i=0; i<m_themesRoleList->count(); i++)
 {
 if(preferences.m_themePath.compare(m_themesRoleList->item(i)->text())==0)
@@ -476,13 +479,9 @@
 QFileDialog::Options options = QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly;
 QString directory = QFileDialog::getExistingDirectory(this,
 _("Select theme directory"),
-#if(QT_VERSION > 0x050000)
 QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0),
-#else
- QDesktopServices::storageLocation(QDesktopServices::HomeLocation),
-#endif
 options);
- if(!directory.isEmpty() && QFileInfo(directory+"/irc_normal.png").exists())
+ if(!directory.isEmpty() && QFileInfo::exists(directory+"/irc_normal.png"))
 {
 m_themesRoleList->addItem(directory);
 }
@@ -507,33 +506,21 @@
 connect(m_hltabColor, SIGNAL(colorChanged(QColor)), this, SLOT(slotTabColor()));
 colors->addWidget(m_unreadtabColor);
 colors->addWidget(m_hltabColor);
- QHBoxLayout *position = new QHBoxLayout;
- m_tabPosition = new QComboBox;
- m_tabPosition->addItem(_("Bottom"));
- m_tabPosition->addItem(_("Left"));
- m_tabPosition->addItem(_("Top"));
- m_tabPosition->addItem(_("Right"));
- m_tabPosition->setCurrentIndex(preferences.m_tabPosition);
- connect(m_tabPosition, SIGNAL(currentIndexChanged(int)), this, SLOT(slotTabPosition()));
- position->addWidget(new QLabel(_("Tab position")));
- position->addWidget(m_tabPosition);
- colors->addLayout(position);
 colors->addStretch(1);
 layout->addLayout(colors);
 m_lookTabs = new TabWidget;
 m_lookTabs->addTab(new QLabel(QString("\t")+_("Standard tab")), "linux");
- m_lookTabs->setTabIcon(0, QIcon(DXIRC_DATADIR "/icons/channel.png"));
+ m_lookTabs->setTabIcon(0, QIcon(dxutils::getDataPath()+"/icons/channel.png"));
 m_lookTabs->addTab(new QLabel(QString("\t")+_("Unreaded tab")), "bsd");
- m_lookTabs->setTabIcon(1, QIcon(DXIRC_DATADIR "/icons/channel.png"));
+ m_lookTabs->setTabIcon(1, QIcon(dxutils::getDataPath()+"/icons/channel.png"));
 m_lookTabs->setTabTextColor(1, preferences.m_unreadColor);
 m_lookTabs->addTab(new QLabel(QString("\t")+_("Highlighted tab")), "hurd");
- m_lookTabs->setTabIcon(2, QIcon(DXIRC_DATADIR "/icons/chnewm.png"));
+ m_lookTabs->setTabIcon(2, QIcon(dxutils::getDataPath()+"/icons/chnewm.png"));
 m_lookTabs->setTabTextColor(2, preferences.m_highlightColor);
 layout->addWidget(m_lookTabs);
 main->addLayout(layout);
 tab->setLayout(main);
 tabbook->addTab(tab, _("Loo&k"));
- updateTabPosition();
 }
 
 void ConfigDialog::slotTabColor()
@@ -542,31 +529,6 @@
 m_lookTabs->setTabTextColor(2, m_hltabColor->getColor());
 }
 
-void ConfigDialog::slotTabPosition()
-{
- updateTabPosition();
-}
-
-void ConfigDialog::updateTabPosition()
-{
- switch(m_tabPosition->currentIndex()) {
- case 0: //bottom
- m_lookTabs->setTabPosition(QTabWidget::South);
- break;
- case 1: //left
- m_lookTabs->setTabPosition(QTabWidget::West);
- break;
- case 2: //top
- m_lookTabs->setTabPosition(QTabWidget::North);
- break;
- case 3: //right
- m_lookTabs->setTabPosition(QTabWidget::East);
- break;
- default:
- m_lookTabs->setTabPosition(QTabWidget::South);
- }
-}
-
 void ConfigDialog::createIrctextTab(QTabWidget *tabbook)
 {
 QWidget *tab = new QWidget;
@@ -678,7 +640,7 @@
 m_ircText->append(QString("00:00:00 dvx is online").arg(m_actionColor->getColor().name()));
 m_ircText->append(QString("00:00:00 server's NOTICE: nice notice").arg(m_noticeColor->getColor().name()));
 m_ircText->append(QString("00:00:00 No error").arg(m_errorColor->getColor().name()));
- m_ircText->append(QString("00:00:00 dvx: <a href=\"http://dxirc.org\">http://dxirc.org</a>").arg(m_mymsgColor->getColor().name()));
+ m_ircText->append(QString("00:00:00 dvx: <a href=\"https://dxirc.org\">https://dxirc.org</a>").arg(m_mymsgColor->getColor().name()));
 }
 
 void ConfigDialog::createNotificationTab(QTabWidget *tabbook)
@@ -743,7 +705,7 @@
 m_setpathConnect = new QPushButton("...");
 connect(m_setpathConnect, SIGNAL(clicked()), this, SLOT(slotPath()));
 connectLayout->addWidget(m_setpathConnect);
- m_playConnect = new QPushButton(QIcon(DXIRC_DATADIR "/icons/play.png"), "");
+ m_playConnect = new QPushButton(QIcon(dxutils::getDataPath()+"/icons/play.png"), "");
 connect(m_playConnect, SIGNAL(clicked()), this, SLOT(slotPlay()));
 connectLayout->addWidget(m_playConnect);
 soundLayout->addLayout(connectLayout);
@@ -758,7 +720,7 @@
 m_setpathDisconnect = new QPushButton("...");
 connect(m_setpathDisconnect, SIGNAL(clicked()), this, SLOT(slotPath()));
 disconnectLayout->addWidget(m_setpathDisconnect);
- m_playDisconnect = new QPushButton(QIcon(DXIRC_DATADIR "/icons/play.png"), "");
+ m_playDisconnect = new QPushButton(QIcon(dxutils::getDataPath()+"/icons/play.png"), "");
 connect(m_playDisconnect, SIGNAL(clicked()), this, SLOT(slotPlay()));
 disconnectLayout->addWidget(m_playDisconnect);

dxirc-1.30.0.tar.xz/qt/dialogs/configdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/configdialog.h Changed

@@ -53,7 +53,6 @@
     void slotAddRoleTheme();
     void slotDeleteRoleTheme();
     void slotTabColor();
-    void slotTabPosition();
     void slotIrcTextColor();
     void slotSound();
     void slotSoundConnect();
@@ -92,7 +91,7 @@
     QCheckBox *m_closeToTray, *m_useSpell, *m_ownServerWindow, *m_autoload;
     QLabel *m_logPath, *m_autoloadPath;
     QPushButton *m_setLogPath, *m_setAutoloadPath;
-    QSpinBox *m_numberAttempt, *m_delayAttempt, *m_maxAway;
+    QSpinBox *m_numberAttempt, *m_delayAttempt, *m_maxAway, *m_joinDelay;
     //IconsTab widgets
     QListWidget *m_themesRoleList;
     QLabel *m_iconAway, *m_iconAdmin, *m_iconOwner, *m_iconHalfop, *m_iconNormal, *m_iconOp, *m_iconVoice;
@@ -100,7 +99,6 @@
     QCheckBox *m_sortUserMode;
     //LookTab widgets
     ColorButton *m_unreadtabColor, *m_hltabColor;
-    QComboBox *m_tabPosition;
     TabWidget *m_lookTabs;
     //IrcTextTab widgets
     ColorButton *m_textColor, *m_backroundColor, *m_userColor, *m_actionColor, *m_errorColor;
@@ -151,7 +149,6 @@
     void createIgnoreTab(QTabWidget *tabbook);
     void createDccTab(QTabWidget *tabbook);
     void createKeybindingsTab(QTabWidget *tabbook);
-    void updateTabPosition();
     void updateIrcText();
     void fillSmileys();
     bool nickExists(const QString &nick, bool frien);

dxirc-1.30.0.tar.xz/qt/dialogs/connectdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/connectdialog.cpp Changed

dxirc-1.30.0.tar.xz/qt/dialogs/connectdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/connectdialog.h Changed

dxirc-1.30.0.tar.xz/qt/dialogs/dccsenddialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/dccsenddialog.cpp Changed

dxirc-1.30.0.tar.xz/qt/dialogs/helpdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/helpdialog.cpp Changed

@@ -34,7 +34,12 @@
     QVBoxLayout *contents = new QVBoxLayout;
     m_text = new QTextEdit;
     m_text->setReadOnly(true);
+#ifdef Q_OS_DARWIN
+    m_text->setText(HELP_TEXT.replace("Ctrl-shift-","⇧⌘",Qt::CaseInsensitive).replace("Ctrl-tab","⌘⇥",Qt::CaseInsensitive).replace("Ctrl-","⌘",Qt::CaseInsensitive)
+                    .replace("Alt-","⌥",Qt::CaseInsensitive));
+#else
     m_text->setText(HELP_TEXT);
+#endif
     contents->addWidget(m_text);
     QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok);
     m_buttonViewLicense  = new QPushButton(_("View license"));
@@ -52,7 +57,12 @@
     if(m_licenseShowed)
     {
         m_buttonViewLicense->setText(_("View license"));
+#ifdef Q_OS_DARWIN
+        m_text->setText(HELP_TEXT.replace("Ctrl-shift-","⇧⌘",Qt::CaseInsensitive).replace("Ctrl-tab","⌘⇥",Qt::CaseInsensitive).replace("Ctrl-","⌘",Qt::CaseInsensitive)
+                        .replace("Alt-","⌥",Qt::CaseInsensitive));
+#else
         m_text->setText(HELP_TEXT);
+#endif
     }
     else
     {

dxirc-1.30.0.tar.xz/qt/dialogs/helpdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/helpdialog.h Changed

dxirc-1.30.0.tar.xz/qt/dialogs/keydialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/keydialog.cpp Changed

@@ -54,9 +54,8 @@
 }
 
 KeyDialog::KeyDialog(QWidget *parent)
-: QDialog(parent)
+: QDialog(parent), m_binds(preferences.m_keybindings)
 {
- m_binds = preferences.m_keybindings;
 m_changed = false;
 m_restart = false;
 m_nonchangeableBindings.append("Tab");
@@ -107,8 +106,8 @@
 QString key;
 QString value = item->text(1);
 QKeySequence sequence;
- QMap<QString,QKeySequence>::iterator it;
- for(it=m_binds.begin(); it!=m_binds.end(); it++)
+ QMap<QString,QKeySequence>::const_iterator it;
+ for(it=m_binds.constBegin(); it!=m_binds.constEnd(); ++it)
 {
 if(it.value().toString(QKeySequence::NativeText) == value)
 {
@@ -156,8 +155,8 @@
 void KeyDialog::updateTable()
 {
 m_table->clear();
- QMap<QString,QKeySequence>::iterator it;
- for(it=m_binds.begin(); it!=m_binds.end(); it++)
+ QMap<QString,QKeySequence>::const_iterator it;
+ for(it=m_binds.constBegin(); it!=m_binds.constEnd(); ++it)
 {
 QTreeWidgetItem *item = new QTreeWidgetItem(m_table);
 item->setText(0, preferences.getBindingName(it.key()));
@@ -174,8 +173,8 @@
 if(m_nonchangeableBindingsi.compare(sequence.toString(QKeySequence::NativeText), Qt::CaseInsensitive)==0)
 return true;
 }
- QMap<QString,QKeySequence>::iterator it;
- for(it=m_binds.begin(); it!=m_binds.end(); it++)
+ QMap<QString,QKeySequence>::const_iterator it;
+ for(it=m_binds.constBegin(); it!=m_binds.constEnd(); ++it)
 {
 if(it.value() == sequence) return true;
 }

dxirc-1.30.0.tar.xz/qt/dialogs/keydialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/keydialog.h Changed

dxirc-1.30.0.tar.xz/qt/dialogs/listdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/listdialog.cpp Changed

@@ -97,7 +97,7 @@
         {
             QTreeWidgetItem *item = new QTreeWidgetItem(m_table);
             item->setText(0, dxutils::getParam(m_channelsi, 1, false));
-            item->setData(1, Qt::EditRole, dxutils::getParam(m_channelsi, 2, false).toInt());
+            item->setText(1, dxutils::getParam(m_channelsi, 2, false));
             item->setText(2, dxutils::stripColors(dxutils::getParam(m_channelsi, 3, true).section(':',1), true));
             if(i == 0) current = item;
         }
@@ -110,7 +110,7 @@
             {
                 QTreeWidgetItem *item = new QTreeWidgetItem(m_table);
                 item->setText(0, dxutils::getParam(m_channelsi, 1, false));
-                item->setData(1, Qt::EditRole, dxutils::getParam(m_channelsi, 2, false).toInt());
+                item->setText(1, dxutils::getParam(m_channelsi, 2, false));
                 item->setText(2, dxutils::stripColors(dxutils::getParam(m_channelsi, 3, true).section(':',1), true));
                 if(!current) current = item;
             }

dxirc-1.30.0.tar.xz/qt/dialogs/listdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/listdialog.h Changed

dxirc-1.30.0.tar.xz/qt/dialogs/scriptdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/scriptdialog.cpp Changed

@@ -40,21 +40,21 @@
 << "\\bwhile\\b";
 foreach(QString pattern, keywordPatterns)
 {
- rule.pattern = QRegExp(pattern);
+ rule.pattern = QRegularExpression(pattern);
 rule.format = m_keywordFormat;
 m_highlightingRules.append(rule);
 }
 m_singleLineCommentFormat.setForeground(Qt::red);
- rule.pattern = QRegExp("--^\n*");
+ rule.pattern = QRegularExpression("--^\n*");
 rule.format = m_singleLineCommentFormat;
 m_highlightingRules.append(rule);
 m_quotationFormat.setForeground(Qt::darkGreen);
- rule.pattern = QRegExp("\".*\"");
+ rule.pattern = QRegularExpression("\".*\"");
 rule.format = m_quotationFormat;
 m_highlightingRules.append(rule);
 m_functionFormat.setFontItalic(true);
 m_functionFormat.setForeground(Qt::blue);
- rule.pattern = QRegExp("\\bA-Za-z0-9_+(?=\\()");
+ rule.pattern = QRegularExpression("\\bA-Za-z0-9_+(?=\\()");
 rule.format = m_functionFormat;
 m_highlightingRules.append(rule);
 }
@@ -63,13 +63,23 @@
 {
 foreach(HighlightingRule rule, m_highlightingRules)
 {
- QRegExp expression(rule.pattern);
- int index = text.indexOf(expression);
- while(index >= 0)
+ QRegularExpression expression(rule.pattern);
+ int startIndex = text.indexOf(expression);
+ while(startIndex >= 0)
 {
- int length = expression.matchedLength();
- setFormat(index, length, rule.format);
- index = text.indexOf(expression, index + length);
+ QRegularExpressionMatch endMatch;
+ int endIndex = text.indexOf(expression, startIndex, &endMatch);
+ int highLength;
+ if(endIndex == -1)
+ {
+ highLength = text.length() - startIndex;
+ }
+ else
+ {
+ highLength = endIndex - startIndex + endMatch.capturedLength();
+ }
+ setFormat(startIndex, highLength, rule.format);
+ startIndex = text.indexOf(expression, startIndex + highLength);
 }
 }
 }

dxirc-1.30.0.tar.xz/qt/dialogs/scriptdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/scriptdialog.h Changed

dxirc-1.30.0.tar.xz/qt/dialogs/serverdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/serverdialog.cpp Changed

dxirc-1.30.0.tar.xz/qt/dialogs/serverdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/serverdialog.h Changed

dxirc-1.30.0.tar.xz/qt/dialogs/userdialog.cpp -> dxirc-1.40.1.tar.xz/qt/dialogs/userdialog.cpp Changed

dxirc-1.30.0.tar.xz/qt/dialogs/userdialog.h -> dxirc-1.40.1.tar.xz/qt/dialogs/userdialog.h Changed

dxirc-1.30.0.tar.xz/qt/dxirc-qt.rc -> dxirc-1.40.1.tar.xz/qt/dxirc-qt.rc Changed

dxirc-1.30.0.tar.xz/qt/dxirc.cpp -> dxirc-1.40.1.tar.xz/qt/dxirc.cpp Changed

@@ -61,11 +61,7 @@
 #ifndef WIN32
 void dxunlink(void)
 {
-#if(QT_VERSION > 0x050000)
     unlink(QString(QStandardPaths::standardLocations(QStandardPaths::TempLocation).at(0)+"/dxirc-qt-"+getenv("USER")).toLatin1().data());
-#else
-    unlink(QString(QDesktopServices::storageLocation(QDesktopServices::TempLocation)+"/dxirc-qt-"+getenv("USER")).toAscii().data());
-#endif
 }
 #endif
 
@@ -83,11 +79,7 @@
         return true;
     }
 #else
-#if(QT_VERSION > 0x050000)
     QString path = QStandardPaths::standardLocations(QStandardPaths::TempLocation).at(0)+"/dxirc-qt-"+getenv("USER");
-#else
-    QString path = QDesktopServices::storageLocation(QDesktopServices::TempLocation)+"/dxirc-qt-"+getenv("USER");
-#endif
     struct flock fl;
     int fd;
     fd = open(path.toLatin1().data(), O_RDWR | O_CREAT, 0600);
@@ -181,13 +173,13 @@
     connect(m_ircengines0, SIGNAL(ircEndMotd()), this, SLOT(slotIrcEndMotd()));
     connect(m_ircengines0, SIGNAL(ircPrivmsg(QString,QString,QString)), this, SLOT(slotIrcPrivmsgAndAction(QString,QString,QString)));
     connect(m_ircengines0, SIGNAL(ircAction(QString,QString,QString)), this, SLOT(slotIrcPrivmsgAndAction(QString,QString,QString)));
-    connect(m_ircengines0, SIGNAL(ircPart(QString,QString,QString)), this, SLOT(slotIrcPart(QString,QString)));
-    connect(m_ircengines0, SIGNAL(ircKick(QString,QString,QString,QString)), this, SLOT(slotIrcKick(QString,QString,QString)));
+    connect(m_ircengines0, SIGNAL(ircPart(QString,QString,QString)), this, SLOT(slotIrcPart(QString,QString,QString)));
+    connect(m_ircengines0, SIGNAL(ircKick(QString,QString,QString,QString)), this, SLOT(slotIrcKick(QString,QString,QString,QString)));
     connect(m_ircengines0, SIGNAL(ircRaw(QString)), this, SLOT(slotIrcRaw(QString)));
     connect(m_ircengines0, SIGNAL(ircDisconnect(QString)), this, SLOT(slotIrcDisconnect(QString)));
     connect(m_ircengines0, SIGNAL(ircConnect(QString)), this, SLOT(slotIrcConnectAndReconnect(QString)));
     connect(m_ircengines0, SIGNAL(ircDisconnect(QString)), this, SLOT(slotIrcConnectAndReconnect(QString)));
-    connect(m_ircengines0, SIGNAL(ircQuit(QString,QString)), this, SLOT(slotIrcQuit(QString)));
+    connect(m_ircengines0, SIGNAL(ircQuit(QString,QString)), this, SLOT(slotIrcQuit(QString,QString)));
     connect(m_ircengines0, SIGNAL(ircDccIn(QString,QString,QString,QString,QString)), this, SLOT(slotIrcDccIn(QString,QString,QString,QString,QString)));
     connect(m_ircengines0, SIGNAL(ircDccMyToken(QString,int,int)), this, SLOT(slotIrcDccMyToken(QString,int,int)));
     connect(m_ircengines0, SIGNAL(ircDccToken(QString,QString,QString,int)), this, SLOT(slotIrcDccToken(QString,QString,QString,int)));
@@ -438,7 +430,7 @@
                     {
                         if (lua_pcall(m_scriptsj.L, 0, 0, 0))
                         {
-                            appendIrcStyledText(_("Lua plugin: error calling %1 %2").arg(m_scriptEventsi.funcname).arg(QString::fromUtf8(lua_tostring(m_scriptsj.L, -1))), 4, false);
+                            appendIrcStyledText(_("Lua plugin: error calling %1 %2").arg(m_scriptEventsi.funcname,QString::fromUtf8(lua_tostring(m_scriptsj.L, -1))), 4, false);
                             lua_pop(m_scriptsj.L, 1);
                         }
                     }
@@ -514,6 +506,25 @@
     }
 }
 
+void dxirc::slotShowHide()
+{
+    if(this->isVisible())
+    {
+        preferences.m_maximized = this->isMaximized();
+        this->hide();
+        m_showhide->setText(_("Show window"));
+    }
+    else
+    {
+        if(preferences.m_maximized) this->showMaximized();
+        else this->show();
+        this->raise();
+        this->activateWindow();
+        m_showhide->setText(_("Hide window"));
+    }
+    setTrayIcon();
+}
+
 void dxirc::createMenus()
 {
     QMenu *serverMenu = menuBar()->addMenu(_("&Server"));
@@ -615,6 +626,10 @@
     helpMenu->addAction(aboutAction);
     aboutAction->setMenuRole(QAction::AboutRole);
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(slotCmdAbout()));
+    QAction *aboutQtAction = new QAction(_("About &Qt"), this);
+    aboutQtAction->setMenuRole(QAction::AboutQtRole);
+    connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+    helpMenu->addAction(aboutQtAction);
     QAction *helpAction = new QAction(QIcon(dxutils::getDataPath()+"/icons/help.png"), _("&Help"), this);
     helpAction->setShortcut(preferences.getBinding("help"));
     connect(helpAction, SIGNAL(triggered()), this, SLOT(slotCmdHelp()));
@@ -624,6 +639,12 @@
 void dxirc::createTrayIcon()
 {
     QMenu *trayMenu = new QMenu(this);
+    m_showhide = new QAction(_("Hide window"), this);
+    trayMenu->addAction(m_showhide);
+    connect(m_showhide, SIGNAL(triggered()), this, SLOT(slotShowHide()));
+    trayMenu->addSeparator();
+    connect(trayMenu->addAction(_("&About...")), SIGNAL(triggered()), this, SLOT(slotCmdAbout()));
+    trayMenu->addSeparator();
     connect(trayMenu->addAction(_("&Quit")), SIGNAL(triggered()), this, SLOT(slotCmdQuit()));
     m_trayIcon = new QSystemTrayIcon(this);
     m_trayIcon->setContextMenu(trayMenu);
@@ -716,7 +737,7 @@
                     && QString::compare(funcname, _pThis->m_scriptEventsi.funcname, Qt::CaseInsensitive)==0
                     && QString::compare(script, _pThis->m_scriptEventsi.script, Qt::CaseInsensitive)==0)
             {
-                _pThis->appendIrcStyledText(_("Function %1 for event %2 already exists").arg(funcname).arg(name), 4, false);
+                _pThis->appendIrcStyledText(_("Function %1 for event %2 already exists").arg(funcname,name), 4, false);
                 return 0;
             }
         }
@@ -755,7 +776,7 @@
                     && QString::compare(script, _pThis->m_scriptEventsi.script, Qt::CaseInsensitive) == 0)
             {
                 _pThis->m_scriptEvents.removeAt(i);
-                _pThis->appendIrcStyledText(_("Command/event %1 in script %2 was removed").arg(command).arg(script), 3, false);
+                _pThis->appendIrcStyledText(_("Command/event %1 in script %2 was removed").arg(command,script), 3, false);
             }
         }
     }
@@ -1182,7 +1203,7 @@
                     {
                         if (lua_pcall(m_scriptsj.L, 0, 0, 0))
                         {
-                            appendIrcStyledText(_("Lua plugin: error calling %1 %2").arg(m_scriptEventsi.funcname).arg(QString::fromUtf8(lua_tostring(m_scriptsj.L, -1))), 4, false);
+                            appendIrcStyledText(_("Lua plugin: error calling %1 %2").arg(m_scriptEventsi.funcname,QString::fromUtf8(lua_tostring(m_scriptsj.L, -1))), 4, false);
                             lua_pop(m_scriptsj.L, 1);
                         }
                     }
@@ -1206,6 +1227,7 @@
 //handle m_trayIcon click
 void dxirc::slotIconActivated(QSystemTrayIcon::ActivationReason reason)
 {
+#ifndef Q_OS_DARWIN
     if(reason == QSystemTrayIcon::Trigger)
     {
         if(this->isVisible())
@@ -1222,6 +1244,7 @@
         }
         setTrayIcon();
     }
+#endif
 }
 
 void dxirc::slotCmdServers()
@@ -1657,7 +1680,6 @@
             if(m_tabbook->tabTextColor(i)==unread) m_tabbook->setTabTextColor(i, preferences.m_unreadColor);
             if(m_tabbook->tabTextColor(i)==high) m_tabbook->setTabTextColor(i, preferences.m_highlightColor);
         }
-        updateTabPosition();
         if(oldOwnServerWindow!=preferences.m_ownServerWindow) updateServerWindow();
         updateMenus();
         if(m_logs) m_logs->setLogPath(preferences.m_logPath);
@@ -1669,7 +1691,6 @@
     m_tabbook->addTab(m_ft, QIcon(dxutils::getDataPath()+"/icons/file.png"), _("DCC transfers"));
     m_tabbook->setTabTextColor(m_tabbook->count()-1, palette().windowText().color());
     m_tabbook->setCurrentWidget(m_ft);
-    updateTabPosition();
     updateMenus();
 }
 
@@ -1693,14 +1714,15 @@
         return;
     }
     updateStatus(_("Checking version in progress"));
-    m_versionSocket->setHost("dxirc.org", 80);
+    m_versionSocket->setHost("dxsolutions.org", 443);
+    m_versionSocket->setIsSSL(true);
     m_versionSocket->connectTo();
 }
 
 void dxirc::slotVersionConnected()
 {
     if(m_versionSocket)
-        m_versionSocket->write("GET http://www.dxirc.org/version HTTP/1.0\nUser-Agent: dxirc version\n\n", 72);
+        m_versionSocket->write(QString("GET /dxirc-version HTTP/1.0\r\nHost: dxsolutions.org\r\nAccept: */*\r\nConnection: close\r\n\r\n"));
 }
 
 void dxirc::slotVersionCanRead()
@@ -1712,7 +1734,16 @@
         char *buffer = new charread;
         read = m_versionSocket->read(buffer, read);
         QString serverVersion = buffer;
+        dxutils::debugLine(serverVersion);
         serverVersion = serverVersion.section('\n', serverVersion.count('\n')-(bufferread-1=='\n'?1:0)).section('\n',0,0);
+        if(serverVersion.isEmpty())
+        {
+            return;
+        }
+        else
+        {
+            if(serverVersion.at(0) != '1') return;
+        }
         QString currentVersion = VERSION;
         int current = currentVersion.section('.',0,0).toInt()*1000+currentVersion.section('.',1).section('.',0,0).toInt()*10+currentVersion.section('.',2).toInt();
         int server = serverVersion.section('.',0,0).toInt()*1000+serverVersion.section('.',1).section('.',0,0).toInt()*10+serverVersion.section('.',2).toInt();
@@ -1765,17 +1796,17 @@
     }
 }
 
-void dxirc::slotConnectServer(ServerInfo info)
+void dxirc::slotConnectServer(const ServerInfo &info)

dxirc-1.30.0.tar.xz/qt/dxirc.h -> dxirc-1.40.1.tar.xz/qt/dxirc.h Changed

@@ -23,9 +23,7 @@
 #define DXIRC_H
 
 #include <QtGui>
-#if(QT_VERSION > 0x050000)
 #include <QtWidgets>
-#endif
 #include "tabitems/tabwidget.h"
 #include "tabitems/fttabitem.h"
 #include "logviewer/logdialog.h"
@@ -80,6 +78,7 @@
 QAction *m_logviewer;
 QAction *m_users;
 QAction *m_status;
+ QAction *m_showhide;
 #ifdef HAVE_ENCHANT
 QAction *m_spellCombo;
 #endif
@@ -91,7 +90,6 @@
 void createActions();
 void createMenus();
 void createTrayIcon();
- void updateTabPosition();
 void updateMenus();
 void updateServerWindow();
 void updateStatus(QString text);
@@ -113,8 +111,8 @@
 QWidget* getTabItemById(int id);
 bool isValidTabId(int id);
 bool isIddxTabItem(int id);
- void appendIrcText(QString text, bool logLine=true);
- void appendIrcStyledText(QString text, int style, bool logLine=true);
+ void appendIrcText(const QString &text, bool logLine=true);
+ void appendIrcStyledText(const QString &text, int style, bool logLine=true);
 bool hasTetrisTab();
 bool hasLuaAll(const QString &);
 bool hasAllCommand();
@@ -161,27 +159,28 @@
 void slotSelectTab();
 void slotRestartApp();
 void slotCmdList();
+ void slotShowHide();
 //IrcEngine slots
 void slotIrcNewChannel(QString channel);
 void slotIrcQuery(QString with);
 void slotIrcDccChat(QString with, QString address, int port);
 void slotIrcInvite(QString nick, QString channel);
 void slotIrcEndMotd();
- void slotIrcPrivmsgAndAction(QString nick, QString to, QString msg);
- void slotIrcPart(QString nick, QString channel);
- void slotIrcKick(QString nick, QString to, QString channel);
- void slotIrcDisconnect(QString msg);
- void slotIrcConnectAndReconnect(QString msg);
- void slotIrcJoin(QString nick, QString channel);
- void slotIrcQuit(QString nick);
+ void slotIrcPrivmsgAndAction(const QString &nick, const QString &to, const QString &msg);
+ void slotIrcPart(const QString &nick, const QString &channel, const QString &reason);
+ void slotIrcKick(const QString &nick, const QString &to, const QString &channel, const QString &reason);
+ void slotIrcDisconnect(const QString &msg);
+ void slotIrcConnectAndReconnect(const QString &msg);
+ void slotIrcJoin(const QString &nick, const QString &channel);
+ void slotIrcQuit(const QString &nick, const QString &reason);
 void slotIrcDccIn(QString nick, QString ip, QString port, QString filename, QString size);
- void slotIrcDccMyToken(QString ip, int port, int token);
+ void slotIrcDccMyToken(const QString &ip, int port, int token);
 void slotIrcDccToken(QString nick, QString filename, QString size, int token);
 void slotIrcDccResume(QString nick, QString filename, QString port, QString position);
 void slotIrcDccPresume(int token, QString position);
 void slotIrcDccAccept(QString nick, QString filename, QString port, QString position);
 void slotIrcDccPaccept(int token, QString position);
- void slotIrcRaw(QString line);
+ void slotIrcRaw(const QString &line);
 void slotIrcBoatsInvite(QString nick);
 void slotIrcBoatsAccept(QString nick);
 void slotIrc323();
@@ -190,11 +189,11 @@
 void slotNewmsg(TYPE type);
 void slotLuaRequest(LuaRequest lua);
 void slotNewtetris();
- void slotConnectServer(ServerInfo info);
- void slotIrcDccServer(IrcEngine *server, QString with);
- void slotIrcDccOut(IrcEngine *server, QString nick, QString file);
- void slotIrcDccPout(IrcEngine *server, QString nick, QString file);
- void slotIrcPrivmsgAndAction(IrcEngine*, QString nick, QString to, QString msg);
+ void slotConnectServer(const ServerInfo &info);
+ void slotIrcDccServer(IrcEngine *server, const QString &with);
+ void slotIrcDccOut(IrcEngine *server, const QString &nick, const QString &file);
+ void slotIrcDccPout(IrcEngine *server, const QString &nick, const QString &file);
+ void slotIrcPrivmsgAndAction(IrcEngine*, const QString &nick, const QString &to, const QString &msg);
 void slotIrcQuery(IrcEngine *server, QString with);
 void slotOwnMsg(QString msg);
 void slotCommand(QString command);

dxirc-1.30.0.tar.xz/qt/dxutils.cpp -> dxirc-1.40.1.tar.xz/qt/dxutils.cpp Changed

@@ -33,11 +33,14 @@
 #include <QDebug>
 #include <QTime>
 #include <QDir>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QProcessEnvironment>
 #include <QSettings>
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 #include <QSound>
+#endif
 #include <string>
+#include <random>
 #include "preferences.h"
 #include "dxutils.h"
 #include "notify/notifywindow.h"
@@ -47,9 +50,11 @@
 #endif
 #ifdef Q_OS_DARWIN
 #include "widgets/macspellcheck.h"
+ #include "notify/macnotify.h"
 #endif
 
 #ifdef HAVE_ENCHANT
+static enchant::Broker *ebroker;
 typedef std::pair<Checkers*,QStringList*> CheckerPair;
 void enumerateDicts (const char * const lang_tag,
 const char * const /*provider_name*/,
@@ -92,17 +97,30 @@
 }
 }
 #endif // WIN32
+#ifdef Q_OS_DARWIN
+ m_haveNotify = false; //I think notifywindow is better than native notify
+#endif
+#ifdef HAVE_ENCHANT
+#ifdef HAVE_ENCHANT2
+ ebroker = new enchant::Broker();
+#else
+ ebroker = enchant::Broker::instance();
+#endif //HAVE_ENCHANT2
+#endif //HAVE_ENCHANT
 }
 
 dxutils::~dxutils()
 {
 #ifdef HAVE_ENCHANT
 Checkers::const_iterator it = m_checkers.begin();
- for(; it != m_checkers.end(); it++)
+ for(; it != m_checkers.end(); ++it)
 {
 delete (*it).second;
 }
 #endif
+#ifdef HAVE_ENCHANT2
+ delete ebroker;
+#endif
 }
 
 dxutils &dxutils::instance()
@@ -208,9 +226,9 @@
 
 QString dxutils::getNickColor(const QString &nick)
 {
- register int len = nick.length();
- register quint32 h = 0;
- for(register int i=0; i<len; i++)
+ int len = nick.length();
+ quint32 h = 0;
+ for(int i=0; i<len; i++)
 h = ((h << 5) + h) ^ nicki.toLatin1();
 switch(h%8)
 {
@@ -257,6 +275,23 @@
 }
 }
 
+#ifdef Q_OS_DARWIN
+void dxutils::showNotify(QString text, int position)
+{
+ //I think notifywindow is better than native notify
+// MacNotify::instance()->showNotify(text);
+ text.replace("\n", " ");
+ if(!m_firstNotify || position!=m_notifyPosition)
+ {
+ m_firstNotify = true;
+ m_notifiesHeight = 0;
+ m_notifyPosition = position;
+ }
+ NotifyWindow *notify = new NotifyWindow(text, m_notifiesHeight, 5);
+ notify->showNotify(position);
+ m_notifiesHeight += notify->height()+4;
+}
+#else
 void dxutils::showNotify(QString text, int position)
 {
 if(m_haveNotify)
@@ -278,6 +313,7 @@
 m_notifiesHeight += notify->height()+4;
 }
 }
+#endif
 
 void dxutils::removeNotify()
 {
@@ -295,7 +331,7 @@
 //is file with name on path right dxirc log file?
 bool dxutils::isRightLogFile(const QString& path, const QString& name)
 {
- if(QRegExp("^\\d\\d\\d\\d-\\d\\d-\\d\\d+$").exactMatch(name))
+ if(QRegularExpression("^\\d\\d\\d\\d-\\d\\d-\\d\\d+$").match(name).hasMatch())
 {
 QFile file(path);
 if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
@@ -304,7 +340,8 @@
 qint64 lineLength = file.readLine(buf, sizeof(buf));
 if(lineLength != -1)
 {
- if(QRegExp("^\$.*)(\\d\\d:\\d\\d:\\d\\d\$").indexIn(QString(buf)) != -1)
+ QRegularExpression ex("^\\\\d\\d:\\d\\d:\\d\\d\\ ");
+ if(ex.match(QString(buf)).hasMatch())
 return true;
 else
 return false;
@@ -358,9 +395,12 @@
 QDir dir;
 if(dir.exists(file))
 {
-#if(QT_VERSION < 0x050000)
-#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#ifdef _WIN32
+ PlaySoundA((LPCSTR)file.toUtf8().constData(), NULL, SND_FILENAME | SND_ASYNC);
+#else
 static const char * players={"aplay","play","esdplay","artsplay","ossplay",NULL};
+ QString exec;
 QStringList paths = QString(getenv("PATH")).split(':');
 foreach(QString path, paths)
 {
@@ -368,17 +408,19 @@
 {
 if(dir.exists(path+"/"+playersi))
 {
- QString exec = path+"/"+playersi;
- if(exec.contains("aplay"))
- exec.append(" -q");
- exec += " "+file+" &";
- system(exec.toLatin1().constData());
+ exec = path+"/"+playersi;
+ break;
 }
 }
 }
+ if(exec.isEmpty()) return;
+ if(exec.contains("aplay")) exec += " -q";
+ exec += " "+enquote(file)+" &";
+ system(exec.toUtf8().constData());
 #endif
-#endif
+#else
 QSound::play(file);
+#endif
 }
 }
 
@@ -399,7 +441,7 @@
 {
 if(path == "internal") return path;
 QString themeDefaultPath = "internal";
- if(QFileInfo(path+"/irc_normal.png").exists()) return path;
+ if(QFileInfo::exists(path+"/irc_normal.png")) return path;
 return themeDefaultPath;
 }
 
@@ -408,10 +450,14 @@
 {
 QString themeDefaultPath = "internal;";
 QString themes;
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 QStringList pathes = list.split(';', QString::SkipEmptyParts);
+#else
+ QStringList pathes = list.split(';', Qt::SkipEmptyParts);
+#endif
 for(int i=0; i<pathes.size(); ++i)
 {
- if(QFileInfo(pathesi+"/irc_normal.png").exists()) themes.append(pathesi+";");
+ if(QFileInfo::exists(pathesi+"/irc_normal.png")) themes.append(pathesi+";");
 }
 if(!themes.contains(themeDefaultPath)) themes.prepend(themeDefaultPath);
 if(!themes.isEmpty()) return themes;
@@ -426,11 +472,14 @@
 QString dxutils::encrypt(const QString &text)
 {
 QString result = "";
+ const std::string CHARACTERS = "0123456789!@#$%^&*ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+ std::random_device random_device;
+ std::mt19937 generator(random_device());
+ std::uniform_int_distribution<> distribution(0, CHARACTERS.size() - 1);
 for(int i=0; i<text.length(); i++)
 {

dxirc-1.30.0.tar.xz/qt/dxutils.h -> dxirc-1.40.1.tar.xz/qt/dxutils.h Changed

@@ -63,8 +63,8 @@
     static QString createSmileys(QString text);
     static QString encrypt(const QString &text);
     static QString decrypt(const QString &text);
-    static QString getParam(QString, int, bool);
-    static QString getParam(QString, int, bool, const char&);
+    static QString getParam(const QString &, int, bool);
+    static QString getParam(const QString &, int, bool, const char&);
     static QString removeSpaces(const QString &text);
     static QString removeNonalphanumeric(const QString &text);
     static QString createModes(char sign, char mode, QString nicks);
@@ -95,15 +95,15 @@
     int getIntIniEntry(const QString &section, const QString &key, int def=0);
     bool getBoolIniEntry(const QString &section, const QString &key, bool def=false);
     QColor getColorIniEntry(const QString &section, const QString &key, QColor def=QColor(255,255,255));
-    bool checkWord(QString word, QString lang);
+    bool checkWord(const QString &word, const QString &lang);
     void loadAvailableSpellLangs();
     int getAvailableSpellLangsNum();
     QStringList getAvailableSpellLangs();
     QString getChannelLang(const QString &channel);
-    static QString stamp2string(QString datestr, QString timestr);
-    static QString normalizeLogLine(QString datestr, std::string line);
+    static QString stamp2string(QString datestr, const QString &timestr);
+    static QString normalizeLogLine(const QString &datestr, const std::string &line);
     static QString stripColors(const QString &text, const bool stripOther);
-    static QColor getIrcColor(int code);
+    static QColor getIrcColor(int code, bool foreground);
     static QString stripLogMark(const QString &text);
     static QColor getColorForStyle(int style);
     static QString createLinks(const QString &txt, bool removeThan=true);
@@ -121,6 +121,7 @@
     static QString getDataPath();
     static QKeySequence getKeybinding(QKeyEvent *event);
     static QString wrapText(QString text, int width, char wrap=' ');
+    static QString enquote(const QString &string);
 private:
     int m_notifiesHeight, m_notifyPosition;
     bool m_firstNotify, m_haveNotify;

dxirc-1.30.0.tar.xz/qt/engine/dccengine.cpp -> dxirc-1.40.1.tar.xz/qt/engine/dccengine.cpp Changed

dxirc-1.30.0.tar.xz/qt/engine/dccengine.h -> dxirc-1.40.1.tar.xz/qt/engine/dccengine.h Changed

dxirc-1.30.0.tar.xz/qt/engine/dxsocket.cpp -> dxirc-1.40.1.tar.xz/qt/engine/dxsocket.cpp Changed

@@ -19,6 +19,7 @@
 * MA 02110-1301, USA.
 */
 
+#include <QRegularExpression>
 #include "dxsocket.h"
 #include "config.h"
 #include "i18n.h"
@@ -35,14 +36,22 @@
 connect(m_tcp, SIGNAL(connected()), this, SLOT(slotConnected()));
 connect(m_tcp, SIGNAL(disconnected()), this, SLOT(slotDisconnected()));
 connect(m_tcp, SIGNAL(readyRead()), this, SLOT(slotCanRead()));
+#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
 connect(m_tcp, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(slotError(QAbstractSocket::SocketError)));
+#else
+ connect(m_tcp, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this, SLOT(slotError(QAbstractSocket::SocketError)));
+#endif
 connect(m_tcp, SIGNAL(bytesWritten(qint64)), this, SLOT(slotWritten(qint64)));
 m_ssl = new QSslSocket;
 m_ssl->setPeerVerifyMode(QSslSocket::QueryPeer);
 connect(m_ssl, SIGNAL(connected()), this, SLOT(slotConnected()));
 connect(m_ssl, SIGNAL(disconnected()), this, SLOT(slotDisconnected()));
 connect(m_ssl, SIGNAL(readyRead()), this, SLOT(slotCanRead()));
+#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
 connect(m_ssl, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(slotError(QAbstractSocket::SocketError)));
+#else
+ connect(m_ssl, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this, SLOT(slotError(QAbstractSocket::SocketError)));
+#endif
 connect(m_ssl, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslError(QList<QSslError>)));
 m_server = new QTcpServer;
 connect(m_server, SIGNAL(newConnection()), this, SLOT(slotSomeConnected()));
@@ -112,7 +121,6 @@
 break;
 case QAbstractSocket::ProxyProtocolError: emit socketError(_("The connection negotiation with the proxy server because the response from the proxy server could not be understood."));
 break;
-#if(QT_VERSION >= 0x050000)
 case QAbstractSocket::OperationError: emit socketError(_("An operation was attempted while the socket was in a state that did not permit it."));
 break;
 case QAbstractSocket::SslInternalError: emit socketError(_("The SSL library being used reported an internal error. This is probably the result of a bad installation or misconfiguration of the library."));
@@ -121,7 +129,6 @@
 break;
 case QAbstractSocket::TemporaryError: emit socketError(_("A temporary error occurred (e.g., operation would block and socket is non-blocking)"));
 break;
-#endif
 case QAbstractSocket::UnknownSocketError: emit socketError(_("An unidentified error occurred."));
 break;
 default: emit socketError(_("Some socket error."));
@@ -295,8 +302,8 @@
 return false;
 if(address.count('.') == 3)
 {
- QRegExp rex("\\l");
- if(!rex.exactMatch(address))
+ QRegularExpression rex("\\l");
+ if(!rex.match(address).hasMatch())
 return true;
 }
 return true;
@@ -400,7 +407,7 @@
 {
 QHostInfo i = QHostInfo::fromName(hostname);
 if(i.addresses().size())
- return i.addresses()0.toString();
+ return i.addresses().constFirst().toString();
 }
 return hostname;
 }

dxirc-1.30.0.tar.xz/qt/engine/ircengine.cpp -> dxirc-1.40.1.tar.xz/qt/engine/ircengine.cpp Changed

@@ -20,6 +20,7 @@
 */
 
 #include <QDateTime>
+#include <QRegularExpression>
 #include "ircengine.h"
 #include "config.h"
 #include "i18n.h"
@@ -75,7 +76,7 @@
 
 void IrcEngine::setUserName(const QString& user)
 {
- //needed for freenode
+ //needed for freenode maybe others
 m_userName = dxutils::removeNonalphanumeric(user);
 }
 
@@ -142,6 +143,15 @@
 }
 }
 
+void IrcEngine::slotJoinDelay()
+{
+ if(!m_startChannels.isEmpty())
+ {
+ sendJoin(m_startChannels);
+ m_startChannels.clear();
+ }
+}
+
 void IrcEngine::slotCanRead()
 {
 if(m_connected)
@@ -435,7 +445,15 @@
 {
 qlonglong idle = dxutils::getParam(params, 3, false).toLongLong();
 emit ircServerReply(_("Idle: ")+QString("%1:%2:%3").arg(idle/3600).arg((idle/60)%60).arg(idle%60));
- QString datestr = QDateTime::fromTime_t(dxutils::getParam(params, 4, false).toUInt()).toString(Qt::SystemLocaleShortDate);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ QDateTime qtime = QDateTime::fromSecsSinceEpoch(dxutils::getParam(params, 4, false).toUInt());
+ QString format = QLocale::system().dateTimeFormat(QLocale::ShortFormat);
+#else
+ QDateTime qtime;
+ qtime.setTime_t(dxutils::getParam(params, 4, false).toUInt());
+ Qt::DateFormat format = Qt::SystemLocaleShortDate;
+#endif
+ QString datestr = qtime.toString(format);
 emit ircServerReply(_("Signon: ")+datestr);
 }break;
 case 318: //RPL_ENDOFWHOIS
@@ -486,7 +504,15 @@
 }break;
 case 333: //RPL_TOPICSETBY
 {
- QString datestr = QDateTime::fromTime_t(dxutils::getParam(params, 4, false).toUInt()).toString(Qt::SystemLocaleShortDate);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ QDateTime qtime = QDateTime::fromSecsSinceEpoch(dxutils::getParam(params, 4, false).toUInt());
+ QString format = QLocale::system().dateTimeFormat(QLocale::ShortFormat);
+#else
+ QDateTime qtime;
+ qtime.setTime_t(dxutils::getParam(params, 4, false).toUInt());
+ Qt::DateFormat format = Qt::SystemLocaleShortDate;
+#endif
+ QString datestr = qtime.toString(format);
 emit irc333(dxutils::getParam(params, 2, false), _("Set %1 %2").arg(dxutils::getParam(params, 3, false).section('!',0,0)).arg(datestr));
 }break;
 case 341: //RPL_INVITING
@@ -548,8 +574,15 @@
 if(datestr.isEmpty()) emit ircServerReply(dxutils::getParam(params, 2, false)+" "+dxutils::getParam(params, 3, false));
 else
 {
- QDateTime time = QDateTime::fromTime_t(datestr.toUInt());
- datestr = time.toString(Qt::SystemLocaleShortDate);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ QDateTime qtime = QDateTime::fromSecsSinceEpoch(datestr.toUInt());
+ QString format = QLocale::system().dateTimeFormat(QLocale::ShortFormat);
+#else
+ QDateTime qtime;
+ qtime.setTime_t(datestr.toUInt());
+ Qt::DateFormat format = Qt::SystemLocaleShortDate;
+#endif
+ datestr = qtime.toString(format);
 emit ircServerReply(dxutils::getParam(params, 2, false)+" "+dxutils::getParam(params, 3, false)+" "+dxutils::getParam(params, 4, false)+" "+datestr);
 }
 }break;
@@ -573,8 +606,15 @@
 m_endmotd = true;
 if(!m_startChannels.isEmpty())
 {
- sendJoin(m_startChannels);
- m_startChannels.clear();
+ if(preferences.m_joinDelay)
+ {
+ QTimer::singleShot(preferences.m_joinDelay*1000, this, SLOT(slotJoinDelay()));
+ }
+ else
+ {
+ sendJoin(m_startChannels);
+ m_startChannels.clear();
+ }
 }
 if(!m_startCommands.isEmpty())
 {
@@ -657,8 +697,15 @@
 m_endmotd = true;
 if(!m_startChannels.isEmpty())
 {
- sendJoin(m_startChannels);
- m_startChannels.clear();
+ if(preferences.m_joinDelay)
+ {
+ QTimer::singleShot(preferences.m_joinDelay*1000, this, SLOT(slotJoinDelay()));
+ }
+ else
+ {
+ sendJoin(m_startChannels);
+ m_startChannels.clear();
+ }
 }
 if(!m_startCommands.isEmpty())
 {
@@ -847,7 +894,11 @@
 {
 // nickLen, topicLen, kickLen, awayLen
 if(text.right(1) != " ") text.append(" ");
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 QStringList list = text.split(' ',QString::SkipEmptyParts);
+#else
+ QStringList list = text.split(' ',Qt::SkipEmptyParts);
+#endif
 for(int i=0; i<list.size(); i++)
 {
 QString parameter = listi.section('=',0,0);
@@ -1024,7 +1075,11 @@
 if(isUserIgnored(nick, from.section('!',1).section('@',0,0), from.section('@',1), to))
 return;
 emit ircCtcpRequest(nick, ctcpCommand);
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ sendCtcpNotice(nick, ctcpCommand+" "+QDateTime::currentDateTime().toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat)));
+#else
 sendCtcpNotice(nick, ctcpCommand+" "+QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate));
+#endif
 }
 else if(ctcpCommand == "BOATS")
 {
@@ -1423,7 +1478,11 @@
 {
 if(!m_startCommands.contains('\n')) m_startCommands.append('\n');
 if(m_startCommands.right(1) != "\n") m_startCommands.append('\n');
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 QStringList list = m_startCommands.split('\n', QString::SkipEmptyParts);
+#else
+ QStringList list = m_startCommands.split('\n', Qt::SkipEmptyParts);
+#endif
 for(int i=0; i < list.size(); i++)
 {
 sendCommand(listi);
@@ -1712,7 +1771,9 @@
 QString banHost = banmask.section('@',1);
 for(int i=0; i<m_nicks.size(); i++)
 {
- if(QRegExp(QString("\\<"+banNick+"\\>").replace("*","\\w*")).exactMatch(m_nicksi.nick) && QRegExp(QString(banUser+"\\>").replace("*","\\w*")).exactMatch(m_nicksi.user) && QRegExp(QString("\\<"+banHost+"\\>").replace("*","\\w*")).exactMatch(m_nicksi.host))
+ if(QRegularExpression(QString("\\<"+banNick+"\\>").replace("*","\\w*")).match(m_nicksi.nick).hasMatch()
+ && QRegularExpression(QString(banUser+"\\>").replace("*","\\w*")).match(m_nicksi.user).hasMatch()
+ && QRegularExpression(QString("\\<"+banHost+"\\>").replace("*","\\w*")).match(m_nicksi.host).hasMatch())
 nicks.append(m_nicksi.nick);
 }
 return nicks;
@@ -1753,9 +1814,9 @@
 inick = preferences.m_ignoreUsersListi.nick.section('!',0,0).toLower();
 iuser = preferences.m_ignoreUsersListi.nick.section('!',1).section('@',0,0).toLower();
 ihost = preferences.m_ignoreUsersListi.nick.section('@',1).toLower();
- if(QRegExp(QString("\\<"+inick+"\\>").replace("*","\\w*")).exactMatch(nick.toLower())) bnick = true;
- if(QRegExp(QString("\\<"+iuser+"\\>").replace("*","\\w*")).exactMatch(user.toLower()) || iuser.isEmpty()) buser = true;
- if(QRegExp(QString("\\<"+ihost+"\\>").replace("*","\\w*")).exactMatch(host.toLower()) || ihost.isEmpty()) bhost = true;
+ if(QRegularExpression(QString("\\<"+inick+"\\>").replace("*","\\w*")).match(nick.toLower()).hasMatch()) bnick = true;
+ if(QRegularExpression(QString("\\<"+iuser+"\\>").replace("*","\\w*")).match(user.toLower()).hasMatch() || iuser.isEmpty()) buser = true;
+ if(QRegularExpression(QString("\\<"+ihost+"\\>").replace("*","\\w*")).match(host.toLower()).hasMatch() || ihost.isEmpty()) bhost = true;
 if(bnick && buser && bhost)
 {
 if(preferences.m_ignoreUsersListi.channel == "all") bchannel = true;
@@ -1763,7 +1824,7 @@
 {
 for(int j=1; j<preferences.m_ignoreUsersListi.channel.count(',')+2; j++)
 {
- if(QRegExp(QString(dxutils::getParam(preferences.m_ignoreUsersListi.channel, j, false, ',')+"\\>").toLower().replace("*","\\w*")).exactMatch(on.toLower()))
+ if(QRegularExpression(QString(dxutils::getParam(preferences.m_ignoreUsersListi.channel, j, false, ',')+"\\>").toLower().replace("*","\\w*")).match(on.toLower()).hasMatch())
 {
 bchannel = true;
 break;
@@ -1772,10 +1833,10 @@
 }
 else
 {
- if(QRegExp(QString(preferences.m_ignoreUsersListi.channel+"\\>").toLower().replace("*","\\w*")).exactMatch(on.toLower())) bchannel = true;
+ if(QRegularExpression(QString(preferences.m_ignoreUsersListi.channel+"\\>").toLower().replace("*","\\w*")).match(on.toLower()).hasMatch()) bchannel = true;
 }
 if(preferences.m_ignoreUsersListi.network == "all") bnetwork = true;
- if(QRegExp(QString("\\<"+preferences.m_ignoreUsersListi.network+"\\>").toLower().replace("*","\\w*")).exactMatch(getNetworkName().toLower())) bnetwork = true;
+ if(QRegularExpression(QString("\\<"+preferences.m_ignoreUsersListi.network+"\\>").toLower().replace("*","\\w*")).match(getNetworkName().toLower()).hasMatch()) bnetwork = true;

dxirc-1.30.0.tar.xz/qt/engine/ircengine.h -> dxirc-1.40.1.tar.xz/qt/engine/ircengine.h Changed

dxirc-1.30.0.tar.xz/qt/logviewer/logdialog.cpp -> dxirc-1.40.1.tar.xz/qt/logviewer/logdialog.cpp Changed

dxirc-1.30.0.tar.xz/qt/logviewer/logitem.cpp -> dxirc-1.40.1.tar.xz/qt/logviewer/logitem.cpp Changed

dxirc-1.40.1.tar.xz/qt/notify/macnotify.h Added

@@ -0,0 +1,36 @@
+/*
+ * macnotify.h
+ *
+ * Copyright 2021 David Vachulka <arch_dvx@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef MACNOTIFY_H
+#define MACNOTIFY_H
+
+#include <QObject>
+#include <QString>
+
+class MacNotify : public QObject
+{
+ Q_OBJECT
+public:
+ void showNotify(const QString &text);
+ static MacNotify *instance();
+};
+
+#endif // MACNOTIFY_H

dxirc-1.40.1.tar.xz/qt/notify/macnotify.mm Added

@@ -0,0 +1,67 @@
+/*
+ * macnotify.cpp
+ *
+ * Copyright 2021 David Vachulka <arch_dvx@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "macnotify.h"
+#import <objc/runtime.h>
+#include <Cocoa/Cocoa.h>
+
+@implementation NSBundle(returnCorrectIdentifier)
+- (NSString *)__bundleIdentifier
+{
+ if(self == NSBundle mainBundle)
+ {
+ return @"org.dxirc.dxirc";
+ }
+ else
+ {
+ return self __bundleIdentifier;
+ }
+}
+@end
+
+void MacNotify::showNotify(const QString &text)
+{
+ NSUserNotification* userNotification = NSUserNotification alloc init;
+ userNotification.title = @"dxirc";
+ userNotification.informativeText = text.toNSString();
+ NSUserNotificationCenter defaultUserNotificationCenter deliverNotification: userNotification;
+ userNotification release;
+}
+
+MacNotify *MacNotify::instance()
+{
+ static MacNotify *s_instance = nullptr;
+ if(!s_instance)
+ {
+ s_instance = new MacNotify();
+ Class aPossibleClass = objc_getClass("NSBundle");
+ if(aPossibleClass)
+ {
+ // change NSBundle -bundleIdentifier method to return a correct bundle identifier
+ // a bundle identifier is required to use OSXs User Notification Center
+ method_exchangeImplementations(class_getInstanceMethod(aPossibleClass, @selector(bundleIdentifier)),
+ class_getInstanceMethod(aPossibleClass, @selector(__bundleIdentifier)));
+ }
+ }
+ return s_instance;
+}
+
+

dxirc-1.30.0.tar.xz/qt/notify/notifywindow.cpp -> dxirc-1.40.1.tar.xz/qt/notify/notifywindow.cpp Changed

dxirc-1.30.0.tar.xz/qt/preferences.cpp -> dxirc-1.40.1.tar.xz/qt/preferences.cpp Changed

@@ -25,6 +25,8 @@
 #include <QDesktopServices>
 #include <QProcessEnvironment>
 #include <QDir>
+#include <QStandardPaths>
+#include <QRegularExpression>
 #include "dxutils.h"
 #include "i18n.h"
 
@@ -36,6 +38,7 @@
 m_reconnect = false;
 m_numberAttempt = 1;
 m_delayAttempt = 20;
+ m_joinDelay = 2;
 m_maxAway = 200;
 m_closeToTray = true;
 m_useSpell = false;
@@ -44,23 +47,14 @@
 #ifdef Q_OS_WIN
 m_logPath = QProcessEnvironment::systemEnvironment().value("APPDATA")+"/dxirc/logs";
 #else
-#if(QT_VERSION > 0x050000)
 m_logPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0)+"/.dxirc/logs";
-#else
- m_logPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation)+"/.dxirc/logs";
-#endif //QT_VERSION
 #endif
 m_autoload = false;
-#if(QT_VERSION > 0x050000)
 m_autoloadPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
-#else
- m_autoloadPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
-#endif
 
 //Look tab in ConfigDialog
 m_unreadColor = QColor("blue");
 m_highlightColor = QColor("red");
- m_tabPosition = 0;
 
 //Irc Text settings pane in Configdialog
 m_colors.text = QColor(255,255,255);
@@ -87,11 +81,7 @@
 m_sortUserMode = false;
 
 //DCC settings pane in Configdialog
-#if(QT_VERSION > 0x050000)
 m_dccPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
-#else
- m_dccPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
-#endif
 m_dccIP = "";
 m_dccPortD = 0;
 m_dccPortH = 0;
@@ -160,6 +150,7 @@
 m_reconnect = set.value("reconnect", m_reconnect).toBool();
 m_numberAttempt = set.value("numberAttempt", m_numberAttempt).toInt();
 m_delayAttempt = set.value("delayAttempt", m_delayAttempt).toInt();
+ m_joinDelay = set.value("joinDelay", m_joinDelay).toInt();
 m_maxAway = set.value("maxAway", m_maxAway).toInt();
 m_closeToTray = set.value("closeToTray", m_closeToTray).toBool();
 m_useSpell = set.value("useSpell", m_useSpell).toBool();
@@ -173,7 +164,6 @@
 set.beginGroup("LOOK");
 m_unreadColor = set.value("unreadColor", m_unreadColor).value<QColor>();
 m_highlightColor = set.value("highlightColor", m_highlightColor).value<QColor>();
- m_tabPosition = set.value("tabPosition", m_tabPosition).toInt();
 set.endGroup();
 //Irc Text settings pane in Configdialog
 set.beginGroup("IRCTEXT");
@@ -204,7 +194,11 @@
 set.endGroup();
 //Ignore settings pane in Configdialog
 set.beginGroup("IGNORE");
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 m_ignoreCommandsList = set.value("commandsList", "").toString().split(';',QString::SkipEmptyParts);
+#else
+ m_ignoreCommandsList = set.value("commandsList", "").toString().split(';',Qt::SkipEmptyParts);
+#endif
 int usersNum = set.value("usersNumber", 0).toInt();
 m_ignoreUsersList.clear();
 if(usersNum)
@@ -222,14 +216,10 @@
 //DCC settings pane in Configdialog
 set.beginGroup("DCC");
 m_dccPath = set.value("dccPath", m_dccPath).toString();
-#if(QT_VERSION > 0x050000)
 if(!QDir(m_dccPath).exists()) m_dccPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
-#else
- if(!QDir(m_dccPath).exists()) m_dccPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
-#endif
 m_dccIP = set.value("dccIP", m_dccIP).toString();
- QRegExp rex("\\l");
- if(m_dccIP.count('.')!=3 || rex.exactMatch(m_dccIP)) m_dccIP = "";
+ QRegularExpression rex("\\l");
+ if(m_dccIP.count('.')!=3 || rex.match(m_dccIP).hasMatch()) m_dccIP = "";
 m_dccPortD = set.value("dccPortD", m_dccPortD).toInt();
 m_dccPortH = set.value("dccPortH", m_dccPortH).toInt();
 m_dccTimeout = set.value("dccTimeout", m_dccTimeout).toInt();
@@ -332,8 +322,8 @@
 set.beginGroup("KEYBINDINGS");
 if(m_defaultkeybindings.size())
 {
- QMap<QString,QKeySequence>::iterator it;
- for(it=m_defaultkeybindings.begin(); it!=m_defaultkeybindings.end(); ++it)
+ QMap<QString,QKeySequence>::const_iterator it;
+ for(it=m_defaultkeybindings.constBegin(); it!=m_defaultkeybindings.constEnd(); ++it)
 m_keybindings.insert(it.key(), set.value(it.key(), it.value()).toString());
 }
 set.endGroup();
@@ -351,6 +341,7 @@
 set.setValue("reconnect", m_reconnect);
 set.setValue("numberAttempt", m_numberAttempt);
 set.setValue("delayAttempt", m_delayAttempt);
+ set.setValue("joinDelay", m_joinDelay);
 set.setValue("maxAway", m_maxAway);
 set.setValue("closeToTray", m_closeToTray);
 set.setValue("useSpell", m_useSpell);
@@ -364,7 +355,6 @@
 set.beginGroup("LOOK");
 set.setValue("unreadColor", m_unreadColor);
 set.setValue("highlightColor", m_highlightColor);
- set.setValue("tabPosition", m_tabPosition);
 set.endGroup();
 //Irc Text settings pane in Configdialog
 set.beginGroup("IRCTEXT");
@@ -483,9 +473,9 @@
 set.setValue("number", m_langs.size());
 if(m_langs.size())
 {
- QMap<QString,QString>::iterator it;
+ QMap<QString,QString>::const_iterator it;
 int i;
- for(i=0, it=m_langs.begin(); it!=m_langs.end(); it++,i++)
+ for(i=0, it=m_langs.constBegin(); it!=m_langs.constBegin(); it++,i++)
 {
 set.setValue(QString("tab%1").arg(i), it.key());
 set.setValue(QString("lang%1").arg(i), it.value());
@@ -497,9 +487,9 @@
 set.setValue("number", aliases.size());
 if(aliases.size())
 {
- QMap<QString,QString>::iterator it;
+ QMap<QString,QString>::const_iterator it;
 int i;
- for(i=0,it=aliases.begin(); it!=aliases.end(); it++,i++)
+ for(i=0,it=aliases.constBegin(); it!=aliases.constEnd(); it++,i++)
 {
 set.setValue(QString("key%1").arg(i), it.key());
 set.setValue(QString("value%1").arg(i), it.value());
@@ -509,8 +499,8 @@
 set.beginGroup("KEYBINDINGS");
 if(m_keybindings.size())
 {
- QMap<QString,QKeySequence>::iterator it;
- for(it=m_keybindings.begin(); it!=m_keybindings.end(); ++it)
+ QMap<QString,QKeySequence>::const_iterator it;
+ for(it=m_keybindings.constBegin(); it!=m_keybindings.constEnd(); ++it)
 set.setValue(it.key(), it.value());
 }
 set.endGroup();
@@ -541,75 +531,75 @@
 m_namekeybindings.insert("serverList", _("Server list"));
 m_defaultkeybindings.insert("quickConnect", QKeySequence(Qt::Key_F7));
 m_namekeybindings.insert("quickConnect", _("Quick connect"));
- m_defaultkeybindings.insert("disconnect", QKeySequence(Qt::CTRL+Qt::Key_D));
+ m_defaultkeybindings.insert("disconnect", QKeySequence(Qt::CTRL|Qt::Key_D));
 m_namekeybindings.insert("disconnect", _("Disconnect"));
- m_defaultkeybindings.insert("dccTransfers", QKeySequence(Qt::CTRL+Qt::Key_T));
+ m_defaultkeybindings.insert("dccTransfers", QKeySequence(Qt::CTRL|Qt::Key_T));
 m_namekeybindings.insert("dccTransfers", _("DCC transfers"));
- m_defaultkeybindings.insert("scripts", QKeySequence(Qt::CTRL+Qt::Key_S));
+ m_defaultkeybindings.insert("scripts", QKeySequence(Qt::CTRL|Qt::Key_S));
 m_namekeybindings.insert("scripts", _("Scripts"));
- m_defaultkeybindings.insert("logViewer", QKeySequence(Qt::CTRL+Qt::Key_G));
+ m_defaultkeybindings.insert("logViewer", QKeySequence(Qt::CTRL|Qt::Key_G));
 m_namekeybindings.insert("logViewer", _("Log viewer"));
 #ifdef Q_OS_WIN32
- m_defaultkeybindings.insert("quit", QKeySequence(Qt::ALT+Qt::Key_F4));
+ m_defaultkeybindings.insert("quit", QKeySequence(Qt::ALT|Qt::Key_F4));
 #else
 m_defaultkeybindings.insert("quit", QKeySequence(QKeySequence::Quit));
 #endif //WIN32
 m_namekeybindings.insert("quit", _("Quit"));
- m_defaultkeybindings.insert("closeCurrentTab", QKeySequence(Qt::CTRL+Qt::Key_W));
+ m_defaultkeybindings.insert("closeCurrentTab", QKeySequence(Qt::CTRL|Qt::Key_W));
 m_namekeybindings.insert("closeCurrentTab", _("Close current tab"));
- m_defaultkeybindings.insert("clearWindow", QKeySequence(Qt::CTRL+Qt::Key_L));
+ m_defaultkeybindings.insert("clearWindow", QKeySequence(Qt::CTRL|Qt::Key_L));
 m_namekeybindings.insert("clearWindow", _("Clear window"));
- m_defaultkeybindings.insert("clearAllWindows", QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_L));
+ m_defaultkeybindings.insert("clearAllWindows", QKeySequence(Qt::CTRL|Qt::SHIFT|Qt::Key_L));
 m_namekeybindings.insert("clearAllWindows", _("Clear all windows"));
- m_defaultkeybindings.insert("usersList", QKeySequence(Qt::CTRL+Qt::Key_U));
+ m_defaultkeybindings.insert("usersList", QKeySequence(Qt::CTRL|Qt::Key_U));
 m_namekeybindings.insert("usersList", _("Users list"));
- m_defaultkeybindings.insert("spellList", QKeySequence(Qt::CTRL+Qt::Key_P));
+ m_defaultkeybindings.insert("spellList", QKeySequence(Qt::CTRL|Qt::Key_P));
 m_namekeybindings.insert("spellList", _("Spellchecking language list"));
 m_defaultkeybindings.insert("help", QKeySequence(Qt::Key_F1));
 m_namekeybindings.insert("help", _("Help"));

dxirc-1.30.0.tar.xz/qt/preferences.h -> dxirc-1.40.1.tar.xz/qt/preferences.h Changed

dxirc-1.30.0.tar.xz/qt/tabitems/boatstabitem.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/boatstabitem.cpp Changed

@@ -63,12 +63,21 @@
 {
 if(m_placeBoats)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ if(qRound(ev->position().x()) < SPACE || qRound(ev->position().x()) > SPACE+bcolumns*m_cell)
+ return;
+ if(qRound(ev->position().y()) < SPACE || qRound(ev->position().y()) > SPACE+brows*m_cell)
+ return;
+ int x = (qRound(ev->position().x())-SPACE)/m_cell;
+ int y = (qRound(ev->position().y())-SPACE)/m_cell;
+#else
 if(ev->x() < SPACE || ev->x() > SPACE+bcolumns*m_cell)
 return;
 if(ev->y() < SPACE || ev->y() > SPACE+brows*m_cell)
 return;
 int x = (ev->x()-SPACE)/m_cell;
 int y = (ev->y()-SPACE)/m_cell;
+#endif
 if(x>-1 && x<bcolumns && y>-1 && y<brows
 && m_mycellsxy.type == PLACED)
 {
@@ -98,12 +107,21 @@
 {
 if(m_onFire)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ if(qRound(ev->position().x()) < 6*SPACE+bcolumns*m_cell || qRound(ev->position().x()) > 6*SPACE+2*bcolumns*m_cell)
+ return;
+ if(qRound(ev->position().y()) < SPACE || qRound(ev->position().y()) > SPACE+brows*m_cell)
+ return;
+ int x = (qRound(ev->position().x())-6*SPACE-bcolumns*m_cell)/m_cell;
+ int y = (qRound(ev->position().y())-SPACE)/m_cell;
+#else
 if(ev->x() < 6*SPACE+bcolumns*m_cell || ev->x() > 6*SPACE+2*bcolumns*m_cell)
 return;
 if(ev->y() < SPACE || ev->y() > SPACE+brows*m_cell)
 return;
 int x = (ev->x()-6*SPACE-bcolumns*m_cell)/m_cell;
 int y = (ev->y()-SPACE)/m_cell;
+#endif
 if(x>-1 && x<bcolumns && y>-1 && y<brows
 && m_hiscellsxy.type == CLEAR)
 {
@@ -119,12 +137,21 @@
 {
 if(m_placeBoats)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ if(qRound(ev->position().x()) < SPACE || qRound(ev->position().x()) > SPACE+bcolumns*m_cell)
+ return;
+ if(qRound(ev->position().y()) < SPACE || qRound(ev->position().y()) > SPACE+brows*m_cell)
+ return;
+ int x = (qRound(ev->position().x())-SPACE)/m_cell;
+ int y = (qRound(ev->position().y())-SPACE)/m_cell;
+#else
 if(ev->x() < SPACE || ev->x() > SPACE+bcolumns*m_cell)
 return;
 if(ev->y() < SPACE || ev->y() > SPACE+brows*m_cell)
 return;
 int x = (ev->x()-SPACE)/m_cell;
 int y = (ev->y()-SPACE)/m_cell;
+#endif
 if(x>-1 && x<bcolumns && y>-1 && y<brows && isRightForPlaceBoat(x, y))
 {
 for(int i=0; i<m_cells; i++)
@@ -151,12 +178,21 @@
 {
 if(m_placeBoats)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ if(qRound(ev->position().x()) < SPACE || qRound(ev->position().x()) > SPACE+bcolumns*m_cell)
+ return;
+ if(qRound(ev->position().y()) < SPACE || qRound(ev->position().y()) > SPACE+brows*m_cell)
+ return;
+ int x = (qRound(ev->position().x())-SPACE)/m_cell;
+ int y = (qRound(ev->position().y())-SPACE)/m_cell;
+#else
 if(ev->x() < SPACE || ev->x() > SPACE+bcolumns*m_cell)
 return;
 if(ev->y() < SPACE || ev->y() > SPACE+brows*m_cell)
 return;
 int x = (ev->x()-SPACE)/m_cell;
 int y = (ev->y()-SPACE)/m_cell;
+#endif
 if((m_previousX!=x || m_previousY!=y)
 && m_previousX>-1 && m_previousX<bcolumns
 && m_previousY>-1 && m_previousY<brows)

dxirc-1.30.0.tar.xz/qt/tabitems/dcctabitem.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/dcctabitem.cpp Changed

@@ -88,6 +88,7 @@
 m_socket = new dxSocket();
 
 connect(m_commandline, SIGNAL(returnPressed()), this, SLOT(slotProcessCommandline()));
+ connect(m_spellLangs, SIGNAL(currentIndexChanged(int)), this, SLOT(slotSpellChanged()));
 connect(m_pipeTimer, SIGNAL(timeout()), this, SLOT(slotPipeTimeout()));
 connect(m_closeTimer, SIGNAL(timeout()), this, SLOT(slotCloseTimeout()));
 if(m_engine) connect(m_engine, SIGNAL(ircNick(QString,QString)), this, SLOT(slotIrcNick(QString,QString)));
@@ -392,18 +393,33 @@
 if(params.section(' ',0,0).contains("-o"))
 {
 m_sendPipe = true;
- m_pipe->start(params.section(' ',1));
+ appendIrcText(_("Command %1 started").arg(params.section(' ',1)), "", false, false);
+ m_pipe->setProgram(params.section(' ',1,1));
+ #if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+ m_pipe->setArguments(params.section(' ',2).split(' ', QString::SkipEmptyParts));
+ #else
+ m_pipe->setArguments(params.section(' ',2).split(' ', Qt::SkipEmptyParts));
+ #endif
+ m_pipe->start();
 }
 else if(params.section(' ',0,0).contains("-c"))
 {
 m_sendPipe = false;
+ appendIrcText(_("Command %1 stopped").arg(m_pipe->program()), "", false, false);
 m_pipeStrings.clear();
 m_pipe->close();
 }
 else
 {
 m_sendPipe = false;
- m_pipe->start(params);
+ appendIrcText(_("Command %1 started").arg(params), "", false, false);
+ m_pipe->setProgram(params.section(' ',0,0));
+ #if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+ m_pipe->setArguments(params.section(' ',1).split(' ', QString::SkipEmptyParts));
+ #else
+ m_pipe->setArguments(params.section(' ',1).split(' ', Qt::SkipEmptyParts));
+ #endif
+ m_pipe->start();
 }
 return true;
 }
@@ -611,7 +627,11 @@
 }
 QByteArray byteArray = m_pipe->readAllStandardOutput();
 bool isUtf8 = dxutils::isUtf8(byteArray);
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 QStringList lines = QString(isUtf8?QString::fromUtf8(byteArray):QString::fromLocal8Bit(byteArray)).split('\n', QString::SkipEmptyParts);
+#else
+ QStringList lines = QString(isUtf8?QString::fromUtf8(byteArray):QString::fromLocal8Bit(byteArray)).split('\n', Qt::SkipEmptyParts);
+#endif
 foreach(QString line, lines)
 {
 if(m_sendPipe)
@@ -692,9 +712,9 @@
 
 QStringList DccTabItem::cutText(QString text, int len)
 {
- register int previous = 0;
- register int s = -1;
- register int lw = 0;
+ int previous = 0;
+ int s = -1;
+ int lw = 0;
 QStringList texts;
 for(int i = 0; i<text.length(); i++)
 {
@@ -827,6 +847,12 @@
 m_closeTimer->stop();
 }
 
+void DccTabItem::slotSpellChanged()
+{
+ m_commandline->setLanguage(m_spellLangs->currentText());
+ m_commandline->setToolTip(_("Current spellchecking language: %1").arg(m_spellLangs->currentText()));
+}
+
 //Load lines from logs
 void DccTabItem::loadLogLines()
 {
@@ -848,7 +874,7 @@
 files << fileInfo.fileName();
 }
 }
- qSort(files.begin(), files.end(), caseInsensitiveLessThan);
+ std::sort(files.begin(), files.end(), caseInsensitiveLessThan);
 QStringList temp, result;
 for(int i=files.size()-1; i>-1; i--)
 {
@@ -891,7 +917,7 @@
 files << fileInfo.fileName();
 }
 }
- qSort(files.begin(), files.end(), caseInsensitiveLessThan);
+ std::sort(files.begin(), files.end(), caseInsensitiveLessThan);
 QApplication::restoreOverrideCursor();
 if(!files.size())
 {

dxirc-1.30.0.tar.xz/qt/tabitems/dcctabitem.h -> dxirc-1.40.1.tar.xz/qt/tabitems/dcctabitem.h Changed

dxirc-1.30.0.tar.xz/qt/tabitems/dxtabitem.h -> dxirc-1.40.1.tar.xz/qt/tabitems/dxtabitem.h Changed

dxirc-1.30.0.tar.xz/qt/tabitems/fttabitem.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/fttabitem.cpp Changed

@@ -65,7 +65,11 @@
 progressBarOption.state = QStyle::State_Enabled;
 progressBarOption.direction = QApplication::layoutDirection();
 progressBarOption.rect = option.rect;
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ progressBarOption.fontMetrics = QFontMetrics(QApplication::font());
+#else
 progressBarOption.fontMetrics = QApplication::fontMetrics();
+#endif
 progressBarOption.minimum = 0;
 progressBarOption.maximum = 100;
 progressBarOption.textAlignment = Qt::AlignCenter;
@@ -93,9 +97,15 @@
 setLayout(mainLayout);
 QFontMetrics fm = fontMetrics();
 QHeaderView *header = m_fileView->header();
+#if (QT_VERSION < QT_VERSION_CHECK(5, 11, 0))
 header->resizeSection(0, fm.width(" Downloading 1024 MB from 1024 MB for 666KB/s .."));
 header->resizeSection(1, fm.width(" Downloading 1024 MB from 1024 MB for 666KB/s .."));
 header->resizeSection(2, fm.width(headers.at(2) + " "));
+#else
+ header->resizeSection(0, fm.horizontalAdvance(" Downloading 1024 MB from 1024 MB for 666KB/s .."));
+ header->resizeSection(1, fm.horizontalAdvance(" Downloading 1024 MB from 1024 MB for 666KB/s .."));
+ header->resizeSection(2, fm.horizontalAdvance(headers.at(2) + " "));
+#endif
 
 m_details = new QGroupBox(_("Details"));
 QGridLayout *groupLayout = new QGridLayout;
@@ -126,13 +136,13 @@
 buttons->addButton(m_finished, QDialogButtonBox::ActionRole);
 connect(m_finished, SIGNAL(clicked()), this, SLOT(slotClearFinished()));
 mainLayout->addWidget(buttons);
- 
+
 m_position = new QTimer(this);
 
 connect(m_fileView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(slotItemChanged(QTreeWidgetItem*)));
 connect(m_fileView, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(slotItemPopup(const QPoint &)));
 connect(m_position, SIGNAL(timeout()), this, SLOT(slotPosition()));
- 
+
 m_position->start(1000);
 }

dxirc-1.30.0.tar.xz/qt/tabitems/fttabitem.h -> dxirc-1.40.1.tar.xz/qt/tabitems/fttabitem.h Changed

dxirc-1.30.0.tar.xz/qt/tabitems/ircitem.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/ircitem.cpp Changed

dxirc-1.30.0.tar.xz/qt/tabitems/ircitemsortmodel.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/ircitemsortmodel.cpp Changed

dxirc-1.30.0.tar.xz/qt/tabitems/irctabitem.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/irctabitem.cpp Changed

@@ -127,6 +127,7 @@
 if(m_type != CHANNEL) m_users->hide();
 
 connect(m_commandline, SIGNAL(returnPressed()), this, SLOT(slotProcessCommandline()));
+ connect(m_spellLangs, SIGNAL(currentIndexChanged(int)), this, SLOT(slotSpellChanged()));
 connect(m_topicline, SIGNAL(returnPressed()), this, SLOT(slotProcessTopicline()));
 connect(m_users, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotPopup(QPoint)));
 connect(m_users, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(slotDoubleClickUsers(QModelIndex)));
@@ -368,7 +369,11 @@
 if(num)
 {
 bool result = false;
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 QStringList commands = acommand.split("&&", QString::SkipEmptyParts);
+#else
+ QStringList commands = acommand.split("&&", Qt::SkipEmptyParts);
+#endif
 for(int i=0; i<=commands.size(); i++)
 {
 if(!commandsi.trimmed().isEmpty()) result = processCommand(commandsi.trimmed());
@@ -972,18 +977,33 @@
 if(params.section(' ',0,0).contains("-o"))
 {
 m_sendPipe = true;
- m_pipe->start(params.section(' ',1));
+ appendIrcText(_("Command %1 started").arg(params.section(' ',1)), "", false, false);
+ m_pipe->setProgram(params.section(' ',1,1));
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+ m_pipe->setArguments(params.section(' ',2).split(' ', QString::SkipEmptyParts));
+#else
+ m_pipe->setArguments(params.section(' ',2).split(' ', Qt::SkipEmptyParts));
+#endif
+ m_pipe->start();
 }
 else if(params.section(' ',0,0).contains("-c"))
 {
 m_sendPipe = false;
+ appendIrcText(_("Command %1 stopped").arg(m_pipe->program()), "", false, false);
 m_pipeStrings.clear();
 m_pipe->close();
 }
 else
 {
 m_sendPipe = false;
- m_pipe->start(params);
+ appendIrcText(_("Command %1 started").arg(params), "", false, false);
+ m_pipe->setProgram(params.section(' ',0,0));
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+ m_pipe->setArguments(params.section(' ',1).split(' ', QString::SkipEmptyParts));
+#else
+ m_pipe->setArguments(params.section(' ',1).split(' ', Qt::SkipEmptyParts));
+#endif
+ m_pipe->start();
 }
 return true;
 }
@@ -2091,7 +2111,11 @@
 {
 QByteArray byteArray = m_pipe->readAllStandardOutput();
 bool isUtf8 = dxutils::isUtf8(byteArray);
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 QStringList lines = QString(isUtf8?QString::fromUtf8(byteArray):QString::fromLocal8Bit(byteArray)).split('\n', QString::SkipEmptyParts);
+#else
+ QStringList lines = QString(isUtf8?QString::fromUtf8(byteArray):QString::fromLocal8Bit(byteArray)).split('\n', Qt::SkipEmptyParts);
+#endif
 foreach(QString line, lines)
 {
 if(m_sendPipe)
@@ -2611,7 +2635,7 @@
 files << fileInfo.fileName();
 }
 }
- qSort(files.begin(), files.end(), caseInsensitiveLessThan);
+ std::sort(files.begin(), files.end(), caseInsensitiveLessThan);
 QStringList temp, result;
 for(int i=files.size()-1; i>-1; i--)
 {
@@ -2654,7 +2678,7 @@
 files << fileInfo.fileName();
 }
 }
- qSort(files.begin(), files.end(), caseInsensitiveLessThan);
+ std::sort(files.begin(), files.end(), caseInsensitiveLessThan);
 QApplication::restoreOverrideCursor();
 if(!files.size())
 {
@@ -2694,9 +2718,9 @@
 
 QStringList IrcTabItem::cutText(QString text, int len)
 {
- register int previous = 0;
- register int s = -1;
- register int lw = 0;
+ int previous = 0;
+ int s = -1;
+ int lw = 0;
 QStringList texts;
 for(int i = 0; i<text.length(); i++)
 {
@@ -3488,7 +3512,11 @@
 if(QString::compare(channel, m_name, Qt::CaseInsensitive) == 0)
 {
 if(list && !isCommandIgnored("numeric")) appendIrcText(_("Users on %1: %2").arg(channel).arg(nicks), "", false, false);
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
 QStringList nicklist = nicks.split(' ', QString::SkipEmptyParts);
+#else
+ QStringList nicklist = nicks.split(' ', Qt::SkipEmptyParts);
+#endif
 foreach(QString nick, nicklist)
 {
 UserMode mode = getUserMode(nick0.toLatin1());
@@ -4091,3 +4119,9 @@
 emit ircQuery(m_engine, index.data().toString());
 }
 }
+
+void IrcTabItem::slotSpellChanged()
+{
+ m_commandline->setLanguage(m_spellLangs->currentText());
+ m_commandline->setToolTip(_("Current spellchecking language: %1").arg(m_spellLangs->currentText()));
+}

dxirc-1.30.0.tar.xz/qt/tabitems/irctabitem.h -> dxirc-1.40.1.tar.xz/qt/tabitems/irctabitem.h Changed

dxirc-1.30.0.tar.xz/qt/tabitems/tabwidget.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/tabwidget.cpp Changed

@@ -20,19 +20,146 @@
 */
 
 #include "tabwidget.h"
+#include <QVBoxLayout>
 
 TabWidget::TabWidget(QWidget *parent) :
- QTabWidget(parent)
+ QWidget(parent)
 {
- m_tabbar = tabBar();
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
+ m_splitter = new QSplitter(this);
+ m_splitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ m_navigation = new QListWidget(this);
+ m_splitter->addWidget(m_navigation);
+ m_switcher = new QStackedWidget(this);
+ m_splitter->addWidget(m_switcher);
+ m_splitter->setStretchFactor(0,2);
+ m_splitter->setStretchFactor(1,17);
+ mainLayout->addWidget(m_splitter);
+ setLayout(mainLayout);
+ connect(m_navigation, SIGNAL(currentRowChanged(int)), this, SLOT(slotRowChanged(int)));
 }
 
 void TabWidget::setTabTextColor(int index, const QColor &color)
 {
- m_tabbar->setTabTextColor(index, color);
+ if(index>-1 && index<m_navigation->count()) m_navigation->item(index)->setForeground(QBrush(color));
 }
 
 QColor TabWidget::tabTextColor(int index) const
 {
- return m_tabbar->tabTextColor(index);
+ if(index>-1 && index<m_navigation->count()) return m_navigation->item(index)->foreground().color();
+ return QColor();
+}
+
+QWidget *TabWidget::currentWidget() const
+{
+ return m_switcher->currentWidget();
+}
+
+void TabWidget::setCurrentWidget(QWidget *widget)
+{
+ m_switcher->setCurrentWidget(widget);
+}
+
+int TabWidget::indexOf(QWidget *w) const
+{
+ return m_switcher->indexOf(w);
+}
+
+int TabWidget::currentIndex() const
+{
+ return m_switcher->currentIndex();
+}
+
+int TabWidget::count() const
+{
+ return m_switcher->count();
+}
+
+QWidget *TabWidget::widget(int index) const
+{
+ return m_switcher->widget(index);
+}
+
+QString TabWidget::tabText(int index) const
+{
+ if(index>-1 && index<m_navigation->count()) return m_navigation->item(index)->text();
+ else return "";
+}
+
+void TabWidget::setTabText(int index, const QString &label)
+{
+ if(index>-1 && index<m_navigation->count()) m_navigation->item(index)->setText(label);
+}
+
+int TabWidget::addTab(QWidget *page, const QString &label)
+{
+ m_navigation->addItem(label);
+ return m_switcher->addWidget(page);
+}
+
+int TabWidget::addTab(QWidget *page, const QIcon &icon, const QString &label)
+{
+ m_navigation->addItem(new QListWidgetItem(icon, label));
+ return m_switcher->addWidget(page);
+}
+
+void TabWidget::setTabIcon(int index, const QIcon &icon)
+{
+ if(index>-1 && index<m_navigation->count()) m_navigation->item(index)->setIcon(icon);
+}
+
+void TabWidget::setCurrentIndex(int index)
+{
+ if(index>-1 && index<m_navigation->count())
+ {
+ m_navigation->setCurrentRow(index);
+ m_switcher->setCurrentIndex(index);
+ }
+}
+
+int TabWidget::insertTab(int index, QWidget *page, const QString &label)
+{
+ if(index>-1 && index<m_navigation->count())
+ {
+ setTabText(index, label);
+ setTabIcon(index, QIcon());
+ }
+ else
+ {
+ m_navigation->insertItem(index, label);
+ }
+ return m_switcher->insertWidget(index, page);
+}
+
+int TabWidget::insertTab(int index, QWidget *page, const QIcon &icon, const QString &label)
+{
+ if(index>-1 && index<m_navigation->count())
+ {
+ setTabText(index, label);
+ setTabIcon(index, icon);
+ }
+ else
+ {
+ m_navigation->insertItem(index, new QListWidgetItem(icon, label));
+ }
+ return m_switcher->insertWidget(index, page);
+}
+
+QIcon TabWidget::tabIcon(int index) const
+{
+ if(index>-1 && index<m_navigation->count()) return m_navigation->item(index)->icon();
+ return QIcon();
+}
+
+void TabWidget::removeTab(int index)
+{
+ QListWidgetItem *i = m_navigation->takeItem(index);
+ if(i) delete i;
+ m_switcher->removeWidget(widget(index));
+}
+
+void TabWidget::slotRowChanged(int index)
+{
+ m_switcher->setCurrentIndex(index);
+ emit currentChanged(index);
 }

dxirc-1.30.0.tar.xz/qt/tabitems/tabwidget.h -> dxirc-1.40.1.tar.xz/qt/tabitems/tabwidget.h Changed

@@ -22,10 +22,11 @@
 #ifndef TABWIDGET_H
 #define TABWIDGET_H
 
-#include <QTabWidget>
-#include <QTabBar>
+#include <QListWidget>
+#include <QStackedWidget>
+#include <QSplitter>
 
-class TabWidget : public QTabWidget
+class TabWidget : public QWidget
 {
 Q_OBJECT
 public:
@@ -33,8 +34,31 @@
 
 void setTabTextColor(int index, const QColor &color);
 QColor tabTextColor(int index) const;
+
+ QWidget *currentWidget() const;
+ void setCurrentWidget(QWidget *widget);
+ int indexOf(QWidget *w) const;
+ int currentIndex() const;
+ int count() const;
+ QWidget *widget(int index) const;
+ QString tabText(int index) const;
+ void setTabText(int index, const QString &label);
+ int addTab(QWidget *page, const QString &label);
+ int addTab(QWidget *page, const QIcon &icon, const QString &label);
+ void setTabIcon(int index, const QIcon &icon);
+ void setCurrentIndex(int index);
+ int insertTab(int index, QWidget *page, const QString &label);
+ int insertTab(int index, QWidget *page, const QIcon &icon, const QString &label);
+ QIcon tabIcon(int index) const;
+ void removeTab(int index);
 private:
- QTabBar *m_tabbar;
+ QSplitter *m_splitter;
+ QListWidget *m_navigation;
+ QStackedWidget *m_switcher;
+private slots:
+ void slotRowChanged(int);
+signals:
+ void currentChanged(int);
 };
 
 #endif // TABWIDGET_H

dxirc-1.30.0.tar.xz/qt/tabitems/tetristabitem.cpp -> dxirc-1.40.1.tar.xz/qt/tabitems/tetristabitem.cpp Changed

dxirc-1.30.0.tar.xz/qt/tabitems/tetristabitem.h -> dxirc-1.40.1.tar.xz/qt/tabitems/tetristabitem.h Changed

dxirc-1.30.0.tar.xz/qt/widgets/colorbutton.cpp -> dxirc-1.40.1.tar.xz/qt/widgets/colorbutton.cpp Changed

dxirc-1.30.0.tar.xz/qt/widgets/linespell.cpp -> dxirc-1.40.1.tar.xz/qt/widgets/linespell.cpp Changed

@@ -21,6 +21,7 @@
 
 #include <QAbstractTextDocumentLayout>
 #include <QKeyEvent>
+#include <QRegularExpression>
 #include "linespell.h"
 #include "config.h"
 #include "preferences.h"
@@ -37,15 +38,25 @@
 QTextCharFormat tcf;
 tcf.setUnderlineColor(QColor(255,0,0));
 tcf.setUnderlineStyle(QTextCharFormat::SpellCheckUnderline);
- QRegExp expression("\\b\\w+\\b");
+ QRegularExpression expression("\\b\\w+\\b");
 // Iterate through all words
- int index = text.indexOf(expression);
- while(index >= 0)
+ int startIndex = text.indexOf(expression);
+ while(startIndex >= 0)
 {
- int length = expression.matchedLength();
- if(!dxUtils.checkWord(expression.cap(), m_spellLang))
- setFormat(index, length, tcf);
- index = text.indexOf(expression, index + length);
+ QRegularExpressionMatch endMatch;
+ int endIndex = text.indexOf(expression, startIndex, &endMatch);
+ int length;
+ if(endIndex == -1)
+ {
+ length = text.length() - startIndex;
+ }
+ else
+ {
+ length = endIndex - startIndex + endMatch.capturedLength();
+ }
+ if(!dxUtils.checkWord(text.mid(startIndex,length), m_spellLang))
+ setFormat(startIndex, length, tcf);
+ startIndex = text.indexOf(expression, startIndex + length);
 }
 }
 }

dxirc-1.30.0.tar.xz/win/dxirc.iss -> dxirc-1.40.1.tar.xz/win/dxirc.iss Changed

@@ -1,7 +1,7 @@
 #define AppName "dxirc"
-#define AppVersion "1.30.0"
+#define AppVersion "1.40.1"
 #define AppPublisher "David Vachulka"
-#define AppURL "http://dxirc.org/"
+#define AppURL "https://dxirc.org/"
 #define AppNameFox "dxirc (FOX tookit)"
 #define AppExeNameFox "dxirc-fox.exe"
 #define AppNameQt "dxirc (Qt toolkit)"
@@ -22,7 +22,7 @@
 DefaultDirName={pf}\{#AppName}
 DefaultGroupName={#AppName}
 OutputBaseFilename={#AppName}-{#AppVersion}-setup
-LicenseFile=COPYING
+LicenseFile=bin\COPYING
 Compression=lzma
 SolidCompression=yes
 
@@ -70,28 +70,28 @@
 Name: "spell\sk"; Description: "{cm:SpellSk}"; Types: full
 
 Files
-Source: "*.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "*.dll"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
-Source: "COPYING"; DestDir: "{app}"; Flags: ignoreversion
-Source: "icons\*.png"; DestDir: "{app}\icons"; Flags: recursesubdirs
-Source: "icons\smileys\dxirc.smiley"; DestDir: "{app}\icons\smileys"; Flags: ignoreversion
-Source: "locale\*.mo"; DestDir: "{app}\locale"; Flags: recursesubdirs
-Source: "translations\*.qm"; DestDir: "{app}\translations"; Flags: recursesubdirs
-Source: "sounds\*.wav"; DestDir: "{app}\sounds"; Flags: recursesubdirs
+Source: "bin\*.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "bin\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs
+Source: "bin\COPYING"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "bin\icons\*.png"; DestDir: "{app}\bin\icons"; Flags: recursesubdirs
+Source: "bin\icons\smileys\dxirc.smiley"; DestDir: "{app}\bin\icons\smileys"; Flags: ignoreversion
+Source: "bin\locale\*.mo"; DestDir: "{app}\bin\locale"; Flags: recursesubdirs
+Source: "bin\translations\*.qm"; DestDir: "{app}\bin\translations"; Flags: recursesubdirs
+Source: "bin\sounds\*.wav"; DestDir: "{app}\bin\sounds"; Flags: recursesubdirs
 ; Spellcheking (enchant)
 Source: "lib\*.*"; DestDir: "{app}\lib"; Components: spell; 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
+Source: "share\enchant\hunspell\*en_US*"; DestDir: "{app}\share\enchant\hunspell"; Components: spell\en
+Source: "share\enchant\hunspell\*cs_CZ*"; DestDir: "{app}\share\enchant\hunspell"; Components: spell\cs
+Source: "share\enchant\hunspell\*sk_SK*"; DestDir: "{app}\share\enchant\hunspell"; Components: spell\sk
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 Icons
-Name: "{group}\{#AppNameFox}"; Filename: "{app}\{#AppExeNameFox}"
-Name: "{group}\{#AppNameQt}"; Filename: "{app}\{#AppExeNameQt}"
+Name: "{group}\{#AppNameFox}"; Filename: "{app}\bin\{#AppExeNameFox}"
+Name: "{group}\{#AppNameQt}"; Filename: "{app}\bin\{#AppExeNameQt}"
 Name: "{group}\{cm:ProgramOnTheWeb,{#AppName}}"; Filename: "{#AppURL}"
 Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#AppNameFox}"; Filename: "{app}\{#AppExeNameFox}"; Tasks: desktopicon
-Name: "{commondesktop}\{#AppNameQt}"; Filename: "{app}\{#AppExeNameQt}"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppNameFox}"; Filename: "{app}\{#AppExeNameFox}"; Tasks: quicklaunchicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppNameQt}"; Filename: "{app}\{#AppExeNameQt}"; Tasks: quicklaunchicon
+Name: "{commondesktop}\{#AppNameFox}"; Filename: "{app}\bin\{#AppExeNameFox}"; Tasks: desktopicon
+Name: "{commondesktop}\{#AppNameQt}"; Filename: "{app}\bin\{#AppExeNameQt}"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppNameFox}"; Filename: "{app}\bin\{#AppExeNameFox}"; Tasks: quicklaunchicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppNameQt}"; Filename: "{app}\bin\{#AppExeNameQt}"; Tasks: quicklaunchicon

dxirc-1.40.1.tar.xz/win/installdxirc Added

@@ -0,0 +1,63 @@
+#!/bin/bash
+if -z "$1" ; then
+ echo "Syntax: $0 <targetdir>" 1>&2
+ exit 1
+fi
+
+TARGET=$1
+
+mkdir -p "$TARGET"
+
+rm -rfv "$TARGET"/*
+
+mkdir -p "$TARGET/bin"
+
+cp ../COPYING "$TARGET/bin"
+
+rsync -a -m --include '*/' --include '*.wav' --exclude '*' ../data/sounds "$TARGET/bin"
+
+rsync -a -m --include '*/' --include '*.png' --include '*.smiley' --exclude '*' ../data/icons "$TARGET/bin"
+
+rsync -a -m --include '*/' --include 'qt*cs.qm' --exclude '*' /mingw32/share/qt5/translations "$TARGET/bin"
+
+rsync -a -m --include '*/' --include 'qwin*.dll' --exclude '*' /mingw32/share/qt5/plugins/platforms "$TARGET/bin"
+
+mkdir -p "$TARGET/bin/locale/cs/LC_MESSAGES"
+cp ../build/data/translations/cs.gmo "$TARGET/bin/locale/cs/LC_MESSAGES/dxirc.mo"
+
+mkdir -p "$TARGET/bin/locale/sk/LC_MESSAGES"
+cp ../build/data/translations/sk.gmo "$TARGET/bin/locale/sk/LC_MESSAGES/dxirc.mo"
+
+installapp ../build/fox "$TARGET/bin"
+installapp ../build/qt "$TARGET/bin"
+
+mkdir -p "$TARGET/lib"
+rsync -a -m --include '*/' --include '*.dll' --include '*.cache' --exclude '*' /mingw32/lib/enchant-2 "$TARGET/lib"
+
+mkdir -p "$TARGET/share/enchant"
+rsync -a -m --include '*/' --include '*.aff' --include '*.dic' --include '*.txt' --exclude '*' /mingw32/share/enchant/hunspell "$TARGET/share/enchant"
+
+DLLSOURCE=/mingw32/bin/
+copydll() {
+ b="$(basename $1)"
+ echo "Copy dll for '$b'"
+ strings "$1" | grep '\.dll' | while read dll
+ do
+ DLL=`find "$DLLSOURCE" -maxdepth 1 -name "$dll" -print -quit`
+ if ! -z "$DLL" ; then
+ FILE="$TARGET/bin/$(basename $DLL)"
+ if ! -f "$FILE" ; then
+ cp -a "$DLL" "$TARGET/bin/"
+ copydll "$DLL"
+ fi
+ fi
+ done
+}
+
+pacman -Ql mingw-w64-i686-openssl | grep '\.dll' | while read dll
+do
+ path=${dll#* }
+ copydll "$path"
+done
+
+find "$TARGET/lib/enchant-2" -name "*.dll" -print0 | while IFS= read -r -d '' file; do copydll "$file"; done
\ No newline at end of file

dxirc-1.40.1.tar.xz/win/installdxirc-fox Added

@@ -0,0 +1,58 @@
+#!/bin/bash
+if -z "$1" ; then
+ echo "Syntax: $0 <targetdir>" 1>&2
+ exit 1
+fi
+
+TARGET=$1
+
+mkdir -p "$TARGET"
+
+rm -rfv "$TARGET"/*
+
+mkdir -p "$TARGET/bin"
+
+cp ../COPYING "$TARGET/bin"
+
+rsync -a -m --include '*/' --include '*.wav' --exclude '*' ../data/sounds "$TARGET/bin"
+
+rsync -a -m --include '*/' --include '*.png' --include '*.smiley' --exclude '*' ../data/icons "$TARGET/bin"
+
+mkdir -p "$TARGET/bin/locale/cs/LC_MESSAGES"
+cp ../build/data/translations/cs.gmo "$TARGET/bin/locale/cs/LC_MESSAGES/dxirc.mo"
+
+mkdir -p "$TARGET/bin/locale/sk/LC_MESSAGES"
+cp ../build/data/translations/sk.gmo "$TARGET/bin/locale/sk/LC_MESSAGES/dxirc.mo"
+
+installapp ../build/fox "$TARGET/bin"
+
+mkdir -p "$TARGET/lib"
+rsync -a -m --include '*/' --include '*.dll' --include '*.cache' --exclude '*' /mingw32/lib/enchant-2 "$TARGET/lib"
+
+mkdir -p "$TARGET/share/enchant"
+rsync -a -m --include '*/' --include '*.aff' --include '*.dic' --include '*.txt' --exclude '*' /mingw32/share/enchant/hunspell "$TARGET/share/enchant"
+
+DLLSOURCE=/mingw32/bin/
+copydll() {
+ b="$(basename $1)"
+ echo "Copy dll for '$b'"
+ strings "$1" | grep '\.dll' | while read dll
+ do
+ DLL=`find "$DLLSOURCE" -maxdepth 1 -name "$dll" -print -quit`
+ if ! -z "$DLL" ; then
+ FILE="$TARGET/bin/$(basename $DLL)"
+ if ! -f "$FILE" ; then
+ cp -a "$DLL" "$TARGET/bin/"
+ copydll "$DLL"
+ fi
+ fi
+ done
+}
+
+pacman -Ql mingw-w64-i686-openssl | grep '\.dll' | while read dll
+do
+ path=${dll#* }
+ copydll "$path"
+done
+
+find "$TARGET/lib/enchant-2" -name "*.dll" -print0 | while IFS= read -r -d '' file; do copydll "$file"; done
\ No newline at end of file

dxirc-1.40.1.tar.xz/win/installdxirc-qt Added

@@ -0,0 +1,62 @@
+#!/bin/bash
+if -z "$1" ; then
+ echo "Syntax: $0 <targetdir>" 1>&2
+ exit 1
+fi
+
+TARGET=$1
+
+mkdir -p "$TARGET"
+
+rm -rfv "$TARGET"/*
+
+mkdir -p "$TARGET/bin"
+
+cp ../COPYING "$TARGET/bin"
+
+rsync -a -m --include '*/' --include '*.wav' --exclude '*' ../data/sounds "$TARGET/bin"
+
+rsync -a -m --include '*/' --include '*.png' --include '*.smiley' --exclude '*' ../data/icons "$TARGET/bin"
+
+rsync -a -m --include '*/' --include 'qt*cs.qm' --exclude '*' /mingw32/share/qt5/translations "$TARGET/bin"
+
+rsync -a -m --include '*/' --include 'qwin*.dll' --exclude '*' /mingw32/share/qt5/plugins/platforms "$TARGET/bin"
+
+mkdir -p "$TARGET/bin/locale/cs/LC_MESSAGES"
+cp ../build/data/translations/cs.gmo "$TARGET/bin/locale/cs/LC_MESSAGES/dxirc.mo"
+
+mkdir -p "$TARGET/bin/locale/sk/LC_MESSAGES"
+cp ../build/data/translations/sk.gmo "$TARGET/bin/locale/sk/LC_MESSAGES/dxirc.mo"
+
+installapp ../build/qt "$TARGET/bin"
+
+mkdir -p "$TARGET/lib"
+rsync -a -m --include '*/' --include '*.dll' --include '*.cache' --exclude '*' /mingw32/lib/enchant-2 "$TARGET/lib"
+
+mkdir -p "$TARGET/share/enchant"
+rsync -a -m --include '*/' --include '*.aff' --include '*.dic' --include '*.txt' --exclude '*' /mingw32/share/enchant/hunspell "$TARGET/share/enchant"
+
+DLLSOURCE=/mingw32/bin/
+copydll() {
+ b="$(basename $1)"
+ echo "Copy dll for '$b'"
+ strings "$1" | grep '\.dll' | while read dll
+ do
+ DLL=`find "$DLLSOURCE" -maxdepth 1 -name "$dll" -print -quit`
+ if ! -z "$DLL" ; then
+ FILE="$TARGET/bin/$(basename $DLL)"
+ if ! -f "$FILE" ; then
+ cp -a "$DLL" "$TARGET/bin/"
+ copydll "$DLL"
+ fi
+ fi
+ done
+}
+
+pacman -Ql mingw-w64-i686-openssl | grep '\.dll' | while read dll
+do
+ path=${dll#* }
+ copydll "$path"
+done
+
+find "$TARGET/lib/enchant-2" -name "*.dll" -print0 | while IFS= read -r -d '' file; do copydll "$file"; done
\ No newline at end of file

Changes of Revision 9