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

Add some of the new pieces to the grid manager panel (not fully hooked up) and hide the values that the grid managers are supposed to set.

Browse Source
This commit is contained in:
RevolutionSmythe
2011-08-14 19:33:00 -05:00
committed by Siana Gearz
parent 8e5c8a0f10
commit 3fa0ef5129
3 changed files with 236 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/hippogridmanager.cpp
View File

@@ -207,7 +207,7 @@ void HippoGridInfo::setPlatform(const std::string& platform)
else
{
setPlatform(PLATFORM_OTHER);
llwarns << "Unknown platform '" << platform << "'." << llendl;
llwarns << "Unknown platform '" << platform << "' for " << mGridName << "." << llendl;
}
}

54
indra/newview/hippopanelgrids.cpp
View File

@@ -77,6 +77,7 @@ class HippoPanelGridsImpl : public HippoPanelGrids
static void onClickDefault(void *data);
static void onClickGridInfo(void *data);
static void onClickHelpRenderCompat(void *data);
static void onClickAdvanced(void *data);
};
@@ -148,6 +149,7 @@ BOOL HippoPanelGridsImpl::postBuild()
childSetAction("btn_default", onClickDefault, this);
childSetAction("btn_gridinfo", onClickGridInfo, this);
childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this);
childSetAction("btn_advanced", onClickAdvanced, this);
childSetCommitCallback("grid_selector", onSelectGrid, this);
childSetCommitCallback("platform", onSelectPlatform, this);
@@ -330,7 +332,9 @@ bool HippoPanelGridsImpl::saveCurGrid()
mCurGrid = gridnick;
gridInfo = new HippoGridInfo(gridnick);
gHippoGridManager->addGrid(gridInfo);
gridInfo->retrieveGridInfo();
refresh();
return true;
} else {
llwarns << "Illegal state " << mState << '.' << llendl;
@@ -492,6 +496,54 @@ void HippoPanelGridsImpl::onClickGridInfo(void *data)
self->retrieveGridInfo();
}
// static
void HippoPanelGridsImpl::onClickAdvanced(void *data)
{
HippoPanelGridsImpl *self = (HippoPanelGridsImpl*)data;
if(self->mState != NORMAL)
{
self->retrieveGridInfo();
}
if(self->childIsVisible("loginpage_label"))
{
self->childSetVisible("loginpage_label", false);
self->childSetVisible("loginpage", false);
self->childSetVisible("helperuri_label", false);
self->childSetVisible("helperuri", false);
self->childSetVisible("website_label", false);
self->childSetVisible("website", false);
self->childSetVisible("support_label", false);
self->childSetVisible("support", false);
self->childSetVisible("register_label", false);
self->childSetVisible("register", false);
self->childSetVisible("password_label", false);
self->childSetVisible("password", false);
self->childSetVisible("search_label", false);
self->childSetVisible("search", false);
self->childSetVisible("render_compat", false);
self->childSetVisible("btn_help_render_compat", false);
}
else
{
self->childSetVisible("loginpage_label", true);
self->childSetVisible("loginpage", true);
self->childSetVisible("helperuri_label", true);
self->childSetVisible("helperuri", true);
self->childSetVisible("website_label", true);
self->childSetVisible("website", true);
self->childSetVisible("support_label", true);
self->childSetVisible("support", true);
self->childSetVisible("register_label", true);
self->childSetVisible("register", true);
self->childSetVisible("password_label", true);
self->childSetVisible("password", true);
self->childSetVisible("search_label", true);
self->childSetVisible("search", true);
self->childSetVisible("render_compat", true);
self->childSetVisible("btn_help_render_compat", true);
}
}
// static
void HippoPanelGridsImpl::onClickHelpRenderCompat(void *data)
{

341
indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml
View File

@@ -2,234 +2,257 @@
<panel enabled="true" label="Grids" name="Grids panel"
height="408" width="517" left="102"
follows="left|top|right|bottom" border="true" mouse_opaque="true">
<!-- Grid Selector -->
<text type="string" length="1" enabled="true" name="grid_selector_label"
<!-- Grid Selector -->
<text type="string" length="1" enabled="true" name="grid_selector_label"
height="10" width="100" left="12" bottom="-20"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Select a grid:
</text>
<combo_box max_chars="20" allow_text_entry="false" name="grid_selector"
height="18" width="200" left="120" bottom_delta="-4"
follows="left|top" mouse_opaque="true" />
<button label="Default" label_selected="Default" enabled="true" name="btn_default"
height="18" width="75" left_delta="210" bottom_delta="0"
halign="center"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<text type="string" length="1" enabled="true" name="default_grid"
height="10" width="200" left_delta="80" bottom_delta="5"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
([DEFAULT])
</text>
<!-- Buttons -->
<button label="Delete" label_selected="Delete" enabled="true" name="btn_delete"
Select a grid:
</text>
<combo_box max_chars="20" allow_text_entry="false" name="grid_selector"
height="18" width="200" left="120" bottom_delta="-4"
follows="left|top" mouse_opaque="true" />
<button label="Default" label_selected="Default" enabled="true" name="btn_default"
height="18" width="75" left_delta="210" bottom_delta="0"
halign="center"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<text type="string" length="1" enabled="true" name="default_grid"
height="10" width="200" left_delta="80" bottom_delta="5"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
([DEFAULT])
</text>
<!-- Buttons -->
<button label="Delete" label_selected="Delete" enabled="true" name="btn_delete"
height="18" width="75" left="120" bottom_delta="-27"
halign="center"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<button label="Add" label_selected="Add" enabled="true" name="btn_add"
<button label="Add" label_selected="Add" enabled="true" name="btn_add"
height="18" width="75" left_delta="78" bottom_delta="0"
halign="center"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<button label="Copy" label_selected="Copy" enabled="true" name="btn_copy"
<button label="Copy" label_selected="Copy" enabled="true" name="btn_copy"
height="18" width="75" left_delta="78" bottom_delta="0"
halign="center"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<!-- Login URI -->
<text type="string" length="1" enabled="true" name="loginuri_label"
<!-- Advanced -->
<button label="Advanced" label_selected="Advanced" enabled="true" name="btn_advanced"
height="18" width="75" left_delta="78" bottom_delta="0"
halign="center"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<!-- Login URI -->
<text type="string" length="1" enabled="true" name="loginuri_label"
height="10" width="100" left="12" bottom_delta="-32"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Login URI:
</text>
<line_editor max_length="254" enabled="true" name="loginuri"
handle_edit_keys_directly="true"
Login URI:
</text>
<line_editor max_length="254" enabled="true" name="loginuri"
handle_edit_keys_directly="true"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
<!--<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
height="18" width="100" left="120" bottom_delta="-22"
halign="center"
follows="left|top" scale_image="true"
font="SansSerifSmall" mouse_opaque="true" />
<!-- Platform -->
<text type="string" length="1" enabled="true" name="platform_label"
font="SansSerifSmall" mouse_opaque="true" />-->
<!-- Platform -->
<text type="string" length="1" enabled="true" name="platform_label"
height="10" width="100" left="12" bottom_delta="-32"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Platform:
</text>
<combo_box max_chars="20" allow_text_entry="false" name="platform"
Platform:
</text>
<combo_box max_chars="20" allow_text_entry="false" name="platform"
height="18" width="200" left="120" bottom_delta="-4"
follows="left|top" mouse_opaque="true" />
<!-- Grid Nickname -->
<text type="string" length="1" enabled="true" name="gridnick_label"
height="10" width="100" left="12" bottom_delta="-22"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Grid Nickname:
</text>
<line_editor max_length="25" enabled="false" name="gridnick"
handle_edit_keys_directly="true"
<!-- Grid Nickname -->
<text type="string" length="1" enabled="true" name="gridnick_label"
height="10" width="100" left="12" bottom_delta="-22"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Grid Nickname:
</text>
<line_editor max_length="25" enabled="false" name="gridnick"
handle_edit_keys_directly="true"
height="18" width="175" left="120" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Grid Name -->
<text type="string" length="1" enabled="true" name="gridname_label"
<!-- Grid Name -->
<text type="string" length="1" enabled="true" name="gridname_label"
height="10" width="100" left="12" bottom_delta="-20"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Grid Name:
</text>
<line_editor max_length="254" enabled="true" name="gridname"
handle_edit_keys_directly="true"
Grid Name:
</text>
<line_editor max_length="254" enabled="true" name="gridname"
handle_edit_keys_directly="true"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Grid Splash Page -->
<text type="string" length="1" enabled="true" name="loginpage_label"
height="10" width="100" left="12" bottom_delta="-22"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
<!-- Grid Message -->
<text type="string" length="1" enabled="true" name="gridmessage_label"
height="10" width="100" left="12" bottom_delta="-50"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Splash Page:
</text>
<line_editor max_length="254" enabled="true" name="loginpage"
handle_edit_keys_directly="true"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
Grid Info:
</text>
<text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top|right"
handle_edit_keys_directly="true"
font="SansSerifSmall" height="50" left="120" right="-12" bottom_delta="-4" max_length="512"
mouse_opaque="true" name="gridmessage" word_wrap="true" spell_check="true" />
<!-- Advanced settings -->
<!-- Grid Splash Page -->
<text type="string" length="1" enabled="true" name="loginpage_label"
height="10" width="100" left="12" bottom_delta="-22" visible="false"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Helper URI -->
<text type="string" length="1" enabled="true" name="helperuri_label"
height="10" width="100" left="12" bottom_delta="-20"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Helper URL:
</text>
<line_editor max_length="254" enabled="true" name="helperuri"
handle_edit_keys_directly="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Splash Page:
</text>
<line_editor max_length="254" enabled="true" name="loginpage"
handle_edit_keys_directly="true" visible="false"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Web Site -->
<text type="string" length="1" enabled="true" name="website_label"
height="10" width="100" left="12" bottom_delta="-20"
<!-- Helper URI -->
<text type="string" length="1" enabled="true" name="helperuri_label"
height="10" width="100" left="12" bottom_delta="-20" visible="false"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Web Site:
</text>
<line_editor max_length="254" enabled="true" name="website"
handle_edit_keys_directly="true"
Helper URL:
</text>
<line_editor max_length="254" enabled="true" name="helperuri"
handle_edit_keys_directly="true" visible="false"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Support URL -->
<text type="string" length="1" enabled="true" name="support_label"
height="10" width="100" left="12" bottom_delta="-20"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Support URL:
</text>
<line_editor max_length="254" enabled="true" name="support"
handle_edit_keys_directly="true"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Account URL -->
<text type="string" length="1" enabled="true" name="register_label"
height="10" width="100" left="12" bottom_delta="-20"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Account URL:
</text>
<line_editor max_length="254" enabled="true" name="register"
handle_edit_keys_directly="true"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Password URL -->
<text type="string" length="1" enabled="true" name="password_label"
height="10" width="100" left="12" bottom_delta="-20"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Password URL:
</text>
<line_editor max_length="254" enabled="true" name="password"
handle_edit_keys_directly="true"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Search URL -->
<text type="string" length="1" enabled="true" name="search_label"
height="10" width="100" left="12" bottom_delta="-20"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Search URL:
</text>
<line_editor max_length="254" enabled="true" name="search"
handle_edit_keys_directly="true"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Rendering Compatibility -->
<check_box enabled="true" radio_style="false"
label="Rendering Compatibility" name="render_compat"
<!-- Web Site -->
<text type="string" length="1" enabled="true" name="website_label"
height="10" width="100" left="12" bottom_delta="-20" visible="false"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Web Site:
</text>
<line_editor max_length="254" enabled="true" name="website"
handle_edit_keys_directly="true" visible="false"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Support URL -->
<text type="string" length="1" enabled="true" name="support_label"
height="10" width="100" left="12" bottom_delta="-20" visible="false"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Support URL:
</text>
<line_editor max_length="254" enabled="true" name="support"
handle_edit_keys_directly="true" visible="false"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Account URL -->
<text type="string" length="1" enabled="true" name="register_label"
height="10" width="100" left="12" bottom_delta="-20" visible="false"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Account URL:
</text>
<line_editor max_length="254" enabled="true" name="register"
handle_edit_keys_directly="true" visible="false"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Password URL -->
<text type="string" length="1" enabled="true" name="password_label"
height="10" width="100" left="12" bottom_delta="-20" visible="false"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Password URL:
</text>
<line_editor max_length="254" enabled="true" name="password"
handle_edit_keys_directly="true" visible="false"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Search URL -->
<text type="string" length="1" enabled="true" name="search_label"
height="10" width="100" left="12" bottom_delta="-20" visible="false"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Search URL:
</text>
<line_editor max_length="254" enabled="true" name="search"
handle_edit_keys_directly="true" visible="false"
height="18" left="120" right="-12" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top|right" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Rendering Compatibility -->
<check_box enabled="true" radio_style="false"
label="Rendering Compatibility" name="render_compat" visible="false"
height="18" left="115" bottom_delta="-35"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<button label="?" label_selected="?" enabled="true" name="btn_help_render_compat"
height="18" width="18" left_delta="160" bottom_delta="1"
<button label="?" label_selected="?" enabled="true" name="btn_help_render_compat"
height="18" width="18" left_delta="160" bottom_delta="1" visible="false"
halign="center" follows="left|top"
font="SansSerifSmall" mouse_opaque="true" />
</panel>