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

FIRE-17695: Reduce impact of changes, minor fixes and German translation

master
Ansariel 2018-12-28 19:51:32 +01:00
parent 866f027354
commit 5c600e4627
3 changed files with 44 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
indra/newview/llfloaterlinkreplace.cpp
View File

@ -108,10 +108,11 @@ void LLFloaterLinkReplace::onTargetItemDrop(const LLUUID& target_item_id)
{
mTargetEditor->setItem(nullptr);
mTargetEditor->setText(getString("DeleteNotReplace"));
mTargetUUID = LLUUID::null;
mTargetUUID.setNull();
}
// </FS:Beq>
}
// <FS:Beq> FIRE-17695 - Delete links capability
void LLFloaterLinkReplace::onDeleteOnlyToggle()
{
@ -121,13 +122,15 @@ void LLFloaterLinkReplace::onDeleteOnlyToggle()
childSetVisible("target_label", !enabled);
childSetVisible("delete_text", enabled);
mDeleteOnly = enabled;
if (mDeleteOnly){
if (mDeleteOnly)
{
mTargetEditor->setItem(nullptr);
mTargetUUID = LLUUID::null;
mTargetUUID.setNull();
}
checkEnableStart();
}
// </FS:Beq>
void LLFloaterLinkReplace::updateFoundLinks()
{
LLInventoryModel::item_array_t items;
@ -157,9 +160,9 @@ void LLFloaterLinkReplace::checkEnableStart()
}
// <FS:Beq> FIRE-17695 - Delete links capability
// mStartBtn->setEnabled(mRemainingItems > 0 && mSourceUUID.notNull() && mTargetUUID.notNull() && mSourceUUID != mTargetUUID);
auto enable=bool{ mRemainingItems > 0 && (
bool enable = mRemainingItems > 0 && (
(mDeleteOnly && mSourceUUID.notNull() ) ||
(mSourceUUID.notNull() && mTargetUUID.notNull() && mSourceUUID != mTargetUUID)) };
(mSourceUUID.notNull() && mTargetUUID.notNull() && mSourceUUID != mTargetUUID));
mStartBtn->setEnabled(enable);
// </FS:Beq>
@ -202,29 +205,11 @@ void LLFloaterLinkReplace::onStartClicked()
if (mRemainingInventoryItems.size() > 0)
{
// <FS:Beq> FIRE-17695 - option to bulk delete links.
// LLViewerInventoryItem* target_item = gInventory.getItem(mTargetUUID);
//if (target_item)
//{
// mRemainingItems = (U32)mRemainingInventoryItems.size();
// LLStringUtil::format_map_t args;
// args["NUM"] = llformat("%d", mRemainingItems);
// mStatusText->setText(getString("ItemsRemaining", args));
// mStartBtn->setEnabled(FALSE);
// mRefreshBtn->setEnabled(FALSE);
// mEventTimer.start();
// tick();
//}
//else
//{
// mStatusText->setText(getString("TargetNotFound"));
// LL_WARNS() << "Link replace target not found." << LL_ENDL;
//}
LLViewerInventoryItem* target_item = gInventory.getItem(mTargetUUID);
// <FS:Beq> FIRE-17695 - option to bulk delete links.
//if (target_item)
if (target_item || mDeleteOnly)
// </FS:Beq>
{
mRemainingItems = (U32)mRemainingInventoryItems.size();
@ -243,7 +228,6 @@ void LLFloaterLinkReplace::onStartClicked()
mStatusText->setText(getString("TargetNotFound"));
LL_WARNS() << "Link replace target not found." << LL_ENDL;
}
// </FS:Beq>
}
}

9
indra/newview/skins/default/xui/de/floater_linkreplace.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="fs_linkreplace" title="Inventar-Links ersetzen">
<floater name="linkreplace" title="Inventar-Links ersetzen">
<string name="Ready">
Bereit...
</string>
@ -18,14 +18,21 @@
<string name="ReplaceFinished">
Ersetzen von Inventar-Links beendet.
</string>
<string name="DeleteNotReplace">
Keine Ersetzung.
</string>
<text name="source_label">
Alt:
</text>
<inventory_link_replace_drop_target name="source_uuid_editor" tool_tip="Quell-Objekt aus dem Inventar hier per Drag&amp;Drop hineinziehen."/>
<text name="delete_text">
Verknüpfungen zu diesem Objekt werden entfernt.
</text>
<text name="target_label">
Neu:
</text>
<inventory_link_replace_drop_target name="target_uuid_editor" tool_tip="Ziel-Objekt aus dem Inventar hier per Drag&amp;Drop hineinziehen."/>
<check_box label="Nur Verknüpfungen entfernen" name="delete_links_only"/>
<text name="status_text">
Bereit...
</text>

51
indra/newview/skins/default/xui/en/floater_linkreplace.xml
View File

@ -27,9 +27,9 @@
<string name="ReplaceFinished">
Finished replacing inventory links.
</string>
<string name="DeleteNotReplace">
No replacement.
</string>
<string name="DeleteNotReplace">
No replacement.
</string>
<text
type="string"
follows="left|top"
@ -52,18 +52,18 @@
top_delta="-3"
right="-10"
tool_tip="Drag and drop the current inventory item here that should be replaced."/>
<text
type="string"
follows="left|top"
font="SanSerif"
height="23"
layout="topleft"
top_pad="10"
left="10"
right="-10"
name="delete_text">
Links to this item will be removed.
</text>
<text
type="string"
follows="left|top"
font="SanSerif"
height="23"
layout="topleft"
top_pad="10"
left="10"
right="-10"
name="delete_text">
Links to this item will be removed.
</text>
<text
type="string"
follows="left|top"
@ -86,16 +86,15 @@
top_delta="-3"
right="-10"
tool_tip="Drag and drop new inventory item here."/>
<check_box
follows="top|left"
height="20"
label="Delete links only"
left="10"
right="-10"
layout="topleft"
top_pad="10"
control_name="DeleteLinksOnly"
name="delete_links_only"/>
<check_box
follows="top|left"
height="20"
label="Delete links only"
left="10"
right="-10"
layout="topleft"
top_pad="5"
name="delete_links_only"/>
<text
type="string"
follows="left|top|right"
@ -103,7 +102,7 @@
height="20"
layout="topleft"
left="10"
right="-10"
right="-10"
name="status_text"
top_pad="10">
Ready...