Skip to content

Commit e699043

Browse files
Tnks2UTnks2U
authored
Merge pull request #148 from entrylabs/develop
2.0.49 PR
2 parents ffbb708 + a22b5b5 commit e699043

File tree

13 files changed

+87
-41
lines changed

13 files changed

+87
-41
lines changed

‎build/entryx64.nsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
!define MUI_UNICON "icon.ico"
1414
!define PRODUCT_NAME "Entry"
1515
!define APP_NAME "Entry.exe"
16-
!define PRODUCT_VERSION "2.0.48"
16+
!define PRODUCT_VERSION "2.0.49"
1717
!define PRODUCT_PUBLISHER "EntryLabs"
1818
!define PRODUCT_WEB_SITE "http://www.playentry.org/"
1919

‎build/entryx86.nsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
!define MUI_UNICON "icon.ico"
1414
!define PRODUCT_NAME "Entry"
1515
!define APP_NAME "Entry.exe"
16-
!define PRODUCT_VERSION "2.0.48"
16+
!define PRODUCT_VERSION "2.0.49"
1717
!define PRODUCT_PUBLISHER "EntryLabs"
1818
!define PRODUCT_WEB_SITE "http://www.playentry.org/"
1919

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"productName": "Entry",
44
"name": "entry",
5-
"version": "2.0.48",
5+
"version": "2.0.49",
66
"description": "Entry for offline",
77
"main": "src/main_build/main.bundle.js",
88
"scripts": {
@@ -31,11 +31,12 @@
3131
"license": "MIT",
3232
"dependencies": {
3333
"@electron/remote": "^1.1.0",
34+
"@entrylabs/modal": "^1.2.7",
3435
"async-csv": "^2.1.3",
3536
"axios": "^0.19.2",
3637
"cross-spawn": "^7.0.3",
37-
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.31",
38-
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.48",
38+
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.32",
39+
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.0.49",
3940
"entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/develop",
4041
"excel4node": "^1.7.0",
4142
"fs-extra": "^8.1.0",

‎src/renderer/components/workspace.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { bindActionCreators } from 'redux';
2020
import { IModalState, ModalActionCreators } from '../store/modules/modal';
2121
import { IMapDispatchToProps, IMapStateToProps } from '../store';
2222
import DragAndDropContainer from './DragAndDropContainer';
23+
import EntryModalHelper from '../helper/entry/entryModalHelper';
2324

2425
interface IProps extends IReduxDispatch, IReduxState {}
2526

@@ -133,7 +134,7 @@ class Workspace extends Component<IProps> {
133134
const addEventListener = Entry.addEventListener.bind(Entry);
134135

135136
addEventListener('openBackPack', () => {
136-
entrylms.alert(RendererUtils.getLang('[다국어미적용]\n온라인에서 사용가능'));
137+
ModalHelper.getAlertModal(RendererUtils.getLang('[다국어미적용]\n온라인에서 사용가능'));
137138
});
138139
// 교과형에서 하드웨어가 바뀔때 마다 카테고리 변화
139140
addEventListener('hwChanged', this.handleHardwareChange);
@@ -202,7 +203,7 @@ class Workspace extends Component<IProps> {
202203

203204
async handleCanvasImageSave(data: any) {
204205
if (this.isSavingCanvasData) {
205-
entrylms.alert(RendererUtils.getLang('Msgs.save_canvas_alert'));
206+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.save_canvas_alert'));
206207
} else {
207208
this.showModalProgress(
208209
'progress',
@@ -473,6 +474,8 @@ class Workspace extends Component<IProps> {
473474
}
474475

475476
if (!this.isFirstRender) {
477+
// 확대보기 상태일시 팝업 닫기
478+
Entry?.engine?.popup && Entry.engine.popup.remove();
476479
Entry.clearProject();
477480
Entry.disposeContainer();
478481
// zoom 스케일이 변경된 상태에서 new project 한 경우 블록메뉴에 스케일정보가 남아서 초기화
@@ -583,7 +586,7 @@ class Workspace extends Component<IProps> {
583586
if (filePath.endsWith('.ent')) {
584587
await this._loadProjectFromFile(filePath);
585588
} else {
586-
entrylms.alert(
589+
EntryModalHelper.getAlertModal(
587590
RendererUtils.getLang('Workspace.upload_not_supported_file_msg')
588591
);
589592
}

‎src/renderer/helper/entry/entryModalHelper.ts‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ class EntryModalHelper {
176176
});
177177
},
178178
uploadFail: (data: any) => {
179-
entrylms.alert(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
179+
EntryModalHelper.getAlertModal(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
180180
},
181181
fail: () => {
182-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
182+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
183183
},
184184
error: () => {
185-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
185+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
186186
},
187187
});
188188
}
@@ -287,13 +287,13 @@ class EntryModalHelper {
287287
});
288288
},
289289
uploadFail: (data: any) => {
290-
entrylms.alert(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
290+
EntryModalHelper.getAlertModal(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
291291
},
292292
fail: () => {
293-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
293+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
294294
},
295295
error: () => {
296-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
296+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
297297
},
298298
});
299299
}
@@ -382,13 +382,13 @@ class EntryModalHelper {
382382
createjs.Sound.stop();
383383
},
384384
uploadFail: (data: any) => {
385-
entrylms.alert(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
385+
EntryModalHelper.getAlertModal(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
386386
},
387387
fail: (data: any) => {
388-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
388+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
389389
},
390390
error: (data: any) => {
391-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
391+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
392392
},
393393
});
394394
}
@@ -516,7 +516,7 @@ class EntryModalHelper {
516516
if (!isActive) {
517517
callback && callback();
518518
} else {
519-
entrylms.alert(
519+
EntryModalHelper.getAlertModal(
520520
RendererUtils.getLang('Workspace.deselect_expansion_block_warning')
521521
);
522522
}
@@ -543,7 +543,7 @@ class EntryModalHelper {
543543
if (!isActive) {
544544
callback && callback();
545545
} else {
546-
entrylms.alert(
546+
EntryModalHelper.getAlertModal(
547547
RendererUtils.getLang('Workspace.deselect_ai_utilize_block_warning')
548548
);
549549
}
@@ -682,13 +682,13 @@ class EntryModalHelper {
682682
});
683683
},
684684
uploadFail: (data: any) => {
685-
entrylms.alert(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
685+
EntryModalHelper.getAlertModal(RendererUtils.getLang(`${data.messageParent}.${data.message}`));
686686
},
687687
fail: () => {
688-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
688+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
689689
},
690690
error: () => {
691-
entrylms.alert(RendererUtils.getLang('Msgs.error_occured'));
691+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Msgs.error_occured'));
692692
},
693693
});
694694
}
@@ -757,6 +757,12 @@ class EntryModalHelper {
757757
type: 'popup',
758758
theme: 'entry',
759759
});
760+
761+
// entryTool의 modal의 css가 덮어씌워져서, 다시 동적으로 css link를 추가
762+
const modalStyleLink = document.createElement('link');
763+
modalStyleLink.setAttribute('href', '../../../node_modules/@entrylabs/modal/dist/entry/entry-modal.css');
764+
modalStyleLink.setAttribute('rel', 'stylesheet');
765+
document.head.appendChild(modalStyleLink);
760766
} else {
761767
EntryModalHelper.popup.setData({ data: { data } });
762768
}
@@ -770,7 +776,7 @@ class EntryModalHelper {
770776
case 'save':
771777
//아무것도 입력하지 않은 경우, 빈칸 하나만 있는 것으로 처리된다.
772778
if (data.length === 1 && data[0] === '') {
773-
entrylms.alert(RendererUtils.getLang('Menus.nothing_to_import'));
779+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Menus.nothing_to_import'));
774780
} else {
775781
const list = Entry.variableContainer.selected;
776782
list.array_ = _.take(data, 5000).map((element) => {
@@ -792,7 +798,7 @@ class EntryModalHelper {
792798
.on('click', function(e: string, data: any[]) {
793799
switch (e) {
794800
case 'copied':
795-
entrylms.alert(RendererUtils.getLang('Menus.content_copied'));
801+
EntryModalHelper.getAlertModal(RendererUtils.getLang('Menus.content_copied'));
796802
break;
797803
case 'excel':
798804
//TODO 추출중입니다 이런 ModalProgress 문구가 있으면 더 좋을것 같음.
@@ -865,6 +871,19 @@ class EntryModalHelper {
865871
}
866872
return result;
867873
}
874+
875+
// 공용으로 사용할 EntryModal 래핑 메소드
876+
static async getConfirmModal(title?: String, content?: String) {
877+
const result = await window.EntryModal.confirm(title, content);
878+
879+
return result;
880+
}
881+
882+
static async getAlertModal(title?: String, content?: String) {
883+
const result = await window.EntryModal.alert(title, content);
884+
885+
return result;
886+
}
868887
}
869888

870889
export default EntryModalHelper;

‎src/renderer/helper/entry/entryUtils.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import IpcRendererHelper from '../ipcRendererHelper';
22
import StorageManager from '../storageManager';
33
import RendererUtils from '../rendererUtils';
44
import Constants from '../constants';
5+
import EntryModalHelper from './entryModalHelper';
56

67
/**
78
* 엔트리 코드로직과 관련된 유틸.
@@ -18,7 +19,7 @@ export default class {
1819
static async confirmProjectWillDismiss() {
1920
let confirmProjectDismiss = true;
2021
if (!Entry.stateManager.isSaved()) {
21-
confirmProjectDismiss = await entrylms.confirm(
22+
confirmProjectDismiss = await EntryModalHelper.getConfirmModal(
2223
RendererUtils.getLang('Menus.save_dismiss')
2324
);
2425
}
@@ -60,13 +61,9 @@ export default class {
6061
} else if (project) {
6162
let confirm = false;
6263
try {
63-
confirm = await entrylms.confirm(
64+
confirm = await EntryModalHelper.getConfirmModal(
6465
RendererUtils.getLang('Workspace.confirm_load_temporary'),
65-
RendererUtils.getLang('Workspace.confirm_load_header'),
66-
{
67-
positiveButtonText: RendererUtils.getLang('Buttons.yes'),
68-
negativeButtonText: RendererUtils.getLang('Buttons.button_no'),
69-
}
66+
RendererUtils.getLang('Workspace.confirm_load_header')
7067
);
7168

7269
if (confirm) {

‎src/renderer/initEntry.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ImportToggleHelper from './helper/importToggleHelper';
66
const lastLang = StorageManager.getPersistLangType() || 'ko';
77
const lastWSMode = StorageManager.getPersistWorkspaceMode();
88

9-
(async() => {
9+
(async () => {
1010
await ImportToggleHelper.changeLang(lastLang);
1111
await ImportToggleHelper.changeEntryStatic(lastWSMode);
1212
})();
@@ -16,3 +16,7 @@ window.entrylms = {
1616
alert: entrylms.alert,
1717
confirm: entrylms.confirm,
1818
};
19+
20+
import('@entrylabs/modal/dist/entry-modal.js').then((module) => {
21+
window.EntryModal = module;
22+
});

‎src/renderer/resources/images/about/logo.png‎

-2.42 KB
Loading

‎src/renderer/resources/lang/ko.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,6 +1255,7 @@
12551255
"python_coding": "엔트리파이선",
12561256
"show_all": "모두 보기",
12571257
"help": "도움말",
1258+
"content_copied": "내용이 복사되었습니다.",
12581259
"offline_file": "파일",
12591260
"offline_edit": "편집",
12601261
"offline_undo": "되돌리기",
@@ -1419,7 +1420,8 @@
14191420
"hardware_need_update_content": "보안 업데이트로 엔트리 웹버전은\r\n하드웨어 1.9.26 버전 이상만 지원합니다.\r\n이하 버전일 경우 프로그램을 업데이트 하세요.\r\n* 업데이트 후 블록이 보이지 않을 경우,\r\n웹브라우저의 캐시를 지워 주세요.",
14201421
"version_update_msg1": "엔트리 오프라인 새 버전(%1)을\n사용하실 수 있습니다.",
14211422
"version_update_msg2": "엔트리 하드웨어 새 버전(%1)을\n사용하실 수 있습니다.",
1422-
"version_update_msg3": "지금 업데이트 하시겠습니까?"
1423+
"version_update_msg3": "지금 업데이트 하시겠습니까?",
1424+
"save_canvas_alert": "저장 중입니다."
14231425
},
14241426
"Users": {
14251427
"auth_failed": "인증에 실패하였습니다",

‎src/renderer/resources/styles/about.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ html, body {
3232
align-items: center;
3333
}
3434
.container .container_inner .logo_wrapper .logo {
35-
width: 204px;
36-
height: 42px;
35+
width: 136px;
36+
height: 28px;
3737
}
3838
.container .container_inner .txtVersion {
3939
font-size: 16px;

0 commit comments

Comments
 (0)