livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-15834: Option to display Received Folder at bottom and as a folder in inventory

Ansariel 2015-04-06 12:06:00 +02:00
parent 25ce6bf9d2
commit a0bdae65cb
4 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -20142,6 +20142,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSAlwaysShowInboxButton</key>
<map>
<key>Comment</key>
<string>If enabled, the Received Items folder aka Inbox is always shown at the bottom of the inventory, even if it is shown as folder in the inventory itself.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<!-- <FS:Zi> External Editor tab conversion -->
<key>ExternalEditorConvertTabsToSpaces</key>

4
indra/newview/llsidepanelinventory.cpp
View File

@ -254,6 +254,7 @@ BOOL LLSidepanelInventory::postBuild()
// <FS:Ansariel> Optional hiding of Received Items folder aka Inbox
gSavedSettings.getControl("FSShowInboxFolder")->getSignal()->connect(boost::bind(&LLSidepanelInventory::refreshInboxVisibility, this));
gSavedSettings.getControl("FSAlwaysShowInboxButton")->getSignal()->connect(boost::bind(&LLSidepanelInventory::refreshInboxVisibility, this));
// Update the verbs buttons state.
updateVerbs();
@ -354,12 +355,11 @@ void LLSidepanelInventory::enableInbox(bool enabled)
LLLayoutPanel * inbox_layout_panel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
// <FS:Ansariel> Optional hiding of Received Items folder aka Inbox
//inbox_layout_panel->setVisible(enabled);
inbox_layout_panel->setVisible(enabled&& !gSavedSettings.getBOOL("FSShowInboxFolder")//); <FS:CR>
inbox_layout_panel->setVisible(enabled && (!gSavedSettings.getBOOL("FSShowInboxFolder") || gSavedSettings.getBOOL("FSAlwaysShowInboxButton"))
// <FS:CR> Show Received Items panel only in Second Life
#ifdef OPENSIM
&& LLGridManager::getInstance()->isInSecondLife()
#endif // OPENSIM
);
// </FS:CR>
}

1
indra/newview/skins/default/xui/de/panel_preferences_UI.xml
View File

@ -114,6 +114,7 @@
</text>
<check_box label="Leere Systemordner im Inventar verstecken" name="DebugHideEmptySystemFolders" tool_tip="Versteckt leere Systemordner wie z.B. Favoriten oder Landmarken usw. in den Inventarfenstern."/>
<check_box label="Ordner &quot;Erhaltene Artikel&quot; im Inventar anzeigen" name="FSShowInboxFolder" tool_tip="Falls aktiviert, wird der Ordner &quot;Erhaltene Artikel&quot; als normaler Ordner im Inventar angezeigt."/>
<check_box label="Button für &quot;Erhaltene Artikel&quot; immer im Inventar anzeigen" name="FSAlwaysShowInboxButton" tool_tip="Falls aktiviert, wird der Button &quot;Erhaltene Artikel&quot; immer im Inventarfenster angezeigt, selbst wenn Ordner im Inventar angezeigt wird."/>
<check_box label="Unterschiedliche Suchbegriffe pro Registerkarte im Inventar erlauben" name="FSSplitInventorySearchOverTabs" tool_tip="Falls aktiviert, können im Inventarfenster für jede Registerkarte unterschiedliche Suchbegriffe eingegeben werden."/>
</panel>

21
indra/newview/skins/default/xui/en/panel_preferences_UI.xml
View File

@ -744,8 +744,7 @@
name="DebugHideEmptySystemFolders"
width="270"
control_name="DebugHideEmptySystemFolders"
tool_tip="If enabled, the inventory windows will hide all empty system folders like Favorites, Landmarks etc.">
</check_box>
tool_tip="If enabled, the inventory windows will hide all empty system folders like Favorites, Landmarks etc."/>
<check_box
top_pad="2"
follows="left|top"
@ -754,18 +753,28 @@
name="FSShowInboxFolder"
width="270"
control_name="FSShowInboxFolder"
tool_tip="If enabled, the inventory windows will also show the Received Items folder">
</check_box>
tool_tip="If enabled, the inventory windows will also show the Received Items folder"/>
<check_box
top_pad="2"
left="30"
follows="left|top"
height="16"
label="Always show Received Items button at bottom of inventory"
name="FSAlwaysShowInboxButton"
width="270"
control_name="FSAlwaysShowInboxButton"
enabled_control="FSShowInboxFolder"
tool_tip="If enabled, the Received Items button is always shown at the bottom of the inventory windows, even if the folder is shown in the inventory."/>
<check_box
top_pad="2"
left="20"
follows="left|top"
height="16"
label="Allow separate search terms on each tab in inventory"
name="FSSplitInventorySearchOverTabs"
width="270"
control_name="FSSplitInventorySearchOverTabs"
tool_tip="If enabled, it is possible to enter a different search term for each tab in inventory.">
</check_box>
tool_tip="If enabled, it is possible to enter a different search term for each tab in inventory."/>
</panel>