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
b79011fb
Commit
b79011fb
authored
Feb 10, 2011
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eeschema: fix bug 716331
Commit installer translation files for Japanese
parent
90c130b6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
28 deletions
+61
-28
controle.cpp
eeschema/controle.cpp
+7
-0
netform.cpp
eeschema/netform.cpp
+22
-23
onrightclick.cpp
eeschema/onrightclick.cpp
+1
-4
Japanese.nsh
packaging/windows/nsis/Japanese.nsh
+28
-0
install.nsi
packaging/windows/nsis/install.nsi
+3
-1
No files found.
eeschema/controle.cpp
View file @
b79011fb
...
@@ -164,6 +164,13 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateItem( const wxPoint& aPosition, bool aIncludePin
...
@@ -164,6 +164,13 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateItem( const wxPoint& aPosition, bool aIncludePin
return
item
;
return
item
;
}
}
item
=
(
SCH_ITEM
*
)
PickStruct
(
aPosition
,
GetScreen
(),
DRAW_ITEM_T
);
if
(
item
)
{
ClearMsgPanel
();
return
item
;
}
item
=
(
SCH_ITEM
*
)
PickStruct
(
aPosition
,
GetScreen
(),
FIELD_T
);
item
=
(
SCH_ITEM
*
)
PickStruct
(
aPosition
,
GetScreen
(),
FIELD_T
);
if
(
item
)
if
(
item
)
...
...
eeschema/netform.cpp
View file @
b79011fb
...
@@ -134,9 +134,9 @@ class EXPORT_HELP
...
@@ -134,9 +134,9 @@ class EXPORT_HELP
/**
/**
* Function findNextComponentAndCreatePinList
* Function findNextComponentAndCreatePinList
* finds a
"suitable" component from the DrawList and optionally
builds
* finds a
component from the DrawList and
builds
* its pin list in m_SortedComponentPinList. Th
e
list is sorted by pin num.
* its pin list in m_SortedComponentPinList. Th
is
list is sorted by pin num.
*
A suitable component is a "new" real component
*
the component is the next actual component after aItem
* (power symbols and virtual components that have their reference starting by '#'are skipped).
* (power symbols and virtual components that have their reference starting by '#'are skipped).
*/
*/
SCH_COMPONENT
*
findNextComponentAndCreatePinList
(
EDA_ITEM
*
aItem
,
SCH_SHEET_PATH
*
aSheetPath
);
SCH_COMPONENT
*
findNextComponentAndCreatePinList
(
EDA_ITEM
*
aItem
,
SCH_SHEET_PATH
*
aSheetPath
);
...
@@ -145,17 +145,16 @@ class EXPORT_HELP
...
@@ -145,17 +145,16 @@ class EXPORT_HELP
/**
/**
* Function eraseDuplicatePins
* Function eraseDuplicatePins
*
removes duplicate Pins from the pin list, m_SortedComponentPinList
.
*
erase duplicate Pins from m_SortedComponentPinList (i.e. set pointer in this list to NULL)
.
* (This is a list of pins found in the whole schematic, for a single
* (This is a list of pins found in the whole schematic, for a single
* component.) These duplicate pins were put in list because some pins (powers... )
* component.) These duplicate pins were put in list because some pins (powers... )
* are found more than one time when we have a multiple parts per package
* are found more than one time when we have a multiple parts per package
* component. For instance, a 74ls00 has 4 parts, and therefore the VCC pin
* component. For instance, a 74ls00 has 4 parts, and therefore the VCC pin
* and GND pin appears 4 times in the list.
* and GND pin appears 4 times in the list.
* @param aPinList = a NETLIST_OBJECT_LIST that contains the list of pins for a
* given component.
* Note: this list *MUST* be sorted by pin number (.m_PinNum member value)
* Note: this list *MUST* be sorted by pin number (.m_PinNum member value)
* Also set the m_Flag member of "removed" NETLIST_OBJECT pin item to 1
*/
*/
void
eraseDuplicatePins
(
NETLIST_OBJECT_LIST
&
aPinList
);
void
eraseDuplicatePins
(
);
/**
/**
* Function addPinToComponentPinList
* Function addPinToComponentPinList
...
@@ -607,7 +606,7 @@ SCH_COMPONENT* EXPORT_HELP::findNextComponentAndCreatePinList( EDA_ITEM* a
...
@@ -607,7 +606,7 @@ SCH_COMPONENT* EXPORT_HELP::findNextComponentAndCreatePinList( EDA_ITEM* a
m_SortedComponentPinList
.
end
(),
sortPinsByNum
);
m_SortedComponentPinList
.
end
(),
sortPinsByNum
);
// Remove duplicate Pins in m_SortedComponentPinList
// Remove duplicate Pins in m_SortedComponentPinList
eraseDuplicatePins
(
m_SortedComponentPinList
);
eraseDuplicatePins
(
);
// record the usage of this library component entry.
// record the usage of this library component entry.
m_LibParts
.
insert
(
entry
);
// rejects non-unique pointers
m_LibParts
.
insert
(
entry
);
// rejects non-unique pointers
...
@@ -1510,14 +1509,14 @@ bool EXPORT_HELP::addPinToComponentPinList( SCH_COMPONENT* aComponent,
...
@@ -1510,14 +1509,14 @@ bool EXPORT_HELP::addPinToComponentPinList( SCH_COMPONENT* aComponent,
* (i.e. set pointer to duplicate pins to NULL in this list).
* (i.e. set pointer to duplicate pins to NULL in this list).
* also set .m_Flag member of "removed" NETLIST_OBJECT pins to 1
* also set .m_Flag member of "removed" NETLIST_OBJECT pins to 1
*/
*/
void
EXPORT_HELP
::
eraseDuplicatePins
(
NETLIST_OBJECT_LIST
&
aPinList
)
void
EXPORT_HELP
::
eraseDuplicatePins
(
)
{
{
if
(
a
PinList
.
size
()
==
0
)
// Trivial case: component with no pin
if
(
m_SortedComponent
PinList
.
size
()
==
0
)
// Trivial case: component with no pin
return
;
return
;
for
(
unsigned
ii
=
0
;
ii
<
a
PinList
.
size
();
ii
++
)
for
(
unsigned
ii
=
0
;
ii
<
m_SortedComponent
PinList
.
size
();
ii
++
)
{
{
if
(
a
PinList
[
ii
]
==
NULL
)
/* already deleted */
if
(
m_SortedComponent
PinList
[
ii
]
==
NULL
)
/* already deleted */
continue
;
continue
;
/* Search for duplicated pins
/* Search for duplicated pins
...
@@ -1529,34 +1528,34 @@ void EXPORT_HELP::eraseDuplicatePins( NETLIST_OBJECT_LIST& aPinList )
...
@@ -1529,34 +1528,34 @@ void EXPORT_HELP::eraseDuplicatePins( NETLIST_OBJECT_LIST& aPinList )
* are necessary successive in list
* are necessary successive in list
*/
*/
int
idxref
=
ii
;
int
idxref
=
ii
;
for
(
unsigned
jj
=
ii
+
1
;
jj
<
a
PinList
.
size
();
jj
++
)
for
(
unsigned
jj
=
ii
+
1
;
jj
<
m_SortedComponent
PinList
.
size
();
jj
++
)
{
{
if
(
a
PinList
[
jj
]
==
NULL
)
// Already removed
if
(
m_SortedComponent
PinList
[
jj
]
==
NULL
)
// Already removed
continue
;
continue
;
// if other pin num, stop search,
// if other pin num, stop search,
// because all pins having the same number are consecutive in list.
// because all pins having the same number are consecutive in list.
if
(
aPinList
[
idxref
]
->
m_PinNum
!=
a
PinList
[
jj
]
->
m_PinNum
)
if
(
m_SortedComponentPinList
[
idxref
]
->
m_PinNum
!=
m_SortedComponent
PinList
[
jj
]
->
m_PinNum
)
break
;
break
;
if
(
a
PinList
[
idxref
]
->
m_FlagOfConnection
==
PAD_CONNECT
)
if
(
m_SortedComponent
PinList
[
idxref
]
->
m_FlagOfConnection
==
PAD_CONNECT
)
{
{
a
PinList
[
jj
]
->
m_Flag
=
1
;
m_SortedComponent
PinList
[
jj
]
->
m_Flag
=
1
;
a
PinList
[
jj
]
=
NULL
;
m_SortedComponent
PinList
[
jj
]
=
NULL
;
}
}
else
/* the reference pin is not connected: remove this pin if the
else
/* the reference pin is not connected: remove this pin if the
* other pin is connected */
* other pin is connected */
{
{
if
(
a
PinList
[
jj
]
->
m_FlagOfConnection
==
PAD_CONNECT
)
if
(
m_SortedComponent
PinList
[
jj
]
->
m_FlagOfConnection
==
PAD_CONNECT
)
{
{
a
PinList
[
idxref
]
->
m_Flag
=
1
;
m_SortedComponent
PinList
[
idxref
]
->
m_Flag
=
1
;
a
PinList
[
idxref
]
=
NULL
;
m_SortedComponent
PinList
[
idxref
]
=
NULL
;
idxref
=
jj
;
idxref
=
jj
;
}
}
else
// the 2 pins are not connected: remove the tested pin,
else
// the 2 pins are not connected: remove the tested pin,
{
// and continue ...
{
// and continue ...
a
PinList
[
jj
]
->
m_Flag
=
1
;
m_SortedComponent
PinList
[
jj
]
->
m_Flag
=
1
;
a
PinList
[
jj
]
=
NULL
;
m_SortedComponent
PinList
[
jj
]
=
NULL
;
}
}
}
}
}
}
...
...
eeschema/onrightclick.cpp
View file @
b79011fb
...
@@ -185,8 +185,6 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
...
@@ -185,8 +185,6 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
break
;
break
;
case
SCH_LINE_T
:
case
SCH_LINE_T
:
// if( !flags ) PopMenu->Append(ID_POPUP_SCH_MOVE_ITEM_REQUEST, "Move");
switch
(
DrawStruct
->
GetLayer
()
)
switch
(
DrawStruct
->
GetLayer
()
)
{
{
case
LAYER_WIRE
:
case
LAYER_WIRE
:
...
@@ -203,7 +201,6 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
...
@@ -203,7 +201,6 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_DELETE
,
_
(
"Delete Drawing"
),
delete_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_DELETE
,
_
(
"Delete Drawing"
),
delete_xpm
);
break
;
break
;
}
}
break
;
break
;
case
SCH_SHEET_T
:
case
SCH_SHEET_T
:
...
...
packaging/windows/nsis/Japanese.nsh
0 → 100644
View file @
b79011fb
;Additional text definitions for Japanese
;File name of license file
LicenseLangString MUILicense ${LANG_JAPANESE} "..\licendoc.txt"
;Component option
LangString TITLE_SEC01 ${LANG_JAPANESE} "メイン アプリケーション"
LangString TITLE_SEC02 ${LANG_JAPANESE} "ライブラリとコンポーネント"
LangString TITLE_SEC03 ${LANG_JAPANESE} "デモンストレーション プロジェクト"
LangString TITLE_SEC04 ${LANG_JAPANESE} "ヘルプ ファイル"
;Component option descriptions
LangString DESC_SEC01 ${LANG_JAPANESE} "メイン アプリケーション ファイル"
LangString DESC_SEC02 ${LANG_JAPANESE} "ライブラリとコンポーネントは以前インストールされていない場合必要です。"
LangString DESC_SEC03 ${LANG_JAPANESE} "デモンストレーションファイルとチュートリアル"
LangString DESC_SEC04 ${LANG_JAPANESE} "PDF形式のヘルプファイル"
;General messages
LangString WINGS3D_PROMPT ${LANG_JAPANESE} "3Dオブジェクトモデルの作成、編集を行うためには Wings3Dをインストールする必要があります。\
Wings3D とユーザーマニュアルは、このボックスにチェックを入れて Wings3D ウェブページ を開くことでダウンロードできます。"
LangString UNINST_PROMPT ${LANG_JAPANESE} "$(^Name) と全てのコンポーネントを完全に削除します。宜しいですか $\n\
この操作は全ての新しいファイル、修正されたファイル、プログラムディレクトリ中のライブラリとモジュールも削除します。"
LangString UNINST_SUCCESS ${LANG_JAPANESE} "$(^Name) はあなたのコンピュータから完全に削除されました。"
LangString INSTALLER_RUNNING ${LANG_JAPANESE} "インストーラは既に起動されています。"
LangString UNINSTALLER_RUNNING ${LANG_JAPANESE} "アンインストーラは既に起動されています。"
LangString ALREADY_INSTALLED ${LANG_JAPANESE} "${PRODUCT_NAME} は既にインストールされています。このパッケージインストールは既存のファイルを上書きします。作業を続けますか?"
packaging/windows/nsis/install.nsi
View file @
b79011fb
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
; General Product Description Definitions
; General Product Description Definitions
!define PRODUCT_NAME "KiCad"
!define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2011.0
1.26
"
!define PRODUCT_VERSION "2011.0
2.10
"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""
!define COMPANY_NAME ""
...
@@ -79,12 +79,14 @@ ShowUnInstDetails hide
...
@@ -79,12 +79,14 @@ ShowUnInstDetails hide
!insertmacro MUI_LANGUAGE "Polish"
!insertmacro MUI_LANGUAGE "Polish"
!insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "Russian"
!insertmacro MUI_LANGUAGE "Russian"
!insertmacro MUI_LANGUAGE "Japanese"
!include "English.nsh"
!include "English.nsh"
!include "French.nsh"
!include "French.nsh"
!include "Polish.nsh"
!include "Polish.nsh"
!include "Dutch.nsh"
!include "Dutch.nsh"
!include "Russian.nsh"
!include "Russian.nsh"
!include "Japanese.nsh"
; MUI end ------
; MUI end ------
...
...
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