[pull] master from 4lex4:master

CMakeLists.txt

@@ -39,11 +39,6 @@ if (NOT DEFAULT_COMPILER_FLAGS_IS_SET)
     message(WARNING "Only MSVC toolchain is supported to build for Windows XP.")
   endif()
 
-  if (UNIX)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-  endif()
-
   if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wpedantic -Werror=return-type -Wno-unused")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror=return-type -Wno-unused")
@@ -60,7 +55,8 @@ if (NOT DEFAULT_COMPILER_FLAGS_IS_SET)
 endif()
 
 if (UNIX)
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  option(CMAKE_POSITION_INDEPENDENT_CODE "" ON)
+  option(CMAKE_INSTALL_RPATH_USE_LINK_PATH "" ON)
 endif()
 
 include(cmake/SetDefaultBuildType.cmake)
@@ -238,7 +234,7 @@ endif()
 enable_testing()
 
 # Prepare config.h
-option(PORTABLE_VERSION "Whether to build the portable version or not." ON)
+option(PORTABLE_VERSION "Whether to build the portable version." ON)
 if (PORTABLE_VERSION)
   set(PORTABLE_CONFIG_DIR "config")
 endif()
@@ -251,6 +247,16 @@ else()
   set(PLUGIN_DIRS ".:../lib/${APPLICATION_NAME}")
 endif()
 configure_file(config.h.in "${CMAKE_BINARY_DIR}/config.h" @ONLY)
+file(READ "${CMAKE_BINARY_DIR}/config.h" config_h_contents)
+set(enable_developer_version_default OFF)
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(enable_developer_version_default ON)
+endif()
+option(DEVELOPER_VERSION "Whether to enable the internal debug features." ${enable_developer_version_default})
+if (NOT DEVELOPER_VERSION)
+  string(REGEX REPLACE "(#define[ \\t]+ENABLE_DEBUG_FEATURES[^\n]*)" "//\\1" config_h_contents ${config_h_contents})
+endif()
+file(WRITE "${CMAKE_BINARY_DIR}/config.h" ${config_h_contents})
 include_directories(BEFORE "${CMAKE_BINARY_DIR}")
 
 # Extract VERSION and VERSION_QUAD from version.h

README.md

@@ -174,7 +174,7 @@ has't been moved due to dirty realization. Their functionality is fully covered
 
   * Page splitting settings now influence on the output by filling offcut.
     Fill offcut option has been added.
-     
+
   * Page layout and all the other views now consider splitting settings.
     Corresponding improvements are done for thumbnails.
 
@@ -187,8 +187,6 @@ has't been moved due to dirty realization. Their functionality is fully covered
     3. UI: Added cutters interaction between each other. They can't more intersect each other,
        which created a wrong page layout configuration before.
 
