Fixed line endings in files added in CHUI-151.
Seth ProductEngine
parent
e9c436e00e
commit
f9ccd6bc9d
|
|
@ -1,127 +1,127 @@
|
|||
/**
|
||||
* @file llfloaterconversationlog.cpp
|
||||
* @brief Functionality of the "conversation log" floater
|
||||
*
|
||||
* $LicenseInfo:firstyear=2012&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2012, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
#include "llviewerprecompiledheaders.h"
|
||||
|
||||
#include "llconversationloglist.h"
|
||||
#include "llfiltereditor.h"
|
||||
#include "llfloaterconversationlog.h"
|
||||
#include "llmenubutton.h"
|
||||
|
||||
LLFloaterConversationLog::LLFloaterConversationLog(const LLSD& key)
|
||||
: LLFloater(key),
|
||||
mConversationLogList(NULL)
|
||||
{
|
||||
mCommitCallbackRegistrar.add("CallLog.Action", boost::bind(&LLFloaterConversationLog::onCustomAction, this, _2));
|
||||
mEnableCallbackRegistrar.add("CallLog.Check", boost::bind(&LLFloaterConversationLog::isActionChecked, this, _2));
|
||||
}
|
||||
|
||||
BOOL LLFloaterConversationLog::postBuild()
|
||||
{
|
||||
mConversationLogList = getChild<LLConversationLogList>("conversation_log_list");
|
||||
|
||||
switch (gSavedSettings.getU32("CallLogSortOrder"))
|
||||
{
|
||||
case E_SORT_BY_NAME:
|
||||
mConversationLogList->sortByName();
|
||||
break;
|
||||
|
||||
case E_SORT_BY_DATE:
|
||||
mConversationLogList->sortByDate();
|
||||
break;
|
||||
}
|
||||
|
||||
// Use the context menu of the Conversation list for the Conversation tab gear menu.
|
||||
LLToggleableMenu* conversations_gear_menu = mConversationLogList->getContextMenu();
|
||||
if (conversations_gear_menu)
|
||||
{
|
||||
getChild<LLMenuButton>("conversations_gear_btn")->setMenu(conversations_gear_menu, LLMenuButton::MP_BOTTOM_LEFT);
|
||||
}
|
||||
|
||||
getChild<LLFilterEditor>("people_filter_input")->setCommitCallback(boost::bind(&LLFloaterConversationLog::onFilterEdit, this, _2));
|
||||
|
||||
return LLFloater::postBuild();
|
||||
}
|
||||
|
||||
void LLFloaterConversationLog::draw()
|
||||
{
|
||||
LLFloater::draw();
|
||||
}
|
||||
|
||||
void LLFloaterConversationLog::onFilterEdit(const std::string& search_string)
|
||||
{
|
||||
std::string filter = search_string;
|
||||
LLStringUtil::trimHead(filter);
|
||||
|
||||
mConversationLogList->setNameFilter(filter);
|
||||
}
|
||||
|
||||
|
||||
void LLFloaterConversationLog::onCustomAction (const LLSD& userdata)
|
||||
{
|
||||
const std::string command_name = userdata.asString();
|
||||
|
||||
if ("sort_by_name" == command_name)
|
||||
{
|
||||
mConversationLogList->sortByName();
|
||||
gSavedSettings.setU32("CallLogSortOrder", E_SORT_BY_NAME);
|
||||
}
|
||||
else if ("sort_by_date" == command_name)
|
||||
{
|
||||
mConversationLogList->sortByDate();
|
||||
gSavedSettings.setU32("CallLogSortOrder", E_SORT_BY_DATE);
|
||||
}
|
||||
else if ("sort_friends_on_top" == command_name)
|
||||
{
|
||||
mConversationLogList->toggleSortFriendsOnTop();
|
||||
}
|
||||
}
|
||||
|
||||
bool LLFloaterConversationLog::isActionEnabled(const LLSD& userdata)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool LLFloaterConversationLog::isActionChecked(const LLSD& userdata)
|
||||
{
|
||||
const std::string command_name = userdata.asString();
|
||||
|
||||
U32 sort_order = gSavedSettings.getU32("CallLogSortOrder");
|
||||
|
||||
if ("sort_by_name" == command_name)
|
||||
{
|
||||
return sort_order == E_SORT_BY_NAME;
|
||||
}
|
||||
else if ("sort_by_date" == command_name)
|
||||
{
|
||||
return sort_order == E_SORT_BY_DATE;
|
||||
}
|
||||
else if ("sort_friends_on_top" == command_name)
|
||||
{
|
||||
return gSavedSettings.getBOOL("SortFriendsFirst");
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
/**
|
||||
* @file llfloaterconversationlog.cpp
|
||||
* @brief Functionality of the "conversation log" floater
|
||||
*
|
||||
* $LicenseInfo:firstyear=2012&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2012, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
#include "llviewerprecompiledheaders.h"
|
||||
|
||||
#include "llconversationloglist.h"
|
||||
#include "llfiltereditor.h"
|
||||
#include "llfloaterconversationlog.h"
|
||||
#include "llmenubutton.h"
|
||||
|
||||
LLFloaterConversationLog::LLFloaterConversationLog(const LLSD& key)
|
||||
: LLFloater(key),
|
||||
mConversationLogList(NULL)
|
||||
{
|
||||
mCommitCallbackRegistrar.add("CallLog.Action", boost::bind(&LLFloaterConversationLog::onCustomAction, this, _2));
|
||||
mEnableCallbackRegistrar.add("CallLog.Check", boost::bind(&LLFloaterConversationLog::isActionChecked, this, _2));
|
||||
}
|
||||
|
||||
BOOL LLFloaterConversationLog::postBuild()
|
||||
{
|
||||
mConversationLogList = getChild<LLConversationLogList>("conversation_log_list");
|
||||
|
||||
switch (gSavedSettings.getU32("CallLogSortOrder"))
|
||||
{
|
||||
case E_SORT_BY_NAME:
|
||||
mConversationLogList->sortByName();
|
||||
break;
|
||||
|
||||
case E_SORT_BY_DATE:
|
||||
mConversationLogList->sortByDate();
|
||||
break;
|
||||
}
|
||||
|
||||
// Use the context menu of the Conversation list for the Conversation tab gear menu.
|
||||
LLToggleableMenu* conversations_gear_menu = mConversationLogList->getContextMenu();
|
||||
if (conversations_gear_menu)
|
||||
{
|
||||
getChild<LLMenuButton>("conversations_gear_btn")->setMenu(conversations_gear_menu, LLMenuButton::MP_BOTTOM_LEFT);
|
||||
}
|
||||
|
||||
getChild<LLFilterEditor>("people_filter_input")->setCommitCallback(boost::bind(&LLFloaterConversationLog::onFilterEdit, this, _2));
|
||||
|
||||
return LLFloater::postBuild();
|
||||
}
|
||||
|
||||
void LLFloaterConversationLog::draw()
|
||||
{
|
||||
LLFloater::draw();
|
||||
}
|
||||
|
||||
void LLFloaterConversationLog::onFilterEdit(const std::string& search_string)
|
||||
{
|
||||
std::string filter = search_string;
|
||||
LLStringUtil::trimHead(filter);
|
||||
|
||||
mConversationLogList->setNameFilter(filter);
|
||||
}
|
||||
|
||||
|
||||
void LLFloaterConversationLog::onCustomAction (const LLSD& userdata)
|
||||
{
|
||||
const std::string command_name = userdata.asString();
|
||||
|
||||
if ("sort_by_name" == command_name)
|
||||
{
|
||||
mConversationLogList->sortByName();
|
||||
gSavedSettings.setU32("CallLogSortOrder", E_SORT_BY_NAME);
|
||||
}
|
||||
else if ("sort_by_date" == command_name)
|
||||
{
|
||||
mConversationLogList->sortByDate();
|
||||
gSavedSettings.setU32("CallLogSortOrder", E_SORT_BY_DATE);
|
||||
}
|
||||
else if ("sort_friends_on_top" == command_name)
|
||||
{
|
||||
mConversationLogList->toggleSortFriendsOnTop();
|
||||
}
|
||||
}
|
||||
|
||||
bool LLFloaterConversationLog::isActionEnabled(const LLSD& userdata)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool LLFloaterConversationLog::isActionChecked(const LLSD& userdata)
|
||||
{
|
||||
const std::string command_name = userdata.asString();
|
||||
|
||||
U32 sort_order = gSavedSettings.getU32("CallLogSortOrder");
|
||||
|
||||
if ("sort_by_name" == command_name)
|
||||
{
|
||||
return sort_order == E_SORT_BY_NAME;
|
||||
}
|
||||
else if ("sort_by_date" == command_name)
|
||||
{
|
||||
return sort_order == E_SORT_BY_DATE;
|
||||
}
|
||||
else if ("sort_friends_on_top" == command_name)
|
||||
{
|
||||
return gSavedSettings.getBOOL("SortFriendsFirst");
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,61 +1,61 @@
|
|||
/**
|
||||
* @file llfloaterconversationlog.h
|
||||
*
|
||||
* $LicenseInfo:firstyear=2012&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2012, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_LLFLOATERCONVERSATIONLOG_H_
|
||||
#define LL_LLFLOATERCONVERSATIONLOG_H_
|
||||
|
||||
#include "llfloater.h"
|
||||
|
||||
class LLConversationLogList;
|
||||
|
||||
class LLFloaterConversationLog : public LLFloater
|
||||
{
|
||||
public:
|
||||
|
||||
typedef enum e_sort_oder{
|
||||
E_SORT_BY_NAME = 0,
|
||||
E_SORT_BY_DATE = 1,
|
||||
} ESortOrder;
|
||||
|
||||
LLFloaterConversationLog(const LLSD& key);
|
||||
virtual ~LLFloaterConversationLog(){};
|
||||
|
||||
virtual BOOL postBuild();
|
||||
|
||||
virtual void draw();
|
||||
|
||||
void onFilterEdit(const std::string& search_string);
|
||||
|
||||
private:
|
||||
|
||||
void onCustomAction (const LLSD& userdata);
|
||||
bool isActionEnabled(const LLSD& userdata);
|
||||
bool isActionChecked(const LLSD& userdata);
|
||||
|
||||
LLConversationLogList* mConversationLogList;
|
||||
};
|
||||
|
||||
|
||||
#endif /* LLFLOATERCONVERSATIONLOG_H_ */
|
||||
/**
|
||||
* @file llfloaterconversationlog.h
|
||||
*
|
||||
* $LicenseInfo:firstyear=2012&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2012, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_LLFLOATERCONVERSATIONLOG_H_
|
||||
#define LL_LLFLOATERCONVERSATIONLOG_H_
|
||||
|
||||
#include "llfloater.h"
|
||||
|
||||
class LLConversationLogList;
|
||||
|
||||
class LLFloaterConversationLog : public LLFloater
|
||||
{
|
||||
public:
|
||||
|
||||
typedef enum e_sort_oder{
|
||||
E_SORT_BY_NAME = 0,
|
||||
E_SORT_BY_DATE = 1,
|
||||
} ESortOrder;
|
||||
|
||||
LLFloaterConversationLog(const LLSD& key);
|
||||
virtual ~LLFloaterConversationLog(){};
|
||||
|
||||
virtual BOOL postBuild();
|
||||
|
||||
virtual void draw();
|
||||
|
||||
void onFilterEdit(const std::string& search_string);
|
||||
|
||||
private:
|
||||
|
||||
void onCustomAction (const LLSD& userdata);
|
||||
bool isActionEnabled(const LLSD& userdata);
|
||||
bool isActionChecked(const LLSD& userdata);
|
||||
|
||||
LLConversationLogList* mConversationLogList;
|
||||
};
|
||||
|
||||
|
||||
#endif /* LLFLOATERCONVERSATIONLOG_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue