Merge branch 'master' into refactor_udp

.github/workflows/ci.yml

@@ -114,14 +114,14 @@ jobs:
       matrix:
         include:
           - arch: aarch64
-            distro: ubuntu20.04
+            distro: ubuntu22.04
           - arch: ppc64le
-            distro: ubuntu20.04
+            distro: ubuntu22.04
           #- arch: s390x
           #  distro: ubuntu20.04
           - arch: armv7
-            distro: ubuntu20.04
-          #- arch: armv6
+            distro: ubuntu22.04
+          #- arch: armv7
           #  distro: bookworm
 
     steps:

NEWS

@@ -1,3 +1,14 @@
+Version 0.9.1
+~~~~~~~~~~~~~
+Released: 2024-05-12
+
+Bugfixes:
+ * [#577] fix UT timeout when run without browser and a new meson version.
+
+Translation:
+ * [#576] update Spanish translation. Thanks to gallegonovato.
+ * [#579] update Traditional Chinese translation. Thanks to xiao sheng wen.
+
 Version 0.9.0
 ~~~~~~~~~~~~~
 Released: 2024-05-09

meson.build

@@ -1,9 +1,9 @@
 project('iptux', 'cpp',
     license: 'GPL2+',
-    version: '0.9.0',
+    version: '0.9.1',
     default_options: ['warning_level=3', 'cpp_std=c++14'])
 add_global_arguments('-Werror=format', language : 'cpp')
-so_version = '0.9.0'
+so_version = '0.9.1'
 subdir('src')
 subdir('share')
 subdir('po')

po/cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2013-04-15 18:07+0000\n"
 "Last-Translator: Jakub Jezbera <Unknown>\n"
 "Language-Team: Czech <[email protected]>\n"

po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2021-05-17 00:40+0000\n"
 "Last-Translator: J. Lavoie <[email protected]>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/iptux/iptux/de/>\n"

po/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2018-01-22 06:45+0000\n"
 "Last-Translator: zhangjiejing <Unknown>\n"
 "Language-Team: English (United Kingdom) <[email protected]>\n"

po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2024-05-11 08:00+0000\n"
 "Last-Translator: gallegonovato <[email protected]>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/iptux/iptux/es/"

po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2021-05-17 00:40+0000\n"
 "Last-Translator: J. Lavoie <[email protected]>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/iptux/iptux/fr/>\n"

po/gl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2010-05-03 13:06+0000\n"
 "Last-Translator: Dario <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"

po/iptux.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: iptux 0.9.0\n"
+"Project-Id-Version: iptux 0.9.1\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

po/it.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2021-05-17 00:40+0000\n"
 "Last-Translator: J. Lavoie <[email protected]>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/iptux/iptux/it/"

po/lb.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2010-08-30 21:09+0000\n"
 "Last-Translator: n0a3n <[email protected]>\n"
 "Language-Team: Luxembourgish <[email protected]>\n"

po/nb_NO.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux 0.8.0-b2\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2021-05-10 08:34+0000\n"
 "Last-Translator: Allan Nordhøy <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/iptux/"

po/pl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2024-03-18 15:02+0000\n"
 "Last-Translator: Eryk Michalak <[email protected]>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/iptux/iptux/pl/>\n"

po/pt.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux 0.8.3\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2023-03-19 11:37+0000\n"
 "Last-Translator: ssantos <[email protected]>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/iptux/iptux/"

po/pt_BR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2021-11-23 16:33+0000\n"
 "Last-Translator: inkhorn <[email protected]>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"

po/ru.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2021-04-11 23:02+0000\n"
 "Last-Translator: Artem <[email protected]>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/iptux/iptux/ru/"

po/uk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2024-01-08 13:06+0000\n"
 "Last-Translator: Сергій <[email protected]>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/iptux/iptux/uk/"

po/zh_CN.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux 0.6.3\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2024-05-13 03:47+0000\n"
 "Last-Translator: LI Daobing <[email protected]>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"

po/zh_TW.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: iptux 0.6.3\n"
 "Report-Msgid-Bugs-To: https://github.com/iptux-src/iptux/issues/new\n"
-"POT-Creation-Date: 2024-05-12 20:36-0700\n"
+"POT-Creation-Date: 2024-05-12 22:10-0700\n"
 "PO-Revision-Date: 2010-03-26 00:21+0800\n"
 "Last-Translator: zhangjiejing <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -975,11 +975,11 @@ msgstr ""
 msgid "Can't open URL: %s, reason: %s"
 msgstr ""
 
-#: src/iptux/UiHelper.cpp:174 src/iptux/UiHelper.cpp:169
+#: src/iptux/UiHelper.cpp:174
 msgid "Information"
 msgstr "資訊"
 
-#: src/iptux/UiHelper.cpp:204 src/iptux/UiHelper.cpp:199
+#: src/iptux/UiHelper.cpp:204
 msgid "Warning"
 msgstr "警告"
 
@@ -1367,14 +1367,8 @@ msgstr ""
 msgid "option parsing failed: %s\n"
 msgstr "打開目錄\"%s\"失敗，%s"
 
-#: src/iptux/UiHelper.cpp:51
-msgid "Can't find any available web browser!\n"
-msgstr "未發現可用的瀏覽器！\n"
-
-#: src/iptux/UiHelper.cpp:28
-#, c-format
-msgid "Open URL: %s\n"
-msgstr ""
+#~ msgid "Can't find any available web browser!\n"
+#~ msgstr "未發現可用的瀏覽器！\n"
 
 #, fuzzy
 #~ msgid "Close Chat"

share/metainfo/io.github.iptux_src.iptux.metainfo.xml

@@ -9,17 +9,17 @@
 
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
-  <content_rating type="oars-1.0"/>
+  <content_rating type="oars-1.0" />
 
   <description>
     <p>
       iptux is an “IP Messenger” client. The features of iptux include:
     </p>
     <ul>
-    <li>auto-detect other clients on the intranet.</li>
-    <li>send/recv messages to other clients.</li>
-    <li>send/recv files to other clients.</li>
-    <li>share your files to other cliens (with optional password protection).</li>
+      <li>auto-detect other clients on the intranet.</li>
+      <li>send/recv messages to other clients.</li>
+      <li>send/recv files to other clients.</li>
+      <li>share your files to other cliens (with optional password protection).</li>
     </ul>
     <p>
       It is (supposedly) compatible with 飞鸽传书 (Feige) and 飞秋 (FeiQ) from China,
@@ -40,6 +40,14 @@
     <category>GTK</category>
   </categories>
 
+  <keywords>
+    <keyword>chat</keyword>
+    <keyword>im</keyword>
+    <keyword>file transfer</keyword>
+    <keyword>ipmsg</keyword>
+    <keyword>feige</keyword>
+  </keywords>
+
   <translation type="gettext">iptux</translation>
   <url type="homepage">https://github.com/iptux-src/iptux</url>
   <url type="bugtracker">https://github.com/iptux-src/iptux/issues</url>

src/api/iptux-core/CoreThread.h

@@ -110,6 +110,8 @@ class CoreThread {
    * @return std::shared_ptr<const Event>
    */
   std::shared_ptr<const Event> getLastEvent() const;
+  bool HasEvent() const;
+  std::shared_ptr<const Event> PopEvent();
 
   const std::string& GetAccessPublicLimit() const;
   void SetAccessPublicLimit(const std::string& val);
@@ -193,7 +195,6 @@ class CoreThread {
 
  private:
   void bind_iptux_port();
-  void processEvents();
 
  private:
   static void RecvUdpData(CoreThread* pcthrd);

src/api/iptux-core/Event.h

@@ -22,18 +22,32 @@ enum class EventType {
   CONFIG_CHANGED,
 };
 
+const char* EventTypeToStr(EventType type);
+
 class Event {
  public:
   explicit Event(EventType type);
   virtual ~Event() = default;
 
   EventType getType() const;
+  virtual std::string getSource() const;
 
  private:
   EventType type;
 };
 
-class NewPalOnlineEvent : public Event {
+class PalEvent : public Event {
+ public:
+  explicit PalEvent(PalKey palKey, EventType type)
+      : Event(type), palKey(palKey) {}
+  const PalKey& GetPalKey() const { return palKey; }
+  std::string getSource() const override;
+
+ private:
+  PalKey palKey;
+};
+
+class NewPalOnlineEvent : public PalEvent {
  public:
   explicit NewPalOnlineEvent(CPPalInfo palInfo);
   CPPalInfo getPalInfo() const;
@@ -42,7 +56,7 @@ class NewPalOnlineEvent : public Event {
   CPPalInfo palInfo;
 };
 
-class PalUpdateEvent : public Event {
+class PalUpdateEvent : public PalEvent {
  public:
   explicit PalUpdateEvent(CPPalInfo palInfo);
   CPPalInfo getPalInfo() const;
@@ -51,7 +65,7 @@ class PalUpdateEvent : public Event {
   CPPalInfo palInfo;
 };
 
-class NewMessageEvent : public Event {
+class NewMessageEvent : public PalEvent {
  public:
   explicit NewMessageEvent(MsgPara&& msgPara);
   const MsgPara& getMsgPara() const;
@@ -60,43 +74,27 @@ class NewMessageEvent : public Event {
   MsgPara msgPara;
 };
 
-class PalOfflineEvent : public Event {
+class PalOfflineEvent : public PalEvent {
  public:
   explicit PalOfflineEvent(PalKey palKey);
-  const PalKey& GetPalKey() const;
-
- private:
-  PalKey palKey;
 };
 
-class IconUpdateEvent : public Event {
+class IconUpdateEvent : public PalEvent {
  public:
   explicit IconUpdateEvent(PalKey palKey)
-      : Event(EventType::ICON_UPDATE), palKey(palKey) {}
-  const PalKey& GetPalKey() const { return palKey; }
-
- private:
-  PalKey palKey;
+      : PalEvent(palKey, EventType::ICON_UPDATE) {}
 };
 
-class PasswordRequiredEvent : public Event {
+class PasswordRequiredEvent : public PalEvent {
  public:
   explicit PasswordRequiredEvent(PalKey palKey)
-      : Event(EventType::PASSWORD_REQUIRED), palKey(palKey) {}
-  const PalKey& GetPalKey() const { return palKey; }
-
- private:
-  PalKey palKey;
+      : PalEvent(palKey, EventType::PASSWORD_REQUIRED) {}
 };
 
-class PermissionRequiredEvent : public Event {
+class PermissionRequiredEvent : public PalEvent {
  public:
   explicit PermissionRequiredEvent(PalKey palKey)
-      : Event(EventType::PERMISSION_REQUIRED), palKey(palKey) {}
-  const PalKey& GetPalKey() const { return palKey; }
-
- private:
-  PalKey palKey;
+      : PalEvent(palKey, EventType::PERMISSION_REQUIRED) {}
 };
 
 class NewShareFileFromFriendEvent : public Event {