-  * Optimized memory usage on the output stage.
-
   * Reworking on [multi column thumbnails view](#multi-column-thumbnails-view-reworked) feature from ver. Enhanced. 
     Now thumbnails are shown evenly.
 
@@ -315,13 +313,19 @@ has't been moved due to dirty realization. Their functionality is fully covered
   Added sensitivity option. If sensitivity equals 25%, the results will be the same as they were in old "Quadro" mode, if 100% - as in old "Rectangular".
 
 * ##### New zone interaction modes  
-  **`Shift+LMB`** on a zone - drag the zone.  
-  **`Ctrl+Shift+LMB`** on a zone - drag the zone copying.  
-  **`Del`** when the cursor is over a zone - delete the zone.  
-  Hold **`Ctrl`** when dragging a zone vertex - make the angle of the vertex right.  
-  **`Ctrl+Alt+Click`** - copy the latest created zone to the cursor position.  
-  **`Ctrl`** while creating a new zone - switch to rectangular mode.  
-  Hold **`Shift+Alt+LMB`** while creating a new zone - use lasso (free drawing) mode.  
+  * Zone creation mode:  
+    Press **`Z`** to switch to polygonal mode.  
+    Press **`X`** to switch to lasso (free drawing) mode.  
+    Press **`C`** to switch to rectangular mode.  
+    Press **`Z`** or **`X`** while creating a new zone to switch between polygonal and rectangular modes respectively.  
+  * Zone:  
+    **`Shift+LMB`** on a zone - drag the zone.  
+    **`Ctrl+Shift+LMB`** on a zone - drag the zone copying.  
+    **`Ctrl+Alt+Click`** - copy the latest created zone to the current cursor position.  
+    **`Del`** when the cursor is over a zone - delete the zone.  
+  * Zone vertex:  
+    **`D`** when the cursor is over a zone vertex - delete the vertex.  
+    Hold **`Ctrl`** when dragging a zone vertex - make the angle of the vertex right.  
 
 * ##### Saving zoom and focus on switching output tabs
   The save is precise and considers the images transformations.  
@@ -334,7 +338,7 @@ has't been moved due to dirty realization. Their functionality is fully covered
   The system affects every aspect of the program, so, for example, it's now possible to adjust margins in pixels, but not only in millimetres or inches.
 
 * ##### Status bar panel
-  The panel shows the next information: mouse position relative to the image, physical size of the image, position of the selected page in current order and the page name and type (`[L]` or `[R]` - left or right page, if the page has been splitted).
+  The panel shows the next information: zone creation mode icon, mouse position relative to the image, physical size of the image, position of the selected page in current order and the page name and type (`[L]` or `[R]` - left or right page, if the page has been splitted).
 
   This feature is also affected by [measurement units system](#measurement-units-system).
 
@@ -381,7 +385,7 @@ has't been moved due to dirty realization. Their functionality is fully covered
   Capabilities:  
     * **`Right-click`** to create/remove guides from the **context menu** called.  
     * **`Right-click`** on a guide to delete that guide from the **context menu** called.  
-    * **`Shift+LMB`** - drag the guide under the cursor.  
+    * **`Ctrl+Alt+LMB`** - drag the guide under the cursor.  
     * **`Shift/Ctrl+LMB`** on the content rectangle - drag the page content.
       Hold **`Shift`** pressed to restrict moving along the horizontal axis only or **`Ctrl`** for the vertical one.
       Hold **`Shift+Ctrl`** for usual dragging.  

config.h.in

@@ -7,6 +7,7 @@
 #define PLUGIN_DIRS "@PLUGIN_DIRS@"
 
 #define PORTABLE_CONFIG_DIR "@PORTABLE_CONFIG_DIR@"
+#define ENABLE_DEBUG_FEATURES
 #define APPLICATION_NAME "@APPLICATION_NAME@"
 #define ORGANIZATION_NAME APPLICATION_NAME
 

src/app/DefaultParamsDialog.cpp

@@ -96,7 +96,7 @@ DefaultParamsDialog::DefaultParamsDialog(QWidget* parent)
   Utils::mapSetValue(m_alignmentByButton, alignBottomBtn, Alignment(Alignment::BOTTOM, Alignment::HCENTER));
   Utils::mapSetValue(m_alignmentByButton, alignBottomRightBtn, Alignment(Alignment::BOTTOM, Alignment::RIGHT));
 
-  m_alignmentButtonGroup = std::make_unique<QButtonGroup>(this);
+  m_alignmentButtonGroup = new QButtonGroup(this);
   for (const auto& buttonAndAlignment : m_alignmentByButton) {
     m_alignmentButtonGroup->addButton(buttonAndAlignment.first);
   }

src/app/DefaultParamsDialog.h

@@ -4,12 +4,13 @@
 #ifndef SCANTAILOR_APP_DEFAULTPARAMSDIALOG_H_
 #define SCANTAILOR_APP_DEFAULTPARAMSDIALOG_H_
 
+#include <core/ConnectionManager.h>
+
 #include <QButtonGroup>
 #include <QWidget>
 #include <list>
 #include <set>
 #include <unordered_map>
-#include <core/ConnectionManager.h>
 
 #include "DefaultParams.h"
 #include "DefaultParamsProfileManager.h"
@@ -146,7 +147,7 @@ class DefaultParamsDialog : public QDialog, private Ui::DefaultParamsDialog {
   bool m_topBottomLinkEnabled;
   OrthogonalRotation m_orthogonalRotation;
   std::unordered_map<QToolButton*, page_layout::Alignment> m_alignmentByButton;
-  std::unique_ptr<QButtonGroup> m_alignmentButtonGroup;
+  QButtonGroup* m_alignmentButtonGroup;
   DefaultParamsProfileManager m_profileManager;
   int m_customDpiItemIdx;
   QString m_customDpiValue;

src/app/DefaultParamsDialog.ui

@@ -393,8 +393,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>193</width>
-            <height>162</height>
+            <width>637</width>
+            <height>442</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
@@ -470,8 +470,7 @@
                  <widget class="QToolButton" name="singlePageUncutBtn">
                   <property name="icon">
                    <iconset resource="../resources/resources.qrc">
-                    <normaloff>:/icons/single_page_uncut.svg</normaloff>
-                    <normalon>:/icons/single_page_uncut_selected.svg</normalon>:/icons/single_page_uncut.svg</iconset>
+                    <normaloff>:/icons/single_page_uncut.svg</normaloff>:/icons/single_page_uncut.svg</iconset>
                   </property>
                   <property name="iconSize">
                    <size>
@@ -497,8 +496,7 @@
                  <widget class="QToolButton" name="pagePlusOffcutBtn">
                   <property name="icon">
                    <iconset resource="../resources/resources.qrc">
-                    <normaloff>:/icons/right_page_plus_offcut.svg</normaloff>
-                    <normalon>:/icons/right_page_plus_offcut_selected.svg</normalon>:/icons/right_page_plus_offcut.svg</iconset>
+                    <normaloff>:/icons/right_page_plus_offcut.svg</normaloff>:/icons/right_page_plus_offcut.svg</iconset>
                   </property>
                   <property name="iconSize">
                    <size>
@@ -521,8 +519,7 @@
                  <widget class="QToolButton" name="twoPagesBtn">
                   <property name="icon">
                    <iconset resource="../resources/resources.qrc">
-                    <normaloff>:/icons/two_pages.svg</normaloff>
-                    <normalon>:/icons/two_pages_selected.svg</normalon>:/icons/two_pages.svg</iconset>
+                    <normaloff>:/icons/two_pages.svg</normaloff>:/icons/two_pages.svg</iconset>
                   </property>
                   <property name="iconSize">
                    <size>
@@ -1117,8 +1114,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>637</width>
-            <height>442</height>
+            <width>406</width>
+            <height>237</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_10">
@@ -1208,14 +1205,14 @@
                       <widget class="QToolButton" name="topBottomLink">
                        <property name="minimumSize">
                         <size>
-                         <width>18</width>
-                         <height>46</height>
+                         <width>20</width>
+                         <height>36</height>
                         </size>
                        </property>
                        <property name="maximumSize">
                         <size>
-                         <width>18</width>
-                         <height>46</height>
+                         <width>20</width>
+                         <height>36</height>
                         </size>
                        </property>
                        <property name="styleSheet">
@@ -1246,8 +1243,8 @@ QToolButton:pressed {
                        </property>
                        <property name="iconSize">
                         <size>
-                         <width>10</width>
-                         <height>30</height>
+                         <width>18</width>
+                         <height>24</height>
                         </size>
                        </property>
                       </widget>
@@ -1277,14 +1274,14 @@ QToolButton:pressed {
                       <widget class="QToolButton" name="leftRightLink">
                        <property name="minimumSize">
                         <size>
-                         <width>18</width>
-                         <height>46</height>
+                         <width>20</width>
+                         <height>36</height>
                         </size>
                        </property>
                        <property name="maximumSize">
                         <size>
-                         <width>18</width>
-                         <height>46</height>
+                         <width>20</width>
+                         <height>36</height>
                         </size>
                        </property>
                        <property name="styleSheet">
@@ -1315,8 +1312,8 @@ QToolButton:pressed {
                        </property>
                        <property name="iconSize">
                         <size>
-                         <width>10</width>
-                         <height>30</height>
+                         <width>18</width>
+                         <height>24</height>
                         </size>
                        </property>
                        <property name="checked">

src/app/FixDpiDialog.cpp

@@ -188,13 +188,14 @@ class FixDpiDialog::FilterModel : private QSortFilterProxyModel {
 
 
 FixDpiDialog::FixDpiDialog(const std::vector<ImageFileInfo>& files, QWidget* parent)
-    : QDialog(parent), m_pages(new TreeModel(files)), m_undefinedDpiPages(new FilterModel(*m_pages)) {
+    : QDialog(parent),
+      m_pages(std::make_unique<TreeModel>(files)),
+      m_undefinedDpiPages(std::make_unique<FilterModel>(*m_pages)) {
   setupUi(this);
 
   m_normalPalette = xDpi->palette();
   m_errorPalette = m_normalPalette;
-  const QColor errorTextColor
-      = ColorSchemeManager::instance().getColorParam(ColorScheme::FixDpiDialogErrorText, QColor(Qt::red));
+  const QColor errorTextColor = ColorSchemeManager::instance().getColorParam("FixDpiDialogErrorText", QColor(Qt::red));
   m_errorPalette.setColor(QPalette::Text, errorTextColor);
 
   dpiCombo->addItem("300 x 300", QSize(300, 300));