From 0d50f9ec7a1d73bdba02ba26962bc07bb29b2cd9 Mon Sep 17 00:00:00 2001 From: Arnaud Bienner Date: Thu, 22 Mar 2012 20:02:12 +0100 Subject: [PATCH] Use '%1 fps' to reduce the number of strings to translate, and to keep consistency over the application, as similar strings are used in equalizer (i.e. I don't want to have different translations for similar original English strings) --- src/visualisations/visualisationcontainer.cpp | 16 +++++++++++----- src/visualisations/visualisationcontainer.h | 5 +++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/visualisations/visualisationcontainer.cpp b/src/visualisations/visualisationcontainer.cpp index 31640d4a2..c4d1ced44 100644 --- a/src/visualisations/visualisationcontainer.cpp +++ b/src/visualisations/visualisationcontainer.cpp @@ -35,10 +35,16 @@ #include #include +// Framerates +const int VisualisationContainer::kLowFramerate = 15; +const int VisualisationContainer::kMediumFramerate = 25; +const int VisualisationContainer::kHighFramerate = 35; +const int VisualisationContainer::kSuperHighFramerate = 60; + const char* VisualisationContainer::kSettingsGroup = "Visualisations"; const int VisualisationContainer::kDefaultWidth = 828; const int VisualisationContainer::kDefaultHeight = 512; -const int VisualisationContainer::kDefaultFps = 35; +const int VisualisationContainer::kDefaultFps = kHighFramerate; const int VisualisationContainer::kDefaultTextureSize = 512; VisualisationContainer::VisualisationContainer(QWidget *parent) @@ -98,10 +104,10 @@ void VisualisationContainer::Init() { QMenu* fps_menu = menu_->addMenu(tr("Framerate")); QSignalMapper* fps_mapper = new QSignalMapper(this); QActionGroup* fps_group = new QActionGroup(this); - AddMenuItem(tr("Low (15 fps)"), 15, fps_, fps_group, fps_mapper); - AddMenuItem(tr("Medium (25 fps)"), 25, fps_, fps_group, fps_mapper); - AddMenuItem(tr("High (35 fps)"), 35, fps_, fps_group, fps_mapper); - AddMenuItem(tr("Super high (60 fps)"), 60, fps_, fps_group, fps_mapper); + AddMenuItem(tr("Low (%1 fps)").arg(kLowFramerate), kLowFramerate, fps_, fps_group, fps_mapper); + AddMenuItem(tr("Medium (%1 fps)").arg(kMediumFramerate), kMediumFramerate, fps_, fps_group, fps_mapper); + AddMenuItem(tr("High (%1 fps)").arg(kHighFramerate), kHighFramerate, fps_, fps_group, fps_mapper); + AddMenuItem(tr("Super high (%1 fps)").arg(kSuperHighFramerate), kSuperHighFramerate, fps_, fps_group, fps_mapper); fps_menu->addActions(fps_group->actions()); connect(fps_mapper, SIGNAL(mapped(int)), SLOT(SetFps(int))); diff --git a/src/visualisations/visualisationcontainer.h b/src/visualisations/visualisationcontainer.h index 8bcc0f3a0..345e23c55 100644 --- a/src/visualisations/visualisationcontainer.h +++ b/src/visualisations/visualisationcontainer.h @@ -38,6 +38,11 @@ class VisualisationContainer : public QGraphicsView { public: VisualisationContainer(QWidget* parent = 0); + static const int kLowFramerate; + static const int kMediumFramerate; + static const int kHighFramerate; + static const int kSuperHighFramerate; + static const char* kSettingsGroup; static const int kDefaultWidth; static const int kDefaultHeight;