games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

windows: Replace CToggleGroup volume widget with CVolumeSlider

Browse Source
This commit is contained in:
Sandy Carter 2015-08-21 23:05:08 -04:00
parent 6a3c2d3071
commit bf353a4f5b
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/windows/GUIClasses.cpp
View File

@ -575,18 +575,10 @@ CSystemOptionsWindow::CSystemOptionsWindow():
mapScrollSpeed->setSelected(settings["adventure"]["scrollSpeed"].Float());
mapScrollSpeed->addCallback(std::bind(&setIntSetting, "adventure", "scrollSpeed", _1));
musicVolume = new CToggleGroup(0, true);
for(int i=0; i<10; ++i)
musicVolume->addToggle(i*11, new CToggleButton(Point(29 + 19*i, 359), "syslb.def", CGI->generaltexth->zelp[326+i]));
musicVolume->setSelected(CCS->musich->getVolume());
musicVolume = new CVolumeSlider(Point(29, 359), "syslb.def", CCS->musich->getVolume(), &CGI->generaltexth->zelp[326]);
musicVolume->addCallback(std::bind(&setIntSetting, "general", "music", _1));
effectsVolume = new CToggleGroup(0, true);
for(int i=0; i<10; ++i)
effectsVolume->addToggle(i*11, new CToggleButton(Point(29 + 19*i, 425), "syslb.def", CGI->generaltexth->zelp[336+i]));
effectsVolume->setSelected(CCS->soundh->getVolume());
effectsVolume = new CVolumeSlider(Point(29, 425), "syslb.def", CCS->soundh->getVolume(), &CGI->generaltexth->zelp[336]);
effectsVolume->addCallback(std::bind(&setIntSetting, "general", "sound", _1));
showReminder = new CToggleButton(Point(246, 87), "sysopchk.def", CGI->generaltexth->zelp[361],

3
client/windows/GUIClasses.h
View File

@ -31,6 +31,7 @@ class CListBox;
class CLabelGroup;
class CToggleButton;
class CToggleGroup;
class CVolumeSlider;
class CGStatusBar;
/// Recruitment window where you can recruit creatures
@ -192,7 +193,7 @@ private:
CToggleGroup * heroMoveSpeed;
CToggleGroup * enemyMoveSpeed;
CToggleGroup * mapScrollSpeed;
CToggleGroup * musicVolume, * effectsVolume;
CVolumeSlider * musicVolume, * effectsVolume;
//CHighlightableButton * showPath;
CToggleButton * showReminder;