Hello community, here is the log from the commit of package ksnapshot for openSUSE:Factory checked in at 2013-07-08 07:33:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksnapshot (Old) and /work/SRC/openSUSE:Factory/.ksnapshot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksnapshot" Changes: -------- --- /work/SRC/openSUSE:Factory/ksnapshot/ksnapshot.changes 2013-06-11 09:32:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksnapshot.new/ksnapshot.changes 2013-07-08 07:33:20.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:14:17 UTC 2013 - [email protected] + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:18:08 UTC 2013 - [email protected] + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- ksnapshot-4.10.4.tar.xz New: ---- ksnapshot-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksnapshot.spec ++++++ --- /var/tmp/diff_new_pack.AFoDK6/_old 2013-07-08 07:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.AFoDK6/_new 2013-07-08 07:33:21.000000000 +0200 @@ -29,7 +29,7 @@ %else BuildRequires: sane-backends %endif -Version: 4.10.4 +Version: 4.10.90 Release: 0 Summary: Screen Capture Program License: GPL-2.0+ ++++++ ksnapshot-4.10.4.tar.xz -> ksnapshot-4.10.90.tar.xz ++++++ Files old/ksnapshot-4.10.4/doc/index.cache.bz2 and new/ksnapshot-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/doc/index.docbook new/ksnapshot-4.10.90/doc/index.docbook --- old/ksnapshot-4.10.4/doc/index.docbook 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/doc/index.docbook 2013-06-10 20:53:19.000000000 +0200 @@ -81,8 +81,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2011-07-05</date> -<releaseinfo>0.8.2 (&kde; 4.7)</releaseinfo> +<date>2013-05-22</date> +<releaseinfo>0.8.2 (&kde; 4.11)</releaseinfo> <abstract> <para>&ksnapshot; is a simple application for taking screenshots. It is capable @@ -236,6 +236,13 @@ <para>If you have multiple screens, <guilabel>Current Screen</guilabel> captures the screen containing the mouse cursor when the screenshot is taken.</para> + +<para>When keeping &ksnapshot; open to take several snapshots using <guibutton> +Rectangular Region</guibutton> or <guibutton>Freehand Region</guibutton>, +the subsequent snapshots will be initialized with the last shape used with this +function (since you launched &ksnapshot;). You have then the possibility to adjust the +handles of the rectangular shape, to move the freehand region, or to completely replace the +shape by starting to draw a new one at a different place of the screen.</para> </sect1> <sect1 id="additional-features"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/freeregiongrabber.cpp new/ksnapshot-4.10.90/freeregiongrabber.cpp --- old/ksnapshot-4.10.4/freeregiongrabber.cpp 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/freeregiongrabber.cpp 2013-06-10 20:53:19.000000000 +0200 @@ -29,9 +29,9 @@ #include <klocale.h> #include <KWindowSystem> -FreeRegionGrabber::FreeRegionGrabber( ) : +FreeRegionGrabber::FreeRegionGrabber( const QPolygon &startFreeRegion ) : QWidget( 0, Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Tool ), - selection(), mouseDown( false ), newSelection( false ), + selection( startFreeRegion ), mouseDown( false ), newSelection( false ), handleSize( 10 ), mouseOverHandle( 0 ), showHelp( true ), grabbing( false ) { @@ -263,8 +263,10 @@ void FreeRegionGrabber::keyPressEvent( QKeyEvent* e ) { + QPolygon pol = selection; if ( e->key() == Qt::Key_Escape ) { + emit freeRegionUpdated( pol ); emit freeRegionGrabbed( QPixmap() ); } else if ( e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return ) @@ -307,6 +309,7 @@ pt.drawPixmap(pixmap2.rect(), pixmap, pol.boundingRect()); pt.end(); + emit freeRegionUpdated(pol); emit freeRegionGrabbed(pixmap2); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/freeregiongrabber.h new/ksnapshot-4.10.90/freeregiongrabber.h --- old/ksnapshot-4.10.4/freeregiongrabber.h 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/freeregiongrabber.h 2013-06-10 20:53:19.000000000 +0200 @@ -31,9 +31,9 @@ class FreeRegionGrabber : public QWidget { Q_OBJECT - + public: - FreeRegionGrabber(); + FreeRegionGrabber( const QPolygon &startFreeRegion ); ~FreeRegionGrabber(); protected slots: @@ -41,6 +41,7 @@ signals: void freeRegionGrabbed( const QPixmap & ); + void freeRegionUpdated( const QPolygon & ); protected: void paintEvent( QPaintEvent* e ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/kbackgroundsnapshot.cpp new/ksnapshot-4.10.90/kbackgroundsnapshot.cpp --- old/ksnapshot-4.10.4/kbackgroundsnapshot.cpp 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/kbackgroundsnapshot.cpp 2013-06-10 20:53:19.000000000 +0200 @@ -60,7 +60,7 @@ } case KSnapshotObject::ChildWindow: { - slotGrab(); + slotGrab(); break; } case KSnapshotObject::Region: @@ -139,7 +139,8 @@ void KBackgroundSnapshot::grabRegion() { - rgnGrab = new RegionGrabber(); + QRect emptySelection; + rgnGrab = new RegionGrabber(emptySelection); connect( rgnGrab, SIGNAL(regionGrabbed(QPixmap)), SLOT(slotRegionGrabbed(QPixmap)) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/kbackgroundsnapshot.h new/ksnapshot-4.10.90/kbackgroundsnapshot.h --- old/ksnapshot-4.10.4/kbackgroundsnapshot.h 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/kbackgroundsnapshot.h 2013-06-10 20:53:19.000000000 +0200 @@ -36,7 +36,7 @@ void slotWindowGrabbed( const QPixmap &pix ); void slotGrab(); void slotRegionGrabbed( const QPixmap &pix ); - + protected: void performGrab(); void grabRegion(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/kipiinterface.cpp new/ksnapshot-4.10.90/kipiinterface.cpp --- old/ksnapshot-4.10.4/kipiinterface.cpp 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/kipiinterface.cpp 2013-06-10 20:53:19.000000000 +0200 @@ -72,7 +72,7 @@ { return true; } -void KIPIInterface::delImage( const KUrl& ) +void KIPIInterface::delImage( const KUrl& ) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/kipiinterface.h new/ksnapshot-4.10.90/kipiinterface.h --- old/ksnapshot-4.10.4/kipiinterface.h 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/kipiinterface.h 2013-06-10 20:53:19.000000000 +0200 @@ -34,24 +34,23 @@ class KIPIInterface :public KIPI::Interface { Q_OBJECT - + public: KIPIInterface(KSnapshot* ksnapshot); virtual ~KIPIInterface(); - + virtual bool addImage(const KUrl&, QString& err); virtual void delImage( const KUrl& ); virtual void refreshImages( const KUrl::List& urls ); virtual KIPI::ImageCollectionSelector* imageCollectionSelector(QWidget *parent); virtual KIPI::UploadWidget* uploadWidget(QWidget *parent); - - + virtual QList<KIPI::ImageCollection> allAlbums(); virtual KIPI::ImageCollection currentAlbum(); virtual KIPI::ImageCollection currentSelection(); virtual int features() const; - virtual KIPI::ImageInfo info(const KUrl& ); + virtual KIPI::ImageInfo info(const KUrl& ); private: KIPIInterfacePrivate* const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/ksnapshot.cpp new/ksnapshot-4.10.90/ksnapshot.cpp --- old/ksnapshot-4.10.4/ksnapshot.cpp 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/ksnapshot.cpp 2013-06-10 20:53:19.000000000 +0200 @@ -99,7 +99,7 @@ // TEMPORARY Make sure "untitled" enters the string freeze for 4.6, // as explained in http://lists.kde.org/?l=kde-graphics-devel&m=128942871430175&w=2 const QString untitled = QString(i18n("untitled")); - + setCaption( "" ); showButtonSeparator( true ); setButtons(Help | Apply | User1 | User2); @@ -108,7 +108,7 @@ setButtonGuiItem(User2, KGuiItem(i18n("Send To..."), "document-open")); setDefaultButton(Apply); grabber = new QWidget( 0, Qt::X11BypassWindowManagerHint ); - + // TODO X11 (Xinerama and Twinview, actually) and Windows use different coordinates for the two monitors case // // On Windows, there are two displays. The origin (0, 0) ('o') is the top left of display 1. If display 2 is to the left, then coordinates in display 2 are negative: @@ -586,6 +586,16 @@ show(); } +void KSnapshot::slotRegionUpdated( const QRect &selection ) +{ + lastRegion = selection; +} + +void KSnapshot::slotFreeRegionUpdated( const QPolygon &selection ) +{ + lastFreeRegion = selection; +} + void KSnapshot::slotWindowGrabbed( const QPixmap &pix ) { if ( !pix.isNull() ) @@ -645,17 +655,21 @@ void KSnapshot::grabRegion() { - rgnGrab = new RegionGrabber(); + rgnGrab = new RegionGrabber(lastRegion); connect( rgnGrab, SIGNAL(regionGrabbed(QPixmap)), SLOT(slotRegionGrabbed(QPixmap)) ); + connect( rgnGrab, SIGNAL(regionUpdated(QRect)), + SLOT(slotRegionUpdated(QRect)) ); } void KSnapshot::grabFreeRegion() { - freeRgnGrab = new FreeRegionGrabber(); + freeRgnGrab = new FreeRegionGrabber(lastFreeRegion); connect( freeRgnGrab, SIGNAL(freeRegionGrabbed(QPixmap)), SLOT(slotRegionGrabbed(QPixmap)) ); + connect( freeRgnGrab, SIGNAL(freeRegionUpdated(QPolygon)), + SLOT(slotFreeRegionUpdated(QPolygon)) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/ksnapshot.desktop new/ksnapshot-4.10.90/ksnapshot.desktop --- old/ksnapshot-4.10.4/ksnapshot.desktop 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/ksnapshot.desktop 2013-06-10 20:53:20.000000000 +0200 @@ -27,7 +27,7 @@ GenericName[hne]=स्क्रीन केप्चर प्रोग्राम GenericName[hr]=Program za snimanje zaslona GenericName[hu]=Képlopó -GenericName[ia]=Programma ro capturar le schermo +GenericName[ia]=Programma pro capturar le schermo GenericName[is]=Forrit sem grípur skjámyndir GenericName[it]=Scatta foto allo schermo GenericName[ja]=スクリーンキャプチャプログラム @@ -150,7 +150,7 @@ Name[zh_HK]=KSnapshot Name[zh_TW]=影像擷取_KSnapshot MimeType= -Exec=ksnapshot -caption "%c" +Exec=ksnapshot -caption %c Icon=ksnapshot Type=Application Terminal=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/ksnapshot.h new/ksnapshot-4.10.90/ksnapshot.h --- old/ksnapshot-4.10.4/ksnapshot.h 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/ksnapshot.h 2013-06-10 20:53:19.000000000 +0200 @@ -103,6 +103,8 @@ void updateCaption(); void updatePreview(); void slotRegionGrabbed( const QPixmap & ); + void slotRegionUpdated( const QRect & ); + void slotFreeRegionUpdated( const QPolygon & ); void slotWindowGrabbed( const QPixmap & ); void slotModeChanged( int mode ); void setPreview( const QPixmap &pm ); @@ -139,6 +141,9 @@ QPoint savedPosition; bool haveXFixes; bool includeAlpha; + QPolygon lastFreeRegion; + QRect lastRegion; + #ifdef KIPI_FOUND KIPI::PluginLoader* mPluginLoader; friend KUrl::List KSnapshotImageCollectionShared::images(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/ksnapshotwidget.ui new/ksnapshot-4.10.90/ksnapshotwidget.ui --- old/ksnapshot-4.10.4/ksnapshotwidget.ui 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/ksnapshotwidget.ui 2013-06-10 20:53:19.000000000 +0200 @@ -28,7 +28,7 @@ <property name="whatsThis"> <string>This is a preview of the current snapshot. -The image can be dragged to another application or document to copy the full screenshot there. Try it with the Konqueror file manager. +The image can be dragged to another application or document to copy the full screenshot there. Try it with the file manager. You can also copy the image to the clipboard by pressing Ctrl+C.</string> </property> @@ -109,7 +109,8 @@ <p> <b>Full Screen</b> - captures the entire desktop.<br/> <b>Window Under Cursor</b> - captures only the window (or menu) that is under the mouse cursor when the snapshot is taken.<br/> -<b>Region</b> - captures only the region of the desktop that you specify. When taking a new snapshot in this mode you will be able to select any area of the screen by clicking and dragging the mouse.<br/> +<b>Rectangular Region</b> - captures only the rectangular region of the desktop that you specify. When taking a new snapshot in this mode you will be able to select any area of the screen by clicking and dragging the mouse.<br/> +<b>Freehand Region</b> - captures arbitrary shapes that you specify. When taking a new snapshot in this mode you will be able to select any shape by dragging the mouse.<br/> <b>Section of Window</b> - captures only a section of the window. When taking a new snapshot in this mode you will be able to select any child window by moving the mouse over it.<br/> <b>Current Screen</b> - if you have multiple screens, this captures the screen containing the mouse cursor when the snapshot is taken. </p></qt></string> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/regiongrabber.cpp new/ksnapshot-4.10.90/regiongrabber.cpp --- old/ksnapshot-4.10.4/regiongrabber.cpp 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/regiongrabber.cpp 2013-06-10 20:53:19.000000000 +0200 @@ -28,9 +28,9 @@ #include <klocale.h> #include <KWindowSystem> -RegionGrabber::RegionGrabber( ) : +RegionGrabber::RegionGrabber( const QRect &startSelection ) : QWidget( 0, Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Tool ), - selection(), mouseDown( false ), newSelection( false ), + selection( startSelection ), mouseDown( false ), newSelection( false ), handleSize( 10 ), mouseOverHandle( 0 ), showHelp( true ), grabbing( false ), TLHandle(0,0,handleSize,handleSize), TRHandle(0,0,handleSize,handleSize), @@ -334,8 +334,10 @@ void RegionGrabber::keyPressEvent( QKeyEvent* e ) { + QRect r = selection; if ( e->key() == Qt::Key_Escape ) { + emit regionUpdated( r ); emit regionGrabbed( QPixmap() ); } else if ( e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return ) @@ -354,6 +356,7 @@ if ( !r.isNull() && r.isValid() ) { grabbing = true; + emit regionUpdated( r ); emit regionGrabbed( pixmap.copy(r) ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/regiongrabber.h new/ksnapshot-4.10.90/regiongrabber.h --- old/ksnapshot-4.10.4/regiongrabber.h 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/regiongrabber.h 2013-06-10 20:53:19.000000000 +0200 @@ -34,9 +34,9 @@ Q_OBJECT enum MaskType { StrokeMask, FillMask }; - + public: - RegionGrabber(); + RegionGrabber( const QRect &startSelection ); ~RegionGrabber(); protected slots: @@ -44,6 +44,7 @@ signals: void regionGrabbed( const QPixmap & ); + void regionUpdated( const QRect & ); protected: void paintEvent( QPaintEvent* e ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnapshot-4.10.4/windowgrabber.cpp new/ksnapshot-4.10.90/windowgrabber.cpp --- old/ksnapshot-4.10.4/windowgrabber.cpp 2013-05-28 21:27:50.000000000 +0200 +++ new/ksnapshot-4.10.90/windowgrabber.cpp 2013-06-10 20:53:19.000000000 +0200 @@ -124,11 +124,11 @@ if ( ( ( wi.dwStyle & WS_VISIBLE ) != 0 ) && (width >= minSize ) && (height >= minSize ) ) { //QRect r( rect.left + 4, rect.top + 4, width, height); // 4 = max(wi.cxWindowBorders) = max(wi.cyWindowBorders) - QRect r(rect.left + cxWindowBorder, rect.top + cyWindowBorder, width, height); + QRect r(rect.left + cxWindowBorder, rect.top + cyWindowBorder, width, height); if ( std::find( windows->begin(), windows->end(), r ) == windows->end() ) { windows->push_back( r ); return true; - } + } } return false; } @@ -260,7 +260,7 @@ QPixmap pm( QPixmap::grabWindow( QX11Info::appRootWindow(), x, y, w, h ) ); KWindowInfo winInfo( findRealWindow(child), NET::WMVisibleName, NET::WM2WindowClass ); - + if ( title ) { (*title) = winInfo.visibleName(); } @@ -373,7 +373,7 @@ QPixmap pm( grabWindow( child, x, y, w, h, border, &title, &windowClass ) ); #elif defined(Q_WS_WIN) HWND child = windowUnderCursor(); - + WINDOWINFO wi; GetWindowInfo( child, &wi); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
