diff options
author | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
commit | 215f423cbe18fe9ca14a26caef918d303bad28ff (patch) | |
tree | 0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llpanelgrouplandmoney.cpp | |
parent | Second Life viewer sources 1.18.3.5-RC (diff) | |
download | meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2 meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz |
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelgrouplandmoney.cpp | 205 |
1 files changed, 141 insertions, 64 deletions
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp index 117145e..a6ffe4f 100644 --- a/linden/indra/newview/llpanelgrouplandmoney.cpp +++ b/linden/indra/newview/llpanelgrouplandmoney.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llpanelgrouplandmoney.cpp | 2 | * @file llpanelgrouplandmoney.cpp |
3 | * @brief Panel for group land and L$. | 3 | * @brief Panel for group land and L$. |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2006-2007, Linden Research, Inc. | 7 | * Copyright (c) 2006-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #include "llviewerprecompiledheaders.h" | 32 | #include "llviewerprecompiledheaders.h" |
@@ -49,12 +52,93 @@ | |||
49 | #include "llfloaterworldmap.h" | 52 | #include "llfloaterworldmap.h" |
50 | #include "llviewermessage.h" | 53 | #include "llviewermessage.h" |
51 | 54 | ||
52 | const char LOADING_STRING[] = "Computing..."; | 55 | //////////////////////////////////////////////////////////////////////////// |
56 | |||
57 | class LLGroupMoneyTabEventHandler | ||
58 | { | ||
59 | public: | ||
60 | LLGroupMoneyTabEventHandler(LLButton* earlier_button, | ||
61 | LLButton* later_button, | ||
62 | LLTextEditor* text_editor, | ||
63 | LLTabContainerCommon* tab_containerp, | ||
64 | LLPanel* panelp, | ||
65 | const LLString& loading_text, | ||
66 | const LLUUID& group_id, | ||
67 | S32 interval_length_days, | ||
68 | S32 max_interval_days); | ||
69 | virtual ~LLGroupMoneyTabEventHandler(); | ||
70 | |||
71 | virtual void requestData(LLMessageSystem* msg); | ||
72 | virtual void processReply(LLMessageSystem* msg, void** data); | ||
73 | |||
74 | virtual void onClickEarlier(); | ||
75 | virtual void onClickLater(); | ||
76 | virtual void onClickTab(); | ||
77 | |||
78 | static void clickEarlierCallback(void* data); | ||
79 | static void clickLaterCallback(void* data); | ||
80 | static void clickTabCallback(void* user_data, bool from_click); | ||
81 | |||
82 | static LLMap<LLUUID, LLGroupMoneyTabEventHandler*> sInstanceIDs; | ||
83 | static std::map<LLPanel*, LLGroupMoneyTabEventHandler*> sTabsToHandlers; | ||
84 | protected: | ||
85 | class impl; | ||
86 | impl* mImplementationp; | ||
87 | }; | ||
88 | |||
89 | class LLGroupMoneyDetailsTabEventHandler : public LLGroupMoneyTabEventHandler | ||
90 | { | ||
91 | public: | ||
92 | LLGroupMoneyDetailsTabEventHandler(LLButton* earlier_buttonp, | ||
93 | LLButton* later_buttonp, | ||
94 | LLTextEditor* text_editorp, | ||
95 | LLTabContainerCommon* tab_containerp, | ||
96 | LLPanel* panelp, | ||
97 | const LLString& loading_text, | ||
98 | const LLUUID& group_id); | ||
99 | virtual ~LLGroupMoneyDetailsTabEventHandler(); | ||
100 | |||
101 | virtual void requestData(LLMessageSystem* msg); | ||
102 | virtual void processReply(LLMessageSystem* msg, void** data); | ||
103 | }; | ||
104 | |||
105 | |||
106 | class LLGroupMoneySalesTabEventHandler : public LLGroupMoneyTabEventHandler | ||
107 | { | ||
108 | public: | ||
109 | LLGroupMoneySalesTabEventHandler(LLButton* earlier_buttonp, | ||
110 | LLButton* later_buttonp, | ||
111 | LLTextEditor* text_editorp, | ||
112 | LLTabContainerCommon* tab_containerp, | ||
113 | LLPanel* panelp, | ||
114 | const LLString& loading_text, | ||
115 | const LLUUID& group_id); | ||
116 | virtual ~LLGroupMoneySalesTabEventHandler(); | ||
117 | |||
118 | virtual void requestData(LLMessageSystem* msg); | ||
119 | virtual void processReply(LLMessageSystem* msg, void** data); | ||
120 | }; | ||
121 | |||
122 | class LLGroupMoneyPlanningTabEventHandler : public LLGroupMoneyTabEventHandler | ||
123 | { | ||
124 | public: | ||
125 | LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editor, | ||
126 | LLTabContainerCommon* tab_containerp, | ||
127 | LLPanel* panelp, | ||
128 | const LLString& loading_text, | ||
129 | const LLUUID& group_id); | ||
130 | virtual ~LLGroupMoneyPlanningTabEventHandler(); | ||
131 | |||
132 | virtual void requestData(LLMessageSystem* msg); | ||
133 | virtual void processReply(LLMessageSystem* msg, void** data); | ||
134 | }; | ||
135 | |||
136 | //////////////////////////////////////////////////////////////////////////// | ||
53 | 137 | ||
54 | class LLPanelGroupLandMoney::impl | 138 | class LLPanelGroupLandMoney::impl |
55 | { | 139 | { |
56 | public: | 140 | public: |
57 | impl(const LLUUID& group_id); //constructor | 141 | impl(LLPanelGroupLandMoney& panel, const LLUUID& group_id); //constructor |
58 | virtual ~impl(); | 142 | virtual ~impl(); |
59 | 143 | ||
60 | void requestGroupLandInfo(); | 144 | void requestGroupLandInfo(); |
@@ -73,12 +157,10 @@ public: | |||
73 | 157 | ||
74 | //member variables | 158 | //member variables |
75 | public: | 159 | public: |
76 | LLTextBox *mTotalContributedLandp; | 160 | LLPanelGroupLandMoney& mPanel; |
77 | LLTextBox *mTotalLandInUsep; | 161 | |
78 | LLTextBox *mLandAvailablep; | ||
79 | LLTextBox* mGroupOverLimitTextp; | 162 | LLTextBox* mGroupOverLimitTextp; |
80 | LLIconCtrl* mGroupOverLimitIconp; | 163 | LLIconCtrl* mGroupOverLimitIconp; |
81 | LLTextBox* mYourContributionMaxTextp; | ||
82 | 164 | ||
83 | LLLineEditor* mYourContributionEditorp; | 165 | LLLineEditor* mYourContributionEditorp; |
84 | 166 | ||
@@ -104,22 +186,19 @@ public: | |||
104 | //******************************************* | 186 | //******************************************* |
105 | //** LLPanelGroupLandMoney::impl Functions ** | 187 | //** LLPanelGroupLandMoney::impl Functions ** |
106 | //******************************************* | 188 | //******************************************* |
107 | LLPanelGroupLandMoney::impl::impl(const LLUUID& group_id) | 189 | LLPanelGroupLandMoney::impl::impl(LLPanelGroupLandMoney& panel, const LLUUID& group_id) |
190 | : mPanel(panel), | ||
191 | mGroupID(group_id) | ||
108 | { | 192 | { |
109 | mGroupID = group_id; | ||
110 | mTransID = LLUUID::null; | 193 | mTransID = LLUUID::null; |
111 | 194 | ||
112 | mBeenActivated = false; | 195 | mBeenActivated = false; |
113 | mNeedsSendGroupLandRequest = true; | 196 | mNeedsSendGroupLandRequest = true; |
114 | mNeedsApply = false; | 197 | mNeedsApply = false; |
115 | 198 | ||
116 | mTotalLandInUsep = NULL; | ||
117 | mTotalContributedLandp = NULL; | ||
118 | mLandAvailablep = NULL; | ||
119 | mYourContributionEditorp = NULL; | 199 | mYourContributionEditorp = NULL; |
120 | mMapButtonp = NULL; | 200 | mMapButtonp = NULL; |
121 | mGroupParcelsp = NULL; | 201 | mGroupParcelsp = NULL; |
122 | mYourContributionMaxTextp = NULL; | ||
123 | mGroupOverLimitTextp = NULL; | 202 | mGroupOverLimitTextp = NULL; |
124 | mGroupOverLimitIconp = NULL; | 203 | mGroupOverLimitIconp = NULL; |
125 | 204 | ||
@@ -227,9 +306,7 @@ int LLPanelGroupLandMoney::impl::getStoredContribution() | |||
227 | // Fills in the text field with the contribution, contrib | 306 | // Fills in the text field with the contribution, contrib |
228 | void LLPanelGroupLandMoney::impl::setYourContributionTextField(int contrib) | 307 | void LLPanelGroupLandMoney::impl::setYourContributionTextField(int contrib) |
229 | { | 308 | { |
230 | char buffer[MAX_STRING]; /* Flawfinder: ignore*/ | 309 | LLString buffer = llformat("%d", contrib); |
231 | buffer[0] = '\0'; | ||
232 | snprintf(buffer, sizeof(buffer), "%d", contrib); /* Flawfinder: ignore*/ | ||
233 | 310 | ||
234 | if ( mYourContributionEditorp ) | 311 | if ( mYourContributionEditorp ) |
235 | { | 312 | { |
@@ -240,14 +317,7 @@ void LLPanelGroupLandMoney::impl::setYourContributionTextField(int contrib) | |||
240 | 317 | ||
241 | void LLPanelGroupLandMoney::impl::setYourMaxContributionTextBox(int max) | 318 | void LLPanelGroupLandMoney::impl::setYourMaxContributionTextBox(int max) |
242 | { | 319 | { |
243 | char buffer[MAX_STRING]; /*Flawfinder: ignore*/ | 320 | mPanel.childSetTextArg("your_contribution_max_value", "[AMOUNT]", llformat("%d", max)); |
244 | buffer[0] = '\0'; | ||
245 | |||
246 | snprintf(buffer, sizeof(buffer), "(%d max)", max); /* Flawfinder: ignore */ | ||
247 | if ( mYourContributionMaxTextp ) | ||
248 | { | ||
249 | mYourContributionMaxTextp->setText(buffer); | ||
250 | } | ||
251 | } | 321 | } |
252 | 322 | ||
253 | //static | 323 | //static |
@@ -306,19 +376,18 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg) | |||
306 | { | 376 | { |
307 | // special block which has total contribution | 377 | // special block which has total contribution |
308 | ++first_block; | 378 | ++first_block; |
379 | |||
309 | S32 total_contribution; | 380 | S32 total_contribution; |
310 | msg->getS32("QueryData", "ActualArea", total_contribution, 0); | 381 | msg->getS32("QueryData", "ActualArea", total_contribution, 0); |
311 | char buffer[MAX_STRING]; /*Flawfinder: ignore*/ | 382 | mPanel.childSetTextArg("total_contributed_land_value", "[AREA]", llformat("%d", total_contribution)); |
312 | snprintf(buffer, sizeof(buffer), "%d sq. meters", total_contribution); /* Flawfinder: ignore */ | 383 | |
313 | mTotalContributedLandp->setText(buffer); | ||
314 | S32 committed; | 384 | S32 committed; |
315 | msg->getS32("QueryData", "BillableArea", committed, 0); | 385 | msg->getS32("QueryData", "BillableArea", committed, 0); |
316 | snprintf(buffer, sizeof(buffer), "%d sq. meters", committed); /* Flawfinder: ignore */ | 386 | mPanel.childSetTextArg("total_land_in_use_value", "[AREA]", llformat("%d", committed)); |
317 | mTotalLandInUsep->setText(buffer); | 387 | |
318 | S32 available = total_contribution - committed; | 388 | S32 available = total_contribution - committed; |
319 | snprintf(buffer, sizeof(buffer), "%d sq. meters", available); /* Flawfinder: ignore */ | 389 | mPanel.childSetTextArg("land_available_value", "[AREA]", llformat("%d", available)); |
320 | mLandAvailablep->setText(buffer); | 390 | |
321 | buffer[0] = '\0'; | ||
322 | if ( mGroupOverLimitTextp && mGroupOverLimitIconp ) | 391 | if ( mGroupOverLimitTextp && mGroupOverLimitIconp ) |
323 | { | 392 | { |
324 | mGroupOverLimitIconp->setVisible(available < 0); | 393 | mGroupOverLimitIconp->setVisible(available < 0); |
@@ -413,7 +482,7 @@ LLPanelGroupLandMoney::LLPanelGroupLandMoney(const std::string& name, | |||
413 | const LLUUID& group_id) : | 482 | const LLUUID& group_id) : |
414 | LLPanelGroupTab(name, group_id) | 483 | LLPanelGroupTab(name, group_id) |
415 | { | 484 | { |
416 | mImplementationp = new impl(group_id); | 485 | mImplementationp = new impl(*this, group_id); |
417 | 486 | ||
418 | //problem what if someone has both the group floater open and the finder | 487 | //problem what if someone has both the group floater open and the finder |
419 | //open to the same group? Some maps that map group ids to panels | 488 | //open to the same group? Some maps that map group ids to panels |
@@ -535,18 +604,10 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
535 | 604 | ||
536 | bool can_view = gAgent.isInGroup(mGroupID); | 605 | bool can_view = gAgent.isInGroup(mGroupID); |
537 | 606 | ||
538 | mImplementationp->mTotalLandInUsep = | ||
539 | (LLTextBox*) getChildByName("total_land_in_use_value"); | ||
540 | mImplementationp->mTotalContributedLandp = | ||
541 | (LLTextBox*) getChildByName("total_contributed_land_value"); | ||
542 | mImplementationp->mLandAvailablep = | ||
543 | (LLTextBox*) getChildByName("land_available_value"); | ||
544 | mImplementationp->mGroupOverLimitIconp = | 607 | mImplementationp->mGroupOverLimitIconp = |
545 | (LLIconCtrl*) getChildByName("group_over_limit_icon"); | 608 | (LLIconCtrl*) getChildByName("group_over_limit_icon"); |
546 | mImplementationp->mGroupOverLimitTextp = | 609 | mImplementationp->mGroupOverLimitTextp = |
547 | (LLTextBox*) getChildByName("group_over_limit_text"); | 610 | (LLTextBox*) getChildByName("group_over_limit_text"); |
548 | mImplementationp->mYourContributionMaxTextp = | ||
549 | (LLTextBox*) getChildByName("your_contribution_max_value"); | ||
550 | 611 | ||
551 | mImplementationp->mYourContributionEditorp | 612 | mImplementationp->mYourContributionEditorp |
552 | = (LLLineEditor*) getChildByName("your_contribution_line_editor"); | 613 | = (LLLineEditor*) getChildByName("your_contribution_line_editor"); |
@@ -633,7 +694,8 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
633 | } | 694 | } |
634 | } | 695 | } |
635 | 696 | ||
636 | 697 | LLString loading_text = childGetText("loading_txt"); | |
698 | |||
637 | //pull out the widgets for the L$ details tab | 699 | //pull out the widgets for the L$ details tab |
638 | earlierp = (LLButton*) getChildByName("earlier_details_button", true); | 700 | earlierp = (LLButton*) getChildByName("earlier_details_button", true); |
639 | laterp = (LLButton*) getChildByName("later_details_button", true); | 701 | laterp = (LLButton*) getChildByName("later_details_button", true); |
@@ -652,6 +714,7 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
652 | textp, | 714 | textp, |
653 | tabcp, | 715 | tabcp, |
654 | panelp, | 716 | panelp, |
717 | loading_text, | ||
655 | mGroupID); | 718 | mGroupID); |
656 | } | 719 | } |
657 | 720 | ||
@@ -668,6 +731,7 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
668 | new LLGroupMoneyPlanningTabEventHandler(textp, | 731 | new LLGroupMoneyPlanningTabEventHandler(textp, |
669 | tabcp, | 732 | tabcp, |
670 | panelp, | 733 | panelp, |
734 | loading_text, | ||
671 | mGroupID); | 735 | mGroupID); |
672 | } | 736 | } |
673 | 737 | ||
@@ -689,6 +753,7 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
689 | textp, | 753 | textp, |
690 | tabcp, | 754 | tabcp, |
691 | panelp, | 755 | panelp, |
756 | loading_text, | ||
692 | mGroupID); | 757 | mGroupID); |
693 | } | 758 | } |
694 | 759 | ||
@@ -726,7 +791,8 @@ public: | |||
726 | impl(LLButton* earlier_buttonp, | 791 | impl(LLButton* earlier_buttonp, |
727 | LLButton* later_buttonp, | 792 | LLButton* later_buttonp, |
728 | LLTextEditor* text_editorp, | 793 | LLTextEditor* text_editorp, |
729 | LLPanel* panelp, | 794 | LLPanel* tabpanelp, |
795 | const LLString& loading_text, | ||
730 | const LLUUID& group_id, | 796 | const LLUUID& group_id, |
731 | S32 interval_length_days, | 797 | S32 interval_length_days, |
732 | S32 max_interval_days); | 798 | S32 max_interval_days); |
@@ -742,7 +808,7 @@ public: | |||
742 | LLUUID mGroupID; | 808 | LLUUID mGroupID; |
743 | LLUUID mPanelID; | 809 | LLUUID mPanelID; |
744 | 810 | ||
745 | LLPanel* mPanelp; | 811 | LLPanel* mTabPanelp; |
746 | 812 | ||
747 | int mIntervalLength; | 813 | int mIntervalLength; |
748 | int mMaxInterval; | 814 | int mMaxInterval; |
@@ -751,12 +817,15 @@ public: | |||
751 | LLTextEditor* mTextEditorp; | 817 | LLTextEditor* mTextEditorp; |
752 | LLButton* mEarlierButtonp; | 818 | LLButton* mEarlierButtonp; |
753 | LLButton* mLaterButtonp; | 819 | LLButton* mLaterButtonp; |
820 | |||
821 | LLString mLoadingText; | ||
754 | }; | 822 | }; |
755 | 823 | ||
756 | LLGroupMoneyTabEventHandler::impl::impl(LLButton* earlier_buttonp, | 824 | LLGroupMoneyTabEventHandler::impl::impl(LLButton* earlier_buttonp, |
757 | LLButton* later_buttonp, | 825 | LLButton* later_buttonp, |
758 | LLTextEditor* text_editorp, | 826 | LLTextEditor* text_editorp, |
759 | LLPanel* panelp, | 827 | LLPanel* tabpanelp, |
828 | const LLString& loading_text, | ||
760 | const LLUUID& group_id, | 829 | const LLUUID& group_id, |
761 | S32 interval_length_days, | 830 | S32 interval_length_days, |
762 | S32 max_interval_days) | 831 | S32 max_interval_days) |
@@ -771,7 +840,9 @@ LLGroupMoneyTabEventHandler::impl::impl(LLButton* earlier_buttonp, | |||
771 | mTextEditorp = text_editorp; | 840 | mTextEditorp = text_editorp; |
772 | mEarlierButtonp = earlier_buttonp; | 841 | mEarlierButtonp = earlier_buttonp; |
773 | mLaterButtonp = later_buttonp; | 842 | mLaterButtonp = later_buttonp; |
774 | mPanelp = panelp; | 843 | mTabPanelp = tabpanelp; |
844 | |||
845 | mLoadingText = loading_text; | ||
775 | } | 846 | } |
776 | 847 | ||
777 | LLGroupMoneyTabEventHandler::impl::~impl() | 848 | LLGroupMoneyTabEventHandler::impl::~impl() |
@@ -803,6 +874,7 @@ void LLGroupMoneyTabEventHandler::impl::updateButtons() | |||
803 | //******************************************* | 874 | //******************************************* |
804 | //** LLGroupMoneyTabEventHandler Functions ** | 875 | //** LLGroupMoneyTabEventHandler Functions ** |
805 | //******************************************* | 876 | //******************************************* |
877 | |||
806 | LLMap<LLUUID, LLGroupMoneyTabEventHandler*> LLGroupMoneyTabEventHandler::sInstanceIDs; | 878 | LLMap<LLUUID, LLGroupMoneyTabEventHandler*> LLGroupMoneyTabEventHandler::sInstanceIDs; |
807 | std::map<LLPanel*, LLGroupMoneyTabEventHandler*> LLGroupMoneyTabEventHandler::sTabsToHandlers; | 879 | std::map<LLPanel*, LLGroupMoneyTabEventHandler*> LLGroupMoneyTabEventHandler::sTabsToHandlers; |
808 | 880 | ||
@@ -811,6 +883,7 @@ LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_butto | |||
811 | LLTextEditor* text_editorp, | 883 | LLTextEditor* text_editorp, |
812 | LLTabContainerCommon* tab_containerp, | 884 | LLTabContainerCommon* tab_containerp, |
813 | LLPanel* panelp, | 885 | LLPanel* panelp, |
886 | const LLString& loading_text, | ||
814 | const LLUUID& group_id, | 887 | const LLUUID& group_id, |
815 | S32 interval_length_days, | 888 | S32 interval_length_days, |
816 | S32 max_interval_days) | 889 | S32 max_interval_days) |
@@ -819,28 +892,26 @@ LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_butto | |||
819 | later_buttonp, | 892 | later_buttonp, |
820 | text_editorp, | 893 | text_editorp, |
821 | panelp, | 894 | panelp, |
895 | loading_text, | ||
822 | group_id, | 896 | group_id, |
823 | interval_length_days, | 897 | interval_length_days, |
824 | max_interval_days); | 898 | max_interval_days); |
825 | 899 | ||
826 | if ( earlier_buttonp ) | 900 | if ( earlier_buttonp ) |
827 | { | 901 | { |
828 | earlier_buttonp->setClickedCallback(LLGroupMoneyTabEventHandler::clickEarlierCallback, | 902 | earlier_buttonp->setClickedCallback(clickEarlierCallback, this); |
829 | this); | ||
830 | } | 903 | } |
831 | 904 | ||
832 | if ( later_buttonp ) | 905 | if ( later_buttonp ) |
833 | { | 906 | { |
834 | later_buttonp->setClickedCallback(LLGroupMoneyTabEventHandler::clickLaterCallback, | 907 | later_buttonp->setClickedCallback(clickLaterCallback, this); |
835 | this); | ||
836 | } | 908 | } |
837 | 909 | ||
838 | mImplementationp->updateButtons(); | 910 | mImplementationp->updateButtons(); |
839 | 911 | ||
840 | if ( tab_containerp && panelp ) | 912 | if ( tab_containerp && panelp ) |
841 | { | 913 | { |
842 | tab_containerp->setTabChangeCallback(panelp, | 914 | tab_containerp->setTabChangeCallback(panelp, clickTabCallback); |
843 | LLGroupMoneyTabEventHandler::clickTabCallback); | ||
844 | tab_containerp->setTabUserData(panelp, this); | 915 | tab_containerp->setTabUserData(panelp, this); |
845 | } | 916 | } |
846 | 917 | ||
@@ -851,7 +922,7 @@ LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_butto | |||
851 | LLGroupMoneyTabEventHandler::~LLGroupMoneyTabEventHandler() | 922 | LLGroupMoneyTabEventHandler::~LLGroupMoneyTabEventHandler() |
852 | { | 923 | { |
853 | sInstanceIDs.removeData(mImplementationp->mPanelID); | 924 | sInstanceIDs.removeData(mImplementationp->mPanelID); |
854 | sTabsToHandlers.erase(mImplementationp->mPanelp); | 925 | sTabsToHandlers.erase(mImplementationp->mTabPanelp); |
855 | 926 | ||
856 | delete mImplementationp; | 927 | delete mImplementationp; |
857 | } | 928 | } |
@@ -876,7 +947,7 @@ void LLGroupMoneyTabEventHandler::onClickEarlier() | |||
876 | { | 947 | { |
877 | if ( mImplementationp->mTextEditorp) | 948 | if ( mImplementationp->mTextEditorp) |
878 | { | 949 | { |
879 | mImplementationp->mTextEditorp->setText(LOADING_STRING); | 950 | mImplementationp->mTextEditorp->setText(mImplementationp->mLoadingText); |
880 | } | 951 | } |
881 | mImplementationp->mCurrentInterval++; | 952 | mImplementationp->mCurrentInterval++; |
882 | 953 | ||
@@ -889,7 +960,7 @@ void LLGroupMoneyTabEventHandler::onClickLater() | |||
889 | { | 960 | { |
890 | if ( mImplementationp->mTextEditorp ) | 961 | if ( mImplementationp->mTextEditorp ) |
891 | { | 962 | { |
892 | mImplementationp->mTextEditorp->setText(LOADING_STRING); | 963 | mImplementationp->mTextEditorp->setText(mImplementationp->mLoadingText); |
893 | } | 964 | } |
894 | mImplementationp->mCurrentInterval--; | 965 | mImplementationp->mCurrentInterval--; |
895 | 966 | ||
@@ -929,12 +1000,14 @@ LLGroupMoneyDetailsTabEventHandler::LLGroupMoneyDetailsTabEventHandler(LLButton* | |||
929 | LLTextEditor* text_editorp, | 1000 | LLTextEditor* text_editorp, |
930 | LLTabContainerCommon* tab_containerp, | 1001 | LLTabContainerCommon* tab_containerp, |
931 | LLPanel* panelp, | 1002 | LLPanel* panelp, |
1003 | const LLString& loading_text, | ||
932 | const LLUUID& group_id) | 1004 | const LLUUID& group_id) |
933 | : LLGroupMoneyTabEventHandler(earlier_buttonp, | 1005 | : LLGroupMoneyTabEventHandler(earlier_buttonp, |
934 | later_buttonp, | 1006 | later_buttonp, |
935 | text_editorp, | 1007 | text_editorp, |
936 | tab_containerp, | 1008 | tab_containerp, |
937 | panelp, | 1009 | panelp, |
1010 | loading_text, | ||
938 | group_id, | 1011 | group_id, |
939 | SUMMARY_INTERVAL, | 1012 | SUMMARY_INTERVAL, |
940 | SUMMARY_MAX) | 1013 | SUMMARY_MAX) |
@@ -961,7 +1034,7 @@ void LLGroupMoneyDetailsTabEventHandler::requestData(LLMessageSystem* msg) | |||
961 | 1034 | ||
962 | if ( mImplementationp->mTextEditorp ) | 1035 | if ( mImplementationp->mTextEditorp ) |
963 | { | 1036 | { |
964 | mImplementationp->mTextEditorp->setText(LOADING_STRING); | 1037 | mImplementationp->mTextEditorp->setText(mImplementationp->mLoadingText); |
965 | } | 1038 | } |
966 | 1039 | ||
967 | LLGroupMoneyTabEventHandler::requestData(msg); | 1040 | LLGroupMoneyTabEventHandler::requestData(msg); |
@@ -1035,8 +1108,8 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg, | |||
1035 | } | 1108 | } |
1036 | 1109 | ||
1037 | //static | 1110 | //static |
1038 | void LLGroupMoneyDetailsTabEventHandler::processGroupAccountDetailsReply(LLMessageSystem* msg, | 1111 | void LLPanelGroupLandMoney::processGroupAccountDetailsReply(LLMessageSystem* msg, |
1039 | void** data) | 1112 | void** data) |
1040 | { | 1113 | { |
1041 | LLUUID agent_id; | 1114 | LLUUID agent_id; |
1042 | msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); | 1115 | msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); |
@@ -1068,12 +1141,14 @@ LLGroupMoneySalesTabEventHandler::LLGroupMoneySalesTabEventHandler(LLButton* ear | |||
1068 | LLTextEditor* text_editorp, | 1141 | LLTextEditor* text_editorp, |
1069 | LLTabContainerCommon* tab_containerp, | 1142 | LLTabContainerCommon* tab_containerp, |
1070 | LLPanel* panelp, | 1143 | LLPanel* panelp, |
1144 | const LLString& loading_text, | ||
1071 | const LLUUID& group_id) | 1145 | const LLUUID& group_id) |
1072 | : LLGroupMoneyTabEventHandler(earlier_buttonp, | 1146 | : LLGroupMoneyTabEventHandler(earlier_buttonp, |
1073 | later_buttonp, | 1147 | later_buttonp, |
1074 | text_editorp, | 1148 | text_editorp, |
1075 | tab_containerp, | 1149 | tab_containerp, |
1076 | panelp, | 1150 | panelp, |
1151 | loading_text, | ||
1077 | group_id, | 1152 | group_id, |
1078 | SUMMARY_INTERVAL, | 1153 | SUMMARY_INTERVAL, |
1079 | SUMMARY_MAX) | 1154 | SUMMARY_MAX) |
@@ -1100,7 +1175,7 @@ void LLGroupMoneySalesTabEventHandler::requestData(LLMessageSystem* msg) | |||
1100 | 1175 | ||
1101 | if ( mImplementationp->mTextEditorp ) | 1176 | if ( mImplementationp->mTextEditorp ) |
1102 | { | 1177 | { |
1103 | mImplementationp->mTextEditorp->setText(LOADING_STRING); | 1178 | mImplementationp->mTextEditorp->setText(mImplementationp->mLoadingText); |
1104 | } | 1179 | } |
1105 | 1180 | ||
1106 | LLGroupMoneyTabEventHandler::requestData(msg); | 1181 | LLGroupMoneyTabEventHandler::requestData(msg); |
@@ -1138,7 +1213,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg, | |||
1138 | 1213 | ||
1139 | // If this is the first packet, clear the text, don't append. | 1214 | // If this is the first packet, clear the text, don't append. |
1140 | // Start with the date. | 1215 | // Start with the date. |
1141 | if (text == LOADING_STRING) | 1216 | if (text == mImplementationp->mLoadingText) |
1142 | { | 1217 | { |
1143 | text.clear(); | 1218 | text.clear(); |
1144 | 1219 | ||
@@ -1210,8 +1285,8 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg, | |||
1210 | } | 1285 | } |
1211 | 1286 | ||
1212 | //static | 1287 | //static |
1213 | void LLGroupMoneySalesTabEventHandler::processGroupAccountTransactionsReply(LLMessageSystem* msg, | 1288 | void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem* msg, |
1214 | void** data) | 1289 | void** data) |
1215 | { | 1290 | { |
1216 | LLUUID agent_id; | 1291 | LLUUID agent_id; |
1217 | msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); | 1292 | msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); |
@@ -1244,12 +1319,14 @@ void LLGroupMoneySalesTabEventHandler::processGroupAccountTransactionsReply(LLMe | |||
1244 | LLGroupMoneyPlanningTabEventHandler::LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editorp, | 1319 | LLGroupMoneyPlanningTabEventHandler::LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editorp, |
1245 | LLTabContainerCommon* tab_containerp, | 1320 | LLTabContainerCommon* tab_containerp, |
1246 | LLPanel* panelp, | 1321 | LLPanel* panelp, |
1322 | const LLString& loading_text, | ||
1247 | const LLUUID& group_id) | 1323 | const LLUUID& group_id) |
1248 | : LLGroupMoneyTabEventHandler(NULL, | 1324 | : LLGroupMoneyTabEventHandler(NULL, |
1249 | NULL, | 1325 | NULL, |
1250 | text_editorp, | 1326 | text_editorp, |
1251 | tab_containerp, | 1327 | tab_containerp, |
1252 | panelp, | 1328 | panelp, |
1329 | loading_text, | ||
1253 | group_id, | 1330 | group_id, |
1254 | SUMMARY_INTERVAL, | 1331 | SUMMARY_INTERVAL, |
1255 | SUMMARY_MAX) | 1332 | SUMMARY_MAX) |
@@ -1276,7 +1353,7 @@ void LLGroupMoneyPlanningTabEventHandler::requestData(LLMessageSystem* msg) | |||
1276 | 1353 | ||
1277 | if ( mImplementationp->mTextEditorp ) | 1354 | if ( mImplementationp->mTextEditorp ) |
1278 | { | 1355 | { |
1279 | mImplementationp->mTextEditorp->setText(LOADING_STRING); | 1356 | mImplementationp->mTextEditorp->setText(mImplementationp->mLoadingText); |
1280 | } | 1357 | } |
1281 | 1358 | ||
1282 | LLGroupMoneyTabEventHandler::requestData(msg); | 1359 | LLGroupMoneyTabEventHandler::requestData(msg); |
@@ -1379,8 +1456,8 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, | |||
1379 | } | 1456 | } |
1380 | 1457 | ||
1381 | //static | 1458 | //static |
1382 | void LLGroupMoneyPlanningTabEventHandler::processGroupAccountSummaryReply(LLMessageSystem* msg, | 1459 | void LLPanelGroupLandMoney::processGroupAccountSummaryReply(LLMessageSystem* msg, |
1383 | void** data) | 1460 | void** data) |
1384 | { | 1461 | { |
1385 | LLUUID agent_id; | 1462 | LLUUID agent_id; |
1386 | msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); | 1463 | msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); |