More auto save improvements. (121b65bf) · Commits · Elphel / kicad-source-mirror

common/base_screen.cpp

+34 −23

Original line number	Diff line number	Diff line
		/********************************************************/
		/* base_screen.cpp - BASE_SCREEN object implementation. */
		/********************************************************/
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
		* Copyright (C) 2009 Wayne Stambaugh <stambaughw@verizon.net>
		* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
		*
		* 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, you may find one here:
		* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
		* or you may search the http://www.gnu.org website for the version 2 license,
		* or you may write to the Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
		*/

		#ifdef __GNUG__
		#pragma implementation
		#endif
		/**
		* @file base_screen.cpp
		* @brief BASE_SCREEN object implementation.
		*/

		#include "fctsys.h"
		#include "common.h"
		@@ -19,8 +41,7 @@
		BASE_SCREEN::BASE_SCREEN( KICAD_T aType ) : EDA_ITEM( aType )
		{
		m_drawList = NULL; /* Draw items list */
		m_UndoRedoCountMax = 10; /* undo/Redo command Max depth, 10 is a
		* reasonable value */
		m_UndoRedoCountMax = 10; /* undo/Redo command Max depth, 10 is a reasonable value */
		m_FirstRedraw = TRUE;
		m_ScreenNumber = 1;
		m_NumberOfScreen = 1; /* Hierarchy: Root: ScreenNumber = 1 */
		@@ -61,8 +82,8 @@ void BASE_SCREEN::InitDatas()

		SetCurItem( NULL );

		m_FlagModified = 0; // Set when any change is made on broad
		m_FlagSave = 1; // Used in auto save: set when an auto save is made
		m_FlagModified = false; // Set when any change is made on broad.
		m_FlagSave = false; // Used in auto save set when an auto save is required.
		}


		@@ -450,8 +471,6 @@ void BASE_SCREEN::SetCrossHairPosition( const wxPoint& aPosition, bool aSnapToGr
		}


		/* free the undo and the redo lists
		*/
		void BASE_SCREEN::ClearUndoRedoList()
		{
		ClearUndoORRedoList( m_UndoList );
		@@ -459,9 +478,6 @@ void BASE_SCREEN::ClearUndoRedoList()
		}


		/* Put aNewitem in top of undo list
		* Deletes old items if > count max.
		*/
		void BASE_SCREEN::PushCommandToUndoList( PICKED_ITEMS_LIST* aNewitem )
		{
		m_UndoList.PushCommand( aNewitem );
		@@ -515,13 +531,7 @@ void BASE_SCREEN::InsertItem( EDA_ITEMS::iterator aIter, EDA_ITEM* aItem )


		#if defined(DEBUG)
		/**
		* Function Show
		* is used to output the object tree, currently for debugging only.
		* @param nestLevel An aid to prettier tree indenting, and is the level
		* of nesting of this object within the overall tree.
		* @param os The ostream& to output to.
		*/

		void BASE_SCREEN::Show( int nestLevel, std::ostream& os )
		{
		EDA_ITEM* item = m_drawList;
		@@ -536,4 +546,5 @@ void BASE_SCREEN::Show( int nestLevel, std::ostream& os )

		NestedSpace( nestLevel, os ) << "</" << GetClass().Lower().mb_str() << ">\n";
		}

		#endif

common/basicframe.cpp

+74 −2

Original line number	Diff line number	Diff line
		@@ -49,6 +49,9 @@
		#define DEFAULT_AUTO_SAVE_INTERVAL 600


		const wxChar* traceAutoSave = wxT( "KicadAutoSave" );

		/// Configuration file entry name for auto save interval.
		static const wxChar* entryAutoSaveInterval = wxT( "AutoSaveInterval" );


		@@ -116,15 +119,17 @@ bool EDA_BASE_FRAME::ProcessEvent( wxEvent& aEvent )
		if( !wxFrame::ProcessEvent( aEvent ) )
		return false;

		if( m_hasAutoSave && (m_autoSaveState != isModified()) && (m_autoSaveInterval > 0) )
		if( m_hasAutoSave && (m_autoSaveState != isAutoSaveRequired()) && (m_autoSaveInterval > 0) )
		{
		if( !m_autoSaveState )
		{
		wxLogTrace( traceAutoSave, wxT( "Starting auto save timer." ) );
		m_autoSaveTimer->Start( m_autoSaveInterval * 1000, wxTIMER_ONE_SHOT );
		m_autoSaveState = true;
		}
		else
		else if( m_autoSaveTimer->IsRunning() )
		{
		wxLogTrace( traceAutoSave, wxT( "Stopping auto save timer." ) );
		m_autoSaveTimer->Stop();
		m_autoSaveState = false;
		}
		@@ -569,3 +574,70 @@ bool EDA_BASE_FRAME::IsWritable( const wxFileName& aFileName )

		return true;
		}


		void EDA_BASE_FRAME::CheckForAutoSaveFile( const wxFileName& aFileName,
		const wxString& aBackupFileExtension )
		{
		wxCHECK_RET( aFileName.IsOk(), wxT( "Invalid file name!" ) );
		wxCHECK_RET( !aBackupFileExtension.IsEmpty(), wxT( "Invalid backup file extension!" ) );

		wxFileName autoSaveFileName = aFileName;

		// Check for auto save file.
		autoSaveFileName.SetName( wxT( "$" ) + aFileName.GetName() );

		wxLogTrace( traceAutoSave,
		wxT( "Checking for auto save file " ) + autoSaveFileName.GetFullPath() );

		if( !autoSaveFileName.FileExists() )
		return;

		wxString msg;

		msg.Printf( _( "Well this is potentially embarrassing! It appears that the last time \
		you were editing the file <%s> it was not saved properly. Do you wish to restore the last \
		edits you made?" ),
		GetChars( aFileName.GetFullName() ) );

		int response = wxMessageBox( msg, wxGetApp().GetAppName(), wxYES_NO \| wxICON_QUESTION, this );

		// Make a backup of the current file, delete the file, and rename the auto save file to
		// the file name.
		if( response == wxYES )
		{
		// Get the backup file name.
		wxFileName backupFileName = aFileName;
		backupFileName.SetExt( aBackupFileExtension );

		// If an old backup file exists, delete it. If an old copy of the file exists, rename
		// it to the backup file name
		if( aFileName.FileExists() )
		{
		// Remove the old file backup file.
		if( backupFileName.FileExists() )
		wxRemoveFile( backupFileName.GetFullPath() );

		// Rename the old file to the backup file name.
		if( !wxRenameFile( aFileName.GetFullPath(), backupFileName.GetFullPath() ) )
		{
		msg = _( "Could not create backup file " ) + backupFileName.GetFullPath();
		DisplayError( this, msg );
		}
		}

		if( !wxRenameFile( autoSaveFileName.GetFullPath(), aFileName.GetFullPath() ) )
		{
		wxMessageBox( _( "The auto save file could not be renamed to the board file name." ),
		wxGetApp().GetAppName(), wxOK \| wxICON_EXCLAMATION, this );
		}
		}
		else
		{
		wxLogTrace( traceAutoSave,
		wxT( "Removing auto save file " ) + autoSaveFileName.GetFullPath() );

		// Remove the auto save file when using the previous file as is.
		wxRemoveFile( autoSaveFileName.GetFullPath() );
		}
		}

eeschema/dialogs/dialog_eeschema_options.cpp

+28 −0

Original line number	Diff line number	Diff line
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2009 Wayne Stambaugh <stambaughw@verizon.net>
		* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
		*
		* 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, you may find one here:
		* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
		* or you may search the http://www.gnu.org website for the version 2 license,
		* or you may write to the Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
		*/

		/**
		* @file dialog_eeschema_options.cpp
		*/

		#include "fctsys.h"
		#include "class_base_screen.h"

eeschema/dialogs/dialog_eeschema_options.h

+31 −3

Original line number	Diff line number	Diff line
		#ifndef __dialog_eeschema_options__
		#define __dialog_eeschema_options__
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2009 Wayne Stambaugh <stambaughw@verizon.net>
		* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
		*
		* 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, you may find one here:
		* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
		* or you may search the http://www.gnu.org website for the version 2 license,
		* or you may write to the Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
		*/

		/**
		* @file
		* @file dialog_eeschema_options.h
		*
		* Subclass of DIALOG_EESCHEMA_OPTIONS_BASE, which is generated by wxFormBuilder.
		*/

		#ifndef __dialog_eeschema_options__
		#define __dialog_eeschema_options__

		#include "dialog_eeschema_options_base.h"

		class DIALOG_EESCHEMA_OPTIONS : public DIALOG_EESCHEMA_OPTIONS_BASE
		@@ -56,6 +81,9 @@ public:
		}
		int GetRepeatLabel( void ) { return m_spinRepeatLabel->GetValue(); }

		void SetAutoSaveInterval( int aInterval ) { m_spinAutoSaveInterval->SetValue( aInterval ); }
		int GetAutoSaveInterval() const { return m_spinAutoSaveInterval->GetValue(); }

		void SetShowGrid( bool show ) { m_checkShowGrid->SetValue( show ); }
		bool GetShowGrid( void ) { return m_checkShowGrid->GetValue(); }

