diff options
| author | Jon Gjengset <jon@thesquareplanet.com> | 2019-10-16 12:44:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 12:44:08 -0400 |
| commit | eecb095076a89f92dfdc203ec474ceac5d85d225 (patch) | |
| tree | 335b6a58653ca6a438de6b35adcd3dd772fb00e1 | |
| parent | Add examples directory (diff) | |
| parent | Update README.md (diff) | |
| download | mktrayicon-eecb095076a89f92dfdc203ec474ceac5d85d225.tar.gz mktrayicon-eecb095076a89f92dfdc203ec474ceac5d85d225.tar.bz2 mktrayicon-eecb095076a89f92dfdc203ec474ceac5d85d225.zip | |
Merge pull request #3 from bdantas/handle-custom-icons
add handling for custom icons
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | mktrayicon.c | 18 |
2 files changed, 18 insertions, 4 deletions
@@ -13,7 +13,7 @@ command. Each command should be terminated by a newline. The following commands are supported: - `q`: Terminate `mktrayicon` and remove the tray icon - - `i <icon>`: Set the graphic to use for the tray icon (see `/usr/share/icons`) + - `i <icon>`: Set the graphic to use for the tray icon; it can be a stock icon name (see `/usr/share/icons`) or path to a custom icon - `t <text>`: Set the text to display in the icon tooltip - `t`: Remove the icon tooltip - `c <cmnd>`: Set the command to be execute when the user clicks the icon (`cmnd` is passed to `/bin/sh -c`) @@ -22,7 +22,7 @@ are supported: - `s`: Show the tray icon By default, the `none` tooltip icon is used. To change this, pass `-i -<icon_name>` when running `mktrayicon`. +<stock_icon_name>` or `-i <path_to_custom_icon>` when running `mktrayicon`. Note that any script communicating with `mktrayicon` **must**, for the time being, send `q` when they are done. Just removing the FIFO file will **not** diff --git a/mktrayicon.c b/mktrayicon.c index f4deb10..d793c89 100644 --- a/mktrayicon.c +++ b/mktrayicon.c @@ -55,7 +55,14 @@ gboolean set_icon(gpointer data) #ifdef DEBUG printf("Setting icon to '%s'\n", p); #endif - gtk_status_icon_set_from_icon_name(icon, p); + if (strchr(p, '/')) + { + gtk_status_icon_set_from_file(icon, p); + } + else + { + gtk_status_icon_set_from_icon_name(icon, p); + } free(data); return FALSE; } @@ -189,7 +196,14 @@ static GtkStatusIcon *create_tray_icon(char *start_icon) { GtkStatusIcon *tray_icon; - tray_icon = gtk_status_icon_new_from_icon_name(start_icon); + if (strchr(start_icon, '/')) + { + tray_icon = gtk_status_icon_new_from_file(start_icon); + } + else + { + tray_icon = gtk_status_icon_new_from_icon_name(start_icon); + } g_signal_connect(G_OBJECT(tray_icon), "activate", G_CALLBACK(tray_icon_on_click), NULL); g_signal_connect(G_OBJECT(tray_icon), "popup-menu", G_CALLBACK(tray_icon_on_menu), NULL); gtk_status_icon_set_visible(tray_icon, TRUE); |