Dialog layout and coding policy fixes.

This commit is contained in:
Wayne Stambaugh 2023-11-04 13:57:31 -04:00
parent 32806a3b8b
commit 19e309d2d2
7 changed files with 29 additions and 18 deletions

View File

@ -47,7 +47,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">DIALOG_GRID_SETTINGS_BASE</property> <property name="name">DIALOG_GRID_SETTINGS_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">288,233</property> <property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property> <property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property>
<property name="title">Grid Settings</property> <property name="title">Grid Settings</property>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -82,6 +82,7 @@ DIALOG_GRID_SETTINGS_BASE::DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindow
this->SetSizer( bMainSizer ); this->SetSizer( bMainSizer );
this->Layout(); this->Layout();
bMainSizer->Fit( this );
this->Centre( wxBOTH ); this->Centre( wxBOTH );

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -53,7 +53,7 @@ class DIALOG_GRID_SETTINGS_BASE : public DIALOG_SHIM
public: public:
DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Grid Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 288,233 ), long style = wxDEFAULT_DIALOG_STYLE ); DIALOG_GRID_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Grid Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
~DIALOG_GRID_SETTINGS_BASE(); ~DIALOG_GRID_SETTINGS_BASE();

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -18,12 +18,12 @@ EDA_VIEW_SWITCHER_BASE::EDA_VIEW_SWITCHER_BASE( wxWindow* parent, wxWindowID id,
m_stTitle = new wxStaticText( this, wxID_ANY, _("View Preset Switcher"), wxDefaultPosition, wxDefaultSize, 0 ); m_stTitle = new wxStaticText( this, wxID_ANY, _("View Preset Switcher"), wxDefaultPosition, wxDefaultSize, 0 );
m_stTitle->Wrap( -1 ); m_stTitle->Wrap( -1 );
m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
bSizerMain->Add( m_stTitle, 0, wxALL|wxEXPAND, 5 ); bSizerMain->Add( m_stTitle, 0, wxALL|wxEXPAND, 5 );
m_listBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0|wxBORDER_NONE ); m_listBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0|wxBORDER_NONE );
bSizerMain->Add( m_listBox, 1, wxEXPAND, 5 ); bSizerMain->Add( m_listBox, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
this->SetSizer( bSizerMain ); this->SetSizer( bSizerMain );

View File

@ -124,7 +124,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxListBox" expanded="1"> <object class="wxListBox" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2004-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2004-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -94,7 +94,8 @@ LANGUAGE_DESCR LanguagesList[] =
{ wxLANGUAGE_GREEK, ID_LANGUAGE_GREEK, wxT( "Ελληνικά" ), true }, { wxLANGUAGE_GREEK, ID_LANGUAGE_GREEK, wxT( "Ελληνικά" ), true },
{ wxLANGUAGE_ENGLISH, ID_LANGUAGE_ENGLISH, wxT( "English" ), true }, { wxLANGUAGE_ENGLISH, ID_LANGUAGE_ENGLISH, wxT( "English" ), true },
{ wxLANGUAGE_SPANISH, ID_LANGUAGE_SPANISH, wxT( "Español" ), true }, { wxLANGUAGE_SPANISH, ID_LANGUAGE_SPANISH, wxT( "Español" ), true },
{ wxLANGUAGE_SPANISH_MEXICAN, ID_LANGUAGE_SPANISH_MEXICAN, wxT( "Español (Latinoamericano)" ), true }, { wxLANGUAGE_SPANISH_MEXICAN, ID_LANGUAGE_SPANISH_MEXICAN,
wxT( "Español (Latinoamericano)" ), true },
{ wxLANGUAGE_FRENCH, ID_LANGUAGE_FRENCH, wxT( "Français" ), true }, { wxLANGUAGE_FRENCH, ID_LANGUAGE_FRENCH, wxT( "Français" ), true },
{ wxLANGUAGE_KOREAN, ID_LANGUAGE_KOREAN, wxT( "한국어"), true }, { wxLANGUAGE_KOREAN, ID_LANGUAGE_KOREAN, wxT( "한국어"), true },
{ wxLANGUAGE_ITALIAN, ID_LANGUAGE_ITALIAN, wxT( "Italiano" ), true }, { wxLANGUAGE_ITALIAN, ID_LANGUAGE_ITALIAN, wxT( "Italiano" ), true },
@ -105,7 +106,8 @@ LANGUAGE_DESCR LanguagesList[] =
{ wxLANGUAGE_THAI, ID_LANGUAGE_THAI, wxT( "ภาษาไทย" ), true }, { wxLANGUAGE_THAI, ID_LANGUAGE_THAI, wxT( "ภาษาไทย" ), true },
{ wxLANGUAGE_POLISH, ID_LANGUAGE_POLISH, wxT( "Polski" ), true }, { wxLANGUAGE_POLISH, ID_LANGUAGE_POLISH, wxT( "Polski" ), true },
{ wxLANGUAGE_PORTUGUESE, ID_LANGUAGE_PORTUGUESE, wxT( "Português" ),true }, { wxLANGUAGE_PORTUGUESE, ID_LANGUAGE_PORTUGUESE, wxT( "Português" ),true },
{ wxLANGUAGE_PORTUGUESE_BRAZILIAN, ID_LANGUAGE_PORTUGUESE_BRAZILIAN, wxT( "Português (Brasil)" ), true }, { wxLANGUAGE_PORTUGUESE_BRAZILIAN, ID_LANGUAGE_PORTUGUESE_BRAZILIAN,
wxT( "Português (Brasil)" ), true },
{ wxLANGUAGE_RUSSIAN, ID_LANGUAGE_RUSSIAN, wxT( "Русский" ), true }, { wxLANGUAGE_RUSSIAN, ID_LANGUAGE_RUSSIAN, wxT( "Русский" ), true },
// { wxLANGUAGE_SERBIAN, ID_LANGUAGE_SERBIAN, wxT( "Српски" ), true }, // { wxLANGUAGE_SERBIAN, ID_LANGUAGE_SERBIAN, wxT( "Српски" ), true },
{ wxLANGUAGE_FINNISH, ID_LANGUAGE_FINNISH, wxT( "Suomi" ), true }, { wxLANGUAGE_FINNISH, ID_LANGUAGE_FINNISH, wxT( "Suomi" ), true },
@ -343,7 +345,8 @@ void PGM_BASE::sentryInit()
sentry_options_set_release( options, GetCommitHash().ToStdString().c_str() ); sentry_options_set_release( options, GetCommitHash().ToStdString().c_str() );
// This just gives us more filtering within sentry, issues still get grouped across environments // This just gives us more filtering within sentry, issues still get grouped across
// environments.
sentry_options_set_environment( options, GetMajorMinorVersion().c_str() ); sentry_options_set_environment( options, GetMajorMinorVersion().c_str() );
sentry_init( options ); sentry_init( options );
@ -418,7 +421,8 @@ void PGM_BASE::ShowSplash()
return; return;
m_splash = new WX_SPLASH( KiBitmap( BITMAPS::splash ), wxSPLASH_CENTRE_ON_SCREEN, 0, m_splash = new WX_SPLASH( KiBitmap( BITMAPS::splash ), wxSPLASH_CENTRE_ON_SCREEN, 0,
NULL, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxSTAY_ON_TOP ); NULL, -1, wxDefaultPosition, wxDefaultSize,
wxBORDER_NONE | wxSTAY_ON_TOP );
wxYield(); wxYield();
} }
@ -641,6 +645,7 @@ bool PGM_BASE::SetLanguage( wxString& aErrMsg, bool first_time )
if( first_time ) if( first_time )
{ {
setLanguageId( wxLANGUAGE_DEFAULT ); setLanguageId( wxLANGUAGE_DEFAULT );
// First time SetLanguage is called, the user selected language id is set // First time SetLanguage is called, the user selected language id is set
// from common user config settings // from common user config settings
wxString languageSel = GetCommonSettings()->m_System.language; wxString languageSel = GetCommonSettings()->m_System.language;
@ -827,7 +832,8 @@ bool PGM_BASE::SetLocalEnvVariable( const wxString& aName, const wxString& aValu
if( aName.IsEmpty() ) if( aName.IsEmpty() )
{ {
wxLogTrace( traceEnvVars, wxLogTrace( traceEnvVars,
wxT( "PGM_BASE::SetLocalEnvVariable: Attempt to set empty variable to value %s" ), wxT( "PGM_BASE::SetLocalEnvVariable: Attempt to set empty variable to "
"value %s" ),
aValue ); aValue );
return false; return false;
} }
@ -836,7 +842,8 @@ bool PGM_BASE::SetLocalEnvVariable( const wxString& aName, const wxString& aValu
if( wxGetEnv( aName, &env ) ) if( wxGetEnv( aName, &env ) )
{ {
wxLogTrace( traceEnvVars, wxLogTrace( traceEnvVars,
wxT( "PGM_BASE::SetLocalEnvVariable: Environment variable %s already set to %s" ), wxT( "PGM_BASE::SetLocalEnvVariable: Environment variable %s already set "
"to %s" ),
aName, env ); aName, env );
return env == aValue; return env == aValue;
} }
@ -856,7 +863,8 @@ void PGM_BASE::SetLocalEnvVariables()
for( const std::pair<wxString, ENV_VAR_ITEM> m_local_env_var : GetCommonSettings()->m_Env.vars ) for( const std::pair<wxString, ENV_VAR_ITEM> m_local_env_var : GetCommonSettings()->m_Env.vars )
{ {
wxLogTrace( traceEnvVars, wxLogTrace( traceEnvVars,
wxT( "PGM_BASE::SetLocalEnvVariables: Setting local environment variable %s to %s" ), wxT( "PGM_BASE::SetLocalEnvVariables: Setting local environment variable %s "
"to %s" ),
m_local_env_var.first, m_local_env_var.first,
m_local_env_var.second.GetValue() ); m_local_env_var.second.GetValue() );
wxSetEnv( m_local_env_var.first, m_local_env_var.second.GetValue() ); wxSetEnv( m_local_env_var.first, m_local_env_var.second.GetValue() );
@ -940,6 +948,7 @@ void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& a
const wxString& aCond, const wxString& aMsg ) const wxString& aCond, const wxString& aMsg )
{ {
wxString assertStr; wxString assertStr;
// Log the assertion details to standard log // Log the assertion details to standard log
if( !aMsg.empty() ) if( !aMsg.empty() )
{ {
@ -962,6 +971,7 @@ void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& a
static std::set<SENTRY_ASSERT_CACHE_KEY> assertCache; static std::set<SENTRY_ASSERT_CACHE_KEY> assertCache;
SENTRY_ASSERT_CACHE_KEY key = { aFile, aLine, aFunc, aCond, aMsg }; SENTRY_ASSERT_CACHE_KEY key = { aFile, aLine, aFunc, aCond, aMsg };
if( assertCache.find( key ) == assertCache.end() ) if( assertCache.find( key ) == assertCache.end() )
{ {
sentry_value_t exc = sentry_value_new_exception( "assert", assertStr ); sentry_value_t exc = sentry_value_new_exception( "assert", assertStr );
@ -980,4 +990,4 @@ void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& a
const wxString& PGM_BASE::GetExecutablePath() const const wxString& PGM_BASE::GetExecutablePath() const
{ {
return PATHS::GetExecutablePath(); return PATHS::GetExecutablePath();
} }