From 064c3f502e5047a1ad00d5ed2864c378b1cc9769 Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Thu, 31 Jul 2014 19:19:51 +0400
Subject: [PATCH] somefixes release 1.0.2

---
 .gitignore                            |  1 +
 CHANGELOG                             |  3 +++
 README.md                             |  2 +-
 create_archive.sh                     |  2 +-
 sources/CMakeLists.txt                | 13 +++++++------
 sources/reportabug.h                  |  1 +
 sources/src/CMakeLists.txt            | 26 ++++++++------------------
 sources/src/{config.h.in => config.h} |  0
 sources/src/reportabug.cpp            |  4 ++--
 sources/src/reportabug.h              |  1 +
 sources/src/reportabug.ui             |  6 +++++-
 11 files changed, 30 insertions(+), 29 deletions(-)
 create mode 120000 sources/reportabug.h
 rename sources/src/{config.h.in => config.h} (100%)

diff --git a/.gitignore b/.gitignore
index 989b8ec..59ce6ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ qrc_*.cpp
 ui_*.h
 Makefile*
 *-build-*
+*.qm
 
 # QtCreator
 
diff --git a/CHANGELOG b/CHANGELOG
index bdc1839..8631294 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Ver.1.0.2:
+* some fixes
+
 Ver.1.0.1:
 * fix captcha
 
diff --git a/README.md b/README.md
index 2a89d09..e1669d2 100644
--- a/README.md
+++ b/README.md
@@ -68,12 +68,12 @@ Dependencies
 ### Optional dependencies ###
 
 * qt5-webkit (if Qt5 is used) or qtwebkit (if Qt4 is used) *(requires for GitReport module)*
-* doxygen *(developers documentation)*
 
 ### Make dependencies ###
 
 * automoc4
 * cmake
+* doxygen *(optional, developers documentation)*
 
 Installation
 ------------
diff --git a/create_archive.sh b/create_archive.sh
index 1622fed..7ca9da3 100755
--- a/create_archive.sh
+++ b/create_archive.sh
@@ -3,7 +3,7 @@
 ARCHIVE="reportabug"
 SRCDIR="sources"
 FILES="AUTHORS CHANGELOG COPYING README.md"
-IGNORELIST="build *.cppcheck"
+IGNORELIST="build *.cppcheck *.qm"
 VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut -c 1)
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index f2bf809..96e8392 100644
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -4,6 +4,7 @@ cmake_policy (SET CMP0003 OLD)
 cmake_policy (SET CMP0002 OLD)
 cmake_policy (SET CMP0011 NEW)
 cmake_policy (SET CMP0015 NEW)
+cmake_policy (SET CMP0048 OLD)
 
 project (reportabug)
 
@@ -13,7 +14,7 @@ set (SUBPROJECT_CONTACT "esalexeev@gmail.com")
 set (SUBPROJECT_LICENSE "LGPLv3")
 set (SUBPROJECT_VERSION_MAJOR 1)
 set (SUBPROJECT_VERSION_MINOR 0)
-set (SUBPROJECT_VERSION_PATCH 1)
+set (SUBPROJECT_VERSION_PATCH 2)
 set (SUBPROJECT_VERSION ${SUBPROJECT_VERSION_MAJOR}.${SUBPROJECT_VERSION_MINOR}.${SUBPROJECT_VERSION_PATCH})
 string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
 string (TIMESTAMP CURRENT_YEAR "%Y")
@@ -23,11 +24,11 @@ message (STATUS "Version: ${SUBPROJECT_VERSION}")
 message (STATUS "Build date: ${CURRENT_DATE}")
 
 # install options
-option (BUILD_AS_LIBRARY "Build the application as a shared library" ON)
-option (BUILD_DOCS "Build developers documentation" OFF)
-option (ENABLE_GITHUB "Enable GitHub module" ON)
-option (ENABLE_GITREPORT "Enable GitReport module" ON)
-option (USE_QT5 "Use Qt5 instead of Qt4" ON)
+set (BUILD_AS_LIBRARY ON CACHE BOOL "Build the application as a shared library")
+set (BUILD_DOCS OFF CACHE BOOL "Build developers documentation")
+set (ENABLE_GITHUB ON CACHE BOOL "Enable GitHub module")
+set (ENABLE_GITREPORT ON CACHE BOOL "Enable GitReport module")
+set (USE_QT5 ON CACHE BOOL "Use Qt5 instead of Qt4")
 set (OWN_GITHUB_TOKEN "" CACHE STRING "Use own GitHub token instead of GitReport")
 # set flags
 if (OWN_GITHUB_TOKEN STREQUAL "")
diff --git a/sources/reportabug.h b/sources/reportabug.h
new file mode 120000
index 0000000..24514fb
--- /dev/null
+++ b/sources/reportabug.h
@@ -0,0 +1 @@
+src/reportabug.h
\ No newline at end of file
diff --git a/sources/src/CMakeLists.txt b/sources/src/CMakeLists.txt
index 4fd3a0d..7e9d661 100644
--- a/sources/src/CMakeLists.txt
+++ b/sources/src/CMakeLists.txt
@@ -1,17 +1,16 @@
 # set files
