From 7b5ef7053f0e00282faa47138497b6937756faeb Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Wed, 3 Mar 2010 16:22:51 +0200 Subject: Implemented major sub task EXT-5858 - Assigned picture is stretched in the Classified Info panel. Reshape snapshot control to max possible size maintaining aspect ratio. --HG-- branch : product-engine --- indra/newview/llpanelclassified.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llpanelclassified.h') diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 9e33e55b88..1942eb5365 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -256,6 +256,8 @@ public: /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + /*virtual*/ void draw(); + protected: LLPanelClassifiedInfo(); @@ -269,6 +271,8 @@ protected: const std::string& sim_name, const LLVector3d& pos_global); + void stretchSnapshot(); + void onMapClick(); void onTeleportClick(); void onExit(); @@ -281,6 +285,9 @@ private: LLUUID mParcelId; bool mInfoLoaded; + bool mSnapshotStreched; + LLRect mSnapshotRect; + LLScrollContainer* mScrollContainer; LLPanel* mScrollingPanel; -- cgit v1.2.3 From dfe98202c031cd70f469d10f4a34aabc9a366375 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 3 Mar 2010 20:10:27 +0200 Subject: WIP on EXT-5687 (Classifieds are missing the clickthrough data). Added clicks info and creation date. --HG-- branch : product-engine --- indra/newview/llpanelclassified.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llpanelclassified.h') diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 1942eb5365..0922150b74 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -250,6 +250,12 @@ public: void setInfoLoaded(bool loaded) { mInfoLoaded = loaded; } + void setClickThrough( + const LLUUID& classified_id, + S32 teleport, + S32 map, + S32 profile); + void setExitCallback(const commit_callback_t& cb); void setEditClassifiedCallback(const commit_callback_t& cb); -- cgit v1.2.3 From eabcd8e1b7a46cdaf005839aa1f524f25f3ddea0 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 3 Mar 2010 22:07:39 +0200 Subject: Fixed bug EXT-5687 (Classifieds are missing the clickthrough data). We now take into account stats received from the so-called "new table" (for regions supporting "SearchStatRequest" capability). --HG-- branch : product-engine --- indra/newview/llpanelclassified.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelclassified.h') diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 0922150b74..43b47d4e3e 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -250,11 +250,12 @@ public: void setInfoLoaded(bool loaded) { mInfoLoaded = loaded; } - void setClickThrough( + static void setClickThrough( const LLUUID& classified_id, S32 teleport, S32 map, - S32 profile); + S32 profile, + bool from_new_table); void setExitCallback(const commit_callback_t& cb); @@ -299,6 +300,17 @@ private: S32 mScrollingPanelMinHeight; S32 mScrollingPanelWidth; + + // Needed for stat tracking + S32 mTeleportClicksOld; + S32 mMapClicksOld; + S32 mProfileClicksOld; + S32 mTeleportClicksNew; + S32 mMapClicksNew; + S32 mProfileClicksNew; + + typedef std::list panel_list_t; + static panel_list_t sAllPanels; }; class LLPanelClassifiedEdit : public LLPanelClassifiedInfo -- cgit v1.2.3 From 5301d4189fde3332237b52ce26ab08f5c7fb0baa Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Thu, 4 Mar 2010 12:18:24 +0200 Subject: Updated major sub task EXT-5858 - Assigned picture is stretched in the Classified Info panel. Fixed reshape issues. Added stretching to edit classified panel. --HG-- branch : product-engine --- indra/newview/llpanelclassified.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelclassified.h') diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 43b47d4e3e..3df3a2255b 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -280,10 +280,16 @@ protected: void stretchSnapshot(); + LLRect getDefaultSnapshotRect(); + void onMapClick(); void onTeleportClick(); void onExit(); + bool mSnapshotStreched; + LLRect mSnapshotRect; + LLTextureCtrl* mSnapshotCtrl; + private: LLUUID mAvatarId; @@ -292,9 +298,6 @@ private: LLUUID mParcelId; bool mInfoLoaded; - bool mSnapshotStreched; - LLRect mSnapshotRect; - LLScrollContainer* mScrollContainer; LLPanel* mScrollingPanel; @@ -341,6 +344,10 @@ public: bool canClose(); + void draw(); + + void stretchSnapshot(); + protected: LLPanelClassifiedEdit(); @@ -372,6 +379,8 @@ protected: void onTexturePickerMouseEnter(LLUICtrl* ctrl); void onTexturePickerMouseLeave(LLUICtrl* ctrl); + void onTextureSelected(); + private: bool mIsNew; bool mCanClose; -- cgit v1.2.3 From 997e91f08e9b6afd5bb3335da235e6ea9e9c0761 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Thu, 4 Mar 2010 16:05:04 +0200 Subject: Fixed major bug EXT-5943 - Classifieds are Published and charged as soon as you hit Save. Added Publish Classified floater to confirm classified creashion and publishing. --HG-- branch : product-engine --- indra/newview/llpanelclassified.h | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelclassified.h') diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 3df3a2255b..1b5b5e54d8 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -202,6 +202,23 @@ private: void* mUserData; }; +class LLPublishClassifiedFloater : public LLFloater +{ +public: + LLPublishClassifiedFloater(const LLSD& key); + virtual ~LLPublishClassifiedFloater(); + + /*virtual*/ BOOL postBuild(); + + void setPrice(S32 price); + S32 getPrice(); + + void setPublishClickedCallback(const commit_signal_t::slot_type& cb); + void setCancelClickedCallback(const commit_signal_t::slot_type& cb); + +private: +}; + class LLPanelClassifiedInfo : public LLPanel, public LLAvatarPropertiesObserver { public: @@ -334,9 +351,9 @@ public: /*virtual*/ void resetDirty(); - void setSaveCallback(const commit_callback_t& cb); + void setSaveCallback(const commit_signal_t::slot_type& cb); - void setCancelCallback(const commit_callback_t& cb); + void setCancelCallback(const commit_signal_t::slot_type& cb); /*virtual*/ void resetControls(); @@ -364,6 +381,8 @@ protected: S32 getPriceForListing(); + void setPriceForListing(S32 price); + U8 getFlags(); std::string getLocationNotice(); @@ -376,6 +395,10 @@ protected: void onChange(); void onSaveClick(); + void doSave(); + + void onPublishFloaterPublishClicked(); + void onTexturePickerMouseEnter(LLUICtrl* ctrl); void onTexturePickerMouseLeave(LLUICtrl* ctrl); @@ -384,6 +407,10 @@ protected: private: bool mIsNew; bool mCanClose; + + LLPublishClassifiedFloater* mPublishFloater; + + commit_signal_t mSaveButtonClickedSignal; }; #endif // LL_LLPANELCLASSIFIED_H -- cgit v1.2.3 From a9b829f371183de408745d27c3fbabf9d4624ea2 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Thu, 4 Mar 2010 16:55:00 +0200 Subject: Fixed low bug EXT-5998 - Classified is scrolled if previos classified was scrolled. --HG-- branch : product-engine --- indra/newview/llpanelclassified.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelclassified.h') diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h index 1b5b5e54d8..78f095a9bb 100644 --- a/indra/newview/llpanelclassified.h +++ b/indra/newview/llpanelclassified.h @@ -299,6 +299,8 @@ protected: LLRect getDefaultSnapshotRect(); + void scrollToTop(); + void onMapClick(); void onTeleportClick(); void onExit(); -- cgit v1.2.3