From c2d7252193cdf6e4cf4a547d1bfa60cc47c7de95 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sat, 13 Mar 2021 21:25:09 +0100
Subject: [PATCH 1/2] GIT_SILENT Upgrade release service version to 21.03.80.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index faca616c6..7c8012dd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "21")
 set (RELEASE_SERVICE_VERSION_MINOR "03")
-set (RELEASE_SERVICE_VERSION_MICRO "70")
+set (RELEASE_SERVICE_VERSION_MICRO "80")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(okular VERSION ${RELEASE_SERVICE_VERSION})

From d0b9b138cc352b6af1dc0bb8427cfc1608b7ac30 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Fri, 19 Feb 2021 13:17:33 -0700
Subject: [PATCH 2/2] Switch to existing document in new tab by default

Right now Okular defaults to opening an already-open document in a new
tab when opened a second time, which is a bit odd. Most other
document-based apps will switch to the existing document's instance
instead of opening a new instance of it.

Interestingly enough, Okular has an option to do this, but it's off by
default. I think on by default makes more sense here, to be consistent
with other document-based apps. Since the option exists, people who have
a specialized use case that commonly involves opening multiple instances
of the same document can toggle the option to have that. Everyone wins!

BUG: 432942
FIXED-IN: 21.04
---
 conf/okular.kcfg  | 2 +-
 doc/index.docbook | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/okular.kcfg b/conf/okular.kcfg
index 7021f6408..482ca3478 100644
--- a/conf/okular.kcfg
+++ b/conf/okular.kcfg
@@ -174,7 +174,7 @@
    <default>false</default>
   </entry>
   <entry key="SwitchToTabIfOpen" type="Bool">
-    <default>false</default>
+    <default>true</default>
   </entry>
   <entry key="ShowOSD" type="Bool" >
    <default>true</default>
diff --git a/doc/index.docbook b/doc/index.docbook
index 580369d4f..f147ba580 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -2588,7 +2588,7 @@ Context menu actions like Rename Bookmarks etc.)
 				<varlistentry>
 					<term><guilabel>Switch to existing tab if file is already open</guilabel></term>
 					<listitem>
-						<para>Whether &okular; should switch to a tab if the file is already open instead of opening a new tab. This option is disabled by default. Can be toggled only if <guilabel>Open new files in tabs</guilabel> is enabled.</para>
+						<para>Whether &okular; should switch to a tab if the file is already open instead of opening a new tab. This option is enabled by default. Can be toggled only if <guilabel>Open new files in tabs</guilabel> is enabled.</para>
 					</listitem>
 				</varlistentry>
 				<varlistentry>