Move the open new files in tabs setting to configure dialog

Also make it non enabled by default for now

GUI
BUGS: 155515

conf/dlggeneral.cpp

@@ -27,6 +27,7 @@ DlgGeneral::DlgGeneral( QWidget * parent, Okular::EmbedMode embedMode )
         m_dlg->kcfg_DisplayDocumentTitle->setVisible( false );
         m_dlg->kcfg_WatchFile->setVisible( false );
     }
+    m_dlg->kcfg_ShellOpenFileInTabs->setVisible( embedMode == Okular::NativeShellMode );
 }
 
 DlgGeneral::~DlgGeneral()

conf/dlggeneralbase.ui

@@ -187,6 +187,13 @@
         <property name="margin">
          <number>0</number>
         </property>
+        <item>
+         <widget class="QCheckBox" name="kcfg_ShellOpenFileInTabs">
+          <property name="text">
+           <string>Open new files in &amp;tabs</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QCheckBox" name="kcfg_ObeyDRM">
           <property name="text">

conf/okular.kcfg

@@ -79,6 +79,9 @@
    </entry>
  </group>
  <group name="General" >
+  <entry key="ShellOpenFileInTabs" type="Bool" >
+   <default>false</default>
+  </entry>
   <entry key="ShowOSD" type="Bool" >
    <default>true</default>
   </entry>

interfaces/viewerinterface.h

@@ -64,6 +64,10 @@ class ViewerInterface
          */
         virtual void setWatchFileModeEnabled(bool b) = 0;
 
+        /**
+         * Should the shell that supports tabs pen new files in tabs?
+         */
+        virtual bool openNewFilesInTabs() const = 0;
 
         // SIGNALS
         /**

part.cpp

@@ -942,6 +942,11 @@ void Part::setShowSourceLocationsGraphically(bool show)
     m_pageView->setShowSourceLocationsGraphically(show);
 }
 
+bool Part::openNewFilesInTabs() const
+{
+    return Okular::Settings::self()->shellOpenFileInTabs();
+}
+
 void Part::slotHandleActivatedSourceReference(const QString& absFileName, int line, int col, bool *handled)
 {
     emit openSourceReference( absFileName, line, col );

part.h

@@ -132,6 +132,7 @@ class OKULAR_PART_EXPORT Part : public KParts::ReadWritePart, public Okular::Doc
         void setWatchFileModeEnabled(bool enable);
         bool areSourceLocationsShownGraphically() const;
         void setShowSourceLocationsGraphically(bool show);
+        bool openNewFilesInTabs() const;
 
     public slots:                // dbus
         Q_SCRIPTABLE Q_NOREPLY void goToPage(uint page);

shell/shell.cpp

@@ -52,6 +52,7 @@
 
 // local includes
 #include "kdocumentviewer.h"
+#include "../interfaces/viewerinterface.h"
 #include "shellutils.h"
 
 static const char *shouldShowMenuBarComingFromFullScreen = "shouldShowMenuBarComingFromFullScreen";
@@ -174,7 +175,8 @@ void Shell::openUrl( const KUrl & url )
     const int activeTab = m_tabWidget->currentIndex();
     if ( activeTab < m_tabs.size() )
     {
-        if( !m_tabs[activeTab].part->url().isEmpty() )
+        KParts::ReadWritePart* const activePart = m_tabs[activeTab].part;
+        if( !activePart->url().isEmpty() )
         {
             if( m_unique )
             {
@@ -182,7 +184,7 @@ void Shell::openUrl( const KUrl & url )
             }
             else
             {
-                if( m_openInTab->isChecked() )
+                if( dynamic_cast<Okular::ViewerInterface *>(activePart)->openNewFilesInTabs() )
                 {
                     openNewTab( url );
                     setActiveTab( m_tabs.size()-1 );
@@ -197,16 +199,15 @@ void Shell::openUrl( const KUrl & url )
         }
         else
         {
-            KParts::ReadWritePart* const emptyPart = m_tabs[activeTab].part;
             m_tabWidget->setTabText( activeTab, url.fileName() );
             if ( m_args ){
-                KDocumentViewer* const doc = qobject_cast<KDocumentViewer*>(emptyPart);
+                KDocumentViewer* const doc = qobject_cast<KDocumentViewer*>(activePart);
                 if ( doc && m_args->isSet( "presentation" ) )
                     doc->startPresentation();
                 if ( m_args->isSet( "print" ) )
-                    QMetaObject::invokeMethod( emptyPart, "enableStartWithPrint" );
+                    QMetaObject::invokeMethod( activePart, "enableStartWithPrint" );
             }
-            bool openOk = emptyPart->openUrl( url );
+            bool openOk = activePart->openUrl( url );
             const bool isstdin = url.fileName( KUrl::ObeyTrailingSlash ) == QLatin1String( "-" );
             if ( !isstdin )
             {
@@ -246,8 +247,6 @@ void Shell::readSettings()
         m_menuBarWasShown = group.readEntry( shouldShowMenuBarComingFromFullScreen, true );
         m_toolBarWasShown = group.readEntry( shouldShowToolBarComingFromFullScreen, true );
     }
-
-    m_openInTab->setChecked( group.readEntry("OpenInTab", true) );
 }
 
 void Shell::writeSettings()
@@ -260,7 +259,6 @@ void Shell::writeSettings()
         group.writeEntry( shouldShowMenuBarComingFromFullScreen, m_menuBarWasShown );
         group.writeEntry( shouldShowToolBarComingFromFullScreen, m_toolBarWasShown );
     }
-    group.writeEntry( "OpenInTab", m_openInTab->isChecked() );
     KGlobal::config()->sync();
 }
 
@@ -294,9 +292,6 @@ void Shell::setupActions()
   m_prevTabAction->setShortcut( KStandardShortcut::tabPrev() );
   m_prevTabAction->setEnabled( false );
   connect( m_prevTabAction, SIGNAL(triggered()), this, SLOT(activatePrevTab()) );
-
-  m_openInTab = actionCollection()->add<KToggleAction>("open_in_tab");
-  m_openInTab->setText( i18n("Open Documents in New Tab") );
 }
 
 void Shell::saveProperties(KConfigGroup &group)

shell/shell.rc

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="8" name="okular_shell" >
+<kpartgui version="7" name="okular_shell" >
  <MenuBar>
   <Menu name="file" >
    <DefineGroup append="open_merge" name="file_open" />
@@ -12,7 +12,6 @@
   <Menu name="settings" >
    <DefineGroup append="show_merge" name="show_merge" />
    <DefineGroup append="configure_merge" name="configure_merge" />
-   <Action append="fullscreen_merge" name="open_in_tab" />
   </Menu>
   <Merge/>
   <Menu name="help">