Skip to content

Commit

Permalink
Pull request #88: Rework Notebook Assistant docked cells
Browse files Browse the repository at this point in the history 
Merge in PAC/chatbook from bugfix/NA_DockedCellChanges to main

* commit 'ffb77e51ed188bad0767dfb2e0a87a743975945e':
  Move toolbar icons to text resources
  Update pop out button
  Rework Notebook Assistant docked cells
  • Loading branch information
@rhennigan
Kevin Daily authored and rhennigan committed Nov 20, 2024
2 parents aff6ee2 + ffb77e5 commit 8aee63d
Show file tree
Hide file tree
Showing 21 changed files with 294 additions and 562 deletions.
Binary file modified Assets/DisplayFunctions.wxf
View file
Binary file not shown.
Binary file modified Assets/Icons.wxf
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion ...rces/Icons/WorkspaceToolbarIconHistory.wl → ...oolbarIcon/WorkspaceToolbarIconHistory.wl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Graphics[
(* ::Package:: *)

RawBoxes @ ToBoxes @ Graphics[
{
Thickness[ 0.05 ],
Style[
Expand Down
40 changes: 21 additions & 19 deletions ...esources/Icons/WorkspaceToolbarIconNew.wl → ...at/ToolbarIcon/WorkspaceToolbarIconNew.wl
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
Graphics[{Thickness[0.058823529411764705],
FilledCurve[{{{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}}, {{1, 4, 3}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0},
{1, 3, 3}, {0, 1, 0}}}, {{{14., 8.}, {14., 5.}, {17., 5.}, {17., 3.},
{14., 3.}, {14., 0.}, {12., 0.}, {12., 3.}, {9., 3.}, {9., 5.},
{12., 5.}, {12., 8.}, {14., 8.}}, {{13.222000002861023, 14.},
{13.65200001001358, 14.}, {14., 13.651999950408936},
{14., 13.221999645233154}, {14., 9.}, {13., 9.}, {13., 13.},
{1., 13.}, {1., 5.}, {3.984999656677246, 5.}, {3.984999656677246, 3.},
{6.5229997634887695, 5.}, {8., 5.}, {8., 4.}, {6.769000053405762, 4.},
{3., 1.}, {3., 4.}, {0.7779998779296875, 4.}, {0.34799957275390625,
4.}, {0., 4.3490002155303955}, {0., 4.7779998779296875},
{0., 13.221999645233154}, {0., 13.651999950408936},
{0.34799957275390625, 14.}, {0.7779998779296875, 14.},
{13.222000002861023, 14.}}}]},
ImageSize -> {22., 20.}, PlotRange -> {{-5., 17.}, {-3, 17}},
(* ::Package:: *)

RawBoxes @ ToBoxes @ Graphics[{Thickness[0.058823529411764705],
FilledCurve[{{{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}}, {{1, 4, 3}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0},
{1, 3, 3}, {0, 1, 0}}}, {{{14., 8.}, {14., 5.}, {17., 5.}, {17., 3.},
{14., 3.}, {14., 0.}, {12., 0.}, {12., 3.}, {9., 3.}, {9., 5.},
{12., 5.}, {12., 8.}, {14., 8.}}, {{13.222000002861023, 14.},
{13.65200001001358, 14.}, {14., 13.651999950408936},
{14., 13.221999645233154}, {14., 9.}, {13., 9.}, {13., 13.},
{1., 13.}, {1., 5.}, {3.984999656677246, 5.}, {3.984999656677246, 3.},
{6.5229997634887695, 5.}, {8., 5.}, {8., 4.}, {6.769000053405762, 4.},
{3., 1.}, {3., 4.}, {0.7779998779296875, 4.}, {0.34799957275390625,
4.}, {0., 4.3490002155303955}, {0., 4.7779998779296875},
{0., 13.221999645233154}, {0., 13.651999950408936},
{0.34799957275390625, 14.}, {0.7779998779296875, 14.},
{13.222000002861023, 14.}}}]},
ImageSize -> {22., 20.}, PlotRange -> {{-5., 17.}, {-3, 17}},
AspectRatio -> Automatic, DefaultBaseStyle -> {}]
75 changes: 75 additions & 0 deletions ...sources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconOpenAsChatbook.wl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
(* ::Package:: *)

RawBoxes @ ToBoxes @ Graphics[
{
Thickness[ 0.11111 ],
FaceForm @ { GrayLevel[ 1 ], Opacity[ 1. ] },
FilledCurve[
{
{
{ 0, 2, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 1, 3, 3 },
{ 1, 3, 3 },
{ 1, 3, 3 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 }
},
{
{ 0, 2, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 },
{ 0, 1, 0 }
}
},
{
{
{ 5., 9. },
{ 5., 8. },
{ 7.293, 8. },
{ 4.145, 4.856 },
{ 3.949, 4.66 },
{ 3.949, 4.344 },
{ 4.145, 4.149 },
{ 4.242, 4.051 },
{ 4.371, 4. },
{ 4.5, 4. },
{ 4.629, 4. },
{ 4.758, 4.051 },
{ 4.855, 4.145 },
{ 8., 7.293 },
{ 8., 5. },
{ 9., 5. },
{ 9., 9. },
{ 5., 9. }
},
{
{ 9., 0. },
{ 0., 0. },
{ 0., 9. },
{ 3., 9. },
{ 3., 8. },
{ 1., 8. },
{ 1., 1. },
{ 8., 1. },
{ 8., 3. },
{ 9., 3. },
{ 9., 0. }
}
}
]
},
AspectRatio -> Automatic,
ImageSize -> { 12, 12 },
PlotRange -> { { -0.5, 9.5 }, { -0.5, 9.5 } }
]
42 changes: 22 additions & 20 deletions ...rces/Icons/WorkspaceToolbarIconSources.wl → ...oolbarIcon/WorkspaceToolbarIconSources.wl
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
Graphics[{Thickness[0.07692307692307693],
FaceForm[{RGBColor[1.0,1.0,1.0], Opacity[1.]}],
FilledCurve[{{{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {1, 3, 3}, {1, 3, 3}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0}, {1, 3, 3},
{0, 1, 0}, {0, 1, 0}}, {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}}},
{{{7., 1.}, {1., 1.}, {1., 11.}, {5., 11.}, {5., 8.5}, {5., 7.672999858856201},
{5.67300009727478, 7.}, {6.5, 7.}, {7., 7.}, {7., 8.}, {6.5, 8.},
{6.225000023841858, 8.}, {6., 8.223999977111816}, {6., 8.5},
{6., 10.293000221252441}, {7.292999982833862, 9.}, {8., 9.},
{8.707000017166138, 9.}, {5.853999972343445, 11.85300064086914},
{5.807999968528748, 11.89900016784668}, {5.7519999742507935, 11.935998916625977},
{5.6910001039505005, 11.961000442504883}, {5.629999995231628, 11.98699951171875},
{5.565000057220459, 12.}, {5.5, 12.}, {1., 12.}, {0.4479999542236328, 12.},
{0., 11.551000595092773}, {0., 11.}, {0., 1.}, {0., 0.4490000009536743},
{0.4479999542236328, 0.}, {1., 0.}, {7., 0.}, {7., 1.}},
{{13., 5.}, {13., 3.}, {10., 3.}, {10., 0.}, {8., 0.}, {8., 3.}, {5., 3.},
{5., 5.}, {8., 5.}, {8., 8.}, {10., 8.}, {10., 5.}, {13., 5.}}}]},
AspectRatio -> Automatic, ImageSize -> {20, 20}, PlotRange -> {{-6, 14}, {-4, 16}}]
(* ::Package:: *)

RawBoxes @ ToBoxes @ Graphics[{Thickness[0.07692307692307693],
FaceForm[{RGBColor[1.0,1.0,1.0], Opacity[1.]}],
FilledCurve[{{{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {1, 3, 3}, {1, 3, 3}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0}, {1, 3, 3},
{0, 1, 0}, {0, 1, 0}}, {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0},
{0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}}},
{{{7., 1.}, {1., 1.}, {1., 11.}, {5., 11.}, {5., 8.5}, {5., 7.672999858856201},
{5.67300009727478, 7.}, {6.5, 7.}, {7., 7.}, {7., 8.}, {6.5, 8.},
{6.225000023841858, 8.}, {6., 8.223999977111816}, {6., 8.5},
{6., 10.293000221252441}, {7.292999982833862, 9.}, {8., 9.},
{8.707000017166138, 9.}, {5.853999972343445, 11.85300064086914},
{5.807999968528748, 11.89900016784668}, {5.7519999742507935, 11.935998916625977},
{5.6910001039505005, 11.961000442504883}, {5.629999995231628, 11.98699951171875},
{5.565000057220459, 12.}, {5.5, 12.}, {1., 12.}, {0.4479999542236328, 12.},
{0., 11.551000595092773}, {0., 11.}, {0., 1.}, {0., 0.4490000009536743},
{0.4479999542236328, 0.}, {1., 0.}, {7., 0.}, {7., 1.}},
{{13., 5.}, {13., 3.}, {10., 3.}, {10., 0.}, {8., 0.}, {8., 3.}, {5., 3.},
{5., 5.}, {8., 5.}, {8., 8.}, {10., 8.}, {10., 5.}, {13., 5.}}}]},
AspectRatio -> Automatic, ImageSize -> {20, 20}, PlotRange -> {{-6, 14}, {-4, 16}}]
4 changes: 2 additions & 2 deletions Developer/Resources/WorkspaceStyles.wl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ Cell[
(*WorkspaceChatToolbarTitle*)
Cell[
StyleData[ "WorkspaceChatToolbarTitle", StyleDefinitions -> StyleData[ "WorkspaceChatToolbarButtonLabel" ] ],
FontSlant -> Italic,
FontWeight -> Plain
FontColor -> RGBColor[ "#3383AC" ],
FontSize -> 12
]

(* ::**************************************************************************************************************:: *)
Expand Down
Loading

0 comments on commit 8aee63d

Please sign in to comment.