diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/icon.c | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index a9075b1b0f..e1f4ec31a6 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -236,36 +236,39 @@ void icons_init(void) | |||
236 | } | 236 | } |
237 | } | 237 | } |
238 | 238 | ||
239 | load_icons(global_settings.icon_file, Iconset_user, SCREEN_MAIN); | 239 | if (global_settings.show_icons) |
240 | |||
241 | if (global_settings.viewers_icon_file[0] && | ||
242 | global_settings.viewers_icon_file[0] != '-') | ||
243 | { | ||
244 | load_icons(global_settings.viewers_icon_file, | ||
245 | Iconset_viewers, SCREEN_MAIN); | ||
246 | read_viewer_theme_file(); | ||
247 | } | ||
248 | else | ||
249 | { | 240 | { |
250 | load_icons(DEFAULT_VIEWER_BMP, Iconset_viewers, SCREEN_MAIN); | 241 | load_icons(global_settings.icon_file, Iconset_user, SCREEN_MAIN); |
251 | } | 242 | |
243 | if (global_settings.viewers_icon_file[0] && | ||
244 | global_settings.viewers_icon_file[0] != '-') | ||
245 | { | ||
246 | load_icons(global_settings.viewers_icon_file, | ||
247 | Iconset_viewers, SCREEN_MAIN); | ||
248 | read_viewer_theme_file(); | ||
249 | } | ||
250 | else | ||
251 | { | ||
252 | load_icons(DEFAULT_VIEWER_BMP, Iconset_viewers, SCREEN_MAIN); | ||
253 | } | ||
252 | 254 | ||
253 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 255 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
254 | load_icons(global_settings.remote_icon_file, | 256 | load_icons(global_settings.remote_icon_file, |
255 | Iconset_user, SCREEN_REMOTE); | 257 | Iconset_user, SCREEN_REMOTE); |
256 | 258 | ||
257 | if (global_settings.remote_viewers_icon_file[0] && | 259 | if (global_settings.remote_viewers_icon_file[0] && |
258 | global_settings.remote_viewers_icon_file[0] != '-') | 260 | global_settings.remote_viewers_icon_file[0] != '-') |
259 | { | 261 | { |
260 | load_icons(global_settings.remote_viewers_icon_file, | 262 | load_icons(global_settings.remote_viewers_icon_file, |
261 | Iconset_viewers, SCREEN_REMOTE); | 263 | Iconset_viewers, SCREEN_REMOTE); |
262 | } | 264 | } |
263 | else | 265 | else |
264 | { | 266 | { |
265 | load_icons(DEFAULT_REMOTE_VIEWER_BMP, | 267 | load_icons(DEFAULT_REMOTE_VIEWER_BMP, |
266 | Iconset_viewers, SCREEN_REMOTE); | 268 | Iconset_viewers, SCREEN_REMOTE); |
267 | } | 269 | } |
268 | #endif | 270 | #endif |
271 | } | ||
269 | } | 272 | } |
270 | 273 | ||
271 | int get_icon_width(enum screen_type screen_type) | 274 | int get_icon_width(enum screen_type screen_type) |