Nabble - kde-graphics-devel

[patch]
Index: ../ksnapshot/ksnapshotwidget.ui

===================================================================

--- ../ksnapshot/ksnapshotwidget.ui	(Revision 905197)

+++ ../ksnapshot/ksnapshotwidget.ui	(Arbeitskopie)

@@ -218,6 +218,19 @@

       </widget>

      </item>

      <item>

+	<widget class="QCheckBox" name="cbCloseWhenOpen" >

+	<property name="whatsThis" >

+	<string>When enabled, KSnapShot will be closed when snapshot is opened with another application</string>

+	</property>

+	<property name="text" >

+	<string>Close KSnapshot when opening other application</string>

+	</property>

+	<property name="checked" >

+	<bool>true</bool>

+	</property>

+	</widget>

+    </item>

+     <item>

       <widget class="KPushButton" name="btnCopy" >

        <property name="whatsThis" >

         <string>Click this button to copy the current snapshot to the clipboard.</string>

Index: ../ksnapshot/ksnapshot.cpp

===================================================================

--- ../ksnapshot/ksnapshot.cpp	(Revision 906308)

+++ ../ksnapshot/ksnapshot.cpp	(Arbeitskopie)

@@ -100,6 +100,7 @@

     connect( mainWidget->btnCopy, SIGNAL( clicked() ), SLOT( slotCopy() ) );

 //    connect( mainWidget->btnOpen, SIGNAL( clicked() ), SLOT( slotOpen() ) );

     connect( mainWidget->comboMode, SIGNAL( activated(int) ), SLOT( slotModeChanged(int) ) );

+    connect( mainWidget->cbCloseWhenOpen, SIGNAL( toggled(bool) ), SLOT( slotCloseWhenOpenToggle(bool) ));

 

     openMenu = new QMenu(this);

     mainWidget->btnOpen->setMenu(openMenu);

@@ -162,7 +163,11 @@

     setMode( conf.readEntry("mode", 0) );

     setIncludeDecorations(conf.readEntry("includeDecorations",true));

     filename = KUrl( conf.readPathEntry( "filename", QDir::currentPath()+'/'+i18n("snapshot")+"1.png" ));

-

+    

+    // shall KSnapshot be closed when "open with" is used?

+    KConfigGroup confOpen(KGlobal::config(), "Open-with settings");

+    mainWidget->cbCloseWhenOpen->setChecked(confOpen.readEntry("close", false));

+    

     // Make sure the name is not already being used

     while(KIO::NetAccess::exists( filename, KIO::NetAccess::DestinationSide, this )) {

         autoincFilename();

@@ -294,7 +299,12 @@

 

     KUrl::List list;

     list.append(fileopen);

-    KRun::run(application, list, this);

+    if ( KRun::run(application, list, this) && closeWhenOpen() ) {

+        // if the service was able to run then we silently

+        // close the application.

+	accept();

+    }

+    

 }

 

 void KSnapshot::slotOpen(QAction* action)

@@ -330,13 +340,31 @@

 

         if (!service && !dlg.text().isEmpty())

         {

-             KRun::run(dlg.text(), list, this);

-             return;

+            if ( KRun::run(dlg.text(), list, this) ) {

+                // if the service was able to run then we silently

+                // close the application.

+		if ( closeWhenOpen() ){

+		    accept();

+		}

+            } else {

+                KMessageBox::error(this, i18n("Unable to open %1. Please check to make sure the application was properly installed.", service->name()));

+            }

+	    return;

         }

     }

 

     // we have an action with a service, run it!

-    KRun::run(*service, list, this, true);

+    if ( KRun::run(*service, list, this, true) ) {

+        // if the service was able to run then we silently

+        // close the application.

+        if ( closeWhenOpen() ){

+	    accept();

+	}

+    } else {

+        KMessageBox::error(this, i18n("Unable to open %1. Please check to make sure the application was properly installed.", service->name()));

+        return;

+    }

+    

 }

 

 void KSnapshot::slotPopulateOpenMenu()

@@ -400,6 +428,13 @@

     show();

 }

 

+void KSnapshot::slotCloseWhenOpenToggle(bool checked)

+{

+    KConfigGroup conf(KGlobal::config(), "Open-with settings");

+    conf.writeEntry("close", checked);

+    conf.sync();

+}

+

 void KSnapshot::closeEvent( QCloseEvent * e )

 {

     KConfigGroup conf(KGlobal::config(), "GENERAL");

@@ -599,6 +634,11 @@

     return mainWidget->cbIncludeDecorations->isChecked();

 }

 

+bool KSnapshot::closeWhenOpen() const

+{

+    return mainWidget->cbCloseWhenOpen->isChecked();

+}

