Skip to content

Commit

Permalink
update menus
Browse files Browse the repository at this point in the history
  • Loading branch information
@tobiasbaur
tobiasbaur committed Nov 14, 2024
1 parent f04e127 commit 761a743
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Controls/LLAMA.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ssi.Controls"
mc:Ignorable="d"
Title="NOVA Assistant" Height="450" Width="800" Closing="Window_Closing" Deactivated="Window_Deactivated">
Title="LENS Chat" Height="450" Width="800" Closing="Window_Closing" Deactivated="Window_Deactivated">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
Expand Down
6 changes: 3 additions & 3 deletions Controls/MainControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</MenuItem>-->

<MenuItem Header="Nova-Server AI" Name="databaseNovaServerMenu"/>
<MenuItem Header="DISCOVER Server" Name="databaseNovaServerMenu"/>
<MenuItem Header="Complete Current Annotation" Name="databaseCMLCompleteStepMenu" InputGestureText="Ctrl+L"/>
</MenuItem>

Expand All @@ -125,7 +125,7 @@
</MenuItem>
</MenuItem>

<MenuItem Header="ASSISTANT" Name="AssistantMenu">
<MenuItem Header="LENS" Name="AssistantMenu">
</MenuItem>

<MenuItem Header="NOSTR DVM" Name="NostrDVMMenu" Visibility="Collapsed">
Expand All @@ -134,7 +134,7 @@


<MenuItem Header="?">
<MenuItem Header="Buy us a coffee ☕" Name="supportMenu" />
<!--<MenuItem Header="Buy us a coffee ☕" Name="supportMenu" />-->
<MenuItem Header="About" Name="aboutMenu" />
<MenuItem Header="Documentation" Name="helpDocumentationMenu" />
<MenuItem Header="Shortcuts" Name="helpShortcutsMenu" />
Expand Down
4 changes: 2 additions & 2 deletions Controls/MainHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public partial class MainHandler
{

//Config
public static string BuildVersion = "1.2.9.1";
public static string BuildVersion = "1.2.9.2";
public static MEDIABACKEND MediaBackend = (Properties.Settings.Default.MediaBackend == "Hardware") ? MEDIABACKEND.MEDIAKIT : MEDIABACKEND.MEDIA;
public static bool ENABLE_PYTHON = Properties.Settings.Default.EnablePython;
public static bool ENABLE_LIGHTNING = Properties.Settings.Default.EnableLightning;
Expand Down Expand Up @@ -260,7 +260,7 @@ public MainHandler(MainControl view)
control.updateCMLMenu.Click += updateCML_Click;
control.updatePythonMenu.Click += updatePython_Click;
control.aboutMenu.Click += aboutMenu_Click;
control.supportMenu.Click += support_Click;
//control.supportMenu.Click += support_Click;

control.AssistantMenu.Click += AssistantMenu_Click;
if (Properties.Settings.Default.NovaAssistantAddress == "")
Expand Down
2 changes: 1 addition & 1 deletion Controls/MainHandlerUpdate.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ private void updatePython_Click(object sender, RoutedEventArgs e)

private void aboutMenu_Click(object sender, RoutedEventArgs e)
{
MessageBox.Show("All rights reserved.\n© University of Augsburg, Lab for Human-Centered Artificial Intelligence 2021\nLead Developer: Tobias Baur, Johannes Wagner, Alexander Heimerl & Dominik Schiller\n[email protected]");
MessageBox.Show("All rights reserved.\n© University of Augsburg, Lab for Human-Centered Artificial Intelligence 2012-2025\nLead Developer: Tobias Baur, Johannes Wagner, Alexander Heimerl & Dominik Schiller\n[email protected]");

}

Expand Down
10 changes: 5 additions & 5 deletions Controls/Other/Settings.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@

</Grid>
</TabItem>
<TabItem Header="NOVA Server">
<TabItem Header="DISCOVER">

<Grid>
<Grid.RowDefinitions>
Expand All @@ -211,7 +211,7 @@
<ColumnDefinition Width="23*"/>
</Grid.ColumnDefinitions>

<Label Grid.Row="0" Grid.Column="0" Content="Nova server:" Grid.ColumnSpan="2"/>
<Label Grid.Row="0" Grid.Column="0" Content="Discover Server settings:" Grid.ColumnSpan="2"/>
<Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"></ColumnDefinition>
Expand All @@ -232,7 +232,7 @@

</Grid>
</TabItem>
<TabItem Header="NOVA Assistant">
<TabItem Header="LENS">
<Grid>
<Grid.RowDefinitions>
<RowDefinition></RowDefinition>
Expand All @@ -241,8 +241,8 @@
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
</Grid.RowDefinitions>

<Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
<Label Grid.Row="0" Grid.Column="0" Content="Lens LLM Assistant server settings:" Grid.ColumnSpan="2"/>
<Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
Expand Down
4 changes: 2 additions & 2 deletions Database/DatabaseNovaServerWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ssi" Deactivated="Window_Deactivated"
Title="NOVA SERVER" Height="800" Width="1400" PreviewKeyDown="Window_PreviewKeyDown" Closing="Window_Closing" Closed="Window_Closed" Icon="..\Resources\ui.ico" Style="{StaticResource WinAll}">
Title="DISCOVER" Height="800" Width="1400" PreviewKeyDown="Window_PreviewKeyDown" Closing="Window_Closing" Closed="Window_Closed" Icon="..\Resources\ui.ico" Style="{StaticResource WinAll}">

<Window.Resources>

Expand Down Expand Up @@ -382,7 +382,7 @@
<Button Content="Apply" x:Name="ApplyButton" IsEnabled="False" Click="Apply_Click" Width="75" Margin="5" Height="30"/>
<CheckBox x:Name="ForceCheckBox" Margin="5" VerticalAlignment="Center" Content="Force"/>
</StackPanel>
<GroupBox Name="statusBox" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="1" Margin="0,5,5,0" Header="Nova-Server">
<GroupBox Name="statusBox" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="1" Margin="0,5,5,0" Header="Discover-Server">
<Label Name="statusLabel" HorizontalContentAlignment="Center" Foreground="red" Content="No connection to server!" Width="160" Height="30"/>
</GroupBox>
</DockPanel>
Expand Down
4 changes: 2 additions & 2 deletions Database/DatabaseNovaServerWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ private void switchMode()

case Mode.PROCESS:

Title = "NOVA SERVER";
Title = "DISCOVER SERVER";
ApplyButton.Content = "Send";
//TrainerLabel.Content = "Processor";

Expand Down Expand Up @@ -1542,7 +1542,7 @@ private List<Processor> getProcessors()
}
catch
{
Console.WriteLine("No Connection to a Nova Server instance");
Console.WriteLine("No Connection to a Discover Server instance");
}


Expand Down
Binary file modified bin/nova.exe
View file
Binary file not shown.

0 comments on commit 761a743

Please sign in to comment.