Skip to content

Commit 980d738

Browse files
authored
Merge branch 'master' into ask_sol_gpt
2 parents 38c2b18 + 2e23b58 commit 980d738

34 files changed

+857
-36
lines changed

apps/remix-ide/src/app/components/pinned-panel.tsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ const pinnedPanel = {
1111
displayName: 'Pinned Panel',
1212
description: 'Remix IDE pinned panel',
1313
version: packageJson.version,
14-
methods: ['addView', 'removeView', 'currentFocus', 'pinView', 'unPinView']
14+
methods: ['addView', 'removeView', 'currentFocus', 'pinView', 'unPinView', 'highlight']
1515
}
1616

1717
export class PinnedPanel extends AbstractPanel {
1818
dispatch: React.Dispatch<any> = () => {}
19-
loggedState: any
19+
loggedState: Record<string, any>
20+
highlightStamp: number
2021

2122
constructor() {
2223
super(pinnedPanel)
@@ -61,6 +62,11 @@ export class PinnedPanel extends AbstractPanel {
6162
this.emit('unPinnedPlugin', profile)
6263
}
6364

65+
highlight () {
66+
this.highlightStamp = Date.now()
67+
this.renderComponent()
68+
}
69+
6470
setDispatch (dispatch: React.Dispatch<any>) {
6571
this.dispatch = dispatch
6672
}
@@ -72,13 +78,14 @@ export class PinnedPanel extends AbstractPanel {
7278
}
7379

7480
updateComponent(state: any) {
75-
return <RemixPluginPanel header={<RemixUIPanelHeader plugins={state.plugins} pinView={this.pinView.bind(this)} unPinView={this.unPinView.bind(this)}></RemixUIPanelHeader>} plugins={state.plugins} pluginState={state.pluginState} />
81+
return <RemixPluginPanel header={<RemixUIPanelHeader plugins={state.plugins} pinView={this.pinView.bind(this)} unPinView={this.unPinView.bind(this)}></RemixUIPanelHeader>} { ...state } />
7682
}
7783

7884
renderComponent() {
7985
this.dispatch({
8086
plugins: this.plugins,
81-
pluginState: this.loggedState
87+
pluginState: this.loggedState,
88+
highlightStamp: this.highlightStamp
8289
})
8390
}
8491
}

apps/remix-ide/src/app/components/side-panel.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export class SidePanel extends AbstractPanel {
7373
await this.call('pinnedPanel', 'pinView', profile, this.plugins[profile.name].view)
7474
if (this.plugins[profile.name].active) this.call('menuicons', 'select', 'filePanel')
7575
super.remove(profile.name)
76-
this.call('menuicons', 'unlinkContent', profile)
7776
this.renderComponent()
7877
}
7978

@@ -85,7 +84,6 @@ export class SidePanel extends AbstractPanel {
8584
super.addView(profile, view)
8685
this.plugins[activePlugin].active = false
8786
this.plugins[profile.name].active = true
88-
await this.call('menuicons', 'linkContent', profile)
8987
this.showContent(profile.name)
9088
}
9189

apps/remix-ide/src/app/components/vertical-icons.tsx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,22 @@ export class VerticalIcons extends Plugin {
7979
}
8080
this.renderComponent()
8181
})
82+
83+
this.on('pinnedPanel', 'pinnedPlugin', (profile) => {
84+
Object.keys(this.icons).map((icon) => {
85+
if (this.icons[icon].profile.name === profile.name) {
86+
this.icons[icon].pinned = true
87+
} else {
88+
this.icons[icon].pinned = false
89+
}
90+
})
91+
this.renderComponent()
92+
})
93+
94+
this.on('pinnedPanel', 'unPinnedPlugin', (profile) => {
95+
if (this.icons[profile.name]) this.icons[profile.name].pinned = false
96+
this.renderComponent()
97+
})
8298
}
8399