eeschema/dialogs/dialog_eeschema_options_base.cpp

+15 −6

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Nov 17 2010)
		// C++ code generated with wxFormBuilder (version Sep 8 2010)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -16,7 +16,6 @@ END_EVENT_TABLE()
		DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
		{
		this->SetSizeHints( wxDefaultSize, wxDefaultSize );
		this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );

		wxBoxSizer* mainSizer;
		mainSizer = new wxBoxSizer( wxVERTICAL );
		@@ -25,9 +24,9 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		bOptionsSizer = new wxBoxSizer( wxVERTICAL );

		m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
		m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
		m_panel1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
		m_notebook1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );

		m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
		wxBoxSizer* p1mainSizer;
		p1mainSizer = new wxBoxSizer( wxHORIZONTAL );

		@@ -35,7 +34,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		bSizer3 = new wxBoxSizer( wxVERTICAL );

		wxFlexGridSizer* fgSizer1;
		fgSizer1 = new wxFlexGridSizer( 7, 3, 0, 0 );
		fgSizer1 = new wxFlexGridSizer( 8, 3, 0, 0 );
		fgSizer1->AddGrowableCol( 0 );
		fgSizer1->AddGrowableCol( 1 );
		fgSizer1->AddGrowableCol( 2 );
		@@ -121,6 +120,17 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx

		fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL\|wxEXPAND, 3 );

		m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save time interval:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText221->Wrap( -1 );
		fgSizer1->Add( m_staticText221, 1, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

		m_spinAutoSaveInterval = new wxSpinCtrl( m_panel1, ID_M_SPINAUTOSAVEINTERVAL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 10 );
		fgSizer1->Add( m_spinAutoSaveInterval, 0, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );

		m_staticText23 = new wxStaticText( m_panel1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText23->Wrap( -1 );
		fgSizer1->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

		bSizer3->Add( fgSizer1, 0, wxALIGN_CENTER\|wxEXPAND, 0 );

		wxBoxSizer* bSizer2;
		@@ -153,7 +163,6 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		p1mainSizer->Fit( m_panel1 );
		m_notebook1->AddPage( m_panel1, _("General Options"), true );
		m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
		m_panel2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
		m_panel2->SetToolTip( _("User defined field names for schematic components. ") );

		wxBoxSizer* bSizer6;

Admin message