Git commit b818a063c80e995ca79bdd5fd979e52284abf9d3 by Boudhayan Gupta. Committed on 23/09/2015 at 16:14. Pushed by bgupta into branch 'master'.
Rename to Spectacle M +3 -7 CMakeLists.txt M +1 -1 CONTRIBUTING M +1 -3 Messages.sh M +2 -2 desktop/CMakeLists.txt R +3 -13 desktop/org.kde.spectacle.desktop [from: desktop/org.kde.kapture.desktop - 083% similarity] R +2 -12 desktop/spectacle.notifyrc [from: desktop/kapture.notifyrc - 091% similarity] M +1 -1 doc/CMakeLists.txt R +- -- doc/Spectacle.png [from: doc/Kapture.png - 100% similarity] M +29 -29 doc/index.docbook R +- -- icons/16-apps-spectacle.png [from: icons/16-apps-ksnapshot.png - 100% similarity] R +- -- icons/22-apps-spectacle.png [from: icons/22-apps-ksnapshot.png - 100% similarity] R +- -- icons/32-apps-spectacle.png [from: icons/32-apps-ksnapshot.png - 100% similarity] R +- -- icons/48-apps-spectacle.png [from: icons/48-apps-ksnapshot.png - 100% similarity] M +5 -5 icons/CMakeLists.txt R +- -- icons/sc-apps-spectacle.svgz [from: icons/sc-apps-ksnapshot.svgz - 100% similarity] M +1 -1 src/.reviewboardrc M +13 -13 src/CMakeLists.txt M +4 -4 src/Config.h.in M +3 -3 src/Gui/KSMainWindow.cpp M +2 -2 src/Gui/KSSaveConfigDialog.cpp M +5 -5 src/Gui/KSWidget.cpp M +5 -5 src/KSCore.cpp M +1 -1 src/KipiInterface/KSGKipiImageCollectionShared.cpp M +1 -1 src/KipiInterface/KSGKipiInfoShared.cpp M +6 -6 src/Main.cpp http://commits.kde.org/kscreengenie/b818a063c80e995ca79bdd5fd979e52284abf9d3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bc3dff..bb0b97e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,13 @@ -# Kapture project +# Spectacle project -project(Kapture) +project(Spectacle) # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "08") set(KDE_APPLICATIONS_VERSION_MICRO "999") set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") -set(KAPTURE_VERSION ${KDE_APPLICATIONS_VERSION}) +set(SPECTACLE_VERSION ${KDE_APPLICATIONS_VERSION}) # minimum requirements @@ -30,12 +30,8 @@ set( include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) -include(ECMOptionalAddSubdirectory) include(ECMInstallIcons) include(ECMSetupVersion) -include(ECMMarkNonGuiExecutable) -include(ECMGenerateHeaders) -include(GenerateExportHeader) include(FeatureSummary) find_package( diff --git a/CONTRIBUTING b/CONTRIBUTING index bc16797..1e6b90f 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -21,7 +21,7 @@ committed without prior notification. CODING STYLE -Kapture follows the KDELibs coding style, with a few execptions: +Spectacle follows the KDELibs coding style, with a few execptions: 1. In class definitions, access modifiers are aligned along with member declarations, i.e., at one level right. E.g.: diff --git a/Messages.sh b/Messages.sh index 7390e81..2430fbc 100644 --- a/Messages.sh +++ b/Messages.sh @@ -13,6 +13,4 @@ if [ -f "data/tips" ] ; then fi # Run xgettext to extract strings from all source files. -$XGETTEXT `find . -name \*.cpp -o -name \*.h -o -name \*.qml` -o $podir/kapture.pot - - +$XGETTEXT `find . -name \*.cpp -o -name \*.h -o -name \*.qml` -o $podir/spectacle.pot diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index 7127249..891fbba 100644 --- a/desktop/CMakeLists.txt +++ b/desktop/CMakeLists.txt @@ -1,11 +1,11 @@ # install the .desktop and rc files in the correct place install( - PROGRAMS org.kde.kapture.desktop + PROGRAMS org.kde.spectacle.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( - FILES kapture.notifyrc + FILES spectacle.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} ) diff --git a/desktop/org.kde.kapture.desktop b/desktop/org.kde.spectacle.desktop similarity index 83% rename from desktop/org.kde.kapture.desktop rename to desktop/org.kde.spectacle.desktop index 2741c41..00777c7 100644 --- a/desktop/org.kde.kapture.desktop +++ b/desktop/org.kde.spectacle.desktop @@ -18,21 +18,11 @@ GenericName[sv]=Verktyg för att ta skärmbilder GenericName[uk]=Програма для створення знімків екрана GenericName[x-test]=xxScreenshot Capture Utilityxx GenericName[zh_CN]=屏幕截图工具 -Name=Kapture -Name[ca]=Kapture -Name[es]=Kapture -Name[fi]=Kapture -Name[nl]=Kapture -Name[pl]=Kapture -Name[pt]=Kapture -Name[pt_BR]=Kapture -Name[sv]=Kapture -Name[uk]=Kapture -Name[x-test]=xxKapturexx +Name=Spectacle Categories=Qt;KDE;Utility; MimeType= -Exec=kapture -Icon=ksnapshot +Exec=spectacle +Icon=spectacle Type=Application Terminal=false StartupNotify=false diff --git a/desktop/kapture.notifyrc b/desktop/spectacle.notifyrc similarity index 91% rename from desktop/kapture.notifyrc rename to desktop/spectacle.notifyrc index d224200..d44cec5 100644 --- a/desktop/kapture.notifyrc +++ b/desktop/spectacle.notifyrc @@ -1,16 +1,6 @@ [Global] -IconName=kapture -Name=Kapture -Name[ca]=Kapture -Name[es]=Kapture -Name[fi]=Kapture -Name[nl]=Kapture -Name[pl]=Kapture -Name[pt]=Kapture -Name[pt_BR]=Kapture -Name[sv]=Kapture -Name[uk]=Kapture -Name[x-test]=xxKapturexx +IconName=spectacle +Name=Spectacle Comment=Screenshot Capture Utility Comment[ca]=Utilitat per pendre captures de pantalla Comment[cs]=Nástroj na snímání obrazovky diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 12ea21e..1f691b0 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -3,5 +3,5 @@ KDOCTOOLS_CREATE_HANDBOOK( index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en - SUBDIR kapture + SUBDIR spectacle ) diff --git a/doc/Kapture.png b/doc/Spectacle.png similarity index 100% rename from doc/Kapture.png rename to doc/Spectacle.png diff --git a/doc/index.docbook b/doc/index.docbook index c75b86a..deced0e 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kapture "Kapture"> - <!ENTITY kappname "&kapture;"> + <!ENTITY spectacle "Spectacle"> + <!ENTITY kappname "&spectacle;"> <!ENTITY package "kdegraphics"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> @@ -9,9 +9,9 @@ <!ENTITY Boudhayan.Gupta.mail "<email>[email protected]</email>"> ]> -<book id="kapture" lang="&language;"> +<book id="spectacle" lang="&language;"> <bookinfo> - <title>The &kapture; Handbook</title> + <title>The &spectacle; Handbook</title> <authorgroup> <author> @@ -37,12 +37,12 @@ <releaseinfo>1.9.96</releaseinfo> <abstract> - <para>&kapture; 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> + <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> </abstract> <keywordset> <keyword>KDE</keyword> - <keyword>&kapture;</keyword> + <keyword>&spectacle;</keyword> <keyword>kdegraphics</keyword> <keyword>screenshot</keyword> <keyword>screen capture</keyword> @@ -53,61 +53,61 @@ <chapter id="introduction"> <title>Introduction</title> - <para>&kapture; 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> + <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> <para>Please report any problems or feature requests to the <ulink url="http://bugs.kde.org/";>&kde; Bug Tracking System</ulink>.</para> </chapter> <chapter id="starting"> - <title>Starting &kapture;</title> + <title>Starting &spectacle;</title> - <para>&kapture; can be started in a variety of ways, as described below:</para> + <para>&spectacle; can be started in a variety of ways, as described below:</para> <itemizedlist> <listitem> - <para>In the application launcher menu, &kapture; can be found at <menuchoice><guisubmenu>Applications</guisubmenu><guisubmenu>Graphics</guisubmenu><guimenuitem>Screenshot Capture Utility &kapture;</guimenuitem></menuchoice></para> + <para>In the application launcher menu, &spectacle; can be found at <menuchoice><guisubmenu>Applications</guisubmenu><guisubmenu>Graphics</guisubmenu><guimenuitem>Screenshot Capture Utility &spectacle;</guimenuitem></menuchoice></para> </listitem> <listitem> - <para>Pressing the <keycap>Print Screen</keycap> button on the keyboard will immediately launch &kapture;. Additionally, two more keyboard shortcuts are available. Pressing <keycombo action="simul">&Alt;<keycap>Print Screen</keycap></keycombo> will take a screenshot of the active window and save it in your default <filename class="directory">Pictures</filename> folder without showing the GUI, while pressing <keycombo action="simul">&Shift;<keycap>Print Screen</keycap></keycombo> will take a screenshot of your entire desktop and save it in your default <filename class="directory">Pictures</filename> folder without showing the GUI.</para> + <para>Pressing the <keycap>Print Screen</keycap> button on the keyboard will immediately launch &spectacle;. Additionally, two more keyboard shortcuts are available. Pressing <keycombo action="simul">&Alt;<keycap>Print Screen</keycap></keycombo> will take a screenshot of the active window and save it in your default <filename class="directory">Pictures</filename> folder without showing the GUI, while pressing <keycombo action="simul">&Shift;<keycap>Print Screen</keycap></keycombo> will take a screenshot of your entire desktop and save it in your default <filename class="directory">Pictures</filename> folder without showing the GUI.</para> </listitem> <listitem> - <para>The mini command line &krunner; (invoked with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) may also be used to start &kapture;.</para> + <para>The mini command line &krunner; (invoked with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) may also be used to start &spectacle;.</para> </listitem> <listitem> - <para> &kapture; can be started from the command-line. &kapture; has an extensive set of command-line options, including a background mode which can be used to script the capture of screenshots without showing the GUI or requiring user interaction.</para> + <para> &spectacle; can be started from the command-line. &spectacle; has an extensive set of command-line options, including a background mode which can be used to script the capture of screenshots without showing the GUI or requiring user interaction.</para> - <para>To start &kapture; from the command prompt, type in:</para> + <para>To start &spectacle; from the command prompt, type in:</para> <screen width="40"> - <prompt>%</prompt> <command>kapture &</command> + <prompt>%</prompt> <command>spectacle &</command> </screen> <para>To view the full list of command-line options and their explanation, type in:</para> <screen width="40"> - <prompt>%</prompt> <command>kapture --help</command> + <prompt>%</prompt> <command>spectacle --help</command> </screen> </listitem> </itemizedlist> </chapter> <chapter id="using"> - <title>Using &kapture;</title> + <title>Using &spectacle;</title> - <para>Once &kapture; starts, you will see a window like the following: + <para>Once &spectacle; starts, you will see a window like the following: <mediaobject> <imageobject> <imagedata fileref="MainWindow.png" format="PNG"/> </imageobject> <textobject> - <phrase>&kapture; Main Window</phrase> + <phrase>&spectacle; Main Window</phrase> </textobject> </mediaobject> </para> - <para>&kapture; grabs an image of your entire desktop immediately after it is started, but before it displays itself on screen. This allows you to quickly create full-desktop screenshot images.</para> + <para>&spectacle; grabs an image of your entire desktop immediately after it is started, but before it displays itself on screen. This allows you to quickly create full-desktop screenshot images.</para> - <para>The snapshot taken by &kapture; is displayed in the preview window, which is located on the left-hand side of the &kapture; application window.</para> + <para>The snapshot taken by &spectacle; is displayed in the preview window, which is located on the left-hand side of the &spectacle; application window.</para> - <para>To quickly save the image and quit &kapture; 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>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> @@ -136,9 +136,9 @@ <para>The <guilabel>Active Window</guilabel> option takes a screenshot of the window that currently has focus. It is advisable to use a delay with this mode, to give you time to select and activate a window before the screenshot is taken.</para> </listitem> <listitem> - <para>The <guilabel>Window Under Cursor</guilabel> option takes a screenshot of the window that is under the mouse cursor. If the cursor is on top of a pop-up menu, &kapture; tries to take a screenshot of the menu as well as its parent window.</para> + <para>The <guilabel>Window Under Cursor</guilabel> option takes a screenshot of the window that is under the mouse cursor. If the cursor is on top of a pop-up menu, &spectacle; tries to take a screenshot of the menu as well as its parent window.</para> - <para>While this works most of the time, in certain cases it may fail to obtain information about the parent window. In this case, &kapture; falls back to old way of capturing the image automatically, and captures an image of only the pop-up menu. You can also force the old way of capturing the image by checking the <guilabel>Capture the current pop-up only</guilabel> checkbox under <guilabel>Content Options</guilabel></para> + <para>While this works most of the time, in certain cases it may fail to obtain information about the parent window. In this case, &spectacle; falls back to old way of capturing the image automatically, and captures an image of only the pop-up menu. You can also force the old way of capturing the image by checking the <guilabel>Capture the current pop-up only</guilabel> checkbox under <guilabel>Content Options</guilabel></para> </listitem> <listitem> <para>The <guilabel>Rectangular Region</guilabel> option allows you to select a rectangular region of your desktop with your mouse. This region may be spread across different outputs.</para> @@ -149,13 +149,13 @@ <para>The <guilabel>Delay</guilabel> spin-box allows you to set the delay between pressing the <guibutton>Take New Screenshot</guibutton> (<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>) button and taking the screenshot. This delay can be set in increments of 0.1 seconds, or 100 milliseconds.</para> - <para>Enabling the <guilabel>On Click</guilabel> checkbox overrides the delay. When this checkbox is enabled, pressing the <guibutton>Take New Screenshot</guibutton> (<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>) button hides the &kapture; window and changes the mouse cursor to a crosshair. The screenshot is captured when the mouse is left-clicked, or aborted if any other mouse buttons are clicked. Note that you cannot interact with the desktop using the mouse while the cursor is a crosshair, but you can use the keyboard.</para> + <para>Enabling the <guilabel>On Click</guilabel> checkbox overrides the delay. When this checkbox is enabled, pressing the <guibutton>Take New Screenshot</guibutton> (<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>) button hides the &spectacle; window and changes the mouse cursor to a crosshair. The screenshot is captured when the mouse is left-clicked, or aborted if any other mouse buttons are clicked. Note that you cannot interact with the desktop using the mouse while the cursor is a crosshair, but you can use the keyboard.</para> </sect2> <sect2> <title>Content Options</title> - <para>The content options settings allow you to select whether the mouse cursor should be included in the screenshots, and whether to capture window decorations along with the image of a single application window. In <guilabel>Window Under Cursor</guilabel> mode, it also allows you to select if &kapture; shall only capture the image of the current pop-up menu under the cursor, or also include the parent window.</para> + <para>The content options settings allow you to select whether the mouse cursor should be included in the screenshots, and whether to capture window decorations along with the image of a single application window. In <guilabel>Window Under Cursor</guilabel> mode, it also allows you to select if &spectacle; shall only capture the image of the current pop-up menu under the cursor, or also include the parent window.</para> <itemizedlist> <listitem> @@ -178,13 +178,13 @@ <sect1> <title>Buttons</title> - <para>There are five buttons located at the bottom of the &kapture; window. Their functions are described below:</para> + <para>There are five buttons located at the bottom of the &spectacle; window. Their functions are described below:</para> <variablelist> <varlistentry> <term><guibutton>Help</guibutton></term> <listitem> - <para>This button gives you a menu where you can open the <guimenuitem>&kapture; Handbook</guimenuitem>, report a bug, switch the language for &kapture; or get some more information <guimenuitem>About &kapture;</guimenuitem> and <guimenuitem>About &kde;</guimenuitem>.</para> + <para>This button gives you a menu where you can open the <guimenuitem>&spectacle; Handbook</guimenuitem>, report a bug, switch the language for &spectacle; or get some more information <guimenuitem>About &spectacle;</guimenuitem> and <guimenuitem>About &kde;</guimenuitem>.</para> </listitem> </varlistentry> <varlistentry> @@ -220,7 +220,7 @@ <sect1> <title>Configure Save Options</title> - <para>When you use the <guilabel>Save & Exit</guilabel> or the <guilabel>Save</guilabel> functions, &kapture; saves the image with a default filename, in your Pictures folder under your home directory. The default filename includes the date and time when the image was taken.</para> + <para>When you use the <guilabel>Save & Exit</guilabel> or the <guilabel>Save</guilabel> functions, &spectacle; saves the image with a default filename, in your Pictures folder under your home directory. The default filename includes the date and time when the image was taken.</para> <para>The <guilabel>Configure Save Options</guilabel> option allows you to set the default save location and filename. Clicking this option brings up a dialog box like the following: <mediaobject> diff --git a/icons/16-apps-ksnapshot.png b/icons/16-apps-spectacle.png similarity index 100% rename from icons/16-apps-ksnapshot.png rename to icons/16-apps-spectacle.png diff --git a/icons/22-apps-ksnapshot.png b/icons/22-apps-spectacle.png similarity index 100% rename from icons/22-apps-ksnapshot.png rename to icons/22-apps-spectacle.png diff --git a/icons/32-apps-ksnapshot.png b/icons/32-apps-spectacle.png similarity index 100% rename from icons/32-apps-ksnapshot.png rename to icons/32-apps-spectacle.png diff --git a/icons/48-apps-ksnapshot.png b/icons/48-apps-spectacle.png similarity index 100% rename from icons/48-apps-ksnapshot.png rename to icons/48-apps-spectacle.png diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index d162049..2c6d2e3 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -3,11 +3,11 @@ ecm_install_icons( ICONS - 16-apps-ksnapshot.png - 22-apps-ksnapshot.png - 32-apps-ksnapshot.png - 48-apps-ksnapshot.png - sc-apps-ksnapshot.svgz + 16-apps-spectacle.png + 22-apps-spectacle.png + 32-apps-spectacle.png + 48-apps-spectacle.png + sc-apps-spectacle.svgz DESTINATION ${ICON_INSTALL_DIR} THEME hicolor ) diff --git a/icons/sc-apps-ksnapshot.svgz b/icons/sc-apps-spectacle.svgz similarity index 100% rename from icons/sc-apps-ksnapshot.svgz rename to icons/sc-apps-spectacle.svgz diff --git a/src/.reviewboardrc b/src/.reviewboardrc index f711507..1c284e9 100644 --- a/src/.reviewboardrc +++ b/src/.reviewboardrc @@ -1,3 +1,3 @@ REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kapture' +REPOSITORY = 'git://anongit.kde.org/spectacle' PEOPLE='bgupta' diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54a3a89..0dcac08 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,7 @@ configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h) # target set( - KAPTURE_SRCS_DEFAULT + SPECTACLE_SRCS_DEFAULT Main.cpp KSCore.cpp ScreenClipper.cpp @@ -20,14 +20,14 @@ set( if(XCB_FOUND) set( - KAPTURE_SRCS_X11 + SPECTACLE_SRCS_X11 PlatformBackends/X11ImageGrabber.cpp ) endif() if(KF5Kipi_FOUND) set( - KAPTURE_SRCS_KIPI + SPECTACLE_SRCS_KIPI KipiInterface/KSGKipiInterface.cpp KipiInterface/KSGKipiInfoShared.cpp KipiInterface/KSGKipiImageCollectionShared.cpp @@ -36,21 +36,21 @@ if(KF5Kipi_FOUND) endif() set( - KAPTURE_SRCS_ALL - ${KAPTURE_SRCS_DEFAULT} - ${KAPTURE_SRCS_KIPI} - ${KAPTURE_SRCS_X11} + SPECTACLE_SRCS_ALL + ${SPECTACLE_SRCS_DEFAULT} + ${SPECTACLE_SRCS_KIPI} + ${SPECTACLE_SRCS_X11} ) add_executable( - kapture - ${KAPTURE_SRCS_ALL} + spectacle + ${SPECTACLE_SRCS_ALL} ) # link libraries target_link_libraries( - kapture + spectacle Qt5::DBus Qt5::PrintSupport KF5::CoreAddons @@ -65,7 +65,7 @@ target_link_libraries( if(XCB_FOUND) target_link_libraries( - kapture + spectacle XCB::XFIXES XCB::IMAGE XCB::CURSOR @@ -77,9 +77,9 @@ endif() if(KF5Kipi_FOUND) target_link_libraries ( - kapture + spectacle KF5::Kipi ) endif() -install(TARGETS kapture ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS spectacle ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/Config.h.in b/src/Config.h.in index 6a1a8dd..bdc8c8f 100644 --- a/src/Config.h.in +++ b/src/Config.h.in @@ -1,5 +1,5 @@ -#ifndef KAPTURE_CONFIG_H -#define KAPTURE_CONFIG_H +#ifndef SPECTACLE_CONFIG_H +#define SPECTACLE_CONFIG_H /* Define to 1 if we are building with XCB */ #cmakedefine XCB_FOUND 1 @@ -7,7 +7,7 @@ /* Define to 1 if we have KIPI */ #cmakedefine KIPI_FOUND 1 -/* Set the Kapture version from CMake */ -#cmakedefine KAPTURE_VERSION "@KAPTURE_VERSION@" +/* Set the Spectacle version from CMake */ +#cmakedefine SPECTACLE_VERSION "@SPECTACLE_VERSION@" #endif diff --git a/src/Gui/KSMainWindow.cpp b/src/Gui/KSMainWindow.cpp index af8bc5b..beca83b 100644 --- a/src/Gui/KSMainWindow.cpp +++ b/src/Gui/KSMainWindow.cpp @@ -35,7 +35,7 @@ KSMainWindow::KSMainWindow(bool onClickAvailable, QWidget *parent) : { // before we do anything, we need to set a window property // that skips the close/hide window animation on kwin. this - // fixes a ghost image of the kapture window that appears + // fixes a ghost image of the spectacle window that appears // on subsequent screenshots taken with the take new screenshot // button // @@ -77,7 +77,7 @@ KSMainWindow::~KSMainWindow() void KSMainWindow::init() { - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup guiConfig(config, "GuiConfig"); // window properties @@ -175,7 +175,7 @@ void KSMainWindow::moveEvent(QMoveEvent *event) { Q_UNUSED(event); - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup guiConfig(config, "GuiConfig"); guiConfig.writeEntry("window-position", pos()); diff --git a/src/Gui/KSSaveConfigDialog.cpp b/src/Gui/KSSaveConfigDialog.cpp index d84d264..6b7fb76 100644 --- a/src/Gui/KSSaveConfigDialog.cpp +++ b/src/Gui/KSSaveConfigDialog.cpp @@ -30,7 +30,7 @@ KSSaveConfigDialog::KSSaveConfigDialog(QWidget *parent) : // bring up the configuration reader - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup generalConfig = KConfigGroup(config, "General"); // set up the layout. start with the directory @@ -127,7 +127,7 @@ void KSSaveConfigDialog::accept() { // bring up the configuration reader - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup generalConfig = KConfigGroup(config, "General"); // save the data diff --git a/src/Gui/KSWidget.cpp b/src/Gui/KSWidget.cpp index 742278e..b153c0b 100644 --- a/src/Gui/KSWidget.cpp +++ b/src/Gui/KSWidget.cpp @@ -100,7 +100,7 @@ KSWidget::KSWidget(QWidget *parent) : mTakeScreenshotButton = new QPushButton(this); mTakeScreenshotButton->setText(i18n("Take New Screenshot")); - mTakeScreenshotButton->setIcon(QIcon::fromTheme("ksnapshot")); + mTakeScreenshotButton->setIcon(QIcon::fromTheme("spectacle")); mTakeScreenshotButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); mTakeScreenshotButton->setFocus(); connect(mTakeScreenshotButton, &QPushButton::clicked, this, &KSWidget::newScreenshotClicked); @@ -135,7 +135,7 @@ KSWidget::KSWidget(QWidget *parent) : // and read in the saved checkbox states and capture mode indices - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup guiConfig(config, "GuiConfig"); mMousePointer->setChecked(guiConfig.readEntry("includePointer", true)); @@ -178,7 +178,7 @@ void KSWidget::checkboxStatesChanged(int state) { Q_UNUSED(state); - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup guiConfig(config, "GuiConfig"); guiConfig.writeEntry("includePointer", mMousePointer->isChecked()); @@ -199,7 +199,7 @@ void KSWidget::onClickStateChanged(int state) void KSWidget::captureModeChanged(int index) { - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup guiConfig(config, "GuiConfig"); guiConfig.writeEntry("captureModeIndex", index); @@ -223,7 +223,7 @@ void KSWidget::captureModeChanged(int index) void KSWidget::captureDelayChanged(qreal value) { - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup guiConfig(config, "GuiConfig"); guiConfig.writeEntry("captureDelay", value); diff --git a/src/KSCore.cpp b/src/KSCore.cpp index 8a41059..efe5aac 100644 --- a/src/KSCore.cpp +++ b/src/KSCore.cpp @@ -42,7 +42,7 @@ KSCore::KSCore(bool backgroundMode, ImageGrabber::GrabMode grabMode, QString &sa mImageGrabber(nullptr), mMainWindow(nullptr) { - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup guiConfig(config, "GuiConfig"); if (!(saveFileName.isEmpty() || saveFileName.isNull())) { @@ -141,7 +141,7 @@ void KSCore::setOverwriteOnSave(const bool &overwrite) QString KSCore::saveLocation() const { - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup generalConfig = KConfigGroup(config, "General"); QString savePath = generalConfig.readPathEntry( @@ -162,7 +162,7 @@ QString KSCore::saveLocation() const void KSCore::setSaveLocation(const QString &savePath) { - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup generalConfig = KConfigGroup(config, "General"); generalConfig.writePathEntry("last-saved-to", savePath); @@ -266,7 +266,7 @@ void KSCore::doAutoSave() KNotification *notify = new KNotification("newScreenshotSaved"); notify->setText(i18n("A new screenshot was captured and saved to %1", savePath.toLocalFile())); - notify->setPixmap(QIcon::fromTheme("ksnapshot").pixmap(QSize(32, 32))); + notify->setPixmap(QIcon::fromTheme("spectacle").pixmap(QSize(32, 32))); notify->sendEvent(); // unfortunately we can't quit just yet, emitting allDone right away @@ -411,7 +411,7 @@ QUrl KSCore::getAutosaveFilename() QString KSCore::makeAutosaveFilename() { - KSharedConfigPtr config = KSharedConfig::openConfig("kapturerc"); + KSharedConfigPtr config = KSharedConfig::openConfig("spectaclerc"); KConfigGroup generalConfig = KConfigGroup(config, "General"); const QDateTime timestamp = QDateTime::currentDateTime(); diff --git a/src/KipiInterface/KSGKipiImageCollectionShared.cpp b/src/KipiInterface/KSGKipiImageCollectionShared.cpp index b617a17..8052c09 100644 --- a/src/KipiInterface/KSGKipiImageCollectionShared.cpp +++ b/src/KipiInterface/KSGKipiImageCollectionShared.cpp @@ -26,7 +26,7 @@ KSGKipiImageCollectionShared::KSGKipiImageCollectionShared() {} KSGKipiImageCollectionShared::~KSGKipiImageCollectionShared() {} -QString KSGKipiImageCollectionShared::name() { return "Kapture"; } +QString KSGKipiImageCollectionShared::name() { return "Spectacle"; } QString KSGKipiImageCollectionShared::comment() { return QString(); } QString KSGKipiImageCollectionShared::uploadRootName() { return "/"; } QUrl KSGKipiImageCollectionShared::uploadRoot() { return QUrl(uploadRootName()); } diff --git a/src/KipiInterface/KSGKipiInfoShared.cpp b/src/KipiInterface/KSGKipiInfoShared.cpp index f66485e..c3fd1a9 100644 --- a/src/KipiInterface/KSGKipiInfoShared.cpp +++ b/src/KipiInterface/KSGKipiInfoShared.cpp @@ -36,4 +36,4 @@ void KSGKipiInfoShared::addAttributes(const QMap< QString, QVariant > &) {} void KSGKipiInfoShared::clearAttributes() {} QMap<QString, QVariant> KSGKipiInfoShared::attributes() { return QMap<QString, QVariant>(); } void KSGKipiInfoShared::setDescription(const QString &) {} -QString KSGKipiInfoShared::description() { return i18n("Taken with Kapture"); } +QString KSGKipiInfoShared::description() { return i18n("Taken with Spectacle"); } diff --git a/src/Main.cpp b/src/Main.cpp index e3990ef..0384bc8 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -37,18 +37,18 @@ int main(int argc, char **argv) QApplication app(argc, argv); app.setOrganizationDomain("kde.org"); - app.setApplicationName("kapture"); - app.setWindowIcon(QIcon::fromTheme("ksnapshot")); + app.setApplicationName("spectacle"); + app.setWindowIcon(QIcon::fromTheme("spectacle")); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true); app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); // set up the about data - KLocalizedString::setApplicationDomain("kapture"); - KAboutData aboutData("kapture", - i18n("Kapture"), - KAPTURE_VERSION, + KLocalizedString::setApplicationDomain("spectacle"); + KAboutData aboutData("spectacle", + i18n("Spectacle"), + SPECTACLE_VERSION, i18n("KDE Screenshot Utility"), KAboutLicense::GPL_V2, i18n("(C) 2015 Boudhayan Gupta")); _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
