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
f6551172
Commit
f6551172
authored
May 10, 2012
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix capitalization issues in title bar and config files (broken by bzr rev 3543)
parent
2e0941a1
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
19 deletions
+17
-19
edaappl.cpp
common/edaappl.cpp
+1
-1
cvpcb.cpp
cvpcb/cvpcb.cpp
+1
-1
eeschema.cpp
eeschema/eeschema.cpp
+1
-1
schframe.cpp
eeschema/schframe.cpp
+8
-10
gerbview_frame.cpp
gerbview/gerbview_frame.cpp
+1
-1
pcbframe.cpp
pcbnew/pcbframe.cpp
+4
-4
pcbnew.cpp
pcbnew/pcbnew.cpp
+1
-1
No files found.
common/edaappl.cpp
View file @
f6551172
...
@@ -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
);
SetAppName
(
aName
.
Lower
()
);
SetTitle
(
aName
);
SetTitle
(
aName
);
m_settings
=
new
wxConfig
();
m_settings
=
new
wxConfig
();
wxASSERT
(
m_settings
!=
NULL
);
wxASSERT
(
m_settings
!=
NULL
);
...
...
cvpcb/cvpcb.cpp
View file @
f6551172
...
@@ -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 @
f6551172
...
@@ -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
()
)
{
{
...
...
eeschema/schframe.cpp
View file @
f6551172
...
@@ -977,9 +977,8 @@ void SCH_EDIT_FRAME::UpdateTitle()
...
@@ -977,9 +977,8 @@ void SCH_EDIT_FRAME::UpdateTitle()
if
(
GetScreen
()
->
GetFileName
()
==
m_DefaultSchematicFileName
)
if
(
GetScreen
()
->
GetFileName
()
==
m_DefaultSchematicFileName
)
{
{
wxString
msg
=
wxGetApp
().
GetAppName
()
+
wxT
(
" "
)
+
GetBuildVersion
();
title
.
Printf
(
wxT
(
"Eeschema %s [%s]"
),
GetChars
(
GetBuildVersion
()
),
title
.
Printf
(
wxT
(
"%s [%s]"
),
GetChars
(
msg
),
GetChars
(
GetScreen
()
->
GetFileName
()
)
);
GetChars
(
GetScreen
()
->
GetFileName
()
)
);
SetTitle
(
title
);
}
}
else
else
{
{
...
@@ -989,12 +988,10 @@ void SCH_EDIT_FRAME::UpdateTitle()
...
@@ -989,12 +988,10 @@ void SCH_EDIT_FRAME::UpdateTitle()
// passed to LoadOneEEFile() which omits the path on non-root schematics.
// passed to LoadOneEEFile() which omits the path on non-root schematics.
// Making the path absolute solves this problem.
// Making the path absolute solves this problem.
fn
.
MakeAbsolute
();
fn
.
MakeAbsolute
();
title
=
wxChar
(
'['
);
title
.
Printf
(
wxT
(
"[ %s %s] (%s)"
),
title
<<
fn
.
GetName
()
<<
wxChar
(
' '
);
GetChars
(
fn
.
GetName
()
),
title
<<
m_CurrentSheet
->
PathHumanReadable
()
<<
wxChar
(
']'
);
GetChars
(
m_CurrentSheet
->
PathHumanReadable
()
),
GetChars
(
fn
.
GetPath
()
)
);
title
<<
wxChar
(
' '
);
title
<<
wxChar
(
'('
)
<<
fn
.
GetPath
()
<<
wxChar
(
')'
);
if
(
fn
.
FileExists
()
)
if
(
fn
.
FileExists
()
)
{
{
...
@@ -1004,6 +1001,7 @@ void SCH_EDIT_FRAME::UpdateTitle()
...
@@ -1004,6 +1001,7 @@ void SCH_EDIT_FRAME::UpdateTitle()
else
else
title
<<
_
(
" [no file]"
);
title
<<
_
(
" [no file]"
);
SetTitle
(
title
);
}
}
SetTitle
(
title
);
}
}
gerbview/gerbview_frame.cpp
View file @
f6551172
...
@@ -451,7 +451,7 @@ void GERBVIEW_FRAME::UpdateTitleAndInfo()
...
@@ -451,7 +451,7 @@ void GERBVIEW_FRAME::UpdateTitleAndInfo()
// Display the gerber filename
// Display the gerber filename
if
(
gerber
==
NULL
)
if
(
gerber
==
NULL
)
{
{
text
=
wxGetApp
().
GetAppName
()
+
wxT
(
" "
)
+
GetBuildVersion
(
);
text
.
Printf
(
wxT
(
"GerbView %s"
),
GetChars
(
GetBuildVersion
()
)
);
SetTitle
(
text
);
SetTitle
(
text
);
SetStatusText
(
wxEmptyString
,
0
);
SetStatusText
(
wxEmptyString
,
0
);
text
.
Printf
(
_
(
"Layer %d not in use"
),
getActiveLayer
()
+
1
);
text
.
Printf
(
_
(
"Layer %d not in use"
),
getActiveLayer
()
+
1
);
...
...
pcbnew/pcbframe.cpp
View file @
f6551172
...
@@ -752,16 +752,16 @@ void PCB_EDIT_FRAME::UpdateTitle()
...
@@ -752,16 +752,16 @@ void PCB_EDIT_FRAME::UpdateTitle()
if
(
fileName
.
IsOk
()
&&
fileName
.
FileExists
()
)
if
(
fileName
.
IsOk
()
&&
fileName
.
FileExists
()
)
{
{
title
=
wxGetApp
().
GetTitle
()
+
wxT
(
" "
)
+
GetBuildVersion
()
+
title
.
Printf
(
wxT
(
"Pcbnew %s %s"
),
GetChars
(
GetBuildVersion
()
),
wxT
(
" "
)
+
fileName
.
GetFullPath
(
);
GetChars
(
fileName
.
GetFullPath
()
)
);
if
(
!
fileName
.
IsFileWritable
()
)
if
(
!
fileName
.
IsFileWritable
()
)
title
+=
_
(
" [Read Only]"
);
title
+=
_
(
" [Read Only]"
);
}
}
else
else
{
{
title
=
wxGetApp
().
GetTitle
()
+
wxT
(
" "
)
+
GetBuildVersion
()
+
title
.
Printf
(
wxT
(
"Pcbnew %s "
),
GetChars
(
GetBuildVersion
()
)
);
wxT
(
" "
)
+
_
(
" [no file]"
);
title
<<
_
(
" [no file]"
);
}
}
SetTitle
(
title
);
SetTitle
(
title
);
...
...
pcbnew/pcbnew.cpp
View file @
f6551172
...
@@ -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