PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow using variables and addition/subtraction in variables

Browse Source 
Change-Id: I1acba95302e414e1a471d27474508a7c48df0328
This commit is contained in:
Ethan Yonker
2014-08-05 09:20:30 -05:00
committed by Dees Troy
parent 05d18c9a74
commit 96acb3d14d
2 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/devices/800x1280/res/ui.xml
+18 -17
View File
@@ -58,24 +58,25 @@
<variable name="row4_y" value="905" />
<variable name="row_queue_y" value="710" />
<variable name="row1_header_y" value="131" />
<variable name="text_row_height" value="50" />
<variable name="row1_text_y" value="170" />
<variable name="row2_text_y" value="220" />
<variable name="row3_text_y" value="270" />
<variable name="row4_text_y" value="320" />
<variable name="row5_text_y" value="370" />
<variable name="row6_text_y" value="420" />
<variable name="row7_text_y" value="470" />
<variable name="row8_text_y" value="520" />
<variable name="row9_text_y" value="570" />
<variable name="row10_text_y" value="620" />
<variable name="row11_text_y" value="670" />
<variable name="row12_text_y" value="720" />
<variable name="row13_text_y" value="770" />
<variable name="row14_text_y" value="820" />
<variable name="row15_text_y" value="870" />
<variable name="row16_text_y" value="920" />
<variable name="row17_text_y" value="970" />
<variable name="row18_text_y" value="1020" />
<variable name="row2_text_y" value="%row1_text_y%+%text_row_height%" />
<variable name="row3_text_y" value="%row2_text_y%+%text_row_height%" />
<variable name="row4_text_y" value="%row3_text_y%+%text_row_height%" />
<variable name="row5_text_y" value="%row4_text_y%+%text_row_height%" />
<variable name="row6_text_y" value="%row5_text_y%+%text_row_height%" />
<variable name="row7_text_y" value="%row6_text_y%+%text_row_height%" />
<variable name="row8_text_y" value="%row7_text_y%+%text_row_height%" />
<variable name="row9_text_y" value="%row8_text_y%+%text_row_height%" />
<variable name="row10_text_y" value="%row9_text_y%+%text_row_height%" />
<variable name="row11_text_y" value="%row10_text_y%+%text_row_height%" />
<variable name="row12_text_y" value="%row11_text_y%+%text_row_height%" />
<variable name="row13_text_y" value="%row12_text_y%+%text_row_height%" />
<variable name="row14_text_y" value="%row13_text_y%+%text_row_height%" />
<variable name="row15_text_y" value="%row14_text_y%+%text_row_height%" />
<variable name="row16_text_y" value="%row15_text_y%+%text_row_height%" />
<variable name="row17_text_y" value="%row16_text_y%+%text_row_height%" />
<variable name="row18_text_y" value="%row17_text_y%+%text_row_height%" />
<variable name="zip_status_y" value="640" />
<variable name="tz_selected_y" value="160" />
<variable name="tz_set_y" value="955" />
gui/pages.cpp
+26 -1
View File
@@ -783,7 +783,32 @@ int PageSet::LoadVariables(xml_node<>* vars)
if(name && value)
{
p = persist ? atoi(persist->value()) : 0;
DataManager::SetValue(name->value(), value->value(), p);
string temp = value->value();
string valstr = gui_parse_text(temp);
if (valstr.find("+") != string::npos) {
string val1str = valstr;
val1str = val1str.substr(0, val1str.find('+'));
string val2str = valstr;
val2str = val2str.substr(val2str.find('+') + 1, string::npos);
int val1 = atoi(val1str.c_str());
int val2 = atoi(val2str.c_str());
int val = val1 + val2;
DataManager::SetValue(name->value(), val, p);
} else if (valstr.find("-") != string::npos) {
string val1str = valstr;
val1str = val1str.substr(0, val1str.find('-'));
string val2str = valstr;
val2str = val2str.substr(val2str.find('-') + 1, string::npos);
int val1 = atoi(val1str.c_str());
int val2 = atoi(val2str.c_str());
int val = val1 - val2;
DataManager::SetValue(name->value(), val, p);
} else {
DataManager::SetValue(name->value(), valstr, p);
}
}
child = child->next_sibling("variable");