Changeset 14681
- Timestamp:
- Feb 23, 2016, 4:34:57 AM (6 years ago)
- Location:
- trunk/gtk
- Files:
-
- 5 added
- 6 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gtk/CMakeLists.txt
r14617 r14681 36 36 transmission.gresource.xml 37 37 DEPENDS 38 icons/hicolor_apps_24x24_transmission.png 39 icons/hicolor_apps_48x48_transmission.png 40 icons/lock.png 41 icons/ratio.png 42 icons/turtle-blue.png 43 icons/turtle-grey.png 44 icons/utilities.png 38 45 transmission.gresource.xml 39 46 transmission-ui.xml … … 88 95 filter.h 89 96 hig.h 90 icon-lock.h91 icon-logo-24.h92 icon-logo-48.h93 icon-ratio.h94 97 icons.h 95 icon-turtle.h96 icon-utilities.h97 98 makemeta-ui.h 98 99 msgwin.h -
trunk/gtk/Makefile.am
r14436 r14681 35 35 hig.h \ 36 36 icons.h \ 37 icon-lock.h \38 icon-logo-24.h \39 icon-logo-48.h \40 icon-ratio.h \41 icon-turtle.h \42 icon-utilities.h \43 37 makemeta-ui.h \ 44 38 msgwin.h \ -
trunk/gtk/actions.c
r14666 r14681 19 19 #include "tr-core.h" 20 20 #include "tr-prefs.h" 21 22 #include "icon-lock.h"23 #include "icon-logo-24.h"24 #include "icon-logo-48.h"25 #include "icon-ratio.h"26 #include "icon-turtle.h"27 #include "icon-utilities.h"28 21 29 22 #define UNUSED G_GNUC_UNUSED … … 132 125 typedef struct 133 126 { 134 const guint8* raw;135 const char * 127 const char * filename; 128 const char * name; 136 129 } 137 130 BuiltinIconInfo; … … 139 132 static const BuiltinIconInfo my_fallback_icons[] = 140 133 { 141 { tr_icon_logo_48, WINDOW_ICON},142 { tr_icon_logo_24, TRAY_ICON},143 { tr_icon_logo_48, NOTIFICATION_ICON},144 { tr_icon_lock, "transmission-lock"},145 { utilities_icon, "utilities"},146 { blue_turtle, "alt-speed-on"},147 { grey_turtle, "alt-speed-off"},148 { ratio_icon, "ratio"}134 { "logo-48", WINDOW_ICON }, 135 { "logo-24", TRAY_ICON }, 136 { "logo-48", NOTIFICATION_ICON }, 137 { "lock", "transmission-lock" }, 138 { "utilities", "utilities" }, 139 { "turtle-blue", "alt-speed-on" }, 140 { "turtle-grey", "alt-speed-off" }, 141 { "ratio", "ratio" } 149 142 }; 150 143 … … 166 159 { 167 160 GdkPixbuf * p; 168 169 p = gdk_pixbuf_new_from_inline (-1, my_fallback_icons[i].raw, FALSE, NULL); 161 gchar * resource_path = g_strdup_printf (TR_RESOURCE_PATH "icons/%s.png", my_fallback_icons[i].filename); 162 163 p = gdk_pixbuf_new_from_resource (resource_path, NULL); 164 165 g_free (resource_path); 170 166 171 167 if (p != NULL) -
trunk/gtk/icons/Makefile.am
r12105 r14681 19 19 20 20 noinst_DATA = \ 21 lock.png \ 22 ratio.png \ 23 turtle-blue.png \ 24 turtle-grey.png \ 25 utilities.png \ 21 26 hicolor_apps_16x16_transmission.svg \ 22 27 hicolor_apps_22x22_transmission.svg \ -
trunk/gtk/main.c
r14670 r14681 59 59 #define MY_CONFIG_NAME "transmission" 60 60 #define MY_READABLE_NAME "transmission-gtk" 61 62 #define TR_RESOURCE_PATH "/com/transmissionbt/transmission/"63 61 64 62 #define SHOW_LICENSE -
trunk/gtk/tr-core.h
r14552 r14681 35 35 #define TR_CORE_TYPE (tr_core_get_type ()) 36 36 #define TR_CORE(o)(G_TYPE_CHECK_INSTANCE_CAST ((o), TR_CORE_TYPE, TrCore)) 37 38 #define TR_RESOURCE_PATH "/com/transmissionbt/transmission/" 37 39 38 40 typedef struct _TrCore -
trunk/gtk/transmission.gresource.xml
r13477 r14681 2 2 <gresources> 3 3 <gresource prefix="/com/transmissionbt/transmission"> 4 <file alias="icons/logo-24.png">icons/hicolor_apps_24x24_transmission.png</file> 5 <file alias="icons/logo-48.png">icons/hicolor_apps_48x48_transmission.png</file> 6 <file>icons/lock.png</file> 7 <file>icons/ratio.png</file> 8 <file>icons/turtle-blue.png</file> 9 <file>icons/turtle-grey.png</file> 10 <file>icons/utilities.png</file> 4 11 <file>transmission-ui.xml</file> 5 12 </gresource>
Note: See TracChangeset
for help on using the changeset viewer.