haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop nagging me about annotating. 

Adds a checkbox to turn off confirmation dialogs.
This commit is contained in:
Jeff Young 2018-02-20 15:39:16 +00:00 committed by Wayne Stambaugh
parent 5159fc5952
commit c47821a689
4 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
eeschema/dialogs/dialog_annotate.cpp
View File

@ -41,7 +41,7 @@
#define KEY_ANNOTATE_SORT_OPTION wxT( "AnnotateSortOption" )
#define KEY_ANNOTATE_ALGO_OPTION wxT( "AnnotateAlgoOption" )
#define KEY_ANNOTATE_KEEP_OPEN_OPTION wxT( "AnnotateKeepOpenOption" )
#define KEY_ANNOTATE_ASK_FOR_CONFIRMATION wxT( "AnnotateRequestConfirmation" )
#define KEY_ANNOTATE_SKIP_CONFIRMATION wxT( "AnnotateSkipConfirmation" )
#define KEY_ANNOTATE_MESSAGES_FILTER wxT( "AnnotateFilterMsg" )
@ -93,9 +93,9 @@ private:
return m_cbKeepDlgOpen->GetValue();
}
bool GetAnnotateAskForConfirmation()
bool GetAnnotateSkipConfirmation()
{
return m_cbAskForConfirmation->GetValue();
return m_cbSkipConfirmation->GetValue();
}
};
@ -129,7 +129,7 @@ DIALOG_ANNOTATE::~DIALOG_ANNOTATE()
m_Config->Write( KEY_ANNOTATE_SORT_OPTION, GetSortOrder() );
m_Config->Write( KEY_ANNOTATE_ALGO_OPTION, GetAnnotateAlgo() );
m_Config->Write( KEY_ANNOTATE_KEEP_OPEN_OPTION, GetAnnotateKeepOpen() );
m_Config->Write( KEY_ANNOTATE_ASK_FOR_CONFIRMATION, GetAnnotateAskForConfirmation() );
m_Config->Write( KEY_ANNOTATE_SKIP_CONFIRMATION, GetAnnotateSkipConfirmation() );
m_Config->Write( KEY_ANNOTATE_MESSAGES_FILTER,
(long) m_MessageWindow->GetVisibleSeverities() );
@ -179,8 +179,8 @@ void DIALOG_ANNOTATE::InitValues()
m_Config->Read( KEY_ANNOTATE_KEEP_OPEN_OPTION, &option, 0L );
m_cbKeepDlgOpen->SetValue( option );
m_Config->Read( KEY_ANNOTATE_ASK_FOR_CONFIRMATION, &option, 1L );
m_cbAskForConfirmation->SetValue( option );
m_Config->Read( KEY_ANNOTATE_SKIP_CONFIRMATION, &option, 0L );
m_cbSkipConfirmation->SetValue( option );
annotate_down_right_bitmap->SetBitmap( KiBitmap( annotate_down_right_xpm ) );
annotate_right_down_bitmap->SetBitmap( KiBitmap( annotate_right_down_xpm ) );
@ -199,34 +199,16 @@ void DIALOG_ANNOTATE::OnApplyClick( wxCommandEvent& event )
int response;
wxString message;
// Display a message info if we always ask for confirmation
// or if a reset of the previous annotation is asked.
bool promptUser = GetAnnotateAskForConfirmation();
if( GetResetItems() )
// Ask for confirmation of destructive actions unless the user asked us not to.
if( GetResetItems() && !GetAnnotateSkipConfirmation() )
{
if( GetLevel() )
message += _( "Clear and annotate all of the symbols on the entire schematic?" );
else
message += _( "Clear and annotate all of the symbols on the current sheet?" );
promptUser = true;
}
else
{
if( GetLevel() )
message += _( "Annotate only the unannotated symbols on the entire schematic?" );
else
message += _( "Annotate only the unannotated symbols on the current sheet?" );
}
message += _( "\n\nThis operation will change the current annotation and cannot be undone." );
message += _( "\n\nThis operation will change the current annotation and cannot be undone." );
if( promptUser )
{
// TODO(hzeller): ideally, this would be a wxMessageDialog that contains
// a checkbox asking the 'ask for confirmation' flag for better
// discoverability (and it should only show in the 'benign' case, so if
// !GetResetItems())
response = wxMessageBox( message, wxT( "" ), wxICON_EXCLAMATION | wxOK | wxCANCEL );
if( response == wxCANCEL )
@ -265,16 +247,19 @@ void DIALOG_ANNOTATE::OnClearAnnotationCmpClick( wxCommandEvent& event )
int response;
wxString message;
if( GetLevel() )
message = _( "Clear the existing annotation for the entire schematic?" );
else
message = _( "Clear the existing annotation for the current sheet?" );
if( !GetAnnotateSkipConfirmation() )
{
if( GetLevel() )
message = _( "Clear the existing annotation for the entire schematic?" );
else
message = _( "Clear the existing annotation for the current sheet?" );
message += _( "\n\nThis operation will clear the existing annotation and cannot be undone." );
response = wxMessageBox( message, wxT( "" ), wxICON_EXCLAMATION | wxOK | wxCANCEL );
message += _( "\n\nThis operation will clear the existing annotation and cannot be undone." );
response = wxMessageBox( message, wxT( "" ), wxICON_EXCLAMATION | wxOK | wxCANCEL );
if( response == wxCANCEL )
return;
if( response == wxCANCEL )
return;
}
m_Parent->DeleteAnnotation( GetLevel() ? false : true );
m_btnClear->Enable( false );

5
eeschema/dialogs/dialog_annotate_base.cpp
View File

@ -133,9 +133,8 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
wxBoxSizer* bSizerChoiceSilentMode;
bSizerChoiceSilentMode = new wxBoxSizer( wxHORIZONTAL );
m_cbAskForConfirmation = new wxCheckBox( this, wxID_ANY, _("Always ask for confirmation"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbAskForConfirmation->SetValue(true);
bSizerChoiceSilentMode->Add( m_cbAskForConfirmation, 0, wxALL, 5 );
m_cbSkipConfirmation = new wxCheckBox( this, wxID_ANY, _("Don't ask for confirmation"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerChoiceSilentMode->Add( m_cbSkipConfirmation, 0, wxALL, 5 );
bSizerChoiceSilentMode->Add( 0, 0, 1, wxEXPAND, 5 );

6
eeschema/dialogs/dialog_annotate_base.fbp
View File

@ -1331,7 +1331,7 @@
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">1</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
@ -1346,7 +1346,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Always ask for confirmation</property>
<property name="label">Don&apos;t ask for confirmation</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -1354,7 +1354,7 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_cbAskForConfirmation</property>
<property name="name">m_cbSkipConfirmation</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>

2
eeschema/dialogs/dialog_annotate_base.h
View File

@ -64,7 +64,7 @@ class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM
wxRadioButton* m_rbSheetX100;
wxRadioButton* m_rbSheetX1000;
wxCheckBox* m_cbKeepDlgOpen;
wxCheckBox* m_cbAskForConfirmation;
wxCheckBox* m_cbSkipConfirmation;
wxButton* m_btnApply;
wxButton* m_btnClear;
wxButton* m_btnClose;