Cosmetic UI changes mostly for Mac OS X, see CHANGELOG.txt

This commit is contained in:
Jerry Jacobs 2012-05-05 18:02:09 +02:00
parent 173c93969d
commit 5f5c504288
10 changed files with 43 additions and 15 deletions

View File

@ -4,6 +4,14 @@ KiCad ChangeLog 2012
Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with
email address. email address.
2012-May-5 UPDATE Jerry Jacobs <jerry@xor-gate.org>
================================================================================
++ 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 <dick@softplc.com> 2012-Mar-11 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================ ================================================================================
++pcbnew ++pcbnew

View File

@ -59,7 +59,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) ); info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) );
/* Copyright information */ /* Copyright information */
info.SetCopyright( wxT( "(C) 1992-2011 KiCad Developers Team" ) ); info.SetCopyright( wxT( "(C) 1992-2012 KiCad Developers Team" ) );
/* KiCad build version */ /* KiCad build version */
wxString version; wxString version;

View File

@ -58,7 +58,7 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS
bSizer1->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); 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 = 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 ); bSizer1->Add( m_auiNotebook, 2, wxEXPAND | wxALL, 5 );

View File

@ -37,7 +37,7 @@
<property name="minimum_size">-1,-1</property> <property name="minimum_size">-1,-1</property>
<property name="name">dialog_about_base</property> <property name="name">dialog_about_base</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">510,434</property> <property name="size">750,450</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="title">About...</property> <property name="title">About...</property>
@ -472,7 +472,7 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size">550,300</property> <property name="minimum_size">750,350</property>
<property name="name">m_auiNotebook</property> <property name="name">m_auiNotebook</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>

View File

@ -53,7 +53,7 @@ class dialog_about_base : public wxDialog
public: 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(); ~dialog_about_base();
}; };

View File

@ -335,7 +335,7 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId )
/* Init parameters for configuration */ /* Init parameters for configuration */
SetVendorName( wxT( "KiCad" ) ); SetVendorName( wxT( "KiCad" ) );
SetAppName( aName.Lower() ); SetAppName( aName );
SetTitle( aName ); SetTitle( aName );
m_settings = new wxConfig(); m_settings = new wxConfig();
wxASSERT( m_settings != NULL ); wxASSERT( m_settings != NULL );

View File

@ -103,27 +103,47 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
bool zoom_at_cursor = false; bool zoom_at_cursor = false;
BASE_SCREEN* screen = GetScreen(); BASE_SCREEN* screen = GetScreen();
wxPoint center = screen->GetScrollCenterPosition(); wxPoint center = screen->GetScrollCenterPosition();
wxPoint zoom_center = center;
double zoom = screen->GetZoom();
switch( id ) switch( id )
{ {
case ID_POPUP_ZOOM_IN: case ID_POPUP_ZOOM_IN:
zoom_at_cursor = true; zoom_at_cursor = true;
center = screen->GetCrossHairPosition(); zoom_center = screen->GetCrossHairPosition();
// fall thru // fall thru
case ID_ZOOM_IN: case ID_ZOOM_IN:
if( screen->SetPreviousZoom() ) if( screen->SetPreviousZoom() ) {
RedrawScreen( center, zoom_at_cursor ); 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; break;
case ID_POPUP_ZOOM_OUT: case ID_POPUP_ZOOM_OUT:
zoom_at_cursor = true; zoom_at_cursor = true;
center = screen->GetCrossHairPosition(); zoom_center = screen->GetCrossHairPosition();
// fall thru // fall thru
case ID_ZOOM_OUT: case ID_ZOOM_OUT:
if( screen->SetNextZoom() ) if( screen->SetNextZoom() ) {
RedrawScreen( center, zoom_at_cursor ); 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; break;
case ID_ZOOM_REDRAW: case ID_ZOOM_REDRAW:

View File

@ -73,7 +73,7 @@ bool EDA_APP::OnInit()
wxString message; wxString message;
CVPCB_MAINFRAME* frame = NULL; CVPCB_MAINFRAME* frame = NULL;
InitEDA_Appl( wxT( "CvPcb" ), APP_CVPCB_T ); InitEDA_Appl( wxT( "CvPCB" ), APP_CVPCB_T );
if( m_Checker && m_Checker->IsAnotherRunning() ) if( m_Checker && m_Checker->IsAnotherRunning() )
{ {

View File

@ -124,7 +124,7 @@ bool EDA_APP::OnInit()
wxFileName filename; wxFileName filename;
SCH_EDIT_FRAME* frame = NULL; 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() ) if( m_Checker && m_Checker->IsAnotherRunning() )
{ {

View File

@ -102,7 +102,7 @@ bool EDA_APP::OnInit()
wxFileName fn; wxFileName fn;
PCB_EDIT_FRAME* frame = NULL; 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() ) if( m_Checker && m_Checker->IsAnotherRunning() )
{ {