haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

About dialog: small changes. EDA_HOTKEY class: better ctor.

This commit is contained in:
jean-pierre charras 2016-03-29 19:51:53 +02:00
parent 0cd747668f
commit 713e8d93f3
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/dialog_about/AboutDialog_main.cpp
View File

@ -171,31 +171,38 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
description << wxT( "</p>" );
description << wxT( "<p><b><u>" )
<< _( "Contribute to KiCad" )
<< _( "Bug tracker" )
<< wxT( "</u></b>" ); // bold & underlined font caption
// bullet-ed list with some http links
description << wxT( "<ul>" );
description << wxT( "<li>" )
<<HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),
_( "Report bugs if you found any" ) )
<<HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad/+bugs?orderby=-id&start=0" ),
_( "Report or examine bugs" ) )
<< wxT( "</li>" );
description << wxT( "<li>" )
<< HtmlHyperlink( wxT( "https://blueprints.launchpad.net/kicad" ),
_( "File an idea for improvement" ) )
<< wxT( "</li>" );
description << wxT( "<li>" )
<< HtmlHyperlink( wxT( "http://www.kicadlib.org/Kicad_related_links.html" ),
_( "KiCad links to user groups, tutorials and much more" ) )
<< wxT( "</li>" );
description << wxT( "</ul>" );
description << wxT( "</ul></p>" );
description << wxT( "</p>" );
description << wxT( "<p><b><u>" )
<< _( "KiCad user group and community" )
<< wxT( "</u></b>" ); // bold & underlined font caption
description << wxT( "<ul>" );
description << wxT( "<li>" )
<< HtmlHyperlink( wxT( "https://groups.yahoo.com/neo/groups/kicad-users/info" ),
_( "KiCad user group" ) )
<< wxT( "</li>" );
description << wxT( "<li>" )
<< HtmlHyperlink( wxT( "https://forum.kicad.info" ),
_( "KiCad forum" ) )
<< wxT( "</li>" );
description << wxT( "</ul></p>" );
info.SetDescription( description );
/* License information also HTML formatted */
// License information also HTML formatted:
wxString license;
license
<< wxT( "<div align='center'>" )

16
common/hotkeys_basic.cpp
View File

@ -56,23 +56,15 @@ wxString g_CommonSectionTag( wxT( "[common]" ) );
*/
EDA_HOTKEY::EDA_HOTKEY( const wxChar* infomsg, int idcommand, int keycode, int idmenuevent ) :
m_DefaultKeyCode( keycode ) // initialize DefaultKeyCode
m_defaultKeyCode( keycode ), m_KeyCode( keycode ), m_InfoMsg( infomsg ),
m_Idcommand( idcommand ), m_IdMenuEvent( idmenuevent )
{
m_KeyCode = keycode; // Key code (ascii value for ascii keys
// or wxWidgets code for function key
m_InfoMsg = infomsg; // info message.
m_Idcommand = idcommand; // internal id for the corresponding
// command (see hotkey_id_commnand list)
m_IdMenuEvent = idmenuevent; // id to call the corresponding event
// (if any) (see id.h)
}
EDA_HOTKEY::EDA_HOTKEY( const EDA_HOTKEY* base ) :
m_DefaultKeyCode( base->m_DefaultKeyCode ) // initialize DefaultKeyCode
EDA_HOTKEY::EDA_HOTKEY( const EDA_HOTKEY* base )
{
m_defaultKeyCode = base->m_defaultKeyCode; // initialize default key code
m_KeyCode = base->m_KeyCode;
m_InfoMsg = base->m_InfoMsg;
m_Idcommand = base->m_Idcommand;

5
include/hotkeys_basic.h
View File

@ -57,7 +57,8 @@ extern wxString g_CommonSectionTag;
class EDA_HOTKEY
{
private:
const int m_DefaultKeyCode; // Key code assigned upon object construction, to be used as default value
int m_defaultKeyCode; // Key code assigned upon object construction, to be used as default value
public:
int m_KeyCode; // Key code (ascii value for ascii keys or wxWidgets code for function key
wxString m_InfoMsg; // info message.
@ -67,7 +68,7 @@ public:
public:
EDA_HOTKEY( const wxChar* infomsg, int idcommand, int keycode, int idmenuevent = 0 );
EDA_HOTKEY( const EDA_HOTKEY* base);
void ResetKeyCodeToDefault() { m_KeyCode = m_DefaultKeyCode; }
void ResetKeyCodeToDefault() { m_KeyCode = m_defaultKeyCode; }
};