Fixing merge between master and branch v1.1.0

ksnip · Oct 23, 2016 · 9b46456 · 9b46456
2 parents f35641a + 3f909dd
commit 9b46456
Show file tree

Hide file tree

Showing 34 changed files with 2,301 additions and 884 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,18 +8,24 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
 
-set(ksnip_SRCS src/main.cpp
-               src/ImageGrabber.cpp 
-               src/PaintStroke.cpp 
+set(ksnip_SRCS src/main.cpp 
+               src/backend/StringManip.cpp
+               src/backend/KsnipConfig.cpp
+               src/backend/ImageGrabber.cpp 
+               src/backend/CmdParser.cpp
+               src/backend/CmdOption.cpp
+               src/widgets/CaptureView.cpp 
+               src/widgets/PaintStroke.cpp 
                src/widgets/CustomToolButton.cpp 
-               src/PaintArea.cpp 
+               src/widgets/PaintArea.cpp 
+               src/widgets/CustomCursor.cpp 
+               src/widgets/NumericComboBox.cpp 
+               src/widgets/ColorComboBox.cpp
                src/gui/MainWindow.cpp 
                src/gui/SnippingArea.cpp 
                src/gui/SettingsDialog.cpp
                src/gui/AboutDialog.cpp 
-               src/widgets/CustomCursor.cpp 
-               src/widgets/NumericComboBox.cpp 
-               src/widgets/ColorComboBox.cpp)
+               )
 
 SET(ksnip_RES icons/resources.qrc)
 qt4_add_resources(ksnip_RES_RCC ${ksnip_RES})

diff --git a/CODINGSTYLE b/CODINGSTYLE
@@ -1,8 +1,8 @@
 Ksnip follows the KDELibs (see https://community.kde.org/Policies/Kdelibs_Coding_Style)
 coding style, with a few exceptions:
 
-    1. The access modifier ordering is: public, signals, public slots,
-       protected slots, protected, private slots, private. Member variables
+    1. The access modifier ordering is: public, public slots, signals,
+       protected, protected slots, , private, private slots. Member variables
        come come at beginning, before all member functions. This is not strictly
        enforced, but is a good rule to follow.
 

diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
 # ksnip
 
+Version v1.1.0
+
 Screenshot tool inspired by Windows Snipping Tool and made with Qt for Linux. 
 
-Version v1.0.0
 
 ### Building from source
 

diff --git a/icons/16x16/move.16.png b/icons/16x16/move.16.png
diff --git a/icons/64x64/move.64.png b/icons/64x64/move.64.png
diff --git a/icons/resources.qrc b/icons/resources.qrc
@@ -7,6 +7,7 @@
     <file alias="pen64.png">64x64/pen.64.png</file>
     <file alias="marker64.png">64x64/marker.64.png</file>
     <file alias="eraser64.png">64x64/eraser.64.png</file>
+    <file alias="move64.png">64x64/move.64.png</file>
     <file alias="copyToClipboard64.png">64x64/copyToClipboard.64.png</file>
     <file alias="save64.png">64x64/save.64.png</file>
     <file alias="drawRect64.png">64x64/drawRect.64.png</file>

diff --git a/src/PaintArea.cpp b/src/PaintArea.cpp
diff --git a/src/PaintArea.h b/src/PaintArea.h