diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index a044937d9..5747121cc 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2606,8 +2606,8 @@ timerlist.repeat.wednesday Mi timerlist.repeat.weekdays An Wochentagen timerlist.repeat.weekly wöchentlich timerlist.repeatcount Wiederholungen -timerlist.repeatcount.help1 Anzahl der Timerausführungen -timerlist.repeatcount.help2 0 für unbegrenzte Anzahl +timerlist.repeatcount.hint_1 Anzahl der Timerausführungen +timerlist.repeatcount.hint_2 0 für unbegrenzte Anzahl timerlist.save Timer speichern timerlist.standby Aktion timerlist.standby.off Aufwachen aus Standby diff --git a/data/locale/english.locale b/data/locale/english.locale index 87b3211b0..1de49a9a2 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2606,8 +2606,8 @@ timerlist.repeat.wednesday We timerlist.repeat.weekdays on weekdays timerlist.repeat.weekly weekly timerlist.repeatcount repeats -timerlist.repeatcount.help1 amount of timer repeats -timerlist.repeatcount.help2 0 for unlimited repeats +timerlist.repeatcount.hint_1 Amount of timer repeats +timerlist.repeatcount.hint_2 0 for unlimited repeats timerlist.save Save timer timerlist.standby Action timerlist.standby.off Leave standby diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp index a1ae03b04..5bba0af59 100644 --- a/src/gui/components/cc_frm.cpp +++ b/src/gui/components/cc_frm.cpp @@ -375,9 +375,9 @@ void CComponentsForm::paintCCItems() //init and handle scrollbar getPageCount(); - int y_sb = this_y+1; + int y_sb = this_y; int x_sb = this_x + width - w_sb; - int h_sb = height-2; + int h_sb = height; if (sb == NULL){ sb = new CComponentsScrollBar(x_sb, y_sb, w_sb, h_sb); }else{ diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp index b0ca25fca..ad2189689 100644 --- a/src/gui/components/cc_frm_scrollbar.cpp +++ b/src/gui/components/cc_frm_scrollbar.cpp @@ -76,11 +76,13 @@ void CComponentsScrollBar::initVarSbForm(const int& count) cc_item_type = CC_ITEMTYPE_FRM_SCROLLBAR; fr_thickness = 0; - append_x_offset = 0; - append_y_offset = 2; + append_x_offset = OFFSET_INNER_MIN; + append_y_offset = OFFSET_INNER_MIN; - sb_up_obj = sb_down_obj = NULL; + sb_up_obj = NULL; + sb_down_obj = NULL; sb_segments_obj = NULL; + setCorner(RADIUS_MIN, CORNER_ALL); sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ; @@ -130,19 +132,19 @@ void CComponentsScrollBar::initBottomNaviIcon() void CComponentsScrollBar::initSegments() { //init dimensions for segments - int w_seg = width - 4*fr_thickness; -//never read int h_seg = height - (sb_segments_count-1)*append_y_offset; + int w_seg = width - 2*fr_thickness - 2*append_x_offset; + if (w_seg < 0) + w_seg = 0; //calculate height of segment container - int h_seg_obj = height - 2*sb_up_obj->getHeight() - 3*append_y_offset; - if(h_seg_obj < 0) + int h_seg_obj = height - 2*fr_thickness - 2*sb_up_obj->getHeight() - 2*append_y_offset; + if (h_seg_obj < 0) h_seg_obj = 0; //init segment container if (sb_segments_obj == NULL){ sb_segments_obj = new CComponentsFrmChain(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj, NULL, CC_DIR_Y, this, false); - sb_segments_obj->setFrameThickness(0/*,0*/); - sb_segments_obj->setAppendOffset(0, 3); + sb_segments_obj->setFrameThickness(0); }else sb_segments_obj->setDimensionsAll(CC_CENTERED, CC_APPEND, w_seg, h_seg_obj); @@ -153,9 +155,9 @@ void CComponentsScrollBar::initSegments() sb_segments_obj->clear(); //set y position of 1st segment and set height of segments - int y_seg = 1+ append_y_offset; + int y_seg = append_y_offset; int h_seg = sb_segments_obj->getHeight()/sb_segments_count - append_y_offset; - if(h_seg < 0) + if (h_seg < 0) h_seg = 0; //create and add segments to segment container diff --git a/src/gui/components/cc_frm_scrollbar.h b/src/gui/components/cc_frm_scrollbar.h index 8ea476fb7..8057147ec 100644 --- a/src/gui/components/cc_frm_scrollbar.h +++ b/src/gui/components/cc_frm_scrollbar.h @@ -78,7 +78,7 @@ class CComponentsScrollBar : public CComponentsFrmChain CComponentsScrollBar( const int &x_pos, const int &y_pos, const int &w = 15, - const int &h = 40, + const int &h = 0, const int& count = 1, CComponentsForm *parent = NULL, int shadow_mode = CC_SHADOW_OFF, diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 122c68042..66ac7465d 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -2812,24 +2812,37 @@ bool CMovieBrowser::onSortMovieInfoHandleList(std::vector& handl void CMovieBrowser::updateDir(void) { + struct stat info; + m_dir.clear(); + #if 0 // check if there is a movie dir and if we should use it if (g_settings.network_nfs_moviedir[0] != 0) { + if (!(stat(g_settings.network_nfs_moviedir.c_str(), &info) == 0 && S_ISDIR(info.st_mode))) + m_settings.storageDirMovieUsed = false; + std::string name = g_settings.network_nfs_moviedir; addDir(name,&m_settings.storageDirMovieUsed); } #endif + // check if there is a record dir and if we should use it if (!g_settings.network_nfs_recordingdir.empty()) { + if (!(stat(g_settings.network_nfs_recordingdir.c_str(), &info) == 0 && S_ISDIR(info.st_mode))) + m_settings.storageDirRecUsed = false; + addDir(g_settings.network_nfs_recordingdir, &m_settings.storageDirRecUsed); cHddStat::getInstance()->statOnce(); } for (int i = 0; i < MB_MAX_DIRS; i++) { + if (!(stat(m_settings.storageDir[i].c_str(), &info) == 0 && S_ISDIR(info.st_mode))) + m_settings.storageDirUsed[i] = false; + if (!m_settings.storageDir[i].empty()) addDir(m_settings.storageDir[i],&m_settings.storageDirUsed[i]); } diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 4860793e9..52eca8f4f 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1600,7 +1600,7 @@ int CTimerList::modifyTimer() timer->eventRepeat = (CTimerd::CTimerEventRepeat)(((int)timer->eventRepeat) & 0x1FF); CStringInput timerSettings_weekdays(LOCALE_TIMERLIST_WEEKDAYS, &m_weekdaysStr, 7, LOCALE_TIMERLIST_WEEKDAYS_HINT_1, LOCALE_TIMERLIST_WEEKDAYS_HINT_2, "-X"); CMenuForwarder *m4 = new CMenuForwarder(LOCALE_TIMERLIST_WEEKDAYS, ((int)timer->eventRepeat) >= (int)CTimerd::TIMERREPEAT_WEEKDAYS, m_weekdaysStr, &timerSettings_weekdays ); - CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timer->repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HELP1, LOCALE_TIMERLIST_REPEATCOUNT_HELP2); + CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timer->repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HINT_1, LOCALE_TIMERLIST_REPEATCOUNT_HINT_2); CMenuForwarder *m5 = new CMenuForwarder(LOCALE_TIMERLIST_REPEATCOUNT, timer->eventRepeat != (int)CTimerd::TIMERREPEAT_ONCE ,timerSettings_repeatCount.getValue() , &timerSettings_repeatCount); @@ -1710,7 +1710,7 @@ int CTimerList::newTimer() CStringInput timerSettings_weekdays(LOCALE_TIMERLIST_WEEKDAYS, &m_weekdaysStr, 7, LOCALE_TIMERLIST_WEEKDAYS_HINT_1, LOCALE_TIMERLIST_WEEKDAYS_HINT_2, "-X"); CMenuForwarder *m4 = new CMenuForwarder(LOCALE_TIMERLIST_WEEKDAYS, false, m_weekdaysStr, &timerSettings_weekdays); - CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timerNew.repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HELP1, LOCALE_TIMERLIST_REPEATCOUNT_HELP2); + CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timerNew.repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HINT_1, LOCALE_TIMERLIST_REPEATCOUNT_HINT_2); CMenuForwarder *m5 = new CMenuForwarder(LOCALE_TIMERLIST_REPEATCOUNT, false,timerSettings_repeatCount.getValue() , &timerSettings_repeatCount); CTimerListRepeatNotifier notifier((int *)&timerNew.eventRepeat,m4,m5, &m_weekdaysStr); diff --git a/src/gui/widget/helpbox.cpp b/src/gui/widget/helpbox.cpp index 7d4816dc1..d900ed5ad 100644 --- a/src/gui/widget/helpbox.cpp +++ b/src/gui/widget/helpbox.cpp @@ -44,7 +44,7 @@ Helpbox::Helpbox( const string& Title, CC_SHADOW_ON) { page = 0; - hbox_y = 1; + hbox_y = 0; setWindowHeaderButtons(CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT); ccw_footer->setButtonLabel(NEUTRINO_ICON_BUTTON_HOME, LOCALE_MESSAGEBOX_BACK); diff --git a/src/system/locals.h b/src/system/locals.h index 3666ad04b..e16443b72 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2633,8 +2633,8 @@ typedef enum LOCALE_TIMERLIST_REPEAT_WEEKDAYS, LOCALE_TIMERLIST_REPEAT_WEEKLY, LOCALE_TIMERLIST_REPEATCOUNT, - LOCALE_TIMERLIST_REPEATCOUNT_HELP1, - LOCALE_TIMERLIST_REPEATCOUNT_HELP2, + LOCALE_TIMERLIST_REPEATCOUNT_HINT_1, + LOCALE_TIMERLIST_REPEATCOUNT_HINT_2, LOCALE_TIMERLIST_SAVE, LOCALE_TIMERLIST_STANDBY, LOCALE_TIMERLIST_STANDBY_OFF, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index b0e387f6b..fa5ccbd91 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2633,8 +2633,8 @@ const char * locale_real_names[] = "timerlist.repeat.weekdays", "timerlist.repeat.weekly", "timerlist.repeatcount", - "timerlist.repeatcount.help1", - "timerlist.repeatcount.help2", + "timerlist.repeatcount.hint_1", + "timerlist.repeatcount.hint_2", "timerlist.save", "timerlist.standby", "timerlist.standby.off",