summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelprofileclassifieds.cpp33
-rw-r--r--indra/newview/llpanelprofileclassifieds.h7
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_classified.xml31
3 files changed, 10 insertions, 61 deletions
diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index 225aca406e..079867d03f 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -363,7 +363,7 @@ void LLPanelProfileClassifieds::apply()
for (S32 tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
{
LLPanelProfileClassified* classified_panel = dynamic_cast<LLPanelProfileClassified*>(mTabContainer->getPanelByIndex(tab_idx));
- if (classified_panel && classified_panel->isDirty())
+ if (classified_panel && classified_panel->isDirty() && !classified_panel->isNew())
{
classified_panel->doSave();
}
@@ -419,6 +419,7 @@ LLPanelProfileClassified::LLPanelProfileClassified()
, mTeleportClicksNew(0)
, mMapClicksNew(0)
, mProfileClicksNew(0)
+ , mPriceForListing(0)
, mSnapshotCtrl(NULL)
, mPublishFloater(NULL)
, mIsNew(false)
@@ -475,8 +476,6 @@ BOOL LLPanelProfileClassified::postBuild()
mLocationEdit = getChild<LLUICtrl>("classified_location_edit");
mCategoryCombo = getChild<LLComboBox>("category_edit");
mContentTypeCombo = getChild<LLComboBox>("content_type_edit");
- mPriceEdit = getChild<LLUICtrl>("price_for_listing_edit");
- mPricelabel = getChild<LLUICtrl>("price_for_listing_edit_label");
mAutoRenewEdit = getChild<LLUICtrl>("auto_renew_edit");
mSaveButton = getChild<LLButton>("save_changes_btn");
@@ -513,7 +512,6 @@ BOOL LLPanelProfileClassified::postBuild()
mClassifiedDescEdit->setKeystrokeCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
mCategoryCombo->setCommitCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
mContentTypeCombo->setCommitCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
- mPriceEdit->setCommitCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
mAutoRenewEdit->setCommitCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
return TRUE;
@@ -613,9 +611,6 @@ void LLPanelProfileClassified::onOpen(const LLSD& key)
}
- mPricelabel->setVisible(is_new);
- mPriceEdit->setVisible(is_new);
-
bool is_self = getSelfProfile();
getChildView("auto_renew_layout_panel")->setVisible(is_self);
getChildView("clickthrough_layout_panel")->setVisible(is_self);
@@ -660,8 +655,6 @@ void LLPanelProfileClassified::processProperties(void* data, EAvatarProcessorTyp
static LLUIString price_str = getString("l$_price");
price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing));
mPriceText->setValue(LLSD(price_str));
- mPriceEdit->setValue(c_info->price_for_listing);
- mPriceEdit->setEnabled(isNew());
static std::string date_fmt = getString("date_fmt");
std::string date_str = date_fmt;
@@ -742,7 +735,6 @@ void LLPanelProfileClassified::enableEditing(bool enable)
mSetLocationButton->setEnabled(enable);
mCategoryCombo->setEnabled(enable);
mContentTypeCombo->setEnabled(enable);
- mPriceEdit->setEnabled(enable);
mAutoRenewEdit->setEnabled(enable);
}
@@ -753,8 +745,7 @@ void LLPanelProfileClassified::resetControls()
mCategoryCombo->setCurrentByIndex(0);
mContentTypeCombo->setCurrentByIndex(0);
mAutoRenewEdit->setValue(false);
- mPriceEdit->setValue(MINIMUM_PRICE_FOR_LISTING);
- mPriceEdit->setEnabled(TRUE);
+ mPriceForListing = MINIMUM_PRICE_FOR_LISTING;
}
void LLPanelProfileClassified::onEditClick()
@@ -772,8 +763,7 @@ void LLPanelProfileClassified::onCancelClick()
mCategoryCombo->setCurrentByIndex(0);
mContentTypeCombo->setCurrentByIndex(0);
mAutoRenewEdit->setValue(false);
- mPriceEdit->setValue(MINIMUM_PRICE_FOR_LISTING);
- mPriceEdit->setEnabled(TRUE);
+ mPriceForListing = MINIMUM_PRICE_FOR_LISTING;
}
else
{
@@ -863,10 +853,11 @@ void LLPanelProfileClassified::resetData()
mMapClicksNew = 0;
mProfileClicksNew = 0;
+ mPriceForListing = MINIMUM_PRICE_FOR_LISTING;
+
mCategoryText->setValue(LLStringUtil::null);
mContentTypeText->setValue(LLStringUtil::null);
getChild<LLUICtrl>("click_through_text")->setValue(LLStringUtil::null);
- mPriceEdit->setValue(LLStringUtil::null);
mEditButton->setValue(LLStringUtil::null);
getChild<LLUICtrl>("creation_date")->setValue(LLStringUtil::null);
mContentTypeM->setVisible(FALSE);
@@ -1093,7 +1084,6 @@ BOOL LLPanelProfileClassified::isDirty() const
dirty |= mCategoryCombo->isDirty();
dirty |= mContentTypeCombo->isDirty();
dirty |= mAutoRenewEdit->isDirty();
- dirty |= mPriceEdit->isDirty();
return dirty;
}
@@ -1110,7 +1100,6 @@ void LLPanelProfileClassified::resetDirty()
mCategoryCombo->resetDirty();
mContentTypeCombo->resetDirty();
mAutoRenewEdit->resetDirty();
- mPriceEdit->resetDirty();
}
bool LLPanelProfileClassified::canClose()
@@ -1221,16 +1210,6 @@ std::string LLPanelProfileClassified::makeClassifiedName()
return name;
}
-S32 LLPanelProfileClassified::getPriceForListing()
-{
- return mPriceEdit->getValue().asInteger();
-}
-
-void LLPanelProfileClassified::setPriceForListing(S32 price)
-{
- mPriceEdit->setValue(price);
-}
-
void LLPanelProfileClassified::onSetLocationClick()
{
setPosGlobal(gAgent.getPositionGlobal());
diff --git a/indra/newview/llpanelprofileclassifieds.h b/indra/newview/llpanelprofileclassifieds.h
index 53ee41cf04..31ef1c65b3 100644
--- a/indra/newview/llpanelprofileclassifieds.h
+++ b/indra/newview/llpanelprofileclassifieds.h
@@ -185,7 +185,7 @@ public:
bool getAutoRenew();
- S32 getPriceForListing();
+ S32 getPriceForListing() { return mPriceForListing; }
void setEditMode(BOOL edit_mode);
bool getEditMode() {return mEditMode;}
@@ -239,7 +239,7 @@ protected:
std::string makeClassifiedName();
- void setPriceForListing(S32 price);
+ void setPriceForListing(S32 price) { mPriceForListing = price; }
U8 getFlags();
@@ -318,8 +318,6 @@ private:
LLIconCtrl* mContentTypeG;
LLComboBox* mContentTypeCombo;
LLUICtrl* mPriceText;
- LLUICtrl* mPriceEdit;
- LLUICtrl* mPricelabel;
LLUICtrl* mAutoRenewText;
LLUICtrl* mAutoRenewEdit;
@@ -358,6 +356,7 @@ private:
S32 mMapClicksNew;
S32 mProfileClicksNew;
+ S32 mPriceForListing;
static void handleSearchStatResponse(LLUUID classifiedId, LLSD result);
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 7f0f86d524..741ea49b1e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -619,36 +619,7 @@
width="250"
layout="topleft"
/>
- <text
- name="price_for_listing_edit_label"
- value="Price for listing:"
- top_pad="10"
- left="10"
- height="10"
- width="120"
- follows="left|top"
- layout="topleft"
- text_color="white"
- />
- <spinner
- name="price_for_listing_edit"
- label="L$"
- value="50"
- tool_tip="Price for listing."
- top_delta="0"
- left_pad="0"
- height="23"
- width="105"
- follows="left|top"
- layout="topleft"
- decimal_digits="0"
- halign="left"
- increment="1"
- label_width="20"
- max_val="99999"
- min_val="50"
- />
- </panel>
+ </panel>
</panel>
</scroll_container>
<layout_stack
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 15:41:01 +0000