arcanis/reportabug
1
0
Fork 0
mirror of https://github.com/arcan1s/reportabug.git synced 2025-04-24 07:17:18 +00:00
Code Issues Projects Releases Wiki Activity

somefixes

Browse Source 
release 1.0.2
This commit is contained in:
arcan1s 2014-07-31 19:19:51 +04:00
parent 33fdd14e79
commit 064c3f502e
11 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -22,6 +22,7 @@ qrc_*.cpp
ui_*.h
Makefile*
*-build-*
*.qm
# QtCreator

3
CHANGELOG
View File

@ -1,3 +1,6 @@
Ver.1.0.2:
* some fixes
Ver.1.0.1:
* fix captcha

2
README.md
View File

@ -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
------------

2
create_archive.sh
View File

@ -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)

13
sources/CMakeLists.txt
View File

@ -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 "")

1
sources/reportabug.h Symbolic link
View File

@ -0,0 +1 @@
src/reportabug.h

26
sources/src/CMakeLists.txt
View File

@ -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 ()

0
sources/src/config.h.in → sources/src/config.h
View File

4
sources/src/reportabug.cpp
View File

@ -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);
}

1
sources/src/reportabug.h
View File

@ -26,6 +26,7 @@
#define REPORTABUG_H
#include <QKeyEvent>
#include <QLocale>
#include <QMainWindow>

6
sources/src/reportabug.ui
View File

@ -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>