History

Fix up capitalization of other settings dialogs

David Rowe committed 10 years ago

Commit 98eb94e1 parent 2b03e161 file · +22 −24Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+22−24
@@ -36,8 +36,7 @@ void setupPreferences() { · 35 unmodified lines
36 {36 {
37 auto getter = [=]()->QString {return myAvatar->getDisplayName(); };37 auto getter = [=]()->QString {return myAvatar->getDisplayName(); };
38 auto setter = [=](const QString& value) { myAvatar->setDisplayName(value); };38 auto setter = [=](const QString& value) { myAvatar->setDisplayName(value); };
39 const QString label = "Avatar display name <font color=\"#909090\">(optional)</font>";39 auto preference = new EditPreference(AVATAR_BASICS, "Avatar display name (optional)", getter, setter);
40 auto preference = new EditPreference(AVATAR_BASICS, label, getter, setter);
41 preference->setPlaceholderText("Not showing a name");40 preference->setPlaceholderText("Not showing a name");
42 preferences->addPreference(preference);41 preferences->addPreference(preference);
43 }42 }
@@ -45,8 +44,7 @@ void setupPreferences() { · 1 unmodified line
45 {44 {
46 auto getter = [=]()->QString {return myAvatar->getCollisionSoundURL(); };45 auto getter = [=]()->QString {return myAvatar->getCollisionSoundURL(); };
47 auto setter = [=](const QString& value) { myAvatar->setCollisionSoundURL(value); };46 auto setter = [=](const QString& value) { myAvatar->setCollisionSoundURL(value); };
48 const QString label = "Avatar collision sound URL <font color=\"#909090\">(optional)</font>";47 auto preference = new EditPreference(AVATAR_BASICS, "Avatar collision sound URL (optional)", getter, setter);
49 auto preference = new EditPreference(AVATAR_BASICS, label, getter, setter);
50 preference->setPlaceholderText("Enter the URL of a sound to play when you bump into something");48 preference->setPlaceholderText("Enter the URL of a sound to play when you bump into something");
51 preferences->addPreference(preference);49 preferences->addPreference(preference);
52 }50 }
@@ -54,13 +52,13 @@ void setupPreferences() { · 1 unmodified line
54 {52 {
55 auto getter = [=]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); };53 auto getter = [=]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); };
56 auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); };54 auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); };
57 auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance: ", getter, setter);55 auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter);
58 preferences->addPreference(preference);56 preferences->addPreference(preference);
59 }57 }
60 {58 {
61 auto getter = [=]()->bool {return myAvatar->getSnapTurn(); };59 auto getter = [=]()->bool {return myAvatar->getSnapTurn(); };
62 auto setter = [=](bool value) { myAvatar->setSnapTurn(value); };60 auto setter = [=](bool value) { myAvatar->setSnapTurn(value); };
63 preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Snap Turn when in HMD", getter, setter));61 preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Snap turn when in HMD", getter, setter));
64 }62 }
65 {63 {
66 auto getter = []()->QString { return Snapshot::snapshotsLocation.get(); };64 auto getter = []()->QString { return Snapshot::snapshotsLocation.get(); };
@@ -90,7 +88,7 @@ void setupPreferences() { · 23 unmodified lines
90 {88 {
91 auto getter = []()->float { return DependencyManager::get<LODManager>()->getDesktopLODDecreaseFPS(); };89 auto getter = []()->float { return DependencyManager::get<LODManager>()->getDesktopLODDecreaseFPS(); };
92 auto setter = [](float value) { DependencyManager::get<LODManager>()->setDesktopLODDecreaseFPS(value); };90 auto setter = [](float value) { DependencyManager::get<LODManager>()->setDesktopLODDecreaseFPS(value); };
93 auto preference = new SpinnerPreference(LOD_TUNING, "Minimum Desktop FPS", getter, setter);91 auto preference = new SpinnerPreference(LOD_TUNING, "Minimum desktop FPS", getter, setter);
94 preference->setMin(0);92 preference->setMin(0);
95 preference->setMax(120);93 preference->setMax(120);
96 preference->setStep(1);94 preference->setStep(1);
@@ -138,7 +136,7 @@ void setupPreferences() { · 41 unmodified lines
138 {136 {
139 auto getter = [=]()->float { return myAvatar->getUniformScale(); };137 auto getter = [=]()->float { return myAvatar->getUniformScale(); };
140 auto setter = [=](float value) { myAvatar->setTargetScaleVerbose(value); }; // The hell?138 auto setter = [=](float value) { myAvatar->setTargetScaleVerbose(value); }; // The hell?
141 auto preference = new SpinnerPreference(AVATAR_TUNING, "Avatar scale <font color=\"#909090\">(default is 1.0)</font>", getter, setter);139 auto preference = new SpinnerPreference(AVATAR_TUNING, "Avatar scale (default is 1.0)", getter, setter);
142 preference->setMin(0.01f);140 preference->setMin(0.01f);
143 preference->setMax(99.9f);141 preference->setMax(99.9f);
144 preference->setDecimals(2);142 preference->setDecimals(2);
@@ -170,7 +168,7 @@ void setupPreferences() { · 25 unmodified lines
170 {168 {
171 auto getter = [=]()->QString { return myAvatar->getAnimGraphUrl().toString(); };169 auto getter = [=]()->QString { return myAvatar->getAnimGraphUrl().toString(); };
172 auto setter = [=](const QString& value) { myAvatar->setAnimGraphUrl(value); };170 auto setter = [=](const QString& value) { myAvatar->setAnimGraphUrl(value); };
173 auto preference = new EditPreference(AVATAR_TUNING, "Avatar Animation JSON", getter, setter);171 auto preference = new EditPreference(AVATAR_TUNING, "Avatar animation JSON", getter, setter);
174 preference->setPlaceholderText("default");172 preference->setPlaceholderText("default");
175 preferences->addPreference(preference);173 preferences->addPreference(preference);
176 }174 }
@@ -179,7 +177,7 @@ void setupPreferences() { · 2 unmodified lines
179 {177 {
180 auto getter = [=]()->float { return myAvatar->getPitchSpeed(); };178 auto getter = [=]()->float { return myAvatar->getPitchSpeed(); };
181 auto setter = [=](float value) { myAvatar->setPitchSpeed(value); };179 auto setter = [=](float value) { myAvatar->setPitchSpeed(value); };
182 auto preference = new SpinnerPreference(AVATAR_CAMERA, "Camera Pitch Speed (degrees/second)", getter, setter);180 auto preference = new SpinnerPreference(AVATAR_CAMERA, "Camera pitch speed (degrees/second)", getter, setter);
183 preference->setMin(1.0f);181 preference->setMin(1.0f);
184 preference->setMax(360.0f);182 preference->setMax(360.0f);
185 preferences->addPreference(preference);183 preferences->addPreference(preference);
@@ -187,7 +185,7 @@ void setupPreferences() { · 1 unmodified line
187 {185 {
188 auto getter = [=]()->float { return myAvatar->getYawSpeed(); };186 auto getter = [=]()->float { return myAvatar->getYawSpeed(); };
189 auto setter = [=](float value) { myAvatar->setYawSpeed(value); };187 auto setter = [=](float value) { myAvatar->setYawSpeed(value); };
190 auto preference = new SpinnerPreference(AVATAR_CAMERA, "Camera Yaw Speed (degrees/second)", getter, setter);188 auto preference = new SpinnerPreference(AVATAR_CAMERA, "Camera yaw speed (degrees/second)", getter, setter);
191 preference->setMin(1.0f);189 preference->setMin(1.0f);
192 preference->setMax(360.0f);190 preference->setMax(360.0f);
193 preferences->addPreference(preference);191 preferences->addPreference(preference);
@@ -197,13 +195,13 @@ void setupPreferences() { · 3 unmodified lines
197 {195 {
198 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getDynamicJitterBuffers(); };196 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getDynamicJitterBuffers(); };
199 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setDynamicJitterBuffers(value); };197 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setDynamicJitterBuffers(value); };
200 preferences->addPreference(new CheckPreference(AUDIO, "Enable Dynamic Jitter Buffers", getter, setter));198 preferences->addPreference(new CheckPreference(AUDIO, "Enable dynamic jitter buffers", getter, setter));
201 }199 }
202 {200 {
203 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getDesiredJitterBufferFrames(); };201 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getDesiredJitterBufferFrames(); };
204 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setStaticDesiredJitterBufferFrames(value); };202 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setStaticDesiredJitterBufferFrames(value); };
205 203
206 auto preference = new SpinnerPreference(AUDIO, "Static Jitter Buffer Frames", getter, setter);204 auto preference = new SpinnerPreference(AUDIO, "Static jitter buffer frames", getter, setter);
207 preference->setMin(0);205 preference->setMin(0);
208 preference->setMax(10000);206 preference->setMax(10000);
209 preference->setStep(1);207 preference->setStep(1);
@@ -212,7 +210,7 @@ void setupPreferences() { · 2 unmodified lines
212 {210 {
213 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getMaxFramesOverDesired(); };211 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getMaxFramesOverDesired(); };
214 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setMaxFramesOverDesired(value); };212 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setMaxFramesOverDesired(value); };
215 auto preference = new SpinnerPreference(AUDIO, "Max Frames Over Desired", getter, setter);213 auto preference = new SpinnerPreference(AUDIO, "Max frames over desired", getter, setter);
216 preference->setMax(10000);214 preference->setMax(10000);
217 preference->setStep(1);215 preference->setStep(1);
218 preferences->addPreference(preference);216 preferences->addPreference(preference);
@@ -220,12 +218,12 @@ void setupPreferences() { · 1 unmodified line
220 {218 {
221 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getUseStDevForJitterCalc(); };219 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getUseStDevForJitterCalc(); };
222 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setUseStDevForJitterCalc(value); };220 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setUseStDevForJitterCalc(value); };
223 preferences->addPreference(new CheckPreference(AUDIO, "Use Stddev for Dynamic Jitter Calc", getter, setter));221 preferences->addPreference(new CheckPreference(AUDIO, "Use standard deviation for dynamic jitter calc", getter, setter));
224 }222 }
225 {223 {
226 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowStarveThreshold(); };224 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowStarveThreshold(); };
227 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setWindowStarveThreshold(value); };225 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setWindowStarveThreshold(value); };
228 auto preference = new SpinnerPreference(AUDIO, "Window A Starve Threshold", getter, setter);226 auto preference = new SpinnerPreference(AUDIO, "Window A starve threshold", getter, setter);
229 preference->setMax(10000);227 preference->setMax(10000);
230 preference->setStep(1);228 preference->setStep(1);
231 preferences->addPreference(preference);229 preferences->addPreference(preference);
@@ -233,7 +231,7 @@ void setupPreferences() { · 1 unmodified line
233 {231 {
234 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowSecondsForDesiredCalcOnTooManyStarves(); };232 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowSecondsForDesiredCalcOnTooManyStarves(); };
235 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setWindowSecondsForDesiredCalcOnTooManyStarves(value); };233 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setWindowSecondsForDesiredCalcOnTooManyStarves(value); };
236 auto preference = new SpinnerPreference(AUDIO, "Window A (raise desired on N starves) Seconds)", getter, setter);234 auto preference = new SpinnerPreference(AUDIO, "Window A (raise desired on N starves) seconds", getter, setter);
237 preference->setMax(10000);235 preference->setMax(10000);
238 preference->setStep(1);236 preference->setStep(1);
239 preferences->addPreference(preference);237 preferences->addPreference(preference);
@@ -241,7 +239,7 @@ void setupPreferences() { · 1 unmodified line
241 {239 {
242 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowSecondsForDesiredReduction(); };240 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowSecondsForDesiredReduction(); };
243 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setWindowSecondsForDesiredReduction(value); };241 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setWindowSecondsForDesiredReduction(value); };
244 auto preference = new SpinnerPreference(AUDIO, "Window B (desired ceiling) Seconds", getter, setter);242 auto preference = new SpinnerPreference(AUDIO, "Window B (desired ceiling) seconds", getter, setter);
245 preference->setMax(10000);243 preference->setMax(10000);
246 preference->setStep(1);244 preference->setStep(1);
247 preferences->addPreference(preference);245 preferences->addPreference(preference);
@@ -249,12 +247,12 @@ void setupPreferences() { · 1 unmodified line
249 {247 {
250 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getRepetitionWithFade(); };248 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getRepetitionWithFade(); };
251 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setRepetitionWithFade(value); };249 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setRepetitionWithFade(value); };
252 preferences->addPreference(new CheckPreference(AUDIO, "Repetition with Fade", getter, setter));250 preferences->addPreference(new CheckPreference(AUDIO, "Repetition with fade", getter, setter));
253 }251 }
254 {252 {
255 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputBufferSize(); };253 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputBufferSize(); };
256 auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputBufferSize(value); };254 auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputBufferSize(value); };
257 auto preference = new SpinnerPreference(AUDIO, "Output Buffer Initial Size (frames)", getter, setter);255 auto preference = new SpinnerPreference(AUDIO, "Output buffer initial size (frames)", getter, setter);
258 preference->setMin(1);256 preference->setMin(1);
259 preference->setMax(20);257 preference->setMax(20);
260 preference->setStep(1);258 preference->setStep(1);
@@ -263,13 +261,13 @@ void setupPreferences() { · 2 unmodified lines
263 {261 {
264 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getOutputStarveDetectionEnabled(); };262 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getOutputStarveDetectionEnabled(); };
265 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionEnabled(value); };263 auto setter = [](bool value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionEnabled(value); };
266 auto preference = new CheckPreference(AUDIO, "Output Starve Detection (Automatic Buffer Size Increase)", getter, setter);264 auto preference = new CheckPreference(AUDIO, "Output starve detection (automatic buffer size increase)", getter, setter);
267 preferences->addPreference(preference);265 preferences->addPreference(preference);
268 }266 }
269 {267 {
270 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputStarveDetectionThreshold(); };268 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputStarveDetectionThreshold(); };
271 auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionThreshold(value); };269 auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionThreshold(value); };
272 auto preference = new SpinnerPreference(AUDIO, "Output Starve Detection Threshold", getter, setter);270 auto preference = new SpinnerPreference(AUDIO, "Output starve detection threshold", getter, setter);
273 preference->setMin(1);271 preference->setMin(1);
274 preference->setMax(500);272 preference->setMax(500);
275 preference->setStep(1);273 preference->setStep(1);
@@ -278,7 +276,7 @@ void setupPreferences() { · 2 unmodified lines
278 {276 {
279 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputStarveDetectionPeriod(); };277 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputStarveDetectionPeriod(); };
280 auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionPeriod(value); };278 auto setter = [](float value) { DependencyManager::get<AudioClient>()->setOutputStarveDetectionPeriod(value); };
281 auto preference = new SpinnerPreference(AUDIO, "Output Starve Detection Period (ms)", getter, setter);279 auto preference = new SpinnerPreference(AUDIO, "Output starve detection period (ms)", getter, setter);
282 preference->setMin(1);280 preference->setMin(1);
283 preference->setMax((float)999999999);281 preference->setMax((float)999999999);
284 preference->setStep(1);282 preference->setStep(1);
@@ -325,7 +323,7 @@ void setupPreferences() { · 40 unmodified lines
325 {323 {
326 auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); };324 auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); };
327 auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); };325 auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); };
328 auto preference = new ComboBoxPreference(RENDER, "Ambient Occlusion", getter, setter);326 auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter);
329 preference->setItems(ambientOcclusionConfig->getPresetList());327 preference->setItems(ambientOcclusionConfig->getPresetList());
330 preferences->addPreference(preference);328 preferences->addPreference(preference);
331 }329 }