-set (SOURCES main.cpp reportabug.cpp)
-set (HEADERS reportabug.h)
-set (FORMS reportabug.ui)
+set (SOURCES ${SUBPROJECT_SOURCE_DIR}/main.cpp ${SUBPROJECT_SOURCE_DIR}/reportabug.cpp)
+set (HEADERS ${SUBPROJECT_SOURCE_DIR}/reportabug.h ${SUBPROJECT_SOURCE_DIR}/config.h)
+set (FORMS ${SUBPROJECT_SOURCE_DIR}/reportabug.ui)
 if (ENABLE_GITHUB OR USE_OWN_TOKEN)
-    set (SOURCES ${SOURCES} githubmodule.cpp)
-    set (HEADERS ${HEADERS} githubmodule.h)
+    set (SOURCES ${SOURCES} ${SUBPROJECT_SOURCE_DIR}/githubmodule.cpp)
+    set (HEADERS ${HEADERS} ${SUBPROJECT_SOURCE_DIR}/githubmodule.h)
 endif ()
 if (ENABLE_GITREPORT)
-    set (SOURCES ${SOURCES} gitreportmodule.cpp)
-    set (HEADERS ${HEADERS} gitreportmodule.h)
+    set (SOURCES ${SOURCES} ${SUBPROJECT_SOURCE_DIR}/gitreportmodule.cpp)
+    set (HEADERS ${HEADERS} ${SUBPROJECT_SOURCE_DIR}/gitreportmodule.h)
 endif ()
 
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/inconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/inconfig.h)
 
 # include_path
@@ -38,11 +37,6 @@ if (USE_QT5)
     endif ()
     qt5_wrap_cpp (MOC_SOURCES ${HEADERS})
     qt5_wrap_ui (UI_HEADERS ${FORMS})
-
-    source_group ("Header Files" FILES ${HEADERS})
-    source_group ("Source Files" FILES ${SOURCES})
-    source_group ("Generated Files" FILES ${MOC_SOURCES})
-
 else ()
     set (QT_USED_COMPONENTS QtCore QtGui QtNetwork)
     if (ENABLE_GITREPORT)
@@ -58,12 +52,8 @@ else ()
     qt4_wrap_ui (UI_HEADERS ${FORMS})
 endif()
 
-source_group ("Header Files" FILES ${HEADERS})
-source_group ("Source Files" FILES ${SOURCES})
-source_group ("Generated Files" FILES ${MOC_SOURCES})
-
 if (BUILD_AS_LIBRARY)
-    add_library (${SUBPROJECT} SHARED ${SOURCES} ${HEADERS} ${MOC_SOURCES})
+    add_library (${SUBPROJECT} SHARED ${SOURCES} ${HEADERS} ${MOC_SOURCES} ${UI_HEADERS})
 else ()
     add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES})
 endif ()
diff --git a/sources/src/config.h.in b/sources/src/config.h
similarity index 100%
rename from sources/src/config.h.in
rename to sources/src/config.h
diff --git a/sources/src/reportabug.cpp b/sources/src/reportabug.cpp
index 5c43483..18dfd11 100644
--- a/sources/src/reportabug.cpp
+++ b/sources/src/reportabug.cpp
@@ -117,9 +117,9 @@ void Reportabug::createComboBox()
 
     ui->comboBox->clear();
     if (modules[0])
-        ui->comboBox->addItem(QApplication::translate("Reportabug", GITHUB_COMBOBOX));
+        ui->comboBox->addItem(GITHUB_COMBOBOX);
     if (modules[1] || modules[2])
-        ui->comboBox->addItem(QApplication::translate("Reportabug", GITREPORT_COMBOBOX));
+        ui->comboBox->addItem(GITREPORT_COMBOBOX);
 }
 
 
diff --git a/sources/src/reportabug.h b/sources/src/reportabug.h
index 28acd39..1c10618 100644
--- a/sources/src/reportabug.h
+++ b/sources/src/reportabug.h
@@ -26,6 +26,7 @@
 #define REPORTABUG_H
 
 #include <QKeyEvent>
+#include <QLocale>
 #include <QMainWindow>
 
 
diff --git a/sources/src/reportabug.ui b/sources/src/reportabug.ui
index 13846ff..a5c469b 100644
--- a/sources/src/reportabug.ui
+++ b/sources/src/reportabug.ui
@@ -120,7 +120,11 @@
         </widget>
        </item>
        <item>
-        <widget class="QLineEdit" name="lineEdit_captcha"/>
+        <widget class="QLineEdit" name="lineEdit_captcha">
+         <property name="placeholderText">
+          <string>captcha</string>
+         </property>
+        </widget>
        </item>
       </layout>
      </widget>