mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

make driver selectable for graphlcd

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/nglcd.h
	src/gui/glcdsetup.cpp
	src/gui/glcdsetup.h
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h

Signed-off-by: Thilo Graf <dbt@novatux.de>

compile fixed
This commit is contained in:
TangoCash
2019-12-29 23:46:52 +01:00
committed by Thilo Graf
parent 3fd2d5011f
commit efe45e9b7a
10 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/glcdsetup.cpp
View File

@@ -32,6 +32,7 @@
#include <daemonc/remotecontrol.h>
#include <driver/nglcd.h>
#include <driver/screen_max.h>
#include <system/helpers.h>
#include "glcdsetup.h"
#include <mymenu.h>
@@ -123,6 +124,13 @@ int GLCD_Menu::exec(CMenuTarget* parent, const std::string & actionKey)
nglcd->Rescan();
return res;
}
if(actionKey == "select_driver") {
if(parent)
parent->hide();
GLCD_Menu_Select_Driver();
nglcd->Exit();
return res;
}
if(actionKey == "select_font") {
if(parent)
parent->hide();
@@ -220,6 +228,9 @@ void GLCD_Menu::GLCD_Menu_Settings()
m.addItem(new CMenuOptionChooser(LOCALE_GLCD_ENABLE, &g_settings.glcd_enable,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
m.addItem(new CMenuForwarder(LOCALE_GLCD_DISPLAY, (nGLCD::getInstance()->GetConfigSize() > 1),
nGLCD::getInstance()->GetConfigName(g_settings.glcd_selected_config).c_str(), this, "select_driver"));
int shortcut = 1;
m.addItem(GenericMenuSeparatorLine);
m.addItem(new CMenuOptionChooser(LOCALE_GLCD_SELECT_FG, &color_fg,
@@ -271,3 +282,34 @@ void GLCD_Menu::GLCD_Menu_Settings()
nGLCD::getInstance()->StandbyMode(false);
m.hide();
}
void GLCD_Menu::GLCD_Menu_Select_Driver()
{
int select = 0;
if (nGLCD::getInstance()->GetConfigSize() > 1)
{
CMenuWidget *m = new CMenuWidget(LOCALE_GLCD_HEAD, NEUTRINO_ICON_SETTINGS);
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
// we don't show introitems, so we add a separator for a smoother view
m->addItem(GenericMenuSeparator);
CMenuForwarder* mf;
for (int i = 0; i != nGLCD::getInstance()->GetConfigSize() - 1; i++)
{
mf = new CMenuForwarder(nGLCD::getInstance()->GetConfigName(i), true, NULL, selector,to_string(i).c_str());
m->addItem(mf);
}
m->enableSaveScreen();
m->exec(NULL, "");
if (!m->gotAction())
return;
delete selector;
m->hide();
}
g_settings.glcd_selected_config = select;
}

1
src/gui/glcdsetup.h
View File

@@ -36,6 +36,7 @@ class GLCD_Menu : public CMenuTarget, public CChangeObserver
int width;
int selected;
static int color2index(uint32_t color);
void GLCD_Menu_Select_Driver();
public:
static uint32_t index2color(int i);
GLCD_Menu();