diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5ec349d655..3a510572ad 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,14 @@ KiCad ChangeLog 2012 Please add newer entries at the top, list the date and your name with email address. +2012-May-5 UPDATE Jerry Jacobs +================================================================================ +++ common + * Update about dialog to more native size so the notebook is not squeezed + * Increment copyright year to 2012 + * Fix mousezoom jumping to center for Mac OS X and other platforms + * Remove lowercase application name because Mac OS X menubar was inconsitent + 2012-Mar-11 UPDATE Dick Hollenbeck ================================================================================ ++pcbnew diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 6137148358..24e24c6902 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -59,7 +59,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) ); /* Copyright information */ - info.SetCopyright( wxT( "(C) 1992-2011 KiCad Developers Team" ) ); + info.SetCopyright( wxT( "(C) 1992-2012 KiCad Developers Team" ) ); /* KiCad build version */ wxString version; diff --git a/common/dialog_about/dialog_about_base.cpp b/common/dialog_about/dialog_about_base.cpp index 1f358bea87..6f12b16dda 100644 --- a/common/dialog_about/dialog_about_base.cpp +++ b/common/dialog_about/dialog_about_base.cpp @@ -58,7 +58,7 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS bSizer1->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); m_auiNotebook = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_TAB_FIXED_WIDTH ); - m_auiNotebook->SetMinSize( wxSize( 550,300 ) ); + m_auiNotebook->SetMinSize( wxSize( 750,350 ) ); bSizer1->Add( m_auiNotebook, 2, wxEXPAND | wxALL, 5 ); diff --git a/common/dialog_about/dialog_about_base.fbp b/common/dialog_about/dialog_about_base.fbp index c67f7ee5da..34a5b9b48e 100644 --- a/common/dialog_about/dialog_about_base.fbp +++ b/common/dialog_about/dialog_about_base.fbp @@ -37,7 +37,7 @@ -1,-1 dialog_about_base - 510,434 + 750,450 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP About... @@ -472,7 +472,7 @@ 0 wxID_ANY - 550,300 + 750,350 m_auiNotebook protected diff --git a/common/dialog_about/dialog_about_base.h b/common/dialog_about/dialog_about_base.h index cd61604a03..4250779462 100644 --- a/common/dialog_about/dialog_about_base.h +++ b/common/dialog_about/dialog_about_base.h @@ -53,7 +53,7 @@ class dialog_about_base : public wxDialog public: - dialog_about_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 510,434 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP ); + dialog_about_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 750,350 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP ); ~dialog_about_base(); }; diff --git a/common/edaappl.cpp b/common/edaappl.cpp index d870a08ac7..d8db853d3b 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -335,7 +335,7 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId ) /* Init parameters for configuration */ SetVendorName( wxT( "KiCad" ) ); - SetAppName( aName.Lower() ); + SetAppName( aName ); SetTitle( aName ); m_settings = new wxConfig(); wxASSERT( m_settings != NULL ); diff --git a/common/zoom.cpp b/common/zoom.cpp index dab51a79e3..79b9472d19 100644 --- a/common/zoom.cpp +++ b/common/zoom.cpp @@ -103,27 +103,47 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event ) bool zoom_at_cursor = false; BASE_SCREEN* screen = GetScreen(); wxPoint center = screen->GetScrollCenterPosition(); + wxPoint zoom_center = center; + double zoom = screen->GetZoom(); switch( id ) { case ID_POPUP_ZOOM_IN: zoom_at_cursor = true; - center = screen->GetCrossHairPosition(); + zoom_center = screen->GetCrossHairPosition(); // fall thru case ID_ZOOM_IN: - if( screen->SetPreviousZoom() ) - RedrawScreen( center, zoom_at_cursor ); + if( screen->SetPreviousZoom() ) { + if( zoom_at_cursor ) { + double new_zoom = screen->GetZoom(); + double factor = new_zoom / zoom; + wxPoint delta = center - zoom_center; + center = wxPoint( + zoom_center.x + delta.x * factor, + zoom_center.y + delta.y * factor); + } + RedrawScreen( center, false ); + } break; case ID_POPUP_ZOOM_OUT: zoom_at_cursor = true; - center = screen->GetCrossHairPosition(); + zoom_center = screen->GetCrossHairPosition(); // fall thru case ID_ZOOM_OUT: - if( screen->SetNextZoom() ) - RedrawScreen( center, zoom_at_cursor ); + if( screen->SetNextZoom() ) { + if( zoom_at_cursor ) { + double new_zoom = screen->GetZoom(); + double factor = new_zoom / zoom; + wxPoint delta = center - zoom_center; + center = wxPoint( + zoom_center.x + delta.x * factor, + zoom_center.y + delta.y * factor); + } + RedrawScreen( center, false ); + } break; case ID_ZOOM_REDRAW: diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp index 06b2367234..3f03eba3df 100644 --- a/cvpcb/cvpcb.cpp +++ b/cvpcb/cvpcb.cpp @@ -73,7 +73,7 @@ bool EDA_APP::OnInit() wxString message; CVPCB_MAINFRAME* frame = NULL; - InitEDA_Appl( wxT( "CvPcb" ), APP_CVPCB_T ); + InitEDA_Appl( wxT( "CvPCB" ), APP_CVPCB_T ); if( m_Checker && m_Checker->IsAnotherRunning() ) { diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index e899851990..044bb37fd8 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -124,7 +124,7 @@ bool EDA_APP::OnInit() wxFileName filename; SCH_EDIT_FRAME* frame = NULL; - InitEDA_Appl( wxT( "Eeschema" ), APP_EESCHEMA_T ); + InitEDA_Appl( wxT( "EESchema" ), APP_EESCHEMA_T ); if( m_Checker && m_Checker->IsAnotherRunning() ) { diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index dd3304462e..1a09edde42 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -102,7 +102,7 @@ bool EDA_APP::OnInit() wxFileName fn; PCB_EDIT_FRAME* frame = NULL; - InitEDA_Appl( wxT( "Pcbnew" ), APP_PCBNEW_T ); + InitEDA_Appl( wxT( "PCBNew" ), APP_PCBNEW_T ); if( m_Checker && m_Checker->IsAnotherRunning() ) {