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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 84381644ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)
This commit is contained in:
vanhofen
2016-11-24 00:04:21 +01:00
parent 577199b79e e10e0583ae
commit a2f404e939
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/driver/record.h
View File

@@ -209,6 +209,7 @@ class CRecordManager : public CMenuTarget /*, public CChangeObserver*/
bool StopAutoRecord(bool lock = true); bool StopAutoRecord(bool lock = true);
void StopAutoTimer(); void StopAutoTimer();
bool CheckRecordingId_if_Timeshift(int recid); bool CheckRecordingId_if_Timeshift(int recid);
recmap_t GetRecordMap()const{return recmap;}
MI_MOVIE_INFO * GetMovieInfo(const t_channel_id channel_id, bool timeshift = true); MI_MOVIE_INFO * GetMovieInfo(const t_channel_id channel_id, bool timeshift = true);
const std::string GetFileName(const t_channel_id channel_id, bool timeshift = true); const std::string GetFileName(const t_channel_id channel_id, bool timeshift = true);

2
src/gui/components/cc_frm_window.cpp
View File

@@ -59,7 +59,7 @@ using namespace std;
//sub class CComponentsWindow inherit from CComponentsForm //sub class CComponentsWindow inherit from CComponentsForm
CComponentsWindow::CComponentsWindow(CComponentsForm *parent) CComponentsWindow::CComponentsWindow(CComponentsForm *parent)
{ {
initVarWindow(0, 0, 800, 600, "", "", parent); initVarWindow(0, 0, 800, 600, "", "", parent, CC_SHADOW_OFF, COL_FRAME_PLUS_0, COL_MENUCONTENT_PLUS_0, COL_SHADOW_PLUS_0);
} }
CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const int& w, const int& h, CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,

16
src/gui/components/cc_frm_window.h
View File

@@ -107,14 +107,14 @@ class CComponentsWindow : public CComponentsForm
///initialze all window objects at once ///initialze all window objects at once
void initCCWItems(); void initCCWItems();
///initialize all attributes ///initialize all attributes
void initVarWindow( const int& x_pos = CC_CENTERED, const int& y_pos = CC_CENTERED, const int& w = 0, const int& h = 0, void initVarWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption = "", const std::string& caption,
const std::string& iconname = "", const std::string& iconname,
CComponentsForm *parent = NULL, CComponentsForm *parent,
int shadow_mode = CC_SHADOW_OFF, int shadow_mode,
fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_frame,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_body,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); fb_pixel_t color_shadow);
///initialize width and height ///initialize width and height
void initWindowSize(); void initWindowSize();
///initialize position ///initialize position

4
src/gui/components/cc_item.cpp
View File

@@ -86,7 +86,7 @@ void CComponentsItem::paintInit(bool do_save_bg)
sw = max(0, sw); sw = max(0, sw);
//set current needed corner main box radius //set current needed corner main box radius
int box_rad = corner_rad; int box_rad = corner_type ? corner_rad : 0;
//and ensure max main box radius < dimensions //and ensure max main box radius < dimensions
if (2*box_rad > dy) if (2*box_rad > dy)
@@ -186,7 +186,7 @@ void CComponentsItem::paintInit(bool do_save_bg)
{sh_ctr, CC_FBDATA_TYPE_SHADOW_BOX, sh_ctr_x-sw, sh_ctr_y-sw+th, sh_cdx, sh_cdy-sh_cdy_size_offset+sw, col_shadow_clean, box_rad, corner_type & CORNER_TOP_RIGHT, 0, NULL, NULL, NULL, false}, {sh_ctr, CC_FBDATA_TYPE_SHADOW_BOX, sh_ctr_x-sw, sh_ctr_y-sw+th, sh_cdx, sh_cdy-sh_cdy_size_offset+sw, col_shadow_clean, box_rad, corner_type & CORNER_TOP_RIGHT, 0, NULL, NULL, NULL, false},
//main box //main box
{true, CC_FBDATA_TYPE_BOX, ix+th, iy+th, dx-2*th, dy-2*th, col_body, box_rad-th, corner_type, 0, NULL, NULL, NULL, false}, {true, CC_FBDATA_TYPE_BOX, ix+th, iy+th, dx-2*th, dy-2*th, col_body, max(0,box_rad-th), corner_type, 0, NULL, NULL, NULL, false},
//frame //frame
{true, CC_FBDATA_TYPE_FRAME, ix, iy, dx, dy, col_frame_cur, box_rad, corner_type, th, NULL, NULL, NULL, false} {true, CC_FBDATA_TYPE_FRAME, ix, iy, dx, dy, col_frame_cur, box_rad, corner_type, th, NULL, NULL, NULL, false}