Skip to content

Commit c86264e

Browse files
NathanW2NathanW2
committedApr 23, 2017
UI cleanup for crash dialog
·
ltr-3_40final-3_0_0
1 parent 716ff6c commit c86264e

File tree

3 files changed

+77
-52
lines changed

3 files changed

+77
-52
lines changed
 

‎src/app/qgscrashdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ QgsCrashDialog::QgsCrashDialog( QWidget *parent )
3030
mCrashMessage->setText( tr( "Sorry. It looks something unexpected happened that we didn't handle and QGIS crashed." ) );
3131
connect( mCopyReportButton, &QPushButton::clicked, this, &QgsCrashDialog::createBugReport );
3232

33-
mHelpLabel->setText( tr( "Keen to help us fix bugs?"
33+
mHelpLabel->setText( tr( "Keen to help us fix bugs? "
3434
"<a href=\"http://qgis.org/en/site/getinvolved/development/bugreporting.html#bugs-features-and-issues\">Follow the steps to help our developers.</a>"
3535
"<br><br>"
36-
"You can also send us a helpful bug report using the Copy Report button and opening a ticket at "
36+
"You can also send us a helpful bug report using the Copy Report button <br>and opening a ticket at "
3737
"<a href=\"http://hub.qgis.org/\">hub.qgis.org</a>" ) );
3838
mHelpLabel->setTextInteractionFlags( Qt::TextBrowserInteraction );
3939
mHelpLabel->setOpenExternalLinks( true );

‎src/app/qgscrashreport.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,14 @@ const QString QgsCrashReport::crashID() const
128128
{
129129
QFileInfo fileInfo( line.fileName );
130130
QString filename( fileInfo.fileName() );
131-
data += line.moduleName + line.symbolName + line.lineNumber + filename;
131+
data += line.symbolName;
132132
}
133133

134134
if ( data.isNull() )
135135
return "ID not generated due to missing information";
136136

137137
QString hash = QString( QCryptographicHash::hash( data.toAscii(), QCryptographicHash::Sha1 ).toHex() );
138-
return hash + " ||data(" + data + ")";
139-
138+
return hash;
140139
}
141140

142141
bool QgsCrashReport::StackLine::isQgisModule() const

‎src/ui/qgscrashdialog.ui

Lines changed: 73 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>518</width>
10-
<height>481</height>
9+
<width>583</width>
10+
<height>644</height>
1111
</rect>
1212
</property>
1313
<property name="palette">
@@ -492,20 +492,25 @@
492492
</item>
493493
<item row="3" column="0" colspan="3">
494494
<widget class="QPlainTextEdit" name="mReportDetailsText">
495+
<property name="sizePolicy">
496+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
497+
<horstretch>0</horstretch>
498+
<verstretch>0</verstretch>
499+
</sizepolicy>
500+
</property>
495501
<property name="verticalScrollBarPolicy">
496502
<enum>Qt::ScrollBarAlwaysOn</enum>
497503
</property>
498504
</widget>
499505
</item>
500-
<item row="0" column="2">
501-
<widget class="QPushButton" name="mCopyReportButton">
502-
<property name="text">
503-
<string>Copy Report</string>
504-
</property>
505-
</widget>
506-
</item>
507506
<item row="1" column="0" colspan="3">
508507
<widget class="QPlainTextEdit" name="mUserFeedbackText">
508+
<property name="sizePolicy">
509+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
510+
<horstretch>0</horstretch>
511+
<verstretch>0</verstretch>
512+
</sizepolicy>
513+
</property>
509514
<property name="verticalScrollBarPolicy">
510515
<enum>Qt::ScrollBarAlwaysOn</enum>
511516
</property>
@@ -517,58 +522,36 @@
517522
</property>
518523
</widget>
519524
</item>
520-
<item row="0" column="0">
525+
<item row="0" column="2">
526+
<widget class="QPushButton" name="mCopyReportButton">
527+
<property name="text">
528+
<string>Copy Report</string>
529+
</property>
530+
</widget>
531+
</item>
532+
<item row="0" column="0" colspan="2">
521533
<widget class="QLabel" name="label">
522534
<property name="text">
523535
<string>Tell us something about when you got the crash</string>
524536
</property>
537+
<property name="wordWrap">
538+
<bool>true</bool>
539+
</property>
525540
</widget>
526541
</item>
527-
<item row="2" column="0">
542+
<item row="2" column="0" colspan="2">
528543
<widget class="QLabel" name="label_3">
529544
<property name="text">
530545
<string>Report Details</string>
531546
</property>
547+
<property name="wordWrap">
548+
<bool>true</bool>
549+
</property>
532550
</widget>
533551
</item>
534552
</layout>
535553
</widget>
536554
</item>
537-
<item row="2" column="0">
538-
<spacer name="verticalSpacer">
539-
<property name="orientation">
540-
<enum>Qt::Vertical</enum>
541-
</property>
542-
<property name="sizeHint" stdset="0">
543-
<size>
544-
<width>20</width>
545-
<height>40</height>
546-
</size>
547-
</property>
548-
</spacer>
549-
</item>
550-
<item row="0" column="0">
551-
<widget class="QLabel" name="label_2">
552-
<property name="maximumSize">
553-
<size>
554-
<width>150</width>
555-
<height>150</height>
556-
</size>
557-
</property>
558-
<property name="text">
559-
<string/>
560-
</property>
561-
<property name="pixmap">
562-
<pixmap resource="../../images/images.qrc">:/images/icons/qgis_icon.svg</pixmap>
563-
</property>
564-
<property name="scaledContents">
565-
<bool>true</bool>
566-
</property>
567-
<property name="alignment">
568-
<set>Qt::AlignCenter</set>
569-
</property>
570-
</widget>
571-
</item>
572555
<item row="0" column="1" colspan="2">
573556
<layout class="QVBoxLayout" name="verticalLayout">
574557
<item>
@@ -588,10 +571,19 @@
588571
<property name="text">
589572
<string>Header</string>
590573
</property>
574+
<property name="wordWrap">
575+
<bool>true</bool>
576+
</property>
591577
</widget>
592578
</item>
593579
<item>
594580
<widget class="QLabel" name="mCrashMessage">
581+
<property name="sizePolicy">
582+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
583+
<horstretch>0</horstretch>
584+
<verstretch>0</verstretch>
585+
</sizepolicy>
586+
</property>
595587
<property name="text">
596588
<string>Message</string>
597589
</property>
@@ -602,26 +594,60 @@
602594
</item>
603595
<item>
604596
<widget class="QLabel" name="mHelpLabel">
597+
<property name="sizePolicy">
598+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
599+
<horstretch>0</horstretch>
600+
<verstretch>0</verstretch>
601+
</sizepolicy>
602+
</property>
605603
<property name="text">
606604
<string>Help Message</string>
607605
</property>
606+
<property name="wordWrap">
607+
<bool>true</bool>
608+
</property>
608609
</widget>
609610
</item>
610611
<item>
611612
<spacer name="verticalSpacer_3">
612613
<property name="orientation">
613614
<enum>Qt::Vertical</enum>
614615
</property>
616+
<property name="sizeType">
617+
<enum>QSizePolicy::Preferred</enum>
618+
</property>
615619
<property name="sizeHint" stdset="0">
616620
<size>
617621
<width>20</width>
618-
<height>40</height>
622+
<height>20</height>
619623
</size>
620624
</property>
621625
</spacer>
622626
</item>
623627
</layout>
624628
</item>
629+
<item row="0" column="0">
630+
<widget class="QLabel" name="label_2">
631+
<property name="maximumSize">
632+
<size>
633+
<width>150</width>
634+
<height>150</height>
635+
</size>
636+
</property>
637+
<property name="text">
638+
<string/>
639+
</property>
640+
<property name="pixmap">
641+
<pixmap resource="../../images/images.qrc">:/images/icons/qgis_icon.svg</pixmap>
642+
</property>
643+
<property name="scaledContents">
644+
<bool>true</bool>
645+
</property>
646+
<property name="alignment">
647+
<set>Qt::AlignCenter</set>
648+
</property>
649+
</widget>
650+
</item>
625651
</layout>
626652
</widget>
627653
<resources>

0 commit comments

Comments
 (0)
Please sign in to comment.