Preferences: const shared warning icon string (html)

mixxxdj · Oct 3, 2023 · cd2fdb3 · cd2fdb3
1 parent 17362a7
commit cd2fdb3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/src/preferences/dialog/dlgpreferencepage.h b/src/preferences/dialog/dlgpreferencepage.h
@@ -19,6 +19,13 @@ class DlgPreferencePage : public QWidget {
     /// overriding this. The default implementation returns an invalid QUrl.
     virtual QUrl helpUrl() const;
 
+    const QString kWarningIconHtmlString = QStringLiteral(
+            "<html>"
+            "<img "
+            "src=':/images/preferences/ic_preferences_warning.svg' "
+            "width='20' height='20'>"
+            "</html> ");
+
     void setScrollSafeGuardForAllInputWidgets(QObject* obj);
     /// Avoid undesired value changes when scrolling a preferences page while
     /// the pointer is above an input widget (QSpinBox, QComboBox, QSlider):

diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
@@ -124,12 +124,7 @@ DlgPrefInterface::DlgPrefInterface(
 
     if (pSkinLoader) {
         // Skin configurations
-        QString sizeWarningString =
-                "<img src=\":/images/preferences/ic_preferences_warning.svg\") "
-                "width=16 height=16 />   " +
-                tr("The minimum size of the selected skin is bigger than your "
-                   "screen resolution.");
-        warningLabel->setText(sizeWarningString);
+        warningLabel->setText(kWarningIconHtmlString);
 
         ComboBoxSkinconf->clear();
         // align left edge of preview image and skin description with comboboxes

diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
@@ -799,27 +799,29 @@ void DlgPrefSound::checkLatencyCompensation() {
         micMonitorModeComboBox->setEnabled(true);
         if (configuredMicMonitorMode == EngineMixer::MicMonitorMode::DirectMonitor) {
             latencyCompensationSpinBox->setEnabled(true);
-            QString warningIcon(
-                    "<html>"
-                    "<img "
-                    "src=':/images/preferences/ic_preferences_warning.svg' "
-                    "width='20' height='20'>"
-                    "</html> ");
             QString lineBreak("<br/>");
             // TODO(Be): Make the "User Manual" text link to the manual.
             if (m_pLatencyCompensation->get() == 0.0) {
-                latencyCompensationWarningLabel->setText(
-                      warningIcon +
-                      tr("Microphone inputs are out of time in the record & broadcast signal compared to what you hear.") + lineBreak +
-                      tr("Measure round trip latency and enter it above for Microphone Latency Compensation to align microphone timing.") + lineBreak +
-                      tr("Refer to the Mixxx User Manual for details.") + "</html>");
+                latencyCompensationWarningLabel->setText(kWarningIconHtmlString +
+                        tr("Microphone inputs are out of time in the record & "
+                           "broadcast signal compared to what you hear.") +
+                        lineBreak +
+                        tr("Measure round trip latency and enter it above for "
+                           "Microphone Latency Compensation to align "
+                           "microphone timing.") +
+                        lineBreak +
+                        tr("Refer to the Mixxx User Manual for details.") +
+                        "</html>");
                 latencyCompensationWarningLabel->show();
             } else if (m_bLatencyChanged) {
-                latencyCompensationWarningLabel->setText(
-                  warningIcon +
-                  tr("Configured latency has changed.") + lineBreak +
-                  tr("Remeasure round trip latency and enter it above for Microphone Latency Compensation to align microphone timing.") + lineBreak +
-                  tr("Refer to the Mixxx User Manual for details.") + "</html>");
+                latencyCompensationWarningLabel->setText(kWarningIconHtmlString +
+                        tr("Configured latency has changed.") + lineBreak +
+                        tr("Remeasure round trip latency and enter it above "
+                           "for Microphone Latency Compensation to align "
+                           "microphone timing.") +
+                        lineBreak +
+                        tr("Refer to the Mixxx User Manual for details.") +
+                        "</html>");
                 latencyCompensationWarningLabel->show();
             } else {
                 latencyCompensationWarningLabel->hide();