Skip to content

Commit

Permalink
Merge branch 'main' into evan/make-macos-version-great-for-the-first-…
Browse files Browse the repository at this point in the history
…time
  • Loading branch information
lcarrere committed Nov 23, 2024
2 parents a1ab810 + a223b14 commit 172fb35
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 2 additions & 10 deletions LM-Kit-Maestro/Models/Message.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@

namespace LMKit.Maestro.Models;
namespace LMKit.Maestro.Models;

public sealed class Message
{
public string? Text { get; set; }

public MessageSender Sender { get; set; }
}

public enum MessageSender
{
Undefined,
User,
Assistant
}
}
9 changes: 9 additions & 0 deletions LM-Kit-Maestro/Models/MessageSender.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

namespace LMKit.Maestro.Models;

public enum MessageSender
{
Undefined,
User,
Assistant
}
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/UI/ModelSelectionButton.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@

<DataTrigger TargetType="Label" Binding="{Binding Source={x:RelativeSource AncestorType={x:Type vm:AppShellViewModel}}, Path=AppIsInitialized}" Value="False">
<Setter Property="TextColor" Value="{StaticResource Outline}"/>
<Setter Property="Text" Value="Chat Playground is initializing..."/>
<Setter Property="Text" Value="Maestro is initializing..."/>
</DataTrigger>
</Label.Triggers>
</Label>
Expand Down

0 comments on commit 172fb35

Please sign in to comment.