diff --git a/src/gui/AudioDialog.cxx b/src/gui/AudioDialog.cxx index 7788f3674..475846fed 100644 --- a/src/gui/AudioDialog.cxx +++ b/src/gui/AudioDialog.cxx @@ -42,7 +42,7 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, buttonWidth = font.getStringWidth("Defaults") + 20, buttonHeight = font.getLineHeight() + 4; int xpos, ypos; - int lwidth = font.getStringWidth("Sample Size (*): "), + int lwidth = font.getStringWidth("Sample Size (*) "), pwidth = font.getStringWidth("512 bytes"); WidgetArray wid; VariantList items; @@ -55,7 +55,7 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, xpos = 3 * fontWidth; ypos = 10; myVolumeSlider = new SliderWidget(this, font, xpos, ypos, 6*fontWidth, lineHeight, - "Volume: ", lwidth, kVolumeChanged); + "Volume ", lwidth, kVolumeChanged); myVolumeSlider->setMinValue(1); myVolumeSlider->setMaxValue(100); wid.push_back(myVolumeSlider); myVolumeLabel = new StaticTextWidget(this, font, @@ -75,7 +75,7 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "4 KB", "4096"); myFragsizePopup = new PopUpWidget(this, font, xpos, ypos, pwidth + myVolumeLabel->getWidth() - 4, lineHeight, - items, "Sample size (*): ", lwidth); + items, "Sample size (*) ", lwidth); wid.push_back(myFragsizePopup); ypos += lineHeight + 4; @@ -88,7 +88,7 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "48000 Hz", "48000"); myFreqPopup = new PopUpWidget(this, font, xpos, ypos, pwidth + myVolumeLabel->getWidth() - 4, lineHeight, - items, "Frequency (*): ", lwidth); + items, "Frequency (*) ", lwidth); wid.push_back(myFreqPopup); ypos += lineHeight + 4; diff --git a/src/gui/BrowserDialog.cxx b/src/gui/BrowserDialog.cxx index 3b6cdfb1e..2ad9fd396 100644 --- a/src/gui/BrowserDialog.cxx +++ b/src/gui/BrowserDialog.cxx @@ -74,9 +74,9 @@ BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font, // Add currently selected item ypos += _fileList->getHeight() + 4; - _type = new StaticTextWidget(this, font, xpos, ypos, - font.getStringWidth("Name: "), lineHeight, - "Name:", kTextAlignCenter); + _type = new StaticTextWidget(this, font, xpos, ypos+2, + font.getStringWidth("Name "), lineHeight, + "Name", kTextAlignCenter); _selected = new EditTextWidget(this, font, xpos + _type->getWidth(), ypos, _w - _type->getWidth() - 2 * xpos, lineHeight, ""); _selected->setEditable(false); diff --git a/src/gui/ComboDialog.cxx b/src/gui/ComboDialog.cxx index 6e8369b12..feefac42c 100644 --- a/src/gui/ComboDialog.cxx +++ b/src/gui/ComboDialog.cxx @@ -69,14 +69,14 @@ ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font, }; xpos = 10; - myEvents[0] = nullptr; ADD_EVENT_POPUP(0, "Event 1: "); - myEvents[1] = nullptr; ADD_EVENT_POPUP(1, "Event 2: "); - myEvents[2] = nullptr; ADD_EVENT_POPUP(2, "Event 3: "); - myEvents[3] = nullptr; ADD_EVENT_POPUP(3, "Event 4: "); - myEvents[4] = nullptr; ADD_EVENT_POPUP(4, "Event 5: "); - myEvents[5] = nullptr; ADD_EVENT_POPUP(5, "Event 6: "); - myEvents[6] = nullptr; ADD_EVENT_POPUP(6, "Event 7: "); - myEvents[7] = nullptr; ADD_EVENT_POPUP(7, "Event 8: "); + myEvents[0] = nullptr; ADD_EVENT_POPUP(0, "Event 1 "); + myEvents[1] = nullptr; ADD_EVENT_POPUP(1, "Event 2 "); + myEvents[2] = nullptr; ADD_EVENT_POPUP(2, "Event 3 "); + myEvents[3] = nullptr; ADD_EVENT_POPUP(3, "Event 4 "); + myEvents[4] = nullptr; ADD_EVENT_POPUP(4, "Event 5 "); + myEvents[5] = nullptr; ADD_EVENT_POPUP(5, "Event 6 "); + myEvents[6] = nullptr; ADD_EVENT_POPUP(6, "Event 7 "); + myEvents[7] = nullptr; ADD_EVENT_POPUP(7, "Event 8 "); // Add Defaults, OK and Cancel buttons ButtonWidget* b; diff --git a/src/gui/ConfigPathDialog.cxx b/src/gui/ConfigPathDialog.cxx index 692492ae7..5fac271b3 100644 --- a/src/gui/ConfigPathDialog.cxx +++ b/src/gui/ConfigPathDialog.cxx @@ -38,7 +38,7 @@ ConfigPathDialog::ConfigPathDialog( { const int lineHeight = font.getLineHeight(), fontWidth = font.getMaxCharWidth(), - buttonWidth = font.getStringWidth("Properties file:") + 20, + buttonWidth = font.getStringWidth("Properties file") + 20, buttonHeight = font.getLineHeight() + 4; const int vBorder = 8; int xpos, ypos; @@ -54,7 +54,7 @@ ConfigPathDialog::ConfigPathDialog( // ROM path ButtonWidget* romButton = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Rom path:", kChooseRomDirCmd); + "Rom path", kChooseRomDirCmd); wid.push_back(romButton); xpos += buttonWidth + 10; myRomPath = new EditTextWidget(this, font, xpos, ypos + 2, @@ -64,7 +64,7 @@ ConfigPathDialog::ConfigPathDialog( // Cheat file xpos = vBorder; ypos += romButton->getHeight() + 3; b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Cheat file:", kChooseCheatFileCmd); + "Cheat file", kChooseCheatFileCmd); wid.push_back(b); xpos += buttonWidth + 10; myCheatFile = new EditTextWidget(this, font, xpos, ypos + 2, @@ -74,7 +74,7 @@ ConfigPathDialog::ConfigPathDialog( // Palette file xpos = vBorder; ypos += b->getHeight() + 3; b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Palette file:", kChoosePaletteFileCmd); + "Palette file", kChoosePaletteFileCmd); wid.push_back(b); xpos += buttonWidth + 10; myPaletteFile = new EditTextWidget(this, font, xpos, ypos + 2, @@ -84,7 +84,7 @@ ConfigPathDialog::ConfigPathDialog( // Properties file xpos = vBorder; ypos += b->getHeight() + 3; b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Properties file:", kChoosePropsFileCmd); + "Properties file", kChoosePropsFileCmd); wid.push_back(b); xpos += buttonWidth + 10; myPropsFile = new EditTextWidget(this, font, xpos, ypos + 2, @@ -94,7 +94,7 @@ ConfigPathDialog::ConfigPathDialog( // State directory xpos = vBorder; ypos += b->getHeight() + 3; b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "State path:", kChooseStateDirCmd); + "State path", kChooseStateDirCmd); wid.push_back(b); xpos += buttonWidth + 10; myStatePath = new EditTextWidget(this, font, xpos, ypos + 2, @@ -104,7 +104,7 @@ ConfigPathDialog::ConfigPathDialog( // NVRAM directory xpos = vBorder; ypos += b->getHeight() + 3; b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "NVRAM path:", kChooseNVRamDirCmd); + "NVRAM path", kChooseNVRamDirCmd); wid.push_back(b); xpos += buttonWidth + 10; myNVRamPath = new EditTextWidget(this, font, xpos, ypos + 2, @@ -206,7 +206,7 @@ void ConfigPathDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select ROM directory:", myRomPath->getText(), + myBrowser->show("Select ROM directory", myRomPath->getText(), BrowserDialog::Directories, LauncherDialog::kRomDirChosenCmd); break; @@ -214,7 +214,7 @@ void ConfigPathDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select cheat file:", myCheatFile->getText(), + myBrowser->show("Select cheat file", myCheatFile->getText(), BrowserDialog::FileLoad, kCheatFileChosenCmd); break; @@ -222,7 +222,7 @@ void ConfigPathDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select palette file:", myPaletteFile->getText(), + myBrowser->show("Select palette file", myPaletteFile->getText(), BrowserDialog::FileLoad, kPaletteFileChosenCmd); break; @@ -230,7 +230,7 @@ void ConfigPathDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select properties file:", myPropsFile->getText(), + myBrowser->show("Select properties file", myPropsFile->getText(), BrowserDialog::FileLoad, kPropsFileChosenCmd); break; @@ -238,7 +238,7 @@ void ConfigPathDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select NVRAM directory:", myNVRamPath->getText(), + myBrowser->show("Select NVRAM directory", myNVRamPath->getText(), BrowserDialog::Directories, kNVRamDirChosenCmd); break; @@ -246,7 +246,7 @@ void ConfigPathDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select state directory:", myStatePath->getText(), + myBrowser->show("Select state directory", myStatePath->getText(), BrowserDialog::Directories, kStateDirChosenCmd); break; diff --git a/src/gui/EventMappingWidget.cxx b/src/gui/EventMappingWidget.cxx index 55f8d09de..764a92c91 100644 --- a/src/gui/EventMappingWidget.cxx +++ b/src/gui/EventMappingWidget.cxx @@ -106,13 +106,13 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font, // Show message for currently selected event xpos = 10; ypos = 5 + myActionsList->getHeight() + 5; StaticTextWidget* t; - t = new StaticTextWidget(boss, font, xpos, ypos, font.getStringWidth("Action:"), - fontHeight, "Action:", kTextAlignLeft); + t = new StaticTextWidget(boss, font, xpos, ypos+2, font.getStringWidth("Action"), + fontHeight, "Action", kTextAlignLeft); t->setFlags(WIDGET_CLEARBG); - myKeyMapping = new EditTextWidget(boss, font, xpos + t->getWidth() + 5, ypos, + myKeyMapping = new EditTextWidget(boss, font, xpos + t->getWidth() + 8, ypos, _w - xpos - t->getWidth() - 15, lineHeight, ""); - myKeyMapping->setEditable(false); + myKeyMapping->setEditable(false, true); myKeyMapping->clearFlags(WIDGET_RETAIN_FOCUS); } diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index 7a6be8540..722a760d1 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -65,52 +65,52 @@ GameInfoDialog::GameInfoDialog( tabID = myTab->addTab("Cartridge"); xpos = 10; - lwidth = font.getStringWidth("Manufacturer: "); + lwidth = font.getStringWidth("Manufacturer "); fwidth = _w - xpos - lwidth - 10; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Name:", kTextAlignLeft); + "Name", kTextAlignLeft); myName = new EditTextWidget(myTab, font, xpos+lwidth, ypos, fwidth, fontHeight, ""); wid.push_back(myName); ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "MD5:", kTextAlignLeft); + "MD5", kTextAlignLeft); myMD5 = new StaticTextWidget(myTab, font, xpos+lwidth, ypos, fwidth, fontHeight, "", kTextAlignLeft); ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Manufacturer:", kTextAlignLeft); + "Manufacturer", kTextAlignLeft); myManufacturer = new EditTextWidget(myTab, font, xpos+lwidth, ypos, fwidth, fontHeight, ""); wid.push_back(myManufacturer); ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Model:", kTextAlignLeft); + "Model", kTextAlignLeft); myModelNo = new EditTextWidget(myTab, font, xpos+lwidth, ypos, fwidth, fontHeight, ""); wid.push_back(myModelNo); ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Rarity:", kTextAlignLeft); + "Rarity", kTextAlignLeft); myRarity = new EditTextWidget(myTab, font, xpos+lwidth, ypos, fwidth, fontHeight, ""); wid.push_back(myRarity); ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Note:", kTextAlignLeft); + "Note", kTextAlignLeft); myNote = new EditTextWidget(myTab, font, xpos+lwidth, ypos, fwidth, fontHeight, ""); wid.push_back(myNote); ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Sound:", kTextAlignLeft); + "Sound", kTextAlignLeft); pwidth = font.getStringWidth("Stereo"); items.clear(); VarList::push_back(items, "Mono", "MONO"); @@ -121,7 +121,7 @@ GameInfoDialog::GameInfoDialog( ypos += lineHeight + 3; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Type:", kTextAlignLeft); + "Type", kTextAlignLeft); pwidth = font.getStringWidth("CM (SpectraVideo CompuMate)"); items.clear(); for(int i = 0; i < Cartridge::ourNumBSTypes; ++i) @@ -139,10 +139,10 @@ GameInfoDialog::GameInfoDialog( tabID = myTab->addTab("Console"); xpos = 10; ypos = vBorder; - lwidth = font.getStringWidth("Right Difficulty: "); + lwidth = font.getStringWidth("Right Difficulty "); pwidth = font.getStringWidth("B & W"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Left Difficulty:", kTextAlignLeft); + "Left Difficulty", kTextAlignLeft); items.clear(); VarList::push_back(items, "B", "B"); VarList::push_back(items, "A", "A"); @@ -152,7 +152,7 @@ GameInfoDialog::GameInfoDialog( ypos += lineHeight + 5; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Right Difficulty:", kTextAlignLeft); + "Right Difficulty", kTextAlignLeft); // ... use same items as above myRightDiff = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); @@ -160,7 +160,7 @@ GameInfoDialog::GameInfoDialog( ypos += lineHeight + 5; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "TV Type:", kTextAlignLeft); + "TV Type", kTextAlignLeft); items.clear(); VarList::push_back(items, "Color", "COLOR"); VarList::push_back(items, "B & W", "BW"); @@ -177,10 +177,10 @@ GameInfoDialog::GameInfoDialog( tabID = myTab->addTab("Controller"); xpos = 10; ypos = vBorder; - lwidth = font.getStringWidth("P0 Controller: "); + lwidth = font.getStringWidth("P0 Controller "); pwidth = font.getStringWidth("Paddles_IAxis"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "P0 Controller:", kTextAlignLeft); + "P0 Controller", kTextAlignLeft); ctrls.clear(); VarList::push_back(ctrls, "Joystick", "JOYSTICK" ); VarList::push_back(ctrls, "Paddles", "PADDLES" ); @@ -218,7 +218,7 @@ GameInfoDialog::GameInfoDialog( xpos = 10; ypos += lineHeight + 5; pwidth = font.getStringWidth("Paddles_IAxis"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "P1 Controller:", kTextAlignLeft); + "P1 Controller", kTextAlignLeft); myP1Controller = new PopUpWidget(myTab, font, xpos+lwidth, ypos, pwidth, lineHeight, ctrls, "", 0, 0); wid.push_back(myP1Controller); @@ -235,7 +235,7 @@ GameInfoDialog::GameInfoDialog( xpos = 10; ypos += lineHeight + 5; pwidth = font.getStringWidth("Yes"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Swap Paddles:", kTextAlignLeft); + "Swap Paddles", kTextAlignLeft); items.clear(); VarList::push_back(items, "Yes", "YES"); VarList::push_back(items, "No", "NO"); @@ -244,18 +244,18 @@ GameInfoDialog::GameInfoDialog( wid.push_back(mySwapPaddles); ypos += lineHeight + 8; - lwidth = font.getStringWidth("Mouse axis mode: "); + lwidth = font.getStringWidth("Mouse axis mode "); pwidth = font.getStringWidth("Specific axis"); items.clear(); VarList::push_back(items, "Automatic", "AUTO"); VarList::push_back(items, "Specific axis", "specific"); myMouseControl = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, - "Mouse axis mode: ", lwidth, kMCtrlChanged); + "Mouse axis mode ", lwidth, kMCtrlChanged); wid.push_back(myMouseControl); // Mouse controller specific axis - lwidth = font.getStringWidth("X-Axis is: "); + lwidth = font.getStringWidth("X-Axis is "); pwidth = font.getStringWidth("MindLink 0"); items.clear(); VarList::push_back(items, "None", MouseControl::NoControl); @@ -270,18 +270,18 @@ GameInfoDialog::GameInfoDialog( xpos = 45; ypos += lineHeight + 4; myMouseX = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, - "X-Axis is: ", lwidth); + "X-Axis is ", lwidth); wid.push_back(myMouseX); ypos += lineHeight + 4; myMouseY = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, - "Y-Axis is: ", lwidth); + "Y-Axis is ", lwidth); wid.push_back(myMouseY); xpos = 10; ypos += lineHeight + 8; - lwidth = font.getStringWidth("Mouse axis range: "); + lwidth = font.getStringWidth("Mouse axis range "); myMouseRange = new SliderWidget(myTab, font, xpos, ypos, 8*fontWidth, lineHeight, - "Mouse axis range: ", lwidth, kMRangeChanged); + "Mouse axis range ", lwidth, kMRangeChanged); myMouseRange->setMinValue(1); myMouseRange->setMaxValue(100); wid.push_back(myMouseRange); @@ -299,10 +299,10 @@ GameInfoDialog::GameInfoDialog( tabID = myTab->addTab("Display"); xpos = 10; ypos = vBorder; - lwidth = font.getStringWidth("Use Phosphor: "); + lwidth = font.getStringWidth("Use Phosphor "); pwidth = font.getStringWidth("Auto-detect"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Format:", kTextAlignLeft); + "Format", kTextAlignLeft); items.clear(); VarList::push_back(items, "Auto-detect", "AUTO"); VarList::push_back(items, "NTSC", "NTSC"); @@ -317,7 +317,7 @@ GameInfoDialog::GameInfoDialog( ypos += lineHeight + 5; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "YStart:", kTextAlignLeft); + "YStart", kTextAlignLeft); myYStart = new SliderWidget(myTab, font, xpos+lwidth, ypos, 8*fontWidth, lineHeight, "", 0, kYStartChanged); @@ -330,7 +330,7 @@ GameInfoDialog::GameInfoDialog( ypos += lineHeight + 5; new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Height:", kTextAlignLeft); + "Height", kTextAlignLeft); myHeight = new SliderWidget(myTab, font, xpos+lwidth, ypos, 8*fontWidth, lineHeight, "", 0, kHeightChanged); myHeight->setMinValue(FrameManager::minViewableHeight-1); @@ -343,7 +343,7 @@ GameInfoDialog::GameInfoDialog( ypos += lineHeight + 5; pwidth = font.getStringWidth("Yes"); new StaticTextWidget(myTab, font, xpos, ypos+1, lwidth, fontHeight, - "Use Phosphor:", kTextAlignLeft); + "Use Phosphor", kTextAlignLeft); items.clear(); VarList::push_back(items, "Yes", "YES"); VarList::push_back(items, "No", "NO"); @@ -352,8 +352,8 @@ GameInfoDialog::GameInfoDialog( wid.push_back(myPhosphor); myPPBlend = new SliderWidget(myTab, font, xpos + lwidth + myPhosphor->getWidth() + 10, - ypos, 8*fontWidth, lineHeight, "Blend: ", - font.getStringWidth("Blend: "), + ypos, 8*fontWidth, lineHeight, "Blend ", + font.getStringWidth("Blend "), kPPBlendChanged); myPPBlend->setMinValue(1); myPPBlend->setMaxValue(100); wid.push_back(myPPBlend); diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx index 097deaa8f..68a81bf03 100644 --- a/src/gui/GlobalPropsDialog.cxx +++ b/src/gui/GlobalPropsDialog.cxx @@ -39,7 +39,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) buttonWidth = font.getStringWidth("Defaults") + 20, buttonHeight = font.getLineHeight() + 4; int xpos, ypos; - int lwidth = font.getStringWidth("Right Difficulty: "), + int lwidth = font.getStringWidth("Right Difficulty "), pwidth = font.getStringWidth("CM (SpectraVideo CompuMate)"); WidgetArray wid; VariantList items; @@ -53,7 +53,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) // Bankswitch type new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, - "Bankswitch type:", kTextAlignLeft); + "Bankswitch type", kTextAlignLeft); for(int i = 0; i < Cartridge::ourNumBSTypes; ++i) VarList::push_back(items, Cartridge::ourBSList[i].desc, Cartridge::ourBSList[i].type); myBSType = new PopUpWidget(this, font, xpos+lwidth, ypos, @@ -64,7 +64,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) // Left difficulty pwidth = font.getStringWidth("Debugger"); new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, - "Left Difficulty:", kTextAlignLeft); + "Left Difficulty", kTextAlignLeft); items.clear(); VarList::push_back(items, "Default", "DEFAULT"); VarList::push_back(items, "B", "B"); @@ -76,7 +76,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) // Right difficulty new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, - "Right Difficulty:", kTextAlignLeft); + "Right Difficulty", kTextAlignLeft); // ... use same items as above myRightDiff = new PopUpWidget(this, font, xpos+lwidth, ypos, pwidth, lineHeight, items, "", 0, 0); @@ -85,7 +85,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) // TV type new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, - "TV Type:", kTextAlignLeft); + "TV Type", kTextAlignLeft); items.clear(); VarList::push_back(items, "Default", "DEFAULT"); VarList::push_back(items, "Color", "COLOR"); @@ -97,7 +97,7 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font) // Start in debugger mode new StaticTextWidget(this, font, xpos, ypos+1, lwidth, fontHeight, - "Startup Mode:", kTextAlignLeft); + "Startup Mode", kTextAlignLeft); items.clear(); VarList::push_back(items, "Console", "false"); VarList::push_back(items, "Debugger", "true"); @@ -151,7 +151,7 @@ int GlobalPropsDialog::addHoldWidgets(const GUI::Font& font, int x, int y, // Left joystick StaticTextWidget* t = new StaticTextWidget(this, font, xpos, ypos+2, - font.getStringWidth("Left Joy:"), fontHeight, "Left Joy:", + font.getStringWidth("Left Joy"), fontHeight, "Left Joy", kTextAlignLeft); xpos += t->getWidth()/2 - 5; ypos += t->getHeight() + 10; myJoy[kJ0Up] = new CheckboxWidget(this, font, xpos, ypos, "", kJ0Up); @@ -171,7 +171,7 @@ int GlobalPropsDialog::addHoldWidgets(const GUI::Font& font, int x, int y, // Right joystick t = new StaticTextWidget(this, font, xpos, ypos+2, - font.getStringWidth("Right Joy:"), fontHeight, "Right Joy:", + font.getStringWidth("Right Joy"), fontHeight, "Right Joy", kTextAlignLeft); xpos += t->getWidth()/2 - 5; ypos += t->getHeight() + 10; myJoy[kJ1Up] = new CheckboxWidget(this, font, xpos, ypos, "", kJ1Up); @@ -190,7 +190,7 @@ int GlobalPropsDialog::addHoldWidgets(const GUI::Font& font, int x, int y, // Console Select/Reset t = new StaticTextWidget(this, font, xpos, ypos+2, - font.getStringWidth("Console:"), fontHeight, "Console:", + font.getStringWidth("Console"), fontHeight, "Console", kTextAlignLeft); xpos -= 10; ypos += t->getHeight() + 10; myHoldSelect = new CheckboxWidget(this, font, xpos, ypos, "Select"); diff --git a/src/gui/HelpDialog.cxx b/src/gui/HelpDialog.cxx index ed4733d1a..7e0ad499d 100644 --- a/src/gui/HelpDialog.cxx +++ b/src/gui/HelpDialog.cxx @@ -103,7 +103,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title) switch(page) { case 1: - title = "Common commands:"; + title = "Common commands"; #ifndef BSPF_MAC_OSX ADD_BIND("Ctrl Q", "Quit emulation"); #else @@ -121,7 +121,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title) break; case 2: - title = "Special commands:"; + title = "Special commands"; ADD_BIND("Ctrl g", "Grab mouse (keep in window)"); ADD_BIND("Ctrl f", "Switch between NTSC/PAL/SECAM"); ADD_BIND("Ctrl s", "Save game properties"); @@ -132,7 +132,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title) break; case 3: - title = "TV Filters:"; + title = "TV Filters"; ADD_BIND(ALT_" 1", "Disable filtering"); ADD_BIND(ALT_" 2", "Enable 'Composite' mode"); ADD_BIND(ALT_" 3", "Enable 'S-video' mode"); @@ -146,7 +146,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title) break; case 4: - title = "Developer commands:"; + title = "Developer commands"; ADD_BIND("~", "Enter/exit debugger"); ADD_LINE(); ADD_BIND(ALT_" PgUp", "Increase Display.YStart"); @@ -156,7 +156,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title) break; case 5: - title = "All other commands:"; + title = "All other commands"; ADD_LINE(); ADD_BIND("Remapped Events", ""); ADD_TEXT("Most other commands can be"); diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx index 2c4429a3e..42f7af5ec 100644 --- a/src/gui/InputDialog.cxx +++ b/src/gui/InputDialog.cxx @@ -104,13 +104,13 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) // Stelladaptor mappings xpos = 5; ypos = 5; - lwidth = font.getStringWidth("Use mouse as a controller: "); + lwidth = font.getStringWidth("Use mouse as a controller "); pwidth = font.getStringWidth("-UI, -Emulation"); VarList::push_back(items, "Left / Right", "lr"); VarList::push_back(items, "Right / Left", "rl"); mySAPort = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, - "Stelladaptor port order: ", lwidth); + "Stelladaptor port order ", lwidth); wid.push_back(mySAPort); // Use mouse as controller @@ -120,7 +120,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) VarList::push_back(items, "Analog devices", "analog"); VarList::push_back(items, "Never", "never"); myMouseControl = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, - "Use mouse as a controller: ", lwidth); + "Use mouse as a controller ", lwidth); wid.push_back(myMouseControl); // Mouse cursor state @@ -131,7 +131,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) VarList::push_back(items, "+UI, -Emulation", "2"); VarList::push_back(items, "+UI, +Emulation", "3"); myCursorState = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, items, - "Mouse cursor visibility: ", lwidth); + "Mouse cursor visibility ", lwidth); wid.push_back(myCursorState); #ifndef WINDOWED_SUPPORT myCursorState->clearFlags(WIDGET_ENABLED); @@ -139,21 +139,21 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) // Add AtariVox serial port ypos += lineHeight + 5; - lwidth = font.getStringWidth("AVox serial port: "); + lwidth = font.getStringWidth("AVox serial port "); int fwidth = _w - xpos - lwidth - 20; new StaticTextWidget(myTab, font, xpos, ypos, lwidth, fontHeight, - "AVox serial port: ", kTextAlignLeft); + "AVox serial port ", kTextAlignLeft); myAVoxPort = new EditTextWidget(myTab, font, xpos+lwidth, ypos, fwidth, fontHeight, ""); wid.push_back(myAVoxPort); - lwidth = font.getStringWidth("Digital paddle sensitivity: "); + lwidth = font.getStringWidth("Digital paddle sensitivity "); pwidth = font.getMaxCharWidth() * 8; // Add joystick deadzone setting ypos += lineHeight + 8; myDeadzone = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - "Joystick deadzone size: ", lwidth, kDeadzoneChanged); + "Joystick deadzone size ", lwidth, kDeadzoneChanged); myDeadzone->setMinValue(0); myDeadzone->setMaxValue(29); xpos += myDeadzone->getWidth() + 5; myDeadzoneLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 5*fontWidth, @@ -164,7 +164,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) // Add paddle speed (digital emulation) xpos = 5; ypos += lineHeight + 4; myDPaddleSpeed = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - "Digital paddle sensitivity: ", + "Digital paddle sensitivity ", lwidth, kDPSpeedChanged); myDPaddleSpeed->setMinValue(1); myDPaddleSpeed->setMaxValue(20); xpos += myDPaddleSpeed->getWidth() + 5; @@ -176,7 +176,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font) // Add paddle speed (mouse emulation) xpos = 5; ypos += lineHeight + 4; myMPaddleSpeed = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - "Mouse paddle sensitivity: ", + "Mouse paddle sensitivity ", lwidth, kMPSpeedChanged); myMPaddleSpeed->setMinValue(1); myMPaddleSpeed->setMaxValue(20); xpos += myMPaddleSpeed->getWidth() + 5; diff --git a/src/gui/JoystickDialog.cxx b/src/gui/JoystickDialog.cxx index 1868b20ac..c72c2d2bc 100644 --- a/src/gui/JoystickDialog.cxx +++ b/src/gui/JoystickDialog.cxx @@ -45,8 +45,8 @@ JoystickDialog::JoystickDialog(GuiObject* boss, const GUI::Font& font, // Joystick ID ypos = _h - buttonHeight - 10; StaticTextWidget* t = new StaticTextWidget(this, font, xpos, ypos, - font.getStringWidth("Joystick ID: "), font.getFontHeight(), - "Joystick ID: ", kTextAlignLeft); + font.getStringWidth("Joystick ID "), font.getFontHeight(), + "Joystick ID ", kTextAlignLeft); xpos += t->getWidth() + 4; myJoyText = new EditTextWidget(this, font, xpos, ypos-2, font.getStringWidth("Unplugged")+8, font.getLineHeight(), ""); diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index 6ee095be3..f1f9e2354 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -116,7 +116,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent, // Add note textwidget to show any notes for the currently selected ROM xpos = 10; xpos += 5; ypos += myList->getHeight() + 4; - lwidth = font.getStringWidth("Note:"); + lwidth = font.getStringWidth("Note"); myDirLabel = new StaticTextWidget(this, font, xpos, ypos, lwidth, fontHeight, "Dir:", kTextAlignLeft); xpos += lwidth + 5; @@ -515,7 +515,7 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd, if(!myRomDir) myRomDir = make_ptr(this, instance().frameBuffer().font(), _w, _h); - myRomDir->show("Select ROM directory:", "~", + myRomDir->show("Select ROM directory", "~", BrowserDialog::Directories, kStartupRomDirChosenCmd); break; diff --git a/src/gui/LauncherFilterDialog.cxx b/src/gui/LauncherFilterDialog.cxx index 14ffa9e3b..a1a553d9a 100644 --- a/src/gui/LauncherFilterDialog.cxx +++ b/src/gui/LauncherFilterDialog.cxx @@ -39,7 +39,7 @@ LauncherFilterDialog::LauncherFilterDialog(GuiObject* boss, const GUI::Font& fon buttonWidth = font.getStringWidth("Defaults") + 20, buttonHeight = font.getLineHeight() + 4; int xpos, ypos; - int lwidth = font.getStringWidth("Show: "), + int lwidth = font.getStringWidth("Show "), pwidth = font.getStringWidth("ROMs ending with"); WidgetArray wid; VariantList items; @@ -55,7 +55,7 @@ LauncherFilterDialog::LauncherFilterDialog(GuiObject* boss, const GUI::Font& fon VarList::push_back(items, "ROMs ending with", "__EXTS"); myFileType = new PopUpWidget(this, font, xpos, ypos, pwidth, lineHeight, items, - "Show: ", lwidth, kFileTypeChanged); + "Show ", lwidth, kFileTypeChanged); wid.push_back(myFileType); ypos += lineHeight + 10; diff --git a/src/gui/LoggerDialog.cxx b/src/gui/LoggerDialog.cxx index 1cd9ce1d8..606e7bc50 100644 --- a/src/gui/LoggerDialog.cxx +++ b/src/gui/LoggerDialog.cxx @@ -67,8 +67,8 @@ LoggerDialog::LoggerDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "Verbose", "2"); myLogLevel = new PopUpWidget(this, font, xpos, ypos, font.getStringWidth("Verbose"), - lineHeight, items, "Log level: ", - font.getStringWidth("Log level: ")); + lineHeight, items, "Log level ", + font.getStringWidth("Log level ")); wid.push_back(myLogLevel); // Should log output also be shown on the console? diff --git a/src/gui/RomAuditDialog.cxx b/src/gui/RomAuditDialog.cxx index 6cd6d414e..521a77453 100644 --- a/src/gui/RomAuditDialog.cxx +++ b/src/gui/RomAuditDialog.cxx @@ -44,7 +44,7 @@ RomAuditDialog::RomAuditDialog(OSystem& osystem, DialogContainer& parent, const int lineHeight = font.getLineHeight(), fontWidth = font.getMaxCharWidth(), fontHeight = font.getFontHeight(), - buttonWidth = font.getStringWidth("Audit path:") + 20, + buttonWidth = font.getStringWidth("Audit path") + 20, buttonHeight = font.getLineHeight() + 4, lwidth = font.getStringWidth("ROMs without properties (skipped): "); int xpos = vBorder, ypos = vBorder; @@ -57,7 +57,7 @@ RomAuditDialog::RomAuditDialog(OSystem& osystem, DialogContainer& parent, // Audit path ButtonWidget* romButton = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Audit path:", kChooseAuditDirCmd); + "Audit path", kChooseAuditDirCmd); wid.push_back(romButton); xpos += buttonWidth + 10; myRomPath = new EditTextWidget(this, font, xpos, ypos + 2, @@ -67,14 +67,14 @@ RomAuditDialog::RomAuditDialog(OSystem& osystem, DialogContainer& parent, // Show results of ROM audit xpos = vBorder + 10; ypos += buttonHeight + 10; new StaticTextWidget(this, font, xpos, ypos, lwidth, fontHeight, - "ROMs with properties (renamed): ", kTextAlignLeft); + "ROMs with properties (renamed) ", kTextAlignLeft); myResults1 = new StaticTextWidget(this, font, xpos + lwidth, ypos, _w - lwidth - 20, fontHeight, "", kTextAlignLeft); myResults1->setFlags(WIDGET_CLEARBG); ypos += buttonHeight; new StaticTextWidget(this, font, xpos, ypos, lwidth, fontHeight, - "ROMs without properties (skipped): ", kTextAlignLeft); + "ROMs without properties (skipped) ", kTextAlignLeft); myResults2 = new StaticTextWidget(this, font, xpos + lwidth, ypos, _w - lwidth - 20, fontHeight, "", kTextAlignLeft); @@ -190,7 +190,7 @@ void RomAuditDialog::handleCommand(CommandSender* sender, int cmd, break; case kChooseAuditDirCmd: - myBrowser->show("Select ROM directory to audit:", myRomPath->getText(), + myBrowser->show("Select ROM directory to audit", myRomPath->getText(), BrowserDialog::Directories, kAuditDirChosenCmd); break; diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index e5bd0edbb..b3c3785ed 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -35,7 +35,7 @@ SnapshotDialog::SnapshotDialog( { const int lineHeight = font.getLineHeight(), fontWidth = font.getMaxCharWidth(), - buttonWidth = font.getStringWidth("Save path:") + 20, + buttonWidth = font.getStringWidth("Save path") + 20, buttonHeight = font.getLineHeight() + 4; const int vBorder = 10; int xpos, ypos, lwidth, fwidth; @@ -50,7 +50,7 @@ SnapshotDialog::SnapshotDialog( // Snapshot path (save files) b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Save path:", kChooseSnapSaveDirCmd); + "Save path", kChooseSnapSaveDirCmd); wid.push_back(b); xpos += buttonWidth + 10; mySnapSavePath = new EditTextWidget(this, font, xpos, ypos + 2, @@ -60,7 +60,7 @@ SnapshotDialog::SnapshotDialog( // Snapshot path (load files) xpos = vBorder; ypos += buttonHeight + 3; b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Load path:", kChooseSnapLoadDirCmd); + "Load path", kChooseSnapLoadDirCmd); wid.push_back(b); xpos += buttonWidth + 10; mySnapLoadPath = new EditTextWidget(this, font, xpos, ypos + 2, @@ -68,7 +68,7 @@ SnapshotDialog::SnapshotDialog( wid.push_back(mySnapLoadPath); // Snapshot naming - lwidth = font.getStringWidth("Continuous snapshot interval: "); + lwidth = font.getStringWidth("Continuous snapshot interval "); fwidth = font.getStringWidth("internal database"); VariantList items; VarList::push_back(items, "actual ROM name", "rom"); @@ -76,7 +76,7 @@ SnapshotDialog::SnapshotDialog( xpos = vBorder+10; ypos += buttonHeight + 8; mySnapName = new PopUpWidget(this, font, xpos, ypos, fwidth, lineHeight, items, - "Save snapshots according to: ", lwidth); + "Save snapshots according to ", lwidth); wid.push_back(mySnapName); // Snapshot interval (continuous mode) @@ -94,7 +94,7 @@ SnapshotDialog::SnapshotDialog( ypos += buttonHeight; mySnapInterval = new PopUpWidget(this, font, xpos, ypos, fwidth, lineHeight, items, - "Continuous snapshot interval: ", lwidth); + "Continuous snapshot interval ", lwidth); wid.push_back(mySnapInterval); // Booleans for saving snapshots @@ -184,7 +184,7 @@ void SnapshotDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select snapshot save directory:", mySnapSavePath->getText(), + myBrowser->show("Select snapshot save directory", mySnapSavePath->getText(), BrowserDialog::Directories, kSnapSaveDirChosenCmd); break; @@ -192,7 +192,7 @@ void SnapshotDialog::handleCommand(CommandSender* sender, int cmd, // This dialog is resizable under certain conditions, so we need // to re-create it as necessary createBrowser(); - myBrowser->show("Select snapshot load directory:", mySnapLoadPath->getText(), + myBrowser->show("Select snapshot load directory", mySnapLoadPath->getText(), BrowserDialog::Directories, kSnapLoadDirChosenCmd); break; diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx index 5e33189b8..b192f75d6 100644 --- a/src/gui/UIDialog.cxx +++ b/src/gui/UIDialog.cxx @@ -64,11 +64,11 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, ////////////////////////////////////////////////////////// // 1) Launcher options tabID = myTab->addTab(" Launcher "); - lwidth = font.getStringWidth("Exit to Launcher: "); + lwidth = font.getStringWidth("Exit to Launcher "); // Launcher width and height myLauncherWidthSlider = new SliderWidget(myTab, font, xpos, ypos, pwidth, - lineHeight, "Launcher Width: ", + lineHeight, "Launcher Width ", lwidth, kLWidthChanged); myLauncherWidthSlider->setMinValue(FrameBuffer::kFBMinW); myLauncherWidthSlider->setMaxValue(ds.w); @@ -82,7 +82,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, ypos += lineHeight + 4; myLauncherHeightSlider = new SliderWidget(myTab, font, xpos, ypos, pwidth, - lineHeight, "Launcher Height: ", + lineHeight, "Launcher Height ", lwidth, kLHeightChanged); myLauncherHeightSlider->setMinValue(FrameBuffer::kFBMinH); myLauncherHeightSlider->setMaxValue(ds.h); @@ -103,7 +103,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "Large", "large"); myLauncherFontPopup = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, - "Launcher Font: ", lwidth); + "Launcher Font ", lwidth); wid.push_back(myLauncherFontPopup); ypos += lineHeight + 4; @@ -114,7 +114,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "2x (1000x760)", "2"); myRomViewerPopup = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, - "ROM Info viewer: ", lwidth); + "ROM Info viewer ", lwidth); wid.push_back(myRomViewerPopup); ypos += lineHeight + 4; @@ -125,7 +125,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "Always", "1"); myLauncherExitPopup = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, - "Exit to Launcher: ", lwidth); + "Exit to Launcher ", lwidth); wid.push_back(myLauncherExitPopup); ypos += lineHeight + 4; @@ -144,12 +144,12 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, wid.clear(); tabID = myTab->addTab(" Debugger "); #ifdef DEBUGGER_SUPPORT - lwidth = font.getStringWidth("Debugger Height: "); + lwidth = font.getStringWidth("Debugger Height "); xpos = ypos = vBorder; // Debugger width and height myDebuggerWidthSlider = new SliderWidget(myTab, font, xpos, ypos, pwidth, - lineHeight, "Debugger Width: ", + lineHeight, "Debugger Width ", lwidth, kDWidthChanged); myDebuggerWidthSlider->setMinValue(DebuggerDialog::kSmallFontMinW); myDebuggerWidthSlider->setMaxValue(ds.w); @@ -163,7 +163,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, ypos += lineHeight + 4; myDebuggerHeightSlider = new SliderWidget(myTab, font, xpos, ypos, pwidth, - lineHeight, "Debugger Height: ", + lineHeight, "Debugger Height ", lwidth, kDHeightChanged); myDebuggerHeightSlider->setMinValue(DebuggerDialog::kSmallFontMinH); myDebuggerHeightSlider->setMaxValue(ds.h); @@ -192,7 +192,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, ypos += b->getHeight() + 12; // Font style (bold label vs. text, etc) - lwidth = font.getStringWidth("Font Style: "); + lwidth = font.getStringWidth("Font Style "); pwidth = font.getStringWidth("Bold non-labels only"); xpos = vBorder; items.clear(); @@ -202,7 +202,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "All Bold font", "3"); myDebuggerFontStyle = new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items, - "Font Style: ", lwidth); + "Font Style ", lwidth); wid.push_back(myDebuggerFontStyle); // Debugger is only realistically available in windowed modes 800x600 or greater @@ -232,7 +232,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, // 3) Misc. options wid.clear(); tabID = myTab->addTab(" Misc. "); - lwidth = font.getStringWidth("Interface Palette (*): "); + lwidth = font.getStringWidth("Interface Palette (*) "); pwidth = font.getStringWidth("Standard"); xpos = ypos = vBorder; @@ -242,7 +242,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "Standard", "standard"); VarList::push_back(items, "Classic", "classic"); myPalettePopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - items, "Interface Palette (*): ", lwidth); + items, "Interface Palette (*) ", lwidth); wid.push_back(myPalettePopup); ypos += lineHeight + 4; @@ -258,7 +258,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "900 ms", "900"); VarList::push_back(items, "1 second", "1000"); myListDelayPopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - items, "List quick delay (*): ", lwidth); + items, "List quick delay (*) ", lwidth); wid.push_back(myListDelayPopup); ypos += lineHeight + 4; @@ -275,7 +275,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "9 lines", "9"); VarList::push_back(items, "10 lines", "10"); myWheelLinesPopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - items, "Mouse wheel scroll: ", lwidth); + items, "Mouse wheel scroll ", lwidth); wid.push_back(myWheelLinesPopup); ypos += lineHeight + 4; diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx index 7ec4d8e7c..e33ce0cf2 100644 --- a/src/gui/VideoDialog.cxx +++ b/src/gui/VideoDialog.cxx @@ -45,7 +45,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, buttonWidth = font.getStringWidth("Defaults") + 20, buttonHeight = font.getLineHeight() + 4; int xpos, ypos, tabID; - int lwidth = font.getStringWidth("NTSC Aspect: "), + int lwidth = font.getStringWidth("NTSC Aspect "), pwidth = font.getStringWidth("XXXXxXXXX"); WidgetArray wid; VariantList items; @@ -66,13 +66,13 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, // Video renderer myRenderer = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, instance().frameBuffer().supportedRenderers(), - "Renderer: ", lwidth); + "Renderer ", lwidth); wid.push_back(myRenderer); ypos += lineHeight + 4; // TIA filters (will be dynamically filled later) myTIAZoom = new PopUpWidget(myTab, font, xpos, ypos, pwidth, - lineHeight, items, "TIA Zoom: ", lwidth); + lineHeight, items, "TIA Zoom ", lwidth); wid.push_back(myTIAZoom); ypos += lineHeight + 4; @@ -82,7 +82,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "Z26", "z26"); VarList::push_back(items, "User", "user"); myTIAPalette = new PopUpWidget(myTab, font, xpos, ypos, pwidth, - lineHeight, items, "TIA Palette: ", lwidth); + lineHeight, items, "TIA Palette ", lwidth); wid.push_back(myTIAPalette); ypos += lineHeight + 4; @@ -91,7 +91,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "Linear", "linear"); VarList::push_back(items, "Nearest", "nearest"); myTIAInterpolate = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - items, "TIA Inter: ", lwidth); + items, "TIA Inter ", lwidth); wid.push_back(myTIAInterpolate); ypos += lineHeight + 4; @@ -100,14 +100,14 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "Sleep", "sleep"); VarList::push_back(items, "Busy-wait", "busy"); myFrameTiming = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - items, "Timing (*): ", lwidth); + items, "Timing (*) ", lwidth); wid.push_back(myFrameTiming); ypos += lineHeight + 4; // Aspect ratio (NTSC mode) myNAspectRatio = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - "NTSC Aspect: ", lwidth, kNAspectRatioChanged); + "NTSC Aspect ", lwidth, kNAspectRatioChanged); myNAspectRatio->setMinValue(80); myNAspectRatio->setMaxValue(120); wid.push_back(myNAspectRatio); myNAspectRatioLabel = @@ -119,7 +119,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, // Aspect ratio (PAL mode) myPAspectRatio = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - "PAL Aspect: ", lwidth, kPAspectRatioChanged); + "PAL Aspect ", lwidth, kPAspectRatioChanged); myPAspectRatio->setMinValue(80); myPAspectRatio->setMaxValue(120); wid.push_back(myPAspectRatio); myPAspectRatioLabel = @@ -131,7 +131,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, // Framerate myFrameRate = new SliderWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - "Framerate: ", lwidth, kFrameRateChanged); + "Framerate ", lwidth, kFrameRateChanged); myFrameRate->setMinValue(0); myFrameRate->setMaxValue(300); myFrameRate->setStepValue(10); wid.push_back(myFrameRate); @@ -205,18 +205,18 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, VarList::push_back(items, "RGB", NTSCFilter::PRESET_RGB); VarList::push_back(items, "Bad adjust", NTSCFilter::PRESET_BAD); VarList::push_back(items, "Custom", NTSCFilter::PRESET_CUSTOM); - lwidth = font.getStringWidth("TV Mode: "); + lwidth = font.getStringWidth("TV Mode "); pwidth = font.getStringWidth("Bad adjust"), myTVMode = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight, - items, "TV Mode: ", lwidth, kTVModeChanged); + items, "TV Mode ", lwidth, kTVModeChanged); wid.push_back(myTVMode); ypos += lineHeight + 4; // Custom adjustables (using macro voodoo) xpos += 8; ypos += 4; pwidth = lwidth; - lwidth = font.getStringWidth("Saturation: "); + lwidth = font.getStringWidth("Saturation "); #define CREATE_CUSTOM_SLIDERS(obj, desc) \ myTV ## obj = \ @@ -230,16 +230,16 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, myTV ## obj->setFlags(WIDGET_CLEARBG); \ ypos += lineHeight + 4 - CREATE_CUSTOM_SLIDERS(Contrast, "Contrast: "); - CREATE_CUSTOM_SLIDERS(Bright, "Brightness: "); - CREATE_CUSTOM_SLIDERS(Hue, "Hue: "); - CREATE_CUSTOM_SLIDERS(Satur, "Saturation: "); - CREATE_CUSTOM_SLIDERS(Gamma, "Gamma: "); - CREATE_CUSTOM_SLIDERS(Sharp, "Sharpness: "); - CREATE_CUSTOM_SLIDERS(Res, "Resolution: "); - CREATE_CUSTOM_SLIDERS(Artifacts, "Artifacts: "); - CREATE_CUSTOM_SLIDERS(Fringe, "Fringing: "); - CREATE_CUSTOM_SLIDERS(Bleed, "Bleeding: "); + CREATE_CUSTOM_SLIDERS(Contrast, "Contrast "); + CREATE_CUSTOM_SLIDERS(Bright, "Brightness "); + CREATE_CUSTOM_SLIDERS(Hue, "Hue "); + CREATE_CUSTOM_SLIDERS(Satur, "Saturation "); + CREATE_CUSTOM_SLIDERS(Gamma, "Gamma "); + CREATE_CUSTOM_SLIDERS(Sharp, "Sharpness "); + CREATE_CUSTOM_SLIDERS(Res, "Resolution "); + CREATE_CUSTOM_SLIDERS(Artifacts, "Artifacts "); + CREATE_CUSTOM_SLIDERS(Fringe, "Fringing "); + CREATE_CUSTOM_SLIDERS(Bleed, "Bleeding "); xpos += myTVContrast->getWidth() + myTVContrastLabel->getWidth() + 20; ypos = 8; @@ -249,20 +249,20 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent, "Jitter/Roll effect", kTVJitterChanged); wid.push_back(myTVJitter); ypos += lineHeight; - lwidth = font.getStringWidth("Intensity: "); + lwidth = font.getStringWidth("Intensity "); pwidth = font.getMaxCharWidth() * 6; - CREATE_CUSTOM_SLIDERS(JitterRec, "Recovery: "); + CREATE_CUSTOM_SLIDERS(JitterRec, "Recovery "); myTVJitterRec->setMinValue(1); myTVJitterRec->setMaxValue(20); ypos += 4; // Scanline intensity and interpolation myTVScanLabel = - new StaticTextWidget(myTab, font, xpos, ypos, font.getStringWidth("Scanline settings:"), - fontHeight, "Scanline settings:", kTextAlignLeft); + new StaticTextWidget(myTab, font, xpos, ypos, font.getStringWidth("Scanline settings"), + fontHeight, "Scanline settings", kTextAlignLeft); ypos += lineHeight; xpos += 20; - CREATE_CUSTOM_SLIDERS(ScanIntense, "Intensity: "); + CREATE_CUSTOM_SLIDERS(ScanIntense, "Intensity "); myTVScanInterpolate = new CheckboxWidget(myTab, font, xpos, ypos, "Interpolation"); @@ -319,7 +319,7 @@ void VideoDialog::loadConfig() // the desktop and which renderer we're using const VariantList& items = instance().frameBuffer().supportedTIAZoomLevels(); myTIAZoom->addItems(items); - myTIAZoom->setSelected(instance().settings().getString("tia.zoom"), "2"); + myTIAZoom->setSelected(instance().settings().getString("tia.zoom"), "3"); // TIA Palette myTIAPalette->setSelected( @@ -491,8 +491,8 @@ void VideoDialog::setDefaults() { case 0: // General { - myRenderer->setSelected("soft", ""); - myTIAZoom->setSelected("2", ""); + myRenderer->setSelectedIndex(0); + myTIAZoom->setSelected("3", ""); myTIAPalette->setSelected("standard", ""); myFrameTiming->setSelected("sleep", ""); myTIAInterpolate->setSelected("nearest", "");