mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-10 07:50:19 +00:00
Updated the Network List Connect button icon on GTK3 to use the bundled zc-menu-connect asset, which avoids theme-dependent missing network-connect behavior.
Added a Help menu _Update entry with a dedicated zc-menu-update icon constant, so Windows builds can display an appropriate update icon in the Help menu.
Extended icon mapping/fallback logic so emoji/update icons resolve correctly across stock/icon-name paths (zc-menu-emoji, zc-menu-update) including GTK2 stock fallback compatibility.
Added zc-menu-emoji to the input entry fallback icon list so the emoji affordance has a deterministic built-in fallback when theme emoji icons are missing.
Added new update and emoji icon assets in both SVG and PNG for light/dark variants, and registered the PNG resources in the gresource manifest for runtime loading.
This commit is contained in:
@@ -96,6 +96,7 @@ gtkutil_menu_custom_icon_from_stock (const char *stock_name)
|
||||
{ "gtk-go-forward", "zc-menu-next" },
|
||||
{ "gtk-help", "zc-menu-help" },
|
||||
{ "gtk-about", "zc-menu-about" },
|
||||
{ "gtk-convert", "zc-menu-emoji" },
|
||||
};
|
||||
size_t i;
|
||||
|
||||
@@ -143,6 +144,9 @@ gtkutil_menu_custom_icon_from_icon_name (const char *icon_name)
|
||||
{ "go-next", "zc-menu-next" },
|
||||
{ "help-browser", "zc-menu-help" },
|
||||
{ "help-about", "zc-menu-about" },
|
||||
{ "face-smile", "zc-menu-emoji" },
|
||||
{ "insert-emoticon", "zc-menu-emoji" },
|
||||
{ "software-update-available", "zc-menu-update" },
|
||||
{ "network-workgroup", "zc-menu-chanlist" },
|
||||
};
|
||||
size_t i;
|
||||
@@ -195,6 +199,8 @@ gtkutil_stock_from_menu_custom_icon (const char *custom_icon)
|
||||
{ "zc-menu-next", GTK_STOCK_GO_FORWARD },
|
||||
{ "zc-menu-help", GTK_STOCK_HELP },
|
||||
{ "zc-menu-about", GTK_STOCK_ABOUT },
|
||||
{ "zc-menu-emoji", GTK_STOCK_CONVERT },
|
||||
{ "zc-menu-update", GTK_STOCK_REFRESH },
|
||||
};
|
||||
size_t i;
|
||||
|
||||
|
||||
@@ -3545,6 +3545,7 @@ mg_create_entry (session *sess, GtkWidget *box)
|
||||
"face-smile",
|
||||
"insert-emoticon-symbolic",
|
||||
"insert-emoticon",
|
||||
"zc-menu-emoji",
|
||||
NULL
|
||||
};
|
||||
const char *emoji_fallback_icon_name;
|
||||
|
||||
@@ -2014,6 +2014,7 @@ menu_about (GtkWidget *wid, gpointer sess)
|
||||
#define ICON_FIND "zc-menu-find"
|
||||
#define ICON_HELP "zc-menu-help"
|
||||
#define ICON_ABOUT "zc-menu-about"
|
||||
#define ICON_UPDATE "zc-menu-update"
|
||||
|
||||
static struct mymenu mymenu[] = {
|
||||
{N_("_ZoiteChat"), 0, 0, M_NEWMENU, MENU_ID_ZOITECHAT, 0, 1},
|
||||
@@ -2109,6 +2110,7 @@ static struct mymenu mymenu[] = {
|
||||
|
||||
{N_("_Help"), 0, 0, M_NEWMENU, 0, 0, 1}, /* 74 */
|
||||
{N_("_Contents"), menu_docs, ICON_HELP, M_MENUSTOCK, 0, 0, 1, GDK_KEY_F1},
|
||||
{N_("_Update"), menu_docs, ICON_UPDATE, M_MENUSTOCK, 0, 0, 1},
|
||||
{N_("_About"), menu_about, ICON_ABOUT, M_MENUSTOCK, 0, 0, 1},
|
||||
|
||||
{0, 0, 0, M_END, 0, 0, 0},
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
#define SERVLIST_Y_PADDING 0 /* vertical padding in the network editor */
|
||||
|
||||
#if HAVE_GTK3
|
||||
#define ICON_SERVLIST_CONNECT "network-connect"
|
||||
#define ICON_SERVLIST_CONNECT "zc-menu-connect"
|
||||
#define ICON_SERVLIST_ADD "list-add"
|
||||
#define ICON_SERVLIST_REMOVE "list-remove"
|
||||
#define ICON_SERVLIST_CLOSE "window-close"
|
||||
|
||||
Reference in New Issue
Block a user