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
8a2eecf4
Commit
8a2eecf4
authored
Oct 05, 2014
by
Mark Roszko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the verb "Annotate" instead of "Annotation" in the Annotate Schematic dialog
parent
3169b417
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
dialog_annotate_base.cpp
eeschema/dialogs/dialog_annotate_base.cpp
+2
-2
dialog_annotate_base.fbp
eeschema/dialogs/dialog_annotate_base.fbp
+5
-3
dialog_annotate_base.h
eeschema/dialogs/dialog_annotate_base.h
+4
-2
No files found.
eeschema/dialogs/dialog_annotate_base.cpp
View file @
8a2eecf4
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// C++ code generated with wxFormBuilder (version
Jun 6 2014
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -205,7 +205,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
...
@@ -205,7 +205,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
m_btnClear
=
new
wxButton
(
this
,
ID_CLEAR_ANNOTATION_CMP
,
_
(
"Clear Annotation"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_btnClear
=
new
wxButton
(
this
,
ID_CLEAR_ANNOTATION_CMP
,
_
(
"Clear Annotation"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bButtonsSizer
->
Add
(
m_btnClear
,
0
,
wxALL
|
wxEXPAND
,
5
);
bButtonsSizer
->
Add
(
m_btnClear
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_btnApply
=
new
wxButton
(
this
,
wxID_APPLY
,
_
(
"Annotat
ion
"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_btnApply
=
new
wxButton
(
this
,
wxID_APPLY
,
_
(
"Annotat
e
"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bButtonsSizer
->
Add
(
m_btnApply
,
0
,
wxALL
|
wxEXPAND
,
5
);
bButtonsSizer
->
Add
(
m_btnApply
,
0
,
wxALL
|
wxEXPAND
,
5
);
...
...
eeschema/dialogs/dialog_annotate_base.fbp
View file @
8a2eecf4
<?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=
"1
1
"
/>
<FileVersion
major=
"1"
minor=
"1
3
"
/>
<object
class=
"Project"
expanded=
"1"
>
<object
class=
"Project"
expanded=
"1"
>
<property
name=
"class_decoration"
></property>
<property
name=
"class_decoration"
></property>
<property
name=
"code_generation"
>
C++
</property>
<property
name=
"code_generation"
>
C++
</property>
...
@@ -20,8 +20,10 @@
...
@@ -20,8 +20,10 @@
<property
name=
"path"
>
.
</property>
<property
name=
"path"
>
.
</property>
<property
name=
"precompiled_header"
></property>
<property
name=
"precompiled_header"
></property>
<property
name=
"relative_path"
>
1
</property>
<property
name=
"relative_path"
>
1
</property>
<property
name=
"skip_lua_events"
>
1
</property>
<property
name=
"skip_php_events"
>
1
</property>
<property
name=
"skip_php_events"
>
1
</property>
<property
name=
"skip_python_events"
>
1
</property>
<property
name=
"skip_python_events"
>
1
</property>
<property
name=
"ui_table"
>
UI
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<object
class=
"Dialog"
expanded=
"1"
>
<object
class=
"Dialog"
expanded=
"1"
>
...
@@ -42,7 +44,7 @@
...
@@ -42,7 +44,7 @@
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
DIALOG_ANNOTATE_BASE
</property>
<property
name=
"name"
>
DIALOG_ANNOTATE_BASE
</property>
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
432,
454
</property>
<property
name=
"size"
>
432,
550
</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"
>
Annotate Schematic
</property>
<property
name=
"title"
>
Annotate Schematic
</property>
...
@@ -2398,7 +2400,7 @@
...
@@ -2398,7 +2400,7 @@
<property
name=
"gripper"
>
0
</property>
<property
name=
"gripper"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_APPLY
</property>
<property
name=
"id"
>
wxID_APPLY
</property>
<property
name=
"label"
>
Annotat
ion
</property>
<property
name=
"label"
>
Annotat
e
</property>
<property
name=
"max_size"
></property>
<property
name=
"max_size"
></property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
...
...
eeschema/dialogs/dialog_annotate_base.h
View file @
8a2eecf4
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// C++ code generated with wxFormBuilder (version
Jun 6 2014
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -11,6 +11,8 @@
...
@@ -11,6 +11,8 @@
#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>
...
@@ -81,7 +83,7 @@ class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM
...
@@ -81,7 +83,7 @@ class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM
public
:
public
:
DIALOG_ANNOTATE_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Annotate Schematic"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
432
,
454
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_ANNOTATE_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Annotate Schematic"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
432
,
550
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_ANNOTATE_BASE
();
~
DIALOG_ANNOTATE_BASE
();
};
};
...
...
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