Skip to content

K
kicad-source-mirror
Commit 909c2a60 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Dialog exit: better icon. 

Pcbnew:
 * graphic_item_properties_base.fbp * dialog pad edit: make some strings more easier to translate.
 * global pad edition: fix a bug that change pad position instead of pad size (round pas only).
Eeschema:
 * fix a bug: new created wires were not alwaes shows until the screen was redrawn.
parent 672b55fd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11291 additions and 10843 deletions
bitmaps_png/CMakeLists.txt
View file @ 909c2a60
...@@ -510,6 +510,7 @@ set( BMAPS_MID ...@@ -510,6 +510,7 @@ set( BMAPS_MID
# 48 x 48 for now # 48 x 48 for now
set( BMAPS_BIG set( BMAPS_BIG
dialog_warning
icon_3d icon_3d
icon_cvpcb icon_cvpcb
icon_eeschema icon_eeschema
......
bitmaps_png/cpp_48/dialog_warning.cpp 0 → 100644
View file @ 909c2a60
This diff is collapsed.
bitmaps_png/sources/dialog_warning.svg 0 → 100644
View file @ 909c2a60
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="48px"
id="svg7299"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.48.1 "
sodipodi:docname="dialog-warning.svg"
sodipodi:version="0.32"
width="48px"
version="1.1">
<metadata
id="metadata3">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:title />
<dc:description />
<dc:subject>
<rdf:Bag>
<rdf:li>unsorted</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:publisher>
<cc:Agent
rdf:about="http://www.openclipart.org/">
<dc:title>Open Clip Art Library, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors</dc:title>
</cc:Agent>
</dc:publisher>
<dc:creator>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:date />
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:language>en</dc:language>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs7301">
<filter
height="1.8313844"
id="filter11277"
inkscape:collect="always"
width="1.0566853"
x="-0.02834265"
y="-0.4156922">
<feGaussianBlur
id="feGaussianBlur11279"
inkscape:collect="always"
stdDeviation="0.51961525" />
</filter>
<filter
height="3.4941532"
id="filter11267"
inkscape:collect="always"
width="1.1700559"
x="-0.08502795"
y="-1.2470766">
<feGaussianBlur
id="feGaussianBlur11269"
inkscape:collect="always"
stdDeviation="1.5588457" />
</filter>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient11223"
x1="4.1914001"
x2="47.319698"
y1="11.1133"
y2="56.052299">
<stop
id="stop11225"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop11227"
offset="1"
style="stop-color:#ffffff;stop-opacity:0" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.646153,0,-0.00281268,0.671002,2.320937,4.636421)"
gradientUnits="userSpaceOnUse"
id="linearGradient11177"
inkscape:collect="always"
x1="22.858232"
x2="23.075396"
xlink:href="#linearGradient11223"
y1="27.427332"
y2="77.315834" />
<linearGradient
id="linearGradient5252">
<stop
id="stop5256"
offset="0"
style="stop-color:#fed496;stop-opacity:1;" />
<stop
id="stop5254"
offset="1"
style="stop-color:#fcaf3e;stop-opacity:1;" />
</linearGradient>
<radialGradient
cx="21.080828"
cy="27.925562"
fx="21.080828"
fy="27.925562"
gradientTransform="matrix(2.794628,0,0,2.6342217,-37.832243,-46.946604)"
gradientUnits="userSpaceOnUse"
id="radialGradient11221"
inkscape:collect="always"
r="8.803154"
xlink:href="#linearGradient5252" />
<linearGradient
id="linearGradient5402"
inkscape:collect="always">
<stop
id="stop5404"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop5406"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<radialGradient
cx="79.377068"
cy="44.534161"
fx="79.377068"
fy="44.534161"
gradientTransform="matrix(0.5111798,0,0,0.4916103,-18.445765,-11.688203)"
gradientUnits="userSpaceOnUse"
id="radialGradient11181"
inkscape:collect="always"
r="50.66839"
xlink:href="#linearGradient5402" />
</defs>
<sodipodi:namedview
bordercolor="#666666"
borderopacity="1.0"
id="base"
inkscape:current-layer="layer1"
inkscape:cx="24.055179"
inkscape:cy="24.019671"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:window-height="688"
inkscape:window-width="641"
inkscape:window-x="260"
inkscape:window-y="167"
inkscape:zoom="7"
pagecolor="#ffffff"
showgrid="true"
inkscape:window-maximized="0" />
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<rect
height="3"
id="rect11271"
rx="3.25"
ry="1.5"
style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter11277);enable-background:new"
transform="matrix(1,0,0,1.3333333,-296,-80.833333)"
width="44"
x="298"
y="91" />
<rect
height="3"
id="rect11249"
rx="3.25"
ry="1.5"
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter11267);enable-background:new"
transform="matrix(1,0,0,1.5833333,-296,-103.95833)"
width="44"
x="298"
y="91" />
<g
id="g11137"
style="display:inline;enable-background:new"
transform="matrix(1.6642077,0,0,1.7057624,-11.330187,-28.512243)">
<g
id="g11139"
style="display:inline"
transform="matrix(0.01508284,0,0,0.01391344,34.42474,40.95434)" />
<g
id="g11147"
style="display:inline"
transform="matrix(0.01508284,0,0,0.01391344,34.42474,40.95434)" />
<path
d="M 34.661531,40.883147 22.706683,18.443515 c -0.343618,-0.623323 -0.965385,-0.969613 -1.657845,-0.969613 -0.692462,0 -1.317417,0.415547 -1.666257,1.038871 L 7.5167568,40.952406 c -0.2793053,0.554065 -0.282496,1.315904 0.061415,1.869969 0.3439093,0.554065 0.8967188,0.831097 1.5891806,0.831097 l 23.8206686,0 c 0.69246,0 1.317126,-0.34629 1.596433,-0.900356 0.34855,-0.554065 0.35145,-1.246645 0.07708,-1.869969 z"
id="path11155"
inkscape:r_cx="true"
inkscape:r_cy="true"
style="fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:0.63829809;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 12.350235,39.643509 c -0.180686,0.297681 -0.0023,0.535827 0.296738,0.535827 l 16.865083,0 c 0.299028,0 0.47946,-0.238146 0.301316,-0.535827 L 21.328843,23.806857 c -0.178145,-0.297681 -0.417365,-0.297681 -0.538248,0 l -8.44036,15.836652 z"
id="path11157"
inkscape:r_cx="true"
inkscape:r_cy="true"
style="fill:url(#radialGradient11221);fill-opacity:1;fill-rule:nonzero;stroke:none"
inkscape:connector-curvature="0" />
<path
d="M 33.589554,40.372476 22.40647,19.408588 c -0.476278,-0.903101 -0.647108,-1.192852 -1.370915,-1.192852 -0.62253,0 -0.948257,0.421984 -1.398129,1.274438 L 8.5784665,40.437181 c -0.6421717,1.176051 -0.7109747,1.482604 -0.4018775,2.000231 0.3090955,0.517628 0.7059594,0.489435 2.172334,0.5232 l 21.735721,0 c 1.365168,0.01688 1.672683,-0.08716 1.923863,-0.604785 0.313433,-0.517629 0.180116,-0.928304 -0.418953,-1.983351 z"
id="path11159"
inkscape:r_cx="true"
inkscape:r_cy="true"
sodipodi:nodetypes="ccsccscccc"
style="opacity:0.5;fill:none;stroke:url(#linearGradient11177);stroke-width:0.63829821;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<g
id="g11161"
inkscape:r_cx="true"
inkscape:r_cy="true"
style="fill:#121312;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.98018837;stroke-miterlimit:4"
transform="matrix(0.561759,0,0,0.570854,7.608308,17.60115)">
<path
d="m 23.9,36.5 c -1.3,0 -2.3,-1 -2.3,-2.3 0,-1.4 0.9,-2.3 2.3,-2.3 1.4,0 2.2,0.9 2.3,2.3 0,1.3 -0.9,2.3 -2.3,2.3 l 0,0 z M 23.167629,29.066754 21.9,19.1 l 4,0 -1.267629,11.609518 -1.464742,-1.642764 z"
id="path11163"
inkscape:r_cx="true"
inkscape:r_cy="true"
sodipodi:nodetypes="csscccccccc"
style="fill:#121312;fill-opacity:1;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
<path
d="M 23.982235,3.0642796 C 22.983955,3.0642796 22.084515,3.6634646 21.581625,4.5632536 L 6.9499354,32.262453 L 37.310435,25.017218 L 26.371965,4.4600786 C 25.876595,3.5602906 24.980525,3.0642796 23.982235,3.0642796 z"
id="path11179"
style="opacity:0.47126435;fill:url(#radialGradient11181);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.63829809;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;enable-background:new" />
</g>
</svg>
common/confirm.cpp
View file @ 909c2a60
...@@ -17,7 +17,7 @@ public: ...@@ -17,7 +17,7 @@ public:
DIALOG_EXIT( wxWindow * parent, const wxString& aMessage ) : DIALOG_EXIT( wxWindow * parent, const wxString& aMessage ) :
DIALOG_EXIT_BASE( parent ) DIALOG_EXIT_BASE( parent )
{ {
m_bitmap->SetBitmap( KiBitmap( cancel_xpm ) ); m_bitmap->SetBitmap( KiBitmap( dialog_warning_xpm ) );
if( ! aMessage.IsEmpty() ) if( ! aMessage.IsEmpty() )
m_TextInfo->SetLabel( aMessage ); m_TextInfo->SetLabel( aMessage );
GetSizer()->Fit( this ); GetSizer()->Fit( this );
......
eeschema/bus-wire-junction.cpp
View file @ 909c2a60
...@@ -250,7 +250,7 @@ void SCH_EDIT_FRAME::EndSegment( wxDC* DC ) ...@@ -250,7 +250,7 @@ void SCH_EDIT_FRAME::EndSegment( wxDC* DC )
screen->Append( tmp ); screen->Append( tmp );
// Correct and remove segments that need merged. // Correct and remove segments that need merged.
screen->SchematicCleanUp( m_canvas, DC ); screen->SchematicCleanUp( NULL, DC );
// A junction may be needed to connect the last segment. If the last segment was // A junction may be needed to connect the last segment. If the last segment was
// removed by a cleanup, a junction may be needed to connect the segment's end point // removed by a cleanup, a junction may be needed to connect the segment's end point
...@@ -276,7 +276,8 @@ void SCH_EDIT_FRAME::EndSegment( wxDC* DC ) ...@@ -276,7 +276,8 @@ void SCH_EDIT_FRAME::EndSegment( wxDC* DC )
// Now add the new wires and any required junctions to the schematic item list. // Now add the new wires and any required junctions to the schematic item list.
screen->Append( s_wires ); screen->Append( s_wires );
screen->SchematicCleanUp( m_canvas, DC ); screen->SchematicCleanUp( NULL, DC );
m_canvas->Refresh();
// Put the snap shot of the previous wire, buses, and junctions in the undo/redo list. // Put the snap shot of the previous wire, buses, and junctions in the undo/redo list.
PICKED_ITEMS_LIST oldItems; PICKED_ITEMS_LIST oldItems;
......
include/bitmaps.h
View file @ 909c2a60
...@@ -152,6 +152,7 @@ EXTERN_BITMAP( delete_sheet_xpm ) ...@@ -152,6 +152,7 @@ EXTERN_BITMAP( delete_sheet_xpm )
EXTERN_BITMAP( delete_text_xpm ) EXTERN_BITMAP( delete_text_xpm )
EXTERN_BITMAP( delete_track_xpm ) EXTERN_BITMAP( delete_track_xpm )
EXTERN_BITMAP( delete_xpm ) EXTERN_BITMAP( delete_xpm )
EXTERN_BITMAP( dialog_warning_xpm )
EXTERN_BITMAP( directory_xpm ) EXTERN_BITMAP( directory_xpm )
EXTERN_BITMAP( display_options_xpm ) EXTERN_BITMAP( display_options_xpm )
EXTERN_BITMAP( down_xpm ) EXTERN_BITMAP( down_xpm )
......
pcbnew/dialogs/dialog_graphic_item_properties_base.fbp
View file @ 909c2a60
This source diff could not be displayed because it is too large. You can view the blob instead.
pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp
View file @ 909c2a60
...@@ -215,17 +215,21 @@ void DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::OnOkClick( wxCommandEvent& event ) ...@@ -215,17 +215,21 @@ void DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::OnOkClick( wxCommandEvent& event )
wxString msg; wxString msg;
msg = m_Center_StartXCtrl->GetValue(); wxPoint coord;
m_item->SetStartX( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() ));
msg = m_Center_StartXCtrl->GetValue();
coord.x = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
msg = m_Center_StartYCtrl->GetValue(); msg = m_Center_StartYCtrl->GetValue();
m_item->SetStartY( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); coord.y = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
m_item->SetStart( coord );
m_item->SetStart0( coord );
msg = m_EndX_Radius_Ctrl->GetValue(); msg = m_EndX_Radius_Ctrl->GetValue();
m_item->SetEndX( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); coord.x = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
msg = m_EndY_Ctrl->GetValue(); msg = m_EndY_Ctrl->GetValue();
m_item->SetEndY( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); coord.y = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
m_item->SetEnd( coord );
m_item->SetEnd0( coord );
msg = m_ThicknessCtrl->GetValue(); msg = m_ThicknessCtrl->GetValue();
m_item->SetWidth( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); m_item->SetWidth( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() ));
......
pcbnew/dialogs/dialog_graphic_items_options_base.fbp
View file @ 909c2a60
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="10" /> <FileVersion major="1" minor="11" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration" /> <property name="class_decoration" />
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
......
pcbnew/dialogs/dialog_pad_properties_base.h
View file @ 909c2a60
This diff is collapsed.
pcbnew/globaleditpad.cpp
View file @ 909c2a60
...@@ -335,7 +335,11 @@ void PCB_BASE_FRAME::GlobalChange_PadSettings( D_PAD* aPad, ...@@ -335,7 +335,11 @@ void PCB_BASE_FRAME::GlobalChange_PadSettings( D_PAD* aPad,
} }
if( pad->GetShape() == PAD_CIRCLE ) if( pad->GetShape() == PAD_CIRCLE )
pad->SetY( pad->GetSize().x ); {
// Ensure pad size.y = pad size.x
int size = pad->GetSize().x;
pad->SetSize( wxSize( size, size ) );
}
switch( pad->GetAttribute() ) switch( pad->GetAttribute() )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment