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

Hippo Grid Manager

Browse Source
This commit is contained in:
Siana Gearz
2011-01-29 16:17:31 +01:00
parent bb708b71ff
commit d962b05a9e
28 changed files with 1506 additions and 1737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llfloaterpreference.cpp
View File

@@ -62,6 +62,7 @@
#include "llpanelmsgs.h"
#include "llpanelweb.h"
#include "llpanelskins.h"
#include "hippopanelgrids.h"
#include "llprefschat.h"
#include "llprefsvoice.h"
#include "llprefsim.h"
@@ -78,6 +79,7 @@
#include "llkeyboard.h"
#include "llscrollcontainer.h"
#include "llfloaterhardwaresettings.h"
#include "hippopanelgrids.h"
const S32 PREF_BORDER = 4;
const S32 PREF_PAD = 5;
@@ -134,6 +136,7 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
mAudioPanel(NULL),
mMsgPanel(NULL),
mSkinsPanel(NULL),
mGridsPanel(NULL),
mLCDPanel(NULL),
mPrefsAscentSys(NULL),
mPrefsAscentVan(NULL)
@@ -196,6 +199,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mSkinsPanel->setDefaultBtn(default_btn);
mGridsPanel = HippoPanelGrids::create();
mTabContainer->addTabPanel(mGridsPanel, mGridsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mGridsPanel->setDefaultBtn(default_btn);
mPrefsAscentSys = new LLPrefsAscentSys();
mTabContainer->addTabPanel(mPrefsAscentSys->getPanel(), mPrefsAscentSys->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
mPrefsAscentSys->getPanel()->setDefaultBtn(default_btn);
@@ -263,6 +270,11 @@ LLPreferenceCore::~LLPreferenceCore()
delete mSkinsPanel;
mSkinsPanel = NULL;
}
if (mGridsPanel)
{
delete mGridsPanel;
mGridsPanel = NULL;
}
if (mPrefsAscentSys)
{
delete mPrefsAscentSys;
@@ -288,6 +300,7 @@ void LLPreferenceCore::apply()
mPrefsIM->apply();
mMsgPanel->apply();
mSkinsPanel->apply();
mGridsPanel->apply();
mPrefsAscentSys->apply();
mPrefsAscentVan->apply();
@@ -318,6 +331,7 @@ void LLPreferenceCore::cancel()
mPrefsIM->cancel();
mMsgPanel->cancel();
mSkinsPanel->cancel();
mGridsPanel->cancel();
mPrefsAscentSys->cancel();
mPrefsAscentVan->cancel();
@@ -539,3 +553,9 @@ void LLFloaterPreference::refreshEnabledGraphics()
{
sInstance->mPreferenceCore->refreshEnabledGraphics();
}
//static
void LLFloaterPreference::switchTab(S32 i)
{
sInstance->mPreferenceCore->getTabContainer()->selectTab(i);
}