Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added reload button to web-based search and showcase, since a page failing to load shouldn't require a client restart in order to try it again.

Browse Source
This commit is contained in:
Shyotl
2011-03-15 02:32:14 -05:00
parent 62d7f3d59f
commit ef4c050e35
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llpaneldirfind.cpp
View File

@@ -109,6 +109,7 @@ BOOL LLPanelDirFind::postBuild()
childSetAction("back_btn", onClickBack, this);
childSetAction("home_btn", onClickHome, this);
childSetAction("forward_btn", onClickForward, this);
childSetAction("reload_btn", onClickRefresh, this);
childSetCommitCallback("search_editor", onCommitSearch, this);
childSetAction("search_btn", onClickSearch, this);
childSetAction("?", onClickHelp, this);
@@ -177,6 +178,7 @@ void LLPanelDirFind::draw()
bool enable_forward = mWebBrowser->canNavigateForward();
childSetEnabled( "forward_btn", enable_forward );
childSetEnabled( "reload_btn", TRUE );
}
// showcase doesn't have maturity flags -- it's all PG
@@ -464,6 +466,16 @@ void LLPanelDirFind::onClickHome( void* data )
}
}
// static
void LLPanelDirFind::onClickRefresh( void* data )
{
LLPanelDirFind* self = ( LLPanelDirFind* )data;
if ( self->mWebBrowser )
{
self->mWebBrowser->navigateTo(self->mWebBrowser->getCurrentNavUrl());
}
}
// static
void LLPanelDirFind::onCommitSearch(LLUICtrl*, void* data)
{

1
indra/newview/llpaneldirfind.h
View File

@@ -68,6 +68,7 @@ private:
static void onClickBack( void* data );
static void onClickForward( void* data );
static void onClickHome( void* data );
static void onClickRefresh( void* data );
static void onClickSearch( void* data );
static void onCommitSearch(LLUICtrl*, void* data);
static void onClickHelp( void* data );

11
indra/newview/skins/default/xui/en-us/floater_directory.xml
View File

@@ -30,6 +30,8 @@
left="230" name="back_btn" width="70" />
<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
label="Forward" left="304" name="forward_btn" width="70" />
<button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
label="Reload" left="388" name="reload_btn" width="50" />
<button bottom="-48" follows="top|right" font="SansSerif" height="20"
label="Search" left="121" name="search_btn" width="95" />
<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
@@ -56,15 +58,15 @@
</combo_box>
<check_box bottom="-22" control_name="ShowPGSearchAll" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="PG content" left="420" mouse_opaque="true"
label="PG content" left="450" mouse_opaque="true"
name="incpg" width="156" />
<check_box bottom="-40" control_name="ShowMatureSearchAll" follows="right|top"
font="SansSerifSmall" height="16" initial_value="true"
label="Mature content" left="420" mouse_opaque="true"
label="Mature content" left="450" mouse_opaque="true"
name="incmature" width="156" />
<check_box bottom="-58" control_name="ShowAdultSearchAll" follows="right|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Adult content" left="420" mouse_opaque="true"
label="Adult content" left="450" mouse_opaque="true"
name="incadult" width="156" />
<button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
halign="center" height="18" label="?" label_selected="?" left="-25"
@@ -318,6 +320,9 @@
<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
label="Forward" left_delta="75"
name="forward_btn" width="70" />
<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
label="Reload" left_delta="85"
name="reload_btn" width="50" />
<!-- No mature content checkbox, showcase is all PG -->
<web_browser name="showcase_browser"
bottom="25"