mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-19 04:00:19 +00:00
Unified tray menu icon definitions to always use the zc-menu-* identifiers (instead of conditional stock GTK icons), so Preferences/Quit resolve through the same menu icon set on all builds.
Unified plugin manager action icons to use zc-menu-load-plugin, zc-menu-delete, and zc-menu-refresh across platforms. Unified channel list action icons to only use the zc-menu-* icon names (join/copy/find/refresh/save), matching data/icons/menu usage. Unified spell-entry menu action icons to only use zc-menu-add, zc-menu-remove, and zc-menu-spell-check.
This commit is contained in:
@@ -45,20 +45,11 @@
|
|||||||
|
|
||||||
#include "custom-list.h"
|
#include "custom-list.h"
|
||||||
|
|
||||||
#if HAVE_GTK3
|
|
||||||
#define ICON_CHANLIST_JOIN "zc-menu-join"
|
#define ICON_CHANLIST_JOIN "zc-menu-join"
|
||||||
#define ICON_CHANLIST_COPY "zc-menu-copy"
|
#define ICON_CHANLIST_COPY "zc-menu-copy"
|
||||||
#define ICON_CHANLIST_FIND "zc-menu-find"
|
#define ICON_CHANLIST_FIND "zc-menu-find"
|
||||||
#define ICON_CHANLIST_REFRESH "zc-menu-refresh"
|
#define ICON_CHANLIST_REFRESH "zc-menu-refresh"
|
||||||
#define ICON_CHANLIST_SAVE "zc-menu-save"
|
#define ICON_CHANLIST_SAVE "zc-menu-save"
|
||||||
#endif
|
|
||||||
#if !HAVE_GTK3
|
|
||||||
#define ICON_CHANLIST_JOIN GTK_STOCK_JUMP_TO
|
|
||||||
#define ICON_CHANLIST_COPY GTK_STOCK_COPY
|
|
||||||
#define ICON_CHANLIST_FIND GTK_STOCK_FIND
|
|
||||||
#define ICON_CHANLIST_REFRESH GTK_STOCK_REFRESH
|
|
||||||
#define ICON_CHANLIST_SAVE GTK_STOCK_SAVE_AS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -43,12 +43,10 @@ typedef struct _GtkStatusIcon GtkStatusIcon;
|
|||||||
#include <libappindicator/app-indicator.h>
|
#include <libappindicator/app-indicator.h>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#define ICON_TRAY_PREFERENCES "zc-menu-preferences"
|
#define ICON_TRAY_PREFERENCES "zc-menu-preferences"
|
||||||
#define ICON_TRAY_QUIT "zc-menu-quit"
|
#define ICON_TRAY_QUIT "zc-menu-quit"
|
||||||
#else
|
|
||||||
#define ICON_TRAY_PREFERENCES GTK_STOCK_PREFERENCES
|
|
||||||
#define ICON_TRAY_QUIT GTK_STOCK_QUIT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|||||||
@@ -64,16 +64,9 @@ plugingui_get_target_session (void)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAVE_GTK3
|
|
||||||
#define ICON_PLUGIN_LOAD "zc-menu-load-plugin"
|
#define ICON_PLUGIN_LOAD "zc-menu-load-plugin"
|
||||||
#define ICON_PLUGIN_UNLOAD "zc-menu-delete"
|
#define ICON_PLUGIN_UNLOAD "zc-menu-delete"
|
||||||
#define ICON_PLUGIN_RELOAD "zc-menu-refresh"
|
#define ICON_PLUGIN_RELOAD "zc-menu-refresh"
|
||||||
#endif
|
|
||||||
#if !HAVE_GTK3
|
|
||||||
#define ICON_PLUGIN_LOAD GTK_STOCK_REVERT_TO_SAVED
|
|
||||||
#define ICON_PLUGIN_UNLOAD GTK_STOCK_DELETE
|
|
||||||
#define ICON_PLUGIN_RELOAD GTK_STOCK_REFRESH
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if HAVE_GTK3
|
#if HAVE_GTK3
|
||||||
static GtkWidget *
|
static GtkWidget *
|
||||||
|
|||||||
@@ -59,16 +59,9 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_GTK3
|
|
||||||
#define ICON_ADD "zc-menu-add"
|
#define ICON_ADD "zc-menu-add"
|
||||||
#define ICON_REMOVE "zc-menu-remove"
|
#define ICON_REMOVE "zc-menu-remove"
|
||||||
#define ICON_SPELL_CHECK "zc-menu-spell-check"
|
#define ICON_SPELL_CHECK "zc-menu-spell-check"
|
||||||
#endif
|
|
||||||
#if !HAVE_GTK3
|
|
||||||
#define ICON_ADD GTK_STOCK_ADD
|
|
||||||
#define ICON_REMOVE GTK_STOCK_REMOVE
|
|
||||||
#define ICON_SPELL_CHECK GTK_STOCK_SPELL_CHECK
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Bunch of poop to make enchant into a runtime dependency rather than a
|
* Bunch of poop to make enchant into a runtime dependency rather than a
|
||||||
|
|||||||
Reference in New Issue
Block a user