[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-03-01 22:10:32
Message-ID: 20050301221032.EED5716EF1 () office ! kde ! org
[Download RAW message or body]

CVS commit by aacid: 

More on the DRM issue.
How it is going to end:
 - Exists a configure option called --enable-kpdf-drm that is DISABLE by default and \
                you can use to FORCE kpdf obeying DRM
 - Exists a kiosk option called skip_drm that is true by default and the admin can \
                set to TRUE to FORCE kdpf obeying DRM
 - Exists a GUI option called Obey pdf limitations that is shown if skip_drm is true, \
that option is ON by default, that means DRM is obeyed but the user can disable it \
from the GUI Hope that will please everyone
Please can somebody with better english than me check that the wording i used is \
actually correct english? Thanks


  A            conf/dlggeneral.ui.h   1.1 [no copyright]
  M +1 -0      TODO   1.40
  M +1 -1      configure.in.in   1.18
  M +14 -2     conf/dlggeneral.ui   1.8
  M +3 -0      conf/kpdf.kcfg   1.10
  M +3 -0      core/generator_pdf/generator_pdf.cpp   1.24


--- kdegraphics/kpdf/TODO  #1.39:1.40
@@ -76,4 +76,5 @@
 Done (newest features come first):
 -- merging from kdpf_annotations branch --
+-> ADD: Obey DRM is now a configuration option
 -> FIX: leakfix when closing document while thread was running (no more leaks now)
 -> FIX: direct hi-performance pixels manipulation for highlighting (instead of the \
obsoleted setRasterOp)

--- kdegraphics/kpdf/configure.in.in  #1.17:1.18
@@ -113,5 +113,5 @@
  esac
 ]
-, AC_DEFINE(KPDF_HAVE_DRM, 1, [Defines if use DRM in kpdf])
+, AC_DEFINE(KPDF_HAVE_DRM, 0, [Defines if use DRM in kpdf])
 )
 

--- kdegraphics/kpdf/conf/dlggeneral.ui  #1.7:1.8
@@ -10,5 +10,5 @@
             <y>0</y>
             <width>320</width>
-            <height>169</height>
+            <height>300</height>
         </rect>
     </property>
@@ -33,5 +33,5 @@
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
@@ -112,4 +112,12 @@
                             </property>
                         </widget>
+                        <widget class="QCheckBox">
+                            <property name="name">
+                                <cstring>kcfg_ObeyDRM</cstring>
+                            </property>
+                            <property name="text">
+                                <string>&amp;Obey DRM limitations</string>
+                            </property>
+                        </widget>
                     </vbox>
                 </widget>
@@ -195,5 +203,9 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="local" impldecl="in implementation">dlggeneral.ui.h</include>
 </includes>
+<functions>
+    <function access="protected" specifier="non virtual">showEvent( QShowEvent * \
)</function> +</functions>
 <pixmapfunction>DesktopIcon</pixmapfunction>
 <layoutdefaults spacing="6" margin="11"/>

--- kdegraphics/kpdf/conf/kpdf.kcfg  #1.9:1.10
@@ -54,4 +54,7 @@
    <default>true</default>
   </entry>
+  <entry key="ObeyDRM" type="Bool" >
+   <default>true</default>
+  </entry>
  </group>
  <group name="MainView" >

--- kdegraphics/kpdf/core/generator_pdf/generator_pdf.cpp  #1.23:1.24
@@ -16,4 +16,5 @@
 #include <qpaintdevicemetrics.h>
 #include <qregexp.h>
+#include <kapplication.h>
 #include <klocale.h>
 #include <kpassdlg.h>
@@ -214,4 +215,6 @@ const DocumentSynopsis * PDFGenerator::g
 bool PDFGenerator::isAllowed( int permissions )
 {
+    if (kapp->authorize("skip_drm") && !Settings::obeyDRM()) return true;
+
     bool b = true;
     if (permissions & KPDFDocument::AllowModify) b = b && pdfdoc->okToChange();


[prev in list] [next in list] [prev in thread] [next in thread]