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
11919da6
Commit
11919da6
authored
Oct 14, 2014
by
Brian Sidebotham
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Fix issues mainly for windows
parent
37748ad2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
6 deletions
+16
-6
dialog_eeschema_options.cpp
eeschema/dialogs/dialog_eeschema_options.cpp
+14
-4
dialog_eeschema_options_base.cpp
eeschema/dialogs/dialog_eeschema_options_base.cpp
+1
-1
dialog_eeschema_options_base.fbp
eeschema/dialogs/dialog_eeschema_options_base.fbp
+1
-1
No files found.
eeschema/dialogs/dialog_eeschema_options.cpp
View file @
11919da6
...
@@ -58,9 +58,9 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
...
@@ -58,9 +58,9 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
templateFieldListCtrl
->
InsertColumn
(
1
,
col1
);
templateFieldListCtrl
->
InsertColumn
(
1
,
col1
);
templateFieldListCtrl
->
InsertColumn
(
2
,
col2
);
templateFieldListCtrl
->
InsertColumn
(
2
,
col2
);
templateFieldListCtrl
->
SetColumnWidth
(
0
,
200
);
templateFieldListCtrl
->
SetColumnWidth
(
0
,
templateFieldListCtrl
->
GetSize
().
GetWidth
()
/
3.5
);
templateFieldListCtrl
->
SetColumnWidth
(
1
,
200
);
templateFieldListCtrl
->
SetColumnWidth
(
1
,
templateFieldListCtrl
->
GetSize
().
GetWidth
()
/
3.5
);
templateFieldListCtrl
->
SetColumnWidth
(
2
,
7
5
);
templateFieldListCtrl
->
SetColumnWidth
(
2
,
templateFieldListCtrl
->
GetSize
().
GetWidth
()
/
3.
5
);
// Invalid field selected and don't ignore selection events because
// Invalid field selected and don't ignore selection events because
// they'll be from the user
// they'll be from the user
...
@@ -191,7 +191,7 @@ void DIALOG_EESCHEMA_OPTIONS::RefreshTemplateFieldView( void )
...
@@ -191,7 +191,7 @@ void DIALOG_EESCHEMA_OPTIONS::RefreshTemplateFieldView( void )
void
DIALOG_EESCHEMA_OPTIONS
::
SelectTemplateField
(
int
aItem
)
void
DIALOG_EESCHEMA_OPTIONS
::
SelectTemplateField
(
int
aItem
)
{
{
// Only select valid items!
// Only select valid items!
if
(
(
aItem
<
0
)
||
(
aItem
>=
templateFieldListCtrl
->
GetItemCount
()
)
)
if
(
!
selectionValid
||
(
aItem
>=
templateFieldListCtrl
->
GetItemCount
()
)
)
return
;
return
;
// Make sure we select the new item
// Make sure we select the new item
...
@@ -225,6 +225,8 @@ void DIALOG_EESCHEMA_OPTIONS::OnAddButtonClick( wxCommandEvent& event )
...
@@ -225,6 +225,8 @@ void DIALOG_EESCHEMA_OPTIONS::OnAddButtonClick( wxCommandEvent& event )
// Make sure we select the new item
// Make sure we select the new item
SelectTemplateField
(
selectedField
);
SelectTemplateField
(
selectedField
);
event
.
Skip
();
}
}
...
@@ -250,6 +252,8 @@ void DIALOG_EESCHEMA_OPTIONS::OnDeleteButtonClick( wxCommandEvent& event )
...
@@ -250,6 +252,8 @@ void DIALOG_EESCHEMA_OPTIONS::OnDeleteButtonClick( wxCommandEvent& event )
// Make sure after the refresh that the selected item is correct
// Make sure after the refresh that the selected item is correct
SelectTemplateField
(
selectedField
);
SelectTemplateField
(
selectedField
);
}
}
event
.
Skip
();
}
}
void
DIALOG_EESCHEMA_OPTIONS
::
copyPanelToSelected
(
void
)
void
DIALOG_EESCHEMA_OPTIONS
::
copyPanelToSelected
(
void
)
...
@@ -269,6 +273,9 @@ void DIALOG_EESCHEMA_OPTIONS::OnEditControlKillFocus( wxFocusEvent& event )
...
@@ -269,6 +273,9 @@ void DIALOG_EESCHEMA_OPTIONS::OnEditControlKillFocus( wxFocusEvent& event )
// Update the data + UI
// Update the data + UI
copyPanelToSelected
();
copyPanelToSelected
();
RefreshTemplateFieldView
();
RefreshTemplateFieldView
();
SelectTemplateField
(
selectedField
);
event
.
Skip
();
}
}
...
@@ -291,6 +298,7 @@ void DIALOG_EESCHEMA_OPTIONS::OnTemplateFieldSelected( wxListEvent& event )
...
@@ -291,6 +298,7 @@ void DIALOG_EESCHEMA_OPTIONS::OnTemplateFieldSelected( wxListEvent& event )
if
(
ignoreSelection
)
if
(
ignoreSelection
)
{
{
ignoreSelection
=
false
;
ignoreSelection
=
false
;
event
.
Skip
();
return
;
return
;
}
}
...
@@ -312,6 +320,8 @@ void DIALOG_EESCHEMA_OPTIONS::OnTemplateFieldSelected( wxListEvent& event )
...
@@ -312,6 +320,8 @@ void DIALOG_EESCHEMA_OPTIONS::OnTemplateFieldSelected( wxListEvent& event )
// If an item was selected, make sure we re-select it, or at least the
// If an item was selected, make sure we re-select it, or at least the
// same position in the grid
// same position in the grid
SelectTemplateField
(
selectedField
);
SelectTemplateField
(
selectedField
);
event
.
Skip
();
}
}
...
...
eeschema/dialogs/dialog_eeschema_options_base.cpp
View file @
11919da6
...
@@ -218,7 +218,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
...
@@ -218,7 +218,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
bSizer6
=
new
wxBoxSizer
(
wxVERTICAL
);
bSizer6
=
new
wxBoxSizer
(
wxVERTICAL
);
templateFieldListCtrl
=
new
wxListCtrl
(
m_panel2
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLC_HRULES
|
wxLC_REPORT
|
wxLC_SINGLE_SEL
|
wxLC_VRULES
);
templateFieldListCtrl
=
new
wxListCtrl
(
m_panel2
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLC_HRULES
|
wxLC_REPORT
|
wxLC_SINGLE_SEL
|
wxLC_VRULES
);
templateFieldListCtrl
->
SetMinSize
(
wxSize
(
22
0
,
-
1
)
);
templateFieldListCtrl
->
SetMinSize
(
wxSize
(
50
0
,
-
1
)
);
bSizer6
->
Add
(
templateFieldListCtrl
,
1
,
wxALIGN_TOP
|
wxBOTTOM
|
wxEXPAND
|
wxLEFT
|
wxRIGHT
|
wxTOP
,
8
);
bSizer6
->
Add
(
templateFieldListCtrl
,
1
,
wxALIGN_TOP
|
wxBOTTOM
|
wxEXPAND
|
wxLEFT
|
wxRIGHT
|
wxTOP
,
8
);
...
...
eeschema/dialogs/dialog_eeschema_options_base.fbp
View file @
11919da6
...
@@ -3536,7 +3536,7 @@
...
@@ -3536,7 +3536,7 @@
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimum_size"
>
22
0,-1
</property>
<property
name=
"minimum_size"
>
50
0,-1
</property>
<property
name=
"moveable"
>
1
</property>
<property
name=
"moveable"
>
1
</property>
<property
name=
"name"
>
templateFieldListCtrl
</property>
<property
name=
"name"
>
templateFieldListCtrl
</property>
<property
name=
"pane_border"
>
1
</property>
<property
name=
"pane_border"
>
1
</property>
...
...
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