frodovdr
/
vdr-plugin-tvguide
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
1
0
Fork 0
Code Issues Releases Wiki Activity

changed order of actions on search timer menu items

This commit is contained in:
louis 2014-02-07 16:18:37 +01:00
parent 51df65e90b
commit acb0580522
7 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -123,3 +123,4 @@ Version 1.2.0
a fixed recording dir which also supports epgsearch variables
- fixed a bug when scrolling page up and the menu footer is active
- order of search timers in search timer list in alphabetical order
- changed order of actions on search timer menu items

6
po/ca_ES.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-02-06 17:17+0100\n"
"POT-Creation-Date: 2014-02-07 16:15+0100\n"
"PO-Revision-Date: 2013-09-21 17:49+0200\n"
"Last-Translator: My friend <Sampep> Thanks David <Gabychan> <gbonich@gmail.com>\n"
"Language-Team: \n"
@ -120,7 +120,7 @@ msgstr ""
msgid "Create Search Timer"
msgstr "Cerca temporitzadors"
msgid "Manage Search Timers"
msgid "Search Timers"
msgstr ""
msgid "Create Series Timer"
@ -291,7 +291,7 @@ msgstr "Opcions de configuració manual"
msgid "Use Template"
msgstr "Utilitza plantilla"
msgid "Manage EPGSearch Search Timers"
msgid "EPGSearch Search Timers"
msgstr ""
msgid "No Search Timers Configured"

11
po/de_DE.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 0.0.1\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-02-06 17:17+0100\n"
"POT-Creation-Date: 2014-02-07 16:15+0100\n"
"PO-Revision-Date: 2012-08-25 17:49+0200\n"
"Last-Translator: Horst\n"
"Language-Team: \n"
@ -117,8 +117,8 @@ msgstr "Timer Tagesübersicht"
msgid "Create Search Timer"
msgstr "Suchtimer anlegen"
msgid "Manage Search Timers"
msgstr "Suchtimer bearbeiten"
msgid "Search Timers"
msgstr "Suchtimer"
msgid "Create Series Timer"
msgstr "Serientimer anlegen"
@ -288,8 +288,8 @@ msgstr "Optionen manuell konfigurieren"
msgid "Use Template"
msgstr "Template benutzen"
msgid "Manage EPGSearch Search Timers"
msgstr "EPGSearch Suchtimer bearbeiten"
msgid "EPGSearch Search Timers"
msgstr "EPGSearch Suchtimer"
msgid "No Search Timers Configured"
msgstr "Keine Suchtimer angelegt"
@ -833,3 +833,4 @@ msgstr "Kanalgruppen Cache"
msgid "Recording Menus Icon Cache"
msgstr "Recording Menüs Icon Cache"

6
po/ru_RU.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 1.0.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-02-06 17:17+0100\n"
"POT-Creation-Date: 2014-02-07 16:15+0100\n"
"PO-Revision-Date: 2013-09-25 17:49+0400\n"
"Last-Translator: AmiD, ilya\n"
"Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n"
@ -117,7 +117,7 @@ msgstr ""
msgid "Create Search Timer"
msgstr "Создать поисковый таймер"
msgid "Manage Search Timers"
msgid "Search Timers"
msgstr ""
msgid "Create Series Timer"
@ -288,7 +288,7 @@ msgstr "Ручная настройка параметров"
msgid "Use Template"
msgstr "Использовать шаблоны"
msgid "Manage EPGSearch Search Timers"
msgid "EPGSearch Search Timers"
msgstr ""
msgid "No Search Timers Configured"

6
po/sk_SK.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-tvguide 1.1.0\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2014-02-06 17:17+0100\n"
"POT-Creation-Date: 2014-02-07 16:15+0100\n"
"PO-Revision-Date: 2013-09-15 00:12+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: \n"
@ -117,7 +117,7 @@ msgstr ""
msgid "Create Search Timer"
msgstr "Vytvori» vyhµadávaè plánov nahrávania"
msgid "Manage Search Timers"
msgid "Search Timers"
msgstr ""
msgid "Create Series Timer"
@ -288,7 +288,7 @@ msgstr "Ru
msgid "Use Template"
msgstr "pou¾itie ¹ablóny"
msgid "Manage EPGSearch Search Timers"
msgid "EPGSearch Search Timers"
msgstr ""
msgid "No Search Timers Configured"

