Add setting to move ascent title label in ascent viewer

Includes translation

Author: svetter

src/settings/settings.h

@@ -360,6 +360,10 @@ class Settings {
 	/** Enable the start and end date fields for new trips by default. */
 	inline static const Setting<bool>	tripDialog_datesEnabledInitially			= Setting<bool>		("tripDialog/datesEnabledInitially",			true);
 
+	// Ascent viewer
+	/** Show the ascent title below the peak name in the peak info box instead of the ascent info box in the ascent viewer. */
+	inline static const Setting<bool>	ascentViewer_ascentTitleUnderPeakName		= Setting<bool>		("ascentViewer/ascentTitleUnderPeakName",		false);
+	
 
 	// === IMPLICIT ===
 

src/settings/settings_window.cpp

@@ -123,6 +123,8 @@ void SettingsWindow::loadSettings()
 
 	tripDatesCheckbox							->setChecked	(tripDialog_datesEnabledInitially			.get());
 
+	ascentTitleUnderPeakNameCheckbox			->setChecked	(ascentViewer_ascentTitleUnderPeakName		.get());
+	
 	updateEnabled();
 }
 
@@ -163,6 +165,8 @@ void SettingsWindow::loadDefaults()
 
 	tripDatesCheckbox							->setChecked	(tripDialog_datesEnabledInitially			.getDefault());
 
+	ascentTitleUnderPeakNameCheckbox			->setChecked	(ascentViewer_ascentTitleUnderPeakName		.getDefault());
+	
 	updateEnabled();
 }
 
@@ -211,6 +215,8 @@ void SettingsWindow::saveSettings()
 
 	tripDialog_datesEnabledInitially			.set(tripDatesCheckbox							->isChecked());
 
+	ascentViewer_ascentTitleUnderPeakName		.set(ascentTitleUnderPeakNameCheckbox			->isChecked());
+	
 	if (languageBefore != language.get()) {
 		QString title = tr("Language setting changed");
 		QString message = tr("Changing the language requires a restart.");
@@ -391,4 +397,4 @@ void SettingsWindow::applyStyle(QString styleString)
 void SettingsWindow::reject()
 {
 	handle_cancel();
-}
+}

src/ui/ascent_viewer.ui

@@ -62,7 +62,7 @@
             <x>0</x>
             <y>0</y>
             <width>422</width>
-            <height>844</height>
+            <height>836</height>
            </rect>
           </property>
           <property name="sizePolicy">
@@ -524,7 +524,7 @@
                <widget class="QLabel" name="ascentTitleLabel">
                 <property name="font">
                  <font>
-                  <pointsize>20</pointsize>
+                  <pointsize>16</pointsize>
                  </font>
                 </property>
                 <property name="text">

src/ui/settings_window.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>823</height>
+    <height>895</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -45,7 +45,7 @@
     <number>10</number>
    </property>
    <item>
-    <layout class="QFormLayout" name="topSettingsLayout">
+    <layout class="QFormLayout" name="mainSettingsLayout">
      <property name="horizontalSpacing">
       <number>10</number>
      </property>
@@ -317,11 +317,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="defaultValuesSettingsBox">
+    <widget class="QGroupBox" name="defaultValuesBox">
      <property name="title">
       <string>Default values for new items</string>
      </property>
-     <layout class="QVBoxLayout" name="defaultValuesSettingsBoxLayout">
+     <layout class="QVBoxLayout" name="defaultValuesBoxLayout">
       <property name="spacing">
        <number>5</number>
       </property>
@@ -594,6 +594,37 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="ascentViewerBox">
+     <property name="title">
+      <string>Ascent Viewer</string>
+     </property>
+     <layout class="QVBoxLayout" name="ascentViewerBoxLayout">
+      <property name="spacing">
+       <number>5</number>
+      </property>
+      <property name="leftMargin">
+       <number>10</number>
+      </property>
+      <property name="topMargin">
+       <number>5</number>
+      </property>
+      <property name="rightMargin">
+       <number>10</number>
+      </property>
+      <property name="bottomMargin">
+       <number>5</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="ascentTitleUnderPeakNameCheckbox">
+        <property name="text">
+         <string>Show ascent title below peak name, not in ascent box</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="bottomSpacer">
      <property name="orientation">

src/viewer/ascent_viewer.cpp

@@ -98,6 +98,13 @@ void AscentViewer::additionalUISetup()
 	rightSplitter	->setSizes({ rightSplitter->size().width() / 2, rightSplitter->size().width() / 2 });
 
 
+	// Move ascent title label if settings dictate
+	if (Settings::ascentViewer_ascentTitleUnderPeakName.get()) {
+		peakInfoBoxLayout->insertWidget(1, ascentInfoLine);
+		peakInfoBoxLayout->insertWidget(2, ascentTitleLabel);
+	}
+	
+	
 	// Set icons for info boxes
 	tripInfoBox				->setIcon(QIcon(":/icons/trip.svg"),	28, 28);
 	peakInfoBox				->setIcon(QIcon(":/icons/peak.svg"),	28, 28);