diff --git a/ivette/src/frama-c/index.tsx b/ivette/src/frama-c/index.tsx index f1afdf8d0908b5046d5ce869eb13edce087ef469..5e759842b4f30fa34f93884780214b18ec874c5f 100644 --- a/ivette/src/frama-c/index.tsx +++ b/ivette/src/frama-c/index.tsx @@ -77,7 +77,7 @@ Ivette.registerGroup({ }); Ivette.registerComponent({ - id: 'fc.kernel.serverlogs', + id: 'fc.server.serverlogs', label: 'Server Logs', title: 'Frama-C server output logs', children: <ServerLogs /> diff --git a/ivette/src/frama-c/kernel/ServerLogs.tsx b/ivette/src/frama-c/kernel/ServerLogs.tsx index d8cd454e2d714c7a1d1eaa9a3e9eda97b6785aa3..cf473d0d6269024a6fd752bc968110bc9cdc8472 100644 --- a/ivette/src/frama-c/kernel/ServerLogs.tsx +++ b/ivette/src/frama-c/kernel/ServerLogs.tsx @@ -536,7 +536,7 @@ function computeDelta(log?: Log): void { // ------------------------------------------------------------------------- export function RecordingLogs(): JSX.Element { - const { active } = Display.useComponentStatus('fc.kernel.serverlogs'); + const { active } = Display.useComponentStatus('fc.server.serverlogs'); const [isRecording] = useGlobalState(RECORDING); const onClick = (): void => RECORDING.setValue(!isRecording); return ( diff --git a/ivette/src/frama-c/plugins/eva/index.tsx b/ivette/src/frama-c/plugins/eva/index.tsx index 63eaabc68c74182139032dbb5aa8c7a2827b3ebf..1aced6c446efa710f2a9ce3c002b7cc4a5aaf6cf 100644 --- a/ivette/src/frama-c/plugins/eva/index.tsx +++ b/ivette/src/frama-c/plugins/eva/index.tsx @@ -46,7 +46,7 @@ Ivette.registerView({ layout: { 'A': 'fc.eva.summary', 'B': 'fc.eva.coverage', - 'CD': 'ivette.messages', + 'CD': 'fc.kernel.messages', }, }); diff --git a/ivette/src/ivette/laboratory.tsx b/ivette/src/ivette/laboratory.tsx index 6413e13781119605b2595ca0f5c5d05cc9b1d9f4..61eb3cb2a834c1cd38ed4d0da3c8c3f33bd63a38 100644 --- a/ivette/src/ivette/laboratory.tsx +++ b/ivette/src/ivette/laboratory.tsx @@ -639,7 +639,7 @@ function updateIndex(settings: LabSettings): void { if (theTab) { applyTab(tabKeyOf(theTab.view, theTab.custom)); } else { - const console = VIEW.getElement('ivette.console'); + const console = VIEW.getElement('fc.kernel.console'); if (console !== undefined) applyView(console); } setCurrentNone(); diff --git a/ivette/src/renderer/Controller.tsx b/ivette/src/renderer/Controller.tsx index 371961c429738178be398da5307302d23e7c5b09..4986f81b54ef3bddf4ff4bdf1ea697182c7dc5f9 100644 --- a/ivette/src/renderer/Controller.tsx +++ b/ivette/src/renderer/Controller.tsx @@ -416,7 +416,7 @@ Server.onStatus((s: Server.Status) => { return; case Server.Status.FAILURE: Display.showError('Frama-C Server Failure'); - Display.alertComponent('ivette.console'); + Display.alertComponent('fc.kernel.console'); return; } }); diff --git a/ivette/src/renderer/Messages.tsx b/ivette/src/renderer/Messages.tsx index 8fad319176192c725817ad5074021c8d5b9ca6a0..7d306012b9a0c1b5740cf094a6d48b3f81f80d68 100644 --- a/ivette/src/renderer/Messages.tsx +++ b/ivette/src/renderer/Messages.tsx @@ -203,7 +203,7 @@ function filterMessage( // -------------------------------------------------------------------------- function Section(p: Forms.SectionProps): JSX.Element { - const settings = `ivette.messages.filter.${p.label}`; + const settings = `fc.kernel.messages.filter.${p.label}`; return ( <Forms.Section label={p.label} unfold settings={settings}> {p.children} @@ -469,7 +469,7 @@ export function RenderMessages(): JSX.Element { ); const [showFilter, flipFilter] = - Dome.useFlipSettings('ivette.messages.showFilter', true); + Dome.useFlipSettings('fc.kernel.messages.showFilter', true); const MessagePanel = ( <Vbox style={{ height: '100%' }}> @@ -497,12 +497,12 @@ export function RenderMessages(): JSX.Element { /> </TitleBar> <RSplit - settings="ivette.messages.filterSplit" + settings="fc.kernel.messages.filterSplit" defaultPosition={225} unfold={showFilter} > <BSplit - settings="ivette.messages.messageSplit" + settings="fc.kernel.messages.messageSplit" defaultPosition={90} unfold={text !== ''} > @@ -511,7 +511,7 @@ export function RenderMessages(): JSX.Element { sorting={model} selection={selectedMsg?.key} onSelection={onMessageSelection} - settings="ivette.messages.table" + settings="fc.kernel.messages.table" > <MessageColumns /> </Table> @@ -551,7 +551,7 @@ States.onSyncArray(Kernel.message, () => { const many = errors > 0 ? 's' : ''; if (errors) { Display.showError(`Frama-C/${from} Error${many}`); - Display.alertComponent('ivette.messages'); + Display.alertComponent('fc.kernel.messages'); } }); diff --git a/ivette/src/renderer/command.tsx b/ivette/src/renderer/command.tsx index 52bb84fb9b696a9036984c37e855c6baca642a3d..5258e78e3ef5343ab1b8ead4a2996e9a613c18a7 100644 --- a/ivette/src/renderer/command.tsx +++ b/ivette/src/renderer/command.tsx @@ -26,7 +26,7 @@ import * as Messages from './Messages'; import * as Ivette from 'ivette'; Ivette.registerComponent({ - id: 'ivette.console', + id: 'fc.kernel.console', label: 'Console', title: 'Frama-C Command Line', preferredPosition: 'AB', @@ -34,7 +34,7 @@ Ivette.registerComponent({ }); Ivette.registerComponent({ - id: 'ivette.messages', + id: 'fc.kernel.messages', label: 'Messages', title: 'Frama-C Messages', preferredPosition: 'CD', @@ -43,7 +43,7 @@ Ivette.registerComponent({ Ivette.registerView({ id: 'ivette.console', - label: 'Frama-C', + label: 'Console', title: 'Frama-C Console & Messages', - layout: { AB: 'ivette.console', CD: 'ivette.messages' }, + layout: { AB: 'fc.kernel.console', CD: 'fc.kernel.messages' }, });