diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp
index 88d20bc610..b9e005c9f6 100644
--- a/common/dialogs/wx_html_report_panel.cpp
+++ b/common/dialogs/wx_html_report_panel.cpp
@@ -37,8 +37,7 @@ WX_HTML_REPORT_PANEL::WX_HTML_REPORT_PANEL( wxWindow* parent,
WX_HTML_REPORT_PANEL_BASE( parent, id, pos, size, style ),
m_reporter( this ),
m_severities( -1 ),
- m_lazyUpdate( false ),
- m_printInfo( true )
+ m_lazyUpdate( false )
{
syncCheckboxes();
m_htmlView->SetPage( addHeader( "" ) );
@@ -409,12 +408,6 @@ wxString& WX_HTML_REPORT_PANEL::GetFileName( void )
}
-void WX_HTML_REPORT_PANEL::SetPrintInfo( bool aPrintInfo )
-{
- m_printInfo = aPrintInfo;
-}
-
-
void WX_HTML_REPORT_PANEL::SetShowSeverity( SEVERITY aSeverity, bool aValue )
{
switch( aSeverity )
diff --git a/common/dialogs/wx_html_report_panel.h b/common/dialogs/wx_html_report_panel.h
index 4ef34fa907..02f4775c6c 100644
--- a/common/dialogs/wx_html_report_panel.h
+++ b/common/dialogs/wx_html_report_panel.h
@@ -85,9 +85,6 @@ public:
///< If the m_showAll option is set, the mask is < 0
int GetVisibleSeverities() const;
- ///< If true prints Info: at the beginning of each Info severity line (Default)
- void SetPrintInfo( bool aPrintInfo );
-
///< @return the visible severity filter.
///< If the m_showAll option is set, the mask is < 0
void SetShowSeverity( SEVERITY aSeverity, bool aValue );
@@ -126,28 +123,17 @@ private:
void onBtnSaveToFile( wxCommandEvent& event ) override;
- ///< copy of the report, stored for filtering
- REPORT_LINES m_report;
-
- ///< Lines to print at the very end of the report, regardless of sorting
- REPORT_LINES m_reportTail;
-
- ///< Lines to print at the very beginning of the report, regardless of sorting
- REPORT_LINES m_reportHead;
-
- ///< the reporter
+private:
WX_HTML_PANEL_REPORTER m_reporter;
- ///< message severities to display (mask)
- int m_severities;
+ REPORT_LINES m_report; ///< copy of the report, stored for filtering
+ REPORT_LINES m_reportTail; ///< Lines to print at the end, regardless of sorting
+ REPORT_LINES m_reportHead; ///< ... and at the beginning, regardless of sorting
- bool m_lazyUpdate;
+ int m_severities; ///< message severities to display (mask)
+ bool m_lazyUpdate;
- ///< Print "Info:" at the front of Info messages (default)
- bool m_printInfo;
-
- ///< Use this as the filename instead of /bin/report.txt (default)
- wxString m_reportFileName;
+ wxString m_reportFileName; ///< defaults to the not very useful /bin/report.txt
};
#endif //__WX_HTML_REPORT_PANEL_H__
diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp
index 253db2248d..c33217b71b 100644
--- a/eeschema/dialogs/dialog_annotate.cpp
+++ b/eeschema/dialogs/dialog_annotate.cpp
@@ -96,6 +96,7 @@ DIALOG_ANNOTATE::DIALOG_ANNOTATE( SCH_EDIT_FRAME* parent, const wxString& messag
}
m_MessageWindow->SetLabel( _( "Annotation Messages:" ) );
+ m_MessageWindow->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
// We use a sdbSizer to get platform-dependent ordering of the action buttons, but
// that requires us to correct the button labels here.
diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index 168395f866..9733973d9f 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -111,6 +111,7 @@ DIALOG_CHANGE_SYMBOLS::DIALOG_CHANGE_SYMBOLS( SCH_EDIT_FRAME* aParent, SCH_COMPO
}
m_messagePanel->SetLazyUpdate( true );
+ m_messagePanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
if( aSymbol && aSymbol->IsSelected() )
{
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index 17cfb0f480..da4812b114 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@@ -25,6 +25,7 @@
*/
#include
+#include
#include
#include
#include
@@ -54,6 +55,8 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent )
m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );
+ m_MessagesBox->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
+
// We use a sdbSizer to get platform-dependent ordering of the action buttons, but
// that requires us to correct the button labels here.
m_sdbSizer1OK->SetLabel( _( "Plot All Pages" ) );
diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp
index e51c626a24..b5147e75fc 100644
--- a/eeschema/dialogs/dialog_symbol_remap.cpp
+++ b/eeschema/dialogs/dialog_symbol_remap.cpp
@@ -73,6 +73,8 @@ DIALOG_SYMBOL_REMAP::DIALOG_SYMBOL_REMAP( SCH_EDIT_FRAME* aParent ) :
"you will be responsible for manually remapping the symbols." );
m_htmlCtrl->AppendToPage( text );
+
+ m_messagePanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
}
diff --git a/eeschema/dialogs/dialog_update_from_pcb.cpp b/eeschema/dialogs/dialog_update_from_pcb.cpp
index bacc9e601d..f838069d21 100644
--- a/eeschema/dialogs/dialog_update_from_pcb.cpp
+++ b/eeschema/dialogs/dialog_update_from_pcb.cpp
@@ -40,6 +40,7 @@ DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB( SCH_EDIT_FRAME* aParent )
{
m_messagePanel->SetLabel( _( "Changes To Be Applied" ) );
+ m_messagePanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
m_messagePanel->SetLazyUpdate( true );
m_messagePanel->GetSizer()->SetSizeHints( this );
diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp
index c16530c07e..5deee54e05 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.cpp
+++ b/pcbnew/dialogs/dialog_board_reannotate.cpp
@@ -163,17 +163,7 @@ DIALOG_BOARD_REANNOTATE::DIALOG_BOARD_REANNOTATE( PCB_EDIT_FRAME* aParentFrame )
m_ExcludeList->SetToolTip( m_ExcludeListText->GetToolTipText() );
m_GridChoice->SetToolTip( m_SortGridText->GetToolTipText() );
- // Set the reporter window filename to something sensible
- if( m_MessageWindow->GetFileName().empty() )
- {
- wxFileName fn = m_frame->GetBoard()->GetFileName();
- fn.SetName( "annotationreport" );
- fn.SetExt( "txt " );
- wxString fullname = fn.GetFullPath();
- m_MessageWindow->SetFileName( fullname );
- }
-
- m_MessageWindow->SetPrintInfo( false ); // Suppress the "Info: " prefix
+ m_MessageWindow->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
finishDialogSettings();
}
diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp
index 3e3066b648..830ab97aa1 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints.cpp
+++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp
@@ -146,6 +146,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
m_reset3DModels->SetValue( g_reset3DModels[ m_updateMode ? 0 : 1 ] );
m_MessageWindow->SetLazyUpdate( true );
+ m_MessageWindow->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
// DIALOG_SHIM needs a unique hash_key because classname is not sufficient
// because the update and change versions of this dialog have different controls.
diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp
index 5b3d1a9b70..9608804cf2 100644
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@@ -83,6 +83,8 @@ DIALOG_EXPORT_SVG::DIALOG_EXPORT_SVG( PCB_EDIT_FRAME* aParent, BOARD* aBoard ) :
{
m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) );
+ m_messagesPanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
+
initDialog();
// We use a sdbSizer to get platform-dependent ordering of the action buttons, but
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index 2bd21a5b21..a386d8b5bb 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -80,6 +80,7 @@ DIALOG_NETLIST::DIALOG_NETLIST( PCB_EDIT_FRAME* aParent, wxString& aNetlistFullF
m_MessageWindow->SetLabel( _("Changes To Be Applied") );
m_MessageWindow->SetVisibleSeverities( cfg->m_NetlistDialog.report_filter );
+ m_MessageWindow->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
// We use a sdbSizer to get platform-dependent ordering of the action buttons, but
// that requires us to correct the button labels here.
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 7b2d5d0374..ff325a304d 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -54,6 +54,8 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
m_plotOpts = aParent->GetPlotSettings();
m_DRCWarningTemplate = m_DRCExclusionsWarning->GetLabel();
+ m_messagesPanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
+
init_Dialog();
// We use a sdbSizer to get platform-dependent ordering of the action buttons, but
diff --git a/pcbnew/dialogs/dialog_update_pcb.cpp b/pcbnew/dialogs/dialog_update_pcb.cpp
index 9f71f7bb41..f0e87b63bd 100644
--- a/pcbnew/dialogs/dialog_update_pcb.cpp
+++ b/pcbnew/dialogs/dialog_update_pcb.cpp
@@ -51,6 +51,7 @@ DIALOG_UPDATE_PCB::DIALOG_UPDATE_PCB( PCB_EDIT_FRAME* aParent, NETLIST* aNetlist
m_cbWarnNoNetPad->SetValue( m_warnForNoNetPads );
m_messagePanel->SetLabel( _("Changes To Be Applied") );
+ m_messagePanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
m_messagePanel->SetLazyUpdate( true );
m_netlist->SortByReference();
diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp
index 1f15941fd2..bed63549db 100644
--- a/pcbnew/exporters/gen_footprints_placefile.cpp
+++ b/pcbnew/exporters/gen_footprints_placefile.cpp
@@ -57,6 +57,7 @@ public:
m_parent( aParent ),
m_plotOpts( aParent->GetPlotSettings() )
{
+ m_messagesPanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );
m_reporter = &m_messagesPanel->Reporter();
initDialog();