Skip to content
Snippets Groups Projects
Commit c9a7f3d2 authored by Loïc Correnson's avatar Loïc Correnson
Browse files

Merge branch 'feature/ivette/views' into 'master'

[ivette] Creates new views by default, and unfold the sidebars.

See merge request frama-c/frama-c!2778
parents b2fa52ef 78757371
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ import './style.css'; ...@@ -14,7 +14,7 @@ import './style.css';
import { LabView, View, Group } from 'frama-c/LabViews'; import { LabView, View, Group } from 'frama-c/LabViews';
import Dive from 'frama-c/dive/Dive'; import Dive from 'frama-c/dive/Dive';
import { GridItem } from 'dome/layout/grids'; import { GridHbox, GridItem } from 'dome/layout/grids';
import * as Controller from './Controller'; import * as Controller from './Controller';
import ASTview from './ASTview'; import ASTview from './ASTview';
...@@ -59,11 +59,11 @@ const HistorySelectionControls = () => { ...@@ -59,11 +59,11 @@ const HistorySelectionControls = () => {
export default (() => { export default (() => {
const [sidebar, flipSidebar] = Dome.useSwitch( const [sidebar, flipSidebar] = Dome.useSwitch(
'frama-c.sidebar.unfold', 'frama-c.sidebar.unfold',
false, true,
); );
const [viewbar, flipViewbar] = Dome.useSwitch( const [viewbar, flipViewbar] = Dome.useSwitch(
'frama-c.viewbar.unfold', 'frama-c.viewbar.unfold',
false, true,
); );
return ( return (
...@@ -94,9 +94,27 @@ export default (() => { ...@@ -94,9 +94,27 @@ export default (() => {
customize={viewbar} customize={viewbar}
settings="frama-c.labview" settings="frama-c.labview"
> >
<View id="dashboard" label="Dashboard" defaultView> <View id="console" label="Console" defaultView>
<GridItem id="frama-c.console" /> <GridItem id="frama-c.console" />
</View> </View>
<View id="values" label="Values">
<GridHbox>
<GridItem id="frama-c.astview" />
<GridItem id="frama-c.values" />
</GridHbox>
<GridItem id="frama-c.properties" />
</View>
<View id="dive" label="Dive">
<GridHbox>
<GridItem id="frama-c.astview" />
<GridItem id="dive.graph" />
<GridItem id="frama-c.locations" />
</GridHbox>
<GridHbox>
<GridItem id="frama-c.properties" />
<GridItem id="frama-c.console" />
</GridHbox>
</View>
<Group id="frama-c" label="Frama-C" title="Frama-C Kernel Components"> <Group id="frama-c" label="Frama-C" title="Frama-C Kernel Components">
<Controller.Console /> <Controller.Console />
<Properties /> <Properties />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment