mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-15 01:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
parent 5c7d94cee0 2106ee8f45
commit 0a95a07654
122 changed files with 5543 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/Makefile.am
View File

@@ -2,7 +2,7 @@ if BOXMODEL_APOLLO
SUBDIRS = mtdutils
endif
AM_CXXFLAGS = -fno-rtti -fno-exceptions
AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
AM_CPPFLAGS = \
-I$(top_builddir) \

2
src/system/debug.h
View File

@@ -24,7 +24,7 @@
#ifndef __neutrino_debug__
#define __neutrino_debug__
#include <zapit/debug.h>
extern int debug;
enum

3
src/system/helpers.cpp
View File

@@ -31,6 +31,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <inttypes.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -284,7 +285,7 @@ int check_dir(const char * dir, bool allow_tmp)
ret = 0; // ok
}
if(ret == -1)
printf("Wrong Filessystem Type: 0x%x\n",s.f_type);
printf("Wrong Filessystem Type: 0x%" PRIx32"\n",s.f_type);
}
return ret;
}

34
src/system/locals.h
View File

@@ -317,11 +317,23 @@ typedef enum
LOCALE_CLOCK_SWITCH_OFF,
LOCALE_CLOCK_SWITCH_ON,
LOCALE_COLOR_GRADIENT,
LOCALE_COLOR_GRADIENT_C2C,
LOCALE_COLOR_GRADIENT_A2B,
LOCALE_COLOR_GRADIENT_B2A,
LOCALE_COLOR_GRADIENT_D2L,
LOCALE_COLOR_GRADIENT_DLD,
LOCALE_COLOR_GRADIENT_L2D,
LOCALE_COLOR_GRADIENT_LDL,
LOCALE_COLOR_GRADIENT_MODE_DIRECTION,
LOCALE_COLOR_GRADIENT_MODE_DIRECTION_HOR,
LOCALE_COLOR_GRADIENT_MODE_DIRECTION_VER,
LOCALE_COLOR_GRADIENT_SEPARATOR_ENABLE,
LOCALE_COLORCHOOSER_ALPHA,
LOCALE_COLORCHOOSER_BLUE,
LOCALE_COLORCHOOSER_GREEN,
LOCALE_COLORCHOOSER_RED,
LOCALE_COLORCHOOSER_SAVE,
LOCALE_COLORMENU_ADVANCED_MODE_OFF,
LOCALE_COLORMENU_ADVANCED_MODE_ON,
LOCALE_COLORMENU_BACKGROUND,
LOCALE_COLORMENU_CLOCK_TEXTCOLOR,
LOCALE_COLORMENU_CONTRAST_FONTS,
@@ -1004,7 +1016,8 @@ typedef enum
LOCALE_MENU_HINT_CLOCK_SIZE,
LOCALE_MENU_HINT_CLOCK_TEXTCOLOR,
LOCALE_MENU_HINT_COLOR_GRADIENT,
LOCALE_MENU_HINT_COLOR_GRADIENT_C2C,
LOCALE_MENU_HINT_COLOR_GRADIENT_DIRECTION,
LOCALE_MENU_HINT_COLOR_GRADIENT_SEPARATOR_ENABLE,
LOCALE_MENU_HINT_COLORED_EVENTS,
LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR,
LOCALE_MENU_HINT_COLORS,
@@ -1210,6 +1223,8 @@ typedef enum
LOCALE_MENU_HINT_NEXT_BRIEF,
LOCALE_MENU_HINT_NUMERIC_ADJUST,
LOCALE_MENU_HINT_OPKG,
LOCALE_MENU_HINT_OPKG_FEED_ADRESSES_EDIT,
LOCALE_MENU_HINT_OPKG_INSTALL_LOCAL_PACKAGE,
LOCALE_MENU_HINT_OPKG_UPGRADE,
LOCALE_MENU_HINT_OSD,
LOCALE_MENU_HINT_OSD_LANGUAGE,
@@ -1358,6 +1373,8 @@ typedef enum
LOCALE_MENU_HINT_SCREEN_SETUP,
LOCALE_MENU_HINT_SCREENSAVER_DELAY,
LOCALE_MENU_HINT_SCREENSAVER_DIR,
LOCALE_MENU_HINT_SCREENSAVER_MODE,
LOCALE_MENU_HINT_SCREENSAVER_RANDOM,
LOCALE_MENU_HINT_SCREENSAVER_TIMEOUT,
LOCALE_MENU_HINT_SCREENSAVER_SETUP,
LOCALE_MENU_HINT_SCREENSHOT_COUNT,
@@ -1443,6 +1460,7 @@ typedef enum
LOCALE_MESSAGEBOX_CANCEL,
LOCALE_MESSAGEBOX_DISCARD,
LOCALE_MESSAGEBOX_ERROR,
LOCALE_MESSAGEBOX_FEATURE_NOT_SUPPORTED,
LOCALE_MESSAGEBOX_INFO,
LOCALE_MESSAGEBOX_NO,
LOCALE_MESSAGEBOX_OK,
@@ -1499,6 +1517,7 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_DISP_4,
LOCALE_MISCSETTINGS_INFOBAR_DISP_5,
LOCALE_MISCSETTINGS_INFOBAR_DISP_6,
LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_BODY,
LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_BOTTOM,
LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_TOP,
LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR,
@@ -1871,14 +1890,21 @@ typedef enum
LOCALE_OPKG_BUTTON_INFO,
LOCALE_OPKG_BUTTON_INSTALL,
LOCALE_OPKG_BUTTON_UNINSTALL,
LOCALE_OPKG_ENTER_FEED_ADDRESS,
LOCALE_OPKG_ENTER_FEED_ADDRESS_EXAMPLE,
LOCALE_OPKG_FAILURE_INSTALL,
LOCALE_OPKG_FAILURE_UPDATE,
LOCALE_OPKG_FAILURE_UPGRADE,
LOCALE_OPKG_FEED_ADRESSES,
LOCALE_OPKG_INSTALL_LOCAL_PACKAGE,
LOCALE_OPKG_MESSAGEBOX_REINSTALL,
LOCALE_OPKG_MESSAGEBOX_REMOVE,
LOCALE_OPKG_MESSAGEBOX_SIZE_ERROR,
LOCALE_OPKG_MESSAGEBOX_UPDATES_AVAILABLE,
LOCALE_OPKG_SUCCESS_INSTALL,
LOCALE_OPKG_TITLE,
LOCALE_OPKG_UPGRADE,
LOCALE_OPKG_WARNING_3RDPARTY_PACKAGES,
LOCALE_OPTIONS_DEFAULT,
LOCALE_OPTIONS_FB,
LOCALE_OPTIONS_HINT_DEFAULT,
@@ -2157,7 +2183,11 @@ typedef enum
LOCALE_SCREENSAVER_DELAY,
LOCALE_SCREENSAVER_DIR,
LOCALE_SCREENSAVER_MENU,
LOCALE_SCREENSAVER_MODE,
LOCALE_SCREENSAVER_MODE_CLOCK,
LOCALE_SCREENSAVER_MODE_IMAGE,
LOCALE_SCREENSAVER_OFF,
LOCALE_SCREENSAVER_RANDOM,
LOCALE_SCREENSAVER_TIMEOUT,
LOCALE_SCREENSETUP_LOWERRIGHT,
LOCALE_SCREENSETUP_UPPERLEFT,

34
src/system/locals_intern.h
View File

@@ -317,11 +317,23 @@ const char * locale_real_names[] =
"clock_switch_off",
"clock_switch_on",
"color.gradient",
"color.gradient_c2c",
"color.gradient_a2b",
"color.gradient_b2a",
"color.gradient_d2l",
"color.gradient_dld",
"color.gradient_l2d",
"color.gradient_ldl",
"color.gradient_mode_direction",
"color.gradient_mode_direction_hor",
"color.gradient_mode_direction_ver",
"color.gradient_separator_enable",
"colorchooser.alpha",
"colorchooser.blue",
"colorchooser.green",
"colorchooser.red",
"colorchooser.save",
"colormenu.advanced_mode_off",
"colormenu.advanced_mode_on",
"colormenu.background",
"colormenu.clock_textcolor",
"colormenu.contrast_fonts",
@@ -1004,7 +1016,8 @@ const char * locale_real_names[] =
"menu.hint_clock_size",
"menu.hint_clock_textcolor",
"menu.hint_color_gradient",
"menu.hint_color_gradient_c2c",
"menu.hint_color_gradient_direction",
"menu.hint_color_gradient_separator_enable",
"menu.hint_colored_events",
"menu.hint_colored_events_textcolor",
"menu.hint_colors",
@@ -1210,6 +1223,8 @@ const char * locale_real_names[] =
"menu.hint_next_brief",
"menu.hint_numeric_adjust",
"menu.hint_opkg",
"menu.hint_opkg_feed_address_edit",
"menu.hint_opkg_install_local_package",
"menu.hint_opkg_upgrade",
"menu.hint_osd",
"menu.hint_osd_language",
@@ -1358,6 +1373,8 @@ const char * locale_real_names[] =
"menu.hint_screen_setup",
"menu.hint_screensaver_delay",
"menu.hint_screensaver_dir",
"menu.hint_screensaver_mode",
"menu.hint_screensaver_random",
"menu.hint_screensaver_timeout",
"menu.hint_screensaver_setup",
"menu.hint_screenshot_count",
@@ -1443,6 +1460,7 @@ const char * locale_real_names[] =
"messagebox.cancel",
"messagebox.discard",
"messagebox.error",
"messagebox.feature_not_supported",
"messagebox.info",
"messagebox.no",
"messagebox.ok",
@@ -1499,6 +1517,7 @@ const char * locale_real_names[] =
"miscsettings.infobar_disp_4",
"miscsettings.infobar_disp_5",
"miscsettings.infobar_disp_6",
"miscsettings.infobar_gradient_body",
"miscsettings.infobar_gradient_bottom",
"miscsettings.infobar_gradient_top",
"miscsettings.infobar_logo_hdd_dir",
@@ -1871,14 +1890,21 @@ const char * locale_real_names[] =
"opkg.button.info",
"opkg.button.install",
"opkg.button.uninstall",
"opkg.enter.feed.address",
"opkg.enter.feed.address.example",
"opkg.failure.install",
"opkg.failure.update",
"opkg.failure.upgrade",
"opkg.feed.addresses",
"opkg.install.local.package",
"opkg.messagebox.reinstall",
"opkg.messagebox.remove",
"opkg.messagebox.size.error",
"opkg.messagebox.updates.available",
"opkg.success.install",
"opkg.title",
"opkg.upgrade",
"opkg.warning_3rdparty_packages",
"options.default",
"options.fb",
"options.hint_default",
@@ -2157,7 +2183,11 @@ const char * locale_real_names[] =
"screensaver.delay",
"screensaver.dir",
"screensaver.menu",
"screensaver.mode",
"screensaver.mode_clock",
"screensaver.mode_image",
"screensaver.off",
"screensaver.random",
"screensaver.timeout",
"screensetup.lowerright",
"screensetup.upperleft",

