Hello community, here is the log from the commit of package spectacle for openSUSE:Factory checked in at 2016-08-29 14:52:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-21 07:50:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spectacle.new/spectacle.changes 2016-08-29 14:52:24.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:33:15 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:56:50 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- spectacle-16.04.3.tar.xz New: ---- spectacle-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spectacle.spec ++++++ --- /var/tmp/diff_new_pack.MPBE1o/_old 2016-08-29 14:52:26.000000000 +0200 +++ /var/tmp/diff_new_pack.MPBE1o/_new 2016-08-29 14:52:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: spectacle -Version: 16.04.3 +Version: 16.08.0 Release: 0 BuildRequires: extra-cmake-modules BuildRequires: kconfig-devel @@ -97,6 +97,8 @@ %doc COPYING README %{_kf5_bindir}/spectacle %{_kf5_applicationsdir}/org.kde.spectacle.desktop +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.spectacle.appdata.xml %{_kf5_iconsdir}/hicolor/*/*/spectacle* %{_kf5_notifydir}/spectacle.notifyrc %_datadir/dbus-1/interfaces/org.kde.Spectacle.xml ++++++ spectacle-16.04.3.tar.xz -> spectacle-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/CMakeLists.txt new/spectacle-16.08.0/CMakeLists.txt --- old/spectacle-16.04.3/CMakeLists.txt 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/CMakeLists.txt 2016-08-10 01:06:22.000000000 +0200 @@ -4,8 +4,8 @@ # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "16") -set(KDE_APPLICATIONS_VERSION_MINOR "04") -set(KDE_APPLICATIONS_VERSION_MICRO "3") +set(KDE_APPLICATIONS_VERSION_MINOR "08") +set(KDE_APPLICATIONS_VERSION_MICRO "0") set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(SPECTACLE_VERSION ${KDE_APPLICATIONS_VERSION}) @@ -100,6 +100,8 @@ message(FATAL_ERROR "No suitable backend platform was found. Currenty supported platforms are: XCB Components Required: ${XCB_COMPONENTS_ERRORS}") endif() +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + # hand off to subdirectories add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/desktop/CMakeLists.txt new/spectacle-16.08.0/desktop/CMakeLists.txt --- old/spectacle-16.04.3/desktop/CMakeLists.txt 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/desktop/CMakeLists.txt 2016-08-10 01:06:22.000000000 +0200 @@ -14,3 +14,8 @@ FILES spectacle.khotkeys DESTINATION ${DATA_INSTALL_DIR}/khotkeys ) + +install( + FILES org.kde.spectacle.appdata.xml + DESTINATION ${KDE_INSTALL_METAINFODIR} +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/desktop/org.kde.spectacle.appdata.xml new/spectacle-16.08.0/desktop/org.kde.spectacle.appdata.xml --- old/spectacle-16.04.3/desktop/org.kde.spectacle.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/spectacle-16.08.0/desktop/org.kde.spectacle.appdata.xml 2016-08-10 01:06:22.000000000 +0200 @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="utf-8"?> +<component type="desktop"> + <id>org.kde.spectacle.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0+</project_license> + <name>Spectacle</name> + <name xml:lang="ca">Spectacle</name> + <name xml:lang="ca-valencia">Spectacle</name> + <name xml:lang="cs">Spectacle</name> + <name xml:lang="de">Spectacle</name> + <name xml:lang="en-GB">Spectacle</name> + <name xml:lang="es">Spectacle</name> + <name xml:lang="it">Spectacle</name> + <name xml:lang="nl">Spectacle</name> + <name xml:lang="pl">Spectacle</name> + <name xml:lang="pt">Spectacle</name> + <name xml:lang="sk">Spectacle</name> + <name xml:lang="sl">Spectacle</name> + <name xml:lang="sv">Spectacle</name> + <name xml:lang="uk">Spectacle</name> + <name xml:lang="x-test">xxSpectaclexx</name> + <description> + <p> + Spectacle is a simple application for capturing desktop screenshots. It can capture images of the entire desktop, a single monitor, the currently active window, the window currently under the mouse, or a rectangular region of the screen. The images can then be printed, sent to other applications for manipulation, or quickly be saved as-is. + </p> + <p xml:lang="ca">L'Spectacle és una aplicació per a prendre captures de pantalla de l'escriptori. Pot capturar imatges de tot l'escriptori, un sol monitor, la finestra activa, la finestra sota el ratolí o d'una regió rectangular de la pantalla. Les imatges es poden imprimir, enviar a altres aplicacions per a la seva manipulació o desar-les com estan.</p> + <p xml:lang="ca-valencia">L'Spectacle és una aplicació per a prendre captures de pantalla de l'escriptori. Pot capturar imatges de tot l'escriptori, un sol monitor, la finestra activa, la finestra sota el ratolí o d'una regió rectangular de la pantalla. Les imatges es poden imprimir, enviar a altres aplicacions per a la seua manipulació o guardar-les com estan.</p> + <p xml:lang="en-GB">Spectacle is a simple application for capturing desktop screenshots. It can capture images of the entire desktop, a single monitor, the currently active window, the window currently under the mouse, or a rectangular region of the screen. The images can then be printed, sent to other applications for manipulation, or quickly be saved as-is.</p> + <p xml:lang="es">Spectacle es una sencilla aplicación para realizar capturas de pantalla del escritorio. Puede capturar imágenes de todo el escritorio, de un único monitor, de la ventana activa actual, de la ventana que esté bajo el cursor o de un área rectangular de la pantalla. Las imágenes se pueden imprimir, enviar a otras aplicaciones para su procesamiento o guardar en el disco de forma inmediata.</p> + <p xml:lang="it">Spectacle è una semplice applicazione per catturare schermate. Può acquisire immagini dell'intero desktop, di un singolo monitor, della finestra attiva, della finestra sotto il puntatore del mouse, o di una regione rettangolare dello schermo. Le immagini possono essere stampate, inviate ad altre applicazioni per essere modificate, o salvate rapidamente così come sono.</p> + <p xml:lang="nl">Spectacle is een eenvoudige toepassing voor het opnemen van schermafbeeldingen van het bureaublad. Het kan afbeeldingen van het gehele bureaublad, een enkele monitor, het nu actieve venster, het venster nu onder de muis of een rechthoekig gebied van het scherm. De afbeelding kan dan afgedrukt worden, naar een andere toepassing voor bewerking worden verzonden of snel worden opgeslagen zoals deze nu is.</p> + <p xml:lang="pl">Spectacle to prosta aplikacja do wykonywania zrzutów ekranu. Za jej pomocą można przechwycić cały pulpit, pojedynczy monitor, obecnie aktywne okno, okno obecnie pod wskaźnikiem myszy lub prostokątny obszar ekrany. Zrzuty można wydrukować, wysłać do innej aplikacji do obróbki lub szybko zapisać tak jak go wykonano.</p> + <p xml:lang="pt">O Spectacle é uma aplicação simples para capturar imagens do ecrã. Pode capturar imagens de todo o ecrã, de um único monitor, da janela activa no momento, da janela sob o cursor do rato ou de uma região rectangular do ecrã. As imagens poderão então ser impressas, enviadas para outras aplicações para posterior manipulação ou serem gravadas como estão.</p> + <p xml:lang="sl">Spectacle je preprost program za zajemanje zaslonskih slik namizja. Zajame lahko slike celotnega namizja, enega zaslona, trenutno dejavnega okna, okna pod miško ali pravokotnega območja pod miško. Te slike lahko nato natisnete, pošljete v druge programe ali pa hitro shranite.</p> + <p xml:lang="sv">Spectacle är ett enkelt program för att ta skärmbilder av skrivbordet. Det kan ta bilder av hela skrivbordet, en enda bildskärm, fönstret som för närvarande är aktivt, fönstret som för närvarande är under musen, eller ett rektangulärt skärmområde. Bilderna kan därefter skrivas ut, skickas till andra program för behandling, eller snabbt sparas som de är.</p> + <p xml:lang="uk">Spectacle — проста програма для створення знімків екрана. Передбачено можливість захоплення знімків усієї стільниці, окремого монітора, поточного активного вікна, вікна під вказівником миші або прямокутної ділянки на екрані. Створені зображення можна надрукувати, надіслати до іншої програми для обробки або зберегти без змін.</p> + <p xml:lang="x-test">xxSpectacle is a simple application for capturing desktop screenshots. It can capture images of the entire desktop, a single monitor, the currently active window, the window currently under the mouse, or a rectangular region of the screen. The images can then be printed, sent to other applications for manipulation, or quickly be saved as-is.xx</p> + <p>Features:</p> + <p xml:lang="ca">Característiques:</p> + <p xml:lang="ca-valencia">Característiques:</p> + <p xml:lang="cs">Vlastnosti:</p> + <p xml:lang="de">Funktionen:</p> + <p xml:lang="en-GB">Features:</p> + <p xml:lang="es">Funciones:</p> + <p xml:lang="it">Funzionalità:</p> + <p xml:lang="nl">Mogelijkheden:</p> + <p xml:lang="pl">Możliwości:</p> + <p xml:lang="pt">Funcionalidades:</p> + <p xml:lang="sk">Funkcie:</p> + <p xml:lang="sl">Zmožnosti:</p> + <p xml:lang="sv">Funktioner:</p> + <p xml:lang="uk">Можливості:</p> + <p xml:lang="x-test">xxFeatures:xx</p> + <ul> + <li>Capture Entire Desktop</li> + <li xml:lang="ca">Captura l'escriptori sencer</li> + <li xml:lang="ca-valencia">Captura l'escriptori sencer</li> + <li xml:lang="cs">Zachytit celou plochu</li> + <li xml:lang="de">Die gesamte Arbeitsfläche aufnehmen</li> + <li xml:lang="en-GB">Capture Entire Desktop</li> + <li xml:lang="es">Capturar todo el escritorio</li> + <li xml:lang="it">Cattura l'intero desktop</li> + <li xml:lang="nl">Opname van het gehele bureaublad</li> + <li xml:lang="pl">Przechwytywanie całego pulpitu</li> + <li xml:lang="pt">Captura de Todo o Ecrã</li> + <li xml:lang="sk">Zachytiť celú plochu</li> + <li xml:lang="sl">Zajem celotnega namizja</li> + <li xml:lang="sv">Ta en bild av hela skrivbordet</li> + <li xml:lang="uk">Захоплення зображення усієї стільниці</li> + <li xml:lang="x-test">xxCapture Entire Desktopxx</li> + <li>Capture Current Monitor</li> + <li xml:lang="ca">Captura el monitor actual</li> + <li xml:lang="ca-valencia">Captura el monitor actual</li> + <li xml:lang="cs">Zachytit současný monitor</li> + <li xml:lang="de">Den aktuellen Bildschirm aufnehmen</li> + <li xml:lang="en-GB">Capture Current Monitor</li> + <li xml:lang="es">Capturar el monitor actual</li> + <li xml:lang="it">Cattura il monitor attuale</li> + <li xml:lang="nl">Opname van de huidige monitor</li> + <li xml:lang="pl">Przechwytywanie bieżącego monitora</li> + <li xml:lang="pt">Captura do Monitor Actual</li> + <li xml:lang="sk">Zachytiť aktuálny monitor</li> + <li xml:lang="sl">Zajem trenutnega zaslona</li> + <li xml:lang="sv">Ta en bild av aktuell bildskärm</li> + <li xml:lang="uk">Захоплення зображення на поточному моніторі</li> + <li xml:lang="x-test">xxCapture Current Monitorxx</li> + <li>Capture Active Window</li> + <li xml:lang="ca">Captura la finestra activa</li> + <li xml:lang="ca-valencia">Captura la finestra activa</li> + <li xml:lang="cs">Zachytit aktivní okno</li> + <li xml:lang="de">Das aktive Fenster aufnehmen</li> + <li xml:lang="en-GB">Capture Active Window</li> + <li xml:lang="es">Capturar la ventana activa</li> + <li xml:lang="it">Cattura la finestra attiva</li> + <li xml:lang="nl">Opname van het actieve venster</li> + <li xml:lang="pl">Przechwytywanie aktywnego okna</li> + <li xml:lang="pt">Captura da Janela Activa</li> + <li xml:lang="sk">Zachytiť aktuálne okno</li> + <li xml:lang="sl">Zajem dejavnega okna</li> + <li xml:lang="sv">Ta en bild av aktivt fönster</li> + <li xml:lang="uk">Захоплення зображення активного вікна</li> + <li xml:lang="x-test">xxCapture Active Windowxx</li> + <li>Capture Rectangular Region</li> + <li xml:lang="ca">Captura una regió rectangular</li> + <li xml:lang="ca-valencia">Captura una regió rectangular</li> + <li xml:lang="cs">Zachytit obdélníkovou oblast</li> + <li xml:lang="de">Einen rechteckigen Bereich aufnehmen</li> + <li xml:lang="en-GB">Capture Rectangular Region</li> + <li xml:lang="es">Capturar un área rectangular</li> + <li xml:lang="it">Cattura una regione rettangolare</li> + <li xml:lang="nl">Opname van een rechthoekig gebied</li> + <li xml:lang="pl">Przechwytywanie obszaru prostokątnego</li> + <li xml:lang="pt">Captura de uma Região Rectangular</li> + <li xml:lang="sk">Zachytiť pravouhlú oblasť</li> + <li xml:lang="sl">Zajem pravokotnega območja</li> + <li xml:lang="sv">Ta en bild av ett rektangulärt område</li> + <li xml:lang="uk">Захоплення зображення прямокутної ділянки</li> + <li xml:lang="x-test">xxCapture Rectangular Regionxx</li> + <li>Keyboard shortcuts for taking screenshots</li> + <li xml:lang="ca">Dreceres de teclat per a prendre captures de pantalla</li> + <li xml:lang="ca-valencia">Dreceres de teclat per a prendre captures de pantalla</li> + <li xml:lang="de">Kurzbefehle für die Aufnahme von Bildschirmfotos</li> + <li xml:lang="en-GB">Keyboard shortcuts for taking screenshots</li> + <li xml:lang="es">Accesos rápidos de teclado para realizar capturas</li> + <li xml:lang="it">Scorciatoie di tastiera per acquisire schermate</li> + <li xml:lang="nl">Sneltoetsen voor het maken van schermafdrukken</li> + <li xml:lang="pl">Skróty klawiszowe do wykonywania zrzutów ekranu</li> + <li xml:lang="pt">Atalhos do teclado para capturar as imagens</li> + <li xml:lang="sl">Tipkovne bližnjice za zajemanje zaslonskih slik</li> + <li xml:lang="sv">Snabbtangenter för att ta skärmbilder</li> + <li xml:lang="uk">Створення знімків за допомогою натискання комбінацій клавіш</li> + <li xml:lang="x-test">xxKeyboard shortcuts for taking screenshotsxx</li> + </ul> + </description> + <screenshots> + <screenshot type="default"> + <image width="880" height="537">http://kde.org/images/screenshots/spectacle.png</image> + </screenshot> + </screenshots> + <url type="homepage">http://kde.org/applications/graphics/spectacle/</url> + <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=spectacle</url> + <project_group>KDE</project_group> + <provides> + <binary>spectacle</binary> + </provides> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/desktop/org.kde.spectacle.desktop new/spectacle-16.08.0/desktop/org.kde.spectacle.desktop --- old/spectacle-16.04.3/desktop/org.kde.spectacle.desktop 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/desktop/org.kde.spectacle.desktop 2016-08-10 01:06:22.000000000 +0200 @@ -16,7 +16,7 @@ GenericName[it]=Accessorio per catturare schermate GenericName[ko]=화면 캡처 유틸리티 GenericName[lt]=KDE ekranvaizdžių paveikslavimas -GenericName[nl]=Hulpmiddel voor het maken van een schermafdruk +GenericName[nl]=Hulpmiddel voor het vangen van een schermafdruk GenericName[nn]=Verktøy for å lagra skjermbilete GenericName[pl]=Narzędzie do przechwytywania ekranu GenericName[pt]=Utilitário de Captura de Imagens @@ -29,11 +29,11 @@ GenericName[uk]=Програма для створення знімків екрана GenericName[x-test]=xxScreenshot Capture Utilityxx GenericName[zh_CN]=屏幕截图工具 -GenericName[zh_TW]=畫面擷取工具 Name=Spectacle Name[ast]=Spectacle Name[ca]=Spectacle Name[ca@valencia]=Spectacle +Name[cs]=Spectacle Name[da]=Spectacle Name[de]=Spectacle Name[el]=Spectacle @@ -56,7 +56,6 @@ Name[uk]=Spectacle Name[x-test]=xxSpectaclexx Name[zh_CN]=Spectacle -Name[zh_TW]=Spectacle Categories=Qt;KDE;Utility; Exec=spectacle Icon=spectacle @@ -73,6 +72,7 @@ Name[ast]=Capturar tol escritoriu Name[ca]=Captura l'escriptori sencer Name[ca@valencia]=Captura l'escriptori sencer +Name[cs]=Zachytit celou plochu Name[da]=Indfang hele skrivebordet Name[de]=Die gesamte Arbeitsfläche aufnehmen Name[el]=Λήψη όλης της επιφάνειας εργασίας @@ -94,7 +94,6 @@ Name[uk]=Захопити зображення усієї стільниці Name[x-test]=xxCapture Entire Desktopxx Name[zh_CN]=捕获整个桌面 -Name[zh_TW]=擷取整個桌面 Exec=spectacle -f [Desktop Action CurrentMonitorScreenShot] @@ -103,6 +102,7 @@ Name[ast]=Capturar monitor actual Name[ca]=Captura el monitor actual Name[ca@valencia]=Captura el monitor actual +Name[cs]=Zachytit současný monitor Name[da]=Indfang den aktuelle skærm Name[de]=Den aktuellen Bildschirm aufnehmen Name[el]=Λήψη της τρέχουσας οθόνης @@ -124,7 +124,6 @@ Name[uk]=Захопити зображення на моніторі Name[x-test]=xxCapture Current Monitorxx Name[zh_CN]=捕获当前屏幕 -Name[zh_TW]=擷取目前螢幕 Exec=spectacle -m [Desktop Action ActiveWindowScreenShot] @@ -133,6 +132,7 @@ Name[ast]=Capturar ventana actual Name[ca]=Captura la finestra activa Name[ca@valencia]=Captura la finestra activa +Name[cs]=Zachytit aktivní okno Name[da]=Indfang det aktive vindue Name[de]=Das aktive Fenster aufnehmen Name[el]=Λήψη του ενεργού παραθύρου @@ -154,7 +154,6 @@ Name[uk]=Захопити зображення активного вікна Name[x-test]=xxCapture Active Windowxx Name[zh_CN]=捕获活动窗口 -Name[zh_TW]=擷取作用中的視窗 Exec=spectacle -a [Desktop Action RectangularRegionScreenShot] @@ -163,6 +162,7 @@ Name[ast]=Capturar rexón rectangular Name[ca]=Captura una regió rectangular Name[ca@valencia]=Captura una regió rectangular +Name[cs]=Zachytit obdélníkový výběr na obrazovce Name[da]=Indfang firkantet område Name[de]=Einen rechteckigen Bereich aufnehmen Name[el]=Λήψη ορθογώνιας περιοχής @@ -184,5 +184,4 @@ Name[uk]=Захопити прямокутну область екрана Name[x-test]=xxCapture Rectangular Regionxx Name[zh_CN]=捕获矩形区域 -Name[zh_TW]=擷取矩形區域 Exec=spectacle -r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/desktop/spectacle.khotkeys new/spectacle-16.08.0/desktop/spectacle.khotkeys --- old/spectacle-16.04.3/desktop/spectacle.khotkeys 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/desktop/spectacle.khotkeys 2016-08-10 01:06:22.000000000 +0200 @@ -7,6 +7,7 @@ [Data_1] Comment=Shortcuts for taking screenshots +Comment[ast]=Atayos pa facer captures Comment[ca]=Dreceres per a prendre captures de pantalla Comment[ca@valencia]=Dreceres per a prendre captures de pantalla Comment[da]=Genveje til at tage skærmbilleder @@ -28,12 +29,13 @@ Comment[uk]=Клавіатурні скорочення для створення знімків Comment[x-test]=xxShortcuts for taking screenshotsxx Comment[zh_CN]=截图快捷键 -Comment[zh_TW]=螢幕快照的快捷鍵 DataCount=4 Enabled=true Name=Screenshots +Name[ast]=Captures de pantalla Name[ca]=Captures de pantalla Name[ca@valencia]=Captures de pantalla +Name[cs]=Snímky obrazovky Name[da]=Skærmbilleder Name[de]=Bildschirmfotos Name[el]=Στιγμιότυπα οθόνης @@ -53,7 +55,6 @@ Name[uk]=Знімки екрана Name[x-test]=xxScreenshotsxx Name[zh_CN]=截图 -Name[zh_TW]=螢幕快照 SystemGroup=0 Type=ACTION_DATA_GROUP @@ -63,6 +64,7 @@ [Data_1_1] Comment=Start the screenshot tool and show the GUI +Comment[ast]=Anicia la ferramienta de captures de pantalla y amuesa la GUI Comment[ca]=Inicia l'eina de captura de pantalla i mostra la IGU Comment[ca@valencia]=Inicia l'eina de captura de pantalla i mostra la IGU Comment[da]=Start skærmbilledeværktøjet og vis den grafiske brugerflade @@ -84,11 +86,12 @@ Comment[uk]=Запустити інструмент створення знімків і показати графічний інтерфейс Comment[x-test]=xxStart the screenshot tool and show the GUIxx Comment[zh_CN]=启动截图工具并显示界面 -Comment[zh_TW]=啟動螢幕快照工具並顯示使用者介面 Enabled=true Name=Start Screenshot Tool +Name[ast]=Aniciar ferramienta de captures de pantalla Name[ca]=Inicia l'eina de captura de pantalla Name[ca@valencia]=Inicia l'eina de captura de pantalla +Name[cs]=Spustit nástroj na zachytávání snímků obrazovky Name[da]=Start skærmebilledeværktøjet Name[de]=Bildschirmfoto-Programm starten Name[el]=Εκκίνηση του εργαλείου στιγμιοτύπων @@ -108,7 +111,6 @@ Name[uk]=Запустити інструмент створення знімків Name[x-test]=xxStart Screenshot Toolxx Name[zh_CN]=启动截图工具 -Name[zh_TW]=啟動螢幕快照工具 Type=SIMPLE_ACTION_DATA [Data_1_1Actions] @@ -127,6 +129,7 @@ [Data_1_1Triggers] Comment=Simple_action +Comment[ast]=Aición_cenciella Comment[ca]=Acció_senzilla Comment[ca@valencia]=Acció_senzilla Comment[cs]=Jednoduchá činnost @@ -149,7 +152,6 @@ Comment[uk]=Проста_дія Comment[x-test]=xxSimple_actionxx Comment[zh_CN]=简单动作 -Comment[zh_TW]=簡單動作 TriggersCount=1 [Data_1_1Triggers0] @@ -158,8 +160,9 @@ [Data_1_2] Comment=Take a full screen (all monitors) screenshot and save it -Comment[ca]=Pren una captura de pantalla a pantalla completa (tots els monitors) i la desa -Comment[ca@valencia]=Pren una captura de pantalla a pantalla completa (tots els monitors) i la guarda +Comment[ast]=Fai una captura a pantalla completa (tolos monitores) y guárdala +Comment[ca]=Pren una captura de pantalla completa (tots els monitors) i la desa +Comment[ca@valencia]=Pren una captura de pantalla completa (tots els monitors) i la guarda Comment[da]=Tag skærmbillede af hele skærmen (alle skærme) og gem det Comment[de]=Bildschirmfoto des ganzen Bildschirms aller Monitore aufnehmen und speichern Comment[el]=Λήψη ενός πλήρους στιγμιοτύπου οθόνης (όλες οι οθόνες) και αποθήκευσή του @@ -179,11 +182,11 @@ Comment[uk]=Зробити знімок усього екрана (усіх моніторів) і зберегти його Comment[x-test]=xxTake a full screen (all monitors) screenshot and save itxx Comment[zh_CN]=对全屏 (所有显示器) 截图并保存 -Comment[zh_TW]=取得全螢幕（所有螢幕）快照並儲存 Enabled=true Name=Take Full Screen Screenshot -Name[ca]=Pren una captura de pantalla a pantalla completa -Name[ca@valencia]=Pren una captura de pantalla a pantalla completa +Name[ast]=Facer captura de pantalla completa +Name[ca]=Pren una captura de pantalla completa +Name[ca@valencia]=Pren una captura de pantalla completa Name[da]=Tag skærmbillede af hele skærmen Name[de]=Bildschirmfoto des ganzen Bildschirms aufnehmen Name[el]=Λήψη πλήρους στιγμιοτύπου οθόνης @@ -203,7 +206,6 @@ Name[uk]=Зробити знімок усього екрана Name[x-test]=xxTake Full Screen Screenshotxx Name[zh_CN]=对全屏截图 -Name[zh_TW]=取得全螢幕快照 Type=SIMPLE_ACTION_DATA [Data_1_2Actions] @@ -222,6 +224,7 @@ [Data_1_2Triggers] Comment=Simple_action +Comment[ast]=Aición_cenciella Comment[ca]=Acció_senzilla Comment[ca@valencia]=Acció_senzilla Comment[cs]=Jednoduchá činnost @@ -244,7 +247,6 @@ Comment[uk]=Проста_дія Comment[x-test]=xxSimple_actionxx Comment[zh_CN]=简单动作 -Comment[zh_TW]=簡單動作 TriggersCount=1 [Data_1_2Triggers0] @@ -253,6 +255,7 @@ [Data_1_3] Comment=Take a screenshot of the currently active window and save it +Comment[ast]=Fai una captura de la ventana activa anguaño y guárdala Comment[ca]=Pren una captura de pantalla de la finestra activa i la desa Comment[ca@valencia]=Pren una captura de pantalla de la finestra activa i la guarda Comment[da]=Tag skærmbillede af det aktuelt aktive vindue og gem det @@ -274,9 +277,9 @@ Comment[uk]=Зробити знімок поточного активного вікна і зберегти його Comment[x-test]=xxTake a screenshot of the currently active window and save itxx Comment[zh_CN]=对当前活动窗口截图并保存 -Comment[zh_TW]=取得目前作用中視窗的快照並儲存 Enabled=true Name=Take Active Window Screenshot +Name[ast]=Capturar ventana activa Name[ca]=Pren una captura de pantalla de la finestra activa Name[ca@valencia]=Pren una captura de pantalla de la finestra activa Name[da]=Tag skærmbillede af det aktive vindue @@ -298,7 +301,6 @@ Name[uk]=Зробити знімок активного вікна Name[x-test]=xxTake Active Window Screenshotxx Name[zh_CN]=对活动窗口截图 -Name[zh_TW]=取得目前視窗快照 Type=SIMPLE_ACTION_DATA [Data_1_3Actions] @@ -317,6 +319,7 @@ [Data_1_3Triggers] Comment=Simple_action +Comment[ast]=Aición_cenciella Comment[ca]=Acció_senzilla Comment[ca@valencia]=Acció_senzilla Comment[cs]=Jednoduchá činnost @@ -339,7 +342,6 @@ Comment[uk]=Проста_дія Comment[x-test]=xxSimple_actionxx Comment[zh_CN]=简单动作 -Comment[zh_TW]=簡單動作 TriggersCount=1 [Data_1_3Triggers0] @@ -348,6 +350,7 @@ [Data_1_4] Comment=Take a screenshot of a rectangular region you specify and save it +Comment[ast]=Fai una captura d'una rexón rectangular qu'especifiques y guárdala Comment[ca]=Pren una captura de pantalla d'una regió rectangular i la desa Comment[ca@valencia]=Pren una captura de pantalla d'una regió rectangular i la guarda Comment[da]=Tag skærmbillede af et firkantet område som du angiver og gem det @@ -369,9 +372,9 @@ Comment[uk]=Зробити знімок вказаної прямокутної ділянки і зберегти його Comment[x-test]=xxTake a screenshot of a rectangular region you specify and save itxx Comment[zh_CN]=对指定矩形区域截图并保存 -Comment[zh_TW]=取得您指定的矩形區域的快照並儲存 Enabled=true Name=Take Rectangular Region Screenshot +Name[ast]=Capturar rexón rectangular Name[ca]=Pren una captura de pantalla d'una regió rectangular Name[ca@valencia]=Pren una captura de pantalla d'una regió rectangular Name[da]=Tag skærmbillede af et firkantet område @@ -393,7 +396,6 @@ Name[uk]=Зробити знімок прямокутної ділянки Name[x-test]=xxTake Rectangular Region Screenshotxx Name[zh_CN]=对矩形区域截图 -Name[zh_TW]=取得矩形區域快照 Type=SIMPLE_ACTION_DATA [Data_1_4Actions] @@ -412,6 +414,7 @@ [Data_1_4Triggers] Comment=Simple_action +Comment[ast]=Aición_cenciella Comment[ca]=Acció_senzilla Comment[ca@valencia]=Acció_senzilla Comment[cs]=Jednoduchá činnost @@ -434,7 +437,6 @@ Comment[uk]=Проста_дія Comment[x-test]=xxSimple_actionxx Comment[zh_CN]=简单动作 -Comment[zh_TW]=簡單動作 TriggersCount=1 [Data_1_4Triggers0] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/desktop/spectacle.notifyrc new/spectacle-16.08.0/desktop/spectacle.notifyrc --- old/spectacle-16.04.3/desktop/spectacle.notifyrc 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/desktop/spectacle.notifyrc 2016-08-10 01:06:22.000000000 +0200 @@ -4,6 +4,7 @@ Name[ast]=Spectacle Name[ca]=Spectacle Name[ca@valencia]=Spectacle +Name[cs]=Spectacle Name[da]=Spectacle Name[de]=Spectacle Name[el]=Spectacle @@ -26,7 +27,6 @@ Name[uk]=Spectacle Name[x-test]=xxSpectaclexx Name[zh_CN]=Spectacle -Name[zh_TW]=Spectacle Comment=Screenshot Capture Utility Comment[ar]=أداة لأخذ اللقطات Comment[ast]=Utilidá de captura de pantalla @@ -55,7 +55,6 @@ Comment[uk]=Програма для створення знімків екрана Comment[x-test]=xxScreenshot Capture Utilityxx Comment[zh_CN]=屏幕捕获工具 -Comment[zh_TW]=畫面擷取工具 [Event/newScreenshotSaved] Name=New Screenshot Saved @@ -63,6 +62,7 @@ Name[ast]=Guardóse una captura nueva Name[ca]=S'ha desat una captura de pantalla nova Name[ca@valencia]=S'ha guardat una captura de pantalla nova +Name[cs]=Nový snímek byl zachycen Name[da]=Nyt skærmbillede gemt Name[de]=Neues Bildschirmfoto gespeichert Name[el]=Αποθηκεύτηκε νέο στιγμιότυπο @@ -85,7 +85,6 @@ Name[uk]=Збереженого нових знімок Name[x-test]=xxNew Screenshot Savedxx Name[zh_CN]=新屏幕截图已保存 -Name[zh_TW]=螢幕快照已儲存 Comment=A new screenshot was captured and saved Comment[ar]=أُخذت لقطة جديدة وحُفظت Comment[ast]=Capturóse y guardóse una captura de pantalla nueva @@ -113,5 +112,4 @@ Comment[uk]=Було створено і збережено новий знімок Comment[x-test]=xxA new screenshot was captured and savedxx Comment[zh_CN]=屏幕截图已截取并保存 -Comment[zh_TW]=新的螢幕快照已擷取並儲存 Action=Popup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/doc/index.docbook new/spectacle-16.08.0/doc/index.docbook --- old/spectacle-16.04.3/doc/index.docbook 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/doc/index.docbook 2016-08-10 01:06:22.000000000 +0200 @@ -1,8 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY spectacle "Spectacle"> - <!ENTITY kappname "&spectacle;"> - <!ENTITY package "kdegraphics"> + <!ENTITY spectacle "<application>Spectacle</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY Boudhayan.Gupta "<personname><firstname>Boudhayan</firstname><surname>Gupta</surname></personname>"> @@ -34,7 +32,7 @@ <legalnotice>&FDLNotice;</legalnotice> <date>2015-10-17</date> - <releaseinfo>15.12.0</releaseinfo> + <releaseinfo>Applications 15.12</releaseinfo> <abstract> <para>&spectacle; is a simple application for capturing desktop screenshots. It can capture images of the entire desktop, a single monitor, the currently active window, the window currently under the mouse, or a rectangular region of the screen. The images can then be printed, sent to other applications for manipulation, or quickly be saved as-is.</para> @@ -42,7 +40,7 @@ <keywordset> <keyword>KDE</keyword> - <keyword>&spectacle;</keyword> + <keyword>spectacle</keyword> <keyword>kdegraphics</keyword> <keyword>screenshot</keyword> <keyword>screen capture</keyword> @@ -111,7 +109,7 @@ <para>To quickly save the image and quit &spectacle; press the <guibutton>Save & Exit</guibutton> (<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>) button. By default, this saves the image as a PNG file in your default Pictures folder, and exits the application immediately. The default save location and filename can be configured, as described later.</para> - <para>The image can be saved by clicking on the arrow portion of the <guibutton>Save & Exit</guibutton> button, and choosing <guimenuitem>Save As...</guimenuitem> (<keycombo action="simul">&Ctrl;&Shift;<keycap>S</keycap></keycombo>) option. This opens the standard &kde; save dialog, where you can choose the filename, the folder location, and the format that your screenshot will be saved in. You may edit the filename to anything you wish, including the name of a previously saved screenshot. You may also select the <guimenuitem>Save...</guimenuitem> (<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>) option, which will save the image to its default location and with the default filename.</para> + <para>The image can be saved by clicking on the arrow portion of the <guibutton>Save & Exit</guibutton> button, and choosing <guimenuitem>Save As...</guimenuitem> (<keycombo action="simul">&Ctrl;&Shift;<keycap>S</keycap></keycombo>) option. This opens standard save dialog, where you can choose the filename, the folder location, and the format that your screenshot will be saved in. You may edit the filename to anything you wish, including the name of a previously saved screenshot. You may also select the <guimenuitem>Save...</guimenuitem> (<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>) option, which will save the image to its default location and with the default filename.</para> <sect1 id="taking-screenshot"> <title>Taking A Screenshot</title> @@ -164,7 +162,7 @@ <para>Enabling the <guilabel>Include mouse pointer</guilabel> checkbox includes an image of the mouse pointer in the screenshot.</para> </listitem> <listitem> - <para>The <guilabel>Include window titlebar and borders</guilabel> option is only enabled when either the <guilabel>Active Window</guilabel> mode or the <guilabel>Window Under Cursor</guilabel> mode is selected in the <guilabel>Capture Area</guilabel> combo-box. Checking this option includes the window borders and decoration in the screenshot, while unchecking it gives an image of only the window contents.</para> + <para>The <guilabel>Include window titlebar and borders</guilabel> option is only enabled when either the <guilabel>Active Window</guilabel> mode or the <guilabel>Window Under Cursor</guilabel> mode is selected in the <guilabel>Area</guilabel> combo-box. Checking this option includes the window borders and decoration in the screenshot, while unchecking it gives an image of only the window contents.</para> </listitem> <listitem> <para>The <guilabel>Capture the current pop-up only</guilabel> option is only enabled when the <guilabel>Window Under Cursor</guilabel> mode is selected in the <guilabel>Area</guilabel> combo-box. Checking this option captures only the pop-up menu under the cursor, without its parent window.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Config.h.in new/spectacle-16.08.0/src/Config.h.in --- old/spectacle-16.04.3/src/Config.h.in 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Config.h.in 2016-08-10 01:06:22.000000000 +0200 @@ -14,6 +14,6 @@ #cmakedefine SPECTACLE_VERSION "@SPECTACLE_VERSION@" /* set the release codename */ -#define SPECTACLE_CODENAME "So Much For Subtlety" +#define SPECTACLE_CODENAME "Sorry For Any Inconvenience" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/ExportManager.cpp new/spectacle-16.08.0/src/ExportManager.cpp --- old/spectacle-16.04.3/src/ExportManager.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/ExportManager.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -282,7 +282,7 @@ // save slots -void ExportManager::doSave(const QUrl &url) +void ExportManager::doSave(const QUrl &url, bool notify) { if (mSavePixmap.isNull()) { emit errorMessage(i18n("Cannot save an empty screenshot image.")); @@ -296,6 +296,9 @@ setSaveLocation(dir.absolutePath()); emit imageSaved(savePath); + if (notify) { + emit forceNotify(savePath); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/ExportManager.h new/spectacle-16.08.0/src/ExportManager.h --- old/spectacle-16.04.3/src/ExportManager.h 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/ExportManager.h 2016-08-10 01:06:22.000000000 +0200 @@ -63,13 +63,14 @@ void saveLocationChanged(const QString &location); void pixmapChanged(const QPixmap &pixmap); void imageSaved(const QUrl &savedAt); + void forceNotify(const QUrl &savedAt); public slots: QUrl getAutosaveFilename(); QUrl tempSave(const QString &mimetype = "png"); - void doSave(const QUrl &url = QUrl()); + void doSave(const QUrl &url = QUrl(), bool notify = false); void doSaveAs(QWidget *parentWindow = 0); void doCopyToClipboard(); void doPrint(QPrinter *printer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Gui/ExportMenu.cpp new/spectacle-16.08.0/src/Gui/ExportMenu.cpp --- old/spectacle-16.04.3/src/Gui/ExportMenu.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Gui/ExportMenu.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -138,7 +138,7 @@ KIPI::PluginLoader::PluginList pluginList = loader->pluginList(); - for (auto pluginInfo: pluginList) { + Q_FOREACH (const auto &pluginInfo, pluginList) { if (!(pluginInfo->shouldLoad())) { continue; } @@ -154,7 +154,7 @@ QList<QAction *> actions = plugin->actions(); QSet<QAction *> exportActions; - for (auto action: actions) { + Q_FOREACH (auto action, actions) { KIPI::Category category = plugin->category(action); if (category == KIPI::ExportPlugin) { exportActions += action; @@ -163,7 +163,7 @@ } } - for (auto action: exportActions) { + Q_FOREACH (auto action, exportActions) { mKipiMenu->addAction(action); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Gui/KSMainWindow.cpp new/spectacle-16.08.0/src/Gui/KSMainWindow.cpp --- old/spectacle-16.04.3/src/Gui/KSMainWindow.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Gui/KSMainWindow.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -154,7 +154,7 @@ mDialogButtonBox->button(QDialogButtonBox::Help)->setMenu(helpMenu->menu()); // message widget - connect(mMessageWidget, &KMessageWidget::linkActivated, &QDesktopServices::openUrl); + connect(mMessageWidget, &KMessageWidget::linkActivated, this, [](const QString &str) { QDesktopServices::openUrl(QUrl(str)); } ); // layouts @@ -328,6 +328,7 @@ void KSMainWindow::saveAndExit() { SpectacleConfig::instance()->setLastUsedSaveMode(0); - ExportManager::instance()->doSave(); - QApplication::quit(); + qApp->setQuitOnLastWindowClosed(false); + ExportManager::instance()->doSave(QUrl(), true); + hide(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Gui/KSWidget.cpp new/spectacle-16.08.0/src/Gui/KSWidget.cpp --- old/spectacle-16.04.3/src/Gui/KSWidget.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Gui/KSWidget.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -69,9 +69,10 @@ mDelayMsec->setSingleStep(1.0); mDelayMsec->setMinimum(0.0); mDelayMsec->setMaximum(999.9); - mDelayMsec->setSuffix(i18n(" seconds")); + mDelayMsec->setSpecialValueText(i18n("No Delay")); mDelayMsec->setMinimumWidth(160); - connect(mDelayMsec, static_cast<void (SmartSpinBox::*)(qreal)>(&SmartSpinBox::valueChanged), configManager, &SpectacleConfig::setCaptureDelay); + connect(mDelayMsec, static_cast<void (SmartSpinBox::*)(qreal)>(&SmartSpinBox::valueChanged), + configManager, &SpectacleConfig::setCaptureDelay); mCaptureOnClick = new QCheckBox(this); mCaptureOnClick->setText(i18n("On Click")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Gui/SettingsDialog/GeneralOptionsPage.cpp new/spectacle-16.08.0/src/Gui/SettingsDialog/GeneralOptionsPage.cpp --- old/spectacle-16.04.3/src/Gui/SettingsDialog/GeneralOptionsPage.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Gui/SettingsDialog/GeneralOptionsPage.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -60,6 +60,31 @@ dsLayout->addLayout(dsCLayout); mainLayout->addWidget(dsGroup, 1); + // copy save path to clipboard + + QGroupBox *cpGroup = new QGroupBox(i18n("Copy Save Location to Clipboard")); + QVBoxLayout *cpLayout = new QVBoxLayout; + cpGroup->setLayout(cpLayout); + cpGroup->setStyleSheet(QStringLiteral("QGroupBox { font-weight: bold; }")); + + QLabel *cpHelpText = new QLabel; + cpHelpText->setWordWrap(true); + cpHelpText->setText(i18n("When a screenshot is saved, copy the location at which the file was saved " + "to the clipboard. You can then paste it anywhere that accepts text input. " + "Note that you must be running a clipboard manager in order to keep the path " + "in the clipboard after Spectacle quits.")); + cpLayout->addWidget(cpHelpText); + + mCopyPathToClipboard = new QCheckBox; + mCopyPathToClipboard->setText(i18n("Copy save location to the clipboard")); + connect(mCopyPathToClipboard, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty); + + QVBoxLayout *cpCLayout = new QVBoxLayout; + cpCLayout->setContentsMargins(15, 10, 0, 10); + cpCLayout->addWidget(mCopyPathToClipboard); + cpLayout->addLayout(cpCLayout); + mainLayout->addWidget(cpGroup, 1); + // use a light background for the rectangular region grabber QGroupBox *lbGroup = new QGroupBox(i18n("Light Background For Rectangular Region")); @@ -131,6 +156,7 @@ cfgManager->setUseDynamicSaveButton(mUseLastSaveAction->checkState() == Qt::Checked); cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked); cfgManager->setRememberLastRectangularRegion(mRememberRect->checkState() == Qt::Checked); + cfgManager->setCopySaveLocationToClipboard(mCopyPathToClipboard->checkState() == Qt::Checked); mChangesMade = false; } @@ -142,6 +168,7 @@ mUseLastSaveAction->setChecked(cfgManager->useDynamicSaveButton()); mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour()); mRememberRect->setChecked(cfgManager->rememberLastRectangularRegion()); + mCopyPathToClipboard->setChecked(cfgManager->copySaveLocationToClipboard()); mChangesMade = false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Gui/SettingsDialog/GeneralOptionsPage.h new/spectacle-16.08.0/src/Gui/SettingsDialog/GeneralOptionsPage.h --- old/spectacle-16.04.3/src/Gui/SettingsDialog/GeneralOptionsPage.h 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Gui/SettingsDialog/GeneralOptionsPage.h 2016-08-10 01:06:22.000000000 +0200 @@ -46,6 +46,7 @@ QCheckBox *mUseLastSaveAction; QCheckBox *mRememberRect; QCheckBox *mUseLightBackground; + QCheckBox *mCopyPathToClipboard; }; #endif // GENERALOPTIONSPAGE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Gui/SmartSpinBox.cpp new/spectacle-16.08.0/src/Gui/SmartSpinBox.cpp --- old/spectacle-16.04.3/src/Gui/SmartSpinBox.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Gui/SmartSpinBox.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -18,11 +18,16 @@ */ #include <QtMath> +#include <KLocalizedString> + #include "SmartSpinBox.h" SmartSpinBox::SmartSpinBox(QWidget *parent) : QDoubleSpinBox(parent) -{} +{ + connect(this, static_cast<void (SmartSpinBox::*)(qreal)>(&SmartSpinBox::valueChanged), + this, &SmartSpinBox::suffixChangeHandler); +} QString SmartSpinBox::textFromValue(double val) const { @@ -31,3 +36,12 @@ } return QWidget::locale().toString(val, 'f', decimals()); } + +void SmartSpinBox::suffixChangeHandler(double val) +{ + if (val <= 1.0) { + setSuffix(i18n(" second")); + } else { + setSuffix(i18n(" seconds")); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Gui/SmartSpinBox.h new/spectacle-16.08.0/src/Gui/SmartSpinBox.h --- old/spectacle-16.04.3/src/Gui/SmartSpinBox.h 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Gui/SmartSpinBox.h 2016-08-10 01:06:22.000000000 +0200 @@ -30,6 +30,10 @@ explicit SmartSpinBox(QWidget *parent = 0); QString textFromValue(double val) const Q_DECL_OVERRIDE; + + private slots: + + void suffixChangeHandler(double val); }; #endif // SMARTSPINBOX_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/KipiInterface/KSGKipiImageCollectionSelector.cpp new/spectacle-16.08.0/src/KipiInterface/KSGKipiImageCollectionSelector.cpp --- old/spectacle-16.04.3/src/KipiInterface/KSGKipiImageCollectionSelector.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/KipiInterface/KSGKipiImageCollectionSelector.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -27,7 +27,7 @@ mInterface(interface), mListWidget(new QListWidget) { - for(auto collection: interface->allAlbums()) { + Q_FOREACH (const auto &collection, interface->allAlbums()) { QListWidgetItem *item = new QListWidgetItem(mListWidget); QString name = collection.name(); int imageCount = collection.images().size(); @@ -53,7 +53,7 @@ QList<KIPI::ImageCollection> selectedList; if (item) { QString name = item->data(Qt::UserRole).toString(); - for(auto collection: mInterface->allAlbums()) { + Q_FOREACH (const auto &collection, mInterface->allAlbums()) { if (collection.name() == name) { selectedList.append(collection); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/Main.cpp new/spectacle-16.08.0/src/Main.cpp --- old/spectacle-16.04.3/src/Main.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/Main.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -31,6 +31,7 @@ #include "SpectacleCore.h" #include "SpectacleDBusAdapter.h" +#include "ExportManager.h" #include "Config.h" int main(int argc, char **argv) @@ -150,8 +151,10 @@ new KDBusService(KDBusService::Multiple, &core); SpectacleDBusAdapter *dbusAdapter = new SpectacleDBusAdapter(&core); - QObject::connect(&core, &SpectacleCore::imageSaved, dbusAdapter, &SpectacleDBusAdapter::ScreenshotTaken); QObject::connect(&core, &SpectacleCore::grabFailed, dbusAdapter, &SpectacleDBusAdapter::ScreenshotFailed); + QObject::connect(ExportManager::instance(), &ExportManager::imageSaved, [&](const QUrl savedAt) { + emit dbusAdapter->ScreenshotTaken(savedAt.toLocalFile()); + }); QDBusConnection::sessionBus().registerObject("/", &core); QDBusConnection::sessionBus().registerService("org.kde.Spectacle"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/PlatformBackends/X11ImageGrabber.cpp new/spectacle-16.08.0/src/PlatformBackends/X11ImageGrabber.cpp --- old/spectacle-16.04.3/src/PlatformBackends/X11ImageGrabber.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/PlatformBackends/X11ImageGrabber.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -125,7 +125,7 @@ QByteArrayLiteral("cross-reverse") }; - for (auto cursorName: cursorNames) { + Q_FOREACH (const QByteArray &cursorName, cursorNames) { xcb_cursor_t cursor = xcb_cursor_load_cursor(xcbCursorCtx, cursorName.constData()); if (cursor != XCB_CURSOR_NONE) { xcbCursor = cursor; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/QuickEditor/EditorRoot.qml new/spectacle-16.08.0/src/QuickEditor/EditorRoot.qml --- old/spectacle-16.04.3/src/QuickEditor/EditorRoot.qml 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/QuickEditor/EditorRoot.qml 2016-08-10 01:06:22.000000000 +0200 @@ -45,21 +45,21 @@ cropDisplayCanvas.requestPaint(); } - // key handlers - - focus: true; - - Keys.onReturnPressed: { + function accept() { if (selection) { - acceptImage(selection.x * Screen.devicePixelRatio, - selection.y * Screen.devicePixelRatio, - selection.width * Screen.devicePixelRatio, - selection.height * Screen.devicePixelRatio); + acceptImage(selection.x, selection.y, selection.width, selection.height); } else { acceptImage(-1, -1, -1, -1); } } + // key handlers + + focus: true; + + Keys.onReturnPressed: accept() + Keys.onEnterPressed: accept() + Keys.onEscapePressed: { cancelImage(); } @@ -255,12 +255,7 @@ drawCanvas: cropDisplayCanvas; imageElement: imageBackground; - onDoubleClicked: { - editorRoot.acceptImage(selection.x * Screen.devicePixelRatio, - selection.y * Screen.devicePixelRatio, - selection.width * Screen.devicePixelRatio, - selection.height * Screen.devicePixelRatio); - } + onDoubleClicked: editorRoot.accept() } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/QuickEditor/QuickEditor.cpp new/spectacle-16.08.0/src/QuickEditor/QuickEditor.cpp --- old/spectacle-16.04.3/src/QuickEditor/QuickEditor.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/QuickEditor/QuickEditor.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -135,7 +135,8 @@ return; } - d->mGrabRect = QRect(x, y, width, height); + auto pixelRatio = d->mQuickView->devicePixelRatio(); + d->mGrabRect = QRect(x * pixelRatio, y * pixelRatio, width * pixelRatio, height * pixelRatio); SpectacleConfig::instance()->setCropRegion(d->mGrabRect); d->mQuickView->hide(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/SpectacleConfig.cpp new/spectacle-16.08.0/src/SpectacleConfig.cpp --- old/spectacle-16.04.3/src/SpectacleConfig.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/SpectacleConfig.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -222,3 +222,16 @@ mGeneralConfig.writePathEntry(QStringLiteral("default-save-location"), location); mGeneralConfig.sync(); } + +// copy save location to clipboard + +bool SpectacleConfig::copySaveLocationToClipboard() const +{ + return mGeneralConfig.readEntry(QStringLiteral("copySaveLocation"), false); +} + +void SpectacleConfig::setCopySaveLocationToClipboard(bool enabled) +{ + mGeneralConfig.writeEntry(QStringLiteral("copySaveLocation"), enabled); + mGeneralConfig.sync(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/SpectacleConfig.h new/spectacle-16.08.0/src/SpectacleConfig.h --- old/spectacle-16.04.3/src/SpectacleConfig.h 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/SpectacleConfig.h 2016-08-10 01:06:22.000000000 +0200 @@ -91,6 +91,9 @@ QString autoSaveLocation() const; void setAutoSaveLocation(const QString &location); + bool copySaveLocationToClipboard() const; + void setCopySaveLocationToClipboard(bool enabled); + private: KSharedConfigPtr mConfig; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/SpectacleCore.cpp new/spectacle-16.08.0/src/SpectacleCore.cpp --- old/spectacle-16.04.3/src/SpectacleCore.cpp 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/SpectacleCore.cpp 2016-08-10 01:06:22.000000000 +0200 @@ -18,7 +18,9 @@ */ #include "SpectacleCore.h" +#include "SpectacleConfig.h" +#include <QClipboard> #include <QDir> #include <QTimer> #include <QDebug> @@ -81,9 +83,8 @@ connect(this, &SpectacleCore::errorMessage, this, &SpectacleCore::showErrorMessage); connect(mImageGrabber, &ImageGrabber::pixmapChanged, this, &SpectacleCore::screenshotUpdated); connect(mImageGrabber, &ImageGrabber::imageGrabFailed, this, &SpectacleCore::screenshotFailed); - connect(mExportManager, &ExportManager::imageSaved, [&](const QUrl &savedAt) { - emit imageSaved(savedAt.toLocalFile()); - }); + connect(mExportManager, &ExportManager::imageSaved, this, &SpectacleCore::doCopyPath); + connect(mExportManager, &ExportManager::forceNotify, this, &SpectacleCore::doNotify); switch (startMode) { case DBusMode: @@ -250,7 +251,6 @@ connect(notify, &KNotification::action1Activated, this, [this, savedAt] { new KRun(savedAt, nullptr); - QTimer::singleShot(250, this, &SpectacleCore::allDone); }); connect(notify, &QObject::destroyed, this, &SpectacleCore::allDone); @@ -258,6 +258,13 @@ notify->sendEvent(); } +void SpectacleCore::doCopyPath(const QUrl &savedAt) +{ + if (SpectacleConfig::instance()->copySaveLocationToClipboard()) { + qApp->clipboard()->setText(savedAt.toLocalFile()); + } +} + void SpectacleCore::doStartDragAndDrop() { QUrl tempFile = mExportManager->tempSave(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.04.3/src/SpectacleCore.h new/spectacle-16.08.0/src/SpectacleCore.h --- old/spectacle-16.04.3/src/SpectacleCore.h 2016-07-02 18:00:52.000000000 +0200 +++ new/spectacle-16.08.0/src/SpectacleCore.h 2016-08-10 01:06:22.000000000 +0200 @@ -57,7 +57,6 @@ void filenameChanged(QString filename); void grabModeChanged(ImageGrabber::GrabMode mode); void grabFailed(); - void imageSaved(const QString &savedAt); public slots: @@ -68,6 +67,7 @@ void dbusStartAgent(); void doStartDragAndDrop(); void doNotify(const QUrl &savedAt); + void doCopyPath(const QUrl &savedAt); private:
