1

lidaobing · lidaobing · commit 861d8d914ccd · 2026-01-29T21:05:48.000-08:00
diff --git a/NEWS b/NEWS
@@ -3,6 +3,7 @@ Version 0.10.0
 Released: 2026-XX-XX
 
 Features:
+  * Add status icon mode setting in Preferences (no icon, normal, blinking).
   * [#711] Add macOS menu bar status item (NSStatusItem) with system tray icon.
 
 Version 0.9.4
diff --git a/src/api/iptux-core/ProgramData.h b/src/api/iptux-core/ProgramData.h
@@ -7,6 +7,7 @@
 
 #include "iptux-core/IptuxConfig.h"
 #include "iptux-core/Models.h"
+#include "iptux-core/StatusIconMode.h"
 
 namespace iptux {
 
@@ -53,6 +54,8 @@ class ProgramData {
   bool IsUsingBlacklist() const;
   bool IsFilterFileShareRequest() const;
   bool isHideTaskbarWhenMainWindowIconified() const;
+  int statusIconMode() const;
+  void setStatusIconMode(int value);
   void set_port(uint16_t port, bool is_init = false);
   void setOpenChat(bool value) { open_chat = value; }
   void setHideStartup(bool value) { hide_startup = value; }
@@ -108,6 +111,7 @@ class ProgramData {
   uint8_t proof_shared : 1;
   uint8_t hide_taskbar_when_main_window_iconified_ : 1;
   uint8_t need_restart_ : 1;
+  uint8_t status_icon_mode_ : 2;
 
  private:
   void InitSublayer();
diff --git a/src/api/iptux-core/StatusIconMode.h b/src/api/iptux-core/StatusIconMode.h
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+namespace iptux {
+
+enum StatusIconMode {
+  STATUS_ICON_MODE_NONE = 0,
+  STATUS_ICON_MODE_NORMAL = 1,
+  STATUS_ICON_MODE_BLINKING = 2,
+};
+
+}  // namespace iptux
diff --git a/src/config.h.in b/src/config.h.in
@@ -22,6 +22,12 @@
 #mesondefine SYSTEM_DARWIN
 #mesondefine HAVE_APPINDICATOR
 
+#if SYSTEM_DARWIN || HAVE_APPINDICATOR
+#define HAVE_STATUS_ICON 1
+#else
+#define HAVE_STATUS_ICON 0
+#endif
+
 #if defined(__APPLE__) || defined(__CYGWIN__)
 #define O_LARGEFILE 0
 #endif
diff --git a/src/iptux-core/ProgramData.cpp b/src/iptux-core/ProgramData.cpp
@@ -69,6 +69,7 @@ void ProgramData::WriteProgData() {
   config->SetBool("proof_shared", proof_shared);
   config->SetBool("hide_taskbar_when_main_window_iconified",
                   hide_taskbar_when_main_window_iconified_);
+  config->SetInt("status_icon_mode", status_icon_mode_);
   config->SetString("access_shared_limit", passwd);
   config->SetInt("send_message_retry_in_us", send_message_retry_in_us);
   WriteNetSegment();
@@ -144,6 +145,7 @@ void ProgramData::ReadProgData() {
   proof_shared = config->GetBool("proof_shared");
   hide_taskbar_when_main_window_iconified_ =
       config->GetBool("hide_taskbar_when_main_window_iconified");
+  status_icon_mode_ = config->GetInt("status_icon_mode", STATUS_ICON_MODE_NORMAL);
 
   passwd = config->GetString("access_shared_limit");
   send_message_retry_in_us =
@@ -245,6 +247,14 @@ bool ProgramData::isHideTaskbarWhenMainWindowIconified() const {
 #endif
 }
 
+int ProgramData::statusIconMode() const {
+  return status_icon_mode_;
+}
+
+void ProgramData::setStatusIconMode(int value) {
+  status_icon_mode_ = value;
+}
+
 ProgramData& ProgramData::SetUsingBlacklist(bool value) {
   open_blacklist = value;
   return *this;
diff --git a/src/iptux/AppIndicator.cpp b/src/iptux/AppIndicator.cpp
@@ -20,6 +20,8 @@ class IptuxAppIndicatorPrivate {
   IptuxAppIndicator* owner;
   AppIndicator* indicator;
   GtkBuilder* menuBuilder;
+  StatusIconMode mode = STATUS_ICON_MODE_NORMAL;
+  int unreadCount = 0;
 
   static void onScrollEvent(IptuxAppIndicatorPrivate* self) {
     self->owner->sigActivateMainWindow.emit();
@@ -57,11 +59,22 @@ IptuxAppIndicator::IptuxAppIndicator(GActionGroup* action_group) {
 }
 
 void IptuxAppIndicator::SetUnreadCount(int i) {
+  priv->unreadCount = i;
+  if (priv->mode == STATUS_ICON_MODE_NONE) return;
   if (i > 0) {
     app_indicator_set_status(priv->indicator, APP_INDICATOR_STATUS_ATTENTION);
   } else {
     app_indicator_set_status(priv->indicator, APP_INDICATOR_STATUS_ACTIVE);
   }
 }
 
+void IptuxAppIndicator::SetMode(StatusIconMode mode) {
+  priv->mode = mode;
+  if (mode == STATUS_ICON_MODE_NONE) {
+    app_indicator_set_status(priv->indicator, APP_INDICATOR_STATUS_PASSIVE);
+  } else {
+    SetUnreadCount(priv->unreadCount);
+  }
+}
+
 }  // namespace iptux
diff --git a/src/iptux/AppIndicator.h b/src/iptux/AppIndicator.h
@@ -5,12 +5,15 @@
 
 #include <memory>
 
+#include "iptux-core/StatusIconMode.h"
+
 namespace iptux {
 class IptuxAppIndicatorPrivate;
 class IptuxAppIndicator {
  public:
   IptuxAppIndicator(GActionGroup* action_group);
   void SetUnreadCount(int count);
+  void SetMode(StatusIconMode mode);
 
   sigc::signal<void> sigActivateMainWindow;
 
diff --git a/src/iptux/AppIndicatorDummy.cpp b/src/iptux/AppIndicatorDummy.cpp
@@ -8,4 +8,8 @@ IptuxAppIndicator::IptuxAppIndicator(GActionGroup*) {
 void IptuxAppIndicator::SetUnreadCount(int) {
   // Dummy implementation
 }
+
+void IptuxAppIndicator::SetMode(StatusIconMode) {
+  // Dummy implementation
+}
 }  // namespace iptux
diff --git a/src/iptux/AppIndicatorMac.mm b/src/iptux/AppIndicatorMac.mm
@@ -130,6 +130,8 @@ - (void)statusItemClicked:(id)sender {
   IptuxStatusItemHelper* helper = nil;
   NSImage* normalIcon = nil;
   NSImage* attentionIcon = nil;
+  StatusIconMode mode = STATUS_ICON_MODE_NORMAL;
+  int unreadCount = 0;
 };
 
 IptuxAppIndicator::IptuxAppIndicator(GActionGroup* action_group) {
@@ -185,7 +187,8 @@ - (void)statusItemClicked:(id)sender {
 }
 
 void IptuxAppIndicator::SetUnreadCount(int count) {
-  if (!priv->statusItem) return;
+  priv->unreadCount = count;
+  if (!priv->statusItem || priv->mode == STATUS_ICON_MODE_NONE) return;
 
   if (count > 0 && priv->attentionIcon) {
     priv->statusItem.button.image = priv->attentionIcon;
@@ -194,4 +197,13 @@ - (void)statusItemClicked:(id)sender {
   }
 }
 
+void IptuxAppIndicator::SetMode(StatusIconMode mode) {
+  priv->mode = mode;
+  if (!priv->statusItem) return;
+  priv->statusItem.visible = (mode != STATUS_ICON_MODE_NONE);
+  if (mode != STATUS_ICON_MODE_NONE) {
+    SetUnreadCount(priv->unreadCount);
+  }
+}
+
 }  // namespace iptux
diff --git a/src/iptux/Application.cpp b/src/iptux/Application.cpp
@@ -128,6 +128,7 @@ void Application::onStartup(Application& self) {
   if (self.enable_app_indicator_) {
     self.app_indicator =
         make_shared<IptuxAppIndicator>(G_ACTION_GROUP(self.app));
+    self.app_indicator->SetMode(StatusIconMode(self.data->statusIconMode()));
     self.app_indicator->sigActivateMainWindow.connect([&self]() {
       g_action_group_activate_action(G_ACTION_GROUP(self.app),
                                      "open_main_window", NULL);
@@ -392,6 +393,9 @@ void Application::onConfigChanged() {
   } else {
     add_accelerator(app, "win.send_message", "<Primary>Return");
   }
+  if (app_indicator) {
+    app_indicator->SetMode(StatusIconMode(data->statusIconMode()));
+  }
 }
 
 void Application::updateItemToTransTree(const TransFileModel& para) {
diff --git a/src/iptux/DataSettings.cpp b/src/iptux/DataSettings.cpp
@@ -28,6 +28,21 @@ using namespace std;
 
 namespace iptux {
 
+static const struct {
+  StatusIconMode mode;
+  const char* label;
+} kStatusIconModes[] = {
+    {STATUS_ICON_MODE_NONE, N_("No status icon")},
+    {STATUS_ICON_MODE_NORMAL, N_("Normal status icon")},
+    {STATUS_ICON_MODE_BLINKING, N_("Blinking status icon")},
+};
+
+enum {
+  STATUS_ICON_MODEL_COL_ID,
+  STATUS_ICON_MODEL_COL_LABEL,
+  STATUS_ICON_MODEL_N_COLS,
+};
+
 /**
  * 类构造函数.
  */
@@ -410,6 +425,35 @@ GtkWidget* DataSettings::CreateSystem() {
   g_datalist_set_data(&widset, "taskbar-check-widget", widget);
 #endif
 
+#if HAVE_STATUS_ICON
+  row++;
+  label = gtk_label_new(_("Status icon:"));
+  gtk_widget_set_halign(label, GTK_ALIGN_END);
+  gtk_grid_attach(GTK_GRID(box), label, 0, row, 1, 1);
+
+  {
+    auto store = gtk_list_store_new(STATUS_ICON_MODEL_N_COLS, G_TYPE_STRING,
+                                    G_TYPE_STRING);
+    for (const auto& entry : kStatusIconModes) {
+      GtkTreeIter iter;
+      gtk_list_store_append(store, &iter);
+      gtk_list_store_set(store, &iter, STATUS_ICON_MODEL_COL_ID,
+                         std::to_string(entry.mode).c_str(),
+                         STATUS_ICON_MODEL_COL_LABEL, _(entry.label), -1);
+    }
+    widget = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
+    g_object_unref(store);
+    gtk_combo_box_set_id_column(GTK_COMBO_BOX(widget),
+                                STATUS_ICON_MODEL_COL_ID);
+    auto cell = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), cell, TRUE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(widget), cell, "text",
+                                   STATUS_ICON_MODEL_COL_LABEL, NULL);
+  }
+  gtk_grid_attach(GTK_GRID(box), widget, 1, row, 1, 1);
+  g_datalist_set_data(&widset, "status-icon-mode-combo-widget", widget);
+#endif
+
   return GTK_WIDGET(box);
 }
 
@@ -597,6 +641,12 @@ void DataSettings::SetSystemValue() {
       GTK_TOGGLE_BUTTON(widget),
       g_progdt->isHideTaskbarWhenMainWindowIconified());
 #endif
+#if HAVE_STATUS_ICON
+  widget = GTK_WIDGET(
+      g_datalist_get_data(&widset, "status-icon-mode-combo-widget"));
+  gtk_combo_box_set_active_id(GTK_COMBO_BOX(widget),
+                              std::to_string(g_progdt->statusIconMode()).c_str());
+#endif
 }
 
 /**
@@ -961,6 +1011,12 @@ string DataSettings::ObtainSystemValue(bool dryrun) {
   widget = GTK_WIDGET(g_datalist_get_data(&widset, "taskbar-check-widget"));
   progdt->setHideTaskbarWhenMainWindowIconified(
       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
+#endif
+#if HAVE_STATUS_ICON
+  widget = GTK_WIDGET(
+      g_datalist_get_data(&widset, "status-icon-mode-combo-widget"));
+  progdt->setStatusIconMode(
+      std::stoi(gtk_combo_box_get_active_id(GTK_COMBO_BOX(widget))));
 #endif
   return oss.str();
 }

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,8 @@ IptuxAppIndicator::IptuxAppIndicator(GActionGroup*) {`
`8`	`8`	`void IptuxAppIndicator::SetUnreadCount(int) {`
`9`	`9`	`// Dummy implementation`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+void IptuxAppIndicator::SetMode(StatusIconMode) {`
	`13`	`+ // Dummy implementation`
	`14`	`+}`
`11`	`15`	`} // namespace iptux`