From 22378dd351c8bf56a42d5ab1887599e052713ada Mon Sep 17 00:00:00 2001 From: Nick Liu Date: Sat, 17 Apr 2021 21:47:53 -0500 Subject: [PATCH] Pidgin `To`: Only skip "with" chat rows from events --- README.txt | 19 +++++++++++-------- about.ui | 2 +- formats/pidgin.cpp | 4 +--- update.h | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.txt b/README.txt index 17c88fa..47a1e18 100644 --- a/README.txt +++ b/README.txt @@ -4,7 +4,7 @@ # !! IMPORTANT INFORMATION ! IMPORTANT INFORMATION ! IMPORTANT INFORMATION !! # ############################################################################### # The Log2Log v1.x branch has been deprecated. This is the final release of # -# Log2Log v1.x (v1.0.9) as of 04 November 2020. You may ask for a customized # +# Log2Log v1.x (v1.0.10) as of 17 April 2021. You may ask for a customized # # release; Deltik will help you support new format converters if you ask. # # # # Development is paused due to a lack of interest in the Log2Log project and # @@ -29,11 +29,11 @@ ╔═══════════════════════════════════════════╤═╤═╤═╗ ║Information │-│■│X║ ╟───────────────────────────────────────────┴─┴─┴─╢ -║Version: 1.0.9 (v1.0.9) ║ +║Version: 1.0.10 (v1.0.10) ║ ║Website: https://www.deltik.org/ ║ ║Information: https://log2log.sourceforge.io/ ║ ║E-Mail: deltik@gmx.com ║ -║Release Date: 2020-11-07 ║ +║Release Date: 2021-04-17 ║ ╚═════════════════════════════════════════════════╝ @@@@@@@@@@@@@@@@@@@@@@@@@ @@ -84,8 +84,8 @@ Install Log2Log in three easy steps: ┌─────────┐ │ WINDOWS │ └─────────┘ - 1. Open "Setup.exe". - 2. Follow the installer instructions. + 1. Save the Log2Log ".exe" file somewhere. + 2. There is no installer; just run the ".exe" file to use Log2Log. 3. There is no step 3. ┌──────────┐ @@ -109,7 +109,7 @@ Install Log2Log in three easy steps: ++++++++++++++++++++++++++++++ + CONFIGURATION AND FEATURES + ++++++++++++++++++++++++++++++ -Log2Log v1.0.9 does not have any configurable options. Is there something you +Log2Log v1.0.10 does not have any configurable options. Is there something you want to be configurable? Suggest it to the project manager (email address in the "More Information" section)! @@ -180,10 +180,10 @@ converter compatibility, see the "Configuration and Features" section. 2. Converting chat log formats is no easy task. Note that Log2Log converters might not be 100% successful at converting chat logs. -3. Time zone compatibility is rough as of v1.0.9. +3. Time zone compatibility is rough as of v1.0.10. 4. Languages other than English have not been figured out for format - converters as of v1.0.9. The Log2Log team would greatly appreciate it if + converters as of v1.0.10. The Log2Log team would greatly appreciate it if you could develop a translation system for us. 5. This project would like help. If you would like to contribute to Log2Log in @@ -206,6 +206,9 @@ You can contact the developer, too: +++++++++++++++++++ + VERSION HISTORY + +++++++++++++++++++ +1.0.10 (2021-04-17) + - FIX: Pidgin `To` format converter might skip some chat rows sent from the other party + 1.0.9 (2020-11-07) - FIX: Pidgin `From` format converter handled neither 12 AM nor 12 PM correctly diff --git a/about.ui b/about.ui index e627839..0d6c1d7 100644 --- a/about.ui +++ b/about.ui @@ -51,7 +51,7 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:2px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/etc/favicon.ico" /><span style=" font-family:'Ubuntu'; font-size:11pt;"><br /></span><span style=" font-family:'Ubuntu'; font-size:20pt; font-weight:600;">Log2Log VERSION</span></p> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">All-In-One Chat Log Converter</span></p> -<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt;">Copyright © 2011-2020 Deltik</span></p></body></html> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:9pt;">Copyright © 2011-2021 Deltik</span></p></body></html> diff --git a/formats/pidgin.cpp b/formats/pidgin.cpp index eae53fd..c51444c 100644 --- a/formats/pidgin.cpp +++ b/formats/pidgin.cpp @@ -868,9 +868,7 @@ QVariant Pidgin::generate(StdFormat *$log) $sender == $self_alias) $sender_color = "#16569E"; // Color: Sent by _self - if ($sender == "_with" || - $sender == $with || - $sender == $with_alias) + else if (!$sender.contains(QRegExp("^_(evt_|group_|error)"))) $sender_color = "#A82F2F"; if (!$sender_color.isEmpty()) diff --git a/update.h b/update.h index cc8a101..923008f 100644 --- a/update.h +++ b/update.h @@ -1,4 +1,4 @@ -#define VERSION "1.0.9" +#define VERSION "1.0.10" #define DL_SOURCE "https://log2log.sourceforge.io/update/" /**