diff --git a/Assets/DisplayFunctions.wxf b/Assets/DisplayFunctions.wxf index b405aa34..b76a548e 100644 Binary files a/Assets/DisplayFunctions.wxf and b/Assets/DisplayFunctions.wxf differ diff --git a/Assets/Icons.wxf b/Assets/Icons.wxf index 6c7ec960..635321a1 100644 Binary files a/Assets/Icons.wxf and b/Assets/Icons.wxf differ diff --git a/Developer/Resources/Icons/WorkspaceToolbarIconHistory.wl b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconHistory.wl similarity index 93% rename from Developer/Resources/Icons/WorkspaceToolbarIconHistory.wl rename to Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconHistory.wl index 054d1eab..16bd69cb 100644 --- a/Developer/Resources/Icons/WorkspaceToolbarIconHistory.wl +++ b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconHistory.wl @@ -1,4 +1,6 @@ -Graphics[ +(* ::Package:: *) + +RawBoxes @ ToBoxes @ Graphics[ { Thickness[ 0.05 ], Style[ diff --git a/Developer/Resources/Icons/WorkspaceToolbarIconNew.wl b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconNew.wl similarity index 64% rename from Developer/Resources/Icons/WorkspaceToolbarIconNew.wl rename to Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconNew.wl index cf1227e4..27620b63 100644 --- a/Developer/Resources/Icons/WorkspaceToolbarIconNew.wl +++ b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconNew.wl @@ -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 -> {}] diff --git a/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconOpenAsChatbook.wl b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconOpenAsChatbook.wl new file mode 100644 index 00000000..151afaa9 --- /dev/null +++ b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconOpenAsChatbook.wl @@ -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 } } +] \ No newline at end of file diff --git a/Developer/Resources/Icons/WorkspaceToolbarIconSources.wl b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconSources.wl similarity index 70% rename from Developer/Resources/Icons/WorkspaceToolbarIconSources.wl rename to Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconSources.wl index d26d9225..58f6ffd3 100644 --- a/Developer/Resources/Icons/WorkspaceToolbarIconSources.wl +++ b/Developer/Resources/FrontEndResources/WorkspaceChat/ToolbarIcon/WorkspaceToolbarIconSources.wl @@ -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}}] diff --git a/Developer/Resources/WorkspaceStyles.wl b/Developer/Resources/WorkspaceStyles.wl index d889f801..c2e76733 100644 --- a/Developer/Resources/WorkspaceStyles.wl +++ b/Developer/Resources/WorkspaceStyles.wl @@ -59,8 +59,8 @@ Cell[ (*WorkspaceChatToolbarTitle*) Cell[ StyleData[ "WorkspaceChatToolbarTitle", StyleDefinitions -> StyleData[ "WorkspaceChatToolbarButtonLabel" ] ], - FontSlant -> Italic, - FontWeight -> Plain + FontColor -> RGBColor[ "#3383AC" ], + FontSize -> 12 ] (* ::**************************************************************************************************************:: *) diff --git a/FrontEnd/Assets/Extensions/CoreExtensions.nb b/FrontEnd/Assets/Extensions/CoreExtensions.nb index 8f9837e9..98603619 100644 --- a/FrontEnd/Assets/Extensions/CoreExtensions.nb +++ b/FrontEnd/Assets/Extensions/CoreExtensions.nb @@ -11,7 +11,7 @@ Notebook[ Cell["Chatbook Core.nb Extensions", "Title"], Cell[ StyleData["ChatStyleSheetInformation"], - TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3941018585"|> + TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3941081007"|> ], Cell[ StyleData["NotebookAssistant`Text"], @@ -13055,213 +13055,6 @@ Notebook[ ]) } ], - Cell[ - StyleData["WorkspaceToolbarIconHistory"], - TemplateBoxOptions -> { - DisplayFunction -> - (Function[ - GraphicsBox[ - { - Thickness[0.05], - StyleBox[ - { - FilledCurveBox[ - { - {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}}, - {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}}, - {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}} - }, - { - { - {4.0, 13.0}, - {16.0, 13.0}, - {16.0, 15.0}, - {4.0, 15.0}, - {4.0, 13.0} - }, - { - {4.0, 8.9882}, - {16.0, 8.9882}, - {16.0, 10.989}, - {4.0, 10.989}, - {4.0, 8.9882} - }, - { - {4.0, 5.0}, - {16.0, 5.0}, - {16.0, 7.0}, - {4.0, 7.0}, - {4.0, 5.0} - } - } - ] - }, - {FaceForm[RGBColor[1.0, 1.0, 1.0, 1.0]]}, - StripOnInput -> False - ] - }, - ImageSize -> {20.0, 20.0}, - PlotRange -> {{0.0, 20.0}, {0.0, 20.0}}, - AspectRatio -> Automatic - ] - ]) - } - ], - Cell[ - StyleData["WorkspaceToolbarIconNew"], - TemplateBoxOptions -> { - DisplayFunction -> - (Function[ - GraphicsBox[ - { - Thickness[0.0588235], - FilledCurveBox[ - { - { - {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.0, 8.0}, - {14.0, 5.0}, - {17.0, 5.0}, - {17.0, 3.0}, - {14.0, 3.0}, - {14.0, 0.0}, - {12.0, 0.0}, - {12.0, 3.0}, - {9.0, 3.0}, - {9.0, 5.0}, - {12.0, 5.0}, - {12.0, 8.0}, - {14.0, 8.0} - }, - CompressedData[ - "\n1:eJxTTMoPSmViYGCQAmIQDQR/VhZqOUCYOiD60yVfbWQ+jP6AJv4BTR8QKEFp\nLRx8GP3BHjtfBMRvcH/I74CdzwGiHXrFpZDlgUABB18ARB8oEZZG5sPMQbKX\nA0U+4ekLe2T+AtdrKHwoCEhIFUTmM6yREUbmI4UPhA8LP4R5Omj2gfko8QEA\nLWkzDA==\n " - ] - } - ] - }, - ImageSize -> {22.0, 20.0}, - PlotRange -> {{-5.0, 17.0}, {-3, 17}}, - AspectRatio -> Automatic, - DefaultBaseStyle -> { } - ] - ]) - } - ], - Cell[ - StyleData["WorkspaceToolbarIconSources"], - TemplateBoxOptions -> { - DisplayFunction -> - (Function[ - GraphicsBox[ - { - Thickness[0.0769231], - FaceForm[{RGBColor[1.0, 1.0, 1.0], Opacity[1.0]}], - FilledCurveBox[ - { - { - {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} - } - }, - { - CompressedData[ - "\n1:eJxTTMoPSmViYGBQBmIQDQEyDhD6gz1+Wg2qTsQBO18Rmf9AbaMciP6gtlHM\nAdUeKTQ+LloBTT2Yn5H2TAJNHsxX2FCEwkdyD0SeZZoKiDbg0JGFiiuhmQPm\nv/idqYjM/1GXJQ6iG/ZsUQfRESnWYP4BzzNgvgcPE5jvYH0fzO+YehjsXweO\nN2D+DrlWiP8jfoL5Cf1OsPDQgNLofFh4Q/gca+7Yo8qDwQEZKXVkPgMiPmAA\nZg4YNGTtgZiDMA+rOgZE+KPzP9gDADwyPuA=\n " - ], - { - {13.0, 5.0}, - {13.0, 3.0}, - {10.0, 3.0}, - {10.0, 0.0}, - {8.0, 0.0}, - {8.0, 3.0}, - {5.0, 3.0}, - {5.0, 5.0}, - {8.0, 5.0}, - {8.0, 8.0}, - {10.0, 8.0}, - {10.0, 5.0}, - {13.0, 5.0} - } - } - ] - }, - AspectRatio -> Automatic, - ImageSize -> {20, 20}, - PlotRange -> {{-6, 14}, {-4, 16}} - ] - ]) - } - ], Cell[ StyleData["ChatOutputStopButtonWrapper"], TemplateBoxOptions -> { diff --git a/FrontEnd/StyleSheets/Chatbook.nb b/FrontEnd/StyleSheets/Chatbook.nb index 10cf75f4..92e055d9 100644 --- a/FrontEnd/StyleSheets/Chatbook.nb +++ b/FrontEnd/StyleSheets/Chatbook.nb @@ -824,7 +824,7 @@ Notebook[ ], Cell[ StyleData["ChatStyleSheetInformation"], - TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3941018585"|> + TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3941081007"|> ], Cell[ StyleData["NotebookAssistant`Text"], @@ -13927,213 +13927,6 @@ Notebook[ ]) } ], - Cell[ - StyleData["WorkspaceToolbarIconHistory"], - TemplateBoxOptions -> { - DisplayFunction -> - (Function[ - GraphicsBox[ - { - Thickness[0.05], - StyleBox[ - { - FilledCurveBox[ - { - {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}}, - {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}}, - {{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}} - }, - { - { - {4.0, 13.0}, - {16.0, 13.0}, - {16.0, 15.0}, - {4.0, 15.0}, - {4.0, 13.0} - }, - { - {4.0, 8.9882}, - {16.0, 8.9882}, - {16.0, 10.989}, - {4.0, 10.989}, - {4.0, 8.9882} - }, - { - {4.0, 5.0}, - {16.0, 5.0}, - {16.0, 7.0}, - {4.0, 7.0}, - {4.0, 5.0} - } - } - ] - }, - {FaceForm[RGBColor[1.0, 1.0, 1.0, 1.0]]}, - StripOnInput -> False - ] - }, - ImageSize -> {20.0, 20.0}, - PlotRange -> {{0.0, 20.0}, {0.0, 20.0}}, - AspectRatio -> Automatic - ] - ]) - } - ], - Cell[ - StyleData["WorkspaceToolbarIconNew"], - TemplateBoxOptions -> { - DisplayFunction -> - (Function[ - GraphicsBox[ - { - Thickness[0.0588235], - FilledCurveBox[ - { - { - {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.0, 8.0}, - {14.0, 5.0}, - {17.0, 5.0}, - {17.0, 3.0}, - {14.0, 3.0}, - {14.0, 0.0}, - {12.0, 0.0}, - {12.0, 3.0}, - {9.0, 3.0}, - {9.0, 5.0}, - {12.0, 5.0}, - {12.0, 8.0}, - {14.0, 8.0} - }, - CompressedData[ - "\n1:eJxTTMoPSmViYGCQAmIQDQR/VhZqOUCYOiD60yVfbWQ+jP6AJv4BTR8QKEFp\nLRx8GP3BHjtfBMRvcH/I74CdzwGiHXrFpZDlgUABB18ARB8oEZZG5sPMQbKX\nA0U+4ekLe2T+AtdrKHwoCEhIFUTmM6yREUbmI4UPhA8LP4R5Omj2gfko8QEA\nLWkzDA==\n " - ] - } - ] - }, - ImageSize -> {22.0, 20.0}, - PlotRange -> {{-5.0, 17.0}, {-3, 17}}, - AspectRatio -> Automatic, - DefaultBaseStyle -> { } - ] - ]) - } - ], - Cell[ - StyleData["WorkspaceToolbarIconSources"], - TemplateBoxOptions -> { - DisplayFunction -> - (Function[ - GraphicsBox[ - { - Thickness[0.0769231], - FaceForm[{RGBColor[1.0, 1.0, 1.0], Opacity[1.0]}], - FilledCurveBox[ - { - { - {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} - } - }, - { - CompressedData[ - "\n1:eJxTTMoPSmViYGBQBmIQDQEyDhD6gz1+Wg2qTsQBO18Rmf9AbaMciP6gtlHM\nAdUeKTQ+LloBTT2Yn5H2TAJNHsxX2FCEwkdyD0SeZZoKiDbg0JGFiiuhmQPm\nv/idqYjM/1GXJQ6iG/ZsUQfRESnWYP4BzzNgvgcPE5jvYH0fzO+YehjsXweO\nN2D+DrlWiP8jfoL5Cf1OsPDQgNLofFh4Q/gca+7Yo8qDwQEZKXVkPgMiPmAA\nZg4YNGTtgZiDMA+rOgZE+KPzP9gDADwyPuA=\n " - ], - { - {13.0, 5.0}, - {13.0, 3.0}, - {10.0, 3.0}, - {10.0, 0.0}, - {8.0, 0.0}, - {8.0, 3.0}, - {5.0, 3.0}, - {5.0, 5.0}, - {8.0, 5.0}, - {8.0, 8.0}, - {10.0, 8.0}, - {10.0, 5.0}, - {13.0, 5.0} - } - } - ] - }, - AspectRatio -> Automatic, - ImageSize -> {20, 20}, - PlotRange -> {{-6, 14}, {-4, 16}} - ] - ]) - } - ], Cell[ StyleData["ChatOutputStopButtonWrapper"], TemplateBoxOptions -> { diff --git a/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb b/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb index 8c87ee03..d7f1b4d9 100644 --- a/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb +++ b/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb @@ -83,7 +83,7 @@ Notebook[ Cell[StyleData["CellExpression"], Selectable -> True], Cell[ StyleData["WorkspaceChatStyleSheetInformation"], - TaggingRules -> <|"WorkspaceChatStyleSheetVersion" -> "1.5.2.3941018585"|> + TaggingRules -> <|"WorkspaceChatStyleSheetVersion" -> "1.5.2.3941081007"|> ], Cell[ StyleData[ @@ -100,8 +100,8 @@ Notebook[ StyleDefinitions -> StyleData["WorkspaceChatToolbarButtonLabel"] ], - FontWeight -> Plain, - FontSlant -> Italic + FontSize -> 12, + FontColor -> RGBColor[0.2, 0.513725, 0.67451] ], Cell[ StyleData["ChatInput"], diff --git a/FrontEnd/TextResources/ChatbookResources.tr b/FrontEnd/TextResources/ChatbookResources.tr index f5adcc06..c9f0cda6 100644 --- a/FrontEnd/TextResources/ChatbookResources.tr +++ b/FrontEnd/TextResources/ChatbookResources.tr @@ -4500,60 +4500,43 @@ xyc4nl4Kwfno8Q8ARrPSLw== PlotRange->{{0., 20.}, {0., 20.}}], "WorkspaceToolbarIconNew" -> GraphicsBox[ - {Thickness[0.058824], FaceForm[{RGBColor[1., 1., 1.], Opacity[1.]}], + {Thickness[0.058823529411764705`], FilledCurveBox[{{{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}}, {{0, 2, 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}, {1, 3, 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}}}, {{{14., 5.}, {14., 8.}, {12., 8.}, {12., 5.}, {9., 5.}, {9., 3.}, { - 12., 3.}, {12., 0.}, {14., 0.}, {14., 3.}, {17., 3.}, {17., 5.}, {14., - 5.}}, CompressedData[" -1:eJxTTMoPSmViYGCQAmIQnWJ9379XXMqBAQxEoLQCDr6Aw6+6rD0lwtJwPoTm -gNIf7FH5Ag4+5p2OCU9f2MP4Qs0HTi10vWaPqp+BAawuVRDOf6lmyLFGRhjO -7855/ntloRacD+R9vOSrjWaeDpp9Og6o+nQcYPpgfFzi6PogtBKU1sLBh9Gw -cEDnizg8rBJZ5/6Q3wE7n8MBPT4AEYFQVA== + 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.}}, CompressedData[" +1:eJxTTMoPSmViYGCQAmIQDQR/VhZqOUCYOiD60yVfbWQ+jP6AJv4BTR8QKEFp +LRx8GP3BHjtfBMRvcH/I74CdzwGiHXrFpZDlgUABB18ARB8oEZZG5sPMQbKX +A0U+4ekLe2T+AtdrKHwoCEhIFUTmM6yREUbmI4UPhA8LP4R5Omj2gfko8QEA +LWkzDA== "]}]}, AspectRatio->Automatic, - ImageSize->{17., 14.}, - PlotRange->{{0., 17.}, {0., 14.}}], + DefaultBaseStyle->{}, + ImageSize->{22., 20.}, + PlotRange->{{-5., 17.}, {-3, 17}}], "WorkspaceToolbarIconSources" -> GraphicsBox[ - {Thickness[0.014493], - {FaceForm[{RGBColor[1., 1., 1.], Opacity[1.]}], - FilledCurveBox[{{{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {1, 3, 3}, { - 0, 1, 0}, {0, 1, 0}}, {{0, 2, 0}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0}}, {{0, - 2, 0}, {1, 3, 3}, {1, 3, 3}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0}, {1, 3, - 3}, {0, 1, 0}, {1, 3, 3}, {0, 1, 0}, {1, 3, 3}, {1, 3, 3}}}, {{{15., - 5.}, {7., 5.}, {7., 15.}, {11., 15.}, {11., 12.5}, {11., 11.673}, { - 11.673, 11.}, {12.5, 11.}, {15., 11.}, {15., 5.}}, {{12., 14.293}, { - 14.293, 12.}, {12.5, 12.}, {12.225, 12.}, {12., 12.224}, {12., 12.5}, { - 12., 14.293}}, CompressedData[" -1:eJxTTMoPSmViYGCQBmIQfftnXdaeLfoOGRPf1thvVYfTMHGWMD7dTXPVHexN -43Z5ntF3kNa/q8LWqO6wRiYqxfq+vkO+UPOBU4nqDpUv1Qw53ug7HP6qEdPv -pO5w2TdJIOKnvsPDKpF17orqDgxgYACl0fkycP6MPJCBkmjyEg7qhhxrZKT0 -4XwIrYfGF4HzN819v/zYaUE08wTQ7IPx9eD8LSfK9s2H2wOTN4Cbh+ouETQ+ -wl8wf8PCARYusHCChRssHGHhCgtnWLijxw8A7jBvnA== - "]}]}, - {FaceForm[{RGBColor[1., 1., 1.], Opacity[1.]}], - FilledCurveBox[{{{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}}}, {{{16., 9.}, {16., 12.}, {14., 12.}, {14., 9.}, {11., 9.}, {11., - 7.}, {14., 7.}, {14., 4.}, {16., 4.}, {16., 7.}, {19., 7.}, {19., 9.}, { - 16., 9.}}}]}, - {FaceForm[{RGBColor[0.4, 0.67843, 0.82353], Opacity[1.]}], - FilledCurveBox[{{{0, 2, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, { + {Thickness[0.07692307692307693], FaceForm[{RGBColor[1., 1., 1.], Opacity[ + 1.]}], FilledCurveBox[{{{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, 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}}}, CompressedData[" -1:eJxTTMoPSmVmYGBgAmJeKA0BBg4QWglKG+PgyzigqkfnC0BpHRx8mHo1HHwl -NPXofA00+9D5MPVaUFoFjQ+jDXHwYepNcPAl0NSj8znQzEXnw9Sr4OCju1fF -AQCgQRZY - "]]}}, + 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}}}, {CompressedData[" +1:eJxTTMoPSmViYGBQBmIQDQEyDhD6gz1+Wg2qTsQBO18Rmf9AbaMciP6gtlHM +AdUeKTQ+LloBTT2Yn5H2TAJNHsxX2FCEwkdyD0SeZZoKiDbg0JGFiiuhmQPm +v/idqYjM/1GXJQ6iG/ZsUQfRESnWYP4BzzNgvgcPE5jvYH0fzO+YehjsXweO +N2D+DrlWiP8jfoL5Cf1OsPDQgNLofFh4Q/gca+7Yo8qDwQEZKXVkPgMiPmAA +Zg4YNGTtgZiDMA+rOgZE+KPzP9gDADwyPuA= + "], {{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->{{0., 20.}, {0., 20.}}], + ImageSize->{20, 20}, + PlotRange->{{-6, 14}, {-4, 16}}], "WrenchIcon" -> GraphicsBox[ {GrayLevel[0.4], AbsoluteThickness[1], Opacity[1.], @@ -5605,7 +5588,22 @@ hPG91XSQ1r+rwnZQz0FvwoIfhm3KUHFtB2neB7oTgO6HhT96fAAASQiSDg== AspectRatio->Automatic, BaselinePosition->(Center -> Center), ImageSize->{17., 18.}, - PlotRange->{{-0.5, 16.5}, {-0.5, 17.5}}] + PlotRange->{{-0.5, 16.5}, {-0.5, 17.5}}], + +"WorkspaceToolbarIconOpenAsChatbook" -> GraphicsBox[ + {Thickness[0.11111], FaceForm[{GrayLevel[1], Opacity[1.]}], + FilledCurveBox[{{{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}}] } @| @| diff --git a/FrontEnd/TextResources/ChatbookStrings.tr b/FrontEnd/TextResources/ChatbookStrings.tr index c1cb1776..4bcb1838 100644 --- a/FrontEnd/TextResources/ChatbookStrings.tr +++ b/FrontEnd/TextResources/ChatbookStrings.tr @@ -202,10 +202,12 @@ "WorkspaceWindowTitle" -> "Notebook Assistant", "WorkspaceToolbarButtonLabelHistory" -> "History", "WorkspaceToolbarButtonLabelSources" -> "Sources", -"WorkspaceToolbarButtonLabelNew" -> "New", +"WorkspaceToolbarSourcesSubTitle" -> "Choose sources to be made available to the notebook assistant.", +"WorkspaceToolbarButtonLabelNew" -> "New Chat", "WorkspaceToolbarButtonTooltipHistory" -> "Manage conversations", "WorkspaceToolbarButtonTooltipSources" -> "Sources for additional material to add to the chat context", "WorkspaceToolbarButtonTooltipNew" -> "Start a new conversation", +"WorkspaceToolbarButtonTooltipOpenAsChatbook" -> "Open as a Chat Notebook", "WorkspaceSourcesOpenNotebooks" -> "Open Notebooks", "WorkspaceOutputRaftCopyAsTooltip" -> "Copy response to clipboard\[Ellipsis]", diff --git a/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr b/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr index 969b69a7..7349088c 100644 --- a/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr +++ b/FrontEnd/TextResources/ChineseSimplified/ChatbookStrings.tr @@ -202,10 +202,12 @@ "WorkspaceWindowTitle" -> "\:7B14\:8BB0\:672C\:52A9\:624B", "WorkspaceToolbarButtonLabelHistory" -> "\:5386\:53F2\:8BB0\:5F55", "WorkspaceToolbarButtonLabelSources" -> "\:8D44\:6E90", -"WorkspaceToolbarButtonLabelNew" -> "\:65B0\:5BF9\:8BDD", +"WorkspaceToolbarSourcesSubTitle" -> "Choose sources to be made available to the notebook assistant.", +"WorkspaceToolbarButtonLabelNew" -> "New Chat", "WorkspaceToolbarButtonTooltipHistory" -> "\:7BA1\:7406\:5BF9\:8BDD", "WorkspaceToolbarButtonTooltipSources" -> "\:5C06\:5176\:4ED6\:8D44\:6599\:6DFB\:52A0\:5230\:804A\:5929\:4E0A\:4E0B\:6587\:4E2D", "WorkspaceToolbarButtonTooltipNew" -> "\:5F00\:59CB\:65B0\:7684\:5BF9\:8BDD", +"WorkspaceToolbarButtonTooltipOpenAsChatbook" -> "Open as a Chat Notebook", "WorkspaceSourcesOpenNotebooks" -> "\:6253\:5F00\:7B14\:8BB0\:672C", "InlineChatButtonTooltipClose" -> "\:5173\:95ED", diff --git a/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr b/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr index 2767e1ef..e6c8c988 100644 --- a/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr +++ b/FrontEnd/TextResources/ChineseTraditional/ChatbookStrings.tr @@ -202,10 +202,12 @@ "WorkspaceWindowTitle" -> "\:7B46\:8A18\:672C\:5C0F\:5E6B\:624B", "WorkspaceToolbarButtonLabelHistory" -> "\:6B77\:53F2\:8A18\:9304", "WorkspaceToolbarButtonLabelSources" -> "\:8CC7\:6E90", -"WorkspaceToolbarButtonLabelNew" -> "\:65B0\:589E", +"WorkspaceToolbarSourcesSubTitle" -> "Choose sources to be made available to the notebook assistant.", +"WorkspaceToolbarButtonLabelNew" -> "New Chat", "WorkspaceToolbarButtonTooltipHistory" -> "\:7BA1\:7406\:6703\:8A71", "WorkspaceToolbarButtonTooltipSources" -> "\:589E\:6DFB\:984D\:5916\:4F86\:6E90\:8CC7\:6599\:81F3\:804A\:5929\:7CFB\:7D71\:4E0A\:4E0B\:6587", "WorkspaceToolbarButtonTooltipNew" -> "\:958B\:59CB\:65B0\:589E\:6703\:8A71", +"WorkspaceToolbarButtonTooltipOpenAsChatbook" -> "Open as a Chat Notebook", "WorkspaceSourcesOpenNotebooks" -> "\:958B\:555F\:7B46\:8A18\:672C", "WorkspaceOutputRaftCopyAsTooltip" -> "Copy response to clipboard\[Ellipsis]", diff --git a/FrontEnd/TextResources/French/ChatbookStrings.tr b/FrontEnd/TextResources/French/ChatbookStrings.tr index 70dc8ab6..704b789c 100644 --- a/FrontEnd/TextResources/French/ChatbookStrings.tr +++ b/FrontEnd/TextResources/French/ChatbookStrings.tr @@ -202,10 +202,12 @@ "WorkspaceWindowTitle" -> "Assistant de notebook", "WorkspaceToolbarButtonLabelHistory" -> "Historique", "WorkspaceToolbarButtonLabelSources" -> "Sources", -"WorkspaceToolbarButtonLabelNew" -> "Nouveau", +"WorkspaceToolbarSourcesSubTitle" -> "Choose sources to be made available to the notebook assistant.", +"WorkspaceToolbarButtonLabelNew" -> "New Chat", "WorkspaceToolbarButtonTooltipHistory" -> "G\[EAcute]rer les conversations", "WorkspaceToolbarButtonTooltipSources" -> "Ajouter des sources suppl\[EAcute]mentaires au contexte du chat", "WorkspaceToolbarButtonTooltipNew" -> "D\[EAcute]marrer une nouvelle conversation", +"WorkspaceToolbarButtonTooltipOpenAsChatbook" -> "Open as a Chat Notebook", "WorkspaceSourcesOpenNotebooks" -> "Ouvrir les notebooks", "WorkspaceOutputRaftCopyAsTooltip" -> "Copy response to clipboard\[Ellipsis]", diff --git a/FrontEnd/TextResources/Japanese/ChatbookStrings.tr b/FrontEnd/TextResources/Japanese/ChatbookStrings.tr index 00b044f1..a3203f23 100644 --- a/FrontEnd/TextResources/Japanese/ChatbookStrings.tr +++ b/FrontEnd/TextResources/Japanese/ChatbookStrings.tr @@ -202,10 +202,12 @@ "WorkspaceWindowTitle" -> "\:30ce\:30fc\:30c8\:30d6\:30c3\:30af\:30a2\:30b7\:30b9\:30bf\:30f3\:30c8", "WorkspaceToolbarButtonLabelHistory" -> "\:5c65\:6b74", "WorkspaceToolbarButtonLabelSources" -> "\:30BD\:30FC\:30B9", -"WorkspaceToolbarButtonLabelNew" -> "\:65B0\:898F", +"WorkspaceToolbarSourcesSubTitle" -> "Choose sources to be made available to the notebook assistant.", +"WorkspaceToolbarButtonLabelNew" -> "New Chat", "WorkspaceToolbarButtonTooltipHistory" -> "\:4F1A\:8A71\:3092\:7BA1\:7406\:3059\:308B", "WorkspaceToolbarButtonTooltipSources" -> "\:4ED6\:306E\:30BD\:30FC\:30B9\:30DE\:30C6\:30EA\:30A2\:30EB\:3092\:30C1\:30E3\:30C3\:30C8\:30B3\:30F3\:30C6\:30AD\:30B9\:30C8\:306B\:8FFD\:52A0\:3059\:308B", "WorkspaceToolbarButtonTooltipNew" -> "\:65B0\:3057\:3044\:4F1A\:8A71\:3092\:59CB\:3081\:308B", +"WorkspaceToolbarButtonTooltipOpenAsChatbook" -> "Open as a Chat Notebook", "WorkspaceSourcesOpenNotebooks" -> "\:30ce\:30fc\:30c8\:30d6\:30c3\:30af\:3092\:958b\:304f", "WorkspaceOutputRaftCopyAsTooltip" -> "Copy response to clipboard\[Ellipsis]", diff --git a/FrontEnd/TextResources/Korean/ChatbookStrings.tr b/FrontEnd/TextResources/Korean/ChatbookStrings.tr index d5aa59f2..7040ec2e 100644 --- a/FrontEnd/TextResources/Korean/ChatbookStrings.tr +++ b/FrontEnd/TextResources/Korean/ChatbookStrings.tr @@ -203,10 +203,12 @@ "WorkspaceWindowTitle" -> "\:B178\:D2B8\:BD81 \:C5B4\:C2DC\:C2A4\:D134\:D2B8", "WorkspaceToolbarButtonLabelHistory" -> "\:D788\:C2A4\:D1A0\:B9AC", "WorkspaceToolbarButtonLabelSources" -> "\:CD9C\:CC98", -"WorkspaceToolbarButtonLabelNew" -> "\:C2E0\:ADDC", +"WorkspaceToolbarSourcesSubTitle" -> "Choose sources to be made available to the notebook assistant.", +"WorkspaceToolbarButtonLabelNew" -> "New Chat", "WorkspaceToolbarButtonTooltipHistory" -> "\:B300\:D654 \:AD00\:B9AC", "WorkspaceToolbarButtonTooltipSources" -> "\:CC44\:D305 \:B0B4\:C6A9\:C5D0 \:B2E4\:B978 \:C790\:B8CC \:CD94\:AC00", "WorkspaceToolbarButtonTooltipNew" -> "\:C0C8\:B85C\:C6B4 \:B300\:D654 \:C2DC\:C791", +"WorkspaceToolbarButtonTooltipOpenAsChatbook" -> "Open as a Chat Notebook", "WorkspaceSourcesOpenNotebooks" -> "\:B178\:D2B8\:BD81 \:C5F4\:AE30", "WorkspaceOutputRaftCopyAsTooltip" -> "Copy response to clipboard\[Ellipsis]", diff --git a/FrontEnd/TextResources/Spanish/ChatbookStrings.tr b/FrontEnd/TextResources/Spanish/ChatbookStrings.tr index 090a52b3..258a16d3 100644 --- a/FrontEnd/TextResources/Spanish/ChatbookStrings.tr +++ b/FrontEnd/TextResources/Spanish/ChatbookStrings.tr @@ -202,10 +202,12 @@ "WorkspaceWindowTitle" -> "Asistente de cuadernos", "WorkspaceToolbarButtonLabelHistory" -> "Historial", "WorkspaceToolbarButtonLabelSources" -> "Fuentes", -"WorkspaceToolbarButtonLabelNew" -> "Nuevo", +"WorkspaceToolbarSourcesSubTitle" -> "Choose sources to be made available to the notebook assistant.", +"WorkspaceToolbarButtonLabelNew" -> "New Chat", "WorkspaceToolbarButtonTooltipHistory" -> "Administrar conversaciones", "WorkspaceToolbarButtonTooltipSources" -> "Agregar material de origen adicional al contexto del chat", "WorkspaceToolbarButtonTooltipNew" -> "Iniciar una nueva conversaci\[OAcute]n", +"WorkspaceToolbarButtonTooltipOpenAsChatbook" -> "Open as a Chat Notebook", "WorkspaceSourcesOpenNotebooks" -> "Abrir cuadernos", "WorkspaceOutputRaftCopyAsTooltip" -> "Copy response to clipboard\[Ellipsis]", diff --git a/Source/Chatbook/ChatModes/UI.wl b/Source/Chatbook/ChatModes/UI.wl index 0874e178..9535e0a0 100644 --- a/Source/Chatbook/ChatModes/UI.wl +++ b/Source/Chatbook/ChatModes/UI.wl @@ -59,10 +59,11 @@ makeWorkspaceChatDockedCell[ ] := Framed[ DynamicModule[ { nbo }, Grid[ { { - LogChatTiming @ historyButton @ Dynamic @ nbo, + LogChatTiming @ newChatButton @ Dynamic @ nbo, Item[ Spacer[ 0 ], ItemSize -> Fit ], LogChatTiming @ sourcesButton @ Dynamic @ nbo, - LogChatTiming @ newChatButton @ Dynamic @ nbo + LogChatTiming @ historyButton @ Dynamic @ nbo, + LogChatTiming @ openAsChatbookButton @ Dynamic @ nbo } }, Alignment -> { Automatic, Center }, Spacings -> 0.5 @@ -78,50 +79,76 @@ makeWorkspaceChatDockedCell[ ] := Framed[ makeWorkspaceChatDockedCell // endDefinition; (* ::**************************************************************************************************************:: *) -(* ::Subsubsection::Closed:: *) -(*historyButton*) -historyButton // beginDefinition; +(* ::Subsection::Closed:: *) +(*makeWorkspaceChatSubDockedCellExpression*) +makeWorkspaceChatSubDockedCellExpression // beginDefinition; + +makeWorkspaceChatSubDockedCellExpression[ content_ ] := Cell[ BoxData @ ToBoxes @ + Framed[ + content, + Background -> RGBColor[ "#DDEFF9" ], + BaseStyle -> { FontSlant -> Italic }, + FrameMargins -> { { 7, 7 }, { 4, 4 } }, + FrameStyle -> RGBColor[ "#DDEFF9" ], + ImageMargins -> 0, + ImageSize -> Scaled[1.] + ], + PrivateCellOptions -> { "ContentsOpacity" -> Dynamic[ If[ CurrentValue[ "NotebookSelected" ], 1, 0.5 ] ] }, + CellFrame -> 0, + CellFrameMargins -> 0, + CellMargins -> { { -1, -5 }, { -1, -1 } }, + CellTags -> "WorkspaceChatSubDockedCell", + Magnification -> Dynamic[ AbsoluteCurrentValue[ EvaluationNotebook[ ], Magnification ] ] +]; -historyButton[ Dynamic[ nbo_ ] ] := - Module[ { label }, +makeWorkspaceChatSubDockedCellExpression // endDefinition; - label = Pane[ - Dynamic[ - If[ - Or[ - AbsoluteCurrentValue[ nbo, { WindowSize, 1 } ] < 250, - Not @ MatchQ[CurrentValue[ nbo, { TaggingRules, "ConversationTitle" } ], - Except["", _String]] - ], - tr["WorkspaceToolbarButtonLabelHistory"], - Grid[ - {{ - tr["WorkspaceToolbarButtonLabelHistory"], - Style[ - FE`Evaluate @ FEPrivate`TruncateStringToWidth[ - CurrentValue[ nbo, { TaggingRules, "ConversationTitle" } ], - "WorkspaceChatToolbarTitle", - AbsoluteCurrentValue[ nbo, { WindowSize, 1 } ] - 210, - Right - ], - "WorkspaceChatToolbarTitle" - ] - }}, - FrameStyle -> GrayLevel[1, 0.75], - Dividers -> Center, - Spacings -> {1,0} - ] +(* ::**************************************************************************************************************:: *) +(* ::Subsection::Closed:: *) +(*writeWorkspaceChatSubDockedCell*) +writeWorkspaceChatSubDockedCell // beginDefinition; + +writeWorkspaceChatSubDockedCell[ nbo_NotebookObject, content_ ] := ( +CurrentValue[ nbo, DockedCells ] = Inherited; +CurrentValue[ nbo, DockedCells ] = { + First @ Replace[ AbsoluteCurrentValue[ nbo, DockedCells ], c_Cell :> {c} ], + makeWorkspaceChatSubDockedCellExpression[ content ] } +) + +writeWorkspaceChatSubDockedCell[ nbo_NotebookObject, WindowTitle ] := writeWorkspaceChatSubDockedCell[ + nbo, + Style[ + FE`Evaluate @ FEPrivate`TruncateStringToWidth[ + CurrentValue[ nbo, { TaggingRules, "ConversationTitle" } ], + "WorkspaceChatToolbarTitle", + #, + Right + ]&[ AbsoluteCurrentValue[ nbo, { WindowSize, 1 } ] - 10 ], + "WorkspaceChatToolbarTitle" + ] +] - ] - ] - ]; +writeWorkspaceChatSubDockedCell // endDefinition; - Button[ - toolbarButtonLabel[ "History", label, "History" ], - toggleOverlayMenu[ nbo, "History" ], - Appearance -> "Suppressed" - ] - ]; +(* ::**************************************************************************************************************:: *) +(* ::Subsection::Closed:: *) +(*removeWorkspaceChatSubDockedCell*) +removeWorkspaceChatSubDockedCell // beginDefinition; + +removeWorkspaceChatSubDockedCell[ nbo_NotebookObject ] := CurrentValue[ nbo, DockedCells ] = Inherited; + +removeWorkspaceChatSubDockedCell // endDefinition; + +(* ::**************************************************************************************************************:: *) +(* ::Subsubsection::Closed:: *) +(*historyButton*) +historyButton // beginDefinition; + +historyButton[ Dynamic[ nbo_ ] ] := Button[ + toolbarButtonLabel[ "History" ], + toggleOverlayMenu[ nbo, "History" ], + Appearance -> "Suppressed" +]; historyButton // endDefinition; @@ -158,6 +185,7 @@ newChatButton[ Dynamic[ nbo_ ] ] := toolbarButtonLabel[ lightButton, {label, hotlabel}, "New"], clearOverlayMenus @ nbo; NotebookDelete @ Cells @ nbo; + NotebookDelete @ Cells[ nbo, DockedCell -> True, CellTags -> "WorkspaceChatSubDockedCell" ]; CurrentChatSettings[ nbo, "ConversationUUID" ] = CreateUUID[ ]; CurrentValue[ nbo, { TaggingRules, "ConversationTitle" } ] = ""; moveChatInputToTop @ nbo; @@ -168,6 +196,19 @@ newChatButton[ Dynamic[ nbo_ ] ] := newChatButton // endDefinition; +(* ::**************************************************************************************************************:: *) +(* ::Subsubsection::Closed:: *) +(*openAsChatbookButton*) +openAsChatbookButton // beginDefinition; + +openAsChatbookButton[ Dynamic[ nbo_ ] ] := Button[ + toolbarButtonLabel[ "OpenAsChatbook", None ], + popOutChatNB @ nbo, + Appearance -> "Suppressed" +]; + +openAsChatbookButton // endDefinition; + (* ::**************************************************************************************************************:: *) (* ::Subsubsection::Closed:: *) (*toolbarButtonLabel*) @@ -213,7 +254,7 @@ toolbarButtonLabel0[ iconName_String, labelName_String, {styleopts___}, {gridopt toolbarButtonLabel0[ iconName_String, None, {styleopts___}, {gridopts___}] := Grid[ - { { RawBoxes @ TemplateBox[ { }, "WorkspaceToolbarIcon"<>iconName ] } }, + { { chatbookIcon[ "WorkspaceToolbarIcon"<>iconName, False ] } }, gridopts, Spacings -> 0.25, Alignment -> { {Left, Right}, Center } @@ -222,7 +263,7 @@ toolbarButtonLabel0[ iconName_String, None, {styleopts___}, {gridopts___}] := toolbarButtonLabel0[ iconName_String, label_, {styleopts___}, {gridopts___}] := Grid[ { { - RawBoxes @ TemplateBox[ { }, "WorkspaceToolbarIcon"<>iconName ], + chatbookIcon[ "WorkspaceToolbarIcon"<>iconName, False ], Style[ label, $toolbarLabelStyle, styleopts ] } }, gridopts, @@ -242,7 +283,7 @@ $toolbarButtonCommon = Sequence[ $toolbarButtonDefault = Sequence[ Background -> RGBColor[ "#66ADD2" ], FrameStyle -> RGBColor[ "#66ADD2" ] ]; $toolbarButtonHover = Sequence[ Background -> RGBColor[ "#87C3E3" ], FrameStyle -> RGBColor[ "#9ACAE4" ] ]; $toolbarButtonActive = Sequence[ Background -> RGBColor[ "#3689B5" ], FrameStyle -> RGBColor[ "#3689B5" ] ]; -$toolbarButtonLight = Sequence[ Background -> RGBColor[ "#E0EFF6" ], FrameStyle -> RGBColor[ "#E0EFF6" ] ]; +$toolbarButtonLight = Sequence[ Background -> RGBColor[ "#F1F8FC" ], FrameStyle -> RGBColor[ "#F1F8FC" ] ]; (* ::**************************************************************************************************************:: *) @@ -1234,7 +1275,16 @@ toggleOverlayMenu[ nbo_NotebookObject, name_String ] := ]; If[ MissingQ @ cell, - attachOverlayMenu[ nbo, name ], + If[ name == "Sources", + writeWorkspaceChatSubDockedCell[ nbo, Style[ tr[ "WorkspaceToolbarSourcesSubTitle" ], FontSlant -> Italic, FontFamily -> "Source Sans Pro" ] ], + removeWorkspaceChatSubDockedCell[ nbo ] + ]; + attachOverlayMenu[ nbo, name ]; + , + If[ CurrentValue[ nbo, {TaggingRules, "ConversationTitle" } ] =!= "", + writeWorkspaceChatSubDockedCell[ nbo, WindowTitle ], + removeWorkspaceChatSubDockedCell[ nbo ] + ]; restoreVerticalScrollbar @ nbo; NotebookDelete @ cell ] @@ -1781,6 +1831,7 @@ loadConversation[ nbo_NotebookObject, id_ ] := Enclose[ ChatbookAction[ "AttachWorkspaceChatInput", nbo ]; CurrentChatSettings[ nbo, "ConversationUUID" ] = uuid; CurrentValue[ nbo, { TaggingRules, "ConversationTitle" } ] = title; + writeWorkspaceChatSubDockedCell[ nbo, WindowTitle ]; restoreVerticalScrollbar @ nbo; moveToChatInputField[ nbo, True ] ] // withLoadingOverlay @ nbo, diff --git a/Source/Chatbook/CommonSymbols.wl b/Source/Chatbook/CommonSymbols.wl index 2cb0fdb3..e9c80524 100644 --- a/Source/Chatbook/CommonSymbols.wl +++ b/Source/Chatbook/CommonSymbols.wl @@ -314,5 +314,6 @@ BeginPackage[ "Wolfram`Chatbook`Common`" ]; `wlTemplateBoxes; `writeInlineChatOutputCell; `writeReformattedCell; +`writeWorkspaceChatSubDockedCell; EndPackage[ ]; \ No newline at end of file diff --git a/Source/Chatbook/Storage.wl b/Source/Chatbook/Storage.wl index 8101a885..e4214df5 100644 --- a/Source/Chatbook/Storage.wl +++ b/Source/Chatbook/Storage.wl @@ -475,7 +475,8 @@ setChatDisplayTitle // beginDefinition; setChatDisplayTitle[ nbo_NotebookObject, KeyValuePattern[ "ConversationTitle" -> title_String ] ] := If[ title =!= $defaultConversationTitle, - CurrentValue[ nbo, { TaggingRules, "ConversationTitle" } ] = title + CurrentValue[ nbo, { TaggingRules, "ConversationTitle" } ] = title; + writeWorkspaceChatSubDockedCell[ nbo, WindowTitle ] ]; setChatDisplayTitle[ None, _ ] :=