diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 4d27b2a6f..2e1ca181a 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -4,10 +4,10 @@ Copyright (C) 2012 'defans' Homepage: http://www.bluepeercrew.us/ - Copyright (C) 2012-2016 'vanhofen' + Copyright (C) 2012-2018 'vanhofen' Homepage: http://www.neutrino-images.de/ - Modded (C) 2016 'TangoCash' + Copyright (C) 2016-2018 'TangoCash' License: GPL @@ -96,7 +96,7 @@ extern CPictureViewer *g_PicViewer; #define START LCD_DATADIR "start" #define END LCD_DATADIR "end" -#define LCD_FONT LCD_DATADIR "font" +#define LCD_FONT LCD_DATADIR "font" #define FGCOLOR LCD_DATADIR "fgcolor" #define BGCOLOR LCD_DATADIR "bgcolor" @@ -233,6 +233,7 @@ int CLCD4l::GetMaxBrightness() case SAMSUNG800x600: case SAMSUNG1024x600: case VUSOLO4K480x320: + case PNG: max_brightness = 10; break; case PEARL320x240: diff --git a/src/driver/lcd4l.h b/src/driver/lcd4l.h index 188e3914c..99e1766cc 100644 --- a/src/driver/lcd4l.h +++ b/src/driver/lcd4l.h @@ -4,10 +4,10 @@ Copyright (C) 2012 'defans' Homepage: http://www.bluepeercrew.us/ - Copyright (C) 2012-2016 'vanhofen' + Copyright (C) 2012-2018 'vanhofen' Homepage: http://www.neutrino-images.de/ - Modded (C) 2016 'TangoCash' + Copyright (C) 2016-2018 'TangoCash' License: GPL @@ -46,7 +46,7 @@ class CLCD4l SAMSUNG800x600 = 2, SAMSUNG1024x600 = 3, VUSOLO4K480x320 = 4, - PNG = 5 + PNG = 5 }; // Functions diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index 2b7bc04ee..a988e28fb 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -108,7 +108,7 @@ CLCD4lSetup* CLCD4lSetup::getInstance() return me; } -int CLCD4lSetup::exec(CMenuTarget* parent, const std::string &actionkey) +int CLCD4lSetup::exec(CMenuTarget *parent, const std::string &actionkey) { printf("CLCD4lSetup::exec: actionkey %s\n", actionkey.c_str()); int res = menu_return::RETURN_REPAINT; @@ -116,7 +116,8 @@ int CLCD4lSetup::exec(CMenuTarget* parent, const std::string &actionkey) if (parent) parent->hide(); - if (actionkey == "lcd4l_logodir") { + if (actionkey == "lcd4l_logodir") + { const char *action_str = "lcd4l_logodir"; chooserDir(g_settings.lcd4l_logodir, false, action_str); return menu_return::RETURN_REPAINT; @@ -194,7 +195,7 @@ int CLCD4lSetup::show() const char *flag_lcd4l_clock_a = FLAGDIR "/.lcd-clock_a"; int fake_lcd4l_clock_a = file_exists(flag_lcd4l_clock_a); - CTouchFileNotifier * lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a); + CTouchFileNotifier *lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a); mc = new CMenuOptionChooser(LOCALE_LCD4L_CLOCK_A, &fake_lcd4l_clock_a, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, ((file_exists(LCD4L_ICONSDIR "/clock/analog")) || (file_exists(LCD4L_ICONSDIR_VAR "/clock/analog"))), lcd_clock_a, CRCInput::convertDigitToKey(shortcut++)); mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_CLOCK_A); lcd4lSetup->addItem(mc); @@ -233,7 +234,7 @@ int CLCD4lSetup::show() if (g_settings.lcd4l_brightness != temp_lcd4l_brightness) { g_settings.lcd4l_brightness = temp_lcd4l_brightness; - initlcd4l = true; + initlcd4l = true; } if (initlcd4l) diff --git a/src/gui/lcd4l_setup.h b/src/gui/lcd4l_setup.h index d92ab3056..062aadaac 100644 --- a/src/gui/lcd4l_setup.h +++ b/src/gui/lcd4l_setup.h @@ -49,7 +49,7 @@ class CLCD4lSetup : public CMenuTarget, CChangeObserver static CLCD4lSetup* getInstance(); CLCD4lSetup(); ~CLCD4lSetup(); - int exec(CMenuTarget* parent, const std::string &actionkey); + int exec(CMenuTarget *parent, const std::string &actionkey); virtual bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/); };