Git commit adea074999ba3fed0377004a41f9573df477f62b by Boudhayan Gupta. Committed on 15/09/2015 at 06:26. Pushed by bgupta into branch 'master'.
Rename to Kapture M +9 -6 CMakeLists.txt M +3 -3 desktop/CMakeLists.txt R +2 -35 desktop/kapture.notifyrc [from: desktop/kscreengenie.notifyrc - 056% similarity] R +2 -22 desktop/org.kde.kapture.desktop [from: desktop/org.kde.kscreengenie.desktop - 071% similarity] M +1 -1 doc/CMakeLists.txt R +- -- doc/Kapture.png [from: doc/KScreenGenie.png - 100% similarity] M +30 -30 doc/index.docbook M +13 -13 src/CMakeLists.txt M +4 -4 src/Config.h.in M +1 -1 src/Gui/KSImageWidget.cpp M +1 -1 src/Gui/KSImageWidget.h M +1 -1 src/Gui/KSMainWindow.cpp M +1 -1 src/Gui/KSMainWindow.h M +1 -1 src/Gui/KSSaveConfigDialog.cpp M +1 -1 src/Gui/KSSaveConfigDialog.h M +1 -1 src/Gui/KSSendToMenu.cpp M +1 -1 src/Gui/KSSendToMenu.h M +1 -1 src/Gui/KSWidget.cpp M +1 -1 src/Gui/KSWidget.h M +1 -1 src/KSCore.cpp M +1 -1 src/KSCore.h M +7 -7 src/Main.cpp M +19 -0 src/PlatformBackends/DummyImageGrabber.cpp M +19 -0 src/PlatformBackends/DummyImageGrabber.h M +1 -1 src/PlatformBackends/ImageGrabber.cpp M +1 -1 src/PlatformBackends/X11ImageGrabber.cpp M +1 -1 src/PlatformBackends/X11ImageGrabber.h M +1 -1 src/ScreenClipper.cpp M +1 -1 src/ScreenClipper.h http://commits.kde.org/kscreengenie/adea074999ba3fed0377004a41f9573df477f62b diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f2b272..3bc3dff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,13 @@ -# KScreenGenie project +# Kapture project -project(KScreenGenie) -set(KSG_VERSION_MAJOR 2) -set(KSG_VERSION_MINOR 0) -set(KSG_VERSION_PATCH 1) -set(KSG_VERSION "${KSG_VERSION_MAJOR}.${KSG_VERSION_MINOR}.${KSG_VERSION_PATCH}") +project(Kapture) + +# 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}) # minimum requirements diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index 677331e..7127249 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.kscreengenie.desktop + PROGRAMS org.kde.kapture.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( - FILES kscreengenie.notifyrc - DESTINATION ${KNOTIFYRC_INSTALL_DIR} + FILES kapture.notifyrc + DESTINATION ${KNOTIFYRC_INSTALL_DIR} ) diff --git a/desktop/kscreengenie.notifyrc b/desktop/kapture.notifyrc similarity index 56% rename from desktop/kscreengenie.notifyrc rename to desktop/kapture.notifyrc index 193d7e2..6e667ec 100644 --- a/desktop/kscreengenie.notifyrc +++ b/desktop/kapture.notifyrc @@ -1,40 +1,7 @@ [Global] -IconName=kscreengenie -Name=KScreenGenie -Name[bg]=KScreenGenie -Name[ca]=KScreenGenie -Name[cs]=KScreenGenie -Name[de]=KScreenGenie -Name[en_GB]=KScreenGenie -Name[es]=KScreenGenie -Name[fi]=KScreenGenie -Name[gl]=KScreenGenie -Name[nl]=KScreenGenie -Name[pl]=KDżinEkranu -Name[pt]=KScreenGenie -Name[pt_BR]=KScreenGenie -Name[ro]=KScreenGenie -Name[sk]=KScreenGenie -Name[sv]=Kscreengenie -Name[uk]=KScreenGenie -Name[x-test]=xxKScreenGeniexx -Name[zh_CN]=KScreenGenie +IconName=kapture +Name=Kapture Comment=Screenshot Capture Utility -Comment[ca]=Utilitat per pendre captures de pantalla -Comment[cs]=Nástroj na snímání obrazovky -Comment[de]=Dienstprogramm für Bildschirmfotos -Comment[en_GB]=Screenshot Capture Utility -Comment[es]=Utilidad de capturas de pantalla -Comment[fi]=Kuvankaappausohjelma -Comment[gl]=Utilidade para facer capturas de pantalla. -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[sk]=Nástroj na zachytávanie obrazovky -Comment[sv]=Verktyg för att ta skärmbilder -Comment[uk]=Програма для створення знімків екрана -Comment[x-test]=xxScreenshot Capture Utilityxx [Event/newScreenshotSaved] Name=New Screenshot Saved diff --git a/desktop/org.kde.kscreengenie.desktop b/desktop/org.kde.kapture.desktop similarity index 71% rename from desktop/org.kde.kscreengenie.desktop rename to desktop/org.kde.kapture.desktop index 3c7f804..3998f03 100644 --- a/desktop/org.kde.kscreengenie.desktop +++ b/desktop/org.kde.kapture.desktop @@ -18,31 +18,11 @@ GenericName[sv]=Verktyg för att ta skärmbilder GenericName[uk]=Програма для створення знімків екрана GenericName[x-test]=xxScreenshot Capture Utilityxx GenericName[zh_CN]=屏幕截图工具 -Name=KScreenGenie -Name[bg]=KScreenGenie -Name[ca]=KScreenGenie -Name[cs]=KScreenGenie -Name[de]=KScreenGenie -Name[en_GB]=KScreenGenie -Name[es]=KScreenGenie -Name[fi]=KScreenGenie -Name[gl]=KScreenGenie -Name[nl]=KScreenGenie -Name[pl]=KDżinEkranu -Name[pt]=KScreenGenie -Name[pt_BR]=KScreenGenie -Name[ro]=KScreenGenie -Name[sk]=KScreenGenie -Name[sv]=Kscreengenie -Name[uk]=KScreenGenie -Name[x-test]=xxKScreenGeniexx -Name[zh_CN]=KScreenGenie +Name=Kapture Categories=Qt;KDE;Utility; MimeType= -Exec=kscreengenie +Exec=kapture Icon=ksnapshot Type=Application Terminal=false StartupNotify=false - - diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 04b0fc6..12ea21e 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 ksnapshot + SUBDIR kapture ) diff --git a/doc/KScreenGenie.png b/doc/Kapture.png similarity index 100% rename from doc/KScreenGenie.png rename to doc/Kapture.png diff --git a/doc/index.docbook b/doc/index.docbook index 280e4d7..c75b86a 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1,17 +1,17 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kscreengenie "KScreenGenie"> - <!ENTITY kappname "&kscreengenie;"> + <!ENTITY kapture "Kapture"> + <!ENTITY kappname "&kapture;"> <!ENTITY package "kdegraphics"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY Boudhayan.Gupta "<personname><firstname>Boudhayan</firstname><surname>Gupta</surname></personname>"> - <!ENTITY Boudhayan.Gupta.mail "<email>[email protected]</email>"> + <!ENTITY Boudhayan.Gupta.mail "<email>[email protected]</email>"> ]> -<book id="kscreengenie" lang="&language;"> +<book id="kapture" lang="&language;"> <bookinfo> - <title>The &kscreengenie; Handbook</title> + <title>The &kapture; Handbook</title> <authorgroup> <author> @@ -37,12 +37,12 @@ <releaseinfo>1.9.96</releaseinfo> <abstract> - <para>&kscreengenie; 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>&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> </abstract> <keywordset> <keyword>KDE</keyword> - <keyword>&kscreengenie;</keyword> + <keyword>&kapture;</keyword> <keyword>kdegraphics</keyword> <keyword>screenshot</keyword> <keyword>screen capture</keyword> @@ -53,61 +53,61 @@ <chapter id="introduction"> <title>Introduction</title> - <para>&kscreengenie; 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>&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>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 &kscreengenie;</title> + <title>Starting &kapture;</title> - <para>&kscreengenie; can be started in a variety of ways, as described below:</para> + <para>&kapture; can be started in a variety of ways, as described below:</para> <itemizedlist> <listitem> - <para>In the application launcher menu, &kscreengenie; can be found at <menuchoice><guisubmenu>Applications</guisubmenu><guisubmenu>Graphics</guisubmenu><guimenuitem>Screenshot Capture Utility &kscreengenie;</guimenuitem></menuchoice></para> + <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> </listitem> <listitem> - <para>Pressing the <keycap>Print Screen</keycap> button on the keyboard will immediately launch &kscreengenie;. 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 &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> </listitem> <listitem> - <para>The mini command line &krunner; (invoked with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) may also be used to start &kscreengenie;.</para> + <para>The mini command line &krunner; (invoked with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) may also be used to start &kapture;.</para> </listitem> <listitem> - <para> &kscreengenie; can be started from the command-line. &kscreengenie; 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> &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>To start &kscreengenie; from the command prompt, type in:</para> + <para>To start &kapture; from the command prompt, type in:</para> <screen width="40"> - <prompt>%</prompt> <command>kscreengenie &</command> + <prompt>%</prompt> <command>kapture &</command> </screen> <para>To view the full list of command-line options and their explanation, type in:</para> <screen width="40"> - <prompt>%</prompt> <command>kscreengenie --help</command> + <prompt>%</prompt> <command>kapture --help</command> </screen> </listitem> </itemizedlist> </chapter> <chapter id="using"> - <title>Using &kscreengenie;</title> + <title>Using &kapture;</title> - <para>Once &kscreengenie; starts, you will see a window like the following: + <para>Once &kapture; starts, you will see a window like the following: <mediaobject> <imageobject> <imagedata fileref="MainWindow.png" format="PNG"/> </imageobject> <textobject> - <phrase>&kscreengenie; Main Window</phrase> + <phrase>&kapture; Main Window</phrase> </textobject> </mediaobject> </para> - <para>&kscreengenie; 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>&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>The snapshot taken by &kscreengenie; is displayed in the preview window, which is located on the left-hand side of the &kscreengenie; application window.</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>To quickly save the image and quit &kscreengenie; 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 &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>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, &kscreengenie; 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, &kapture; 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, &kscreengenie; 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, &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> </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 &kscreengenie; 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 &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> </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 &kscreengenie; 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 &kapture; 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 &kscreengenie; window. Their functions are described below:</para> + <para>There are five buttons located at the bottom of the &kapture; 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>&kscreengenie; Handbook</guimenuitem>, report a bug, switch the language for &kscreengenie; or get some more information <guimenuitem>About &kscreengenie;</guimenuitem> and <guimenuitem>About &kde;</guimenuitem>.</para> + <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> </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, &kscreengenie; 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, &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>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/src/CMakeLists.txt b/src/CMakeLists.txt index 50fe5af..54a3a89 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( - KSG_SRCS_DEFAULT + KAPTURE_SRCS_DEFAULT Main.cpp KSCore.cpp ScreenClipper.cpp @@ -20,14 +20,14 @@ set( if(XCB_FOUND) set( - KSG_SRCS_X11 + KAPTURE_SRCS_X11 PlatformBackends/X11ImageGrabber.cpp ) endif() if(KF5Kipi_FOUND) set( - KSG_SRCS_KIPI + KAPTURE_SRCS_KIPI KipiInterface/KSGKipiInterface.cpp KipiInterface/KSGKipiInfoShared.cpp KipiInterface/KSGKipiImageCollectionShared.cpp @@ -36,21 +36,21 @@ if(KF5Kipi_FOUND) endif() set( - KSG_SRCS_ALL - ${KSG_SRCS_DEFAULT} - ${KSG_SRCS_KIPI} - ${KSG_SRCS_X11} + KAPTURE_SRCS_ALL + ${KAPTURE_SRCS_DEFAULT} + ${KAPTURE_SRCS_KIPI} + ${KAPTURE_SRCS_X11} ) add_executable( - kscreengenie - ${KSG_SRCS_ALL} + kapture + ${KAPTURE_SRCS_ALL} ) # link libraries target_link_libraries( - kscreengenie + kapture Qt5::DBus Qt5::PrintSupport KF5::CoreAddons @@ -65,7 +65,7 @@ target_link_libraries( if(XCB_FOUND) target_link_libraries( - kscreengenie + kapture XCB::XFIXES XCB::IMAGE XCB::CURSOR @@ -77,9 +77,9 @@ endif() if(KF5Kipi_FOUND) target_link_libraries ( - kscreengenie + kapture KF5::Kipi ) endif() -install(TARGETS kscreengenie ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kapture ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/Config.h.in b/src/Config.h.in index df9710c..6a1a8dd 100644 --- a/src/Config.h.in +++ b/src/Config.h.in @@ -1,5 +1,5 @@ -#ifndef KSG_CONFIG_H -#define KSG_CONFIG_H +#ifndef KAPTURE_CONFIG_H +#define KAPTURE_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 KScreenGenie version from CMake */ -#cmakedefine KSG_VERSION "@KSG_VERSION@" +/* Set the Kapture version from CMake */ +#cmakedefine KAPTURE_VERSION "@KAPTURE_VERSION@" #endif diff --git a/src/Gui/KSImageWidget.cpp b/src/Gui/KSImageWidget.cpp index 213260d..bb0e8ca 100644 --- a/src/Gui/KSImageWidget.cpp +++ b/src/Gui/KSImageWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSImageWidget.h b/src/Gui/KSImageWidget.h index 58941e2..aa6f73a 100644 --- a/src/Gui/KSImageWidget.h +++ b/src/Gui/KSImageWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSMainWindow.cpp b/src/Gui/KSMainWindow.cpp index 417d62d..6520bb9 100644 --- a/src/Gui/KSMainWindow.cpp +++ b/src/Gui/KSMainWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSMainWindow.h b/src/Gui/KSMainWindow.h index 5e63086..4866c05 100644 --- a/src/Gui/KSMainWindow.h +++ b/src/Gui/KSMainWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSSaveConfigDialog.cpp b/src/Gui/KSSaveConfigDialog.cpp index 124e7bf..bed9f6b 100644 --- a/src/Gui/KSSaveConfigDialog.cpp +++ b/src/Gui/KSSaveConfigDialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSSaveConfigDialog.h b/src/Gui/KSSaveConfigDialog.h index edf39c9..44a72b3 100644 --- a/src/Gui/KSSaveConfigDialog.h +++ b/src/Gui/KSSaveConfigDialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSSendToMenu.cpp b/src/Gui/KSSendToMenu.cpp index f009c28..e64db3d 100644 --- a/src/Gui/KSSendToMenu.cpp +++ b/src/Gui/KSSendToMenu.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * Contains code from ksnapshotsendtoactions.cpp, part of KSnapshot. * Copyright notices reproduced below: diff --git a/src/Gui/KSSendToMenu.h b/src/Gui/KSSendToMenu.h index 062a72a..b5b2ae6 100644 --- a/src/Gui/KSSendToMenu.h +++ b/src/Gui/KSSendToMenu.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSWidget.cpp b/src/Gui/KSWidget.cpp index 7b36810..969972a 100644 --- a/src/Gui/KSWidget.cpp +++ b/src/Gui/KSWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Gui/KSWidget.h b/src/Gui/KSWidget.h index 9d6a3fd..db9d4cb 100644 --- a/src/Gui/KSWidget.h +++ b/src/Gui/KSWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/KSCore.cpp b/src/KSCore.cpp index 3106b3d..a6f9241 100644 --- a/src/KSCore.cpp +++ b/src/KSCore.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * Includes code from ksnapshot.cpp, part of KSnapshot. Copyright notices * reproduced below: diff --git a/src/KSCore.h b/src/KSCore.h index fe1b03e..fad0cf5 100644 --- a/src/KSCore.h +++ b/src/KSCore.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/Main.cpp b/src/Main.cpp index c668273..e3990ef 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -37,7 +37,7 @@ int main(int argc, char **argv) QApplication app(argc, argv); app.setOrganizationDomain("kde.org"); - app.setApplicationName("kscreengenie"); + app.setApplicationName("kapture"); app.setWindowIcon(QIcon::fromTheme("ksnapshot")); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true); @@ -45,14 +45,14 @@ int main(int argc, char **argv) // set up the about data - KLocalizedString::setApplicationDomain("kscreengenie"); - KAboutData aboutData("kscreengenie", - i18n("KScreenGenie"), - KSG_VERSION, + KLocalizedString::setApplicationDomain("kapture"); + KAboutData aboutData("kapture", + i18n("Kapture"), + KAPTURE_VERSION, i18n("KDE Screenshot Utility"), KAboutLicense::GPL_V2, i18n("(C) 2015 Boudhayan Gupta")); - aboutData.addAuthor("Boudhayan Gupta", QString(), "[email protected]"); + aboutData.addAuthor("Boudhayan Gupta", QString(), "[email protected]"); KAboutData::setApplicationData(aboutData); // set up the command line options parser diff --git a/src/PlatformBackends/DummyImageGrabber.cpp b/src/PlatformBackends/DummyImageGrabber.cpp index e960086..4ccea75 100644 --- a/src/PlatformBackends/DummyImageGrabber.cpp +++ b/src/PlatformBackends/DummyImageGrabber.cpp @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + #include "DummyImageGrabber.h" DummyImageGrabber::DummyImageGrabber(QObject *parent): diff --git a/src/PlatformBackends/DummyImageGrabber.h b/src/PlatformBackends/DummyImageGrabber.h index 1076b40..73362df 100644 --- a/src/PlatformBackends/DummyImageGrabber.h +++ b/src/PlatformBackends/DummyImageGrabber.h @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + #ifndef DUMMYIMAGEGRABBER_H #define DUMMYIMAGEGRABBER_H diff --git a/src/PlatformBackends/ImageGrabber.cpp b/src/PlatformBackends/ImageGrabber.cpp index 50fd09e..db8fc35 100644 --- a/src/PlatformBackends/ImageGrabber.cpp +++ b/src/PlatformBackends/ImageGrabber.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/PlatformBackends/X11ImageGrabber.cpp b/src/PlatformBackends/X11ImageGrabber.cpp index 78284be..eb7dee7 100644 --- a/src/PlatformBackends/X11ImageGrabber.cpp +++ b/src/PlatformBackends/X11ImageGrabber.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * Contains code from kxutils.cpp, part of KWindowSystem. Copyright * notices reproduced below: diff --git a/src/PlatformBackends/X11ImageGrabber.h b/src/PlatformBackends/X11ImageGrabber.h index 9d0dc70..a73112b 100644 --- a/src/PlatformBackends/X11ImageGrabber.h +++ b/src/PlatformBackends/X11ImageGrabber.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/src/ScreenClipper.cpp b/src/ScreenClipper.cpp index 4e99f55..1486a59 100644 --- a/src/ScreenClipper.cpp +++ b/src/ScreenClipper.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Luca Gugelmann <[email protected]> - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Library General Public License version 2 as diff --git a/src/ScreenClipper.h b/src/ScreenClipper.h index 0983e98..2cc00a1 100644 --- a/src/ScreenClipper.h +++ b/src/ScreenClipper.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Luca Gugelmann <[email protected]> - * Copyright (C) 2015 Boudhayan Gupta <[email protected]> + * Copyright (C) 2015 Boudhayan Gupta <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Library General Public License version 2 as _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
