fix clock visibility flag

svn path=/trunk/; revision=8994
This commit is contained in:
Martin Fuchs 2004-04-06 22:15:25 +00:00
parent 95057e2cf7
commit 6d0d4f988e
4 changed files with 8 additions and 10 deletions

View file

@ -3,7 +3,7 @@
<tr> <tr>
<td><address style="align: right;"><small> <td><address style="align: right;"><small>
ROS Explorer Source Code Documentation ROS Explorer Source Code Documentation
<br>generated on 04.04.2004 by <a href="http://www.doxygen.org/index.html"> <br>generated on 05.04.2004 by <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0> <img src="doxygen.png" alt="doxygen" align="middle" border=0>
</small></address> </small></address>
</td> </td>

View file

@ -209,6 +209,8 @@ static bool get_hide_clock_from_registry()
void NotifyArea::read_config() void NotifyArea::read_config()
{ {
bool clock_visible = true;
// read notification icon settings from XML configuration // read notification icon settings from XML configuration
XMLPos pos = g_Globals.get_cfg(); XMLPos pos = g_Globals.get_cfg();
@ -217,8 +219,7 @@ void NotifyArea::read_config()
#endif #endif
{ {
if (pos.go_down("desktopbar")) { if (pos.go_down("desktopbar")) {
bool show = XMLBoolRef(pos, "options", "show-clock", !get_hide_clock_from_registry()); clock_visible = XMLBoolRef(pos, "options", "show-clock", !get_hide_clock_from_registry());
show_clock(show);
pos.back(); pos.back();
} }
} }
@ -252,6 +253,8 @@ void NotifyArea::read_config()
pos.back(); pos.back();
} }
show_clock(clock_visible);
} }
void NotifyArea::write_config() void NotifyArea::write_config()

View file

@ -151,13 +151,8 @@ void XMLCALL XMLReader::XML_EndElementHandler(void* userData, const XML_Char* na
if (p != s) if (p != s)
pThis->_pos->append_content(s, p-s); pThis->_pos->append_content(s, p-s);
std::string leading;
if (p != e) if (p != e)
leading.assign(p, e-p); pThis->_pos->_end_leading.assign(p, e-p);
if (leading.empty())
pThis->_pos->_end_leading = leading;
pThis->_pos.back(); pThis->_pos.back();

View file

@ -587,7 +587,7 @@ protected:
void append_trailing(const char* s, int l) void append_trailing(const char* s, int l)
{ {
if (_children.empty()) if (_children.empty())
_trailing.append(s, l); _content.append(s, l);
else else
_children.back()->_trailing.append(s, l); _children.back()->_trailing.append(s, l);
} }