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

Complete conversion of object profile sale type to combo box. Fixes FIRE-856 and FIRE-765.

meow-7.2.2
Tonya Souther 2011-04-26 10:35:14 -05:00
parent a4398a09c7
commit 4bcd2d9562
2 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llfloaterproperties.cpp
View File

@ -36,6 +36,7 @@
#include "llagent.h"
#include "llbutton.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "llavataractions.h"
#include "llinventorydefines.h"
#include "llinventoryobserver.h"
@ -146,7 +147,7 @@ BOOL LLFloaterProperties::postBuild()
getChild<LLUICtrl>("CheckNextOwnerTransfer")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitPermissions, this));
// Mark for sale or not, and sale info
getChild<LLUICtrl>("CheckPurchase")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleInfo, this));
getChild<LLUICtrl>("RadioSaleType")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleType, this));
getChild<LLUICtrl>("ComboSaleType")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleType, this));
// "Price" label for edit
getChild<LLUICtrl>("Edit Cost")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitSaleInfo, this));
// The UI has been built, now fill in all the values
@ -191,7 +192,7 @@ void LLFloaterProperties::refresh()
"CheckNextOwnerCopy",
"CheckNextOwnerTransfer",
"CheckPurchase",
"RadioSaleType",
"ComboSaleType",
"Edit Cost"
};
for(size_t t=0; t<LL_ARRAY_SIZE(enableNames); ++t)
@ -511,8 +512,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
getChildView("CheckNextOwnerCopy")->setEnabled((base_mask & PERM_COPY) && !cannot_restrict_permissions);
getChildView("CheckNextOwnerTransfer")->setEnabled((next_owner_mask & PERM_COPY) && !cannot_restrict_permissions);
getChildView("RadioSaleType")->setEnabled(is_complete && is_for_sale);
// getChildView("TextPrice")->setEnabled(is_complete && is_for_sale);
getChildView("ComboSaleType")->setEnabled(is_complete && is_for_sale);
getChildView("Edit Cost")->setEnabled(is_complete && is_for_sale);
}
else
@ -525,30 +525,27 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
getChildView("CheckNextOwnerCopy")->setEnabled(FALSE);
getChildView("CheckNextOwnerTransfer")->setEnabled(FALSE);
getChildView("RadioSaleType")->setEnabled(FALSE);
// getChildView("TextPrice")->setEnabled(FALSE);
getChildView("ComboSaleType")->setEnabled(FALSE);
getChildView("Edit Cost")->setEnabled(FALSE);
}
// Set values.
getChild<LLUICtrl>("CheckPurchase")->setValue(is_for_sale);
getChildView("combobox sale copy")->setEnabled(is_for_sale);
getChildView("Edit Cost")->setEnabled(is_for_sale);
getChild<LLUICtrl>("CheckNextOwnerModify")->setValue(LLSD(BOOL(next_owner_mask & PERM_MODIFY)));
getChild<LLUICtrl>("CheckNextOwnerCopy")->setValue(LLSD(BOOL(next_owner_mask & PERM_COPY)));
getChild<LLUICtrl>("CheckNextOwnerTransfer")->setValue(LLSD(BOOL(next_owner_mask & PERM_TRANSFER)));
LLRadioGroup* radioSaleType = getChild<LLRadioGroup>("RadioSaleType");
LLComboBox* comboSaleType = getChild<LLComboBox>("ComboSaleType");
if (is_for_sale)
{
radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1);
comboSaleType->setCurrentByIndex((S32)sale_info.getSaleType() - 1);
S32 numerical_price;
numerical_price = sale_info.getSalePrice();
getChild<LLUICtrl>("Edit Cost")->setValue(llformat("%d",numerical_price));
}
else
{
radioSaleType->setSelectedIndex(-1);
comboSaleType->setCurrentByIndex(-1);
getChild<LLUICtrl>("Edit Cost")->setValue(llformat("%d",0));
}
}
@ -793,10 +790,10 @@ void LLFloaterProperties::updateSaleInfo()
// turn on sale info
LLSaleInfo::EForSale sale_type = LLSaleInfo::FS_COPY;
LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("RadioSaleType");
if(RadioSaleType)
LLComboBox* ComboSaleType = getChild<LLComboBox>("ComboSaleType");
if(ComboSaleType)
{
switch (RadioSaleType->getSelectedIndex())
switch (ComboSaleType->getCurrentIndex())
{
case 0:
sale_type = LLSaleInfo::FS_ORIGINAL;

39
indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
View File

@ -305,16 +305,20 @@
left_pad="5"
layout="topleft"
follows="left|top"
name="combobox sale copy"
name="ComboSaleType"
width="110">
<combo_box.item
label="Original"
name="Original"
value="Original" />
<combo_box.item
label="Copy"
name="Copy"
value="Copy" />
<combo_box.item
label="Original"
name="Original"
value="Original" />
label="Contents"
name="Contents"
value="Contents" />
</combo_box>
<spinner
follows="left|top"
@ -404,31 +408,4 @@
N:
</text>
<radio_group
draw_border="false"
follows="left|top|right"
height="16"
layout="topleft"
left_delta="78"
name="RadioSaleType"
top_delta="0"
width="252">
<radio_item
height="16"
label="Original"
layout="topleft"
left="0"
name="radio"
top="0"
width="70" />
<radio_item
height="16"
label="Copy"
layout="topleft"
left_delta="60"
name="radio2"
top_delta="0"
width="70" />
</radio_group>
</floater>