Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Schmidt <domme@tomahawk-player.org>2014-08-30 13:05:34 +0400
committerDominik Schmidt <domme@tomahawk-player.org>2014-08-30 13:05:34 +0400
commitd2404156711cbf95e2306104e63e176ba411330a (patch)
treecda3feec8df2483c46e3c76f8e9ec3ef7c3cad66
parent1aca22b5f87d5769b1d8298544264a27c828cceb (diff)
Make crash reporter logo branded
-rw-r--r--OWNCLOUD.cmake1
-rw-r--r--src/crashreporter/CrashReporterConfig.h.in2
-rw-r--r--src/crashreporter/main.cpp4
3 files changed, 6 insertions, 1 deletions
diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake
index 44edd3ded..b45249683 100644
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -13,3 +13,4 @@ set( WIN_SETUP_BITMAP_PATH "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
option( WITH_CRASHREPORTER "Build crashreporter" OFF )
set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.org/submit" CACHE string "URL for crash repoter" )
+set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
diff --git a/src/crashreporter/CrashReporterConfig.h.in b/src/crashreporter/CrashReporterConfig.h.in
index 1fa026d5d..14f937be9 100644
--- a/src/crashreporter/CrashReporterConfig.h.in
+++ b/src/crashreporter/CrashReporterConfig.h.in
@@ -11,4 +11,6 @@
#define CRASHREPORTER_SUBMIT_URL "@CRASHREPORTER_SUBMIT_URL@"
+#define CRASHREPORTER_ICON "@CRASHREPORTER_ICON@"
+
#endif // CRASHREPORTERCONFIG_H
diff --git a/src/crashreporter/main.cpp b/src/crashreporter/main.cpp
index 6471fa91e..048b9ff0b 100644
--- a/src/crashreporter/main.cpp
+++ b/src/crashreporter/main.cpp
@@ -33,7 +33,9 @@ int main( int argc, char* argv[] )
// TODO: install socorro ....
CrashReporter reporter( QUrl( CRASHREPORTER_SUBMIT_URL ), app.arguments() );
- reporter.setLogo(QPixmap(":/owncloud-icon.png"));
+#ifdef CRASHREPORTER_ICON
+ reporter.setLogo(QPixmap(CRASHREPORTER_ICON));
+#endif
reporter.setWindowTitle(CRASHREPORTER_PRODUCT_NAME);
reporter.setText("<html><head/><body><p><span style=\" font-weight:600;\">Sorry!</span> " CRASHREPORTER_PRODUCT_NAME " crashed. Please tell us about it! " CRASHREPORTER_PRODUCT_NAME " has created an error report for you that can help improve the stability in the future. You can now send this report directly to the " CRASHREPORTER_PRODUCT_NAME " developers.</p></body></html>");