A little refactoring.
Removed unused code and xml data which were once used for date in status bar.meow-7.2.2
parent
f0ba3d35b2
commit
73ba940ffe
|
|
@ -107,10 +107,6 @@ const S32 TEXT_HEIGHT = 18;
|
|||
|
||||
static void onClickVolume(void*);
|
||||
|
||||
std::vector<std::string> LLStatusBar::sDays;
|
||||
std::vector<std::string> LLStatusBar::sMonths;
|
||||
const U32 LLStatusBar::MAX_DATE_STRING_LENGTH = 2000;
|
||||
|
||||
LLStatusBar::LLStatusBar(const LLRect& rect)
|
||||
: LLPanel(),
|
||||
mTextTime(NULL),
|
||||
|
|
@ -127,10 +123,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
|
|||
// status bar can possible overlay menus?
|
||||
setMouseOpaque(FALSE);
|
||||
|
||||
// size of day of the weeks and year
|
||||
sDays.reserve(7);
|
||||
sMonths.reserve(12);
|
||||
|
||||
mBalanceTimer = new LLFrameTimer();
|
||||
mHealthTimer = new LLFrameTimer();
|
||||
|
||||
|
|
@ -169,9 +161,6 @@ BOOL LLStatusBar::postBuild()
|
|||
{
|
||||
gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3));
|
||||
|
||||
// build date necessary data (must do after panel built)
|
||||
setupDate();
|
||||
|
||||
mTextTime = getChild<LLTextBox>("TimeText" );
|
||||
|
||||
getChild<LLUICtrl>("buyL")->setCommitCallback(
|
||||
|
|
@ -517,69 +506,6 @@ void LLStatusBar::onClickMediaToggle(void* data)
|
|||
LLViewerMedia::setAllMediaEnabled(enable);
|
||||
}
|
||||
|
||||
// sets the static variables necessary for the date
|
||||
void LLStatusBar::setupDate()
|
||||
{
|
||||
// fill the day array with what's in the xui
|
||||
std::string day_list = getString("StatBarDaysOfWeek");
|
||||
size_t length = day_list.size();
|
||||
|
||||
// quick input check
|
||||
if(length < MAX_DATE_STRING_LENGTH)
|
||||
{
|
||||
// tokenize it and put it in the array
|
||||
std::string cur_word;
|
||||
for(size_t i = 0; i < length; ++i)
|
||||
{
|
||||
if(day_list[i] == ':')
|
||||
{
|
||||
sDays.push_back(cur_word);
|
||||
cur_word.clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
cur_word.append(1, day_list[i]);
|
||||
}
|
||||
}
|
||||
sDays.push_back(cur_word);
|
||||
}
|
||||
|
||||
// fill the day array with what's in the xui
|
||||
std::string month_list = getString( "StatBarMonthsOfYear" );
|
||||
length = month_list.size();
|
||||
|
||||
// quick input check
|
||||
if(length < MAX_DATE_STRING_LENGTH)
|
||||
{
|
||||
// tokenize it and put it in the array
|
||||
std::string cur_word;
|
||||
for(size_t i = 0; i < length; ++i)
|
||||
{
|
||||
if(month_list[i] == ':')
|
||||
{
|
||||
sMonths.push_back(cur_word);
|
||||
cur_word.clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
cur_word.append(1, month_list[i]);
|
||||
}
|
||||
}
|
||||
sMonths.push_back(cur_word);
|
||||
}
|
||||
|
||||
// make sure we have at least 7 days and 12 months
|
||||
if(sDays.size() < 7)
|
||||
{
|
||||
sDays.resize(7);
|
||||
}
|
||||
|
||||
if(sMonths.size() < 12)
|
||||
{
|
||||
sMonths.resize(12);
|
||||
}
|
||||
}
|
||||
|
||||
// static
|
||||
void LLStatusBar::onClickStatGraph(void* data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -85,9 +85,7 @@ public:
|
|||
LLPanelNearByMedia* getNearbyMediaPanel() { return mPanelNearByMedia; }
|
||||
|
||||
private:
|
||||
// simple method to setup the part that holds the date
|
||||
void setupDate();
|
||||
|
||||
|
||||
void onClickBuyCurrency();
|
||||
void onVolumeChanged(const LLSD& newvalue);
|
||||
|
||||
|
|
@ -117,9 +115,6 @@ private:
|
|||
LLFrameTimer* mHealthTimer;
|
||||
LLPanelVolumePulldown* mPanelVolumePulldown;
|
||||
LLPanelNearByMedia* mPanelNearByMedia;
|
||||
static std::vector<std::string> sDays;
|
||||
static std::vector<std::string> sMonths;
|
||||
static const U32 MAX_DATE_STRING_LENGTH;
|
||||
};
|
||||
|
||||
// *HACK: Status bar owns your cached money balance. JC
|
||||
|
|
|
|||
|
|
@ -13,14 +13,6 @@
|
|||
top="19"
|
||||
tab_stop="false"
|
||||
width="1000">
|
||||
<panel.string
|
||||
name="StatBarDaysOfWeek">
|
||||
Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
|
||||
</panel.string>
|
||||
<panel.string
|
||||
name="StatBarMonthsOfYear">
|
||||
January:February:March:April:May:June:July:August:September:October:November:December
|
||||
</panel.string>
|
||||
<panel.string
|
||||
name="packet_loss_tooltip">
|
||||
Packet Loss
|
||||
|
|
|
|||
Loading…
Reference in New Issue