From - Tue Jul 20 16:12:53 2010 X-Mozilla-Status: 0001 X-Mozilla-Status2: 00800000 X-Mozilla-Keys: Message-ID: <4C461143.4090601@softplc.com> Date: Tue, 20 Jul 2010 16:12:35 -0500 From: Dick Hollenbeck User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100528 Thunderbird/3.0.5 MIME-Version: 1.0 To: merge@code.launchpad.net, 'Dick Hollenbeck' Subject: long eeschema titles X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigBBA799E93CA0C13E7014B319" This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigBBA799E93CA0C13E7014B319 Content-Type: multipart/mixed; boundary="------------030907010307000307020808" This is a multi-part message in MIME format. --------------030907010307000307020808 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --------------030907010307000307020808 Content-Type: text/plain; name="fulltitle.bundle" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="fulltitle.bundle" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dick@softplc.com-20100720201533-5lwswb5vdwwto45o # target_branch: bzr+ssh://bazaar.launchpad.net/~kicad-testing-\ # committers/kicad/testing/ # testament_sha1: f8a1aac33eb0af0a30ae15fde453e8fa8c9cd432 # timestamp: 2010-07-20 15:18:12 -0500 # base_revision_id: dick@softplc.com-20100720170511-blrm6ryf1r9c01qj #=20 # Begin patch =3D=3D=3D modified file 'common/common.cpp' --- common/common.cpp 2010-07-13 13:18:13 +0000 +++ common/common.cpp 2010-07-20 20:15:33 +0000 @@ -72,6 +72,7 @@ =20 wxString g_ProductName =3D wxT( "KiCad E.D.A. " ); bool g_ShowPageLimits =3D true; +bool g_TitleFullPath =3D true; wxString g_UserLibDirBuffer; int g_DebugLevel; int g_MouseOldButtons; =3D=3D=3D modified file 'common/edaappl.cpp' --- common/edaappl.cpp 2010-02-28 13:44:29 +0000 +++ common/edaappl.cpp 2010-07-20 20:15:33 +0000 @@ -618,6 +618,7 @@ m_fileHistory.Load( *m_EDA_Config ); =20 m_EDA_Config->Read( wxT( "ShowPageLimits" ), &g_ShowPageLimits ); + m_EDA_Config->Read( wxT( "TitleFullPath" ), &g_TitleFullPath ); =20 if( aReopenLastUsedDirectory ) { @@ -640,6 +641,7 @@ { wxASSERT( m_EDA_Config !=3D NULL ); m_EDA_Config->Write( wxT( "ShowPageLimits" ), g_ShowPageLimits ); + m_EDA_Config->Write( wxT( "TitleFullPath" ), g_TitleFullPath ); m_EDA_Config->Write( wxT( "WorkingDir" ), wxGetCwd() ); m_EDA_Config->Write( wxT( "BgColor" ), g_DrawBgColor ); =20 =3D=3D=3D modified file 'eeschema/dialog_eeschema_options.h' --- eeschema/dialog_eeschema_options.h 2010-06-17 16:30:10 +0000 +++ eeschema/dialog_eeschema_options.h 2010-07-20 20:15:33 +0000 @@ -92,6 +92,15 @@ return m_checkPageLimits->GetValue(); } =20 + void SetTitleFullPath( bool show ) + { + m_checkTitleFullPath->SetValue( show ); + } + bool GetTitleFullPath( void ) + { + return m_checkTitleFullPath->GetValue(); + } + =20 /** Set the field \a aNdx textctrl to \a aName */ void SetFieldName( int aNdx, wxString aName); =3D=3D=3D modified file 'eeschema/dialog_eeschema_options_base.cpp' --- eeschema/dialog_eeschema_options_base.cpp 2010-06-17 16:30:10 +0000 +++ eeschema/dialog_eeschema_options_base.cpp 2010-07-20 20:15:33 +0000 @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////= /// -// C++ code generated with wxFormBuilder (version Dec 21 2009) +// C++ code generated with wxFormBuilder (version Apr 17 2008) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -124,20 +124,29 @@ bSizer2 =3D new wxBoxSizer( wxVERTICAL ); =09 m_checkShowGrid =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid")= , wxDefaultPosition, wxDefaultSize, 0 ); +=09 bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 ); =09 m_checkShowHiddenPins =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show h= i&dden pins"), wxDefaultPosition, wxDefaultSize, 0 ); +=09 bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 ); =09 m_checkAutoPan =3D new wxCheckBox( m_panel1, wxID_ANY, _("Enable automa= tic &panning"), wxDefaultPosition, wxDefaultSize, 0 ); +=09 bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 ); =09 m_checkHVOrientation =3D new wxCheckBox( m_panel1, wxID_ANY, _("Allow b= uses and wires to be placed in H or V &orientation only"), wxDefaultPosit= ion, wxDefaultSize, 0 ); +=09 bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 ); =09 m_checkPageLimits =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age= limits"), wxDefaultPosition, wxDefaultSize, 0 ); +=09 bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 ); =09 + m_checkTitleFullPath =3D new wxCheckBox( m_panel1, wxID_ANY, _("Show pr= oject full path in title"), wxDefaultPosition, wxDefaultSize, 0 ); +=09 + bSizer2->Add( m_checkTitleFullPath, 0, wxALL|wxEXPAND, 3 ); +=09 bSizer3->Add( bSizer2, 0, wxEXPAND, 0 ); =09 =09 =3D=3D=3D modified file 'eeschema/dialog_eeschema_options_base.fbp' --- eeschema/dialog_eeschema_options_base.fbp 2010-06-17 16:30:10 +0000 +++ eeschema/dialog_eeschema_options_base.fbp 2010-07-20 20:15:33 +0000 @@ -7,7 +7,6 @@ 1 UTF-8 table - impl_virtual dialog_eeschema_options_base 1000 none @@ -19,7 +18,7 @@ 1 1 0 - + wxBOTH @@ -38,10 +37,6 @@ Schematic Editor Options= - - wxFILTER_NONE - wxDefaultValidator - @@ -111,10 +106,6 @@ - <= /property> - wxFIL= TER_NONE - wxDefa= ultValidator - @@ -163,10 +154,6 @@ - - wxFILTER_NONE - wxDefaultValidator - <= /property> = wxTAB_TRAVERSAL @@ -245,10 +232,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -300,10 +283,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -365,10 +344,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -420,10 +395,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -475,10 +446,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -530,10 +497,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -587,10 +550,6 @@ wxSP_ARROW_KEYS|wxSP_WRAP - - wxFILTER_NONE - wxDefaultValidator - @@ -644,10 +603,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -699,10 +654,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -756,10 +707,6 @@ wxSP_ARROW_KEYS|wxSP_WRAP - - wxFILTER_NONE - wxDefaultValidator - @@ -813,10 +760,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -868,10 +811,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -925,10 +864,6 @@ wxSP_ARROW_KEYS|wxSP_WRAP - - wxFILTER_NONE - wxDefaultValidator - @@ -982,10 +917,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1037,10 +968,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1094,10 +1021,6 @@ wxSP_ARROW_KEYS|wxSP_WRAP - - wxFILTER_NONE - wxDefaultValidator - @@ -1151,10 +1074,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1206,10 +1125,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1263,10 +1178,6 @@ wxSP_ARROW_KEYS|wxSP_WRAP - - wxFILTER_NONE - wxDefaultValidator - 1 @@ -1342,10 +1253,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1398,10 +1305,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1454,10 +1357,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1510,10 +1409,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1566,10 +1461,58 @@ - - wxFILTER_NONE - wxDefaultValidator - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALL|wxEXPAND + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Show project full path in title + + + m_checkTitleFullPath + protected + + + + + @@ -1636,10 +1579,6 @@ User = defined field names for schematic components. - - wxFILTER_NONE - wxDefaultValidator - <= /property> = wxTAB_TRAVERSAL @@ -1702,10 +1641,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1784,10 +1719,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1839,10 +1770,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1898,10 +1825,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -1953,10 +1876,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2012,10 +1931,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2067,10 +1982,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2126,10 +2037,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2181,10 +2088,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2240,10 +2143,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2295,10 +2194,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2354,10 +2249,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2409,10 +2300,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2468,10 +2355,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2523,10 +2406,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2582,10 +2461,6 @@ - - wxFILTER_NONE - wxDefaultValidator - @@ -2637,10 +2512,6 @@ - - wxFILTER_NONE - wxDefaultValidator - =3D=3D=3D modified file 'eeschema/dialog_eeschema_options_base.h' --- eeschema/dialog_eeschema_options_base.h 2010-06-17 16:30:10 +0000 +++ eeschema/dialog_eeschema_options_base.h 2010-07-20 20:15:33 +0000 @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////= /// -// C++ code generated with wxFormBuilder (version Dec 21 2009) +// C++ code generated with wxFormBuilder (version Apr 17 2008) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -72,6 +72,7 @@ wxCheckBox* m_checkAutoPan; wxCheckBox* m_checkHVOrientation; wxCheckBox* m_checkPageLimits; + wxCheckBox* m_checkTitleFullPath; =09 wxPanel* m_panel2; wxStaticText* m_staticText211; @@ -96,11 +97,10 @@ wxButton* m_sdbSizer1Cancel; =09 // Virtual event handlers, overide them in your derived class - virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); } + virtual void OnChooseUnits( wxCommandEvent& event ){ event.Skip(); } =09 =09 public: - =09 DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id =3D wxID= _ANY, const wxString& title =3D _("Schematic Editor Options"), const wxPo= int& pos =3D wxDefaultPosition, const wxSize& size =3D wxDefaultSize, lon= g style =3D wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EESCHEMA_OPTIONS_BASE(); =09 =3D=3D=3D modified file 'eeschema/eeredraw.cpp' --- eeschema/eeredraw.cpp 2010-03-18 20:35:29 +0000 +++ eeschema/eeredraw.cpp 2010-07-20 20:15:33 +0000 @@ -77,8 +77,16 @@ else { title =3D wxT( "[" ); - title << GetScreen()->m_FileName << wxT( "] " ) << _( "Sheet" )= ; - title << wxT( " " ) << m_CurrentSheet->PathHumanReadable(); + if (g_TitleFullPath) + { + title << GetScreen()->m_FileName << wxT( "] " ) << _( "Shee= t" ); + title << wxT( " " ) << m_CurrentSheet->PathHumanReadable(); + } + else + { + wxFileName t(GetScreen()->m_FileName); + title << t.GetName() << wxT( "] " ) << _( "Sheet" ); + } SetTitle( title ); } } =3D=3D=3D modified file 'eeschema/eeschema_config.cpp' --- eeschema/eeschema_config.cpp 2010-07-14 13:24:36 +0000 +++ eeschema/eeschema_config.cpp 2010-07-20 20:15:33 +0000 @@ -203,6 +203,7 @@ dlg.SetEnableAutoPan( DrawPanel->m_AutoPAN_Enable ); dlg.SetEnableHVBusOrientation( g_HVLines ); dlg.SetShowPageLimits( g_ShowPageLimits ); + dlg.SetTitleFullPath( g_TitleFullPath ); dlg.Layout(); dlg.Fit(); dlg.SetMinSize( dlg.GetSize() ); @@ -235,6 +236,7 @@ DrawPanel->m_AutoPAN_Enable =3D dlg.GetEnableAutoPan(); g_HVLines =3D dlg.GetEnableHVBusOrientation(); g_ShowPageLimits =3D dlg.GetShowPageLimits(); + g_TitleFullPath =3D dlg.GetTitleFullPath(); =20 wxString templateFieldName; =20 =3D=3D=3D modified file 'include/common.h' --- include/common.h 2010-07-13 13:18:13 +0000 +++ include/common.h 2010-07-20 20:15:33 +0000 @@ -160,6 +160,7 @@ extern int g_KeyPressed; =20 extern bool g_ShowPageLimits; // TRUE to display the page limi= ts +extern bool g_TitleFullPath; // TRUE to display full path in = window title =20 /* File name extension definitions. */ extern const wxString ProjectFileExtension; =3D=3D=3D modified file 'pcbnew/dialog_display_options_base.cpp' --- pcbnew/dialog_display_options_base.cpp 2010-03-01 11:25:08 +0000 +++ pcbnew/dialog_display_options_base.cpp 2010-07-20 20:15:33 +0000 @@ -12,139 +12,139 @@ DialogDisplayOptions_base::DialogDisplayOptions_base( wxWindow* parent, = wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& s= ize, long style ) : wxDialog( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); -=09 + wxBoxSizer* bMainSizer; bMainSizer =3D new wxBoxSizer( wxHORIZONTAL ); -=09 + wxStaticBoxSizer* sLeftBoxSizer; sLeftBoxSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY= , _("Tracks and vias:") ), wxVERTICAL ); -=09 + wxString m_OptDisplayTracksChoices[] =3D { _("Sketch"), _("Filled") }; int m_OptDisplayTracksNChoices =3D sizeof( m_OptDisplayTracksChoices ) = / sizeof( wxString ); m_OptDisplayTracks =3D new wxRadioBox( this, wxID_DISPLAY_TRACK, _("Tra= cks:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksNChoices, m_O= ptDisplayTracksChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayTracks->SetSelection( 1 ); m_OptDisplayTracks->SetToolTip( _("Select how tracks are displayed") );= -=09 + sLeftBoxSizer->Add( m_OptDisplayTracks, 0, wxALL|wxEXPAND, 5 ); -=09 + wxString m_OptDisplayTracksClearanceChoices[] =3D { _("Never"), _("New = track"), _("New track with via area"), _("Always") }; int m_OptDisplayTracksClearanceNChoices =3D sizeof( m_OptDisplayTracksC= learanceChoices ) / sizeof( wxString ); m_OptDisplayTracksClearance =3D new wxRadioBox( this, ID_SHOW_CLEARANCE= , _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDis= playTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_= SPECIFY_COLS ); m_OptDisplayTracksClearance->SetSelection( 0 ); m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks cleara= nce area.\nIf New track is selected, track clearance area is shown only = when creating the track.") ); -=09 + sLeftBoxSizer->Add( m_OptDisplayTracksClearance, 0, wxALL|wxEXPAND, 5 )= ; -=09 + wxString m_OptDisplayViaHoleChoices[] =3D { _("Never"), _("Defined hole= s"), _("Always") }; int m_OptDisplayViaHoleNChoices =3D sizeof( m_OptDisplayViaHoleChoices = ) / sizeof( wxString ); m_OptDisplayViaHole =3D new wxRadioBox( this, ID_VIAS_HOLES, _("Show Vi= a Holes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViaHoleNChoices= , m_OptDisplayViaHoleChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayViaHole->SetSelection( 1 ); m_OptDisplayViaHole->SetToolTip( _("Show (or not) via holes.\nIf Define= d Holes is selected, only the non default size holes are shown") ); -=09 + sLeftBoxSizer->Add( m_OptDisplayViaHole, 0, wxALL|wxEXPAND, 5 ); -=09 + bMainSizer->Add( sLeftBoxSizer, 0, wxEXPAND|wxALL, 5 ); -=09 + wxStaticBoxSizer* sbMiddleLeftSizer; sbMiddleLeftSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID= _ANY, _("Net Names:") ), wxVERTICAL ); -=09 + wxString m_ShowNetNamesOptionChoices[] =3D { _("Do not show"), _("On pa= ds"), _("On tracks"), _("On pads and tracks") }; int m_ShowNetNamesOptionNChoices =3D sizeof( m_ShowNetNamesOptionChoice= s ) / sizeof( wxString ); m_ShowNetNamesOption =3D new wxRadioBox( this, wxID_ANY, _("Show Net Na= mes:"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m= _ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS ); m_ShowNetNamesOption->SetSelection( 3 ); m_ShowNetNamesOption->SetToolTip( _("Show or not net names on pads and/= or tracks") ); -=09 + sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL, 5 ); -=09 + bMainSizer->Add( sbMiddleLeftSizer, 0, wxALL|wxEXPAND, 5 ); -=09 + wxStaticBoxSizer* sMiddleRightSizer; sMiddleRightSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID= _ANY, _("Footprints:") ), wxHORIZONTAL ); -=09 + wxBoxSizer* bLModuleSizer; bLModuleSizer =3D new wxBoxSizer( wxVERTICAL ); -=09 + wxString m_OptDisplayModEdgesChoices[] =3D { _("Line"), _("Filled"), _(= "Sketch") }; int m_OptDisplayModEdgesNChoices =3D sizeof( m_OptDisplayModEdgesChoice= s ) / sizeof( wxString ); m_OptDisplayModEdges =3D new wxRadioBox( this, ID_EDGES_MODULES, _("Mod= ule Edges:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModEdgesNChoi= ces, m_OptDisplayModEdgesChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayModEdges->SetSelection( 1 ); bLModuleSizer->Add( m_OptDisplayModEdges, 0, wxALL|wxEXPAND, 5 ); -=09 + wxString m_OptDisplayModTextsChoices[] =3D { _("Line"), _("Filled"), _(= "Sketch") }; int m_OptDisplayModTextsNChoices =3D sizeof( m_OptDisplayModTextsChoice= s ) / sizeof( wxString ); m_OptDisplayModTexts =3D new wxRadioBox( this, ID_TEXT_MODULES, _("Text= s:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModTextsNChoices, m_O= ptDisplayModTextsChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayModTexts->SetSelection( 1 ); bLModuleSizer->Add( m_OptDisplayModTexts, 0, wxALL|wxEXPAND, 5 ); -=09 + sMiddleRightSizer->Add( bLModuleSizer, 0, 0, 5 ); -=09 + wxStaticBoxSizer* bRModuleSizer; bRModuleSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY= , _("Pad Options:") ), wxVERTICAL ); -=09 + wxString m_OptDisplayPadsChoices[] =3D { _("Sketch"), _("Filled") }; int m_OptDisplayPadsNChoices =3D sizeof( m_OptDisplayPadsChoices ) / si= zeof( wxString ); m_OptDisplayPads =3D new wxRadioBox( this, ID_PADS_SHAPES, _("Pad Shape= s:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayPadsNChoices, m_OptDi= splayPadsChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayPads->SetSelection( 1 ); bRModuleSizer->Add( m_OptDisplayPads, 0, wxALL|wxEXPAND, 5 ); -=09 + wxString m_OptDisplayViasChoices[] =3D { _("Sketch"), _("Filled") }; int m_OptDisplayViasNChoices =3D sizeof( m_OptDisplayViasChoices ) / si= zeof( wxString ); m_OptDisplayVias =3D new wxRadioBox( this, ID_VIAS_SHAPES, _("Via Shape= s:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViasNChoices, m_OptDi= splayViasChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayVias->SetSelection( 1 ); bRModuleSizer->Add( m_OptDisplayVias, 0, wxALL|wxEXPAND, 5 ); -=09 + m_OptDisplayPadClearence =3D new wxCheckBox( this, wxID_ANY, _("Show pa= d clearance"), wxDefaultPosition, wxDefaultSize, 0 ); -=09 + bRModuleSizer->Add( m_OptDisplayPadClearence, 0, wxALL, 5 ); -=09 + m_OptDisplayPadNumber =3D new wxCheckBox( this, wxID_ANY, _("Show pad n= umber"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNumber->SetValue(true); -=09 + bRModuleSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); -=09 + m_OptDisplayPadNoConn =3D new wxCheckBox( this, wxID_ANY, _("Show pad N= oConnect"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNoConn->SetValue(true); -=09 + bRModuleSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); -=09 + sMiddleRightSizer->Add( bRModuleSizer, 0, 0, 5 ); -=09 + bMainSizer->Add( sMiddleRightSizer, 0, wxEXPAND|wxALL, 5 ); -=09 + wxBoxSizer* bRightSizer; bRightSizer =3D new wxBoxSizer( wxVERTICAL ); -=09 + wxStaticBoxSizer* sRightUpperSizer; sRightUpperSizer =3D new wxStaticBoxSizer( new wxStaticBox( this, wxID_= ANY, _("Others:") ), wxVERTICAL ); -=09 + wxString m_OptDisplayDrawingsChoices[] =3D { _("Line"), _("Filled"), _(= "Sketch") }; int m_OptDisplayDrawingsNChoices =3D sizeof( m_OptDisplayDrawingsChoice= s ) / sizeof( wxString ); m_OptDisplayDrawings =3D new wxRadioBox( this, wxID_ANY, _("Display oth= er items:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayDrawingsNChoic= es, m_OptDisplayDrawingsChoices, 1, wxRA_SPECIFY_COLS ); m_OptDisplayDrawings->SetSelection( 1 ); sRightUpperSizer->Add( m_OptDisplayDrawings, 0, wxALL|wxEXPAND, 5 ); -=09 + wxString m_Show_Page_LimitsChoices[] =3D { _("Yes"), _("No") }; int m_Show_Page_LimitsNChoices =3D sizeof( m_Show_Page_LimitsChoices ) = / sizeof( wxString ); m_Show_Page_Limits =3D new wxRadioBox( this, wxID_ANY, _("Show page lim= its"), wxDefaultPosition, wxDefaultSize, m_Show_Page_LimitsNChoices, m_Sh= ow_Page_LimitsChoices, 1, wxRA_SPECIFY_COLS ); m_Show_Page_Limits->SetSelection( 0 ); sRightUpperSizer->Add( m_Show_Page_Limits, 0, wxALL|wxEXPAND, 5 ); -=09 + bRightSizer->Add( sRightUpperSizer, 1, wxEXPAND, 5 ); -=09 -=09 + + bRightSizer->Add( 10, 10, 0, 0, 5 ); -=09 + m_buttonOK =3D new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition,= wxDefaultSize, 0 ); bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPA= ND, 5 ); -=09 + m_buttonCANCEL =3D new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefa= ultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wx= EXPAND, 5 ); -=09 + bMainSizer->Add( bRightSizer, 0, wxEXPAND|wxALL, 5 ); -=09 + this->SetSizer( bMainSizer ); this->Layout(); -=09 + // Connect Events m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandle= r( DialogDisplayOptions_base::OnOkClick ), NULL, this ); m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHa= ndler( DialogDisplayOptions_base::OnCancelClick ), NULL, this ); # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbFLglQADRXfgETwU3///= 3/v 3+L////+YBGO+RbPAzz27M153lTTUKqJSqKRpTdqqRtqVCiiKrqzbGG7HHhJITQTCANTGgBT0= JtU /SaJ+qGKeo9TQ0ANqbUwSgmgE1BqT01IyAaAAAABoAAABqeQImqmho9QaGjQAAAyAAAAAASaV= BMS mj1NTT2qPEgNAHqPUDQaADIDQADmE0ZGhoZDCNDIaaNABiMmQDCAYBIkCAECU8FPKemRqT2lP= RPS eptJo0ekNAxNGhoiRYBMkRGxFzIZ+aBlxxBB+rJxDLp0aHT3aC7Dz9YHZFFVC/Vec7dxtqpEZ= VRG vBgYQ/7/b9gxwQGO3dbiG2RkSnt+RTWpJj1QC5mea88GLjNRTKCNOXhaecuQWaRc5OTIY3JyZ= gzi wzRRTXXBwzyaVrbbW24WuAKI4JUWZoLWVBZWsWSfv4zxZZZi3UOxs5BcVibFouKYYKpbSlLaU= b5D JZT5h1zdaVhSvKcc+f8L+PYJILAj7xgJQCF+J3OSuZCRzY5fV4p/74qj9M8yLe6lSQNFThF7/= AjQ IhIsBQikgLIoLAVSXyfGSSc/Tx4dGOPTwenulx5DThbvu/azbfV0Uytt3ObmjJgkl1plCDi6o= sbU RBD0rM6oycG0wqKIJk6gRBwXuqLMtMw7ZDNes3onKBu4u7kUXZaGSgaNpbDCnu2DJqVYm90KL= zd9 3FqiGEmjGRLYIVJqWhvfSrqpjOIcSoUw9O73lsTisY0imiNHesJ1EGMaNDvLOxDG2MKzES6Il= YL2 NyAQymLsGIEFG5gomVrjMsLm2hy0GJW/5q1phmoQ/KOEkc8Zn5nntm0x+hbrgTTEKapZi9oUP= YMX uHp8f9GA9vju4KfGXhGR9+wdywY5Tkp8nSmiMEVWjDv23l7jX65i5UBNJkVQFBBjpt2TOn9U7= Cwh eiZXD7GJTRC7L1J812jjbEuesAhaduqiv8cq379ssyNdsnddSRwwvgyHrIZfXy7AsXniebv8P= Dzx T0f9+n1bbSzMMwmZMNjwaBmC6rUIx/Szy+x8eMWmzbALDSdQ1rk8vaOrXeN9yH5zuki/K2YeI= 3qO wjLByCRTrS/ZAtx8TCEgUhUKmRzgSGTEDGsxJNZXfb/oYe3rK78pbpys8ikG/HEOwZSIW5njB= CZh mGlc5qfWfwKzrLR82/OELnX7vw+7AgD3eoOptckL1IA8AFFAHa/3b3NYX0ILF2wSy0i84Kk4Y= zNe fGsDx+mAAMXjnrR0GZ3ZncgdGFlFAqRjbtsDamEMIjZOI8wFvlec1AxAwC6Z7c9IhZmEjy0h0= IHW ww3WQqEyetBSImqZsycU0YG5BYGqB0V4YYQgKYoevnSSJ1m/2DOeCGIDfaUkJfCpEpAKI+U1I= JKZ tuk4jcgCPAgA8ym0CpsSHXYJqKOwiI76MUdsTFxIiiQTAVQkl0+BIE0OZNClRzBMmZLkjcWxu= N4J KUo0SJtEWaSmwesRFxZ1nPW1p1WlCUUZlXc78JUe4QgBKTiAdjIHhUShu8ZFjIvakIs1mWuwk= VaV NnCAGlfjogCWe6+4ccNMx7pc2RvWGIVDIjS/cSE0MVTsbaSinWYcqUJldWVNGWbt2He7lNtqc= oEd js0c3mSUwaqfWJLkqzLk/gBwys4JP9curAmbnu/NU6uVArsRFA6+YRpqUKLr6KhuUpK/C1sZK= /jV CcaSeC+VtKkqrSRKsSq1aSpLg44chAJgJCdc4AXPC6IhdRoJmJIwdswrdc231oAqE9hWJdaj9= ql0 tMnfU0TndADaJPMYjcxOULH+DUFhTqK+Ga7QPoZx+C227hooQIBI7SqcixcnaB374uCDtdBPC= AIZ MlTidpYY0bGSZ0I7TkcxWMCjHllQ2pz5oGhkL35bLvJVK8KyvOLp2lacosAqjrK0BEcbyuCYY= dCA IFJlG79gcnsAixz1BitbSydx3Fcm/MVEzxl15DSqKsuVq4oAhZ3WzcO/qqIMTcXcDQ3GCAKGt= dUA SsVKng2xNoYm730txqNpWh2JcqwmaIAPdsYLYdSeDQBK60W4dPDfQ3mh8O7MdKQ88dxRUpMg1= c7G vacAFaznFZFoGRdElTKRSZclxqSo+tSjikdJU48dSWJnzbksxG+ls9olLSbo7pk6OK8pvSoxY= v4q ADIBcUkitMoODrZkwOgQAipzwdo6JNdhcrRMDww9tEDzFpTVI0MQd+JgWIOBwJkhmhsdQCvAV= AE9 c3kDddeDsLM4knnzij8GZXhbMtxeabGS5LIaGkSGSDu4HjDQ4UGu8tMxZTW5l8rZeZxLm1g0T= lmR tY22BalDIsadBCALyC2Bgtuo718NNt2RKUa2hFNaKCyVopR5OxLd997gtJ1OwViAhl3WSQp7G= 4sS wMiuJvGXmjNWujotcTN0GO7Mor3YYceFOBTpoEtwLHKSmHwehk4kxmTd2vWEq0oabSdIygBzQ= Arw kq90veVVgWVB5lSCGMmDUFFITRMU3zFijLgqbzvG9EtPsC4GKb0HNyAGUMjU4nOU6EAUNSRvL= HLF acpzizpTXO+pb1e0DUZ2ciLPKJPeKTXn3DNjRyMYxlaY27hsSHuTNFILNYWNhis5qbGCHcU4K= 6bm 3IvxGdCiY8h7iRqbHx5RPMIN6aIdR6Mu1AjGHXdvkkUgE7OiRghWkrov5IA8heXKBQ/EDzAJ2= i/X 1yJPRkevCRhvgXAS+MBelI9+ek2wbgLJlN06tiyRQ5FsGK+UgSojA6hE4CTQpsT7fB+SVylJq= EkR CQSUJCPMhv0MgOYFyDsGQQMGaISO48QAy9h9x7TrOfScpzwUWMii+DYO2ZTjvUdZdp+Zoc2z8= hU4 +XPSr/CMCxkdU/QCRSjhAHqu4UJqqQfo3/Q45o8GjS4v0Jv+Yw+0YoDEzfAqxI/ErskGdvkaW= FSQ teEWIVof2Y0hTp2Id65UHcFX9uJ1hlyo6v0dZoNJ+VRYtRmNaPgluBOF1T0l2vqsYTMzMW5oU= qBv GNitd23CJDEVpdMSPYVEj0hwLj0Y93efaXhkAUJLP6ydf/8B56dDnHDT2Jepl+P37dTSSdSFE= Dvw ORpgahp0m9C4Gvskvq+rzMA/EuyEUwcsIzDDCEqOlO2W8PmXQY0ag2VQXBkkRfME8uIdOJbpq= chS QwGxT0zLeFlS8Ozs7es7TEdpJNnE3cUASjxWGcBbiEplKh5Sc9MpOTH9piB9nUFgMKAIHF5hS= A3W Z3jVEpZ8kRMinXW71u2C40ACjSEjn6gA5lzmhrT0oAxwmgDvGbanSWJEy4j1FkAelIBlCh4Lr= Mss D4CZoaDMzpOnpoZnENvPSPZ8ItvUhBlS9wwQQkRx7wWRSwAb/mBdRcJDQIH8lwDyDGcKSRnHA= 7Tm ePkkElpaJlMZAuxUR4FxsKCY1FBEpiXRKF5zkg1BduZqC23DKXbYjvGYmyuDRCLuweoUGuown= WQe XzCWFBSGQ1qWJUVrPh1nOvEai5hsbGx9qX0kJDER+34EjE7loZqXg8tQKJmnHj7wFv7rQvJ3f= JfI RmUIKuCUfM2mSJHR4yicSOi1AJhECX6yFhIHcbTvuQBEl327MMrFTQ1mwlqQVQAz0DMjhtwEY= iEu OOzEcakogSJuc2ZwitCh9x7OfvsLx3luFADHcPO8hOkZ0Vswyq0uLifuJDpLqHwXM52m8pXcN= cYz vtvleHNiamgssLLC8PBD+QKhVnYtO4vZ1j0YuINg0Oe/c2f73Eys/fpcJBxGtiZNGCJtNyBb2= gyB MkMDApZg8DEobyi6Na42soQC787kIPjzUL5PwTGN693qATdAFYoIWAIBYJG/d+ZVXdz1rUOd5= dlj Lush7LiY5HgczkQOri0Y8vbWYD2rcWECoYrSMRyIj5jKkRx3I2CNSuEMIhBnFtjpVnABwOg+/= TTS d41+F/3v2/XPBJZX7wYlYvXefp2UCqMFAmgcwNxEjh+T8Tgcl+ngub0IH+8t+d6TxJ6UUF/qr= gQG Oc+XLtuSWVID0hrkZbogBpWPlahE//k+r3TJHBHZbT4D0kfgmEattxQZcPbQK8yKFahUG0YOr= 21t 4+Xnr5jUbaEwDHlph0DhCkGUu00RfeB50gZY33dwd9k2IfdH5HqXeDGRw8UsEANIRVmx0CS6l= 3oW U8F0mmgQ5REj3L0kIyQpwDAjltrCUEGwJjKhgTHZZJIJHmEloyQSUMRkqzydDDyWvnC990QkG= +cM AvxxTmSpeonmfEBZ0+ZopJMKgY2J7Gbqe8+Tz1s9rChCD+hHfeuvJWaMj2wIS+OfhsWuvvEmC= uqk OpYQyOxdyOFMBBsfUlWFE9WMA/yQNEkE5XHnygQlMnevfBtJCgGAy6hUiRIl1KcMvcfv0gBjN= Oqy TLUhG0kB8TZgwjPAet5hxBkiLCNbwF1XkdDgZ/EJsnkAHqANKiKoPq04AbTwchYjw3jkwMMJg= Xi/ 5xIqtRSWWRbtDmx0uWMCBeZJcqoVnBgoLvWQD2+y+PdzydNx0PaZxtSfGHhDf2mHmsqRZ3g5t= Xw8 /H0ye/HW7V63iGBMlnV6ZI+BaHiyAVi3hpACMISaxB3rw8SoLG3X+YCgAp+tKS7B9q4A1NxfI= 2D2 5OD8SVOxxQp3kq1v6QN6jFtkFNmKnxnYSPbky5kjIt2fTHetUQctdBWaQLs9wV1tcSG2b4AF9= RgI D31qHzKduLI6ZVk6+aW/E8lfRZyBVkUEg30Qr73xG1zNMXi0chEg+DUx0Qr6nxMQ8dANmHuAC= wTD Yh7tELTDBuQfOArrrR1pflICU4flh3OQs5La56JQJze2uZxTG0McaezkQUEN26Xvwm0ujGYrW= i1B DPulRCiKoqIkltx3HFO1JXW/JMLOiEmHIBc2wlMz2ZwADa6TvQBQlXSAWspb2ALBbQb5dG5E/= lNU fIkDxPWfPjZAGEY/q+7cTOGeh3L6AFpvQL0tAuSiF7yH7noV9Xj5ZzzsSIjDDTLm5eqcBTi1J= kQD AAtYCuAUPZF1jL9Tc5SMicJgRXps2g9IWUrk1udHUAnwwSL4nGICnJlNFQXEKySkQSzlxnOyP= r8g zYS/4u5IpwoSFilwSoA=3D --------------030907010307000307020808-- --------------enigBBA799E93CA0C13E7014B319 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkxGEVEACgkQxCT5S5ALbCSQtgCfVbSNLCWDCaRheE6nIwA6dBpy 7wwAoJVw9D1NwqahB+ydzKnW0gQSzYGX =mVbN -----END PGP SIGNATURE----- --------------enigBBA799E93CA0C13E7014B319--