diff --git a/gui/action.cpp b/gui/action.cpp
index aa81dff1..f9de4e9d 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -226,9 +226,9 @@ GUIAction::GUIAction(xml_node<>* node)
}
// First, get the action
- actions = node->first_node("actions");
- if (actions) child = actions->first_node("action");
- else child = node->first_node("action");
+ actions = FindNode(node, "actions");
+ if (actions) child = FindNode(actions, "action");
+ else child = FindNode(node, "action");
if (!child) return;
@@ -247,7 +247,7 @@ GUIAction::GUIAction(xml_node<>* node)
}
// Now, let's get either the key or region
- child = node->first_node("touch");
+ child = FindNode(node, "touch");
if (child)
{
attr = child->first_attribute("key");
diff --git a/gui/animation.cpp b/gui/animation.cpp
index 1e9a87d3..888b4ab0 100644
--- a/gui/animation.cpp
+++ b/gui/animation.cpp
@@ -29,7 +29,6 @@ extern "C" {
GUIAnimation::GUIAnimation(xml_node<>* node) : GUIObject(node)
{
xml_node<>* child;
- xml_attribute<>* attr;
mAnimation = NULL;
mFrame = 1;
@@ -40,36 +39,26 @@ GUIAnimation::GUIAnimation(xml_node<>* node) : GUIObject(node)
if (!node) return;
- child = node->first_node("resource");
- if (child)
- {
- mAnimation = LoadAttrAnimation(child, "name");
- }
+ mAnimation = LoadAttrAnimation(FindNode(node, "resource"), "name");
// Load the placement
- LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
+ LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
- child = node->first_node("speed");
+ child = FindNode(node, "speed");
if (child)
{
- attr = child->first_attribute("fps");
- if (attr)
- mFPS = atoi(attr->value());
- attr = child->first_attribute("render");
- if (attr)
- mRender = atoi(attr->value());
+ mFPS = LoadAttrInt(child, "fps", mFPS);
+ mRender = LoadAttrInt(child, "render", mRender);
}
if (mFPS > 30) mFPS = 30;
- child = node->first_node("loop");
+ child = FindNode(node, "loop");
if (child)
{
- attr = child->first_attribute("frame");
+ xml_attribute<>* attr = child->first_attribute("frame");
if (attr)
mLoop = atoi(attr->value()) - 1;
- attr = child->first_attribute("start");
- if (attr)
- mFrame = atoi(attr->value());
+ mFrame = LoadAttrInt(child, "start", mFrame);
}
// Fetch the render sizes
diff --git a/gui/button.cpp b/gui/button.cpp
index 6ea0beec..18b5560c 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -63,15 +63,11 @@ GUIButton::GUIButton(xml_node<>* node)
mButtonLabel = new GUIText(node);
mAction = new GUIAction(node);
- child = node->first_node("image");
- if (child)
+ mButtonImg = new GUIImage(node);
+ if (mButtonImg->Render() < 0)
{
- mButtonImg = new GUIImage(node);
- if (mButtonImg->Render() < 0)
- {
- delete mButtonImg;
- mButtonImg = NULL;
- }
+ delete mButtonImg;
+ mButtonImg = NULL;
}
if (mButtonLabel->Render() < 0)
{
@@ -79,45 +75,22 @@ GUIButton::GUIButton(xml_node<>* node)
mButtonLabel = NULL;
}
// Load fill if it exists
- memset(&mFillColor, 0, sizeof(COLOR));
- child = node->first_node("fill");
- if (child)
- {
- attr = child->first_attribute("color");
- if (attr) {
- hasFill = true;
- std::string color = attr->value();
- ConvertStrToColor(color, &mFillColor);
- }
- }
+ mFillColor = LoadAttrColor(FindNode(node, "fill"), "color", &hasFill);
if (!hasFill && mButtonImg == NULL) {
LOGERR("No image resource or fill specified for button.\n");
}
// The icon is a special case
- child = node->first_node("icon");
- if (child)
- {
- mButtonIcon = LoadAttrImage(child, "resource");
- }
+ mButtonIcon = LoadAttrImage(FindNode(node, "icon"), "resource");
- memset(&mHighlightColor, 0, sizeof(COLOR));
- child = node->first_node("highlight");
- if (child) {
- attr = child->first_attribute("color");
- if (attr) {
- hasHighlightColor = true;
- std::string color = attr->value();
- ConvertStrToColor(color, &mHighlightColor);
- }
- }
+ mHighlightColor = LoadAttrColor(FindNode(node, "highlight"), "color", &hasHighlightColor);
int x, y, w, h;
TextPlacement = TOP_LEFT;
if (mButtonImg) {
mButtonImg->GetRenderPos(x, y, w, h);
} else if (hasFill) {
- LoadPlacement(node->first_node("placement"), &x, &y, &w, &h, &TextPlacement);
+ LoadPlacement(FindNode(node, "placement"), &x, &y, &w, &h, &TextPlacement);
}
SetRenderPos(x, y, w, h);
}
diff --git a/gui/checkbox.cpp b/gui/checkbox.cpp
index f4900ba2..46a77086 100644
--- a/gui/checkbox.cpp
+++ b/gui/checkbox.cpp
@@ -45,7 +45,7 @@ GUICheckbox::GUICheckbox(xml_node<>* node)
mLabel = new GUIText(node);
// Read the check states
- child = node->first_node("image");
+ child = FindNode(node, "image");
if (child)
{
mChecked = LoadAttrImage(child, "checked");
@@ -53,7 +53,7 @@ GUICheckbox::GUICheckbox(xml_node<>* node)
}
// Get the variable data
- child = node->first_node("data");
+ child = FindNode(node, "data");
if (child)
{
attr = child->first_attribute("variable");
diff --git a/gui/console.cpp b/gui/console.cpp
index bb70400c..3623f555 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -101,7 +101,6 @@ extern "C" void gui_set_FILE(FILE* f)
GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node)
{
- xml_attribute<>* attr;
xml_node<>* child;
mFont = NULL;
@@ -126,13 +125,9 @@ GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node)
}
else
{
- child = node->first_node("font");
- if (child)
- {
- mFont = LoadAttrFont(child, "resource");
- }
+ mFont = LoadAttrFont(FindNode(node, "font"), "resource");
- child = node->first_node("color");
+ child = FindNode(node, "color");
if (child)
{
mForegroundColor = LoadAttrColor(child, "foreground", mForegroundColor);
@@ -141,9 +136,9 @@ GUIConsole::GUIConsole(xml_node<>* node) : GUIObject(node)
}
// Load the placement
- LoadPlacement(node->first_node("placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH);
+ LoadPlacement(FindNode(node, "placement"), &mConsoleX, &mConsoleY, &mConsoleW, &mConsoleH);
- child = node->first_node("slideout");
+ child = FindNode(node, "slideout");
if (child)
{
mSlideout = 1;
diff --git a/gui/devices/landscape/res/landscape.xml b/gui/devices/landscape/res/landscape.xml
index eb6d9ddd..fd5fcfe4 100644
--- a/gui/devices/landscape/res/landscape.xml
+++ b/gui/devices/landscape/res/landscape.xml
@@ -1,6 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/portrait/res/portrait.xml b/gui/devices/portrait/res/portrait.xml
index fe616715..6fb52f30 100644
--- a/gui/devices/portrait/res/portrait.xml
+++ b/gui/devices/portrait/res/portrait.xml
@@ -1,6 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/devices/watch/res/watch.xml b/gui/devices/watch/res/watch.xml
index 49e172e3..786049a0 100644
--- a/gui/devices/watch/res/watch.xml
+++ b/gui/devices/watch/res/watch.xml
@@ -1,6 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp
index 5c287c34..2602eb25 100644
--- a/gui/fileselector.cpp
+++ b/gui/fileselector.cpp
@@ -70,8 +70,10 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) : GUIScrollList(node)
if (attr)
mPathVar = attr->value();
attr = child->first_attribute("default");
- if (attr)
+ if (attr) {
+ mPathDefault = attr->value();
DataManager::SetValue(mPathVar, attr->value());
+ }
}
// Handle the result variable
@@ -168,6 +170,8 @@ int GUIFileSelector::NotifyVarChange(const std::string& varName, const std::stri
} else {
// Reset the list to the top
SetVisibleListLocation(0);
+ if (value.empty())
+ DataManager::SetValue(mPathVar, mPathDefault);
}
updateFileList = true;
mUpdate = 1;
@@ -288,6 +292,10 @@ void GUIFileSelector::SetPageFocus(int inFocus)
{
GUIScrollList::SetPageFocus(inFocus);
if (inFocus) {
+ std::string value;
+ DataManager::GetValue(mPathVar, value);
+ if (value.empty())
+ DataManager::SetValue(mPathVar, mPathDefault);
updateFileList = true;
mUpdate = 1;
}
diff --git a/gui/fill.cpp b/gui/fill.cpp
index 1ddefaa9..b315cd08 100644
--- a/gui/fill.cpp
+++ b/gui/fill.cpp
@@ -27,23 +27,15 @@ extern "C" {
GUIFill::GUIFill(xml_node<>* node) : GUIObject(node)
{
- xml_attribute<>* attr;
- xml_node<>* child;
-
- if (!node)
- return;
-
- attr = node->first_attribute("color");
- if (!attr) {
+ bool has_color = false;
+ mColor = LoadAttrColor(node, "color", &has_color);
+ if (!has_color) {
LOGERR("No color specified for fill\n");
return;
}
- std::string color = attr->value();
- ConvertStrToColor(color, &mColor);
-
// Load the placement
- LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
+ LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
return;
}
diff --git a/gui/image.cpp b/gui/image.cpp
index 60b1cb95..8b43aaa3 100644
--- a/gui/image.cpp
+++ b/gui/image.cpp
@@ -27,9 +27,6 @@ extern "C" {
GUIImage::GUIImage(xml_node<>* node) : GUIObject(node)
{
- xml_attribute<>* attr;
- xml_node<>* child;
-
mImage = NULL;
mHighlightImage = NULL;
isHighlighted = false;
@@ -37,15 +34,11 @@ GUIImage::GUIImage(xml_node<>* node) : GUIObject(node)
if (!node)
return;
- child = node->first_node("image");
- if (child)
- {
- mImage = LoadAttrImage(child, "resource");
- mHighlightImage = LoadAttrImage(child, "highlightresource");
- }
+ mImage = LoadAttrImage(FindNode(node, "image"), "resource");
+ mHighlightImage = LoadAttrImage(FindNode(node, "image"), "highlightresource");
// Load the placement
- LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
+ LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, NULL, NULL, &mPlacement);
if (mImage && mImage->GetResource())
{
diff --git a/gui/input.cpp b/gui/input.cpp
index 299034a2..ca27ea81 100644
--- a/gui/input.cpp
+++ b/gui/input.cpp
@@ -85,7 +85,7 @@ GUIInput::GUIInput(xml_node<>* node)
}
// Load the background
- child = node->first_node("background");
+ child = FindNode(node, "background");
if (child)
{
mBackground = LoadAttrImage(child, "resource");
@@ -98,7 +98,7 @@ GUIInput::GUIInput(xml_node<>* node)
}
// Load the cursor color
- child = node->first_node("cursor");
+ child = FindNode(node, "cursor");
if (child)
{
mCursor = LoadAttrImage(child, "resource");
@@ -106,31 +106,26 @@ GUIInput::GUIInput(xml_node<>* node)
attr = child->first_attribute("hasfocus");
if (attr)
{
- std::string color = attr->value();
- SetInputFocus(atoi(color.c_str()));
- }
- attr = child->first_attribute("width");
- if (attr)
- {
- std::string cwidth = gui_parse_text(attr->value());
- CursorWidth = scale_theme_x(atoi(cwidth.c_str()));
+ std::string focus = attr->value();
+ SetInputFocus(atoi(focus.c_str()));
}
+ CursorWidth = LoadAttrIntScaleX(child, "width", CursorWidth);
}
DrawCursor = HasInputFocus;
// Load the font
- child = node->first_node("font");
+ child = FindNode(node, "font");
if (child)
{
mFont = LoadAttrFont(child, "resource");
mFontHeight = mFont->GetHeight();
}
- child = node->first_node("text");
+ child = FindNode(node, "text");
if (child) mText = child->value();
mLastValue = gui_parse_text(mText);
- child = node->first_node("data");
+ child = FindNode(node, "data");
if (child)
{
attr = child->first_attribute("name");
@@ -139,11 +134,8 @@ GUIInput::GUIInput(xml_node<>* node)
attr = child->first_attribute("default");
if (attr)
DataManager::SetValue(mVariable, attr->value());
- attr = child->first_attribute("mask");
- if (attr) {
- mMask = attr->value();
- HasMask = true;
- }
+ mMask = LoadAttrString(child, "mask");
+ HasMask = !mMask.empty();
attr = child->first_attribute("maskvariable");
if (attr)
mMaskVariable = attr->value();
@@ -152,33 +144,19 @@ GUIInput::GUIInput(xml_node<>* node)
}
// Load input restrictions
- child = node->first_node("restrict");
+ child = FindNode(node, "restrict");
if (child)
{
- attr = child->first_attribute("minlen");
- if (attr) {
- std::string attrib = attr->value();
- MinLen = atoi(attrib.c_str());
- }
- attr = child->first_attribute("maxlen");
- if (attr) {
- std::string attrib = attr->value();
- MaxLen = atoi(attrib.c_str());
- }
- attr = child->first_attribute("allow");
- if (attr) {
- HasAllowed = true;
- AllowedList = attr->value();
- }
- attr = child->first_attribute("disable");
- if (attr) {
- HasDisabled = true;
- DisabledList = attr->value();
- }
+ MinLen = LoadAttrInt(child, "minlen", MinLen);
+ MaxLen = LoadAttrInt(child, "maxlen", MaxLen);
+ AllowedList = LoadAttrString(child, "allow");
+ HasAllowed = !AllowedList.empty();
+ DisabledList = LoadAttrString(child, "disable");
+ HasDisabled = !DisabledList.empty();
}
// Load the placement
- LoadPlacement(node->first_node("placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
+ LoadPlacement(FindNode(node, "placement"), &mRenderX, &mRenderY, &mRenderW, &mRenderH);
SetActionPos(mRenderX, mRenderY, mRenderW, mRenderH);
if (mInputText && mFontHeight && mFontHeight < (unsigned)mRenderH) {
diff --git a/gui/keyboard.cpp b/gui/keyboard.cpp
index 5528be93..d0262aac 100644
--- a/gui/keyboard.cpp
+++ b/gui/keyboard.cpp
@@ -48,7 +48,8 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node)
{
int layoutindex, rowindex, keyindex, Xindex, Yindex, keyHeight = 0, keyWidth = 0;
rowY = colX = -1;
- highlightRenderCount = hasHighlight = hasCapsHighlight = 0;
+ highlightRenderCount = 0;
+ hasHighlight = hasCapsHighlight = false;
char resource[10], layout[8], row[5], key[6], longpress[7];
xml_attribute<>* attr;
xml_node<>* child;
@@ -66,36 +67,17 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node)
if (!node) return;
// Load the action
- child = node->first_node("action");
+ child = FindNode(node, "action");
if (child)
{
mAction = new GUIAction(node);
}
- memset(&mHighlightColor, 0, sizeof(COLOR));
- child = node->first_node("highlight");
- if (child) {
- attr = child->first_attribute("color");
- if (attr) {
- hasHighlight = 1;
- std::string color = attr->value();
- ConvertStrToColor(color, &mHighlightColor);
- }
- }
-
- memset(&mCapsHighlightColor, 0, sizeof(COLOR));
- child = node->first_node("capshighlight");
- if (child) {
- attr = child->first_attribute("color");
- if (attr) {
- hasCapsHighlight = 1;
- std::string color = attr->value();
- ConvertStrToColor(color, &mCapsHighlightColor);
- }
- }
+ mHighlightColor = LoadAttrColor(FindNode(node, "highlight"), "color", &hasHighlight);
+ mCapsHighlightColor = LoadAttrColor(FindNode(node, "capshighlight"), "color", &hasCapsHighlight);
// Load the images for the different layouts
- child = node->first_node("layout");
+ child = FindNode(node, "layout");
if (child)
{
layoutindex = 1;
@@ -120,7 +102,7 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node)
// Load all of the layout maps
layoutindex = 1;
strcpy(layout, "layout1");
- keylayout = node->first_node(layout);
+ keylayout = FindNode(node, layout);
while (keylayout)
{
if (layoutindex > MAX_KEYBOARD_LAYOUTS) {
@@ -212,12 +194,12 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node)
}
layoutindex++;
layout[6] = (char)(layoutindex + 48);
- keylayout = node->first_node(layout);
+ keylayout = FindNode(node, layout);
}
int x, y, w, h;
// Load the placement
- LoadPlacement(node->first_node("placement"), &x, &y, &w, &h);
+ LoadPlacement(FindNode(node, "placement"), &x, &y, &w, &h);
SetActionPos(x, y, KeyboardWidth, KeyboardHeight);
SetRenderPos(x, y, w, h);
return;
diff --git a/gui/listbox.cpp b/gui/listbox.cpp
index 7c7afa95..625b4b7d 100644
--- a/gui/listbox.cpp
+++ b/gui/listbox.cpp
@@ -37,7 +37,7 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
mUpdate = 0;
// Get the icons, if any
- child = node->first_node("icon");
+ child = FindNode(node, "icon");
if (child) {
mIconSelected = LoadAttrImage(child, "selected");
mIconUnselected = LoadAttrImage(child, "unselected");
@@ -47,7 +47,7 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
SetMaxIconSize(iconWidth, iconHeight);
// Handle the result variable
- child = node->first_node("data");
+ child = FindNode(node, "data");
if (child) {
attr = child->first_attribute("name");
if (attr)
@@ -60,7 +60,7 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
}
// Get the data for the list
- child = node->first_node("listitem");
+ child = FindNode(node, "listitem");
if (!child) return;
while (child) {
ListData data;
diff --git a/gui/mousecursor.cpp b/gui/mousecursor.cpp
index 62558862..84e6322a 100644
--- a/gui/mousecursor.cpp
+++ b/gui/mousecursor.cpp
@@ -51,11 +51,11 @@ void MouseCursor::LoadData(xml_node<>* node)
xml_attribute<>* attr;
xml_node<>* child;
- child = node->first_node("placement");
+ child = FindNode(node, "placement");
if(child)
LoadPlacement(child, &mRenderX, &mRenderY, &mRenderW, &mRenderH);
- child = node->first_node("background");
+ child = FindNode(node, "background");
if(child)
{
m_color = LoadAttrColor(child, "color", m_color);
@@ -67,7 +67,7 @@ void MouseCursor::LoadData(xml_node<>* node)
}
}
- child = node->first_node("speed");
+ child = FindNode(node, "speed");
if(child)
{
attr = child->first_attribute("multiplier");
diff --git a/gui/object.cpp b/gui/object.cpp
index d496414c..7cce5db8 100644
--- a/gui/object.cpp
+++ b/gui/object.cpp
@@ -35,9 +35,9 @@ GUIObject::GUIObject(xml_node<>* node)
if (!node) return;
// First, get the action
- xml_node<>* condition = node->first_node("conditions");
- if (condition) condition = condition->first_node("condition");
- else condition = node->first_node("condition");
+ xml_node<>* condition = FindNode(node, "conditions");
+ if (condition) condition = FindNode(condition, "condition");
+ else condition = FindNode(node, "condition");
if (!condition) return;
diff --git a/gui/objects.hpp b/gui/objects.hpp
index b6937a21..ceb2c6c0 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -649,6 +649,7 @@ protected:
std::vector mFolderList;
std::vector mFileList;
std::string mPathVar; // current path displayed, saved in the data manager
+ std::string mPathDefault; // default value for the path if none is set in mPathVar
std::string mExtn; // used for filtering the file list, for example, *.zip
std::string mVariable; // set when the user selects an item, pull path like /path/to/foo
std::string mSortVariable; // data manager variable used to change the sorting of files
@@ -812,6 +813,7 @@ public:
protected:
GUIAction* sAction;
+ GUIText* sSliderLabel;
ImageResource* sSlider;
ImageResource* sSliderUsed;
ImageResource* sTouch;
@@ -875,7 +877,8 @@ protected:
int currentLayout;
int row_heights[MAX_KEYBOARD_LAYOUTS][MAX_KEYBOARD_ROWS];
unsigned int KeyboardWidth, KeyboardHeight;
- int rowY, colX, highlightRenderCount, hasHighlight, hasCapsHighlight;
+ int rowY, colX, highlightRenderCount;
+ bool hasHighlight, hasCapsHighlight;
GUIAction* mAction;
COLOR mHighlightColor;
COLOR mCapsHighlightColor;
@@ -1064,10 +1067,12 @@ private:
};
// Helper APIs
+xml_node<>* FindNode(xml_node<>* parent, const char* nodename, int depth = 0);
std::string LoadAttrString(xml_node<>* element, const char* attrname, const char* defaultvalue = "");
int LoadAttrInt(xml_node<>* element, const char* attrname, int defaultvalue = 0);
int LoadAttrIntScaleX(xml_node<>* element, const char* attrname, int defaultvalue = 0);
int LoadAttrIntScaleY(xml_node<>* element, const char* attrname, int defaultvalue = 0);
+COLOR LoadAttrColor(xml_node<>* element, const char* attrname, bool* found_color, COLOR defaultvalue = COLOR(0,0,0,0));
COLOR LoadAttrColor(xml_node<>* element, const char* attrname, COLOR defaultvalue = COLOR(0,0,0,0));
FontResource* LoadAttrFont(xml_node<>* element, const char* attrname);
ImageResource* LoadAttrImage(xml_node<>* element, const char* attrname);
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 58e99e60..50c60a69 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -103,6 +103,56 @@ int ConvertStrToColor(std::string str, COLOR* color)
}
// Helper APIs
+xml_node<>* FindNode(xml_node<>* parent, const char* nodename, int depth /* = 0 */)
+{
+ xml_node<>* child = parent->first_node(nodename);
+ if (child)
+ return child;
+
+ if (depth == 10) {
+ LOGERR("Too many style loops detected.\n");
+ return NULL;
+ }
+
+ xml_node<>* style = parent->first_node("style");
+ if (style) {
+ while (style) {
+ if (!style->first_attribute("name")) {
+ LOGERR("No name given for style.\n");
+ continue;
+ } else {
+ std::string name = style->first_attribute("name")->value();
+ xml_node<>* node = PageManager::FindStyle(name);
+
+ if (node) {
+ // We found the style that was named
+ xml_node<>* stylenode = FindNode(node, nodename, depth + 1);
+ if (stylenode)
+ return stylenode;
+ }
+ }
+ style = style->next_sibling("style");
+ }
+ } else {
+ // Search for stylename in the parent node