Use font.capitalization instead of the custom javascript function used and return...

diff --git a/qml/ImageResolutionSettings.qml b/qml/ImageResolutionSettings.qml
index 8d6df88..344aa33 100644 (file)
--- a/qml/ImageResolutionSettings.qml
+++ b/qml/ImageResolutionSettings.qml
@@ -70,7 +70,8 @@ Column {
                         delegate: Button {
                                 property string resolution: resolutionName
                                 property string aspectRatio: resolutionAspectRatio
-                                text: qsTr("%1 Mpx").arg(megaPixels);
+                                font.capitalization: Font.Capitalize
+                                text: qsTr("%1 %2 Mpx").arg(resolutionName).arg(megaPixels);
                                 checked: settings.imageResolution == resolutionName
                                 onClicked: Util.setResolution(resolutionName);
                         }

diff --git a/qml/VideoResolutionSettings.qml b/qml/VideoResolutionSettings.qml
index 6b4308c..e719002 100644 (file)
--- a/qml/VideoResolutionSettings.qml
+++ b/qml/VideoResolutionSettings.qml
@@ -41,12 +41,9 @@ Column {
 
                         model: videoSettings.resolutions
 
-                        function name(name, res) {
-                                return name.charAt(0).toUpperCase() + name.slice(1) + " " + res;
-                        }
-
                         delegate: Button {
-                                text: resolutions.name(resolutionName, resolution);
+                                font.capitalization: Font.Capitalize
+                                text: qsTr("%1 %2").arg(resolutionName).arg(resolution);
                                 checked: settings.videoResolution == resolutionName;
                                 onClicked: settings.videoResolution = resolutionName;
                         }