From cb8972b35ef9cc26985b30be580038e5a82d9e95 Mon Sep 17 00:00:00 2001 From: Cinders Date: Sun, 15 Dec 2013 14:04:59 -0700 Subject: [PATCH] =?UTF-8?q?FIRE-12507:=20Preserve=20control=20panel=20spac?= =?UTF-8?q?e=20in=20the=20im=20floater:=20*=20Tweak=20the=20layout=20of=20?= =?UTF-8?q?the=20control=20panel=20to=20make=20use=20of=20the=20full=20wid?= =?UTF-8?q?th=20of=20the=20floater=20*=20Shift=20Send=20Info=20and=20Show?= =?UTF-8?q?=20Version=20controls=20around,=20rename=20=E2=80=98Show=20View?= =?UTF-8?q?er=20Type=E2=80=99=20to=20=E2=80=98Show=20Version=E2=80=99=20*?= =?UTF-8?q?=20Combine=20Offer=20TP=20and=20Request=20TP=20into=20one=20tog?= =?UTF-8?q?glable=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/fsfloaterim.cpp | 48 ++++---- indra/newview/fsfloaterim.h | 3 +- .../textures/icons/Friends_Icon_24x24.png | Bin 1193 -> 4278 bytes .../textures/icons/request_tp_icon_24x24.png | Bin 5117 -> 0 bytes .../default/textures/icons/teleport_menu.png | Bin 0 -> 6269 bytes .../skins/default/textures/textures.xml | 2 +- .../default/xui/en/floater_fs_im_session.xml | 109 ++++++++---------- .../default/xui/en/menu_fs_im_teleport.xml | 20 ++++ 8 files changed, 89 insertions(+), 93 deletions(-) delete mode 100644 indra/newview/skins/default/textures/icons/request_tp_icon_24x24.png create mode 100644 indra/newview/skins/default/textures/icons/teleport_menu.png create mode 100755 indra/newview/skins/default/xui/en/menu_fs_im_teleport.xml diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index ac3f7adfff..9f0c0d1606 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -133,6 +133,8 @@ FSFloaterIM::FSFloaterIM(const LLUUID& session_id) } } + mCommitCallbackRegistrar.add("IMSession.Menu.Action", boost::bind(&FSFloaterIM::doToSelected, this, _2)); + setOverlapsScreenChannel(true); LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::IM, this); @@ -452,17 +454,6 @@ void FSFloaterIM::onShareButtonClicked() LLAvatarActions::share(mOtherParticipantUUID); } -void FSFloaterIM::onTeleportButtonClicked() -{ - lldebugs << "FSFloaterIM::onTeleportButtonClicked" << llendl; - LLAvatarActions::offerTeleport(mOtherParticipantUUID); -} - -void FSFloaterIM::onRequestTeleportButtonClicked() -{ - LLAvatarActions::teleportRequest(mOtherParticipantUUID); -} - void FSFloaterIM::onPayButtonClicked() { lldebugs << "FSFloaterIM::onPayButtonClicked" << llendl; @@ -512,6 +503,17 @@ void FSFloaterIM::onHistoryButtonClicked() } } +void FSFloaterIM::doToSelected(const LLSD& userdata) +{ + const std::string command = userdata.asString(); + if (command == "offer_tp") + LLAvatarActions::offerTeleport(mOtherParticipantUUID); + else if (command == "request_tp") + LLAvatarActions::teleportRequest(mOtherParticipantUUID); + else + LL_WARNS("IMFloater") << "Unhandled command '" << command << "'. Ignoring." << LL_ENDL; +} + // support sysinfo button -Zi void FSFloaterIM::onSysinfoButtonClicked() { @@ -525,16 +527,16 @@ void FSFloaterIM::onSysinfoButtonClicked() BOOL FSFloaterIM::onSendSysinfo(const LLSD& notification, const LLSD& response) { - S32 option=LLNotificationsUtil::getSelectedOption(notification,response); + S32 option = LLNotificationsUtil::getSelectedOption(notification,response); - if(option==0) + if (option == 0) { std::string part1 = notification["substitutions"]["Part1"]; std::string part2 = notification["substitutions"]["Part2"]; if (mSessionInitialized) { - LLIMModel::sendMessage(part1, mSessionID,mOtherParticipantUUID,mDialog); - LLIMModel::sendMessage(part2, mSessionID,mOtherParticipantUUID,mDialog); + LLIMModel::sendMessage(part1, mSessionID, mOtherParticipantUUID, mDialog); + LLIMModel::sendMessage(part2, mSessionID, mOtherParticipantUUID, mDialog); } else { @@ -646,7 +648,6 @@ void FSFloaterIM::changed(U32 mask) if(LLAvatarActions::isFriend(mOtherParticipantUUID)) { getChild("teleport_btn")->setEnabled(LLAvatarTracker::instance().isBuddyOnline(mOtherParticipantUUID)); - getChild("request_tp_btn")->setEnabled(LLAvatarTracker::instance().isBuddyOnline(mOtherParticipantUUID)); } } @@ -697,12 +698,6 @@ BOOL FSFloaterIM::postBuild() button = getChild("share_btn"); button->setClickedCallback(boost::bind(&FSFloaterIM::onShareButtonClicked, this)); - button = getChild("teleport_btn"); - button->setClickedCallback(boost::bind(&FSFloaterIM::onTeleportButtonClicked, this)); - - button = getChild("request_tp_btn"); - button->setClickedCallback(boost::bind(&FSFloaterIM::onRequestTeleportButtonClicked, this)); - button = getChild("pay_btn"); button->setClickedCallback(boost::bind(&FSFloaterIM::onPayButtonClicked, this)); @@ -744,7 +739,6 @@ BOOL FSFloaterIM::postBuild() { llinfos << "LLAvatarActions::isFriend - tp button" << llendl; getChild("teleport_btn")->setEnabled(LLAvatarTracker::instance().isBuddyOnline(mOtherParticipantUUID)); - getChild("request_tp_btn")->setEnabled(LLAvatarTracker::instance().isBuddyOnline(mOtherParticipantUUID)); } // support sysinfo button -Zi @@ -763,7 +757,6 @@ BOOL FSFloaterIM::postBuild() getChild("profile_panel")->setVisible(false); getChild("friend_panel")->setVisible(false); getChild("tp_panel")->setVisible(false); - getChild("request_tp_panel")->setVisible(false); getChild("share_panel")->setVisible(false); getChild("pay_panel")->setVisible(false); getChild("end_call_btn_panel")->setVisible(false); @@ -780,7 +773,6 @@ BOOL FSFloaterIM::postBuild() getChild("gprofile_panel")->setVisible(false); getChild("friend_panel")->setVisible(false); getChild("tp_panel")->setVisible(false); - getChild("request_tp_panel")->setVisible(false); getChild("share_panel")->setVisible(false); getChild("pay_panel")->setVisible(false); getChild("end_call_btn_panel")->setVisible(false); @@ -832,19 +824,19 @@ BOOL FSFloaterIM::postBuild() LLCheckBoxCtrl* FSPrefixBox = getChild("FSSupportGroupChatPrefix_toggle"); - BOOL isFSSupportGroup=FSData::getInstance()->isSupportGroup(mSessionID); + BOOL isFSSupportGroup = FSData::getInstance()->isSupportGroup(mSessionID); FSPrefixBox->setVisible(isFSSupportGroup); // Viewer version popup if(isFSSupportGroup) { // check if the dialog was set to ignore - LLNotificationTemplatePtr templatep=LLNotifications::instance().getTemplate("FirstJoinSupportGroup"); + LLNotificationTemplatePtr templatep = LLNotifications::instance().getTemplate("FirstJoinSupportGroup"); if(!templatep.get()->mForm->getIgnored()) { // if not, give the user a choice, whether to enable the version prefix or not LLSD args; - LLNotificationsUtil::add("FirstJoinSupportGroup",args,LLSD(),boost::bind(&FSFloaterIM::enableViewerVersionCallback,this,_1,_2)); + LLNotificationsUtil::add("FirstJoinSupportGroup", args, LLSD(),boost::bind(&FSFloaterIM::enableViewerVersionCallback, this, _1, _2)); } } // Viewer version popup diff --git a/indra/newview/fsfloaterim.h b/indra/newview/fsfloaterim.h index a8db85b387..8e58960f6a 100644 --- a/indra/newview/fsfloaterim.h +++ b/indra/newview/fsfloaterim.h @@ -186,11 +186,10 @@ private: void onViewProfileButtonClicked(); void onAddFriendButtonClicked(); void onShareButtonClicked(); - void onTeleportButtonClicked(); - void onRequestTeleportButtonClicked(); void onPayButtonClicked(); void onGroupInfoButtonClicked(); void onHistoryButtonClicked(); + void doToSelected(const LLSD& userdata); // support sysinfo button -Zi void onSysinfoButtonClicked(); diff --git a/indra/newview/skins/default/textures/icons/Friends_Icon_24x24.png b/indra/newview/skins/default/textures/icons/Friends_Icon_24x24.png index 9c5f5bc6d14342429cd58bd976ea540048ab7031..8432ea527a18af0d7cf83aa84e1df9ea439b539f 100644 GIT binary patch delta 4265 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 LNkvXXu0mjfE0-U& delta 1153 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 diff --git a/indra/newview/skins/default/textures/icons/teleport_menu.png b/indra/newview/skins/default/textures/icons/teleport_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..d9527f79a9368e372e41ada2e697281b68724d25 GIT binary patch literal 6269 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 eQ1` - + diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml index a09019aea1..a47a8d207f 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml @@ -26,7 +26,7 @@ follows="top|left" clip="false" height="27" - width="200" + right="-3" left_pad="0" layout="topleft" orientation="horizontal" @@ -137,44 +137,23 @@ top="0" layout="topleft" height="24" - width="27" + width="33" follows="left|top"> -