Merge pull request #16971 from Chocobo1/dialog

Move stacktrace dialog to gui folder

src/gui/CMakeLists.txt

@@ -221,6 +221,16 @@ if (DBUS)
     )
 endif()
 
+if (STACKTRACE)
+    qt_wrap_ui(STACKTRACE_UI_HEADERS stacktracedialog.ui)
+
+    target_sources(qbt_gui PRIVATE
+        stacktracedialog.h
+        stacktracedialog.cpp
+        ${STACKTRACE_UI_HEADERS}
+    )
+endif()
+
 if ((CMAKE_SYSTEM_NAME STREQUAL "Windows") OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
     target_sources(qbt_gui PRIVATE
         programupdater.h

src/gui/gui.pri

@@ -163,26 +163,6 @@ SOURCES += \
     $$PWD/watchedfolderoptionsdialog.cpp \
     $$PWD/watchedfoldersmodel.cpp
 
-win32|macx {
-    HEADERS += $$PWD/programupdater.h
-    SOURCES += $$PWD/programupdater.cpp
-}
-
-unix:!macx:dbus {
-    HEADERS += \
-        $$PWD/powermanagement/powermanagement_x11.h \
-        $$PWD/qtnotify/notifications.h
-
-    SOURCES += \
-        $$PWD/powermanagement/powermanagement_x11.cpp \
-        $$PWD/qtnotify/notifications.cpp
-}
-
-macx {
-    HEADERS += $$PWD/macutilities.h
-    OBJECTIVE_SOURCES += $$PWD/macutilities.mm
-}
-
 FORMS += \
     $$PWD/aboutdialog.ui \
     $$PWD/addnewtorrentdialog.ui \
@@ -215,3 +195,31 @@ FORMS += \
     $$PWD/watchedfolderoptionsdialog.ui
 
 RESOURCES += $$PWD/about.qrc
+
+stacktrace {
+    !unix {
+        HEADERS += $$PWD/stacktracedialog.h
+        SOURCES += $$PWD/stacktracedialog.cpp
+        FORMS += $$PWD/stacktracedialog.ui
+    }
+}
+
+win32|macx {
+    HEADERS += $$PWD/programupdater.h
+    SOURCES += $$PWD/programupdater.cpp
+}
+
+unix:!macx:dbus {
+    HEADERS += \
+        $$PWD/powermanagement/powermanagement_x11.h \
+        $$PWD/qtnotify/notifications.h
+
+    SOURCES += \
+        $$PWD/powermanagement/powermanagement_x11.cpp \
+        $$PWD/qtnotify/notifications.cpp
+}
+
+macx {
+    HEADERS += $$PWD/macutilities.h
+    OBJECTIVE_SOURCES += $$PWD/macutilities.mm
+}

src/gui/stacktracedialog.cpp

@@ -0,0 +1,85 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2015 The qBittorrent project
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ */
+
+#include "stacktracedialog.h"
+
+#include <QString>
+
+#include "base/utils/misc.h"
+#include "base/version.h"
+#include "ui_stacktracedialog.h"
+
+StacktraceDialog::StacktraceDialog(QWidget *parent)
+    : QDialog(parent)
+    , m_ui(new Ui::StacktraceDialog)
+{
+    m_ui->setupUi(this);
+}
+
+StacktraceDialog::~StacktraceDialog()
+{
+    delete m_ui;
+}
+
+void StacktraceDialog::setText(const QString &signalName, const QString &stacktrace)
+{
+    // try to call Qt function as less as possible
+    const QString htmlStr = QStringLiteral(
+        "<p align=center><b><font size=7 color=red>"
+        "qBittorrent has crashed"
+        "</font></b></p>"
+        "<font size=4><p>"
+        "Please file a bug report at "
+        "<a href=\"http://bugs.qbittorrent.org\">http://bugs.qbittorrent.org</a> "
+        "and provide the following information:"
+        "</p></font>"
+        "<br/><hr><br/>"
+        "<p align=center><font size=4>"
+        "qBittorrent version: " QBT_VERSION " (%1-bit)<br/>"
+        "Libtorrent version: %2<br/>"
+        "Qt version: " QT_VERSION_STR "<br/>"
+        "Boost version: %3<br/>"
+        "OpenSSL version: %4<br/>"
+        "zlib version: %5<br/>"
+        "OS version: %6<br/><br/>"
+        "Caught signal: %7"
+        "</font></p>"
+        "<pre><code>%8</code></pre>"
+        "<br/><hr><br/><br/>")
+            .arg(QString::number(QT_POINTER_SIZE * 8)
+                 , Utils::Misc::libtorrentVersionString()
+                 , Utils::Misc::boostVersionString()
+                 , Utils::Misc::opensslVersionString()
+                 , Utils::Misc::zlibVersionString()
+                 , Utils::Misc::osName()
+                 , signalName
+                 , stacktrace);
+
+    m_ui->errorText->setHtml(htmlStr);
+}

src/gui/stacktracedialog.h

@@ -0,0 +1,52 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2015 The qBittorrent project
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ */
+
+#pragma once
+
+#include <QDialog>
+
+namespace Ui
+{
+    class StacktraceDialog;
+}
+
+class StacktraceDialog : public QDialog
+{
+    Q_OBJECT
+    Q_DISABLE_COPY_MOVE(StacktraceDialog)
+
+public:
+    explicit StacktraceDialog(QWidget *parent = nullptr);
+    ~StacktraceDialog() override;
+
+    void setText(const QString &signalName, const QString &stacktrace);
+
+private:
+    Ui::StacktraceDialog *m_ui;
+};

src/gui/stacktracedialog.ui

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StacktraceDialog</class>
+ <widget class="QDialog" name="StacktraceDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Crash info</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTextBrowser" name="errorText">
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>