25
src/system/settings.h
View File

@@ -65,6 +65,8 @@ struct SNeutrinoTheme
unsigned char menu_Head_Text_blue;
int menu_Head_gradient;
int menu_Head_gradient_direction;
int menu_Separator_gradient_enable;
unsigned char menu_Content_alpha;
unsigned char menu_Content_red;
@@ -97,6 +99,9 @@ struct SNeutrinoTheme
unsigned char menu_Content_inactive_Text_blue;
int menu_Hint_gradient;
int menu_Hint_gradient_direction;
int menu_ButtonBar_gradient;
int menu_ButtonBar_gradient_direction;
unsigned char infobar_alpha;
unsigned char infobar_red;
@@ -114,7 +119,11 @@ struct SNeutrinoTheme
unsigned char infobar_Text_blue;
int infobar_gradient_top;
int infobar_gradient_top_direction;
int infobar_gradient_body;
int infobar_gradient_body_direction;
int infobar_gradient_bottom;
int infobar_gradient_bottom_direction;
unsigned char colored_events_alpha;
unsigned char colored_events_red;
@@ -128,7 +137,6 @@ struct SNeutrinoTheme
unsigned char clock_Digit_red;
unsigned char clock_Digit_green;
unsigned char clock_Digit_blue;
int gradient_c2c;
};
struct SNeutrinoSettings
@@ -175,9 +183,9 @@ struct SNeutrinoSettings
int progressbar_timescale_green;
int progressbar_timescale_yellow;
int progressbar_timescale_invert;
int casystem_display;
int casystem_dotmatrix;
int casystem_frame;
int infobar_casystem_display;
int infobar_casystem_dotmatrix;
int infobar_casystem_frame;
int scrambled_message;
int volume_pos;
int volume_digits;
@@ -236,6 +244,8 @@ struct SNeutrinoSettings
int screensaver_delay;
std::string screensaver_dir;
int screensaver_timeout;
int screensaver_random;
int screensaver_mode;
//vcr
int vcr_AutoSwitch;
@@ -386,7 +396,9 @@ struct SNeutrinoSettings
//widget settings
int widget_fade;
//theme/color options
SNeutrinoTheme theme;
bool osd_colorsettings_advanced_mode;
int contrast_fonts;
@@ -600,6 +612,9 @@ struct SNeutrinoSettings
int flashupdate_createimage_add_spare;
int flashupdate_createimage_add_kernel;
std::string update_dir;
std::string update_dir_opkg;
//BouquetHandling
int bouquetlist_mode;
@@ -717,7 +732,7 @@ struct SNeutrinoSettings
int sms_channel;
std::string font_file;
std::string ttx_font_file;
std::string update_dir;
// USERMENU
typedef enum
{