From bbe8d9167fb2bca9f6bf39f1c6c1670655296cfc Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Sat, 22 Jun 2024 08:41:26 +1000
Subject: [PATCH] Fix checks

---
 src/app/options/qgsideoptions.cpp | 15 ++++++++-------
 src/app/options/qgsideoptions.h   |  3 +--
 src/ui/qgsideoptionswidgetbase.ui | 22 +++++++++++++++++++---
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/app/options/qgsideoptions.cpp b/src/app/options/qgsideoptions.cpp
index d88089df069..2afe28d2632 100644
--- a/src/app/options/qgsideoptions.cpp
+++ b/src/app/options/qgsideoptions.cpp
@@ -35,7 +35,7 @@ QgsIdeOptionsWidget::QgsIdeOptionsWidget( QWidget *parent )
   connect( mGenerateTokenButton, &QPushButton::clicked, this, &QgsIdeOptionsWidget::generateGitHubToken );
 
   QgsSettings settings;
-  mTokenLineEdit->setText(settings.value("pythonConsole/accessTokenGithub", QString() ).toString() );
+  mTokenLineEdit->setText( settings.value( "pythonConsole/accessTokenGithub", QString() ).toString() );
 }
 
 QgsIdeOptionsWidget::~QgsIdeOptionsWidget() = default;
@@ -47,20 +47,21 @@ QString QgsIdeOptionsWidget::helpKey() const
 
 void QgsIdeOptionsWidget::apply()
 {
-    QgsSettings settings;
-    settings.setValue("pythonConsole/accessTokenGithub", mTokenLineEdit->text() );
+  QgsSettings settings;
+  settings.setValue( "pythonConsole/accessTokenGithub", mTokenLineEdit->text() );
 }
 
 void QgsIdeOptionsWidget::generateGitHubToken()
 {
-  QDesktopServices::openUrl(QUrl(
-    QStringLiteral("https://github.com/settings/tokens/new?description=%1&scopes=gist").arg(tr("QGIS Code Editor"))
-  ));
+  QDesktopServices::openUrl( QUrl(
+                               QStringLiteral( "https://github.com/settings/tokens/new?description=%1&scopes=gist" ).arg( tr( "QGIS Code Editor" ) )
+                             ) );
 }
 
 //
 // QgsIdeOptionsFactory
 //
+
 QgsIdeOptionsFactory::QgsIdeOptionsFactory()
   : QgsOptionsWidgetFactory( tr( "IDE" ), QIcon(), QStringLiteral( "ide" ) )
 {
@@ -79,5 +80,5 @@ QgsOptionsPageWidget *QgsIdeOptionsFactory::createWidget( QWidget *parent ) cons
 
 QString QgsIdeOptionsFactory::pagePositionHint() const
 {
-    return QString();
+  return QString();
 }
diff --git a/src/app/options/qgsideoptions.h b/src/app/options/qgsideoptions.h
index 56855e0fbd5..fc0e66eda3d 100644
--- a/src/app/options/qgsideoptions.h
+++ b/src/app/options/qgsideoptions.h
@@ -39,7 +39,7 @@ class QgsIdeOptionsWidget : public QgsOptionsPageWidget, private Ui::QgsIdeOptio
 
     void apply() override;
 
-private slots:
+  private slots:
 
     void generateGitHubToken();
 
@@ -60,5 +60,4 @@ class QgsIdeOptionsFactory : public QgsOptionsWidgetFactory
 
 };
 
-
 #endif // QGSIDEOPTIONS_H
diff --git a/src/ui/qgsideoptionswidgetbase.ui b/src/ui/qgsideoptionswidgetbase.ui
index 53f549fc7b6..0b7f1bd27cd 100644
--- a/src/ui/qgsideoptionswidgetbase.ui
+++ b/src/ui/qgsideoptionswidgetbase.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>QgsIdeOptionsWidgetBase</class>
  <widget class="QWidget" name="QgsIdeOptionsWidgetBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>235</width>
+    <height>117</height>
+   </rect>
+  </property>
   <layout class="QGridLayout" name="gridLayout_16">
    <property name="leftMargin">
     <number>0</number>
@@ -16,7 +24,7 @@
     <number>0</number>
    </property>
    <item row="0" column="0">
-    <widget class="QScrollArea" name="scrollArea">
+    <widget class="QgsScrollArea" name="scrollArea">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
@@ -28,8 +36,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>500</width>
-        <height>432</height>
+        <width>235</width>
+        <height>117</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
@@ -87,6 +95,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QgsScrollArea</class>
+   <extends>QScrollArea</extends>
+   <header>qgsscrollarea.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>
   <tabstop>mTokenLineEdit</tabstop>