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

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp
This commit is contained in:
Thilo Graf
2016-11-10 10:27:22 +01:00
parent 996beed078 098905e8e1
commit 3efaac5725
22 changed files with 707 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/gui/widget/listframe.cpp
View File

@@ -55,10 +55,7 @@
#include "listframe.h"
#include <gui/widget/icons.h>
#define TEXT_BORDER_WIDTH 8
#define ROW_BORDER_WIDTH 4
#define SCROLL_FRAME_WIDTH 10
#define SCROLL_MARKER_BORDER 2
#define SCROLL_FRAME_WIDTH 10
#define MAX_WINDOW_WIDTH (frameBuffer->getScreenWidth() - 40)
#define MAX_WINDOW_HEIGHT (frameBuffer->getScreenHeight() - 40)
@@ -190,9 +187,11 @@ void CListFrame::initVar(void)
m_nCurrentPage = 0;
m_nSelectedLine = 0;
m_nBgRadius = RADIUS_NONE;
m_cFrame.iX = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth() - MIN_WINDOW_WIDTH) >>1);
m_cFrame.iWidth = MIN_WINDOW_WIDTH;
m_cFrame.iY = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - MIN_WINDOW_HEIGHT) >>1);
m_cFrame.iWidth = MIN_WINDOW_WIDTH;
m_cFrame.iHeight = MIN_WINDOW_HEIGHT;
m_nMaxHeight = MAX_WINDOW_HEIGHT;
@@ -204,7 +203,7 @@ void CListFrame::reSizeMainFrameWidth(int textWidth)
{
//TRACE("[CListFrame]->ReSizeMainFrameWidth: %d, current: %d\r\n",textWidth,m_cFrameListRel.iWidth);
int iNewWindowWidth = textWidth + m_cFrameScrollRel.iWidth + 2*TEXT_BORDER_WIDTH;
int iNewWindowWidth = textWidth + m_cFrameScrollRel.iWidth + 2*OFFSET_INNER_MID;
if( iNewWindowWidth > m_nMaxWidth) iNewWindowWidth = m_nMaxWidth;
if((unsigned int) iNewWindowWidth < MIN_WINDOW_WIDTH) iNewWindowWidth = MIN_WINDOW_WIDTH;
@@ -219,7 +218,7 @@ void CListFrame::reSizeMainFrameHeight(int textHeight)
{
//TRACE("[CListFrame]->ReSizeMainFrameHeight: %d, current: %d\r\n",textHeight,m_cFrameListRel.iHeight);
int iNewWindowHeight = textHeight + 2*TEXT_BORDER_WIDTH;
int iNewWindowHeight = textHeight + 2*OFFSET_INNER_MID;
if( iNewWindowHeight > m_nMaxHeight) iNewWindowHeight = m_nMaxHeight;
if( iNewWindowHeight < MIN_WINDOW_HEIGHT) iNewWindowHeight = MIN_WINDOW_HEIGHT;
@@ -236,8 +235,8 @@ void CListFrame::initFramesRel(void)
if(m_nMode & TITLE)
{
m_cFrameTitleRel.iX = 0;
m_cFrameTitleRel.iY = 0;
m_cFrameTitleRel.iX = 0;
m_cFrameTitleRel.iY = 0;
m_cFrameTitleRel.iHeight = m_nFontTitleHeight +2 ;
m_cFrameTitleRel.iWidth = m_cFrame.iWidth ;
}
@@ -245,51 +244,51 @@ void CListFrame::initFramesRel(void)
{
m_cFrameTitleRel.iX = 0;
m_cFrameTitleRel.iY = 0;
m_cFrameTitleRel.iHeight= 0;
m_cFrameTitleRel.iWidth = 0;
m_cFrameTitleRel.iHeight = 0;
m_cFrameTitleRel.iWidth = 0;
}
if(m_nMode & HEADER_LINE)
{
m_cFrameHeaderListRel.iX = 0;
m_cFrameHeaderListRel.iY = 0 + m_cFrameTitleRel.iHeight;
m_cFrameHeaderListRel.iX = 0;
m_cFrameHeaderListRel.iY = 0 + m_cFrameTitleRel.iHeight;
m_cFrameHeaderListRel.iHeight = m_nFontHeaderListHeight ;
}
else
{
m_cFrameHeaderListRel.iX = 0;
m_cFrameHeaderListRel.iY = 0;
m_cFrameHeaderListRel.iX = 0;
m_cFrameHeaderListRel.iY = 0;
m_cFrameHeaderListRel.iHeight = 0;
m_cFrameHeaderListRel.iWidth = 0;
}
m_cFrameListRel.iX = 0;
m_cFrameListRel.iY = m_cFrameHeaderListRel.iHeight + m_cFrameTitleRel.iHeight;
m_cFrameListRel.iHeight = m_cFrame.iHeight - m_cFrameHeaderListRel.iHeight - m_cFrameTitleRel.iHeight;
m_cFrameListRel.iHeight = m_cFrame.iHeight - m_cFrameHeaderListRel.iHeight - m_cFrameTitleRel.iHeight;
if(m_nMode & SCROLL)
{
m_cFrameScrollRel.iX = m_cFrame.iWidth - SCROLL_FRAME_WIDTH;
m_cFrameScrollRel.iY = m_cFrameTitleRel.iHeight;
m_cFrameScrollRel.iWidth = SCROLL_FRAME_WIDTH;
m_cFrameScrollRel.iHeight = m_cFrameListRel.iHeight + m_cFrameHeaderListRel.iHeight;
m_cFrameScrollRel.iHeight = m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight - m_nBgRadius;
}
else
{
m_cFrameScrollRel.iX = 0;
m_cFrameScrollRel.iY = 0;
m_cFrameScrollRel.iHeight = 0;
m_cFrameScrollRel.iWidth = 0;
m_cFrameScrollRel.iHeight = 0;
}
m_cFrameListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth;
m_cFrameListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth;
if(m_nMode & HEADER_LINE)
{
m_cFrameHeaderListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth;
}
m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*TEXT_BORDER_WIDTH)) / m_nFontListHeight;
m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*OFFSET_INNER_MID)) / m_nFontListHeight;
}
void CListFrame::onNewLineArray(void)
@@ -311,7 +310,7 @@ void CListFrame::onNewLineArray(void)
{
reSizeMainFrameHeight(m_nNrOfLines * m_nFontListHeight);
}
m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*TEXT_BORDER_WIDTH)) / m_nFontListHeight;
m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*OFFSET_INNER_MID)) / m_nFontListHeight;
if(m_nLinesPerPage <= 0)
m_nLinesPerPage = 1;
@@ -354,11 +353,12 @@ void CListFrame::refreshTitle(void)
if( frameBuffer == NULL) return;
frameBuffer->paintBoxRel(m_cFrameTitleRel.iX+m_cFrame.iX, m_cFrameTitleRel.iY+m_cFrame.iY,
m_cFrameTitleRel.iWidth, m_cFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR);
m_cFrameTitleRel.iWidth, m_cFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR,
m_nBgRadius, CORNER_TOP);
m_pcFontTitle->RenderString(m_cFrameTitleRel.iX + TEXT_BORDER_WIDTH + m_cFrame.iX,
m_pcFontTitle->RenderString(m_cFrameTitleRel.iX + OFFSET_INNER_MID + m_cFrame.iX,
m_cFrameTitleRel.iY + m_cFrameTitleRel.iHeight + m_cFrame.iY,
m_cFrameTitleRel.iWidth - (TEXT_BORDER_WIDTH << 1),
m_cFrameTitleRel.iWidth - (OFFSET_INNER_MID << 1),
m_textTitle.c_str(), TITLE_FONT_COLOR);
}
@@ -376,17 +376,18 @@ void CListFrame::refreshScroll(void)
if (1)
{
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY,
m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_MENUCONTENT_PLUS_0);
m_cFrameScrollRel.iWidth, m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0,
m_nBgRadius, CORNER_BOTTOM_RIGHT);
}
if (m_nNrOfPages > 1)
{
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY,
m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_SCROLLBAR_PASSIVE_PLUS_0, RADIUS_MIN);
unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*SCROLL_MARKER_BORDER) / m_nNrOfPages;
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + SCROLL_MARKER_BORDER+m_cFrame.iX,
m_cFrameScrollRel.iY + SCROLL_MARKER_BORDER + m_nCurrentPage * marker_size +m_cFrame.iY,
m_cFrameScrollRel.iWidth - (2*SCROLL_MARKER_BORDER),
unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*OFFSET_INNER_MIN) / m_nNrOfPages;
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + OFFSET_INNER_MIN+m_cFrame.iX,
m_cFrameScrollRel.iY + OFFSET_INNER_MIN + m_nCurrentPage * marker_size +m_cFrame.iY,
m_cFrameScrollRel.iWidth - (2*OFFSET_INNER_MIN),
marker_size, COL_SCROLLBAR_ACTIVE_PLUS_0, RADIUS_MIN);
}
}
@@ -399,7 +400,7 @@ int CListFrame::paintListIcon(int x, int y, int line)
frameBuffer->getIconSize(m_pLines->Icon[line].c_str(), &icol_w, &icol_h);
if ((icol_w > 0) && (icol_h > 0)) {
frameBuffer->paintIcon(m_pLines->Icon[line], x+m_cFrame.iX, y+m_cFrame.iY-m_nFontListHeight, m_nFontListHeight);
xDiff = icol_w + TEXT_BORDER_WIDTH;
xDiff = icol_w + OFFSET_INNER_MID;
}
}
return xDiff;
@@ -408,16 +409,17 @@ int CListFrame::paintListIcon(int x, int y, int line)
void CListFrame::refreshList(void)
{
//TRACE("[CListFrame]->refreshList: %d\r\n",m_nCurrentLine);
if( frameBuffer == NULL) return;
frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, m_cFrameListRel.iY+m_cFrame.iY,
m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0);
if( m_nNrOfLines <= 0)
if (frameBuffer == NULL)
return;
for(int line = m_nCurrentLine;
line < m_nNrOfLines && line < m_nCurrentLine + m_nLinesPerPage;
line++)
frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, m_cFrameListRel.iY+m_cFrame.iY,
m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0,
m_nBgRadius, CORNER_BOTTOM_LEFT);
if (m_nNrOfLines <= 0)
return;
for (int line = m_nCurrentLine; line < m_nNrOfLines && line < m_nCurrentLine + m_nLinesPerPage; line++)
{
refreshLine(line);
}
@@ -434,7 +436,7 @@ void CListFrame::refreshLine(int line)
fb_pixel_t color, bgcolor;
int rel_line = line - m_nCurrentLine;
int y = m_cFrameListRel.iY + TEXT_BORDER_WIDTH + (rel_line*m_nFontListHeight);
int y = m_cFrameListRel.iY + OFFSET_INNER_MID + (rel_line*m_nFontListHeight);
int radius = 0;
bool selected = (line == m_nSelectedLine && m_showSelection == true);
@@ -449,22 +451,22 @@ void CListFrame::refreshLine(int line)
m_cFrameListRel.iWidth, m_nFontListHeight, bgcolor, radius);
int width;
int x = m_cFrameListRel.iX + TEXT_BORDER_WIDTH;
int x = m_cFrameListRel.iX + OFFSET_INNER_MID;
y += m_nFontListHeight;
int xDiff = paintListIcon(x, y, line);
int net_width = m_cFrameListRel.iWidth - ROW_BORDER_WIDTH * (m_pLines->rows - 1);
int net_width = m_cFrameListRel.iWidth - OFFSET_INNER_SMALL * (m_pLines->rows - 1);
for(int row = 0; row < m_pLines->rows; row++)
{
width = std::min(m_pLines->rowWidth[row] * net_width / 100,
m_cFrameListRel.iWidth - x + m_cFrameListRel.iX - TEXT_BORDER_WIDTH);
m_cFrameListRel.iWidth - x + m_cFrameListRel.iX - OFFSET_INNER_MID);
if (row > 0)
xDiff = 0;
m_pcFontList->RenderString(x+m_cFrame.iX+xDiff, y+m_cFrame.iY,
width-xDiff, m_pLines->lineArray[row][line].c_str(),
color);
x += width + ROW_BORDER_WIDTH;
x += width + OFFSET_INNER_SMALL;
}
}
@@ -478,23 +480,23 @@ void CListFrame::refreshHeaderList(void)
m_cFrameHeaderListRel.iWidth, m_cFrameHeaderListRel.iHeight, HEADER_LIST_BACKGROUND_COLOR);
int width;
int x = m_cFrameHeaderListRel.iX + TEXT_BORDER_WIDTH;
int x = m_cFrameHeaderListRel.iX + OFFSET_INNER_MID;
int y = m_cFrameHeaderListRel.iY + m_nFontHeaderListHeight + 2;
int net_width = m_cFrameHeaderListRel.iWidth - ROW_BORDER_WIDTH * (m_pLines->rows - 1);
int net_width = m_cFrameHeaderListRel.iWidth - OFFSET_INNER_SMALL * (m_pLines->rows - 1);
bool loop = true;
for(int row = 0; row < m_pLines->rows && loop == true; row++)
{
width = m_pLines->rowWidth[row] * net_width / 100;
if (width > m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - TEXT_BORDER_WIDTH)
if (width > m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - OFFSET_INNER_MID)
{
width = m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - TEXT_BORDER_WIDTH;
width = m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - OFFSET_INNER_MID;
//TRACE(" normalize width to %d , x:%d \r\n",width,x);
loop = false;
}
m_pcFontHeaderList->RenderString(x+m_cFrame.iX, y+m_cFrame.iY,
width, m_pLines->lineHeader[row].c_str(),
HEADER_LIST_FONT_COLOR);
x += width + ROW_BORDER_WIDTH;
x += width + OFFSET_INNER_SMALL;
}
}

