Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor|UI|Client: Added CVarChoiceWidget, used it in Audio Settings
A more convenient way to modify cvars with a limited number of valid values.
- Loading branch information
Showing
5 changed files
with
108 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /** @file cvarchoicewidget.h Console variable choice. | ||
| * | ||
| * @authors Copyright (c) 2013 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| * | ||
| * @par License | ||
| * GPL: http://www.gnu.org/licenses/gpl.html | ||
| * | ||
| * <small>This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by the | ||
| * Free Software Foundation; either version 2 of the License, or (at your | ||
| * option) any later version. This program 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 General | ||
| * Public License for more details. You should have received a copy of the GNU | ||
| * General Public License along with this program; if not, see: | ||
| * http://www.gnu.org/licenses</small> | ||
| */ | ||
|
|
||
| #ifndef DENG_CLIENT_CVARCHOICEWIDGET_H | ||
| #define DENG_CLIENT_CVARCHOICEWIDGET_H | ||
|
|
||
| #include "choicewidget.h" | ||
|
|
||
| /** | ||
| * Console variable choice for integer-type cvars with a limited number of | ||
| * valid settings. The choice items' user data is used as the cvar value. | ||
| */ | ||
| class CVarChoiceWidget : public ChoiceWidget | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| CVarChoiceWidget(char const *cvarPath); | ||
|
|
||
| public slots: | ||
| void updateFromCVar(); | ||
|
|
||
| protected slots: | ||
| void setCVarValueFromWidget(); | ||
|
|
||
| private: | ||
| DENG2_PRIVATE(d) | ||
| }; | ||
|
|
||
| #endif // DENG_CLIENT_CVARCHOICEWIDGET_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /** @file cvarchoicewidget.cpp Console variable choice. | ||
| * | ||
| * @authors Copyright (c) 2013 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| * | ||
| * @par License | ||
| * GPL: http://www.gnu.org/licenses/gpl.html | ||
| * | ||
| * <small>This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by the | ||
| * Free Software Foundation; either version 2 of the License, or (at your | ||
| * option) any later version. This program 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 General | ||
| * Public License for more details. You should have received a copy of the GNU | ||
| * General Public License along with this program; if not, see: | ||
| * http://www.gnu.org/licenses</small> | ||
| */ | ||
|
|
||
| #include "ui/widgets/cvarchoicewidget.h" | ||
| #include "con_main.h" | ||
|
|
||
| using namespace de; | ||
| using namespace ui; | ||
|
|
||
| DENG2_PIMPL_NOREF(CVarChoiceWidget) | ||
| { | ||
| char const *cvar; | ||
|
|
||
| cvar_t *var() const | ||
| { | ||
| cvar_t *cv = Con_FindVariable(cvar); | ||
| DENG2_ASSERT(cv != 0); | ||
| return cv; | ||
| } | ||
| }; | ||
|
|
||
| CVarChoiceWidget::CVarChoiceWidget(char const *cvarPath) : d(new Instance) | ||
| { | ||
| d->cvar = cvarPath; | ||
| updateFromCVar(); | ||
|
|
||
| connect(this, SIGNAL(selectionChangedByUser(uint)), | ||
| this, SLOT(setCVarValueFromWidget())); | ||
| } | ||
|
|
||
| void CVarChoiceWidget::updateFromCVar() | ||
| { | ||
| setSelected(items().findData(CVar_Integer(d->var()))); | ||
| } | ||
|
|
||
| void CVarChoiceWidget::setCVarValueFromWidget() | ||
| { | ||
| CVar_SetInteger(d->var(), selectedItem().data().toInt()); | ||
| } |