Attachment 74942 Details for Bug 37347 – shows a possibility to use thin line modes in okular

[patch] shows a possibility to use thin line modes in okular

thinlines.patch (text/plain), 4.52 KB, created by Thomas Freitag on 2013-02-16 14:46:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2013-02-16 14:46:13 UTC

Size: 4.52 KB

patch

obsolete

>diff --git a/cmake/modules/FindPoppler.cmake b/cmake/modules/FindPoppler.cmake
>index 6e421d9..12fbff4 100644
>--- a/cmake/modules/FindPoppler.cmake
>+++ b/cmake/modules/FindPoppler.cmake
>@@ -116,9 +116,22 @@ int main()
> }
> " HAVE_POPPLER_0_22)
> 
>+check_cxx_source_compiles("
>+#include <poppler-qt4.h>
>+int main()
>+{
>+  Poppler::Document *doc = 0;
>+
>+  doc->thinLineMode();
>+  return 0;
>+}
>+" HAVE_POPPLER_0_24)
>+
>   set(CMAKE_REQUIRED_INCLUDES)
>   set(CMAKE_REQUIRED_LIBRARIES)
>-  if (HAVE_POPPLER_0_22)
>+  if (HAVE_POPPLER_0_24)
>+    set(popplerVersionMessage "0.24")
>+  elseif (HAVE_POPPLER_0_22)
>     set(popplerVersionMessage "0.22")
>   elseif (HAVE_POPPLER_0_20)
>     set(popplerVersionMessage "0.20")
>diff --git a/conf/dlgaccessibilitybase.ui b/conf/dlgaccessibilitybase.ui
>index 9e76a75..5d47d01 100644
>--- a/conf/dlgaccessibilitybase.ui
>+++ b/conf/dlgaccessibilitybase.ui
>@@ -37,6 +37,39 @@
>     </widget>
>    </item>
>    <item>
>+       <layout class="QHBoxLayout" >
>+        <item>
>+         <widget class="QLabel" name="label" >
>+          <property name="text" >
>+           <string>Enhance thin lines:</string>
>+          </property>
>+          <property name="alignment" >
>+           <set>Qt::AlignLeft|Qt::AlignVCenter</set>
>+          </property>
>+         </widget>
>+      </item>
>+      <item>
>+         <widget class="KComboBox" name="kcfg_EnhanceThinLines" >
>+          <item>
>+           <property name="text" >
>+            <string>No</string>
>+           </property>
>+          </item>
>+          <item>
>+           <property name="text" >
>+            <string>Solid</string>
>+           </property>
>+          </item>
>+          <item>
>+           <property name="text" >
>+            <string>Shape</string>
>+           </property>
>+          </item>
>+         </widget>
>+      </item>
>+     </layout>
>+   </item>
>+   <item>
>     <widget class="QGroupBox" name="kcfg_ChangeColors" >
>      <property name="enabled" >
>       <bool>true</bool>
>diff --git a/conf/okular_core.kcfg b/conf/okular_core.kcfg
>index 054b5c1..1fac6c7 100644
>--- a/conf/okular_core.kcfg
>+++ b/conf/okular_core.kcfg
>@@ -47,6 +47,14 @@
>   <entry key="ChangeColors" type="Bool" >
>    <default>false</default>
>   </entry>
>+  <entry key="EnhanceThinLines" type="Enum" >
>+   <default>No</default>
>+   <choices>
>+    <choice name="No" />
>+    <choice name="Solid" />
>+    <choice name="Shape" />
>+   </choices>
>+  </entry>
>   <entry key="RenderMode" type="Enum" >
>    <default>Inverted</default>
>    <choices>
>diff --git a/core/document.cpp b/core/document.cpp
>index 372af56..0999df1 100644
>--- a/core/document.cpp
>+++ b/core/document.cpp
>@@ -1802,6 +1802,21 @@ QVariant DocumentPrivate::documentMetaData( const QString &key, const QVariant &
>         }
>         return color;
>     }
>+    else if ( key == QLatin1String( "EnhanceThinLines" ) )
>+    {
>+        switch ( SettingsCore::enhanceThinLines() )
>+        {
>+            case SettingsCore::EnumEnhanceThinLines::No:
>+                return 0;
>+                break;
>+            case SettingsCore::EnumEnhanceThinLines::Solid:
>+                return 1;
>+                break;
>+            case SettingsCore::EnumEnhanceThinLines::Shape:
>+                return 2;
>+                break;
>+        }
>+    }
>     else if ( key == QLatin1String( "TextAntialias" ) )
>     {
>         switch ( SettingsCore::textAntialias() )
>diff --git a/generators/poppler/config-okular-poppler.h.cmake b/generators/poppler/config-okular-poppler.h.cmake
>index 2ce6a4a..4f9bbbc 100644
>--- a/generators/poppler/config-okular-poppler.h.cmake
>+++ b/generators/poppler/config-okular-poppler.h.cmake
>@@ -9,3 +9,6 @@
> 
> /* Defined if we have the 0.22 version of the Poppler library */
> #cmakedefine HAVE_POPPLER_0_22 1
>+
>+/* Defined if we have the 0.24 version of the Poppler library */
>+#cmakedefine HAVE_POPPLER_0_24 1
>diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
>index 0b2c253..21835f7 100644
>--- a/generators/poppler/generator_pdf.cpp
>+++ b/generators/poppler/generator_pdf.cpp
>@@ -1275,6 +1275,15 @@ bool PDFGenerator::reparseConfig()
>         userMutex()->unlock();
>         somethingchanged = true;
>     }
>+    // load thin line mode
>+    int thinLineMode = documentMetaData( "EnhanceThinLines", true ).value< int >();
>+    if ( thinLineMode != pdfdoc->thinLineMode() )
>+    {
>+        userMutex()->lock();
>+        pdfdoc->setThinLineMode(thinLineMode);
>+        userMutex()->unlock();
>+        somethingchanged = true;
>+    }
>     bool aaChanged = setDocumentRenderHints();
>     somethingchanged = somethingchanged || aaChanged;
>     return somethingchanged;

Actions: View | Splinter Review

Attachments on bug 37347: 46889 | 46890 | 46891 | 46920 | 47549 | 47550 | 60900 | 61019 | 62123 | 65140 | 68838 | 72580 | 74941 | 74942 | 75400 | 75401

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.