From eb15b6f93618f34516e00d3ba96237fde8663f58 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 28 Jun 2012 17:55:10 -0400 Subject: Remove redundant "create_account_url" string from panel_login.xml. We already have a "create_account_url" string in strings.xml, and in fact -- according to Eli -- the strings.xml values are "better" for non-English languages. Unfortunately those "better" strings weren't being used. They were tied to the FirstRun notification, which seems to have been disengaged. Changed llpanellogin.cpp to look in strings.xml rather than panel_login.xml when clicking the "Sign Up" link on the login panel. --- indra/newview/llpanellogin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 76aadcd913..a7aa99dfde 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -877,7 +877,7 @@ void LLPanelLogin::onClickConnect(void *) // static void LLPanelLogin::onClickNewAccount(void*) { - LLWeb::loadURLExternal(sInstance->getString("create_account_url")); + LLWeb::loadURLExternal(LLTrans::getString("create_account_url")); } -- cgit v1.2.3 From 8356cc1c4fd921cac46d9d98bdf80c7c8ae05b22 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 13 Jul 2012 12:38:26 -0400 Subject: Try reorganizing panel_login.xml per Leo's redesign. This includes replacing the small "Sign up" link with a "CREATE YOUR ACCOUNT: Start now" button, requiring a small tweak to the C++ code to Do The Right Thing when the button (vs. the link) is clicked. --- indra/newview/llpanellogin.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index a7aa99dfde..e37155aeb6 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -175,8 +175,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, LLTextBox* forgot_password_text = getChild("forgot_password_text"); forgot_password_text->setClickedCallback(onClickForgotPassword, NULL); - LLTextBox* create_new_account_text = getChild("create_new_account_text"); - create_new_account_text->setClickedCallback(onClickNewAccount, NULL); + childSetAction("create_new_account_btn", onClickNewAccount, NULL); LLTextBox* need_help_text = getChild("login_help"); need_help_text->setClickedCallback(onClickHelp, NULL); @@ -1025,7 +1024,7 @@ void LLPanelLogin::updateLoginPanelLinks() // need to call through sInstance, as it's called from onSelectServer, which // is static. - sInstance->getChildView("create_new_account_text")->setVisible( system_grid); + sInstance->getChildView("create_new_account_btn")->setVisible( system_grid); sInstance->getChildView("forgot_password_text")->setVisible( system_grid); } -- cgit v1.2.3 From f7449bdc570e97a2ded2864779c72cce7f52e608 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 18 Jul 2012 14:47:16 -0400 Subject: Make "Log In" button (etc.) move with start/grid combo visibility. The "Start at:" combo box and the grid-selector box can be turned on and off with checkboxes on the Preferences floater. Break the bottom-left layout_panel on panel_login into several different layout_panels so when these UI elements disappear, other controls move left to fill the holes. Similarly, when you turn on either or both of the UI elements in question, the remaining controls in that general bottom-left area move right to accommodate. Tweak C++ and non-English panel_login.xml overrides to reflect widgets' containment in new layout_panel elements. Discard obsolete "mode_selection_text" and "mode_combo" translations from non- English panel_login.xml overrides. --- indra/newview/llpanellogin.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'indra/newview/llpanellogin.cpp') diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index e37155aeb6..c4bd8c750d 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -27,6 +27,7 @@ #include "llviewerprecompiledheaders.h" #include "llpanellogin.h" +#include "lllayoutstack.h" #include "indra_constants.h" // for key and mask constants #include "llfloaterreg.h" @@ -161,7 +162,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, childSetAction("connect_btn", onClickConnect, this); - getChild("login")->setDefaultBtn("connect_btn"); + getChild("links_login_panel")->setDefaultBtn("connect_btn"); std::string channel = LLVersionInfo::getChannel(); std::string version = llformat("%s (%d)", @@ -640,13 +641,11 @@ void LLPanelLogin::updateLocationCombo( bool force_visible ) if ( ! force_visible ) show_start = gSavedSettings.getBOOL("ShowStartLocation"); - - sInstance->getChildView("start_location_combo")->setVisible( show_start); - sInstance->getChildView("start_location_text")->setVisible( show_start); - + + sInstance->getChild("start_location_panel")->setVisible(show_start); + BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid"); - sInstance->getChildView("server_combo_text")->setVisible( show_server); - sInstance->getChildView("server_combo")->setVisible( show_server); + sInstance->getChild("grid_panel")->setVisible(show_server); } // static -- cgit v1.2.3