Merge branch 'sizeHint_for_settings' into 'master'

Implementation of sizeHint based on implementation of systemsettings

See merge request graphics/okular!499

CMakeLists.txt

@@ -487,6 +487,7 @@ if (TARGET Qt6::Qml)
             core/script/js_util.cpp
             core/script/js_event.cpp
             core/script/js_ocg.cpp
+            core/script/js_global.cpp
     )
     target_link_libraries(okularcore PRIVATE Qt6::Qml)
 endif()

core/script/executor_js.cpp

@@ -20,6 +20,7 @@
 #include "js_event_p.h"
 #include "js_field_p.h"
 #include "js_fullscreen_p.h"
+#include "js_global_p.h"
 #include "js_ocg_p.h"
 #include "js_spell_p.h"
 #include "js_util_p.h"
@@ -71,6 +72,7 @@ void ExecutorJSPrivate::initTypes()
     m_interpreter.globalObject().setProperty(QStringLiteral("display"), m_interpreter.newQObject(new JSDisplay));
     m_interpreter.globalObject().setProperty(QStringLiteral("spell"), m_interpreter.newQObject(new JSSpell));
     m_interpreter.globalObject().setProperty(QStringLiteral("util"), m_interpreter.newQObject(new JSUtil));
+    m_interpreter.globalObject().setProperty(QStringLiteral("global"), m_interpreter.newQObject(new JSGlobal));
 }
 
 ExecutorJS::ExecutorJS(DocumentPrivate *doc)

core/script/js_global.cpp

@@ -0,0 +1,16 @@
+/*
+    SPDX-FileCopyrightText: 2024 Pratham Gandhi <ppg.1382@gmail.com>
+
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#include "js_global_p.h"
+
+using namespace Okular;
+
+JSGlobal::JSGlobal(QObject *parent)
+    : QObject(parent)
+{
+}
+
+JSGlobal::~JSGlobal() = default;

core/script/js_global_p.h

@@ -0,0 +1,25 @@
+/*
+    SPDX-FileCopyrightText: 2024 Pratham Gandhi <ppg.1382@gmail.com>
+
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#ifndef OKULAR_SCRIPT_JS_GLOBAL_P_H
+#define OKULAR_SCRIPT_JS_GLOBAL_P_H
+
+#include <QObject>
+
+namespace Okular
+{
+
+class JSGlobal : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit JSGlobal(QObject *parent = nullptr);
+    ~JSGlobal() override;
+};
+
+}
+#endif

part/preferencesdialog.cpp

@@ -9,6 +9,10 @@
 
 #include <KLocalizedString>
 
+#include <QFontDatabase>
+#include <QGuiApplication>
+#include <QScreen>
+
 // single config pages
 #include "dlgaccessibility.h"
 #include "dlgannotations.h"
@@ -23,6 +27,7 @@
 PreferencesDialog::PreferencesDialog(QWidget *parent, KConfigSkeleton *skeleton, Okular::EmbedMode embedMode, const QString &editCmd)
     : KConfigDialog(parent, QStringLiteral("preferences"), skeleton)
 {
+    setMinimumSize(PreferencesDialog::sizeHint());
     setWindowModality(Qt::ApplicationModal);
 
     m_general = new DlgGeneral(this, embedMode);
@@ -78,3 +83,14 @@ void PreferencesDialog::switchToAnnotationsPage()
         setCurrentPage(m_annotationsPage);
     }
 }
+
+QSize PreferencesDialog::sizeHint() const
+{   // Code based on the implementation of sizeHint of the systemsettings project
+    // Take the font size into account for the window size, as we do for UI elements
+    const float fontSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSizeF();
+    const QSize targetSize = QSize(qRound(102 * fontSize), qRound(70 * fontSize));
+
+    // on smaller or portrait-rotated screens, do not max out height and/or width
+    const QSize screenSize = (QGuiApplication::primaryScreen()->availableSize() * 0.9);
+    return targetSize.boundedTo(screenSize);
+}

part/preferencesdialog.h

@@ -33,7 +33,9 @@ public:
     void switchToAccessibilityPage();
     void switchToAnnotationsPage();
 
+
 protected:
+    QSize sizeHint() const override;
     //      void updateSettings(); // Called when OK/Apply is pressed.
     //      void updateWidgets(); // Called upon construction or when Reset is pressed
     //      void updateWidgetsDefault(); // Called when Defaults button is pressed

po/tr/okular.po

@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: kdegraphics-kde4\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2024-06-20 00:38+0000\n"
-"PO-Revision-Date: 2024-03-22 16:14+0300\n"
+"PO-Revision-Date: 2024-06-22 13:04+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
 "Language: tr\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 24.02.1\n"
+"X-Generator: Lokalize 24.07.70\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -4768,7 +4768,7 @@ msgstr "Küçük görselleri sayfa ile eşzamanla"
 #: part/part.cpp:3126
 #, kde-format
 msgid "Add Bookmark"
-msgstr "Yer İmi Ekle"
+msgstr "Yer İmi Koy"
 
 #: part/part.cpp:3148
 #, kde-format