mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

COsdSetup: change order of includes

Browse Source 
- typo fix in member name
 showOsdScreenshottSetup->showOsdScreenShotSetup


Origin commit data
------------------
Branch: ni/coolstream
Commit: 260af3fb65
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-29 (Sun, 29 Jul 2012)

Origin message was:
------------------
*COsdSetup: change order of includes

- typo fix in member name
 showOsdScreenshottSetup->showOsdScreenShotSetup


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2012-07-29 22:56:32 +02:00
committed by Michael Liebmann
parent d0f8a1c3b4
commit 65580de20b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/osd_setup.cpp
View File

@@ -33,6 +33,10 @@
#include <config.h> #include <config.h>
#endif #endif
#include <global.h>
#include <neutrino.h>
#include <mymenu.h>
#include <neutrino_menue.h>
#include "osd_setup.h" #include "osd_setup.h"
#include "themes.h" #include "themes.h"
@@ -40,11 +44,6 @@
#include "osdlang_setup.h" #include "osdlang_setup.h"
#include "filebrowser.h" #include "filebrowser.h"
#include <global.h>
#include <neutrino.h>
#include <mymenu.h>
#include <neutrino_menue.h>
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <gui/widget/colorchooser.h> #include <gui/widget/colorchooser.h>
#include <gui/widget/stringinput.h> #include <gui/widget/stringinput.h>
@@ -434,7 +433,7 @@ int COsdSetup::showOsdSetup()
//screenshot //screenshot
CMenuWidget osd_menu_screenshot(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSHOT); CMenuWidget osd_menu_screenshot(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSHOT);
showOsdScreenshottSetup(&osd_menu_screenshot); showOsdScreenShotSetup(&osd_menu_screenshot);
mf = new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, &osd_menu_screenshot, NULL, CRCInput::RC_3); mf = new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, &osd_menu_screenshot, NULL, CRCInput::RC_3);
mf->setHint("", LOCALE_MENU_HINT_SCREENSHOT_SETUP); mf->setHint("", LOCALE_MENU_HINT_SCREENSHOT_SETUP);
osd_menu->addItem(mf); osd_menu->addItem(mf);
@@ -923,7 +922,7 @@ const CMenuOptionChooser::keyval SCREENSHOT_OPTIONS[SCREENSHOT_OPTION_COUNT] =
{ 1, LOCALE_SCREENSHOT_OSD } { 1, LOCALE_SCREENSHOT_OSD }
}; };
void COsdSetup::showOsdScreenshottSetup(CMenuWidget *menu_screenshot) void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
{ {
menu_screenshot->addIntroItems(LOCALE_SCREENSHOT_MENU); menu_screenshot->addIntroItems(LOCALE_SCREENSHOT_MENU);
if((uint)g_settings.key_screenshot == CRCInput::RC_nokey) if((uint)g_settings.key_screenshot == CRCInput::RC_nokey)

2
src/gui/osd_setup.h
View File

@@ -56,7 +56,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
void showOsdTimeoutSetup(CMenuWidget *menu_timeout); void showOsdTimeoutSetup(CMenuWidget *menu_timeout);
void showOsdInfobarSetup(CMenuWidget *menu_infobar); void showOsdInfobarSetup(CMenuWidget *menu_infobar);
void showOsdChanlistSetup(CMenuWidget *menu_chanlist); void showOsdChanlistSetup(CMenuWidget *menu_chanlist);
void showOsdScreenshottSetup(CMenuWidget *menu_screenshot); void showOsdScreenShotSetup(CMenuWidget *menu_screenshot);
void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry); void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry);