History

move avatar size changes to Avatar slots

Stephen Birarda committed 13 years ago

Commit 811fc871 parent 92b64595 files · +39 −32Browse files

Showing the changes to interface/src/Menu.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Menu.cpp+15−7
@@ -151,13 +151,21 @@ Menu::Menu() : · 150 unmodified lines
151 addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::ParticleSystem);151 addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::ParticleSystem);
152 addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::FirstPerson, Qt::Key_P, true);152 addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::FirstPerson, Qt::Key_P, true);
153 153
154 addActionToQMenuAndActionHash(renderMenu, MenuOption::IncreaseAvatarSize);154 addActionToQMenuAndActionHash(renderMenu,
155 addActionToQMenuAndActionHash(renderMenu, MenuOption::DecreaseAvatarSize);155 MenuOption::IncreaseAvatarSize,
156 addActionToQMenuAndActionHash(renderMenu, MenuOption::ResetAvatarSize);156 Qt::Key_Plus,
157 157 appInstance->getAvatar(),
158 // renderMenu->addAction("Increase Avatar Size", this, SLOT(increaseAvatarSize()), Qt::Key_Plus);158 SLOT(increaseSize()));
159 // renderMenu->addAction("Decrease Avatar Size", this, SLOT(decreaseAvatarSize()), Qt::Key_Minus);159 addActionToQMenuAndActionHash(renderMenu,
160 // renderMenu->addAction("Reset Avatar Size", this, SLOT(resetAvatarSize()));160 MenuOption::DecreaseAvatarSize,
161 Qt::Key_Minus,
162 appInstance->getAvatar(),
163 SLOT(decreaseSize()));
164 addActionToQMenuAndActionHash(renderMenu,
165 MenuOption::ResetAvatarSize,
166 0,
167 appInstance->getAvatar(),
168 SLOT(resetSize()));
161 169
162 QMenu* toolsMenu = addMenu("Tools");170 QMenu* toolsMenu = addMenu("Tools");
163 addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::Stats, Qt::Key_Slash);171 addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::Stats, Qt::Key_Slash);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t