84100
async linkContent(profile: Profile) {
@@ -87,6 +103,7 @@ export class VerticalIcons extends Plugin {
87103
this.icons[profile.name] = {
88104
profile: profile,
89105
active: false,
106+
pinned: false,
90107
canbeDeactivated: await this.call('manager', 'canDeactivate', this.profile, profile),
91108
timestamp: Date.now()
92109
}

apps/remix-ide/src/app/tabs/locale-module.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import zhJson from './locales/zh'
88
import esJson from './locales/es'
99
import frJson from './locales/fr'
1010
import itJson from './locales/it'
11+
import koJson from './locales/ko'
1112
import ruJson from './locales/ru'
1213
const _paq = window._paq = window._paq || []
1314

@@ -16,6 +17,7 @@ const locales = [
1617
{ code: 'en', name: 'English', localeName: 'English', messages: enJson },
1718
{ code: 'fr', name: 'French', localeName: 'Français', messages: frJson },
1819
{ code: 'it', name: 'Italian', localeName: 'Italiano', messages: itJson },
20+
{ code: 'ko', name: 'Korean', localeName: '한국인', messages: koJson },
1921
{ code: 'ru', name: 'Russian', localeName: 'Русский', messages: ruJson },
2022
{ code: 'es', name: 'Spanish', localeName: 'Español', messages: esJson }
2123
]

apps/remix-ide/src/app/tabs/locales/en/udapp.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109

110110
"udapp._comment_universalDappUI.tsx": "libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx",
111111
"udapp.tooltipTextRemove": "Remove from the list",
112+
"udapp.tooltipTextEdit": "Create a DApp using this contract in the main panel",
112113
"udapp.tooltipTextPin": "Pin contract",
113114
"udapp.tooltipText8": "Click for docs about using 'receive'/'fallback'",
114115
"udapp.tooltipText9": "The Calldata to send to fallback function of the contract.",
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"panel.author": "Autor",
3+
"panel.maintainedBy": "Mantenido por",
4+
"panel.documentation": "Documentación",
5+
"panel.description": "Descripción",
6+
"panel.maintainedByRemix": "Mantenido por Remix",
7+
"panel.pluginInfo": "Información del Complemento",
8+
"panel.linkToDoc": "Enlace a la documentación",
9+
"panel.makeAnissue": "Crear un asunto"
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"panel.author": "Auteur",
3+
"panel.maintainedBy": "Maintenu par :",
4+
"panel.documentation": "Documentation",
5+
"panel.description": "Description",
6+
"panel.maintainedByRemix": "Maintenu par Remix",
7+
"panel.pluginInfo": "Informations sur l'extension",
8+
"panel.linkToDoc": "Lien vers la documentation",
9+
"panel.makeAnissue": "Faire un ticket"
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"panel.author": "Autore",
3+
"panel.maintainedBy": "Mantenuto Da",
4+
"panel.documentation": "Documentazione",
5+
"panel.description": "Descrizione",
6+
"panel.maintainedByRemix": "Mantenuto da Remix",
7+
"panel.pluginInfo": "Informazioni sul plugin",
8+
"panel.linkToDoc": "Link alla documentazione",
9+
"panel.makeAnissue": "Crea una Issue"
10+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"circuit.compiler": "컴파일러",
3+
"circuit.autoCompile": "자동 컴파일",
4+
"circuit.hideWarnings": "경고 숨기기",
5+
"circuit.advancedConfigurations": "고급 설정",
6+
"circuit.compilerConfiguration": "컴파일러 설정",
7+
"circuit.prime": "프라임",
8+
"circuit.useConfigurationFile": "설정 파일 사용",
9+
"circuit.compile": "컴파일",
10+
"circuit.noFileSelected": "선택된 파일 없음",
11+
"circuit.generateR1cs": "R1CS 생성",
12+
"circuit.computeWitness": "\b증명 계산",
13+
"circuit.signalInput": "시그널 입력",
14+
"circuit.compute": "계산"
15+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"debugger.displayName": "디버거",
3+
"debugger.debuggerConfiguration": "디버거 설정",
4+
"debugger.stopDebugging": "디버깅 중지",
5+
"debugger.provideTxNumber": "유효한 트랜잭션 해시를 제공하세요.",
6+
"debugger.startDebugging": "디버깅 시작",
7+
"debugger.placeholder": "트랜잭션 해시는 0x 로 시작합니다",
8+
"debugger.debugLocaNodeLabel": "로컬 노드 강제 사용",
9+
"debugger.useGeneratedSources": "생성된 소스 사용",
10+
"debugger.debugWithGeneratedSources": "선택 시, 컴파일된 .yul 파일이 존재한다면 디버거는 그 파일을 단계별로 처리합니다.",
11+
"debugger.introduction": "트랜잭션 해시를 사용하여 디버깅할 때, 컨트랙트가 검증된 경우 Remix는 Sourcify 또는 Etherscan에서 소스 코드를 가져오려고 시도합니다. Remix 설정에 당신의 Etherscan API 키를 입력하세요. 지원되는 네트워크에 대해서는 다음을 참조해 주세요",
12+
"debugger.forceToUseCurrentLocalNode": "디버거가 현재 로컬 노드를 사용하도록 강제하기",
13+
"debugger.sourceLocationStatus1": "중단점을 찾는 중입니다, 이 과정은 다소 시간이 걸릴 수 있습니다...",
14+
"debugger.sourceLocationStatus2": "Sourcify나 Etherscan에서 소스 위치를 찾을 수 없습니다. 설정에서 Etherscan Api 키가 제공되었는지 확인해 주세요.",
15+
"debugger.sourcifyDocs": "Sourcify 문서",
16+
"debugger.noDataAvailable": "데이터 없음",
17+
"debugger.loadMore": "더 보기",
18+
"debugger.copy": "복사",
19+
"debugger.stepOverBack": "이전 단계 건너뛰기",
20+
"debugger.stepBack": "한 단계 뒤로",
21+
"debugger.stepInto": "내부로 들어가기",
22+
"debugger.stepOverForward": "다음 단계 건너뛰기",
23+
"debugger.jumpPreviousBreakpoint": "이전 중단점으로 이동",
24+
"debugger.jumpOut": "밖으로 빠져나오기",
25+
"debugger.jumpNextBreakpoint": "다음 중단점으로 이동"
26+
}

0 commit comments

Comments
 (0)