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

A few more changes to the money tracker: 

* Fix first entry being shown properly if FSAlwaysTrackPayments is TRUE and floater is closed
* Show proper sort order indicator
* Always show seconds for timestamp
Ansariel 2015-03-03 20:45:41 +01:00
parent 791fb13a5d
commit eac1e33ed7
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/fsmoneytracker.cpp
View File

@ -45,6 +45,7 @@ BOOL FSMoneyTracker::postBuild()
{
mTransactionHistory = getChild<LLNameListCtrl>("payment_list");
mTransactionHistory->setContextMenu(&gFSMoneyTrackerListMenu);
mTransactionHistory->sortByColumn("time", TRUE);
clear();
// Button Actions
@ -87,12 +88,7 @@ void FSMoneyTracker::addPayment(const LLUUID other_id, bool is_group, S32 amount
std::string FSMoneyTracker::getTime()
{
time_t utc_time = time_corrected();
std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:[" + LLTrans::getString("TimeMin") + "]";
if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
{
timeStr += ":[" + LLTrans::getString("TimeSec") + "]";
}
std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:[" + LLTrans::getString("TimeMin") + "]:[" + LLTrans::getString("TimeSec") + "]";
LLSD substitution;
substitution["datetime"] = (S32)utc_time;

2
indra/newview/skins/default/xui/de/floater_fs_money_tracker.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="money_tracker" title="Money-Tracker">
<name_list name="payment_list">
<name_list.columns name="time" label="Uhrzeit"/>
<name_list.columns name="time" label="Zeit"/>
<name_list.columns name="name" label="Name"/>
<name_list.columns name="amount" label="Betrag"/>
</name_list>

2
indra/newview/skins/default/xui/en/floater_fs_money_tracker.xml
View File

@ -25,7 +25,7 @@
name="payment_list"
draw_stripes="true"
multi_select="true"
name_column="name"
name_column_index="1"
right="-1">
<name_list.columns
name="time"