Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
47bfe663
Commit
47bfe663
authored
Feb 26, 2010
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Setting a new language now update the layer manager.
parent
1661d6d4
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
426 additions
and
324 deletions
+426
-324
basicframe.cpp
common/basicframe.cpp
+17
-0
build_version.cpp
common/build_version.cpp
+2
-2
drawframe.cpp
common/drawframe.cpp
+5
-9
cvframe.cpp
cvpcb/cvframe.cpp
+4
-6
class_gerbview_layer_widget.cpp
gerbview/class_gerbview_layer_widget.cpp
+14
-0
class_gerbview_layer_widget.h
gerbview/class_gerbview_layer_widget.h
+5
-0
gerberframe.cpp
gerbview/gerberframe.cpp
+16
-3
wxGerberFrame.h
gerbview/wxGerberFrame.h
+5
-0
wxPcbStruct.h
include/wxPcbStruct.h
+6
-0
wxstruct.h
include/wxstruct.h
+11
-2
kicad.mo
internat/fr/kicad.mo
+0
-0
kicad.po
internat/fr/kicad.po
+308
-299
class_pcb_layer_widget.cpp
pcbnew/class_pcb_layer_widget.cpp
+13
-0
class_pcb_layer_widget.h
pcbnew/class_pcb_layer_widget.h
+5
-0
pcbframe.cpp
pcbnew/pcbframe.cpp
+13
-1
version.txt
version.txt
+2
-2
No files found.
common/basicframe.cpp
View file @
47bfe663
...
@@ -77,6 +77,23 @@ void WinEDA_BasicFrame::ReCreateMenuBar()
...
@@ -77,6 +77,23 @@ void WinEDA_BasicFrame::ReCreateMenuBar()
}
}
/** Vitual function SetLanguage
* called on a language menu selection
* when using a derived function, do not forget to call this one
*/
void
WinEDA_BasicFrame
::
SetLanguage
(
wxCommandEvent
&
event
)
{
int
id
=
event
.
GetId
();
wxGetApp
().
SetLanguageIdentifier
(
id
);
if
(
wxGetApp
().
SetLanguage
()
)
{
wxLogDebug
(
wxT
(
"Recreating menu bar due to language change."
)
);
ReCreateMenuBar
();
Refresh
();
}
}
/**
/**
* Load common frame parameters from configuration.
* Load common frame parameters from configuration.
...
...
common/build_version.cpp
View file @
47bfe663
...
@@ -6,10 +6,10 @@
...
@@ -6,10 +6,10 @@
#endif
#endif
#ifndef KICAD_BUILD_VERSION
#ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2010-02-2
1
)"
#define KICAD_BUILD_VERSION "(2010-02-2
6
)"
#endif
#endif
#define VERSION_STABILITY "RC
4
"
#define VERSION_STABILITY "RC
5
"
/** Function GetBuildVersion()
/** Function GetBuildVersion()
* Return the build date and version
* Return the build date and version
...
...
common/drawframe.cpp
View file @
47bfe663
...
@@ -533,17 +533,13 @@ void WinEDA_DrawFrame::AdjustScrollBars()
...
@@ -533,17 +533,13 @@ void WinEDA_DrawFrame::AdjustScrollBars()
}
}
/** function SetLanguage
* called on a language menu selection
* when using a derived function, do not forget to call this one
*/
void
WinEDA_DrawFrame
::
SetLanguage
(
wxCommandEvent
&
event
)
void
WinEDA_DrawFrame
::
SetLanguage
(
wxCommandEvent
&
event
)
{
{
int
id
=
event
.
GetId
();
WinEDA_BasicFrame
::
SetLanguage
(
event
);
wxGetApp
().
SetLanguageIdentifier
(
id
);
if
(
wxGetApp
().
SetLanguage
()
)
{
wxLogDebug
(
wxT
(
"Recreating menu bar due to language change."
)
);
ReCreateMenuBar
();
Refresh
();
}
}
}
/**
/**
...
...
cvpcb/cvframe.cpp
View file @
47bfe663
...
@@ -506,14 +506,12 @@ void WinEDA_CvpcbFrame::DisplayModule( wxCommandEvent& event )
...
@@ -506,14 +506,12 @@ void WinEDA_CvpcbFrame::DisplayModule( wxCommandEvent& event )
}
}
/** Vitual function SetLanguage
* called on a language menu selection
*/
void
WinEDA_CvpcbFrame
::
SetLanguage
(
wxCommandEvent
&
event
)
void
WinEDA_CvpcbFrame
::
SetLanguage
(
wxCommandEvent
&
event
)
{
{
int
id
=
event
.
GetId
();
WinEDA_BasicFrame
::
SetLanguage
(
event
);
wxGetApp
().
SetLanguageIdentifier
(
id
);
wxGetApp
().
SetLanguage
();
ReCreateMenuBar
();
Refresh
();
}
}
...
...
gerbview/class_gerbview_layer_widget.cpp
View file @
47bfe663
...
@@ -76,6 +76,9 @@ GERBER_LAYER_WIDGET::GERBER_LAYER_WIDGET( WinEDA_GerberFrame* aParent, wxWindow*
...
@@ -76,6 +76,9 @@ GERBER_LAYER_WIDGET::GERBER_LAYER_WIDGET( WinEDA_GerberFrame* aParent, wxWindow*
}
}
AppendRenderRows
(
renderRows
,
DIM
(
renderRows
)
);
AppendRenderRows
(
renderRows
,
DIM
(
renderRows
)
);
// Update default tabs labels for gerbview
SetLayersManagerTabsText
(
);
//-----<Popup menu>-------------------------------------------------
//-----<Popup menu>-------------------------------------------------
// handle the popup menu over the layer window.
// handle the popup menu over the layer window.
...
@@ -91,6 +94,16 @@ GERBER_LAYER_WIDGET::GERBER_LAYER_WIDGET( WinEDA_GerberFrame* aParent, wxWindow*
...
@@ -91,6 +94,16 @@ GERBER_LAYER_WIDGET::GERBER_LAYER_WIDGET( WinEDA_GerberFrame* aParent, wxWindow*
// using installRightLayerClickHandler
// using installRightLayerClickHandler
}
}
/** Function SetLayersManagerTabsText
* Update the layer manager tabs labels
* Useful when changing Language or to set labels to a non default value
*/
void
GERBER_LAYER_WIDGET
::
SetLayersManagerTabsText
(
)
{
m_notebook
->
SetPageText
(
0
,
_
(
"Layer"
)
);
m_notebook
->
SetPageText
(
1
,
_
(
"Render"
)
);
}
void
GERBER_LAYER_WIDGET
::
installRightLayerClickHandler
()
void
GERBER_LAYER_WIDGET
::
installRightLayerClickHandler
()
{
{
...
@@ -175,6 +188,7 @@ void GERBER_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
...
@@ -175,6 +188,7 @@ void GERBER_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
}
}
void
GERBER_LAYER_WIDGET
::
ReFill
()
void
GERBER_LAYER_WIDGET
::
ReFill
()
{
{
BOARD
*
brd
=
myframe
->
GetBoard
();
BOARD
*
brd
=
myframe
->
GetBoard
();
...
...
gerbview/class_gerbview_layer_widget.h
View file @
47bfe663
...
@@ -77,6 +77,11 @@ public:
...
@@ -77,6 +77,11 @@ public:
void
OnLayerVisible
(
int
aLayer
,
bool
isVisible
,
bool
isFinal
);
void
OnLayerVisible
(
int
aLayer
,
bool
isVisible
,
bool
isFinal
);
void
OnRenderColorChange
(
int
aId
,
int
aColor
);
void
OnRenderColorChange
(
int
aId
,
int
aColor
);
void
OnRenderEnable
(
int
aId
,
bool
isEnabled
);
void
OnRenderEnable
(
int
aId
,
bool
isEnabled
);
/** Function SetLayersManagerTabsText
* Update the layer manager tabs labels
* Useful when changing Language or to set labels to a non default value
*/
void
SetLayersManagerTabsText
(
);
//-----</implement LAYER_WIDGET abstract callback functions>----------
//-----</implement LAYER_WIDGET abstract callback functions>----------
};
};
...
...
gerbview/gerberframe.cpp
View file @
47bfe663
...
@@ -182,8 +182,6 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father,
...
@@ -182,8 +182,6 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father,
// LAYER_WIDGET is floatable, but initially docked at far right
// LAYER_WIDGET is floatable, but initially docked at far right
wxAuiPaneInfo
lyrs
;
wxAuiPaneInfo
lyrs
;
lyrs
.
MinSize
(
m_LayersManager
->
GetBestSize
()
);
// updated in ReFillLayerWidget
lyrs
.
BestSize
(
m_LayersManager
->
GetBestSize
()
);
lyrs
.
CloseButton
(
false
);
lyrs
.
CloseButton
(
false
);
lyrs
.
Caption
(
_
(
"Visibles"
)
);
lyrs
.
Caption
(
_
(
"Visibles"
)
);
lyrs
.
IsFloatable
();
lyrs
.
IsFloatable
();
...
@@ -210,9 +208,10 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father,
...
@@ -210,9 +208,10 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father,
m_auimgr
.
AddPane
(
MsgPanel
,
m_auimgr
.
AddPane
(
MsgPanel
,
wxAuiPaneInfo
(
horiz
).
Name
(
wxT
(
"MsgPanel"
)
).
Bottom
()
);
wxAuiPaneInfo
(
horiz
).
Name
(
wxT
(
"MsgPanel"
)
).
Bottom
()
);
ReFillLayerWidget
();
// this is near end because contents establish size
m_auimgr
.
Update
();
m_auimgr
.
Update
();
ReFillLayerWidget
();
// this is near end because contents establish size
}
}
...
@@ -485,3 +484,17 @@ void WinEDA_GerberFrame::syncLayerBox()
...
@@ -485,3 +484,17 @@ void WinEDA_GerberFrame::syncLayerBox()
m_SelLayerBox
->
SetSelection
(
getActiveLayer
()
);
m_SelLayerBox
->
SetSelection
(
getActiveLayer
()
);
}
}
/** function SetLanguage
* called on a language menu selection
* Update Layer manager title and tabs texts
*/
void
WinEDA_GerberFrame
::
SetLanguage
(
wxCommandEvent
&
event
)
{
WinEDA_DrawFrame
::
SetLanguage
(
event
);
m_LayersManager
->
SetLayersManagerTabsText
(
);
wxAuiPaneInfo
&
pane_info
=
m_auimgr
.
GetPane
(
m_LayersManager
);
pane_info
.
Caption
(
_
(
"Visibles"
)
);
m_auimgr
.
Update
();
ReFillLayerWidget
();
}
gerbview/wxGerberFrame.h
View file @
47bfe663
...
@@ -179,6 +179,11 @@ public:
...
@@ -179,6 +179,11 @@ public:
*/
*/
virtual
void
SaveSettings
();
virtual
void
SaveSettings
();
/** function SetLanguage
* called on a language menu selection
*/
virtual
void
SetLanguage
(
wxCommandEvent
&
event
);
void
Process_Special_Functions
(
wxCommandEvent
&
event
);
void
Process_Special_Functions
(
wxCommandEvent
&
event
);
void
RedrawActiveWindow
(
wxDC
*
DC
,
bool
EraseBg
);
void
RedrawActiveWindow
(
wxDC
*
DC
,
bool
EraseBg
);
void
ReCreateHToolbar
();
void
ReCreateHToolbar
();
...
...
include/wxPcbStruct.h
View file @
47bfe663
...
@@ -909,6 +909,12 @@ public:
...
@@ -909,6 +909,12 @@ public:
*/
*/
virtual
void
SaveSettings
();
virtual
void
SaveSettings
();
/** function SetLanguage
* called on a language menu selection
*/
virtual
void
SetLanguage
(
wxCommandEvent
&
event
);
DECLARE_EVENT_TABLE
()
DECLARE_EVENT_TABLE
()
};
};
...
...
include/wxstruct.h
View file @
47bfe663
...
@@ -126,7 +126,11 @@ public:
...
@@ -126,7 +126,11 @@ public:
int
ReadHotkeyConfigFile
(
const
wxString
&
Filename
,
int
ReadHotkeyConfigFile
(
const
wxString
&
Filename
,
struct
Ki_HotkeyInfoSectionDescriptor
*
DescList
,
struct
Ki_HotkeyInfoSectionDescriptor
*
DescList
,
bool
verbose
);
bool
verbose
);
void
SetLanguage
(
wxCommandEvent
&
event
);
/** function SetLanguage
* called on a language menu selection
* when using a derived function, do not forget to call this one
*/
virtual
void
SetLanguage
(
wxCommandEvent
&
event
);
wxString
GetFileFromHistory
(
int
cmdId
,
const
wxString
&
type
);
wxString
GetFileFromHistory
(
int
cmdId
,
const
wxString
&
type
);
void
SetLastProject
(
const
wxString
&
FullFileName
);
void
SetLastProject
(
const
wxString
&
FullFileName
);
...
@@ -230,7 +234,12 @@ public:
...
@@ -230,7 +234,12 @@ public:
void
EraseMsgBox
();
void
EraseMsgBox
();
void
Process_PageSettings
(
wxCommandEvent
&
event
);
void
Process_PageSettings
(
wxCommandEvent
&
event
);
virtual
void
SetToolbars
();
virtual
void
SetToolbars
();
void
SetLanguage
(
wxCommandEvent
&
event
);
/** function SetLanguage
* called on a language menu selection
* when using a derived function, do not forget to call this one
*/
virtual
void
SetLanguage
(
wxCommandEvent
&
event
);
virtual
void
ReCreateHToolbar
()
=
0
;
virtual
void
ReCreateHToolbar
()
=
0
;
virtual
void
ReCreateVToolbar
()
=
0
;
virtual
void
ReCreateVToolbar
()
=
0
;
virtual
void
ReCreateMenuBar
();
virtual
void
ReCreateMenuBar
();
...
...
internat/fr/kicad.mo
View file @
47bfe663
No preview for this file type
internat/fr/kicad.po
View file @
47bfe663
This diff is collapsed.
Click to expand it.
pcbnew/class_pcb_layer_widget.cpp
View file @
47bfe663
...
@@ -99,6 +99,9 @@ PCB_LAYER_WIDGET::PCB_LAYER_WIDGET( WinEDA_PcbFrame* aParent, wxWindow* aFocusOw
...
@@ -99,6 +99,9 @@ PCB_LAYER_WIDGET::PCB_LAYER_WIDGET( WinEDA_PcbFrame* aParent, wxWindow* aFocusOw
AppendRenderRows
(
renderRows
,
DIM
(
renderRows
)
);
AppendRenderRows
(
renderRows
,
DIM
(
renderRows
)
);
// Update default tabs labels for gerbview
SetLayersManagerTabsText
(
);
//-----<Popup menu>-------------------------------------------------
//-----<Popup menu>-------------------------------------------------
// handle the popup menu over the layer window.
// handle the popup menu over the layer window.
m_LayerScrolledWindow
->
Connect
(
wxEVT_RIGHT_DOWN
,
m_LayerScrolledWindow
->
Connect
(
wxEVT_RIGHT_DOWN
,
...
@@ -196,6 +199,16 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
...
@@ -196,6 +199,16 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
}
}
}
}
/** Function SetLayersManagerTabsText
* Update the layer manager tabs labels
* Useful when changing Language or to set labels to a non default value
*/
void
PCB_LAYER_WIDGET
::
SetLayersManagerTabsText
(
)
{
m_notebook
->
SetPageText
(
0
,
_
(
"Layer"
)
);
m_notebook
->
SetPageText
(
1
,
_
(
"Render"
)
);
}
void
PCB_LAYER_WIDGET
::
ReFill
()
void
PCB_LAYER_WIDGET
::
ReFill
()
{
{
...
...
pcbnew/class_pcb_layer_widget.h
View file @
47bfe663
...
@@ -75,6 +75,11 @@ public:
...
@@ -75,6 +75,11 @@ public:
void
OnLayerVisible
(
int
aLayer
,
bool
isVisible
,
bool
isFinal
);
void
OnLayerVisible
(
int
aLayer
,
bool
isVisible
,
bool
isFinal
);
void
OnRenderColorChange
(
int
aId
,
int
aColor
);
void
OnRenderColorChange
(
int
aId
,
int
aColor
);
void
OnRenderEnable
(
int
aId
,
bool
isEnabled
);
void
OnRenderEnable
(
int
aId
,
bool
isEnabled
);
/** Function SetLayersManagerTabsText
* Update the layer manager tabs labels
* Useful when changing Language or to set labels to a non default value
*/
void
SetLayersManagerTabsText
(
);
//-----</implement LAYER_WIDGET abstract callback functions>----------
//-----</implement LAYER_WIDGET abstract callback functions>----------
};
};
...
...
pcbnew/pcbframe.cpp
View file @
47bfe663
...
@@ -128,7 +128,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
...
@@ -128,7 +128,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
WinEDA_PcbFrame
::
Process_Special_Functions
)
WinEDA_PcbFrame
::
Process_Special_Functions
)
EVT_MENU_RANGE
(
ID_LANGUAGE_CHOICE
,
ID_LANGUAGE_CHOICE_END
,
EVT_MENU_RANGE
(
ID_LANGUAGE_CHOICE
,
ID_LANGUAGE_CHOICE_END
,
WinEDA_
Draw
Frame
::
SetLanguage
)
WinEDA_
Pcb
Frame
::
SetLanguage
)
// menu Postprocess
// menu Postprocess
EVT_MENU
(
ID_PCB_GEN_POS_MODULES_FILE
,
WinEDA_PcbFrame
::
GenModulesPosition
)
EVT_MENU
(
ID_PCB_GEN_POS_MODULES_FILE
,
WinEDA_PcbFrame
::
GenModulesPosition
)
...
@@ -617,3 +617,15 @@ void WinEDA_PcbFrame::SetVisibleAlls( )
...
@@ -617,3 +617,15 @@ void WinEDA_PcbFrame::SetVisibleAlls( )
m_Layers
->
SetRenderState
(
ii
,
true
);
m_Layers
->
SetRenderState
(
ii
,
true
);
}
}
/** function SetLanguage
* called on a language menu selection
*/
void
WinEDA_PcbFrame
::
SetLanguage
(
wxCommandEvent
&
event
)
{
WinEDA_DrawFrame
::
SetLanguage
(
event
);
m_Layers
->
SetLayersManagerTabsText
(
);
wxAuiPaneInfo
&
pane_info
=
m_auimgr
.
GetPane
(
m_Layers
);
pane_info
.
Caption
(
_
(
"Visibles"
)
);
m_auimgr
.
Update
();
ReFillLayerWidget
();
}
version.txt
View file @
47bfe663
release version:
release version:
2010 feb 2
1
2010 feb 2
6
files (.zip,.tgz):
files (.zip,.tgz):
kicad-2010-02-2
1-RC4
kicad-2010-02-2
6-RC5
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment