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

Remove orphaned LLPanelOutfitSnapshotInventory 

# Conflicts:
#	indra/newview/llpanelsnapshotinventory.cpp
master
Ansariel 2024-09-25 22:14:39 +02:00
parent c7ebde4ec9
commit 698a3017a0
5 changed files with 45 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
indra/newview/llpanelsnapshotinventory.cpp
View File

@ -42,77 +42,33 @@
/**
* The panel provides UI for saving snapshot as an inventory texture.
*/
class LLPanelSnapshotInventoryBase
: public LLPanelSnapshot
{
LOG_CLASS(LLPanelSnapshotInventoryBase);
public:
LLPanelSnapshotInventoryBase();
/*virtual*/ bool postBuild();
protected:
void onSend();
/*virtual*/ LLSnapshotModel::ESnapshotType getSnapshotType();
};
class LLPanelSnapshotInventory
: public LLPanelSnapshotInventoryBase
: public LLPanelSnapshot
{
LOG_CLASS(LLPanelSnapshotInventory);
public:
LLPanelSnapshotInventory();
/*virtual*/ bool postBuild();
/*virtual*/ void onOpen(const LLSD& key);
bool postBuild() override;
void onOpen(const LLSD& key) override;
void onResolutionCommit(LLUICtrl* ctrl);
private:
/*virtual*/ std::string getWidthSpinnerName() const { return "inventory_snapshot_width"; }
/*virtual*/ std::string getHeightSpinnerName() const { return "inventory_snapshot_height"; }
/*virtual*/ std::string getAspectRatioCBName() const { return "inventory_keep_aspect_check"; }
/*virtual*/ std::string getImageSizeComboName() const { return "texture_size_combo"; }
/*virtual*/ std::string getImageSizePanelName() const { return LLStringUtil::null; }
/*virtual*/ void updateControls(const LLSD& info);
std::string getWidthSpinnerName() const override { return "inventory_snapshot_width"; }
std::string getHeightSpinnerName() const override { return "inventory_snapshot_height"; }
std::string getAspectRatioCBName() const override { return "inventory_keep_aspect_check"; }
std::string getImageSizeComboName() const override { return "texture_size_combo"; }
std::string getImageSizePanelName() const override { return LLStringUtil::null; }
LLSnapshotModel::ESnapshotType getSnapshotType() override;
void updateControls(const LLSD& info) override;
};
class LLPanelOutfitSnapshotInventory
: public LLPanelSnapshotInventoryBase
{
LOG_CLASS(LLPanelOutfitSnapshotInventory);
public:
LLPanelOutfitSnapshotInventory();
/*virtual*/ bool postBuild();
/*virtual*/ void onOpen(const LLSD& key);
private:
/*virtual*/ std::string getWidthSpinnerName() const { return ""; }
/*virtual*/ std::string getHeightSpinnerName() const { return ""; }
/*virtual*/ std::string getAspectRatioCBName() const { return ""; }
/*virtual*/ std::string getImageSizeComboName() const { return "texture_size_combo"; }
/*virtual*/ std::string getImageSizePanelName() const { return LLStringUtil::null; }
/*virtual*/ void updateControls(const LLSD& info);
/*virtual*/ void cancel();
void onSend();
};
static LLPanelInjector<LLPanelSnapshotInventory> panel_class1("llpanelsnapshotinventory");
static LLPanelInjector<LLPanelOutfitSnapshotInventory> panel_class2("llpaneloutfitsnapshotinventory");
LLPanelSnapshotInventoryBase::LLPanelSnapshotInventoryBase()
{
}
bool LLPanelSnapshotInventoryBase::postBuild()
{
return LLPanelSnapshot::postBuild();
}
LLSnapshotModel::ESnapshotType LLPanelSnapshotInventoryBase::getSnapshotType()
LLSnapshotModel::ESnapshotType LLPanelSnapshotInventory::getSnapshotType()
{
return LLSnapshotModel::SNAPSHOT_TEXTURE;
}
@ -130,7 +86,7 @@ bool LLPanelSnapshotInventory::postBuild()
getChild<LLSpinCtrl>(getHeightSpinnerName())->setAllowEdit(false);
getChild<LLUICtrl>(getImageSizeComboName())->setCommitCallback(boost::bind(&LLPanelSnapshotInventory::onResolutionCommit, this, _1));
return LLPanelSnapshotInventoryBase::postBuild();
return LLPanelSnapshot::postBuild();
}
// virtual
@ -153,7 +109,7 @@ void LLPanelSnapshotInventory::onResolutionCommit(LLUICtrl* ctrl)
getChild<LLSpinCtrl>(getHeightSpinnerName())->setVisible(!current_window_selected);
}
void LLPanelSnapshotInventoryBase::onSend()
void LLPanelSnapshotInventory::onSend()
{
S32 w = 0;
S32 h = 0;
@ -187,37 +143,3 @@ void LLPanelSnapshotInventoryBase::onSend()
}
}
}
LLPanelOutfitSnapshotInventory::LLPanelOutfitSnapshotInventory()
{
mCommitCallbackRegistrar.add("Inventory.SaveOutfitPhoto", boost::bind(&LLPanelOutfitSnapshotInventory::onSend, this));
mCommitCallbackRegistrar.add("Inventory.SaveOutfitCancel", boost::bind(&LLPanelOutfitSnapshotInventory::cancel, this));
}
// virtual
bool LLPanelOutfitSnapshotInventory::postBuild()
{
return LLPanelSnapshotInventoryBase::postBuild();
}
// virtual
void LLPanelOutfitSnapshotInventory::onOpen(const LLSD& key)
{
getChild<LLUICtrl>("hint_lbl")->setTextArg("[UPLOAD_COST]", llformat("%d", LLAgentBenefitsMgr::current().getTextureUploadCost()));
LLPanelSnapshot::onOpen(key);
}
// virtual
void LLPanelOutfitSnapshotInventory::updateControls(const LLSD& info)
{
const bool have_snapshot = info.has("have-snapshot") ? info["have-snapshot"].asBoolean() : true;
getChild<LLUICtrl>("save_btn")->setEnabled(have_snapshot);
}
void LLPanelOutfitSnapshotInventory::cancel()
{
if (mSnapshotFloater)
{
mSnapshotFloater->closeFloater();
}
}

20
indra/newview/llpanelsnapshotlocal.cpp
View File

@ -47,18 +47,18 @@ class LLPanelSnapshotLocal
public:
LLPanelSnapshotLocal();
/*virtual*/ bool postBuild();
/*virtual*/ void onOpen(const LLSD& key);
bool postBuild() override;
void onOpen(const LLSD& key) override;
private:
/*virtual*/ std::string getWidthSpinnerName() const { return "local_snapshot_width"; }
/*virtual*/ std::string getHeightSpinnerName() const { return "local_snapshot_height"; }
/*virtual*/ std::string getAspectRatioCBName() const { return "local_keep_aspect_check"; }
/*virtual*/ std::string getImageSizeComboName() const { return "local_size_combo"; }
/*virtual*/ std::string getImageSizePanelName() const { return "local_image_size_lp"; }
/*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const;
/*virtual*/ LLSnapshotModel::ESnapshotType getSnapshotType();
/*virtual*/ void updateControls(const LLSD& info);
std::string getWidthSpinnerName() const override { return "local_snapshot_width"; }
std::string getHeightSpinnerName() const override { return "local_snapshot_height"; }
std::string getAspectRatioCBName() const override { return "local_keep_aspect_check"; }
std::string getImageSizeComboName() const override { return "local_size_combo"; }
std::string getImageSizePanelName() const override { return "local_image_size_lp"; }
LLSnapshotModel::ESnapshotFormat getImageFormat() const override;
LLSnapshotModel::ESnapshotType getSnapshotType() override;
void updateControls(const LLSD& info) override;
S32 mLocalFormat;

4
indra/newview/llpanelsnapshotoptions.cpp
View File

@ -47,8 +47,8 @@ class LLPanelSnapshotOptions
public:
LLPanelSnapshotOptions();
~LLPanelSnapshotOptions();
/*virtual*/ bool postBuild();
/*virtual*/ void onOpen(const LLSD& key);
bool postBuild() override;
void onOpen(const LLSD& key) override;
private:
void updateUploadCost();

20
indra/newview/llpanelsnapshotpostcard.cpp
View File

@ -56,18 +56,18 @@ class LLPanelSnapshotPostcard
public:
LLPanelSnapshotPostcard();
/*virtual*/ bool postBuild();
/*virtual*/ void onOpen(const LLSD& key);
bool postBuild() override;
void onOpen(const LLSD& key) override;
private:
/*virtual*/ std::string getWidthSpinnerName() const { return "postcard_snapshot_width"; }
/*virtual*/ std::string getHeightSpinnerName() const { return "postcard_snapshot_height"; }
/*virtual*/ std::string getAspectRatioCBName() const { return "postcard_keep_aspect_check"; }
/*virtual*/ std::string getImageSizeComboName() const { return "postcard_size_combo"; }
/*virtual*/ std::string getImageSizePanelName() const { return "postcard_image_size_lp"; }
/*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const { return LLSnapshotModel::SNAPSHOT_FORMAT_JPEG; }
/*virtual*/ LLSnapshotModel::ESnapshotType getSnapshotType();
/*virtual*/ void updateControls(const LLSD& info);
std::string getWidthSpinnerName() const override { return "postcard_snapshot_width"; }
std::string getHeightSpinnerName() const override { return "postcard_snapshot_height"; }
std::string getAspectRatioCBName() const override { return "postcard_keep_aspect_check"; }
std::string getImageSizeComboName() const override { return "postcard_size_combo"; }
std::string getImageSizePanelName() const override { return "postcard_image_size_lp"; }
LLSnapshotModel::ESnapshotFormat getImageFormat() const override { return LLSnapshotModel::SNAPSHOT_FORMAT_JPEG; }
LLSnapshotModel::ESnapshotType getSnapshotType() override;
void updateControls(const LLSD& info) override;
bool missingSubjMsgAlertCallback(const LLSD& notification, const LLSD& response);
static void sendPostcardFinished(LLSD result);

18
indra/newview/llpanelsnapshotprofile.cpp
View File

@ -49,17 +49,17 @@ class LLPanelSnapshotProfile
public:
LLPanelSnapshotProfile();
/*virtual*/ bool postBuild();
/*virtual*/ void onOpen(const LLSD& key);
bool postBuild() override;
void onOpen(const LLSD& key) override;
private:
/*virtual*/ std::string getWidthSpinnerName() const { return "profile_snapshot_width"; }
/*virtual*/ std::string getHeightSpinnerName() const { return "profile_snapshot_height"; }
/*virtual*/ std::string getAspectRatioCBName() const { return "profile_keep_aspect_check"; }
/*virtual*/ std::string getImageSizeComboName() const { return "profile_size_combo"; }
/*virtual*/ std::string getImageSizePanelName() const { return "profile_image_size_lp"; }
/*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const { return LLSnapshotModel::SNAPSHOT_FORMAT_PNG; }
/*virtual*/ void updateControls(const LLSD& info);
std::string getWidthSpinnerName() const override { return "profile_snapshot_width"; }
std::string getHeightSpinnerName() const override { return "profile_snapshot_height"; }
std::string getAspectRatioCBName() const override { return "profile_keep_aspect_check"; }
std::string getImageSizeComboName() const override { return "profile_size_combo"; }
std::string getImageSizePanelName() const override { return "profile_image_size_lp"; }
LLSnapshotModel::ESnapshotFormat getImageFormat() const override { return LLSnapshotModel::SNAPSHOT_FORMAT_PNG; }
void updateControls(const LLSD& info) override;
void onSend();
};