Merge branch 'release-1.2' into master

xournalpp · Jan 12, 2024 · 1f1265a · 1f1265a
2 parents c2b7f65 + e5e00df
commit 1f1265a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/debian/rules b/debian/rules
@@ -12,4 +12,4 @@ override_dh_dwz:
 	dh_dwz --no-dwz-multifile
 
 override_dh_auto_configure:
-    dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.cpp b/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.cpp
@@ -30,9 +30,6 @@ PdfPagesDialog::PdfPagesDialog(GladeSearchpath* gladeSearchPath, Document* doc,
         auto* pv = new PdfElementView(elements.size(), p, this);
         elements.push_back(pv);
     }
-    if (doc->getPdfPageCount() > 0) {
-        setSelected(0);
-    }
 
     for (size_t i = 0; i < doc->getPageCount(); i++) {
         PageRef p = doc->getPage(i);
@@ -45,7 +42,7 @@ PdfPagesDialog::PdfPagesDialog(GladeSearchpath* gladeSearchPath, Document* doc,
         }
     }
 
-    updateOkButton();
+    gtk_widget_set_sensitive(get("buttonOk"), false);
 
     g_signal_connect(get("cbOnlyNotUsed"), "toggled", G_CALLBACK(onlyNotUsedCallback), this);
     g_signal_connect(get("buttonOk"), "clicked", G_CALLBACK(okButtonCallback), this);
@@ -105,3 +102,11 @@ void PdfPagesDialog::show(GtkWindow* parent) {
 
     BackgroundSelectDialogBase::show(parent);
 }
+
+void PdfPagesDialog::setSelected(int selected) {
+    BackgroundSelectDialogBase::setSelected(selected);
+
+    if (selected < this->elements.size()) {
+        gtk_widget_set_sensitive(get("buttonOk"), true);
+    }
+}
diff --git a/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.h b/src/core/gui/dialog/backgroundSelect/PdfPagesDialog.h
@@ -27,6 +27,7 @@ class PdfPagesDialog: public BackgroundSelectDialogBase {
 
 public:
     void show(GtkWindow* parent) override;
+    void setSelected(int selected) override;
     void updateOkButton();
     static double getZoom();
     size_t getSelectedPage();