tsiry-sandratraina.com / rockbox-zig
Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

plugins: imageviewer: Hide info by default when loading file

Looks nicer, especially when the "View Album Art"
option is used.

Add delay to progress bar, so it only appears when
250ms have passed.

Change-Id: I183c839f1ab206385cd01327922933b544c4b78b

authored by

Christian Soffke and committed by
Solomon Peachy f4dc4d89 fd7ae09e

+160 -114
+3 -3
apps/lang/bulgarian.lang
··· 14597 14597 </voice> 14598 14598 </phrase> 14599 14599 <phrase> 14600 - id: LANG_HIDE_ALBUM_TITLE_NEW 14601 - desc: in the pictureflow settings 14600 + id: LANG_HIDE_INFO 14601 + desc: Hide Information 14602 14602 user: core 14603 14603 <source> 14604 - *: "Hide information" 14604 + *: "Hide Information" 14605 14605 </source> 14606 14606 <dest> 14607 14607 *: "Скриване на информацията"
+3 -3
apps/lang/chinese-simp.lang
··· 14601 14601 </voice> 14602 14602 </phrase> 14603 14603 <phrase> 14604 - id: LANG_HIDE_ALBUM_TITLE_NEW 14605 - desc: in the pictureflow settings 14604 + id: LANG_HIDE_INFO 14605 + desc: Hide Information 14606 14606 user: core 14607 14607 <source> 14608 - *: "Hide information" 14608 + *: "Hide Information" 14609 14609 </source> 14610 14610 <dest> 14611 14611 *: "隐藏信息"
+3 -3
apps/lang/deutsch.lang
··· 14615 14615 </voice> 14616 14616 </phrase> 14617 14617 <phrase> 14618 - id: LANG_HIDE_ALBUM_TITLE_NEW 14619 - desc: in the pictureflow settings 14618 + id: LANG_HIDE_INFO 14619 + desc: Hide Information 14620 14620 user: core 14621 14621 <source> 14622 - *: "Hide information" 14622 + *: "Hide Information" 14623 14623 </source> 14624 14624 <dest> 14625 14625 *: "Information verbergen"
+5 -5
apps/lang/english-us.lang
··· 14591 14591 </voice> 14592 14592 </phrase> 14593 14593 <phrase> 14594 - id: LANG_HIDE_ALBUM_TITLE_NEW 14595 - desc: in the pictureflow settings 14594 + id: LANG_HIDE_INFO 14595 + desc: Hide Information 14596 14596 user: core 14597 14597 <source> 14598 - *: "Hide information" 14598 + *: "Hide Information" 14599 14599 </source> 14600 14600 <dest> 14601 - *: "Hide information" 14601 + *: "Hide Information" 14602 14602 </dest> 14603 14603 <voice> 14604 - *: "Hide information" 14604 + *: "Hide Information" 14605 14605 </voice> 14606 14606 </phrase> 14607 14607 <phrase>
+5 -5
apps/lang/english.lang
··· 14844 14844 </voice> 14845 14845 </phrase> 14846 14846 <phrase> 14847 - id: LANG_HIDE_ALBUM_TITLE_NEW 14848 - desc: in the pictureflow settings 14847 + id: LANG_HIDE_INFO 14848 + desc: Hide Information 14849 14849 user: core 14850 14850 <source> 14851 - *: "Hide information" 14851 + *: "Hide Information" 14852 14852 </source> 14853 14853 <dest> 14854 - *: "Hide information" 14854 + *: "Hide Information" 14855 14855 </dest> 14856 14856 <voice> 14857 - *: "Hide information" 14857 + *: "Hide Information" 14858 14858 </voice> 14859 14859 </phrase> 14860 14860 <phrase>
+3 -3
apps/lang/espanol.lang
··· 14701 14701 </voice> 14702 14702 </phrase> 14703 14703 <phrase> 14704 - id: LANG_HIDE_ALBUM_TITLE_NEW 14705 - desc: in the pictureflow settings 14704 + id: LANG_HIDE_INFO 14705 + desc: Hide Information 14706 14706 user: core 14707 14707 <source> 14708 - *: "Hide information" 14708 + *: "Hide Information" 14709 14709 </source> 14710 14710 <dest> 14711 14711 *: "Ocultar información"
+3 -3
apps/lang/francais.lang
··· 12290 12290 </voice> 12291 12291 </phrase> 12292 12292 <phrase> 12293 - id: LANG_HIDE_ALBUM_TITLE_NEW 12294 - desc: in the pictureflow settings 12293 + id: LANG_HIDE_INFO 12294 + desc: Hide Information 12295 12295 user: core 12296 12296 <source> 12297 - *: "Hide information" 12297 + *: "Hide Information" 12298 12298 </source> 12299 12299 <dest> 12300 12300 *: "Masquer les informations"
+3 -3
apps/lang/italiano.lang
··· 14300 14300 </voice> 14301 14301 </phrase> 14302 14302 <phrase> 14303 - id: LANG_HIDE_ALBUM_TITLE_NEW 14304 - desc: in the pictureflow settings 14303 + id: LANG_HIDE_INFO 14304 + desc: Hide Information 14305 14305 user: core 14306 14306 <source> 14307 - *: "Hide information" 14307 + *: "Hide Information" 14308 14308 </source> 14309 14309 <dest> 14310 14310 *: "Nascondere le informazioni"
+3 -3
apps/lang/japanese.lang
··· 14794 14794 </voice> 14795 14795 </phrase> 14796 14796 <phrase> 14797 - id: LANG_HIDE_ALBUM_TITLE_NEW 14798 - desc: in the pictureflow settings 14797 + id: LANG_HIDE_INFO 14798 + desc: Hide Information 14799 14799 user: core 14800 14800 <source> 14801 - *: "Hide information" 14801 + *: "Hide Information" 14802 14802 </source> 14803 14803 <dest> 14804 14804 *: "情報を隠す"
+3 -3
apps/lang/korean.lang
··· 14609 14609 </voice> 14610 14610 </phrase> 14611 14611 <phrase> 14612 - id: LANG_HIDE_ALBUM_TITLE_NEW 14613 - desc: in the pictureflow settings 14612 + id: LANG_HIDE_INFO 14613 + desc: Hide Information 14614 14614 user: core 14615 14615 <source> 14616 - *: "Hide information" 14616 + *: "Hide Information" 14617 14617 </source> 14618 14618 <dest> 14619 14619 *: "정보 숨기기"
+3 -3
apps/lang/latviesu.lang
··· 14706 14706 </voice> 14707 14707 </phrase> 14708 14708 <phrase> 14709 - id: LANG_HIDE_ALBUM_TITLE_NEW 14710 - desc: in the pictureflow settings 14709 + id: LANG_HIDE_INFO 14710 + desc: Hide Information 14711 14711 user: core 14712 14712 <source> 14713 - *: "Hide information" 14713 + *: "Hide Information" 14714 14714 </source> 14715 14715 <dest> 14716 14716 *: "Paslēpt informāciju"
+3 -3
apps/lang/magyar.lang
··· 14709 14709 </voice> 14710 14710 </phrase> 14711 14711 <phrase> 14712 - id: LANG_HIDE_ALBUM_TITLE_NEW 14713 - desc: in the pictureflow settings 14712 + id: LANG_HIDE_INFO 14713 + desc: Hide Information 14714 14714 user: core 14715 14715 <source> 14716 - *: "Hide information" 14716 + *: "Hide Information" 14717 14717 </source> 14718 14718 <dest> 14719 14719 *: "Információ elrejtése"
+3 -3
apps/lang/moldoveneste.lang
··· 14712 14712 </voice> 14713 14713 </phrase> 14714 14714 <phrase> 14715 - id: LANG_HIDE_ALBUM_TITLE_NEW 14716 - desc: in the pictureflow settings 14715 + id: LANG_HIDE_INFO 14716 + desc: Hide Information 14717 14717 user: core 14718 14718 <source> 14719 - *: "Hide information" 14719 + *: "Hide Information" 14720 14720 </source> 14721 14721 <dest> 14722 14722 *: "Ascunde informațiile"
+3 -3
apps/lang/nederlands.lang
··· 14360 14360 </voice> 14361 14361 </phrase> 14362 14362 <phrase> 14363 - id: LANG_HIDE_ALBUM_TITLE_NEW 14364 - desc: in the pictureflow settings 14363 + id: LANG_HIDE_INFO 14364 + desc: Hide Information 14365 14365 user: core 14366 14366 <source> 14367 - *: "Hide information" 14367 + *: "Hide Information" 14368 14368 </source> 14369 14369 <dest> 14370 14370 *: "Verberg informatie"
+3 -3
apps/lang/norsk-nynorsk.lang
··· 14779 14779 </voice> 14780 14780 </phrase> 14781 14781 <phrase> 14782 - id: LANG_HIDE_ALBUM_TITLE_NEW 14783 - desc: in the pictureflow settings 14782 + id: LANG_HIDE_INFO 14783 + desc: Hide Information 14784 14784 user: core 14785 14785 <source> 14786 - *: "Hide information" 14786 + *: "Hide Information" 14787 14787 </source> 14788 14788 <dest> 14789 14789 *: "Gøym informasjon"
+3 -3
apps/lang/polski.lang
··· 14306 14306 </voice> 14307 14307 </phrase> 14308 14308 <phrase> 14309 - id: LANG_HIDE_ALBUM_TITLE_NEW 14310 - desc: in the pictureflow settings 14309 + id: LANG_HIDE_INFO 14310 + desc: Hide Information 14311 14311 user: core 14312 14312 <source> 14313 - *: "Hide information" 14313 + *: "Hide Information" 14314 14314 </source> 14315 14315 <dest> 14316 14316 *: "Ukryj informacje"
+3 -3
apps/lang/portugues-brasileiro.lang
··· 14817 14817 </voice> 14818 14818 </phrase> 14819 14819 <phrase> 14820 - id: LANG_HIDE_ALBUM_TITLE_NEW 14821 - desc: in the pictureflow settings 14820 + id: LANG_HIDE_INFO 14821 + desc: Hide Information 14822 14822 user: core 14823 14823 <source> 14824 - *: "Hide information" 14824 + *: "Hide Information" 14825 14825 </source> 14826 14826 <dest> 14827 14827 *: "Ocultar informações"
+3 -3
apps/lang/romaneste.lang
··· 14712 14712 </voice> 14713 14713 </phrase> 14714 14714 <phrase> 14715 - id: LANG_HIDE_ALBUM_TITLE_NEW 14716 - desc: in the pictureflow settings 14715 + id: LANG_HIDE_INFO 14716 + desc: Hide Information 14717 14717 user: core 14718 14718 <source> 14719 - *: "Hide information" 14719 + *: "Hide Information" 14720 14720 </source> 14721 14721 <dest> 14722 14722 *: "Ascunde informațiile"
+3 -3
apps/lang/russian.lang
··· 14328 14328 </voice> 14329 14329 </phrase> 14330 14330 <phrase> 14331 - id: LANG_HIDE_ALBUM_TITLE_NEW 14332 - desc: in the pictureflow settings 14331 + id: LANG_HIDE_INFO 14332 + desc: Hide Information 14333 14333 user: core 14334 14334 <source> 14335 - *: "Hide information" 14335 + *: "Hide Information" 14336 14336 </source> 14337 14337 <dest> 14338 14338 *: "Ничего не показывать"
+3 -3
apps/lang/slovak.lang
··· 14326 14326 </voice> 14327 14327 </phrase> 14328 14328 <phrase> 14329 - id: LANG_HIDE_ALBUM_TITLE_NEW 14330 - desc: in the pictureflow settings 14329 + id: LANG_HIDE_INFO 14330 + desc: Hide Information 14331 14331 user: core 14332 14332 <source> 14333 - *: "Hide information" 14333 + *: "Hide Information" 14334 14334 </source> 14335 14335 <dest> 14336 14336 *: "Skryť info"
+3 -3
apps/lang/srpski.lang
··· 14705 14705 </voice> 14706 14706 </phrase> 14707 14707 <phrase> 14708 - id: LANG_HIDE_ALBUM_TITLE_NEW 14709 - desc: in the pictureflow settings 14708 + id: LANG_HIDE_INFO 14709 + desc: Hide Information 14710 14710 user: core 14711 14711 <source> 14712 - *: "Hide information" 14712 + *: "Hide Information" 14713 14713 </source> 14714 14714 <dest> 14715 14715 *: "Сакриј информације"
+3 -3
apps/lang/svenska.lang
··· 14714 14714 </voice> 14715 14715 </phrase> 14716 14716 <phrase> 14717 - id: LANG_HIDE_ALBUM_TITLE_NEW 14718 - desc: in the pictureflow settings 14717 + id: LANG_HIDE_INFO 14718 + desc: Hide Information 14719 14719 user: core 14720 14720 <source> 14721 - *: "Hide information" 14721 + *: "Hide Information" 14722 14722 </source> 14723 14723 <dest> 14724 14724 *: "Göm information"
+3 -3
apps/lang/turkce.lang
··· 14597 14597 </voice> 14598 14598 </phrase> 14599 14599 <phrase> 14600 - id: LANG_HIDE_ALBUM_TITLE_NEW 14601 - desc: in the pictureflow settings 14600 + id: LANG_HIDE_INFO 14601 + desc: Hide Information 14602 14602 user: core 14603 14603 <source> 14604 - *: "Hide information" 14604 + *: "Hide Information" 14605 14605 </source> 14606 14606 <dest> 14607 14607 *: "Bilgileri gizle"
+3 -3
apps/lang/ukrainian.lang
··· 14706 14706 </voice> 14707 14707 </phrase> 14708 14708 <phrase> 14709 - id: LANG_HIDE_ALBUM_TITLE_NEW 14710 - desc: in the pictureflow settings 14709 + id: LANG_HIDE_INFO 14710 + desc: Hide Information 14711 14711 user: core 14712 14712 <source> 14713 - *: "Hide information" 14713 + *: "Hide Information" 14714 14714 </source> 14715 14715 <dest> 14716 14716 *: "Приховати інформацію"
+3 -3
apps/lang/vietnamese.lang
··· 14615 14615 </voice> 14616 14616 </phrase> 14617 14617 <phrase> 14618 - id: LANG_HIDE_ALBUM_TITLE_NEW 14619 - desc: in the pictureflow settings 14618 + id: LANG_HIDE_INFO 14619 + desc: Hide Information 14620 14620 user: core 14621 14621 <source> 14622 - *: "Hide information" 14622 + *: "Hide Information" 14623 14623 </source> 14624 14624 <dest> 14625 14625 *: "Ẩn thông tin"
+6 -3
apps/plugins/imageviewer/bmp/bmp.c
··· 176 176 return PLUGIN_OUTOFMEM; 177 177 } 178 178 179 - if (!iv->running_slideshow) 179 + if (!iv->settings->hide_info && 180 + !iv->running_slideshow) 180 181 { 181 182 rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); 182 183 rb->lcd_putsf(0, 1, "loading %dx%d%s", ··· 206 207 return PLUGIN_ERROR; 207 208 } 208 209 209 - if (!iv->running_slideshow) 210 + if (!iv->settings->hide_info && 211 + !iv->running_slideshow) 210 212 { 211 213 rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ); 212 214 rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */ ··· 225 227 buf_images = buf_root = buf + size; 226 228 buf_images_size = root_size = *buf_size - size; 227 229 228 - if (!iv->running_slideshow) 230 + if (!iv->settings->hide_info && 231 + !iv->running_slideshow) 229 232 { 230 233 rb->lcd_putsf(0, 2, "image %dx%d", bmp.width, bmp.height); 231 234 rb->lcd_update();
+10 -5
apps/plugins/imageviewer/gif/gif.c
··· 56 56 57 57 #ifdef HAVE_LCD_COLOR 58 58 rb->lcd_bitmap_part((fb_data *)*pdisp, info->x + x, info->y + y, 59 - STRIDE(SCREEN_MAIN, info->width, info->height), 59 + STRIDE(SCREEN_MAIN, info->width, info->height), 60 60 x + MAX(0, (LCD_WIDTH-info->width)/2), 61 61 y + MAX(0, (LCD_HEIGHT-info->height)/2), 62 62 width, height); ··· 100 100 } 101 101 #endif 102 102 103 - /* initialize decoder context struct, set buffer decoder is free 103 + /* initialize decoder context struct, set buffer decoder is free 104 104 * to use. 105 105 */ 106 106 gif_decoder_init(p_decoder, memory, memory_size); ··· 111 111 if (!p_decoder->error) 112 112 { 113 113 114 - if (!iv->running_slideshow) 114 + if (!iv->settings->hide_info && 115 + !iv->running_slideshow) 115 116 { 116 117 rb->lcd_putsf(0, 2, "file: %s", 117 118 filename); ··· 137 138 138 139 gif_decoder_destroy_memory_pool(p_decoder); 139 140 140 - if (!iv->running_slideshow && !p_decoder->error) 141 + if (!iv->settings->hide_info && 142 + !iv->running_slideshow && 143 + !p_decoder->error) 141 144 { 142 145 rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ); 143 146 rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */ ··· 215 218 /* assign image buffer */ 216 219 if (ds > 1) 217 220 { 218 - if (!iv->running_slideshow && (info->frames_count == 1)) 221 + if (!iv->settings->hide_info && 222 + !iv->running_slideshow && 223 + (info->frames_count == 1)) 219 224 { 220 225 rb->lcd_putsf(0, 3, "resizing %d*%d", info->width, info->height); 221 226 rb->lcd_update();
+23 -5
apps/plugins/imageviewer/imageviewer.c
··· 64 64 COLOURMODE_COLOUR, 65 65 DITHER_NONE, 66 66 #endif 67 - SS_DEFAULT_TIMEOUT 67 + SS_DEFAULT_TIMEOUT, 68 + true 68 69 }; 69 70 static struct imgview_settings old_settings; 70 71 ··· 78 79 #endif 79 80 { TYPE_INT, SS_MIN_TIMEOUT, SS_MAX_TIMEOUT, 80 81 { .int_p = &settings.ss_timeout }, "Slideshow Time", NULL }, 82 + { TYPE_BOOL, 0, 1, { .bool_p = &settings.hide_info }, "Hide Info", NULL }, 81 83 }; 82 84 83 85 static void cb_progress(int current, int total); ··· 244 246 return false; 245 247 } 246 248 249 + static bool set_option_hide_info(void) 250 + { 251 + rb->set_bool(rb->str(LANG_HIDE_INFO), &settings.hide_info); 252 + return false; 253 + } 254 + 247 255 MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE), 248 256 set_option_grayscale, NULL, Icon_NOICON); 249 257 MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING), 250 258 set_option_dithering, NULL, Icon_NOICON); 251 - MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON, 252 - &grayscale_item, &dithering_item); 259 + MENUITEM_FUNCTION(hide_info_item, 0, ID2P(LANG_HIDE_INFO), 260 + set_option_hide_info, NULL, Icon_NOICON); 261 + MAKE_MENU(display_menu, ID2P(LANG_MENU_DISPLAY_OPTIONS), NULL, Icon_NOICON, 262 + &grayscale_item, 263 + &dithering_item, 264 + &hide_info_item); 253 265 254 266 static void display_options(void) 255 267 { ··· 451 463 { 452 464 /* do not yield or update the progress bar if we did so too recently */ 453 465 long now = *rb->current_tick; 466 + 467 + if (total == 0) 468 + next_progress_tick = now + HZ/4; /* delay by 250ms initially */ 469 + 454 470 if(!TIME_AFTER(now, next_progress_tick)) 455 471 return; 456 472 ··· 965 981 bool initial_frame = true; 966 982 do /* loop the image prepare and decoding when zoomed */ 967 983 { 984 + cb_progress(0, 0); /* delay showing progress bar*/ 968 985 status = imgdec->get_image(info, frame, ds); /* decode or fetch from cache */ 969 986 if (status == PLUGIN_ERROR) 970 987 { ··· 973 990 } 974 991 975 992 set_view(info, cx, cy); 976 - 977 - if(!iv_api.running_slideshow && (info->frames_count == 1)) 993 + if(!settings.hide_info && 994 + !iv_api.running_slideshow && 995 + (info->frames_count == 1)) 978 996 { 979 997 rb->lcd_putsf(0, 3, "showing %dx%d", info->width, info->height); 980 998 rb->lcd_update();
+1
apps/plugins/imageviewer/imageviewer.h
··· 77 77 int jpeg_dither_mode; 78 78 #endif 79 79 int ss_timeout; 80 + bool hide_info; 80 81 }; 81 82 82 83 /* structure passed to image decoder. */
+10 -5
apps/plugins/imageviewer/jpeg/jpeg.c
··· 150 150 return PLUGIN_OUTOFMEM; 151 151 } 152 152 153 - if(!iv->running_slideshow) 153 + if(!iv->settings->hide_info && 154 + !iv->running_slideshow) 154 155 { 155 156 rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); 156 157 rb->lcd_putsf(0, 1, "loading %d bytes", filesize); ··· 160 161 rb->read(fd, buf_jpeg, filesize); 161 162 rb->close(fd); 162 163 163 - if(!iv->running_slideshow) 164 + if(!iv->settings->hide_info && 165 + !iv->running_slideshow) 164 166 { 165 167 rb->lcd_puts(0, 2, "decoding markers"); 166 168 rb->lcd_update(); ··· 190 192 default_huff_tbl(p_jpg); /* use default */ 191 193 build_lut(p_jpg); /* derive Huffman and other lookup-tables */ 192 194 193 - if(!iv->running_slideshow) 195 + if(!iv->settings->hide_info && 196 + !iv->running_slideshow) 194 197 { 195 198 rb->lcd_putsf(0, 2, "image %dx%d", p_jpg->x_size, p_jpg->y_size); 196 199 rb->lcd_update(); ··· 263 266 buf_images += size; 264 267 buf_images_size -= size; 265 268 266 - if(!iv->running_slideshow) 269 + if(!iv->settings->hide_info && 270 + !iv->running_slideshow) 267 271 { 268 272 rb->lcd_putsf(0, 3, "decoding %d*%d", info->width, info->height); 269 273 rb->lcd_update(); ··· 288 292 } 289 293 time = *rb->current_tick - time; 290 294 291 - if(!iv->running_slideshow) 295 + if(!iv->settings->hide_info && 296 + !iv->running_slideshow) 292 297 { 293 298 rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ); 294 299 rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */
+5 -3
apps/plugins/imageviewer/jpegp/jpegp.c
··· 117 117 POS(offset); 118 118 } 119 119 120 - if (!iv->running_slideshow) 120 + if (!iv->settings->hide_info && 121 + !iv->running_slideshow) 121 122 { 122 123 rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); 123 124 rb->lcd_puts(0, 2, "decoding..."); ··· 142 143 return PLUGIN_ERROR; 143 144 } 144 145 145 - if (!iv->running_slideshow) 146 + if (!iv->settings->hide_info && 147 + !iv->running_slideshow) 146 148 { 147 149 rb->lcd_putsf(0, 2, "image %dx%d", p_jpg->X, p_jpg->Y); 148 150 int w, h; /* used to center output */ ··· 262 264 c2 = (sumV + area/2) / area; 263 265 } 264 266 265 - // ITU BT.601 full-range YUV-to-RGB integer approximation 267 + // ITU BT.601 full-range YUV-to-RGB integer approximation 266 268 { 267 269 int y = (c0 << 5) + 16; 268 270 int u = c1 - 128;
+18 -9
apps/plugins/imageviewer/png/png.c
··· 62 62 63 63 #ifdef HAVE_LCD_COLOR 64 64 rb->lcd_bitmap_part((fb_data *)*pdisp, info->x + x, info->y + y, 65 - STRIDE(SCREEN_MAIN, info->width, info->height), 65 + STRIDE(SCREEN_MAIN, info->width, info->height), 66 66 x + MAX(0, (LCD_WIDTH-info->width)/2), 67 67 y + MAX(0, (LCD_HEIGHT-info->height)/2), 68 68 width, height); ··· 82 82 #ifdef USEGSLIB 83 83 return (p_decoder->infoPng.width/ds) * (p_decoder->infoPng.height/ds); 84 84 #else 85 - return (p_decoder->infoPng.width/ds) * 86 - (p_decoder->infoPng.height/ds) * 85 + return (p_decoder->infoPng.width/ds) * 86 + (p_decoder->infoPng.height/ds) * 87 87 FB_DATA_SZ; 88 88 #endif 89 89 } ··· 126 126 127 127 DEBUGF("reading file '%s'\n", filename); 128 128 129 - if (!iv->running_slideshow) { 129 + if (!iv->settings->hide_info && 130 + !iv->running_slideshow) 131 + { 130 132 rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); 131 133 rb->lcd_update(); 132 134 } ··· 136 138 rb->close(fd); 137 139 138 140 } else { 139 - if (!iv->running_slideshow) { 141 + if (!iv->settings->hide_info && 142 + !iv->running_slideshow) 143 + { 140 144 rb->lcd_putsf(0, 1, "loading %zu bytes", file_size); 141 145 rb->lcd_update(); 142 146 } ··· 146 150 rb->read(fd, image, file_size); 147 151 rb->close(fd); 148 152 149 - if (!iv->running_slideshow) { 153 + if (!iv->settings->hide_info && 154 + !iv->running_slideshow) 155 + { 150 156 rb->lcd_puts(0, 2, "decoding image"); 151 157 rb->lcd_update(); 152 158 } ··· 171 177 172 178 if (!p_decoder->error) { 173 179 174 - if (!iv->running_slideshow) { 180 + if (!iv->settings->hide_info && 181 + !iv->running_slideshow) { 175 182 rb->lcd_putsf(0, 2, "image %dx%d", 176 183 p_decoder->infoPng.width, 177 184 p_decoder->infoPng.height); ··· 194 201 } 195 202 } 196 203 197 - if (!iv->running_slideshow && !p_decoder->error) 204 + if (!iv->settings->hide_info && 205 + !iv->running_slideshow && !p_decoder->error) 198 206 { 199 207 rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ); 200 208 rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */ ··· 253 261 254 262 /* assign image buffer */ 255 263 if (ds > 1) { 256 - if (!iv->running_slideshow) 264 + if (!iv->settings->hide_info && 265 + !iv->running_slideshow) 257 266 { 258 267 rb->lcd_putsf(0, 3, "resizing %d*%d", info->width, info->height); 259 268 rb->lcd_update();
+7 -4
apps/plugins/imageviewer/ppm/ppm.c
··· 51 51 52 52 #ifdef HAVE_LCD_COLOR 53 53 rb->lcd_bitmap_part((fb_data *)*pdisp, info->x + x, info->y + y, 54 - STRIDE(SCREEN_MAIN, info->width, info->height), 54 + STRIDE(SCREEN_MAIN, info->width, info->height), 55 55 x + MAX(0, (LCD_WIDTH-info->width)/2), 56 56 y + MAX(0, (LCD_HEIGHT-info->height)/2), 57 57 width, height); ··· 111 111 } 112 112 DEBUGF("reading file '%s'\n", filename); 113 113 114 - if (!iv->running_slideshow) 114 + if (!iv->settings->hide_info && 115 + !iv->running_slideshow) 115 116 { 116 117 rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); 117 118 rb->lcd_putsf(0, 1, "loading %zu bytes", filesize); ··· 140 141 return rc; 141 142 } 142 143 143 - if (!iv->running_slideshow) 144 + if (!iv->settings->hide_info && 145 + !iv->running_slideshow) 144 146 { 145 147 rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ); 146 148 rb->lcd_getstringsize(print, &w, &h); /* centered in progress bar */ ··· 177 179 /* assign image buffer */ 178 180 if (ds > 1) 179 181 { 180 - if (!iv->running_slideshow) 182 + if (!iv->settings->hide_info && 183 + !iv->running_slideshow) 181 184 { 182 185 rb->lcd_putsf(0, 3, "resizing %d*%d", info->width, info->height); 183 186 rb->lcd_update();
+1 -1
apps/plugins/pictureflow/pictureflow.c
··· 3619 3619 ID2P(LANG_DISPLAY)); 3620 3620 3621 3621 static const struct opt_items album_name_options[] = { 3622 - { STR(LANG_HIDE_ALBUM_TITLE_NEW) }, 3622 + { STR(LANG_HIDE_INFO) }, 3623 3623 { STR(LANG_SHOW_AT_THE_BOTTOM_NEW) }, 3624 3624 { STR(LANG_SHOW_AT_THE_TOP_NEW) }, 3625 3625 { STR(LANG_SHOW_ALL_AT_THE_TOP) },