Merge pull request #312 from gwigz/gwigz/preferences-search-slurl

Add support for preference search SLurl

Author: RyeMutt

indra/newview/llfloaterpreference.cpp

@@ -40,6 +40,7 @@
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "llcheckboxctrl.h"
+#include "llclipboard.h"
 #include "llcolorswatch.h"
 #include "llcombobox.h"
 #include "llcommandhandler.h"
@@ -74,6 +75,7 @@
 #include "llsliderctrl.h"
 #include "lltabcontainer.h"
 #include "lltrans.h"
+#include "lluri.h"
 #include "llviewercontrol.h"
 #include "llviewercamera.h"
 #include "llviewereventrecorder.h"
@@ -396,6 +398,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
     mCommitCallbackRegistrar.add("Pref.ClearLog",               boost::bind(&LLConversationLog::onClearLog, &LLConversationLog::instance()));
     mCommitCallbackRegistrar.add("Pref.DeleteTranscripts",      boost::bind(&LLFloaterPreference::onDeleteTranscripts, this));
     mCommitCallbackRegistrar.add("UpdateFilter", boost::bind(&LLFloaterPreference::onUpdateFilterTerm, this, false)); // <FS:ND/> Hook up for filtering
+    mCommitCallbackRegistrar.add("Pref.CopySearchAsSLURL",      boost::bind(&LLFloaterPreference::onCopySearch, this));
 #ifdef LL_DISCORD
     gSavedSettings.getControl("EnableDiscord")->getCommitSignal()->connect(boost::bind(&LLAppViewer::updateDiscordActivity));
     gSavedSettings.getControl("ShowDiscordActivityDetails")->getCommitSignal()->connect(boost::bind(&LLAppViewer::updateDiscordActivity));
@@ -1411,7 +1414,12 @@ void LLFloaterPreference::onOpen(const LLSD& key)
     }
 
     collectSearchableItems();
-    if (!mFilterEdit->getText().empty())
+    if (key.has("search"))
+    {
+        mFilterEdit->setText(key["search"].asString());
+        onUpdateFilterTerm(true);
+    }
+    else if (!mFilterEdit->getText().empty())
     {
         mFilterEdit->setText(LLStringExplicit(""));
         onUpdateFilterTerm(true);
@@ -4269,6 +4277,12 @@ void LLFloaterPreference::onUpdateFilterTerm(bool force)
         pRoot->selectFirstTab();
 }
 
+void LLFloaterPreference::onCopySearch()
+{
+    std::string search_query = "secondlife:///app/openfloater/preferences?search=" + LLURI::escape(mFilterEdit->getText());
+    LLClipboard::instance().copyToClipboard(utf8str_to_wstring(search_query), 0, static_cast<S32>(search_query.size()));
+}
+
 void LLFloaterPreference::filterIgnorableNotifications()
 {
     bool visible = mEnabledPopups->highlightMatchingItems(mFilterEdit->getValue());

indra/newview/llfloaterpreference.h

@@ -288,6 +288,7 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
     boost::signals2::connection mAutoResponseNonFriendsConnection;
 
     void onUpdateFilterTerm( bool force = false );
+    void onCopySearch();
     void collectSearchableItems();
     void filterIgnorableNotifications();
 

indra/newview/llviewerfloaterreg.cpp

@@ -334,7 +334,7 @@ class LLFloaterOpenHandler : public LLCommandHandler
         }
 
         const std::string floater_name = LLURI::unescape(params[0].asString());
-        LLSD key;
+        LLSD key = query_map;
         if (floater_name == FLOATER_PROFILE)
         {
             key["id"] = gAgentID;

indra/newview/skins/default/xui/en/floater_preferences.xml

@@ -56,7 +56,7 @@
          left="0"
          max_length_bytes="255"
          name="search_prefs_edit"
-         right="-1"
+         right="-28"
          text_pad_left="6"
          tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."
          top="0">
@@ -71,6 +71,21 @@
           rect.width="12"
           rect.bottom="-1" />
         </search_editor>
+        <button
+         height="18"
+         width="24"
+         follows="right|top"
+         image_overlay="Icon_Copy"
+         image_unselected="Toolbar_Middle_Off"
+         image_selected="Toolbar_Middle_Selected"
+         layout="topleft"
+         left_pad="4"
+         top_delta="0"
+         name="copy_search_slurl_btn"
+         tool_tip="Copy search query as SLURL">
+          <button.commit_callback
+           function="Pref.CopySearchAsSLURL" />
+        </button>
     </panel>
 
     <tab_container