Diffusion Spectacle 03cfb7d475ef

Merge branch 'master' into editor
03cfb7d475ef
Actions

Authored by bgupta on Sep 29 2015, 9:03 PM.

Description

Merge branch 'master' into editor

Details

Committed

bgupta

Sep 29 2015, 9:03 PM

Parents

R166:916ec089036c: Do not show decimal points if delay is integer value
R166:7022c064447c: Checkpoint

Branches

Unknown

Tags

Unknown

References

refs/backups/branch-editor-1445246441

bgupta committed R166:03cfb7d475ef: Merge branch 'master' into editor (authored by bgupta).Sep 29 2015, 9:03 PM

Merged Changes

Commit	Author	Details	Committed
916ec089036c	bgupta	Do not show decimal points if delay is integer value	Sep 28 2015
b32d207be5eb	bgupta	Shut up, cmake.	Sep 25 2015
35581bd2c0b3	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 25 2015
d2de1af4ca3f	bgupta	Temporarily drop version number to 15.08.50 for test release	Sep 24 2015
d16972eb1420	bgupta	Fix the dbus activation service file	Sep 24 2015
2560bd8c15e1	bgupta	Move files around	Sep 24 2015
09cd11881d82	bgupta	Add DBus and DBus-Activation bits	Sep 24 2015
689ecdf67e6d	bgupta	Add README	Sep 24 2015
b818a063c80e	bgupta	Rename to Spectacle	Sep 23 2015
11e993648bd3	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 21 2015
e1ca0e388978	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 19 2015
1275c6248f86	bgupta	Rename++	Sep 18 2015
f971eda988bf	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 18 2015
64df902321c6	bgupta	Fix Messages.sh after rename	Sep 17 2015
b87c16e546dc	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 16 2015
a10eb3be0223	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 15 2015
adea074999ba	bgupta	Rename to Kapture	Sep 15 2015
090fe46ca8d7	bgupta	Change permissions on temporary save to be user-read/writeable only	Aug 22 2015
6b08c8565fc2	schwarzer	Fix typo in help text.	Aug 18 2015

Changes (60)

		Path
M		CMakeLists.txt
M		CONTRIBUTING
M		Messages.sh
A		README
A	(dir)	dbus/
A		dbus/CMakeLists.txt
A		dbus/org.freedesktop.Screenshot.service.in
A		dbus/org.freedesktop.Screenshot.xml
M		desktop/CMakeLists.txt
V		desktop/{kscreengenie.notifyrc → spectacle.notifyrc}
V		desktop/{org.kde.kscreengenie.desktop → org.kde.spectacle.desktop}
V		desktop/{org.kde.spectacle.desktop ← org.kde.kscreengenie.desktop}
V		desktop/{spectacle.notifyrc ← kscreengenie.notifyrc}
M		doc/CMakeLists.txt
V		doc/{KScreenGenie.png → Spectacle.png}
V		doc/{Spectacle.png ← KScreenGenie.png}
M		doc/index.docbook
V		icons/{16-apps-ksnapshot.png → 16-apps-spectacle.png}
V		icons/{16-apps-spectacle.png ← 16-apps-ksnapshot.png}
V		icons/{22-apps-ksnapshot.png → 22-apps-spectacle.png}
V		icons/{22-apps-spectacle.png ← 22-apps-ksnapshot.png}
V		icons/{32-apps-ksnapshot.png → 32-apps-spectacle.png}
V		icons/{32-apps-spectacle.png ← 32-apps-ksnapshot.png}
V		icons/{48-apps-ksnapshot.png → 48-apps-spectacle.png}
V		icons/{48-apps-spectacle.png ← 48-apps-ksnapshot.png}
M		icons/CMakeLists.txt
V		icons/{sc-apps-ksnapshot.svgz → sc-apps-spectacle.svgz}
V		icons/{sc-apps-spectacle.svgz ← sc-apps-ksnapshot.svgz}
M		src/.reviewboardrc
M		src/CMakeLists.txt
M		src/Config.h.in
M		src/Gui/KSImageWidget.cpp
M		src/Gui/KSImageWidget.h
M		src/Gui/KSMainWindow.cpp
M		src/Gui/KSMainWindow.h
M		src/Gui/KSSaveConfigDialog.cpp
M		src/Gui/KSSaveConfigDialog.h
M		src/Gui/KSSendToMenu.cpp
M		src/Gui/KSSendToMenu.h
M		src/Gui/KSWidget.cpp
M		src/Gui/KSWidget.h
A		src/Gui/ScreenClipper.cpp
A		src/Gui/ScreenClipper.h
P		src/Gui/SmartSpinBox.cpp Copied from src/Editor/QmlResources/KSCropToolBar.qml
P		src/Gui/SmartSpinBox.h Copied from src/Editor/QmlResources/KSCropToolBar.qml
V		src/{KSCore.cpp → SpectacleCore.cpp}
V		src/{KSCore.h → SpectacleCore.h}
M		src/KipiInterface/KSGKipiImageCollectionShared.cpp
M		src/KipiInterface/KSGKipiInfoShared.cpp
M		src/Main.cpp
M		src/PlatformBackends/DummyImageGrabber.cpp
P		src/PlatformBackends/DummyImageGrabber.h Copied from src/Editor/QmlResources/KSCropToolBar.qml
M		src/PlatformBackends/ImageGrabber.cpp
M		src/PlatformBackends/ImageGrabber.h
M		src/PlatformBackends/X11ImageGrabber.cpp
M		src/PlatformBackends/X11ImageGrabber.h
V		src/{SpectacleCore.cpp ← KSCore.cpp}
V		src/{SpectacleCore.h ← KSCore.h}
A		src/SpectacleDBusAdapter.cpp
A		src/SpectacleDBusAdapter.h