Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
233 additions
and 193 deletions.
- +2 −2 python/core/layout/qgslayoutitemhtml.sip
- +14 −0 python/core/layout/qgslayoutmultiframe.sip
- +1 −0 src/app/qgscrashhandler.h
- +3 −2 src/core/layout/qgslayoutitemhtml.h
- +11 −0 src/core/layout/qgslayoutmultiframe.cpp
- +13 −0 src/core/layout/qgslayoutmultiframe.h
- +32 −32 src/crashhandler/CMakeLists.txt
- +55 −55 src/crashhandler/qgscrashdialog.h
- +101 −101 src/crashhandler/qgscrashreport.h
- +1 −1 tests/src/python/test_qgslayoutpagecollection.py
@@ -1,32 +1,32 @@ | ||
INCLUDE_DIRECTORIES(SYSTEM | ||
${CMAKE_CURRENT_BINARY_DIR} | ||
) | ||
|
||
QT5_WRAP_UI(CRASH_UIS_H qgscrashdialog.ui) | ||
QT5_WRAP_CPP(CRASH_HDR_MOC qgscrashdialog.h) | ||
|
||
SET(IMAGE_RCCS ../../images/images.qrc) | ||
QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS}) | ||
|
||
# -wd4091 Avoid 'typedef' ignored on left of '' when no variable is declared warning in DbgHelp.h | ||
SET_SOURCE_FILES_PROPERTIES(qgsstacktrace.cpp PROPERTIES COMPILE_FLAGS -wd4091) | ||
|
||
ADD_EXECUTABLE(qgiscrashhandler WIN32 | ||
main.cpp | ||
${CRASH_UIS_H} | ||
${CRASH_HDR_MOC} | ||
${IMAGE_RCC_SRCS} | ||
qgscrashdialog.cpp | ||
qgsstacktrace.cpp | ||
qgscrashreport.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc | ||
) | ||
|
||
TARGET_LINK_LIBRARIES(qgiscrashhandler | ||
${QT_QTCORE_LIBRARY} | ||
${QT_QTGUI_LIBRARY} | ||
DbgHelp | ||
) | ||
|
||
INSTALL(CODE "MESSAGE(\"Installing crashhandler ...\")") | ||
INSTALL(TARGETS qgiscrashhandler RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR}) | ||
INCLUDE_DIRECTORIES(SYSTEM | ||
${CMAKE_CURRENT_BINARY_DIR} | ||
) | ||
|
||
QT5_WRAP_UI(CRASH_UIS_H qgscrashdialog.ui) | ||
QT5_WRAP_CPP(CRASH_HDR_MOC qgscrashdialog.h) | ||
|
||
SET(IMAGE_RCCS ../../images/images.qrc) | ||
QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS}) | ||
|
||
# -wd4091 Avoid 'typedef' ignored on left of '' when no variable is declared warning in DbgHelp.h | ||
SET_SOURCE_FILES_PROPERTIES(qgsstacktrace.cpp PROPERTIES COMPILE_FLAGS -wd4091) | ||
|
||
ADD_EXECUTABLE(qgiscrashhandler WIN32 | ||
main.cpp | ||
${CRASH_UIS_H} | ||
${CRASH_HDR_MOC} | ||
${IMAGE_RCC_SRCS} | ||
qgscrashdialog.cpp | ||
qgsstacktrace.cpp | ||
qgscrashreport.cpp | ||
${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc | ||
) | ||
|
||
TARGET_LINK_LIBRARIES(qgiscrashhandler | ||
${QT_QTCORE_LIBRARY} | ||
${QT_QTGUI_LIBRARY} | ||
DbgHelp | ||
) | ||
|
||
INSTALL(CODE "MESSAGE(\"Installing crashhandler ...\")") | ||
INSTALL(TARGETS qgiscrashhandler RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR}) |
@@ -1,55 +1,55 @@ | ||
/*************************************************************************** | ||
qgscrashdialog.h - QgsCrashDialog | ||
--------------------- | ||
begin : 11.4.2017 | ||
copyright : (C) 2017 by Nathan Woodrow | ||
email : woodrow.nathan@gmail.com | ||
*************************************************************************** | ||
* * | ||
* This program is free software; you can redistribute it and/or modify * | ||
* it under the terms of the GNU General Public License as published by * | ||
* the Free Software Foundation; either version 2 of the License, or * | ||
* (at your option) any later version. * | ||
* * | ||
***************************************************************************/ | ||
|
||
#ifndef QGSCRASHDIALOG_H | ||
#define QGSCRASHDIALOG_H | ||
|
||
#include <QDialog> | ||
#include <QFormLayout> | ||
#include <QPlainTextEdit> | ||
#include <QPushButton> | ||
|
||
#include "ui_qgscrashdialog.h" | ||
|
||
/** | ||
* A dialog to show a nicer crash dialog to the user. | ||
*/ | ||
class QgsCrashDialog : public QDialog, private Ui::QgsCrashDialog | ||
{ | ||
Q_OBJECT | ||
public: | ||
|
||
/** | ||
* A dialog to show a nicer crash dialog to the user. | ||
*/ | ||
QgsCrashDialog( QWidget *parent = nullptr ); | ||
|
||
void setBugReport( const QString &reportData ); | ||
void setReloadArgs( const QString &reloadArgs ); | ||
|
||
static QString htmlToMarkdown( const QString &html ); | ||
|
||
private slots: | ||
void showReportWidget(); | ||
void createBugReport(); | ||
void reloadQGIS(); | ||
|
||
private: | ||
QString mReportData; | ||
QString mReloadArgs; | ||
}; | ||
|
||
#endif // QGSCRASHDIALOG_H | ||
/*************************************************************************** | ||
qgscrashdialog.h - QgsCrashDialog | ||
--------------------- | ||
begin : 11.4.2017 | ||
copyright : (C) 2017 by Nathan Woodrow | ||
email : woodrow.nathan@gmail.com | ||
*************************************************************************** | ||
* * | ||
* This program is free software; you can redistribute it and/or modify * | ||
* it under the terms of the GNU General Public License as published by * | ||
* the Free Software Foundation; either version 2 of the License, or * | ||
* (at your option) any later version. * | ||
* * | ||
***************************************************************************/ | ||
|
||
#ifndef QGSCRASHDIALOG_H | ||
#define QGSCRASHDIALOG_H | ||
|
||
#include <QDialog> | ||
#include <QFormLayout> | ||
#include <QPlainTextEdit> | ||
#include <QPushButton> | ||
|
||
#include "ui_qgscrashdialog.h" | ||
|
||
/** | ||
* A dialog to show a nicer crash dialog to the user. | ||
*/ | ||
class QgsCrashDialog : public QDialog, private Ui::QgsCrashDialog | ||
{ | ||
Q_OBJECT | ||
public: | ||
|
||
/** | ||
* A dialog to show a nicer crash dialog to the user. | ||
*/ | ||
QgsCrashDialog( QWidget *parent = nullptr ); | ||
|
||
void setBugReport( const QString &reportData ); | ||
void setReloadArgs( const QString &reloadArgs ); | ||
|
||
static QString htmlToMarkdown( const QString &html ); | ||
|
||
private slots: | ||
void showReportWidget(); | ||
void createBugReport(); | ||
void reloadQGIS(); | ||
|
||
private: | ||
QString mReportData; | ||
QString mReloadArgs; | ||
}; | ||
|
||
#endif // QGSCRASHDIALOG_H |
Oops, something went wrong.