10
src/gui/widget/listframe.h
View File

@@ -104,6 +104,8 @@ class CListFrame
int m_nCurrentPage;
int m_nSelectedLine;
int m_nBgRadius;
bool m_showSelection;
Font* m_pcFontTitle;
@@ -141,6 +143,11 @@ class CListFrame
bool setTitle(char* title);
bool setSelectedLine(int selection);
void setSelectedMarked(bool enable);
void setBackGroundRadius(const int radius)
{
m_nBgRadius = radius;
initFramesRel();
};
void clearMarked()
{
if (m_pLines)
@@ -152,6 +159,9 @@ class CListFrame
inline CBox getWindowsPos(void) {return(m_cFrame);};
inline int getSelectedLine(void) {return(m_nSelectedLine);};
inline int getSelectedLineRel(void) {return(m_nSelectedLine - m_nLinesPerPage*m_nCurrentPage);};
inline int getTitleHeight(void) {return(m_cFrameTitleRel.iHeight);};
inline int getHeaderListHeight(void) {return(m_cFrameHeaderListRel.iHeight);};
inline int getLines(void) {return(m_nNrOfLines);};
inline int getPages(void) {return(m_nNrOfPages);};
inline void showSelection(bool show) {m_showSelection = show;refreshLine(m_nSelectedLine);};

14
src/gui/widget/menue.h
View File

@@ -47,6 +47,7 @@
#include <string>
#include <vector>
#include <neutrino_menue.h>
#include "menue_target.h"
extern "C" {
#include <lua.h>
#include <lauxlib.h>
@@ -100,19 +101,6 @@ class CActivateObserver
virtual void activateNotify(const neutrino_locale_t /*OptionName*/) {}
};
class CMenuTarget
{
protected:
std::string *valueString;
std::string valueStringTmp;
public:
CMenuTarget(){ valueString = &valueStringTmp; }
virtual ~CMenuTarget(){}
virtual void hide(){}
virtual int exec(CMenuTarget* parent, const std::string & actionKey) = 0;
virtual std::string &getValue(void) { return *valueString; }
virtual fb_pixel_t getColor(void) { return 0; }
};
class CMenuItem : public CComponentsSignals
{

42
src/gui/widget/menue_target.h Normal file
View File

@@ -0,0 +1,42 @@
/*
Based up Neutrino-GUI - Tuxbox-Project
Copyright (C) 2001 by Steffen Hehn 'McClean'
License: GPL
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __MENU_TARGET__
#define __MENU_TARGET__
class CMenuTarget
{
protected:
std::string *valueString;
std::string valueStringTmp;
public:
CMenuTarget(){ valueString = &valueStringTmp; }
virtual ~CMenuTarget(){}
virtual void hide(){}
virtual int exec(CMenuTarget* parent, const std::string & actionKey) = 0;
virtual std::string &getValue(void) { return *valueString; }
virtual fb_pixel_t getColor(void) { return 0; }
};
#endif /*__MENU_TARGET__*/

10
src/gui/widget/textbox.cpp
View File

@@ -836,6 +836,16 @@ void CTextBox::hide (void)
frameBuffer = NULL;
}
void CTextBox::clear(void)
{
//TRACE("[CTextBox] %s Line %d\r\n", __FUNCTION__, __LINE__);
if (frameBuffer == NULL)
return;
std::string empty(" ");
setText(&empty);
}
bool CTextBox::clearScreenBuffer()
{
if(m_bgpixbuf){

2
src/gui/widget/textbox.h
View File

@@ -204,11 +204,13 @@ class CTextBox : public sigc::trackable
inline int getLines(void) {return(m_nNrOfLines);};
inline int getLinesPerPage(void) {return m_nLinesPerPage;};
inline int getPages(void) {return(m_nNrOfPages);};
inline int getBackGroundRadius(void) {return(m_nBgRadius);};
inline void movePosition(int x, int y) {m_cFrame.iX = x; m_cFrame.iY = y;};
int getFontTextHeight();
inline int getTextMode() {return m_nMode;};
void paint (void);
void hide (void);
void clear(void);
bool clearScreenBuffer();
sigc::signal<void> OnAfterRefresh;
sigc::signal<void> OnAfterScrollPage;