livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-418 : Suppress menu items Save to XML and Load from XML from the Develop > XUI menu

master
Merov Linden 2010-10-26 16:08:11 -07:00
parent a40a2a7a46
commit ffe475e96e
2 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
indra/newview/llviewermenu.cpp
View File

@ -221,8 +221,6 @@ BOOL check_show_xui_names(void *);
// Debug UI
void handle_buy_currency_test(void*);
void handle_save_to_xml(void*);
void handle_load_from_xml(void*);
void handle_god_mode(void*);
@ -1384,37 +1382,6 @@ class LLAdvancedCheckDebugWindowProc : public view_listener_t
// ------------------------------XUI MENU ---------------------------
//////////////////////
// LOAD UI FROM XML //
//////////////////////
class LLAdvancedLoadUIFromXML : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
handle_load_from_xml(NULL);
return true;
}
};
////////////////////
// SAVE UI TO XML //
////////////////////
class LLAdvancedSaveUIToXML : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
handle_save_to_xml(NULL);
return true;
}
};
class LLAdvancedSendTestIms : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@ -7188,44 +7155,6 @@ const LLRect LLViewerMenuHolderGL::getMenuRect() const
return LLRect(0, getRect().getHeight() - MENU_BAR_HEIGHT, getRect().getWidth(), STATUS_BAR_HEIGHT);
}
void handle_save_to_xml(void*)
{
LLFloater* frontmost = gFloaterView->getFrontmost();
if (!frontmost)
{
LLNotificationsUtil::add("NoFrontmostFloater");
return;
}
std::string default_name = "floater_";
default_name += frontmost->getTitle();
default_name += ".xml";
LLStringUtil::toLower(default_name);
LLStringUtil::replaceChar(default_name, ' ', '_');
LLStringUtil::replaceChar(default_name, '/', '_');
LLStringUtil::replaceChar(default_name, ':', '_');
LLStringUtil::replaceChar(default_name, '"', '_');
LLFilePicker& picker = LLFilePicker::instance();
if (picker.getSaveFile(LLFilePicker::FFSAVE_XML, default_name))
{
std::string filename = picker.getFirstFile();
LLUICtrlFactory::getInstance()->saveToXML(frontmost, filename);
}
}
void handle_load_from_xml(void*)
{
LLFilePicker& picker = LLFilePicker::instance();
if (picker.getOpenFile(LLFilePicker::FFLOAD_XML))
{
std::string filename = picker.getFirstFile();
LLFloater* floater = new LLFloater(LLSD());
floater->buildFromFile(filename);
}
}
void handle_web_browser_test(const LLSD& param)
{
std::string url = param.asString();
@ -8011,8 +7940,6 @@ void initialize_menus()
// Advanced > XUI
commit.add("Advanced.ReloadColorSettings", boost::bind(&LLUIColorTable::loadFromSettings, LLUIColorTable::getInstance()));
view_listener_t::addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
view_listener_t::addMenu(new LLAdvancedSaveUIToXML(), "Advanced.SaveUIToXML");
view_listener_t::addMenu(new LLAdvancedToggleXUINames(), "Advanced.ToggleXUINames");
view_listener_t::addMenu(new LLAdvancedCheckXUINames(), "Advanced.CheckXUINames");
view_listener_t::addMenu(new LLAdvancedSendTestIms(), "Advanced.SendTestIMs");

12
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -2761,18 +2761,6 @@
function="Floater.Show"
parameter="font_test" />
</menu_item_call>
<menu_item_call
label="Load from XML"
name="Load from XML">
<menu_item_call.on_click
function="Advanced.LoadUIFromXML" />
</menu_item_call>
<menu_item_call
label="Save to XML"
name="Save to XML">
<menu_item_call.on_click
function="Advanced.SaveUIToXML" />
</menu_item_call>
<menu_item_check
label="Show XUI Names"
name="Show XUI Names">