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
3636 {
3737 auto getter = [=]()->QString {return myAvatar->getDisplayName(); };
3838 auto setter = [=](const QString& value) { myAvatar->setDisplayName(value); };
39− const QString label = "Avatar display name <font color=\"#909090\">(optional)</font>";
40− auto preference = new EditPreference(AVATAR_BASICS, label, getter, setter);
39+ auto preference = new EditPreference(AVATAR_BASICS, "Avatar display name (optional)", getter, setter);
4140 preference->setPlaceholderText("Not showing a name");
4241 preferences->addPreference(preference);
4342 }
@@ -45,8 +44,7 @@ void setupPreferences() { · 1 unmodified line
4544 {
4645 auto getter = [=]()->QString {return myAvatar->getCollisionSoundURL(); };
4746 auto setter = [=](const QString& value) { myAvatar->setCollisionSoundURL(value); };
48− const QString label = "Avatar collision sound URL <font color=\"#909090\">(optional)</font>";
49− auto preference = new EditPreference(AVATAR_BASICS, label, getter, setter);
47+ auto preference = new EditPreference(AVATAR_BASICS, "Avatar collision sound URL (optional)", getter, setter);
5048 preference->setPlaceholderText("Enter the URL of a sound to play when you bump into something");
5149 preferences->addPreference(preference);
5250 }
@@ -54,13 +52,13 @@ void setupPreferences() { · 1 unmodified line
5452 {
5553 auto getter = [=]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); };
5654 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);
5856 preferences->addPreference(preference);
5957 }
6058 {
6159 auto getter = [=]()->bool {return myAvatar->getSnapTurn(); };
6260 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));
6462 }
6563 {
6664 auto getter = []()->QString { return Snapshot::snapshotsLocation.get(); };
@@ -90,7 +88,7 @@ void setupPreferences() { · 23 unmodified lines
9088 {
9189 auto getter = []()->float { return DependencyManager::get<LODManager>()->getDesktopLODDecreaseFPS(); };
9290 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);
9492 preference->setMin(0);
9593 preference->setMax(120);
9694 preference->setStep(1);
@@ -138,7 +136,7 @@ void setupPreferences() { · 41 unmodified lines
138136 {
139137 auto getter = [=]()->float { return myAvatar->getUniformScale(); };
140138 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);
142140 preference->setMin(0.01f);
143141 preference->setMax(99.9f);
144142 preference->setDecimals(2);
@@ -170,7 +168,7 @@ void setupPreferences() { · 25 unmodified lines
170168 {
171169 auto getter = [=]()->QString { return myAvatar->getAnimGraphUrl().toString(); };
172170 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);
174172 preference->setPlaceholderText("default");
175173 preferences->addPreference(preference);
176174 }
@@ -179,7 +177,7 @@ void setupPreferences() { · 2 unmodified lines
179177 {
180178 auto getter = [=]()->float { return myAvatar->getPitchSpeed(); };
181179 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);
183181 preference->setMin(1.0f);
184182 preference->setMax(360.0f);
185183 preferences->addPreference(preference);
@@ -187,7 +185,7 @@ void setupPreferences() { · 1 unmodified line
187185 {
188186 auto getter = [=]()->float { return myAvatar->getYawSpeed(); };
189187 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);
191189 preference->setMin(1.0f);
192190 preference->setMax(360.0f);
193191 preferences->addPreference(preference);
@@ -197,13 +195,13 @@ void setupPreferences() { · 3 unmodified lines
197195 {
198196 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getDynamicJitterBuffers(); };
199197 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));
201199 }
202200 {
203201 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getDesiredJitterBufferFrames(); };
204202 auto setter = [](float value) { DependencyManager::get<AudioClient>()->getReceivedAudioStream().setStaticDesiredJitterBufferFrames(value); };
205203
206− auto preference = new SpinnerPreference(AUDIO, "Static Jitter Buffer Frames", getter, setter);
204+ auto preference = new SpinnerPreference(AUDIO, "Static jitter buffer frames", getter, setter);
207205 preference->setMin(0);
208206 preference->setMax(10000);
209207 preference->setStep(1);
@@ -212,7 +210,7 @@ void setupPreferences() { · 2 unmodified lines
212210 {
213211 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getMaxFramesOverDesired(); };
214212 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);
216214 preference->setMax(10000);
217215 preference->setStep(1);
218216 preferences->addPreference(preference);
@@ -220,12 +218,12 @@ void setupPreferences() { · 1 unmodified line
220218 {
221219 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getUseStDevForJitterCalc(); };
222220 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));
224222 }
225223 {
226224 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowStarveThreshold(); };
227225 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);
229227 preference->setMax(10000);
230228 preference->setStep(1);
231229 preferences->addPreference(preference);
@@ -233,7 +231,7 @@ void setupPreferences() { · 1 unmodified line
233231 {
234232 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowSecondsForDesiredCalcOnTooManyStarves(); };
235233 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);
237235 preference->setMax(10000);
238236 preference->setStep(1);
239237 preferences->addPreference(preference);
@@ -241,7 +239,7 @@ void setupPreferences() { · 1 unmodified line
241239 {
242240 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getWindowSecondsForDesiredReduction(); };
243241 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);
245243 preference->setMax(10000);
246244 preference->setStep(1);
247245 preferences->addPreference(preference);
@@ -249,12 +247,12 @@ void setupPreferences() { · 1 unmodified line
249247 {
250248 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getReceivedAudioStream().getRepetitionWithFade(); };
251249 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));
253251 }
254252 {
255253 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputBufferSize(); };
256254 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);
258256 preference->setMin(1);
259257 preference->setMax(20);
260258 preference->setStep(1);
@@ -263,13 +261,13 @@ void setupPreferences() { · 2 unmodified lines
263261 {
264262 auto getter = []()->bool {return DependencyManager::get<AudioClient>()->getOutputStarveDetectionEnabled(); };
265263 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);
267265 preferences->addPreference(preference);
268266 }
269267 {
270268 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputStarveDetectionThreshold(); };
271269 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);
273271 preference->setMin(1);
274272 preference->setMax(500);
275273 preference->setStep(1);
@@ -278,7 +276,7 @@ void setupPreferences() { · 2 unmodified lines
278276 {
279277 auto getter = []()->float { return DependencyManager::get<AudioClient>()->getOutputStarveDetectionPeriod(); };
280278 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);
282280 preference->setMin(1);
283281 preference->setMax((float)999999999);
284282 preference->setStep(1);
@@ -325,7 +323,7 @@ void setupPreferences() { · 40 unmodified lines
325323 {
326324 auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); };
327325 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);
329327 preference->setItems(ambientOcclusionConfig->getPresetList());
330328 preferences->addPreference(preference);
331329 }