Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move menu stuff out of lltoolmgr and into llviewermenu.cpp

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-20 02:00:25 -05:00
parent 9bd9cb697e
commit a75964c993
3 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/lltoolmgr.cpp
View File

@@ -55,8 +55,6 @@
#include "llagent.h" #include "llagent.h"
#include "llagentcamera.h" #include "llagentcamera.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llmemberlistener.h"
#include "llevent.h"
#include "llviewerjoystick.h" #include "llviewerjoystick.h"
#include "llviewermenu.h" #include "llviewermenu.h"
#include "llviewerparcelmgr.h" #include "llviewerparcelmgr.h"
@@ -77,24 +75,6 @@ LLToolset* gFaceEditToolset = NULL;
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
// LLToolMgr // LLToolMgr
class LLViewBuildMode : public LLMemberListener<LLView>
{
bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata)
{
LLToolMgr::getInstance()->toggleBuildMode();
return true;
}
};
class LLViewCheckBuildMode : public LLMemberListener<LLView>
{
bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata)
{
bool new_value = LLToolMgr::getInstance()->inEdit();
gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
return true;
}
};
LLToolMgr::LLToolMgr() LLToolMgr::LLToolMgr()
: :
mBaseTool(NULL), mBaseTool(NULL),
@@ -114,14 +94,6 @@ LLToolMgr::LLToolMgr()
gFaceEditToolset = new LLToolset("FaceEdit"); gFaceEditToolset = new LLToolset("FaceEdit");
} }
void LLToolMgr::initMenu(std::vector<LLPointer<LLMemberListener<LLView> > >& menu_list)
{
menu_list.push_back(new LLViewBuildMode());
menu_list.back()->registerListener(gMenuHolder, "View.BuildMode");
menu_list.push_back(new LLViewCheckBuildMode());
menu_list.back()->registerListener(gMenuHolder, "View.CheckBuildMode");
}
void LLToolMgr::initTools() void LLToolMgr::initTools()
{ {
static BOOL initialized = FALSE; static BOOL initialized = FALSE;

5
indra/newview/lltoolmgr.h
View File

@@ -35,11 +35,8 @@
#include "llkeyboard.h" #include "llkeyboard.h"
#include "llmemberlistener.h"
class LLTool; class LLTool;
class LLToolset; class LLToolset;
class LLView;
// Key bindings for common operations // Key bindings for common operations
const MASK MASK_VERTICAL = MASK_CONTROL; const MASK MASK_VERTICAL = MASK_CONTROL;
@@ -55,8 +52,6 @@ public:
LLToolMgr(); LLToolMgr();
~LLToolMgr(); ~LLToolMgr();
void initMenu(std::vector<LLPointer<LLMemberListener<LLView> > >& menu_list);
// Must be called after gSavedSettings set up. // Must be called after gSavedSettings set up.
void initTools(); void initTools();

19
indra/newview/llviewermenu.cpp
View File

@@ -9574,7 +9574,24 @@ void initialize_menus()
add_radar_listeners(); add_radar_listeners();
LLToolMgr::getInstance()->initMenu(sMenus); class LLViewBuildMode : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLToolMgr::getInstance()->toggleBuildMode();
return true;
}
};
class LLViewCheckBuildMode : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
gMenuHolder->findControl(userdata["control"].asString())->setValue(LLToolMgr::getInstance()->inEdit());
return true;
}
};
addMenu(new LLViewBuildMode(), "View.BuildMode");
addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
} }
void region_change() void region_change()