API tools faq
paste
Advertisement
svenhoefer

Untitled

svenhoefer
Feb 11th, 2017
254
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 8.71 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
  2. index 3a9f230..5a50710 100644
  3. --- a/data/locale/deutsch.locale
  4. +++ b/data/locale/deutsch.locale
  5. @@ -352,7 +352,7 @@ colormenu.fade Ein-/Ausblenden
  6.  colormenu.font Verwendete Schriftart
  7.  colormenu.font_ttx Teletext Schriftart
  8.  colormenu.menucolors Farben
  9. -colormenu.osd_preset Monitor Auswahl
  10. +colormenu.osd_preset Auflösung
  11.  colormenu.progressbar_active Farbe des aktiven Teil
  12.  colormenu.progressbar_passive Hintergrundfarbe
  13.  colormenu.textcolor Textfarbe
  14. @@ -1396,8 +1396,7 @@ menu.hint_opkg_install_local_package Paket von USB-Stick, SD, Freigabe oder loka
  15.  menu.hint_opkg_upgrade Aktualisiert alle installierten Pakete auf die neueste verfügbare Version
  16.  menu.hint_osd Farben, Schriftarten, Anzeigegröße, Ansichtsoptionen der Menüs usw.
  17.  menu.hint_osd_language Wählen Sie ihre Menü-Sprache
  18. -menu.hint_osd_preset Wählen Sie zwischen Röhren-TV (CRT) oder Flachbildschirm (LCD)
  19. -menu.hint_osd_preset2 Wählen Sie zwischen Röhren-TV (CRT) oder Flachbildschirm (LCD HD/LCD FullHD)
  20. +menu.hint_osd_preset Wählen Sie eine Auflösung in der das OSD angezeigt werden soll
  21.  menu.hint_osd_timing Einblendzeit, die das OSD auf dem TV angezeigt wird
  22.  menu.hint_other_fonts Ändern Sie andere Schriftgrößen
  23.  menu.hint_parentallock_changepin Geben Sie den 4-stelligen PIN-Code ein, der dann ggf. abgefragt wird
  24. diff --git a/data/locale/english.locale b/data/locale/english.locale
  25. index a28919f..a77eb48 100644
  26. --- a/data/locale/english.locale
  27. +++ b/data/locale/english.locale
  28. @@ -352,7 +352,7 @@ colormenu.fade Fade GUI
  29.  colormenu.font Select GUI font
  30.  colormenu.font_ttx Select Teletext font
  31.  colormenu.menucolors Colors
  32. -colormenu.osd_preset TV preset
  33. +colormenu.osd_preset Resolution preset
  34.  colormenu.progressbar_active Aktive part color
  35.  colormenu.progressbar_passive Background
  36.  colormenu.textcolor Text color
  37. @@ -1396,8 +1396,7 @@ menu.hint_opkg_install_local_package Install package from USB, SD, share or loca
  38.  menu.hint_opkg_upgrade Updates all installed packages to the most recent version available
  39.  menu.hint_osd Colors, fonts, screen size\nGUI look and feel options
  40.  menu.hint_osd_language Select OSD language
  41. -menu.hint_osd_preset Pre-configured screen margins for CRT and LCD TV
  42. -menu.hint_osd_preset2 Pre-configured screen margins for CRT and LCD TV (LCD HD/LCD FullHD)
  43. +menu.hint_osd_preset Pre-configured screen resolutions for OSD
  44.  menu.hint_osd_timing After this time the OSD will be faded out
  45.  menu.hint_other_fonts Change other font sizes
  46.  menu.hint_parentallock_changepin Change PIN code
  47. diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
  48. index 309762a..c431c18 100644
  49. --- a/src/gui/osd_setup.cpp
  50. +++ b/src/gui/osd_setup.cpp
  51. @@ -399,21 +399,13 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
  52.  }
  53.  
  54.  
  55. -#ifdef BOXMODEL_APOLLO
  56. -#define OSD_PRESET_OPTIONS_COUNT 3
  57. -#else
  58. -#define OSD_PRESET_OPTIONS_COUNT 2
  59. -#endif
  60. -const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[OSD_PRESET_OPTIONS_COUNT] =
  61. +const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] =
  62.  {
  63. -   { COsdSetup::PRESET_SD,     NONEXISTANT_LOCALE, "CRT"        },
  64. -#ifndef BOXMODEL_APOLLO
  65. -   { COsdSetup::PRESET_HD,     NONEXISTANT_LOCALE, "LCD"        }
  66. -#else
  67. -   { COsdSetup::PRESET_HD,     NONEXISTANT_LOCALE, "LCD HD"     },
  68. -   { COsdSetup::PRESET_FULLHD, NONEXISTANT_LOCALE, "LCD FullHD" }
  69. -#endif
  70. +   { COsdSetup::PRESET_HD_CRT, NONEXISTANT_LOCALE, "HD (CRT)" },
  71. +   { COsdSetup::PRESET_HD,     NONEXISTANT_LOCALE, "HD"       },
  72. +   { COsdSetup::PRESET_FULLHD, NONEXISTANT_LOCALE, "FullHD"   }
  73.  };
  74. +size_t osd_preset_options_count = sizeof(OSD_PRESET_OPTIONS)/sizeof(OSD_PRESET_OPTIONS[0]);
  75.  
  76.  #define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4
  77.  const CMenuOptionChooser::keyval INFOBAR_CASYSTEM_MODE_OPTIONS[INFOBAR_CASYSTEM_MODE_OPTION_COUNT] =
  78. @@ -671,21 +663,11 @@ int COsdSetup::showOsdSetup()
  79.  
  80.     osd_menu->addItem(GenericMenuSeparatorLine);
  81.  
  82. -   //monitor
  83. -   std::string tmp_loc;
  84. -   int preset_count = OSD_PRESET_OPTIONS_COUNT;
  85. -#ifdef BOXMODEL_APOLLO
  86. -   if (frameBuffer->fullHdAvailable())
  87. -       tmp_loc = g_Locale->getText(LOCALE_MENU_HINT_OSD_PRESET2);
  88. -   else {
  89. -       tmp_loc = g_Locale->getText(LOCALE_MENU_HINT_OSD_PRESET);
  90. -       preset_count--;
  91. -   }
  92. -#else
  93. -   tmp_loc = g_Locale->getText(LOCALE_MENU_HINT_OSD_PRESET);
  94. -#endif
  95. -   CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, preset_count, true, this);
  96. -   mc->setHint("", tmp_loc);
  97. +   //resolutions
  98. +   if (!frameBuffer->fullHdAvailable())
  99. +       osd_preset_options_count--; // strip fullHD; FIXME: won't work, when more resolutions will be added
  100. +   CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, osd_preset_options_count, true, this);
  101. +   mc->setHint("", LOCALE_MENU_HINT_OSD_PRESET);
  102.     osd_menu->addItem(mc);
  103.  
  104.  //NI
  105. diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h
  106. index aec8c14..825caf6 100644
  107. --- a/src/gui/osd_setup.h
  108. +++ b/src/gui/osd_setup.h
  109. @@ -104,7 +104,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
  110.  
  111.         enum
  112.         {
  113. -           PRESET_SD,
  114. +           PRESET_HD_CRT,
  115.             PRESET_HD,
  116.             PRESET_FULLHD
  117.         };
  118. diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp
  119. index 13d2f87..2ce71b2 100644
  120. --- a/src/gui/screensetup.cpp
  121. +++ b/src/gui/screensetup.cpp
  122. @@ -117,20 +117,18 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
  123.                 g_settings.screen_StartY = y_coord[0];
  124.                 g_settings.screen_EndY = y_coord[1];
  125.                 switch (g_settings.screen_preset) {
  126. -                   case COsdSetup::PRESET_SD:
  127. +                   case COsdSetup::PRESET_HD_CRT:
  128.                         g_settings.screen_StartX_crt = g_settings.screen_StartX;
  129.                         g_settings.screen_StartY_crt = g_settings.screen_StartY;
  130.                         g_settings.screen_EndX_crt   = g_settings.screen_EndX;
  131.                         g_settings.screen_EndY_crt   = g_settings.screen_EndY;
  132.                         break;
  133. -#ifdef BOXMODEL_APOLLO
  134.                     case COsdSetup::PRESET_FULLHD:
  135.                         g_settings.screen_StartX_lcd_fullhd = g_settings.screen_StartX;
  136.                         g_settings.screen_StartY_lcd_fullhd = g_settings.screen_StartY;
  137.                         g_settings.screen_EndX_lcd_fullhd   = g_settings.screen_EndX;
  138.                         g_settings.screen_EndY_lcd_fullhd   = g_settings.screen_EndY;
  139.                         break;
  140. -#endif
  141.                     case COsdSetup::PRESET_HD:
  142.                     default:
  143.                         g_settings.screen_StartX_lcd = g_settings.screen_StartX;
  144. diff --git a/src/neutrino.cpp b/src/neutrino.cpp
  145. index 6bdd22f..98b5ca0 100644
  146. --- a/src/neutrino.cpp
  147. +++ b/src/neutrino.cpp
  148. @@ -999,20 +999,18 @@ void CNeutrinoApp::setScreenSettings()
  149.     g_settings.screen_width = frameBuffer->getScreenWidth(true);
  150.     g_settings.screen_height = frameBuffer->getScreenHeight(true);
  151.     switch (g_settings.screen_preset) {
  152. -       case COsdSetup::PRESET_SD:
  153. +       case COsdSetup::PRESET_HD_CRT:
  154.             g_settings.screen_StartX = g_settings.screen_StartX_crt;
  155.             g_settings.screen_StartY = g_settings.screen_StartY_crt;
  156.             g_settings.screen_EndX   = g_settings.screen_EndX_crt;
  157.             g_settings.screen_EndY   = g_settings.screen_EndY_crt;
  158.             break;
  159. -#ifdef BOXMODEL_APOLLO
  160.         case COsdSetup::PRESET_FULLHD:
  161.             g_settings.screen_StartX = g_settings.screen_StartX_lcd_fullhd;
  162.             g_settings.screen_StartY = g_settings.screen_StartY_lcd_fullhd;
  163.             g_settings.screen_EndX   = g_settings.screen_EndX_lcd_fullhd;
  164.             g_settings.screen_EndY   = g_settings.screen_EndY_lcd_fullhd;
  165.             break;
  166. -#endif
  167.         case COsdSetup::PRESET_HD:
  168.         default:
  169.             g_settings.screen_StartX = g_settings.screen_StartX_lcd;
  170. @@ -1963,7 +1961,7 @@ void CNeutrinoApp::SetupFrameBuffer()
  171.     else
  172.         setFbMode = frameBuffer->setMode(1280, 720, 8 * sizeof(fb_pixel_t));
  173.  #else
  174. -   setFbMode = frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t));
  175. +   setFbMode = frameBuffer->setMode(720, 576, 8 * sizeof(fb_pixel_t)); //FIXME - SD resolution for Nevis?
  176.  #endif
  177.     if (setFbMode == -1) {
  178.         dprintf(DEBUG_NORMAL, "Error while setting framebuffer mode\n");
  179. diff --git a/src/system/locals.h b/src/system/locals.h
  180. index 57b8e40..ff951c3 100644
  181. --- a/src/system/locals.h
  182. +++ b/src/system/locals.h
  183. @@ -1424,7 +1424,6 @@ typedef enum
  184.     LOCALE_MENU_HINT_OSD,
  185.     LOCALE_MENU_HINT_OSD_LANGUAGE,
  186.     LOCALE_MENU_HINT_OSD_PRESET,
  187. -   LOCALE_MENU_HINT_OSD_PRESET2,
  188.     LOCALE_MENU_HINT_OSD_TIMING,
  189.     LOCALE_MENU_HINT_OTHER_FONTS,
  190.     LOCALE_MENU_HINT_PARENTALLOCK_CHANGEPIN,
  191. diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
  192. index f25648e..3b315af 100644
  193. --- a/src/system/locals_intern.h
  194. +++ b/src/system/locals_intern.h
  195. @@ -1424,7 +1424,6 @@ const char * locale_real_names[] =
  196.     "menu.hint_osd",
  197.     "menu.hint_osd_language",
  198.     "menu.hint_osd_preset",
  199. -   "menu.hint_osd_preset2",
  200.     "menu.hint_osd_timing",
  201.     "menu.hint_other_fonts",
  202.     "menu.hint_parentallock_changepin",
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!