18
recmenuitem.c
View File

@ -2721,13 +2721,18 @@ int cRecMenuItemSearchTimer::DrawIcons(void) {
int iconY = (height - iconSize) / 2;
std::string iconEdit, iconDelete, iconSearch;
if (active) {
iconEdit = (iconActive==0)?"edit_active":"edit_inactive";
iconDelete = (iconActive==1)?"delete_active":"delete_inactive";
iconSearch = (iconActive==2)?"search_active":"search_inactive";
iconSearch = (iconActive==0)?"search_active":"search_inactive";
iconEdit = (iconActive==1)?"edit_active":"edit_inactive";
iconDelete = (iconActive==2)?"delete_active":"delete_inactive";
} else {
iconSearch = "search_inactive";
iconEdit = "edit_inactive";
iconDelete = "delete_inactive";
iconSearch = "search_inactive";
}
cImage *imgSearch = imgCache.GetIcon(iconSearch, iconSize, iconSize);
if (imgSearch) {
pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgSearch);
iconsX += iconSize + 10;
}
cImage *imgEdit = imgCache.GetIcon(iconEdit, iconSize, iconSize);
if (imgEdit) {
@ -2739,11 +2744,6 @@ int cRecMenuItemSearchTimer::DrawIcons(void) {
pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgDel);
iconsX += iconSize + 10;
}
cImage *imgSearch = imgCache.GetIcon(iconSearch, iconSize, iconSize);
if (imgSearch) {
pixmapIcons->DrawImage(cPoint(iconsX, iconY), *imgSearch);
iconsX += iconSize + 10;
}
return iconsX;
}

8
recmenus.c
View File

@ -19,7 +19,7 @@ cRecMenuMain::cRecMenuMain(bool epgSearchAvailable, bool timerActive, bool switc
if (epgSearchAvailable) {
AddMenuItem(new cRecMenuItemButton(tr("Create Search Timer"), rmsSearchTimer, false, false, false, true));
AddMenuItem(new cRecMenuItemButton(tr("Manage Search Timers"), rmsSearchTimers, false, false, false, true));
AddMenuItem(new cRecMenuItemButton(tr("Search Timers"), rmsSearchTimers, false, false, false, true));
}
if (tvguideConfig.instRecFolderMode == eFolderSelect)
@ -635,7 +635,7 @@ cRecMenuSearchTimers::cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> sear
SetWidthPercent(70);
cString headline;
if (numSearchTimers > 0) {
headline = tr("Manage EPGSearch Search Timers");
headline = tr("EPGSearch Search Timers");
} else {
headline = tr("No Search Timers Configured");
}
@ -657,7 +657,7 @@ cRecMenuSearchTimers::~cRecMenuSearchTimers(void) {
void cRecMenuSearchTimers::SetMenuItems(void) {
for (int i = 0; i < numSearchTimers; i++) {
if (!AddMenuItemInitial(new cRecMenuItemSearchTimer(searchTimers[i], rmsSearchTimerEdit, rmsSearchTimerDeleteConfirm, rmsSearchTimerTest, (i==0)?true:false)))
if (!AddMenuItemInitial(new cRecMenuItemSearchTimer(searchTimers[i], rmsSearchTimerTest, rmsSearchTimerEdit, rmsSearchTimerDeleteConfirm, (i==0)?true:false)))
break;
}
}
@ -670,7 +670,7 @@ cTVGuideSearchTimer cRecMenuSearchTimers::GetSearchTimer(void) {
cRecMenuItem *cRecMenuSearchTimers::GetMenuItem(int number) {
if (number < 0 || number >= numSearchTimers)
return NULL;
return new cRecMenuItemSearchTimer(searchTimers[number], rmsSearchTimerEdit, rmsSearchTimerDelete, rmsSearchTimerTest, false);
return new cRecMenuItemSearchTimer(searchTimers[number], rmsSearchTimerTest, rmsSearchTimerEdit, rmsSearchTimerDeleteConfirm, false);
}
int cRecMenuSearchTimers::GetTotalNumMenuItems(void) {