[heekscad] r1492 committed - changes ( not sure if they are copied to the git version )
9 views
Skip to first unread message
codesite...@google.com
Nov 2, 2011, 5:38:54 PM11/2/11
to heeksca...@googlegroups.com
Revision: 1492
Author: danheeks
Date: Wed Nov 2 14:38:29 2011
Log: changes ( not sure if they are copied to the git version )
http://code.google.com/p/heekscad/source/detail?r=1492
Added:
/trunk/translations/ko
/trunk/translations/ko/HeeksCAD.po
Modified:
/trunk/PyHeeksCAD/PythonInterface.cpp
/trunk/src/HeeksCAD.cpp
/trunk/src/HeeksCAD.h
/trunk/src/HeeksFrame.cpp
/trunk/translate 3 compile from po to mo.bat
=======================================
--- /dev/null
+++ /trunk/translations/ko/HeeksCAD.po Wed Nov 2 14:38:29 2011
@@ -0,0 +1,2463 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: HeeksCAD 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 13:41+0200\n"
+"PO-Revision-Date: 2011-07-01 18:27+0900\n"
+"Last-Translator: Choi Youn-Soo <kor...@gmail.com>\n"
+"Language-Team: Choi Youn-Soo <kor...@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Korean\n"
+"X-Poedit-Country: KOREA, REPUBLIC OF\n"
+
+msgid " http://code.google.com/p/heeksart/"
+msgstr "··········http://code.google.com/p/heeksart/"
+
+msgid " http://code.google.com/p/heekscnc/"
+msgstr "··········http://code.google.com/p/heekscnc/"
+
+msgid " which means it is free and open source, and must stay that way"
+msgstr "이 소프트웨어는 무료 및 오픈 소스이며, 그 방법을 유지합니다."
+
+msgid " degree "
+msgstr "단계"
+
+msgid "%s %d"
+msgstr "%s·%d"
+
+msgid "&Edit"
+msgstr "편집(&E)"
+
+msgid "&File"
+msgstr "파일(&F)"
+
+msgid "&Geometry"
+msgstr "지오메트리(&G)"
+
+msgid "&Solid"
+msgstr "솔리드(&S)"
+
+msgid "&Transform"
+msgstr "변형(&T)"
+
+msgid "&View"
+msgstr "뷰(&V)"
+
+msgid "&Window"
+msgstr "윈도우(&W)"
+
+msgid "( with Ctrl key for extra objects)"
+msgstr "( with Ctrl key for extra objects)"
+
+msgid "( with Ctrl key to pan view )"
+msgstr "( with Ctrl key to pan view )"
+
+msgid "( with Ctrl key to rotate view )"
+msgstr "( with Ctrl key to rotate view )"
+
+msgid "(press 'a' for arcs)"
+msgstr "(press 'a' for arcs)"
+
+msgid ".orientation"
+msgstr ".orientation"
+
+msgid "1.5 for square, 1.0 for round"
+msgstr "스퀘어 1.5, 라운드 1.0"
+
+msgid "A axis (around X) rotation"
+msgstr "A 축(X 주변) 회전"
+
+msgid "A fatal error happened during Blend"
+msgstr "혼합하는 동안 치명적인 오류가 발생했습니다."
+
+msgid "About"
+msgstr "정보"
+
+msgid "Accept value and continue"
+msgstr "값을 허용하고 계속"
+
+msgid "Active font"
+msgstr "활성 폰트"
+
+msgid "Adaptive"
+msgstr "적응"
+
+msgid "Adaptive Roughing Operation..."
+msgstr "적응형 러핑(황삭) 작업..."
+
+msgid "Adaptive Roughing code from http://code.google.com/p/libactp/,
using code written in 2004"
+msgstr "적응형 러핑(황삭) 코드 : http://code.google.com/p/libactp/ 2004년
작성된 코드 사용."
+
+msgid "Add"
+msgstr "추가"
+
+msgid "Add "
+msgstr "추가"
+
+msgid "Add Coordinate System"
+msgstr "좌표계 추가"
+
+msgid "Add Cutting Rate Reference..."
+msgstr "커팅 비율 자료 추가..."
+
+msgid "Add Dimension"
+msgstr "치수 추가"
+
+msgid "Add New 3D Operation"
+msgstr "새로운 3D 작업 추가"
+
+msgid "Add New Milling Operation"
+msgstr "새로운 CNC 작업 추가"
+
+msgid "Add New Plugin"
+msgstr "새 플러그인 추가"
+
+msgid "Add New Tool"
+msgstr "새 도구 추가"
+
+msgid "Add Objects"
+msgstr "오브젝트 추가"
+
+msgid "Add Other Operation"
+msgstr "기타 작업 추가"
+
+msgid "Add Speed Reference..."
+msgstr "스피드 자료 추가..."
+
+msgid "Add Text"
+msgstr "텍스트 추가"
+
+msgid "Add a cone"
+msgstr "콘 추가"
+
+msgid "Add a cube"
+msgstr "큐브 추가"
+
+msgid "Add a cylinder"
+msgstr "실린더 추가"
+
+msgid "Add a dimension"
+msgstr "치수 추가"
+
+msgid "Add a point to drawing"
+msgstr "드로잉에 포인트 추가"
+
+msgid "Add a simple mesh"
+msgstr "심플 메쉬 추가"
+
+msgid "Add a sphere"
+msgstr "스피어 추가"
+
+msgid "Add a text object"
+msgstr "텍스트 오브젝트 추가"
+
+msgid "Add point"
+msgstr "포인트 추가"
+
+msgid "All files"
+msgstr "모든 파일"
+
+msgid "Alphabetic Mode"
+msgstr "알파벳 모드"
+
+msgid "Apply"
+msgstr "적용"
+
+msgid "Apply any changes made to the properties"
+msgstr "속성에 만들어진 모든 변경 적용"
+
+msgid "Arc"
+msgstr "아크"
+
+msgid "Arc drawing mode"
+msgstr "아크 드로잉 모드"
+
+msgid "At least one vertex could not be normalized!"
+msgstr "적어도 하나의 버텍스가 정상화되지 않았습니다!"
+
+msgid "Automatic Title"
+msgstr "자동 도구 설명"
+
+msgid "Automatically generate title"
+msgstr "자동으로 도구 설명 생성"
+
+msgid "B axis (around Y) rotation"
+msgstr "B 축(Y주변) 회전"
+
+msgid "Back to zoom in, Forward to zoom out"
+msgstr "Back to zoom in, Forward to zoom out"
+
+msgid "Ball End Drill..."
+msgstr "볼 드릴링 커터"
+
+msgid "Ball End Mill"
+msgstr "볼 엔드 밀"
+
+msgid "Blend"
+msgstr "블렌드"
+
+msgid "Border Width"
+msgstr "경계 너비"
+
+msgid "Both halves"
+msgstr "내부 및 외부"
+
+msgid "Boundary"
+msgstr "경계"
+
+msgid "Brinell Hardness of raw material"
+msgstr "재질의 브리넬 경도"
+
+msgid "Brinell hardness of raw material"
+msgstr "재질의 브리넬 경도"
+
+msgid "C axis (around Z) rotation"
+msgstr "C 축(Z 주변) 회전"
+
+msgid "Cancel"
+msgstr "취소"
+
+msgid "Cancel operation"
+msgstr "작업 취소"
+
+msgid "Carbide"
+msgstr "카바이드"
+
+msgid "Carbide "
+msgstr "카바이드"
+
+msgid "Center"
+msgstr "중심"
+
+msgid "Centre Drill Bit"
+msgstr "센터 드릴 비트"
+
+msgid "Centre Drill..."
+msgstr "센터 드릴..."
+
+msgid "Chamfer"
+msgstr "챔퍼(베벨)"
+
+msgid "Chamfer Mill..."
+msgstr "챔퍼 밀..."
+
+msgid "Chamfer Operation..."
+msgstr "챔퍼 작업..."
+
+msgid "Chamfering Bit"
+msgstr "챔퍼링 비트"
+
+msgid "Chamfering bit"
+msgstr "챔퍼링 비트(베벨)"
+
+msgid "ChangeOwner"
+msgstr "사용자 전환"
+
+msgid "Character Space Percentage"
+msgstr "문자 간격 퍼센트"
+
+msgid "Choose a directory:"
+msgstr "디렉토리 선택: "
+
+msgid "Choose a file"
+msgstr "파일 선택"
+
+msgid "Choose shared library file"
+msgstr "라이브러리 공유 파일 선택"
+
+msgid "Circle"
+msgstr "서클"
+
+msgid "Circle drawing mode"
+msgstr "Circle drawing mode"
+
+msgid "Clearance Tool"
+msgstr "제거 도구"
+
+msgid "Click centre position to rotate about"
+msgstr "Click centre position to rotate about"
+
+msgid "Click centre position to scale about"
+msgstr "Click centre position to scale about"
+
+msgid "Click position to move from"
+msgstr "Click position to move from"
+
+msgid "Click position to move to"
+msgstr "Click position to move to"
+
+msgid "Combine selected sketches"
+msgstr "선텍 스케치 결합"
+
+msgid "Combine sketches"
+msgstr "스케치 결함"
+
+msgid "Common"
+msgstr "커먼(교차)"
+
+msgid "Cone"
+msgstr "콘"
+
+msgid "Contour spline deviation"
+msgstr "등고선 스플라인 편차"
+
+msgid "Convert Mesh To Triangles"
+msgstr "메쉬를 삼각으로 변환"
+
+msgid "Convert sketch to face"
+msgstr "스케치를 페이스로 변환"
+
+msgid "Coordinate System"
+msgstr "좌표계"
+
+msgid "Copies the selected items to the clipboard"
+msgstr "선택 항목을 클립보드로 복사"
+
+msgid "Copy\tCtrl+C"
+msgstr "복사\tCtrl+C"
+
+msgid "Copy Mirror"
+msgstr "대칭 복사"
+
+msgid "Copy Parallel"
+msgstr "평행 복사"
+
+msgid "Copy Rotate"
+msgstr "회전 복사"
+
+msgid "Copy Translate"
+msgstr "이동 복사"
+
+msgid "Copy and mirror selected items"
+msgstr "선택 항목 복사 및 대칭"
+
+msgid "Copy and rotate selected items"
+msgstr "선택 항목 복사 및 회전"
+
+msgid "Copy and translate selected items"
+msgstr "선택 항목 복사 및 이동"
+
+msgid "Copy selected items to the clipboard"
+msgstr "선택 항목을 클립보드로 복사"
+
+msgid "Couldn't open file"
+msgstr "파일을 열 수 없습니다."
+
+msgid "CounterBore"
+msgstr "카운터보어(축소)"
+
+msgid "CounterBore Operation..."
+msgstr "카운터보어 작업..."
+
+msgid "Create a Coordinate System"
+msgstr "좌표계 만들기"
+
+msgid "Create a lofted face"
+msgstr "로프트 페이스 만들기"
+
+msgid "Ctrl key does rotate"
+msgstr "Ctrl 키는 회전"
+
+msgid "Cuboid"
+msgstr "큐보이드"
+
+msgid "Cut"
+msgstr "컷(절단)"
+
+msgid "Cut\tCtrl+X"
+msgstr "잘라내기\tCtrl+X"
+
+msgid "Cut one solid from another"
+msgstr "다른 하나에서 1 솔리드 잘라내기"
+
+msgid "Cut selected items to the clipboard"
+msgstr "선택 항목을 클립보드로 잘라내기"
+
+msgid "Cylinder"
+msgstr "실린더"
+
+msgid "DXF"
+msgstr "DXF"
+
+msgid "DXF files"
+msgstr "DXF 파일"
+
+msgid "Delete\tDel"
+msgstr "삭제\tDel"
+
+msgid "Delete Marked Items"
+msgstr "표시된 항목 삭제"
+
+msgid "Demo Print Preview"
+msgstr "인쇄 미리보기"
+
+msgid "Design Rules Adjustment..."
+msgstr "디자인 규칙 조정..."
+
+msgid "Design Rules Check..."
+msgstr "디자인 규칙 확인..."
+
+msgid "Designe Rules Adjustment"
+msgstr "디자인 규칙 조정"
+
+msgid "Designe Rules Check"
+msgstr "디자인 규칙 확인"
+
+msgid "Dimension"
+msgstr "치수"
+
+msgid "Dimension drawing"
+msgstr "Dimension drawing"
+
+msgid "Distance"
+msgstr "거리"
+
+msgid "Down"
+msgstr "아래"
+
+msgid "Drag to move view"
+msgstr "Drag to move view"
+
+msgid "Drag to zoom in and out"
+msgstr "Drag to zoom in and out"
+
+msgid "Drag with left button to window select"
+msgstr "Drag with left button to window select"
+
+msgid "Drag with the left mouse button"
+msgstr "Drag with the left mouse button"
+
+msgid "Dragging a window"
+msgstr "Dragging a window"
+
+msgid "Dragging a window or picking a point"
+msgstr "Dragging a window or picking a point"
+
+msgid "Draw Circles"
+msgstr "서클 그리기"
+
+msgid "Draw Ellipses"
+msgstr "일립스(타원) 그리기"
+
+msgid "Draw Infinite Lines"
+msgstr "무한 라인 그리기"
+
+msgid "Draw Points"
+msgstr "포인트 그리기"
+
+msgid "Draw Regular Shapes"
+msgstr "정규 쉐이프 그리기"
+
+msgid "Draw a sketch"
+msgstr "스케치 그리기"
+
+msgid "Draw circles through 3 points"
+msgstr "3포인트를 통해 서클 그리기"
+
+msgid "Draw circles, centre and point"
+msgstr "중심과 포인트로 서클 그리기"
+
+msgid "Draw circles, centre and radius"
+msgstr "중심과 반경으로 서클 그리기"
+
+msgid "Draw ellipses"
+msgstr "일립스 그리기"
+
+msgid "Draw regular shapes; rectangles, polygons, obrounds"
+msgstr "정규 쉐이프 드로우: 사각형, 폴리곤, 회로 "
+
+msgid "Drawing"
+msgstr "드로잉"
+
+msgid "Drill Bit"
+msgstr "드릴 비트"
+
+msgid "Drill..."
+msgstr "드릴..."
+
+msgid "Drilling Operation..."
+msgstr "드릴링 작업..."
+
+msgid "Edge"
+msgstr "엣지"
+
+msgid "Edge Chamfer"
+msgstr "엣지 챔퍼"
+
+msgid "Edge Fillet"
+msgstr "엣지 필렛"
+
+msgid "Edge cannot have more than 2 faces!"
+msgstr "엣지는 2개 이상의 페이스를 가질 수 없습니다!"
+
+msgid "Edges"
+msgstr "엣지"
+
+msgid "Edit"
+msgstr "편집"
+
+msgid "Ellipse"
+msgstr "일립스"
+
+msgid "End Mill"
+msgstr "엔드 밀"
+
+msgid "End Mill..."
+msgstr "엔드 밀..."
+
+msgid "Enter Blend Radius"
+msgstr "블렌드 반경 입력"
+
+msgid "Enter Offset Value, + for making bigger, - for making smaller"
+msgstr "옵셋 값 입력, + 크게, - 작게"
+
+msgid "Enter Sketch Mode"
+msgstr "스케치 모드 입력"
+
+msgid "Enter angle to rotate by"
+msgstr "회전할 각도 입력"
+
+msgid "Enter chamfer distance"
+msgstr "챔퍼 거리 입력"
+
+msgid "Enter number of copies"
+msgstr "복사할 수 입력"
+
+msgid "Enter scale factor"
+msgstr "스케일 요소 입력"
+
+msgid "Enter view rotating mode"
+msgstr "회전 모드 입력"
+
+msgid "Error! The 'Stop Picking' button shouldn't have been available!"
+msgstr "오류! \"선택 멈추기\" - 버튼을 사용할 수 없었습니다."
+
+msgid "Estimate when possible"
+msgstr "가능한 경우 계산"
+
+msgid "Exit\tCtrl+Q"
+msgstr "종료\tCtrl+Q"
+
+msgid "Exit Full Screen Mode"
+msgstr "전체 화면 모드 종료"
+
+msgid "Extrude"
+msgstr "익스트루드"
+
+msgid "Extrude a sketch"
+msgstr "스케치 익스트루드(압출)"
+
+msgid "Extrude a wire or face"
+msgstr "와이어 또는 페이스 익스트루드"
+
+msgid "Extruded Solid"
+msgstr "익스트루드 솔리드"
+
+msgid "Face"
+msgstr "페이스"
+
+msgid "Face Name"
+msgstr "페이스 명"
+
+msgid "Faces"
+msgstr "페이스"
+
+msgid "Failed to load resource image"
+msgstr "리소스 이미지를 열지 못했습니다."
+
+msgid "False"
+msgstr "아니오"
+
+msgid "Fatal Error converting sketch to face"
+msgstr "치명적인 오류로 스케치를 페이스로 변환하는 데 실패했습니다."
+
+msgid "Fatal error making extruded solid"
+msgstr "치명적인 오류로 익스트루드 솔리드 만드는 데 실패했습니다."
+
+msgid "Fatal error making ruled solid"
+msgstr "치명적인 오류로 관련 솔리드를 만드는 데 실패했습니다."
+
+msgid "Feeds and Speeds"
+msgstr "피드와 속도"
+
+msgid "Female half"
+msgstr "외부 부품"
+
+msgid "File Path"
+msgstr "파일 경로"
+
+msgid "Fillet"
+msgstr "필렛(라운딩)"
+
+msgid "Find common solid between two solids"
+msgstr "2 솔리드 사이의 공통 솔리드 찾기"
+
+msgid "Finish drawing"
+msgstr "드로잉 끝내기"
+
+msgid "Finish picking"
+msgstr "선택 끝내기"
+
+msgid "Fit view to extents"
+msgstr "윈도우에 뷰 맞추기"
+
+msgid "Fit view to extents, but no rotation"
+msgstr "윈도우에 뷰 맞추기(뷰 회전 안함)"
+
+msgid "Fixtures"
+msgstr "좌표계(조정)"
+
+msgid "For a more modern version of adaptive roughing, see Julian Todd and
Martin Dunschen of http://www.freesteel.co.uk/"
+msgstr "적응형 러핑(황삭)의 최신 버전에 대한 내용은,
http://www.freesteel.co.uk/ 의 Julian Todd 및 Martin Dunschen을
참고하십시오 ."
+
+msgid "Force closed shape"
+msgstr "닫힌 쉐이프 전용"
+
+msgid "Forward to zoom in, Back to zoom out"
+msgstr "앞으로 확대, 뒤로 축소"
+
+msgid "Full screen"
+msgstr "전체 화면"
+
+msgid "Fuse"
+msgstr "퓨즈(연결)"
+
+msgid "Fuse Solids"
+msgstr "솔리드 연결"
+
+msgid "Fuse one solid to another"
+msgstr "다른 하나에서 1 솔리드 연결"
+
+msgid "GCode generation"
+msgstr "G 코드 생성"
+
+msgid "General Tools"
+msgstr "일반 도구"
+
+msgid "Generated"
+msgstr "생성"
+
+msgid "Generated from edge"
+msgstr "엣지에서 생성하기"
+
+msgid "Geometry Tool Bar"
+msgstr "지오메트리 도구바"
+
+msgid "Geometry Tools"
+msgstr "지오메트리 도구"
+
+msgid "Get Position"
+msgstr "위치"
+
+msgid "Go back to previous view"
+msgstr "이전 뷰로 이동"
+
+msgid "Graphics"
+msgstr "그래픽"
+
+msgid "Gripper"
+msgstr "그리퍼"
+
+msgid "Group"
+msgstr "그룹"
+
+msgid "Group selected items"
+msgstr "선택 항목 그룹"
+
+msgid "Heeks files"
+msgstr "Heeks 파일"
+
+msgid "HeeksArt is a free random add-on to HeeksCAD"
+msgstr "HeeksArt는 HeeksCAD 무료 임의 Add On입니다."
+
+msgid "HeeksCAD plugin libraries"
+msgstr "HeeksCAD 플러그인 라이브러리"
+
+msgid "HeeksCNC is the free machining add-on to HeeksCAD"
+msgstr "HeeksCNC는 HeeksCAD 무료 가공 Add On입니다."
+
+msgid "High Speed Steel"
+msgstr "HSS(고속도강)"
+
+msgid "Hold middle mouse button down to pan"
+msgstr "Hold middle mouse button down to pan"
+
+msgid "Horizontal Angle"
+msgstr "수평 각도"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "IGES files"
+msgstr "IGES 파일"
+
+msgid "IGES import not done!"
+msgstr "IGES 수입을 완료하지 못했습니다!"
+
+msgid "Image"
+msgstr "이미지"
+
+msgid "Import"
+msgstr "수입"
+
+msgid "Import file"
+msgstr "파일 수입"
+
+msgid "Infinite Line"
+msgstr "무한 라인"
+
+msgid "Infinite line drawing"
+msgstr "Infinite line drawing"
+
+msgid "Inlay Operation..."
+msgstr "인레이 작업..."
+
+msgid "Inlay spline deviation"
+msgstr "인레이 스플라인 편차"
+
+msgid "Input"
+msgstr "입력"
+
+msgid "Input Mode"
+msgstr "입력 모드"
+
+msgid "Input extrusion height"
+msgstr "익스트루드 높이 입력"
+
+msgid "Intersection of Solids"
+msgstr "솔리드의 교차점"
+
+msgid "Invalid file type chosen"
+msgstr "잘못된 파일 형식입니다."
+
+msgid "Is Deleted"
+msgstr "삭제"
+
+msgid "Knot"
+msgstr "매듭"
+
+msgid "Known Files"
+msgstr "모든 지원 파일"
+
+msgid "Leave manually assigned title"
+msgstr "수동으로 할당 제목 부여(AUS)"
+
+msgid "Left"
+msgstr "좌"
+
+msgid "Left button for selecting objects"
+msgstr "Left button for selecting objects"
+
+msgid "Length"
+msgstr "길이"
+
+msgid "Line"
+msgstr "라인"
+
+msgid "Line drawing mode"
+msgstr "Line drawing mode"
+
+msgid "Loft two sketches"
+msgstr "2 스케치 로프트(연결)"
+
+msgid "Lofted Body"
+msgstr "로프트 바디"
+
+msgid "Machining"
+msgstr "CNC"
+
+msgid "Magnifying by dragging a window"
+msgstr "Magnifying by dragging a window"
+
+msgid "Make Coordinate System"
+msgstr "좌표계 만들기"
+
+msgid "Make Python Script"
+msgstr "Python 스크립트 만들기"
+
+msgid "Make Sketch"
+msgstr "스케치 만들기"
+
+msgid "Make To Sketch"
+msgstr "스케치 만들기"
+
+msgid "Make a chamfer on selected edges"
+msgstr "선택 엣지에 챔퍼 만들기"
+
+msgid "Make a fillet on selected edges"
+msgstr "선택 엣지에 필렛 \"라운딩\" 만들기"
+
+msgid "Make a selection:"
+msgstr "선택 만들기:"
+
+msgid "Make selected lines and arcs into a new sketch"
+msgstr "선택 라인과 아크로 새 스케치 만들기"
+
+msgid "Male half"
+msgstr "내부 부품"
+
+msgid "Mark"
+msgstr "마크"
+
+msgid "Maximum Material Removal Rate (inches^3/min)"
+msgstr "최대 재질 제거율(inches^3/min)"
+
+msgid "Maximum Material Removal Rate (mm^3/min)"
+msgstr "최대 재질 제거율(mm^3/min)"
+
+msgid "Maximum scale threshold (1.0 - must be same size, 1.5 (can be half
as big again or 2/3 size)"
+msgstr "최대 크기 임계값(1.0 - 동일 크기만, bis 1.5 - 절반 보다 크거나
2/3 크기)"
+
+msgid "Mesh"
+msgstr "메쉬"
+
+msgid "Mesh Edge"
+msgstr "메쉬 엣지"
+
+msgid "Mesh Face"
+msgstr "메쉬 페이스"
+
+msgid "Mesh Vertex"
+msgstr "메쉬 버텍스"
+
+msgid "Middle button to pan view"
+msgstr "중 버튼으로 이동 뷰"
+
+msgid "Middle button to rotate view"
+msgstr "Middle button to rotate view"
+
+msgid "Minimum correlation factor (0.0 (nothing like it) -> 1.0 (perfect
match))"
+msgstr "최소 상관 요소 (0.0(거의 모든) -> 1.0(완벽하게 일치))"
+
+msgid "Mirror Axis"
+msgstr "대칭 축"
+
+msgid "Mirror all x<1"
+msgstr "모든 x 대칭<1"
+
+msgid "Mirror selected items"
+msgstr "선택 항목 대칭"
+
+msgid "Modified"
+msgstr "수정"
+
+msgid "Mouse wheel to zoom in and out"
+msgstr "Mouse wheel to zoom in and out"
+
+msgid "Move Mirror"
+msgstr "대칭 이동"
+
+msgid "Move Rotate"
+msgstr "회전 이동"
+
+msgid "Move Scale"
+msgstr "스케일 이동"
+
+msgid "Move Translate"
+msgstr "오브젝트 이동"
+
+msgid "NC files"
+msgstr "NC 파일"
+
+msgid "Name"
+msgstr "이름"
+
+msgid "New\tCtrl+N"
+msgstr "새 파일\tCtrl+N"
+
+msgid "New Adaptive Roughing Operation..."
+msgstr "새 적응형 러핑(황삭) 작업..."
+
+msgid "New Ball End Mill..."
+msgstr "새 볼 엔드 밀..."
+
+msgid "New Centre Drill..."
+msgstr "새 센터 드릴..."
+
+msgid "New Chamfer Mill..."
+msgstr "새 챔퍼 밀..."
+
+msgid "New Chamfer Operation..."
+msgstr "새 챔퍼 작업..."
+
+msgid "New Contour Operation..."
+msgstr "새 등고선 작업..."
+
+msgid "New CounterBore Cycle Operation..."
+msgstr "새 카운터보어 사이클 작업..."
+
+msgid "New CounterBore Operation..."
+msgstr "새 카운터보어 작업..."
+
+msgid "New Cutting Rate Reference..."
+msgstr "새 커팅 비율 참조..."
+
+msgid "New Cutting Tool Definition..."
+msgstr "새 커팅 도구 정의..."
+
+msgid "New Drill Cycle Operation..."
+msgstr "새 드릴 사이클 작업..."
+
+msgid "New Drill..."
+msgstr "새 드릴..."
+
+msgid "New Drilling Operation..."
+msgstr "새 드릴링 작업..."
+
+msgid "New End Mill..."
+msgstr "새 엔드 밀..."
+
+msgid "New Fixture..."
+msgstr "새 좌표계의 수정..."
+
+msgid "New Pocket Operation..."
+msgstr "새 포켓 작업..."
+
+msgid "New Profile Operation..."
+msgstr "새 프로파일 작업..."
+
+msgid "New Slot Drill..."
+msgstr "새 슬롯 드릴..."
+
+msgid "New Special Adaptive Roughing Operation..."
+msgstr "새 특별 적응형 러핑(황삭) 작업..."
+
+msgid "New Speed Reference..."
+msgstr "새 스피드 자료..."
+
+msgid "New Tool Length Switch..."
+msgstr "새 도구 길이 전환"
+
+msgid "New Touch Probe..."
+msgstr "새 터치 프로브..."
+
+msgid "New Turning Tool..."
+msgstr "새 터닝 도구..."
+
+msgid "New file"
+msgstr "새 파일"
+
+msgid "No file specified!"
+msgstr "지정된 파일이 없습니다."
+
+msgid "Normalize All Vertices"
+msgstr "모든 버텍스 정상화 "
+
+msgid "Number of elements"
+msgstr "요소의 수"
+
+msgid "Number of items selected"
+msgstr "선택 항목의 수"
+
+msgid "Number of sample points"
+msgstr "샘플 포인트의 수"
+
+msgid "OK"
+msgstr "확인"
+
+msgid "Objects"
+msgstr "오브젝트"
+
+msgid "Offset Shape"
+msgstr "쉐이프 옵셋"
+
+msgid "Offset value"
+msgstr "옵셋 값"
+
+msgid "Ok"
+msgstr "확인"
+
+msgid "On"
+msgstr "라인 위"
+
+msgid "Open\tCtrl+O"
+msgstr "열기\tCtrl+O"
+
+msgid "Open BOM File"
+msgstr "BOM 파일 열기"
+
+msgid "Open NC File"
+msgstr "NC 파일 열기"
+
+msgid "Open NC file"
+msgstr "NC 파일 열기"
+
+msgid "Open Recent"
+msgstr "최근 파일"
+
+msgid "Open file"
+msgstr "파일 열기"
+
+msgid "OpenNC"
+msgstr "NC(G-코드) 열기"
+
+msgid "Operations"
+msgstr "작업"
+
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/PyHeeksCAD/PythonInterface.cpp Sun Jul 3 22:55:33 2011
+++ /trunk/PyHeeksCAD/PythonInterface.cpp Wed Nov 2 14:38:29 2011
@@ -403,6 +403,11 @@
{
return wxGetApp().PickObjects(Ctt(str), marking_filter, m_just_one);
}
+
+static void PyOnOpenButton()
+{
+ wxGetApp().OnOpenButton();
+}
static bool PyOpenFile(const char* str)
{
@@ -511,5 +516,6 @@
bp::def("GetFirstBody", GetFirstBody,
bp::return_value_policy<bp::reference_existing_object>());
bp::def("GetNextBody", GetNextBody,
bp::return_value_policy<bp::reference_existing_object>());
bp::def("PickObjects", PickObjects);
+ bp::def("OnOpenButton", PyOnOpenButton);
bp::def("OpenFile", PyOpenFile);
}
=======================================
--- /trunk/src/HeeksCAD.cpp Mon Jun 20 16:12:27 2011
+++ /trunk/src/HeeksCAD.cpp Wed Nov 2 14:38:29 2011
@@ -462,9 +462,9 @@
if(!(param.Lower().EndsWith(_T(".so"))))
#endif
{
- wxGetApp().OnBeforeNewOrOpen(true, wxOK);
+ OnBeforeNewOrOpen(true, wxOK);
OpenFile(parser.GetParam(i));
- wxGetApp().OnNewOrOpen(true, wxOK);
+ OnNewOrOpen(true, wxOK);
}
}
}
@@ -887,7 +887,7 @@
HeeksObj *existing = NULL;
- existing = wxGetApp().GetIDObject(object->GetIDGroupType(),
object->m_id);
+ existing = GetIDObject(object->GetIDGroupType(), object->m_id);
if ((existing != NULL) && (existing != object))
{
@@ -1190,6 +1190,48 @@
return false;
}
+
+void HeeksCADapp::OnOpenButton()
+{
+ wxString default_directory = wxGetCwd();
+
+ if (m_recent_files.size() > 0)
+ {
+ #ifdef WIN32
+ wxString delimiter(_T("\\"));
+ #else
+ wxString delimiter(_T("/"));
+ #endif // WIN32
+
+ default_directory = *(m_recent_files.begin());
+ int last_directory_delimiter = default_directory.Find(delimiter[0],true);
+ if (last_directory_delimiter > 0)
+ {
+ default_directory.Remove(last_directory_delimiter);
+ }
+ }
+
+ wxFileDialog dialog(m_frame, _("Open file"), default_directory,
wxEmptyString, GetKnownFilesWildCardString());
+ dialog.CentreOnParent();
+
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ int res = CheckForModifiedDoc();
+ if(res != wxCANCEL)
+ {
+ OnBeforeNewOrOpen(true, res);
+ Reset();
+ if(!OpenFile(dialog.GetPath().c_str()))
+ {
+ wxString str = wxString(_("Invalid file type chosen")) + _T(" ") +
_("expecting") + _T(" ") + GetKnownFilesCommaSeparatedList();
+ wxMessageBox(str);
+ }
+ OnNewOrOpen(true, res);
+ ClearHistory();
+ SetLikeNewFile();
+ }
+ }
+}
bool HeeksCADapp::OpenFile(const wxChar *filepath, bool import_not_open,
HeeksObj* paste_into, HeeksObj* paste_before, bool retain_filename /* =
true */ )
{
@@ -1198,9 +1240,9 @@
m_in_OpenFile = true;
m_file_open_or_import_type = FileOpenOrImportTypeOther;
double file_open_matrix[16];
- if(import_not_open && wxGetApp().m_current_coordinate_system)
- {
- extract(wxGetApp().m_current_coordinate_system->GetMatrix(),
file_open_matrix);
+ if(import_not_open && m_current_coordinate_system)
+ {
+ extract(m_current_coordinate_system->GetMatrix(), file_open_matrix);
m_file_open_matrix = file_open_matrix;
}
@@ -1659,7 +1701,7 @@
if(wf.EndsWith(_T(".heeks")))
{
// call external OnSave functions
- for(std::list< void(*)(bool) >::iterator It =
wxGetApp().m_on_save_callbacks.begin(); It !=
wxGetApp().m_on_save_callbacks.end(); It++)
+ for(std::list< void(*)(bool) >::iterator It =
m_on_save_callbacks.begin(); It != m_on_save_callbacks.end(); It++)
{
void(*callbackfunc)(bool) = *It;
(*callbackfunc)(false);
@@ -1742,7 +1784,7 @@
{
glClear(GL_DEPTH_BUFFER_BIT);
CoordinateSystem::rendering_current = true;
- m_current_coordinate_system->glCommands(false,
wxGetApp().m_marked_list->ObjectMarked(m_current_coordinate_system), false);
+ m_current_coordinate_system->glCommands(false,
m_marked_list->ObjectMarked(m_current_coordinate_system), false);
CoordinateSystem::rendering_current = false;
}
}
@@ -1756,7 +1798,7 @@
if(m_current_coordinate_system)
{
CoordinateSystem::rendering_current = true;
- m_current_coordinate_system->glCommands(false,
wxGetApp().m_marked_list->ObjectMarked(m_current_coordinate_system), false);
+ m_current_coordinate_system->glCommands(false,
m_marked_list->ObjectMarked(m_current_coordinate_system), false);
CoordinateSystem::rendering_current = false;
}
if(m_show_datum_coords_system)
@@ -1893,7 +1935,7 @@
// for sketch mode, only allow items in the sketch to be selected
if(m_sketch_mode)
{
- m_sketch->glCommands(select, marked ||
wxGetApp().m_marked_list->ObjectMarked(m_sketch), no_color);
+ m_sketch->glCommands(select, marked ||
m_marked_list->ObjectMarked(m_sketch), no_color);
}
else
{
@@ -1904,7 +1946,7 @@
if(object->OnVisibleLayer() && object->m_visible)
{
if(select)glPushName(object->GetIndex());
- object->glCommands(select, marked ||
wxGetApp().m_marked_list->ObjectMarked(object), no_color);
+ object->glCommands(select, marked ||
m_marked_list->ObjectMarked(object), no_color);
if(select)glPopName();
}
}
@@ -1933,7 +1975,7 @@
bool HeeksCADapp::IsModified(void){
if(m_isModifiedValid)return m_isModified;
- for(std::list< bool(*)() >::iterator It =
wxGetApp().m_is_modified_callbacks.begin(); It !=
wxGetApp().m_is_modified_callbacks.end(); It++)
+ for(std::list< bool(*)() >::iterator It =
m_is_modified_callbacks.begin(); It != m_is_modified_callbacks.end(); It++)
{
bool(*callbackfunc)() = *It;
bool is_modified = (*callbackfunc)();
@@ -2123,7 +2165,7 @@
void HeeksCADapp::GenerateIntersectionMenuOptions( std::list<Tool*>
&f_list )
{
- if (wxGetApp().m_marked_list->list().size() > 1)
+ if (m_marked_list->list().size() > 1)
{
f_list.push_back(&add_points_at_intersections);
}
@@ -2151,11 +2193,11 @@
AddToolListWithSeparator(f_list, temp_f_list);
temp_f_list.clear();
-
if(wxGetApp().m_current_coordinate_system)f_list.push_back(&coord_system_unset);
+ if(m_current_coordinate_system)f_list.push_back(&coord_system_unset);
#ifndef PYHEEKSCAD
// exit full screen
- if(wxGetApp().m_frame->IsFullScreen() && point.x>=0 &&
point.y>=0)temp_f_list.push_back(new CFullScreenTool);
+ if(m_frame->IsFullScreen() && point.x>=0 &&
point.y>=0)temp_f_list.push_back(new CFullScreenTool);
#endif
AddToolListWithSeparator(f_list, temp_f_list);
@@ -3642,7 +3684,7 @@
void HeeksCADapp::OnBeforeNewOrOpen(bool open, int res)
{
- for(std::list< void(*)(int, int) >::iterator It =
wxGetApp().m_beforeneworopen_callbacks.begin(); It !=
wxGetApp().m_beforeneworopen_callbacks.end(); It++)
+ for(std::list< void(*)(int, int) >::iterator It =
m_beforeneworopen_callbacks.begin(); It !=
m_beforeneworopen_callbacks.end(); It++)
{
void(*callbackfunc)(int, int) = *It;
(*callbackfunc)(open ? 1:0, res);
@@ -3651,7 +3693,7 @@
void HeeksCADapp::OnBeforeFrameDelete(void)
{
- for(std::list< void(*)() >::iterator It =
wxGetApp().m_beforeframedelete_callbacks.begin(); It !=
wxGetApp().m_beforeframedelete_callbacks.end(); It++)
+ for(std::list< void(*)() >::iterator It =
m_beforeframedelete_callbacks.begin(); It !=
m_beforeframedelete_callbacks.end(); It++)
{
void(*callbackfunc)() = *It;
(*callbackfunc)();
@@ -3723,7 +3765,7 @@
void HeeksCADapp::SetFrameTitle()
{
if(m_frame == NULL)return;
- wxString str = wxGetApp().GetAppName().c_str();
+ wxString str = GetAppName().c_str();
if((!m_untitled) || (!m_no_creation_mode))str += wxString(_T(" - ")) +
m_filepath.c_str();
m_frame->SetTitle(str);
}
@@ -4538,11 +4580,11 @@
unsigned int HeeksCADapp::GetIndex(HeeksObj *object)
{
- return wxGetApp().m_marked_list->GetIndex(object);
+ return m_marked_list->GetIndex(object);
}
void HeeksCADapp::ReleaseIndex(unsigned int index)
{
-
if(wxGetApp().m_marked_list)wxGetApp().m_marked_list->ReleaseIndex(index);
-}
+ if(m_marked_list)m_marked_list->ReleaseIndex(index);
+}
=======================================
--- /trunk/src/HeeksCAD.h Mon Jun 20 16:12:27 2011
+++ /trunk/src/HeeksCAD.h Wed Nov 2 14:38:29 2011
@@ -298,6 +298,7 @@
static void OpenDXFFile(const wxChar *filepath);
static void OpenRS274XFile(const wxChar *filepath);
bool OpenImageFile(const wxChar *filepath);
+ void OnOpenButton();
bool OpenFile(const wxChar *filepath, bool import_not_open = false,
HeeksObj* paste_into = NULL, HeeksObj* paste_before = NULL, bool
retain_filename = true );
void SaveDXFFile(const wxChar *filepath);
void SaveSTLFile(const std::list<HeeksObj*>& objects, const wxChar
*filepath, double facet_tolerance = -1.0, double* scale = NULL);
=======================================
--- /trunk/src/HeeksFrame.cpp Mon Jun 13 02:08:06 2011
+++ /trunk/src/HeeksFrame.cpp Wed Nov 2 14:38:29 2011
@@ -731,50 +731,10 @@
// and pick from three points
new_object->PickFrom1Point();
}
-
-
-
static void OnOpenButton( wxCommandEvent& event )
{
- wxString default_directory = wxGetCwd();
-
- if (wxGetApp().m_recent_files.size() > 0)
- {
- #ifdef WIN32
- wxString delimiter(_T("\\"));
- #else
- wxString delimiter(_T("/"));
- #endif // WIN32
-
- default_directory = *(wxGetApp().m_recent_files.begin());
- int last_directory_delimiter = default_directory.Find(delimiter[0],true);
- if (last_directory_delimiter > 0)
- {
- default_directory.Remove(last_directory_delimiter);
- }
- }
-
- wxFileDialog dialog(wxGetApp().m_frame, _("Open file"),
default_directory, wxEmptyString, wxGetApp().GetKnownFilesWildCardString());
- dialog.CentreOnParent();
-
- if (dialog.ShowModal() == wxID_OK)
- {
- int res = wxGetApp().CheckForModifiedDoc();
- if(res != wxCANCEL)
- {
- wxGetApp().OnBeforeNewOrOpen(true, res);
- wxGetApp().Reset();
- if(!wxGetApp().OpenFile(dialog.GetPath().c_str()))
- {
- wxString str = wxString(_("Invalid file type chosen")) + _T(" ") +
_("expecting") + _T(" ") + wxGetApp().GetKnownFilesCommaSeparatedList();
- wxMessageBox(str);
- }
- wxGetApp().OnNewOrOpen(true, res);
- wxGetApp().ClearHistory();
- wxGetApp().SetLikeNewFile();
- }
- }
+ wxGetApp().OnOpenButton();
}
static void OnImportButton( wxCommandEvent& event )
=======================================
--- /trunk/translate 3 compile from po to mo.bat Tue Aug 10 04:33:46 2010
+++ /trunk/translate 3 compile from po to mo.bat Wed Nov 2 14:38:29 2011
@@ -6,5 +6,7 @@
"C:\Program Files\GnuWin32\bin\msgfmt.exe"
-o "%HEEKSCADPATH%\fr\HeeksCAD.mo" "%HEEKSCADPATH%\translations\fr\HeeksCAD.po"
mkdir "%HEEKSCADPATH%\sk"
"C:\Program Files\GnuWin32\bin\msgfmt.exe"
-o "%HEEKSCADPATH%\sk\HeeksCAD.mo" "%HEEKSCADPATH%\translations\sk\HeeksCAD.po"
+mkdir "%HEEKSCADPATH%\ko"
+"C:\Program Files\GnuWin32\bin\msgfmt.exe"
-o "%HEEKSCADPATH%\ko\HeeksCAD.mo" "%HEEKSCADPATH%\translations\ko\HeeksCAD.po"
pause
Author: danheeks
Date: Wed Nov 2 14:38:29 2011
Log: changes ( not sure if they are copied to the git version )
http://code.google.com/p/heekscad/source/detail?r=1492
Added:
/trunk/translations/ko
/trunk/translations/ko/HeeksCAD.po
Modified:
/trunk/PyHeeksCAD/PythonInterface.cpp
/trunk/src/HeeksCAD.cpp
/trunk/src/HeeksCAD.h
/trunk/src/HeeksFrame.cpp
/trunk/translate 3 compile from po to mo.bat
=======================================
--- /dev/null
+++ /trunk/translations/ko/HeeksCAD.po Wed Nov 2 14:38:29 2011
@@ -0,0 +1,2463 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: HeeksCAD 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-26 13:41+0200\n"
+"PO-Revision-Date: 2011-07-01 18:27+0900\n"
+"Last-Translator: Choi Youn-Soo <kor...@gmail.com>\n"
+"Language-Team: Choi Youn-Soo <kor...@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Korean\n"
+"X-Poedit-Country: KOREA, REPUBLIC OF\n"
+
+msgid " http://code.google.com/p/heeksart/"
+msgstr "··········http://code.google.com/p/heeksart/"
+
+msgid " http://code.google.com/p/heekscnc/"
+msgstr "··········http://code.google.com/p/heekscnc/"
+
+msgid " which means it is free and open source, and must stay that way"
+msgstr "이 소프트웨어는 무료 및 오픈 소스이며, 그 방법을 유지합니다."
+
+msgid " degree "
+msgstr "단계"
+
+msgid "%s %d"
+msgstr "%s·%d"
+
+msgid "&Edit"
+msgstr "편집(&E)"
+
+msgid "&File"
+msgstr "파일(&F)"
+
+msgid "&Geometry"
+msgstr "지오메트리(&G)"
+
+msgid "&Solid"
+msgstr "솔리드(&S)"
+
+msgid "&Transform"
+msgstr "변형(&T)"
+
+msgid "&View"
+msgstr "뷰(&V)"
+
+msgid "&Window"
+msgstr "윈도우(&W)"
+
+msgid "( with Ctrl key for extra objects)"
+msgstr "( with Ctrl key for extra objects)"
+
+msgid "( with Ctrl key to pan view )"
+msgstr "( with Ctrl key to pan view )"
+
+msgid "( with Ctrl key to rotate view )"
+msgstr "( with Ctrl key to rotate view )"
+
+msgid "(press 'a' for arcs)"
+msgstr "(press 'a' for arcs)"
+
+msgid ".orientation"
+msgstr ".orientation"
+
+msgid "1.5 for square, 1.0 for round"
+msgstr "스퀘어 1.5, 라운드 1.0"
+
+msgid "A axis (around X) rotation"
+msgstr "A 축(X 주변) 회전"
+
+msgid "A fatal error happened during Blend"
+msgstr "혼합하는 동안 치명적인 오류가 발생했습니다."
+
+msgid "About"
+msgstr "정보"
+
+msgid "Accept value and continue"
+msgstr "값을 허용하고 계속"
+
+msgid "Active font"
+msgstr "활성 폰트"
+
+msgid "Adaptive"
+msgstr "적응"
+
+msgid "Adaptive Roughing Operation..."
+msgstr "적응형 러핑(황삭) 작업..."
+
+msgid "Adaptive Roughing code from http://code.google.com/p/libactp/,
using code written in 2004"
+msgstr "적응형 러핑(황삭) 코드 : http://code.google.com/p/libactp/ 2004년
작성된 코드 사용."
+
+msgid "Add"
+msgstr "추가"
+
+msgid "Add "
+msgstr "추가"
+
+msgid "Add Coordinate System"
+msgstr "좌표계 추가"
+
+msgid "Add Cutting Rate Reference..."
+msgstr "커팅 비율 자료 추가..."
+
+msgid "Add Dimension"
+msgstr "치수 추가"
+
+msgid "Add New 3D Operation"
+msgstr "새로운 3D 작업 추가"
+
+msgid "Add New Milling Operation"
+msgstr "새로운 CNC 작업 추가"
+
+msgid "Add New Plugin"
+msgstr "새 플러그인 추가"
+
+msgid "Add New Tool"
+msgstr "새 도구 추가"
+
+msgid "Add Objects"
+msgstr "오브젝트 추가"
+
+msgid "Add Other Operation"
+msgstr "기타 작업 추가"
+
+msgid "Add Speed Reference..."
+msgstr "스피드 자료 추가..."
+
+msgid "Add Text"
+msgstr "텍스트 추가"
+
+msgid "Add a cone"
+msgstr "콘 추가"
+
+msgid "Add a cube"
+msgstr "큐브 추가"
+
+msgid "Add a cylinder"
+msgstr "실린더 추가"
+
+msgid "Add a dimension"
+msgstr "치수 추가"
+
+msgid "Add a point to drawing"
+msgstr "드로잉에 포인트 추가"
+
+msgid "Add a simple mesh"
+msgstr "심플 메쉬 추가"
+
+msgid "Add a sphere"
+msgstr "스피어 추가"
+
+msgid "Add a text object"
+msgstr "텍스트 오브젝트 추가"
+
+msgid "Add point"
+msgstr "포인트 추가"
+
+msgid "All files"
+msgstr "모든 파일"
+
+msgid "Alphabetic Mode"
+msgstr "알파벳 모드"
+
+msgid "Apply"
+msgstr "적용"
+
+msgid "Apply any changes made to the properties"
+msgstr "속성에 만들어진 모든 변경 적용"
+
+msgid "Arc"
+msgstr "아크"
+
+msgid "Arc drawing mode"
+msgstr "아크 드로잉 모드"
+
+msgid "At least one vertex could not be normalized!"
+msgstr "적어도 하나의 버텍스가 정상화되지 않았습니다!"
+
+msgid "Automatic Title"
+msgstr "자동 도구 설명"
+
+msgid "Automatically generate title"
+msgstr "자동으로 도구 설명 생성"
+
+msgid "B axis (around Y) rotation"
+msgstr "B 축(Y주변) 회전"
+
+msgid "Back to zoom in, Forward to zoom out"
+msgstr "Back to zoom in, Forward to zoom out"
+
+msgid "Ball End Drill..."
+msgstr "볼 드릴링 커터"
+
+msgid "Ball End Mill"
+msgstr "볼 엔드 밀"
+
+msgid "Blend"
+msgstr "블렌드"
+
+msgid "Border Width"
+msgstr "경계 너비"
+
+msgid "Both halves"
+msgstr "내부 및 외부"
+
+msgid "Boundary"
+msgstr "경계"
+
+msgid "Brinell Hardness of raw material"
+msgstr "재질의 브리넬 경도"
+
+msgid "Brinell hardness of raw material"
+msgstr "재질의 브리넬 경도"
+
+msgid "C axis (around Z) rotation"
+msgstr "C 축(Z 주변) 회전"
+
+msgid "Cancel"
+msgstr "취소"
+
+msgid "Cancel operation"
+msgstr "작업 취소"
+
+msgid "Carbide"
+msgstr "카바이드"
+
+msgid "Carbide "
+msgstr "카바이드"
+
+msgid "Center"
+msgstr "중심"
+
+msgid "Centre Drill Bit"
+msgstr "센터 드릴 비트"
+
+msgid "Centre Drill..."
+msgstr "센터 드릴..."
+
+msgid "Chamfer"
+msgstr "챔퍼(베벨)"
+
+msgid "Chamfer Mill..."
+msgstr "챔퍼 밀..."
+
+msgid "Chamfer Operation..."
+msgstr "챔퍼 작업..."
+
+msgid "Chamfering Bit"
+msgstr "챔퍼링 비트"
+
+msgid "Chamfering bit"
+msgstr "챔퍼링 비트(베벨)"
+
+msgid "ChangeOwner"
+msgstr "사용자 전환"
+
+msgid "Character Space Percentage"
+msgstr "문자 간격 퍼센트"
+
+msgid "Choose a directory:"
+msgstr "디렉토리 선택: "
+
+msgid "Choose a file"
+msgstr "파일 선택"
+
+msgid "Choose shared library file"
+msgstr "라이브러리 공유 파일 선택"
+
+msgid "Circle"
+msgstr "서클"
+
+msgid "Circle drawing mode"
+msgstr "Circle drawing mode"
+
+msgid "Clearance Tool"
+msgstr "제거 도구"
+
+msgid "Click centre position to rotate about"
+msgstr "Click centre position to rotate about"
+
+msgid "Click centre position to scale about"
+msgstr "Click centre position to scale about"
+
+msgid "Click position to move from"
+msgstr "Click position to move from"
+
+msgid "Click position to move to"
+msgstr "Click position to move to"
+
+msgid "Combine selected sketches"
+msgstr "선텍 스케치 결합"
+
+msgid "Combine sketches"
+msgstr "스케치 결함"
+
+msgid "Common"
+msgstr "커먼(교차)"
+
+msgid "Cone"
+msgstr "콘"
+
+msgid "Contour spline deviation"
+msgstr "등고선 스플라인 편차"
+
+msgid "Convert Mesh To Triangles"
+msgstr "메쉬를 삼각으로 변환"
+
+msgid "Convert sketch to face"
+msgstr "스케치를 페이스로 변환"
+
+msgid "Coordinate System"
+msgstr "좌표계"
+
+msgid "Copies the selected items to the clipboard"
+msgstr "선택 항목을 클립보드로 복사"
+
+msgid "Copy\tCtrl+C"
+msgstr "복사\tCtrl+C"
+
+msgid "Copy Mirror"
+msgstr "대칭 복사"
+
+msgid "Copy Parallel"
+msgstr "평행 복사"
+
+msgid "Copy Rotate"
+msgstr "회전 복사"
+
+msgid "Copy Translate"
+msgstr "이동 복사"
+
+msgid "Copy and mirror selected items"
+msgstr "선택 항목 복사 및 대칭"
+
+msgid "Copy and rotate selected items"
+msgstr "선택 항목 복사 및 회전"
+
+msgid "Copy and translate selected items"
+msgstr "선택 항목 복사 및 이동"
+
+msgid "Copy selected items to the clipboard"
+msgstr "선택 항목을 클립보드로 복사"
+
+msgid "Couldn't open file"
+msgstr "파일을 열 수 없습니다."
+
+msgid "CounterBore"
+msgstr "카운터보어(축소)"
+
+msgid "CounterBore Operation..."
+msgstr "카운터보어 작업..."
+
+msgid "Create a Coordinate System"
+msgstr "좌표계 만들기"
+
+msgid "Create a lofted face"
+msgstr "로프트 페이스 만들기"
+
+msgid "Ctrl key does rotate"
+msgstr "Ctrl 키는 회전"
+
+msgid "Cuboid"
+msgstr "큐보이드"
+
+msgid "Cut"
+msgstr "컷(절단)"
+
+msgid "Cut\tCtrl+X"
+msgstr "잘라내기\tCtrl+X"
+
+msgid "Cut one solid from another"
+msgstr "다른 하나에서 1 솔리드 잘라내기"
+
+msgid "Cut selected items to the clipboard"
+msgstr "선택 항목을 클립보드로 잘라내기"
+
+msgid "Cylinder"
+msgstr "실린더"
+
+msgid "DXF"
+msgstr "DXF"
+
+msgid "DXF files"
+msgstr "DXF 파일"
+
+msgid "Delete\tDel"
+msgstr "삭제\tDel"
+
+msgid "Delete Marked Items"
+msgstr "표시된 항목 삭제"
+
+msgid "Demo Print Preview"
+msgstr "인쇄 미리보기"
+
+msgid "Design Rules Adjustment..."
+msgstr "디자인 규칙 조정..."
+
+msgid "Design Rules Check..."
+msgstr "디자인 규칙 확인..."
+
+msgid "Designe Rules Adjustment"
+msgstr "디자인 규칙 조정"
+
+msgid "Designe Rules Check"
+msgstr "디자인 규칙 확인"
+
+msgid "Dimension"
+msgstr "치수"
+
+msgid "Dimension drawing"
+msgstr "Dimension drawing"
+
+msgid "Distance"
+msgstr "거리"
+
+msgid "Down"
+msgstr "아래"
+
+msgid "Drag to move view"
+msgstr "Drag to move view"
+
+msgid "Drag to zoom in and out"
+msgstr "Drag to zoom in and out"
+
+msgid "Drag with left button to window select"
+msgstr "Drag with left button to window select"
+
+msgid "Drag with the left mouse button"
+msgstr "Drag with the left mouse button"
+
+msgid "Dragging a window"
+msgstr "Dragging a window"
+
+msgid "Dragging a window or picking a point"
+msgstr "Dragging a window or picking a point"
+
+msgid "Draw Circles"
+msgstr "서클 그리기"
+
+msgid "Draw Ellipses"
+msgstr "일립스(타원) 그리기"
+
+msgid "Draw Infinite Lines"
+msgstr "무한 라인 그리기"
+
+msgid "Draw Points"
+msgstr "포인트 그리기"
+
+msgid "Draw Regular Shapes"
+msgstr "정규 쉐이프 그리기"
+
+msgid "Draw a sketch"
+msgstr "스케치 그리기"
+
+msgid "Draw circles through 3 points"
+msgstr "3포인트를 통해 서클 그리기"
+
+msgid "Draw circles, centre and point"
+msgstr "중심과 포인트로 서클 그리기"
+
+msgid "Draw circles, centre and radius"
+msgstr "중심과 반경으로 서클 그리기"
+
+msgid "Draw ellipses"
+msgstr "일립스 그리기"
+
+msgid "Draw regular shapes; rectangles, polygons, obrounds"
+msgstr "정규 쉐이프 드로우: 사각형, 폴리곤, 회로 "
+
+msgid "Drawing"
+msgstr "드로잉"
+
+msgid "Drill Bit"
+msgstr "드릴 비트"
+
+msgid "Drill..."
+msgstr "드릴..."
+
+msgid "Drilling Operation..."
+msgstr "드릴링 작업..."
+
+msgid "Edge"
+msgstr "엣지"
+
+msgid "Edge Chamfer"
+msgstr "엣지 챔퍼"
+
+msgid "Edge Fillet"
+msgstr "엣지 필렛"
+
+msgid "Edge cannot have more than 2 faces!"
+msgstr "엣지는 2개 이상의 페이스를 가질 수 없습니다!"
+
+msgid "Edges"
+msgstr "엣지"
+
+msgid "Edit"
+msgstr "편집"
+
+msgid "Ellipse"
+msgstr "일립스"
+
+msgid "End Mill"
+msgstr "엔드 밀"
+
+msgid "End Mill..."
+msgstr "엔드 밀..."
+
+msgid "Enter Blend Radius"
+msgstr "블렌드 반경 입력"
+
+msgid "Enter Offset Value, + for making bigger, - for making smaller"
+msgstr "옵셋 값 입력, + 크게, - 작게"
+
+msgid "Enter Sketch Mode"
+msgstr "스케치 모드 입력"
+
+msgid "Enter angle to rotate by"
+msgstr "회전할 각도 입력"
+
+msgid "Enter chamfer distance"
+msgstr "챔퍼 거리 입력"
+
+msgid "Enter number of copies"
+msgstr "복사할 수 입력"
+
+msgid "Enter scale factor"
+msgstr "스케일 요소 입력"
+
+msgid "Enter view rotating mode"
+msgstr "회전 모드 입력"
+
+msgid "Error! The 'Stop Picking' button shouldn't have been available!"
+msgstr "오류! \"선택 멈추기\" - 버튼을 사용할 수 없었습니다."
+
+msgid "Estimate when possible"
+msgstr "가능한 경우 계산"
+
+msgid "Exit\tCtrl+Q"
+msgstr "종료\tCtrl+Q"
+
+msgid "Exit Full Screen Mode"
+msgstr "전체 화면 모드 종료"
+
+msgid "Extrude"
+msgstr "익스트루드"
+
+msgid "Extrude a sketch"
+msgstr "스케치 익스트루드(압출)"
+
+msgid "Extrude a wire or face"
+msgstr "와이어 또는 페이스 익스트루드"
+
+msgid "Extruded Solid"
+msgstr "익스트루드 솔리드"
+
+msgid "Face"
+msgstr "페이스"
+
+msgid "Face Name"
+msgstr "페이스 명"
+
+msgid "Faces"
+msgstr "페이스"
+
+msgid "Failed to load resource image"
+msgstr "리소스 이미지를 열지 못했습니다."
+
+msgid "False"
+msgstr "아니오"
+
+msgid "Fatal Error converting sketch to face"
+msgstr "치명적인 오류로 스케치를 페이스로 변환하는 데 실패했습니다."
+
+msgid "Fatal error making extruded solid"
+msgstr "치명적인 오류로 익스트루드 솔리드 만드는 데 실패했습니다."
+
+msgid "Fatal error making ruled solid"
+msgstr "치명적인 오류로 관련 솔리드를 만드는 데 실패했습니다."
+
+msgid "Feeds and Speeds"
+msgstr "피드와 속도"
+
+msgid "Female half"
+msgstr "외부 부품"
+
+msgid "File Path"
+msgstr "파일 경로"
+
+msgid "Fillet"
+msgstr "필렛(라운딩)"
+
+msgid "Find common solid between two solids"
+msgstr "2 솔리드 사이의 공통 솔리드 찾기"
+
+msgid "Finish drawing"
+msgstr "드로잉 끝내기"
+
+msgid "Finish picking"
+msgstr "선택 끝내기"
+
+msgid "Fit view to extents"
+msgstr "윈도우에 뷰 맞추기"
+
+msgid "Fit view to extents, but no rotation"
+msgstr "윈도우에 뷰 맞추기(뷰 회전 안함)"
+
+msgid "Fixtures"
+msgstr "좌표계(조정)"
+
+msgid "For a more modern version of adaptive roughing, see Julian Todd and
Martin Dunschen of http://www.freesteel.co.uk/"
+msgstr "적응형 러핑(황삭)의 최신 버전에 대한 내용은,
http://www.freesteel.co.uk/ 의 Julian Todd 및 Martin Dunschen을
참고하십시오 ."
+
+msgid "Force closed shape"
+msgstr "닫힌 쉐이프 전용"
+
+msgid "Forward to zoom in, Back to zoom out"
+msgstr "앞으로 확대, 뒤로 축소"
+
+msgid "Full screen"
+msgstr "전체 화면"
+
+msgid "Fuse"
+msgstr "퓨즈(연결)"
+
+msgid "Fuse Solids"
+msgstr "솔리드 연결"
+
+msgid "Fuse one solid to another"
+msgstr "다른 하나에서 1 솔리드 연결"
+
+msgid "GCode generation"
+msgstr "G 코드 생성"
+
+msgid "General Tools"
+msgstr "일반 도구"
+
+msgid "Generated"
+msgstr "생성"
+
+msgid "Generated from edge"
+msgstr "엣지에서 생성하기"
+
+msgid "Geometry Tool Bar"
+msgstr "지오메트리 도구바"
+
+msgid "Geometry Tools"
+msgstr "지오메트리 도구"
+
+msgid "Get Position"
+msgstr "위치"
+
+msgid "Go back to previous view"
+msgstr "이전 뷰로 이동"
+
+msgid "Graphics"
+msgstr "그래픽"
+
+msgid "Gripper"
+msgstr "그리퍼"
+
+msgid "Group"
+msgstr "그룹"
+
+msgid "Group selected items"
+msgstr "선택 항목 그룹"
+
+msgid "Heeks files"
+msgstr "Heeks 파일"
+
+msgid "HeeksArt is a free random add-on to HeeksCAD"
+msgstr "HeeksArt는 HeeksCAD 무료 임의 Add On입니다."
+
+msgid "HeeksCAD plugin libraries"
+msgstr "HeeksCAD 플러그인 라이브러리"
+
+msgid "HeeksCNC is the free machining add-on to HeeksCAD"
+msgstr "HeeksCNC는 HeeksCAD 무료 가공 Add On입니다."
+
+msgid "High Speed Steel"
+msgstr "HSS(고속도강)"
+
+msgid "Hold middle mouse button down to pan"
+msgstr "Hold middle mouse button down to pan"
+
+msgid "Horizontal Angle"
+msgstr "수평 각도"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "IGES files"
+msgstr "IGES 파일"
+
+msgid "IGES import not done!"
+msgstr "IGES 수입을 완료하지 못했습니다!"
+
+msgid "Image"
+msgstr "이미지"
+
+msgid "Import"
+msgstr "수입"
+
+msgid "Import file"
+msgstr "파일 수입"
+
+msgid "Infinite Line"
+msgstr "무한 라인"
+
+msgid "Infinite line drawing"
+msgstr "Infinite line drawing"
+
+msgid "Inlay Operation..."
+msgstr "인레이 작업..."
+
+msgid "Inlay spline deviation"
+msgstr "인레이 스플라인 편차"
+
+msgid "Input"
+msgstr "입력"
+
+msgid "Input Mode"
+msgstr "입력 모드"
+
+msgid "Input extrusion height"
+msgstr "익스트루드 높이 입력"
+
+msgid "Intersection of Solids"
+msgstr "솔리드의 교차점"
+
+msgid "Invalid file type chosen"
+msgstr "잘못된 파일 형식입니다."
+
+msgid "Is Deleted"
+msgstr "삭제"
+
+msgid "Knot"
+msgstr "매듭"
+
+msgid "Known Files"
+msgstr "모든 지원 파일"
+
+msgid "Leave manually assigned title"
+msgstr "수동으로 할당 제목 부여(AUS)"
+
+msgid "Left"
+msgstr "좌"
+
+msgid "Left button for selecting objects"
+msgstr "Left button for selecting objects"
+
+msgid "Length"
+msgstr "길이"
+
+msgid "Line"
+msgstr "라인"
+
+msgid "Line drawing mode"
+msgstr "Line drawing mode"
+
+msgid "Loft two sketches"
+msgstr "2 스케치 로프트(연결)"
+
+msgid "Lofted Body"
+msgstr "로프트 바디"
+
+msgid "Machining"
+msgstr "CNC"
+
+msgid "Magnifying by dragging a window"
+msgstr "Magnifying by dragging a window"
+
+msgid "Make Coordinate System"
+msgstr "좌표계 만들기"
+
+msgid "Make Python Script"
+msgstr "Python 스크립트 만들기"
+
+msgid "Make Sketch"
+msgstr "스케치 만들기"
+
+msgid "Make To Sketch"
+msgstr "스케치 만들기"
+
+msgid "Make a chamfer on selected edges"
+msgstr "선택 엣지에 챔퍼 만들기"
+
+msgid "Make a fillet on selected edges"
+msgstr "선택 엣지에 필렛 \"라운딩\" 만들기"
+
+msgid "Make a selection:"
+msgstr "선택 만들기:"
+
+msgid "Make selected lines and arcs into a new sketch"
+msgstr "선택 라인과 아크로 새 스케치 만들기"
+
+msgid "Male half"
+msgstr "내부 부품"
+
+msgid "Mark"
+msgstr "마크"
+
+msgid "Maximum Material Removal Rate (inches^3/min)"
+msgstr "최대 재질 제거율(inches^3/min)"
+
+msgid "Maximum Material Removal Rate (mm^3/min)"
+msgstr "최대 재질 제거율(mm^3/min)"
+
+msgid "Maximum scale threshold (1.0 - must be same size, 1.5 (can be half
as big again or 2/3 size)"
+msgstr "최대 크기 임계값(1.0 - 동일 크기만, bis 1.5 - 절반 보다 크거나
2/3 크기)"
+
+msgid "Mesh"
+msgstr "메쉬"
+
+msgid "Mesh Edge"
+msgstr "메쉬 엣지"
+
+msgid "Mesh Face"
+msgstr "메쉬 페이스"
+
+msgid "Mesh Vertex"
+msgstr "메쉬 버텍스"
+
+msgid "Middle button to pan view"
+msgstr "중 버튼으로 이동 뷰"
+
+msgid "Middle button to rotate view"
+msgstr "Middle button to rotate view"
+
+msgid "Minimum correlation factor (0.0 (nothing like it) -> 1.0 (perfect
match))"
+msgstr "최소 상관 요소 (0.0(거의 모든) -> 1.0(완벽하게 일치))"
+
+msgid "Mirror Axis"
+msgstr "대칭 축"
+
+msgid "Mirror all x<1"
+msgstr "모든 x 대칭<1"
+
+msgid "Mirror selected items"
+msgstr "선택 항목 대칭"
+
+msgid "Modified"
+msgstr "수정"
+
+msgid "Mouse wheel to zoom in and out"
+msgstr "Mouse wheel to zoom in and out"
+
+msgid "Move Mirror"
+msgstr "대칭 이동"
+
+msgid "Move Rotate"
+msgstr "회전 이동"
+
+msgid "Move Scale"
+msgstr "스케일 이동"
+
+msgid "Move Translate"
+msgstr "오브젝트 이동"
+
+msgid "NC files"
+msgstr "NC 파일"
+
+msgid "Name"
+msgstr "이름"
+
+msgid "New\tCtrl+N"
+msgstr "새 파일\tCtrl+N"
+
+msgid "New Adaptive Roughing Operation..."
+msgstr "새 적응형 러핑(황삭) 작업..."
+
+msgid "New Ball End Mill..."
+msgstr "새 볼 엔드 밀..."
+
+msgid "New Centre Drill..."
+msgstr "새 센터 드릴..."
+
+msgid "New Chamfer Mill..."
+msgstr "새 챔퍼 밀..."
+
+msgid "New Chamfer Operation..."
+msgstr "새 챔퍼 작업..."
+
+msgid "New Contour Operation..."
+msgstr "새 등고선 작업..."
+
+msgid "New CounterBore Cycle Operation..."
+msgstr "새 카운터보어 사이클 작업..."
+
+msgid "New CounterBore Operation..."
+msgstr "새 카운터보어 작업..."
+
+msgid "New Cutting Rate Reference..."
+msgstr "새 커팅 비율 참조..."
+
+msgid "New Cutting Tool Definition..."
+msgstr "새 커팅 도구 정의..."
+
+msgid "New Drill Cycle Operation..."
+msgstr "새 드릴 사이클 작업..."
+
+msgid "New Drill..."
+msgstr "새 드릴..."
+
+msgid "New Drilling Operation..."
+msgstr "새 드릴링 작업..."
+
+msgid "New End Mill..."
+msgstr "새 엔드 밀..."
+
+msgid "New Fixture..."
+msgstr "새 좌표계의 수정..."
+
+msgid "New Pocket Operation..."
+msgstr "새 포켓 작업..."
+
+msgid "New Profile Operation..."
+msgstr "새 프로파일 작업..."
+
+msgid "New Slot Drill..."
+msgstr "새 슬롯 드릴..."
+
+msgid "New Special Adaptive Roughing Operation..."
+msgstr "새 특별 적응형 러핑(황삭) 작업..."
+
+msgid "New Speed Reference..."
+msgstr "새 스피드 자료..."
+
+msgid "New Tool Length Switch..."
+msgstr "새 도구 길이 전환"
+
+msgid "New Touch Probe..."
+msgstr "새 터치 프로브..."
+
+msgid "New Turning Tool..."
+msgstr "새 터닝 도구..."
+
+msgid "New file"
+msgstr "새 파일"
+
+msgid "No file specified!"
+msgstr "지정된 파일이 없습니다."
+
+msgid "Normalize All Vertices"
+msgstr "모든 버텍스 정상화 "
+
+msgid "Number of elements"
+msgstr "요소의 수"
+
+msgid "Number of items selected"
+msgstr "선택 항목의 수"
+
+msgid "Number of sample points"
+msgstr "샘플 포인트의 수"
+
+msgid "OK"
+msgstr "확인"
+
+msgid "Objects"
+msgstr "오브젝트"
+
+msgid "Offset Shape"
+msgstr "쉐이프 옵셋"
+
+msgid "Offset value"
+msgstr "옵셋 값"
+
+msgid "Ok"
+msgstr "확인"
+
+msgid "On"
+msgstr "라인 위"
+
+msgid "Open\tCtrl+O"
+msgstr "열기\tCtrl+O"
+
+msgid "Open BOM File"
+msgstr "BOM 파일 열기"
+
+msgid "Open NC File"
+msgstr "NC 파일 열기"
+
+msgid "Open NC file"
+msgstr "NC 파일 열기"
+
+msgid "Open Recent"
+msgstr "최근 파일"
+
+msgid "Open file"
+msgstr "파일 열기"
+
+msgid "OpenNC"
+msgstr "NC(G-코드) 열기"
+
+msgid "Operations"
+msgstr "작업"
+
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/PyHeeksCAD/PythonInterface.cpp Sun Jul 3 22:55:33 2011
+++ /trunk/PyHeeksCAD/PythonInterface.cpp Wed Nov 2 14:38:29 2011
@@ -403,6 +403,11 @@
{
return wxGetApp().PickObjects(Ctt(str), marking_filter, m_just_one);
}
+
+static void PyOnOpenButton()
+{
+ wxGetApp().OnOpenButton();
+}
static bool PyOpenFile(const char* str)
{
@@ -511,5 +516,6 @@
bp::def("GetFirstBody", GetFirstBody,
bp::return_value_policy<bp::reference_existing_object>());
bp::def("GetNextBody", GetNextBody,
bp::return_value_policy<bp::reference_existing_object>());
bp::def("PickObjects", PickObjects);
+ bp::def("OnOpenButton", PyOnOpenButton);
bp::def("OpenFile", PyOpenFile);
}
=======================================
--- /trunk/src/HeeksCAD.cpp Mon Jun 20 16:12:27 2011
+++ /trunk/src/HeeksCAD.cpp Wed Nov 2 14:38:29 2011
@@ -462,9 +462,9 @@
if(!(param.Lower().EndsWith(_T(".so"))))
#endif
{
- wxGetApp().OnBeforeNewOrOpen(true, wxOK);
+ OnBeforeNewOrOpen(true, wxOK);
OpenFile(parser.GetParam(i));
- wxGetApp().OnNewOrOpen(true, wxOK);
+ OnNewOrOpen(true, wxOK);
}
}
}
@@ -887,7 +887,7 @@
HeeksObj *existing = NULL;
- existing = wxGetApp().GetIDObject(object->GetIDGroupType(),
object->m_id);
+ existing = GetIDObject(object->GetIDGroupType(), object->m_id);
if ((existing != NULL) && (existing != object))
{
@@ -1190,6 +1190,48 @@
return false;
}
+
+void HeeksCADapp::OnOpenButton()
+{
+ wxString default_directory = wxGetCwd();
+
+ if (m_recent_files.size() > 0)
+ {
+ #ifdef WIN32
+ wxString delimiter(_T("\\"));
+ #else
+ wxString delimiter(_T("/"));
+ #endif // WIN32
+
+ default_directory = *(m_recent_files.begin());
+ int last_directory_delimiter = default_directory.Find(delimiter[0],true);
+ if (last_directory_delimiter > 0)
+ {
+ default_directory.Remove(last_directory_delimiter);
+ }
+ }
+
+ wxFileDialog dialog(m_frame, _("Open file"), default_directory,
wxEmptyString, GetKnownFilesWildCardString());
+ dialog.CentreOnParent();
+
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ int res = CheckForModifiedDoc();
+ if(res != wxCANCEL)
+ {
+ OnBeforeNewOrOpen(true, res);
+ Reset();
+ if(!OpenFile(dialog.GetPath().c_str()))
+ {
+ wxString str = wxString(_("Invalid file type chosen")) + _T(" ") +
_("expecting") + _T(" ") + GetKnownFilesCommaSeparatedList();
+ wxMessageBox(str);
+ }
+ OnNewOrOpen(true, res);
+ ClearHistory();
+ SetLikeNewFile();
+ }
+ }
+}
bool HeeksCADapp::OpenFile(const wxChar *filepath, bool import_not_open,
HeeksObj* paste_into, HeeksObj* paste_before, bool retain_filename /* =
true */ )
{
@@ -1198,9 +1240,9 @@
m_in_OpenFile = true;
m_file_open_or_import_type = FileOpenOrImportTypeOther;
double file_open_matrix[16];
- if(import_not_open && wxGetApp().m_current_coordinate_system)
- {
- extract(wxGetApp().m_current_coordinate_system->GetMatrix(),
file_open_matrix);
+ if(import_not_open && m_current_coordinate_system)
+ {
+ extract(m_current_coordinate_system->GetMatrix(), file_open_matrix);
m_file_open_matrix = file_open_matrix;
}
@@ -1659,7 +1701,7 @@
if(wf.EndsWith(_T(".heeks")))
{
// call external OnSave functions
- for(std::list< void(*)(bool) >::iterator It =
wxGetApp().m_on_save_callbacks.begin(); It !=
wxGetApp().m_on_save_callbacks.end(); It++)
+ for(std::list< void(*)(bool) >::iterator It =
m_on_save_callbacks.begin(); It != m_on_save_callbacks.end(); It++)
{
void(*callbackfunc)(bool) = *It;
(*callbackfunc)(false);
@@ -1742,7 +1784,7 @@
{
glClear(GL_DEPTH_BUFFER_BIT);
CoordinateSystem::rendering_current = true;
- m_current_coordinate_system->glCommands(false,
wxGetApp().m_marked_list->ObjectMarked(m_current_coordinate_system), false);
+ m_current_coordinate_system->glCommands(false,
m_marked_list->ObjectMarked(m_current_coordinate_system), false);
CoordinateSystem::rendering_current = false;
}
}
@@ -1756,7 +1798,7 @@
if(m_current_coordinate_system)
{
CoordinateSystem::rendering_current = true;
- m_current_coordinate_system->glCommands(false,
wxGetApp().m_marked_list->ObjectMarked(m_current_coordinate_system), false);
+ m_current_coordinate_system->glCommands(false,
m_marked_list->ObjectMarked(m_current_coordinate_system), false);
CoordinateSystem::rendering_current = false;
}
if(m_show_datum_coords_system)
@@ -1893,7 +1935,7 @@
// for sketch mode, only allow items in the sketch to be selected
if(m_sketch_mode)
{
- m_sketch->glCommands(select, marked ||
wxGetApp().m_marked_list->ObjectMarked(m_sketch), no_color);
+ m_sketch->glCommands(select, marked ||
m_marked_list->ObjectMarked(m_sketch), no_color);
}
else
{
@@ -1904,7 +1946,7 @@
if(object->OnVisibleLayer() && object->m_visible)
{
if(select)glPushName(object->GetIndex());
- object->glCommands(select, marked ||
wxGetApp().m_marked_list->ObjectMarked(object), no_color);
+ object->glCommands(select, marked ||
m_marked_list->ObjectMarked(object), no_color);
if(select)glPopName();
}
}
@@ -1933,7 +1975,7 @@
bool HeeksCADapp::IsModified(void){
if(m_isModifiedValid)return m_isModified;
- for(std::list< bool(*)() >::iterator It =
wxGetApp().m_is_modified_callbacks.begin(); It !=
wxGetApp().m_is_modified_callbacks.end(); It++)
+ for(std::list< bool(*)() >::iterator It =
m_is_modified_callbacks.begin(); It != m_is_modified_callbacks.end(); It++)
{
bool(*callbackfunc)() = *It;
bool is_modified = (*callbackfunc)();
@@ -2123,7 +2165,7 @@
void HeeksCADapp::GenerateIntersectionMenuOptions( std::list<Tool*>
&f_list )
{
- if (wxGetApp().m_marked_list->list().size() > 1)
+ if (m_marked_list->list().size() > 1)
{
f_list.push_back(&add_points_at_intersections);
}
@@ -2151,11 +2193,11 @@
AddToolListWithSeparator(f_list, temp_f_list);
temp_f_list.clear();
-
if(wxGetApp().m_current_coordinate_system)f_list.push_back(&coord_system_unset);
+ if(m_current_coordinate_system)f_list.push_back(&coord_system_unset);
#ifndef PYHEEKSCAD
// exit full screen
- if(wxGetApp().m_frame->IsFullScreen() && point.x>=0 &&
point.y>=0)temp_f_list.push_back(new CFullScreenTool);
+ if(m_frame->IsFullScreen() && point.x>=0 &&
point.y>=0)temp_f_list.push_back(new CFullScreenTool);
#endif
AddToolListWithSeparator(f_list, temp_f_list);
@@ -3642,7 +3684,7 @@
void HeeksCADapp::OnBeforeNewOrOpen(bool open, int res)
{
- for(std::list< void(*)(int, int) >::iterator It =
wxGetApp().m_beforeneworopen_callbacks.begin(); It !=
wxGetApp().m_beforeneworopen_callbacks.end(); It++)
+ for(std::list< void(*)(int, int) >::iterator It =
m_beforeneworopen_callbacks.begin(); It !=
m_beforeneworopen_callbacks.end(); It++)
{
void(*callbackfunc)(int, int) = *It;
(*callbackfunc)(open ? 1:0, res);
@@ -3651,7 +3693,7 @@
void HeeksCADapp::OnBeforeFrameDelete(void)
{
- for(std::list< void(*)() >::iterator It =
wxGetApp().m_beforeframedelete_callbacks.begin(); It !=
wxGetApp().m_beforeframedelete_callbacks.end(); It++)
+ for(std::list< void(*)() >::iterator It =
m_beforeframedelete_callbacks.begin(); It !=
m_beforeframedelete_callbacks.end(); It++)
{
void(*callbackfunc)() = *It;
(*callbackfunc)();
@@ -3723,7 +3765,7 @@
void HeeksCADapp::SetFrameTitle()
{
if(m_frame == NULL)return;
- wxString str = wxGetApp().GetAppName().c_str();
+ wxString str = GetAppName().c_str();
if((!m_untitled) || (!m_no_creation_mode))str += wxString(_T(" - ")) +
m_filepath.c_str();
m_frame->SetTitle(str);
}
@@ -4538,11 +4580,11 @@
unsigned int HeeksCADapp::GetIndex(HeeksObj *object)
{
- return wxGetApp().m_marked_list->GetIndex(object);
+ return m_marked_list->GetIndex(object);
}
void HeeksCADapp::ReleaseIndex(unsigned int index)
{
-
if(wxGetApp().m_marked_list)wxGetApp().m_marked_list->ReleaseIndex(index);
-}
+ if(m_marked_list)m_marked_list->ReleaseIndex(index);
+}
=======================================
--- /trunk/src/HeeksCAD.h Mon Jun 20 16:12:27 2011
+++ /trunk/src/HeeksCAD.h Wed Nov 2 14:38:29 2011
@@ -298,6 +298,7 @@
static void OpenDXFFile(const wxChar *filepath);
static void OpenRS274XFile(const wxChar *filepath);
bool OpenImageFile(const wxChar *filepath);
+ void OnOpenButton();
bool OpenFile(const wxChar *filepath, bool import_not_open = false,
HeeksObj* paste_into = NULL, HeeksObj* paste_before = NULL, bool
retain_filename = true );
void SaveDXFFile(const wxChar *filepath);
void SaveSTLFile(const std::list<HeeksObj*>& objects, const wxChar
*filepath, double facet_tolerance = -1.0, double* scale = NULL);
=======================================
--- /trunk/src/HeeksFrame.cpp Mon Jun 13 02:08:06 2011
+++ /trunk/src/HeeksFrame.cpp Wed Nov 2 14:38:29 2011
@@ -731,50 +731,10 @@
// and pick from three points
new_object->PickFrom1Point();
}
-
-
-
static void OnOpenButton( wxCommandEvent& event )
{
- wxString default_directory = wxGetCwd();
-
- if (wxGetApp().m_recent_files.size() > 0)
- {
- #ifdef WIN32
- wxString delimiter(_T("\\"));
- #else
- wxString delimiter(_T("/"));
- #endif // WIN32
-
- default_directory = *(wxGetApp().m_recent_files.begin());
- int last_directory_delimiter = default_directory.Find(delimiter[0],true);
- if (last_directory_delimiter > 0)
- {
- default_directory.Remove(last_directory_delimiter);
- }
- }
-
- wxFileDialog dialog(wxGetApp().m_frame, _("Open file"),
default_directory, wxEmptyString, wxGetApp().GetKnownFilesWildCardString());
- dialog.CentreOnParent();
-
- if (dialog.ShowModal() == wxID_OK)
- {
- int res = wxGetApp().CheckForModifiedDoc();
- if(res != wxCANCEL)
- {
- wxGetApp().OnBeforeNewOrOpen(true, res);
- wxGetApp().Reset();
- if(!wxGetApp().OpenFile(dialog.GetPath().c_str()))
- {
- wxString str = wxString(_("Invalid file type chosen")) + _T(" ") +
_("expecting") + _T(" ") + wxGetApp().GetKnownFilesCommaSeparatedList();
- wxMessageBox(str);
- }
- wxGetApp().OnNewOrOpen(true, res);
- wxGetApp().ClearHistory();
- wxGetApp().SetLikeNewFile();
- }
- }
+ wxGetApp().OnOpenButton();
}
static void OnImportButton( wxCommandEvent& event )
=======================================
--- /trunk/translate 3 compile from po to mo.bat Tue Aug 10 04:33:46 2010
+++ /trunk/translate 3 compile from po to mo.bat Wed Nov 2 14:38:29 2011
@@ -6,5 +6,7 @@
"C:\Program Files\GnuWin32\bin\msgfmt.exe"
-o "%HEEKSCADPATH%\fr\HeeksCAD.mo" "%HEEKSCADPATH%\translations\fr\HeeksCAD.po"
mkdir "%HEEKSCADPATH%\sk"
"C:\Program Files\GnuWin32\bin\msgfmt.exe"
-o "%HEEKSCADPATH%\sk\HeeksCAD.mo" "%HEEKSCADPATH%\translations\sk\HeeksCAD.po"
+mkdir "%HEEKSCADPATH%\ko"
+"C:\Program Files\GnuWin32\bin\msgfmt.exe"
-o "%HEEKSCADPATH%\ko\HeeksCAD.mo" "%HEEKSCADPATH%\translations\ko\HeeksCAD.po"
pause
Reply all
Reply to author
Forward
0 new messages