Permalink
Browse files

Revmove the "Set Recordind Priorities" screen.

With the removal of recording rule type priorities, this screen adds
no value above that of the "Manage Recording Rules" screen.
  • Loading branch information...
1 parent a76bd18 commit f8cb433bab021785fc4dc3f8513fb7813f602429 @gigem gigem committed Nov 27, 2012
@@ -441,19 +441,6 @@ static void startManaged(void)
delete viewsched;
}
-static void startProgramRecPriorities(void)
-{
- MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-
- ProgramRecPriority *progRecPrior = new ProgramRecPriority(mainStack,
- "ProgramRecPriority");
-
- if (progRecPrior->Create())
- mainStack->AddScreen(progRecPrior);
- else
- delete progRecPrior;
-}
-
static void startManageRecordingRules(void)
{
MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
@@ -807,8 +794,6 @@ static void TVMenuCallback(void *data, QString &selection)
startCustomEdit();
else if (sel == "tv_fix_conflicts")
startManaged();
- else if (sel == "tv_set_recpriorities")
- startProgramRecPriorities();
else if (sel == "tv_manage_recording_rules")
startManageRecordingRules();
else if (sel == "tv_progfind")
@@ -1293,8 +1278,6 @@ static void InitJumpPoints(void)
// "", "", startSearch);
REG_JUMPLOC(QT_TRANSLATE_NOOP("MythControls", "Manage Recordings / "
"Fix Conflicts"), "", "", startManaged, "VIEWSCHEDULED");
- REG_JUMP(QT_TRANSLATE_NOOP("MythControls", "Program Recording "
- "Priorities"), "", "", startProgramRecPriorities);
REG_JUMP(QT_TRANSLATE_NOOP("MythControls", "Manage Recording Rules"),
"", "", startManageRecordingRules);
REG_JUMP(QT_TRANSLATE_NOOP("MythControls", "Channel Recording "
@@ -74,7 +74,6 @@ NetworkControl::NetworkControl() :
jumpMap["playmusic"] = "Play music";
jumpMap["programfinder"] = "Program Finder";
jumpMap["programguide"] = "Program Guide";
- jumpMap["recordingpriorities"] = "Program Recording Priorities";
jumpMap["ripcd"] = "Rip CD";
jumpMap["musicplaylists"] = "Select music playlists";
jumpMap["deleterecordings"] = "TV Recording Deletion";
@@ -92,7 +91,7 @@ NetworkControl::NetworkControl() :
jumpMap["previousbox"] = "Previously Recorded";
jumpMap["progfinder"] = "Program Finder";
jumpMap["guidegrid"] = "Program Guide";
- jumpMap["programrecpriority"] = "Program Recording Priorities";
+ jumpMap["managerecrules"] = "Manage Recording Rules";
jumpMap["statusbox"] = "Status Screen";
jumpMap["deletebox"] = "TV Recording Deletion";
jumpMap["playbackbox"] = "TV Recording Playback";
@@ -425,11 +425,7 @@ ProgramRecPriority::~ProgramRecPriority()
bool ProgramRecPriority::Create()
{
- QString window_name = "programrecpriority";
- if (objectName() == "ManageRecRules")
- window_name = "managerecrules";
-
- if (!LoadWindowFromXML("schedule-ui.xml", window_name, this))
+ if (!LoadWindowFromXML("schedule-ui.xml", "managerecrules", this))
return false;
m_programList = dynamic_cast<MythUIButtonList *> (GetChild("programs"));
@@ -23,10 +23,10 @@
</button>
<button>
- <type>TV_RECPRIORITIES</type>
- <text>Recording Priorities</text>
- <description>Prioritize some shows over others</description>
- <action>TV_SET_RECPRIORITIES</action>
+ <type>TV_RECORDING_RULES</type>
+ <text>Recording Rules</text>
+ <description>Edit or delete any recording rule</description>
+ <action>TV_MANAGE_RECORDING_RULES</action>
</button>
<button>
@@ -711,133 +711,6 @@
</window>
- <window name="programrecpriority">
-
- <textarea name="pagetitle" from="basetextarea">
- <area>15,5,570,40</area>
- <font>baselarge</font>
- <value>Schedule Priorities</value>
- </textarea>
-
- <shape name="list_background" from="basebackground">
- <area>20,48,1240,390</area>
- </shape>
-
- <textarea name="prioritylabel" from="basetextarea">
- <area>900,14,200,40</area>
- <value>Priority</value>
- <align>allcenter</align>
- </textarea>
-
- <textarea name="finalrecprioritylabel" from="basetextarea">
- <area>1140,14,94,40</area>
- <value>Final</value>
- <align>allcenter</align>
- </textarea>
-
- <buttonlist name="programs" from="basebuttonlist2">
- <position>24,60</position>
- <searchposition>-1,450</searchposition>
- <statetype name="buttonitem">
- <state name="active">
- <textarea name="rectypechar" from="buttontext">
- <area>24,2,20,24</area>
- <align>allcenter</align>
- </textarea>
- <textarea name="titlesubtitle" from="rectypechar">
- <area>60,2,850,24</area>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="progpriority" from="rectypechar">
- <area>934,2,40,24</area>
- <align>right,vcenter</align>
- </textarea>
- <textarea name="finalpriority" from="progpriority">
- <position>1130,2</position>
- </textarea>
- </state>
- <state name="selectedactive" from="active">
- <textarea name="rectypechar" from="buttontext">
- <area>24,2,20,24</area>
- <align>allcenter</align>
- <font>base_normal_selected</font>
- <font state="disabled">basesmall_normal_selected</font>
- <font state="error">basesmall_normal_selected</font>
- <font state="warning">basesmall_normal_selected</font>
- <font state="normal">basesmall_normal_selected</font>
- <font state="running">basesmall_normal_selected</font>
- </textarea>
- <textarea name="titlesubtitle" from="rectypechar">
- <area>60,2,850,24</area>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="progpriority" from="rectypechar">
- <area>934,2,40,24</area>
- <align>right,vcenter</align>
- </textarea>
- <textarea name="finalpriority" from="progpriority">
- <position>1130,2</position>
- </textarea>
- <shape name="selectbar">
- <area>6,0,1220,28</area>
- </shape>
- </state>
- <state name="selectedinactive" from="active" />
- </statetype>
- <statetype name="upscrollarrow">
- <position>1214,-36</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>1210,386</position>
- </statetype>
- </buttonlist>
-
- <textarea name="title" from="basetextarea">
- <area>24,450,740,40</area>
- <font>basemedium</font>
- </textarea>
-
- <textarea name="scheduleinfo" from="basetextarea">
- <area>24,490,740,30</area>
- </textarea>
-
- <textarea name="rec_str" from="basetextarea">
- <area>24,530,430,30</area>
- </textarea>
-
- <textarea name="recprioritylabel" from="basetextarea">
- <area>700,490,200,30</area>
- <value>Priority:</value>
- <align>right</align>
- </textarea>
-
- <textarea name="recpriority" from="basetextarea">
- <area>920,490,40,30</area>
- <align>right</align>
- </textarea>
-
- <textarea name="recpriorityB" from="recpriority">
- <position>970,490</position>
- </textarea>
-
- <textarea name="finalprioritylabel" from="recprioritylabel">
- <position>700,550</position>
- <value>Final Priority:</value>
- <align>right</align>
- </textarea>
-
- <textarea name="finalpriority" from="recpriority">
- <position>920,550</position>
- </textarea>
-
- <textarea name="keyinstr" from="basetextarea">
- <area>0,590,1280,30</area>
- <value>(1) Title (2) Priority (4) Type</value>
- <align>allcenter</align>
- </textarea>
-
- </window>
-
<window name="custompriority">
<textarea name="pagetitle" from="basetextarea">
@@ -672,109 +672,6 @@
</window>
- <window name="programrecpriority">
-
- <textarea name="pagetitle" from="basetextarea">
- <area>20,5,570,40</area>
- <font>baselarge</font>
- <value>Schedule Priorities</value>
- </textarea>
-
- <shape name="list_background" from="basebackground">
- <area>15,50,770,367</area>
- </shape>
-
- <textarea name="prioritylabel" from="basetextarea">
- <area>585,15,95,40</area>
- <value>Priority</value>
- <align>right</align>
- </textarea>
-
- <textarea name="finalrecprioritylabel" from="basetextarea">
- <area>680,15,95,40</area>
- <value>Final</value>
- <align>right</align>
- </textarea>
-
- <buttonlist name="programs" from="basebuttonlist2">
- <area>20,64,760,370</area>
- <buttonarea>0,0,760,350</buttonarea>
- <statetype name="buttonitem">
- <state name="active">
- <textarea name="rectypechar" from="buttontext">
- <area>10,1,20,24</area>
- <align>allcenter</align>
- </textarea>
- <textarea name="titlesubtitle" from="buttontext">
- <area>40,1,550,24</area>
- </textarea>
- <textarea name="progpriority" from="buttontext">
- <area>620,1,40,24</area>
- <align>right,vcenter</align>
- </textarea>
- <textarea name="finalpriority" from="progpriority">
- <position>710,1</position>
- </textarea>
- </state>
- <state name="selectedactive" from="active">
- <shape name="selectbar">
- <area>3,-2,755,30</area>
- </shape>
- </state>
- <state name="selectedinactive" from="active" />
- </statetype>
- <statetype name="upscrollarrow">
- <position>710,355</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>740,355</position>
- </statetype>
- </buttonlist>
-
- <textarea name="title" from="basetextarea">
- <area>30,420,740,40</area>
- <font>basemedium</font>
- </textarea>
-
- <textarea name="scheduleinfo" from="basetextarea">
- <area>30,450,740,30</area>
- </textarea>
-
- <textarea name="rec_str" from="basetextarea">
- <area>30,480,430,30</area>
- </textarea>
-
- <textarea name="recprioritylabel" from="basetextarea">
- <area>500,440,170,30</area>
- <value>Priority:</value>
- </textarea>
-
- <textarea name="recpriority" from="basetextarea">
- <area>670,440,40,30</area>
- <align>right</align>
- </textarea>
-
- <textarea name="recpriorityB" from="recpriority">
- <position>770,440</position>
- </textarea>
-
- <textarea name="finalprioritylabel" from="recprioritylabel">
- <position>500,500</position>
- <value>Final Priority:</value>
- </textarea>
-
- <textarea name="finalpriority" from="recpriority">
- <position>670,500</position>
- </textarea>
-
- <textarea name="keyinstr" from="basetextarea">
- <area>0,570,800,30</area>
- <value>(1) Title (2) Priority (4) Type</value>
- <align>allcenter</align>
- </textarea>
-
- </window>
-
<window name="managerecrules">
<textarea name="pagetitle" from="basetextarea">
Oops, something went wrong.

0 comments on commit f8cb433

Please sign in to comment.