Hello community, here is the log from the commit of package spectacle for openSUSE:Factory checked in at 2016-01-23 01:10:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spectacle (Old) and /work/SRC/openSUSE:Factory/.spectacle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spectacle" Changes: -------- --- /work/SRC/openSUSE:Factory/spectacle/spectacle.changes 2016-01-11 19:11:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.spectacle.new/spectacle.changes 2016-01-23 01:10:35.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:37:37 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- spectacle-15.12.0.tar.xz New: ---- spectacle-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spectacle.spec ++++++ --- /var/tmp/diff_new_pack.xEIDyx/_old 2016-01-23 01:10:36.000000000 +0100 +++ /var/tmp/diff_new_pack.xEIDyx/_new 2016-01-23 01:10:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: spectacle -Version: 15.12.0 +Version: 15.12.1 Release: 0 BuildRequires: update-desktop-files BuildRequires: kf5-filesystem ++++++ spectacle-15.12.0.tar.xz -> spectacle-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/CMakeLists.txt new/spectacle-15.12.1/CMakeLists.txt --- old/spectacle-15.12.0/CMakeLists.txt 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/CMakeLists.txt 2016-01-07 00:19:43.000000000 +0100 @@ -5,7 +5,7 @@ # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "12") -set(KDE_APPLICATIONS_VERSION_MICRO "0") +set(KDE_APPLICATIONS_VERSION_MICRO "1") set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(SPECTACLE_VERSION ${KDE_APPLICATIONS_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/desktop/org.kde.spectacle.desktop new/spectacle-15.12.1/desktop/org.kde.spectacle.desktop --- old/spectacle-15.12.0/desktop/org.kde.spectacle.desktop 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/desktop/org.kde.spectacle.desktop 2016-01-07 00:19:43.000000000 +0100 @@ -11,17 +11,20 @@ GenericName[gl]=Utilidade para facer capturas de pantalla GenericName[it]=Accessorio per catturare schermate GenericName[ko]=화면 캡처 유틸리티 +GenericName[lt]=KDE ekranvaizdžių paveikslavimas GenericName[nl]=Hulpmiddel voor het vangen van een schermafdruk GenericName[pl]=Narzędzie do przechwytywania ekranu GenericName[pt]=Utilitário de Captura de Imagens GenericName[pt_BR]=Utilitário de captura de tela GenericName[ro]=Utilitar de capturare a ecranului +GenericName[ru]=Создание снимков экрана GenericName[sk]=Nástroj na snímanie obrazovky GenericName[sl]=Pripomoček za zajem zaslona GenericName[sv]=Verktyg för att ta skärmbilder GenericName[uk]=Програма для створення знімків екрана GenericName[x-test]=xxScreenshot Capture Utilityxx GenericName[zh_CN]=屏幕截图工具 +GenericName[zh_TW]=畫面擷取工具 Name=Spectacle Name[ca]=Spectacle Name[ca@valencia]=Spectacle @@ -33,15 +36,18 @@ Name[gl]=Spectacle Name[it]=Spectacle Name[ko]=Spectacle +Name[lt]=Spectacle Name[nl]=Spectacle -Name[pl]=Spektakl +Name[pl]=Spectacle Name[pt]=Spectacle Name[pt_BR]=Spectacle +Name[ru]=Spectacle Name[sk]=Spectacle Name[sl]=Spectacle Name[sv]=Spectacle Name[uk]=Spectacle Name[x-test]=xxSpectaclexx +Name[zh_TW]=Spectacle Categories=Qt;KDE;Utility; MimeType= Exec=spectacle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/desktop/spectacle.notifyrc new/spectacle-15.12.1/desktop/spectacle.notifyrc --- old/spectacle-15.12.0/desktop/spectacle.notifyrc 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/desktop/spectacle.notifyrc 2016-01-07 00:19:43.000000000 +0100 @@ -11,15 +11,18 @@ Name[gl]=Spectacle Name[it]=Spectacle Name[ko]=Spectacle +Name[lt]=Spectacle Name[nl]=Spectacle -Name[pl]=Spektakl +Name[pl]=Spectacle Name[pt]=Spectacle Name[pt_BR]=Spectacle +Name[ru]=Spectacle Name[sk]=Spectacle Name[sl]=Spectacle Name[sv]=Spectacle Name[uk]=Spectacle Name[x-test]=xxSpectaclexx +Name[zh_TW]=Spectacle Comment=Screenshot Capture Utility Comment[ca]=Utilitat per pendre captures de pantalla Comment[ca@valencia]=Utilitat per pendre captures de pantalla @@ -31,15 +34,18 @@ Comment[gl]=Utilidade para facer capturas de pantalla. Comment[it]=Accessorio per catturare schermate Comment[ko]=화면 캡처 유틸리티 +Comment[lt]=KDE ekranvaizdžių paveikslavimas Comment[nl]=Hulpmiddel voor het maken van een schermafdruk Comment[pl]=Narzędzie do przechwytywania ekranu Comment[pt]=Utilitário de Captura de Imagens Comment[pt_BR]=Utilitário de captura de tela +Comment[ru]=Программа для создания снимков экрана Comment[sk]=Nástroj na zachytávanie obrazovky Comment[sl]=Pripomoček za zajem zaslona Comment[sv]=Verktyg för att ta skärmbilder Comment[uk]=Програма для створення знімків екрана Comment[x-test]=xxScreenshot Capture Utilityxx +Comment[zh_TW]=畫面擷取工具 [Event/newScreenshotSaved] Name=New Screenshot Saved @@ -52,15 +58,18 @@ Name[gl]=Gardouse a nova captura Name[it]=Nuova schermata salvata Name[ko]=새 스크린샷 저장됨 +Name[lt]=Ekranvaizdis įrašytas Name[nl]=Nieuwe schermafdruk opgeslagen Name[pl]=Zapisano nowy zrzut ekranu Name[pt]=Nova Imagem Gravada Name[pt_BR]=Nova captura de tela salva +Name[ru]=Сохранён новый снимок экрана Name[sk]=Nová obrazovka uložená Name[sl]=Shranjena nova zaslonska slika Name[sv]=Ny skärmbild sparad Name[uk]=Збереженого нових знімок Name[x-test]=xxNew Screenshot Savedxx +Name[zh_TW]=螢幕快照已儲存 Comment=A new screenshot was captured and saved Comment[ca]=S'ha efectuat una captura de pantalla nova i s'ha desat Comment[ca@valencia]=S'ha efectuat una captura de pantalla nova i s'ha guardat @@ -71,13 +80,16 @@ Comment[gl]=Fíxose unha nova captura de pantalla e gardouse. Comment[it]=Una nuova schermata è stata catturata e salvata Comment[ko]=새 스크린샷을 캡처하여 저장함 +Comment[lt]=Ekranas nupaveiksluotas ir įrašytas Comment[nl]=Een nieuwe schermafdruk is opgenomen en opgeslagen Comment[pl]=Przechwycono i zapisano zawartość ekranu Comment[pt]=Foi capturada e gravada uma nova imagem Comment[pt_BR]=Uma nova imagem foi obtida e salva +Comment[ru]=Новый снимок экрана создан и сохранён. Comment[sk]=Nová obrazovka bola zachytená a uložená Comment[sl]=Zajeta in shranjena je bila nova zaslonska slika Comment[sv]=En ny skärmbild togs och sparades Comment[uk]=Було створено і збережено новий знімок Comment[x-test]=xxA new screenshot was captured and savedxx +Comment[zh_TW]=新的螢幕快照已擷取並儲存 Action=Popup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/Gui/KSImageWidget.cpp new/spectacle-15.12.1/src/Gui/KSImageWidget.cpp --- old/spectacle-15.12.0/src/Gui/KSImageWidget.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/Gui/KSImageWidget.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -38,7 +38,7 @@ { mPixmap = pixmap; setToolTip(i18n("Image Size: %1x%2 pixels", mPixmap.width(), mPixmap.height())); - setPixmap(mPixmap.scaled(size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); + setPixmap(mPixmap.scaled(size() * pixmap.devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); } // drag handlers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/Gui/ScreenClipper.cpp new/spectacle-15.12.1/src/Gui/ScreenClipper.cpp --- old/spectacle-15.12.0/src/Gui/ScreenClipper.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/Gui/ScreenClipper.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -40,6 +40,7 @@ void ScreenClipper::init() { + mPixmap.setDevicePixelRatio(devicePixelRatio()); setGeometry(0, 0, mPixmap.width(), mPixmap.height()); setCursor(Qt::CrossCursor); showFullScreen(); @@ -94,18 +95,23 @@ // if we don't have a selection yet, just draw a semitransparent // black rectangle over the whole screen, and render the help text + const QRect normalizedWindowGeometry = QRect(geometry().x() / devicePixelRatio(), + geometry().y() / devicePixelRatio(), + geometry().width() / devicePixelRatio(), + geometry().height() / devicePixelRatio()); + if (mSelection.isNull() || mSelection.isEmpty()) { - painter.setClipRegion(QRegion(geometry())); + painter.setClipRegion(QRegion(normalizedWindowGeometry)); painter.setPen(Qt::NoPen); painter.setBrush(overlayColor); - painter.drawRect(geometry()); + painter.drawRect(normalizedWindowGeometry); painter.setPen(textColor); painter.setBrush(textBackgroundColor); QString helpText = i18n("Click anywhere on the screen (including on this text) to start drawing a selection rectangle, or press Esc to quit"); - QRect helpTextBoundingBox = painter.boundingRect(geometry(), Qt::TextWordWrap, helpText); - helpTextBoundingBox.moveCenter(geometry().center()); + QRect helpTextBoundingBox = painter.boundingRect(normalizedWindowGeometry, Qt::TextWordWrap, helpText); + helpTextBoundingBox.moveCenter(normalizedWindowGeometry.center()); QRect helpTextRect = helpTextBoundingBox.adjusted(-20, -20, 20, 20); painter.setPen(textColor); @@ -119,11 +125,11 @@ // if we're here, this means we have a valid selection. let's draw // the overlay first - QRegion region = QRegion(geometry()).subtracted(mSelection); + QRegion region = QRegion(normalizedWindowGeometry).subtracted(mSelection); painter.setClipRegion(region); painter.setPen(Qt::NoPen); painter.setBrush(overlayColor); - painter.drawRect(geometry()); + painter.drawRect(normalizedWindowGeometry); // and the selection rectangle border @@ -131,7 +137,7 @@ painter.setBrush(handleColor); painter.setClipRegion(region); painter.drawRect(mSelection); - painter.setClipRect(geometry()); + painter.setClipRect(normalizedWindowGeometry); // draw the handles @@ -146,9 +152,9 @@ painter.setBrush(textBackgroundColor); QString helpText = i18n("To take the screenshot, double-click or press Enter. Right-click to reset the selection, or press Esc to quit."); - QRect helpTextBoundingBox = painter.boundingRect(geometry(), Qt::TextWordWrap, helpText); - helpTextBoundingBox.moveCenter(geometry().center()); - helpTextBoundingBox.moveTop(geometry().top()); + QRect helpTextBoundingBox = painter.boundingRect(normalizedWindowGeometry, Qt::TextWordWrap, helpText); + helpTextBoundingBox.moveCenter(normalizedWindowGeometry.center()); + helpTextBoundingBox.moveTop(normalizedWindowGeometry.top()); QRect helpTextRect = helpTextBoundingBox.adjusted(-5, 0, 5, 10); helpTextBoundingBox.moveCenter(helpTextRect.center()); @@ -406,7 +412,13 @@ { if (!mSelection.isNull() && mSelection.isValid()) { grabbing = true; - emit regionGrabbed(mPixmap.copy(mSelection), mSelection); + + const QRect normalizedSelection = QRect(mSelection.x() * devicePixelRatio(), + mSelection.y() * devicePixelRatio(), + mSelection.width() * devicePixelRatio(), + mSelection.height() * devicePixelRatio()); + + emit regionGrabbed(mPixmap.copy(normalizedSelection), normalizedSelection); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/Main.cpp new/spectacle-15.12.1/src/Main.cpp --- old/spectacle-15.12.0/src/Main.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/Main.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -56,6 +56,7 @@ KAboutLicense::GPL_V2, i18n("(C) 2015 Boudhayan Gupta")); aboutData.addAuthor("Boudhayan Gupta", QString(), "[email protected]"); + aboutData.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails")); KAboutData::setApplicationData(aboutData); // set up the command line options parser @@ -76,7 +77,6 @@ {{"b", "background"}, i18n("Take a screenshot and exit without showing the GUI")}, {{"s", "dbus"}, i18n("Start in DBus-Activation mode")}, {{"n", "nonotify"}, i18n("In background mode, do not pop up a notification when the screenshot is taken")}, - {{"c", "clipboard"}, i18n("In background mode, send image to clipboard without saving to file")}, {{"o", "output"}, i18n("In background mode, save image to specified file"), "fileName"}, {{"d", "delay"}, i18n("In background mode, delay before taking the shot (in milliseconds)"), "delayMsec"}, {{"w", "onclick"}, i18n("Wait for a click before taking screenshot. Invalidates delay")} @@ -103,7 +103,6 @@ // are we running in background or dbus mode? SpectacleCore::StartMode startMode = SpectacleCore::GuiMode; - bool sendToClipboard = false; bool notify = true; qint64 delayMsec = 0; QString fileName = QString(); @@ -135,10 +134,6 @@ if (parser.isSet("onclick")) { delayMsec = -1; } - - if (parser.isSet("clipboard")) { - sendToClipboard = true; - } case SpectacleCore::DBusMode: app.setQuitOnLastWindowClosed(false); case SpectacleCore::GuiMode: @@ -147,7 +142,7 @@ // release the kraken - SpectacleCore core(startMode, grabMode, fileName, delayMsec, sendToClipboard, notify); + SpectacleCore core(startMode, grabMode, fileName, delayMsec, notify); QObject::connect(&core, &SpectacleCore::allDone, qApp, &QApplication::quit); // create the dbus connections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/SpectacleCore.cpp new/spectacle-15.12.1/src/SpectacleCore.cpp --- old/spectacle-15.12.0/src/SpectacleCore.cpp 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/SpectacleCore.cpp 2016-01-07 00:19:43.000000000 +0100 @@ -20,12 +20,11 @@ #include "SpectacleCore.h" SpectacleCore::SpectacleCore(StartMode startMode, ImageGrabber::GrabMode grabMode, QString &saveFileName, - qint64 delayMsec, bool sendToClipboard, bool notifyOnGrab, QObject *parent) : + qint64 delayMsec, bool notifyOnGrab, QObject *parent) : QObject(parent), mExportManager(ExportManager::instance()), mStartMode(startMode), mNotify(notifyOnGrab), - mBackgroundSendToClipboard(sendToClipboard), mImageGrabber(nullptr), mMainWindow(nullptr), isGuiInited(false) @@ -158,10 +157,6 @@ switch (mStartMode) { case BackgroundMode: - if (mBackgroundSendToClipboard) { - qApp->clipboard()->setPixmap(pixmap); - qDebug() << i18n("Copied image to clipboard"); - } case DBusMode: { if (mNotify) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-15.12.0/src/SpectacleCore.h new/spectacle-15.12.1/src/SpectacleCore.h --- old/spectacle-15.12.0/src/SpectacleCore.h 2015-12-09 13:00:20.000000000 +0100 +++ new/spectacle-15.12.1/src/SpectacleCore.h 2016-01-07 00:19:43.000000000 +0100 @@ -83,7 +83,7 @@ }; explicit SpectacleCore(StartMode startMode, ImageGrabber::GrabMode grabMode, QString &saveFileName, - qint64 delayMsec, bool sendToClipboard, bool notifyOnGrab, QObject *parent = 0); + qint64 delayMsec, bool notifyOnGrab, QObject *parent = 0); ~SpectacleCore(); QString filename() const; @@ -117,7 +117,6 @@ ExportManager *mExportManager; StartMode mStartMode; bool mNotify; - bool mBackgroundSendToClipboard; QString mFileNameString; QUrl mFileNameUrl; ImageGrabber *mImageGrabber;
