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

Eeschema: Show abbreviated units 

CHANGED: Edit Line Style shows "in" and "mm" instead of full word
This commit is contained in:
Seth Hillbrand 2017-11-16 15:56:41 -08:00 committed by jean-pierre charras
parent a3c4b508f8
commit d24c88f254
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/dialogs/dialog_edit_line_style_base.cpp
View File

@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 4 2017) // C++ code generated with wxFormBuilder (version Oct 30 2017)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_edit_line_style_base.h" #include "dialog_edit_line_style_base.h"

4
eeschema/dialogs/dialog_edit_line_style_base.fbp
View File

@ -44,7 +44,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">DIALOG_EDIT_LINE_STYLE_BASE</property> <property name="name">DIALOG_EDIT_LINE_STYLE_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">417,204</property> <property name="size">298,204</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Line Style</property> <property name="title">Line Style</property>
@ -250,7 +250,7 @@
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="maxlength">0</property> <property name="maxlength">0</property>
<property name="min_size">50,-1</property> <property name="min_size">20,-1</property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size">80,-1</property> <property name="minimum_size">80,-1</property>
<property name="moveable">1</property> <property name="moveable">1</property>

8
eeschema/dialogs/dialog_edit_line_style_base.h
View File

@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 4 2017) // C++ code generated with wxFormBuilder (version Oct 30 2017)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_EDIT_LINE_STYLE_BASE_H__ #ifndef __DIALOG_EDIT_LINE_STYLE_BASE_H__
@ -11,8 +11,6 @@
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
class DIALOG_SHIM;
#include "dialog_shim.h" #include "dialog_shim.h"
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
@ -73,7 +71,7 @@ class DIALOG_EDIT_LINE_STYLE_BASE : public DIALOG_SHIM
public: public:
bool m_isValid; bool m_isValid;
DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Style"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 417,204 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_EDIT_LINE_STYLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Line Style"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 298,204 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_EDIT_LINE_STYLE_BASE(); ~DIALOG_EDIT_LINE_STYLE_BASE();
}; };

2
eeschema/sch_line.cpp
View File

@ -783,7 +783,7 @@ int SCH_EDIT_FRAME::EditLine( SCH_LINE* aLine, bool aRedraw )
return wxID_CANCEL; return wxID_CANCEL;
DIALOG_EDIT_LINE_STYLE dlg( this ); DIALOG_EDIT_LINE_STYLE dlg( this );
wxString units = GetUnitsLabel( g_UserUnit ); wxString units = GetAbbreviatedUnitsLabel( g_UserUnit );
int old_style = aLine->GetLineStyle(); int old_style = aLine->GetLineStyle();
int old_width = aLine->GetPenSize(); int old_width = aLine->GetPenSize();
COLOR4D old_color = aLine->GetLineColor(); COLOR4D old_color = aLine->GetLineColor();