+

 int KSnapshot::mode() const

 {

     return mainWidget->comboMode->currentIndex();

Index: ../ksnapshot/ksnapshot.h

===================================================================

--- ../ksnapshot/ksnapshot.h	(Revision 905197)

+++ ../ksnapshot/ksnapshot.h	(Arbeitskopie)

@@ -157,6 +157,7 @@

     void setTime( int newTime );

     void setURL( const QString &newURL );

     void setGrabMode( int m );

+    void slotCloseWhenOpenToggle( bool checked );

     void exit();

 

 protected:

@@ -182,6 +183,7 @@

     void setMode( int mode );

     int delay() const;

     bool includeDecorations() const;

+    bool closeWhenOpen() const;

     int mode() const;

     QPixmap preview();

     int previewWidth() const;


[okular-poppler-if-ifdef.patch]
Index: generator_pdf.cpp

===================================================================

--- generator_pdf.cpp	(revision 800186)

+++ generator_pdf.cpp	(working copy)

@@ -817,7 +817,7 @@ bool PDFGenerator::print( QPrinter& prin

 

     // TODO rotation

 

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

     tf.setAutoRemove(false);

 #else

     tf.close();

@@ -833,7 +833,7 @@ bool PDFGenerator::print( QPrinter& prin

 

     Poppler::PSConverter *psConverter = pdfdoc->psConverter();

 

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

     psConverter->setOutputDevice(&tf);

 #else

     psConverter->setOutputFileName(tempfilename);

@@ -1505,7 +1505,7 @@ bool PDFGenerator::supportsOption( SaveO

 {

     switch ( option )

     {

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

         case SaveChanges:

             return true;

 #endif

@@ -1516,7 +1516,7 @@ bool PDFGenerator::supportsOption( SaveO

 

 bool PDFGenerator::save( const QString &fileName, SaveOptions options )

 {

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

     Poppler::PDFConverter *pdfConv = pdfdoc->pdfConverter();

 

     pdfConv->setOutputFileName( fileName );


[okular-poppler-0.8.patch]
Index: generator_pdf.cpp

===================================================================

--- generator_pdf.cpp	(revision 800167)

+++ generator_pdf.cpp	(working copy)

@@ -46,6 +46,24 @@

 

 static const int PDFDebug = 4710;

 

+static inline double leftEdge(Poppler::TextBox *word, int pos)

+{

+#ifdef HAVE_POPPLER_0_8

+    return word->charBoundingBox(pos).left();

+#else

+    return word->edge(pos);

+#endif

+}

+

+static inline double rightEdge(Poppler::TextBox *word, int pos)

+{

+#ifdef HAVE_POPPLER_0_8

+    return word->charBoundingBox(pos).right();

+#else

+    return word->edge(pos+1);

+#endif

+}

+

 class PDFOptionsPage : public QWidget

 {

    public:

@@ -817,7 +835,7 @@ bool PDFGenerator::print( QPrinter& prin

 

     // TODO rotation

 

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

     tf.setAutoRemove(false);

 #else

     tf.close();

@@ -833,7 +851,7 @@ bool PDFGenerator::print( QPrinter& prin

 

     Poppler::PSConverter *psConverter = pdfdoc->psConverter();

 

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

     psConverter->setOutputDevice(&tf);

 #else

     psConverter->setOutputFileName(tempfilename);

@@ -1081,20 +1099,20 @@ Okular::TextPage * PDFGenerator::abstrac

                 s = word->text().at(j);

                 append(ktp, (j==charCount-1 && !next ) ? (s + '\n') : s,

                     // this letters boundary

-                    word->edge(j)/width,

+                    leftEdge(word, j)/width,

                     wordRect->bottom/height,

                     // next letters boundary

-                    word->edge(j+1)/width,

+                    rightEdge(word, j)/width,

                     wordRect->top/height);

             }

             

             if ( word->hasSpaceAfter() && next )

               append(ktp, " ",

                     // this letters boundary

-                     word->edge(charCount)/width,

+                     rightEdge(word, charCount-1)/width,

                      wordRect->bottom/height,

                     // next letters boundary

-                     next->edge(0)/width,

+                     leftEdge(next, 0)/width,

                      wordRect->top/height);

             break;

 

@@ -1106,19 +1124,19 @@ Okular::TextPage * PDFGenerator::abstrac

                 s=word->text().at(j);

                 append(ktp, (j==charCount-1 && !next ) ? (s + '\n') : s,

                     wordRect->left/width,

-                    word->edge(j)/height,

+                    leftEdge(word, j)/height,

                     wordRect->right/width,

-                    word->edge(j+1)/height);

+                    rightEdge(word, j)/height);

             }

             

             if ( word->hasSpaceAfter() && next )

               append(ktp, " ",

                     // this letters boundary

                      wordRect->left/width,

-                     word->edge(charCount)/height,

+                     rightEdge(word, charCount-1)/height,

                     // next letters boundary

                      wordRect->right/width,

-                     next->edge(0)/height);

+                     leftEdge(next, 0)/height);

             break;

 

             case 2:

@@ -1127,9 +1145,9 @@ Okular::TextPage * PDFGenerator::abstrac

             {

                 s=word->text().at(j);

                 append(ktp, (j==charCount-1 && !next ) ? (s + '\n') : s,

-                    word->edge(j+1)/width,

+                    rightEdge(word, j)/width,

                     wordRect->bottom/height,

-                    word->edge(j)/width,

+                    leftEdge(word, j)/width,

                     wordRect->top/height);

 

             }

@@ -1137,10 +1155,10 @@ Okular::TextPage * PDFGenerator::abstrac

             if ( word->hasSpaceAfter() && next )

               append(ktp, " ",

                     // this letters boundary

-                     next->edge(0)/width,

+                     leftEdge(next, 0)/width,

                      wordRect->bottom/height,

                     // next letters boundary

-                     word->edge(charCount)/width,

+                     rightEdge(word, charCount-1)/width,

                      wordRect->top/height);

            

             break;

@@ -1151,19 +1169,19 @@ Okular::TextPage * PDFGenerator::abstrac

                 s=word->text().at(j);

                 append(ktp, (j==charCount-1 && !next ) ? (s + '\n') : s,

                     wordRect->left/width,

-                    word->edge(j+1)/height,

+                    rightEdge(word, j)/height,

                     wordRect->right/width,

-                    word->edge(j)/height);

+                    leftEdge(word, j)/height);

             }

             

             if ( word->hasSpaceAfter() && next )

               append(ktp, " ",

                     // this letters boundary

                      wordRect->left/width,

-                     next->edge(0)/height,

+                     leftEdge(next, 0)/height,

                     // next letters boundary

                      wordRect->right/width,

-                     word->edge(charCount)/height);

+                     rightEdge(word, charCount-1)/height);

             break;

         }

     }

@@ -1505,7 +1523,7 @@ bool PDFGenerator::supportsOption( SaveO

 {

     switch ( option )

     {

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

         case SaveChanges:

             return true;

 #endif

@@ -1516,7 +1534,7 @@ bool PDFGenerator::supportsOption( SaveO

 

 bool PDFGenerator::save( const QString &fileName, SaveOptions options )

 {

-#if HAVE_POPPLER_0_7

+#ifdef HAVE_POPPLER_0_7

     Poppler::PDFConverter *pdfConv = pdfdoc->pdfConverter();

 

     pdfConv->setOutputFileName( fileName );

Index: config-okular-poppler.h.cmake

===================================================================

--- config-okular-poppler.h.cmake	(revision 800167)

+++ config-okular-poppler.h.cmake	(working copy)

@@ -1,5 +1,8 @@

 /* Defined if we have the 0.7 version of the Poppler library */

 #cmakedefine HAVE_POPPLER_0_7 1

 

+/* Defined if we have the 0.8 version of the Poppler library */

+#cmakedefine HAVE_POPPLER_0_8 1

+

 /* Defined if we have the 0.9 version of the Poppler library */

 #cmakedefine HAVE_POPPLER_0_9 1

Index: CMakeLists.txt

===================================================================

--- CMakeLists.txt	(revision 800167)

+++ CMakeLists.txt	(working copy)

@@ -16,6 +16,15 @@ check_cxx_source_compiles("

 #include <poppler-qt4.h>

 int main()

 {

+  Poppler::TextBox * box = 0;

+  box->charBoundingBox(0);

+  return 0;

+}

+" HAVE_POPPLER_0_8)

+check_cxx_source_compiles("

+#include <poppler-qt4.h>

+int main()

+{

   Poppler::Document * doc = 0;

   (void)doc->scripts();

   return 0;



Nabble - kde-graphics-devel

Re: KSnapshot screencast feature

Re: KSnapshot screencast feature

Re: KSnapshot screencast feature

Re: KSnapshot screencast feature

Re: KSnapshot screencast feature

Re: KSnapshot screencast feature

Re: KSnapshot screencast feature

KSnapshot screencast feature

Re: checking libksane version

Re: checking libksane version

checking libksane version

Re: ksnapshot patch

Re: ksnapshot patch

Re: ksnapshot patch

Re: ksnapshot patch

Re: ksnapshot patch

Re: ksnapshot patch

Re: ksnapshot patch

ksnapshot patch

Re: kruler maintainership

Re: kruler maintainership

kruler maintainership

Looking for new maintainer for kpovmodeler

Re: Review Request: shadowBlur and shadowText libplasma functions

Some changes

Quasar todo

Re: Quasar

Re: Quasar

Re: Quasar

Re: Quasar

Quasar

Re: [PATCH] Okular: support Poppler 0.8

Re: [PATCH] Okular: support Poppler 0.8

[PATCH] Okular: support Poppler 0.8

header intact