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
1ad84c07
Commit
1ad84c07
authored
May 05, 2012
by
Jerry Jacobs
Browse files
Options
Browse Files
Download
Plain Diff
Cosmetic UI changes mostly for Mac OS X, see CHANGELOG.txt
parents
173c9396
5f5c5042
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
43 additions
and
15 deletions
+43
-15
CHANGELOG.txt
CHANGELOG.txt
+8
-0
AboutDialog_main.cpp
common/dialog_about/AboutDialog_main.cpp
+1
-1
dialog_about_base.cpp
common/dialog_about/dialog_about_base.cpp
+1
-1
dialog_about_base.fbp
common/dialog_about/dialog_about_base.fbp
+2
-2
dialog_about_base.h
common/dialog_about/dialog_about_base.h
+1
-1
edaappl.cpp
common/edaappl.cpp
+1
-1
zoom.cpp
common/zoom.cpp
+26
-6
cvpcb.cpp
cvpcb/cvpcb.cpp
+1
-1
eeschema.cpp
eeschema/eeschema.cpp
+1
-1
pcbnew.cpp
pcbnew/pcbnew.cpp
+1
-1
No files found.
CHANGELOG.txt
View file @
1ad84c07
...
@@ -4,6 +4,14 @@ KiCad ChangeLog 2012
...
@@ -4,6 +4,14 @@ KiCad ChangeLog 2012
Please add newer entries at the top, list the date and your name with
Please add newer entries at the top, list the date and your name with
email address.
email address.
2012-May-5 UPDATE Jerry Jacobs <jerry@xor-gate.org>
================================================================================
++ common
* Update about dialog to more native size so the notebook is not squeezed
* Increment copyright year to 2012
* Fix mousezoom jumping to center for Mac OS X and other platforms
* Remove lowercase application name because Mac OS X menubar was inconsitent
2012-Mar-11 UPDATE Dick Hollenbeck <dick@softplc.com>
2012-Mar-11 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
================================================================================
++pcbnew
++pcbnew
...
...
common/dialog_about/AboutDialog_main.cpp
View file @
1ad84c07
...
@@ -59,7 +59,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
...
@@ -59,7 +59,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
info
.
SetAppName
(
wxT
(
".: "
)
+
wxGetApp
().
GetTitle
()
+
wxT
(
" :."
)
);
info
.
SetAppName
(
wxT
(
".: "
)
+
wxGetApp
().
GetTitle
()
+
wxT
(
" :."
)
);
/* Copyright information */
/* Copyright information */
info
.
SetCopyright
(
wxT
(
"(C) 1992-201
1
KiCad Developers Team"
)
);
info
.
SetCopyright
(
wxT
(
"(C) 1992-201
2
KiCad Developers Team"
)
);
/* KiCad build version */
/* KiCad build version */
wxString
version
;
wxString
version
;
...
...
common/dialog_about/dialog_about_base.cpp
View file @
1ad84c07
...
@@ -58,7 +58,7 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS
...
@@ -58,7 +58,7 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS
bSizer1
->
Add
(
m_staticline1
,
0
,
wxEXPAND
|
wxALL
,
5
);
bSizer1
->
Add
(
m_staticline1
,
0
,
wxEXPAND
|
wxALL
,
5
);
m_auiNotebook
=
new
wxAuiNotebook
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxAUI_NB_SCROLL_BUTTONS
|
wxAUI_NB_TAB_FIXED_WIDTH
);
m_auiNotebook
=
new
wxAuiNotebook
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxAUI_NB_SCROLL_BUTTONS
|
wxAUI_NB_TAB_FIXED_WIDTH
);
m_auiNotebook
->
SetMinSize
(
wxSize
(
550
,
30
0
)
);
m_auiNotebook
->
SetMinSize
(
wxSize
(
750
,
35
0
)
);
bSizer1
->
Add
(
m_auiNotebook
,
2
,
wxEXPAND
|
wxALL
,
5
);
bSizer1
->
Add
(
m_auiNotebook
,
2
,
wxEXPAND
|
wxALL
,
5
);
...
...
common/dialog_about/dialog_about_base.fbp
View file @
1ad84c07
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
<property
name=
"minimum_size"
>
-1,-1
</property>
<property
name=
"minimum_size"
>
-1,-1
</property>
<property
name=
"name"
>
dialog_about_base
</property>
<property
name=
"name"
>
dialog_about_base
</property>
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
510,434
</property>
<property
name=
"size"
>
750,450
</property>
<property
name=
"style"
>
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP
</property>
<property
name=
"style"
>
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP
</property>
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"title"
>
About...
</property>
<property
name=
"title"
>
About...
</property>
...
@@ -472,7 +472,7 @@
...
@@ -472,7 +472,7 @@
<property
name=
"hidden"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"minimum_size"
>
550,30
0
</property>
<property
name=
"minimum_size"
>
750,35
0
</property>
<property
name=
"name"
>
m_auiNotebook
</property>
<property
name=
"name"
>
m_auiNotebook
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
...
...
common/dialog_about/dialog_about_base.h
View file @
1ad84c07
...
@@ -53,7 +53,7 @@ class dialog_about_base : public wxDialog
...
@@ -53,7 +53,7 @@ class dialog_about_base : public wxDialog
public
:
public
:
dialog_about_base
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"About..."
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
510
,
434
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
|
wxSTAY_ON_TOP
);
dialog_about_base
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"About..."
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
750
,
350
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
|
wxSTAY_ON_TOP
);
~
dialog_about_base
();
~
dialog_about_base
();
};
};
...
...
common/edaappl.cpp
View file @
1ad84c07
...
@@ -335,7 +335,7 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId )
...
@@ -335,7 +335,7 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId )
/* Init parameters for configuration */
/* Init parameters for configuration */
SetVendorName
(
wxT
(
"KiCad"
)
);
SetVendorName
(
wxT
(
"KiCad"
)
);
SetAppName
(
aName
.
Lower
()
);
SetAppName
(
aName
);
SetTitle
(
aName
);
SetTitle
(
aName
);
m_settings
=
new
wxConfig
();
m_settings
=
new
wxConfig
();
wxASSERT
(
m_settings
!=
NULL
);
wxASSERT
(
m_settings
!=
NULL
);
...
...
common/zoom.cpp
View file @
1ad84c07
...
@@ -103,27 +103,47 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
...
@@ -103,27 +103,47 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
bool
zoom_at_cursor
=
false
;
bool
zoom_at_cursor
=
false
;
BASE_SCREEN
*
screen
=
GetScreen
();
BASE_SCREEN
*
screen
=
GetScreen
();
wxPoint
center
=
screen
->
GetScrollCenterPosition
();
wxPoint
center
=
screen
->
GetScrollCenterPosition
();
wxPoint
zoom_center
=
center
;
double
zoom
=
screen
->
GetZoom
();
switch
(
id
)
switch
(
id
)
{
{
case
ID_POPUP_ZOOM_IN
:
case
ID_POPUP_ZOOM_IN
:
zoom_at_cursor
=
true
;
zoom_at_cursor
=
true
;
center
=
screen
->
GetCrossHairPosition
();
zoom_
center
=
screen
->
GetCrossHairPosition
();
// fall thru
// fall thru
case
ID_ZOOM_IN
:
case
ID_ZOOM_IN
:
if
(
screen
->
SetPreviousZoom
()
)
if
(
screen
->
SetPreviousZoom
()
)
{
RedrawScreen
(
center
,
zoom_at_cursor
);
if
(
zoom_at_cursor
)
{
double
new_zoom
=
screen
->
GetZoom
();
double
factor
=
new_zoom
/
zoom
;
wxPoint
delta
=
center
-
zoom_center
;
center
=
wxPoint
(
zoom_center
.
x
+
delta
.
x
*
factor
,
zoom_center
.
y
+
delta
.
y
*
factor
);
}
RedrawScreen
(
center
,
false
);
}
break
;
break
;
case
ID_POPUP_ZOOM_OUT
:
case
ID_POPUP_ZOOM_OUT
:
zoom_at_cursor
=
true
;
zoom_at_cursor
=
true
;
center
=
screen
->
GetCrossHairPosition
();
zoom_
center
=
screen
->
GetCrossHairPosition
();
// fall thru
// fall thru
case
ID_ZOOM_OUT
:
case
ID_ZOOM_OUT
:
if
(
screen
->
SetNextZoom
()
)
if
(
screen
->
SetNextZoom
()
)
{
RedrawScreen
(
center
,
zoom_at_cursor
);
if
(
zoom_at_cursor
)
{
double
new_zoom
=
screen
->
GetZoom
();
double
factor
=
new_zoom
/
zoom
;
wxPoint
delta
=
center
-
zoom_center
;
center
=
wxPoint
(
zoom_center
.
x
+
delta
.
x
*
factor
,
zoom_center
.
y
+
delta
.
y
*
factor
);
}
RedrawScreen
(
center
,
false
);
}
break
;
break
;
case
ID_ZOOM_REDRAW
:
case
ID_ZOOM_REDRAW
:
...
...
cvpcb/cvpcb.cpp
View file @
1ad84c07
...
@@ -73,7 +73,7 @@ bool EDA_APP::OnInit()
...
@@ -73,7 +73,7 @@ bool EDA_APP::OnInit()
wxString
message
;
wxString
message
;
CVPCB_MAINFRAME
*
frame
=
NULL
;
CVPCB_MAINFRAME
*
frame
=
NULL
;
InitEDA_Appl
(
wxT
(
"CvP
cb
"
),
APP_CVPCB_T
);
InitEDA_Appl
(
wxT
(
"CvP
CB
"
),
APP_CVPCB_T
);
if
(
m_Checker
&&
m_Checker
->
IsAnotherRunning
()
)
if
(
m_Checker
&&
m_Checker
->
IsAnotherRunning
()
)
{
{
...
...
eeschema/eeschema.cpp
View file @
1ad84c07
...
@@ -124,7 +124,7 @@ bool EDA_APP::OnInit()
...
@@ -124,7 +124,7 @@ bool EDA_APP::OnInit()
wxFileName
filename
;
wxFileName
filename
;
SCH_EDIT_FRAME
*
frame
=
NULL
;
SCH_EDIT_FRAME
*
frame
=
NULL
;
InitEDA_Appl
(
wxT
(
"E
es
chema"
),
APP_EESCHEMA_T
);
InitEDA_Appl
(
wxT
(
"E
ES
chema"
),
APP_EESCHEMA_T
);
if
(
m_Checker
&&
m_Checker
->
IsAnotherRunning
()
)
if
(
m_Checker
&&
m_Checker
->
IsAnotherRunning
()
)
{
{
...
...
pcbnew/pcbnew.cpp
View file @
1ad84c07
...
@@ -102,7 +102,7 @@ bool EDA_APP::OnInit()
...
@@ -102,7 +102,7 @@ bool EDA_APP::OnInit()
wxFileName
fn
;
wxFileName
fn
;
PCB_EDIT_FRAME
*
frame
=
NULL
;
PCB_EDIT_FRAME
*
frame
=
NULL
;
InitEDA_Appl
(
wxT
(
"P
cbn
ew"
),
APP_PCBNEW_T
);
InitEDA_Appl
(
wxT
(
"P
CBN
ew"
),
APP_PCBNEW_T
);
if
(
m_Checker
&&
m_Checker
->
IsAnotherRunning
()
)
if
(
m_Checker
&&
m_Checker
->
IsAnotherRunning
()
)
{
{
...
...
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