Skip to content

Commit

Permalink
詳細設定画面のレイアウトを変更
Browse files Browse the repository at this point in the history
  • Loading branch information
sh-akira committed Apr 6, 2023
1 parent a1cffbb commit d14e109
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions ControlWindowWPF/ControlWindowWPF/SettingWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,6 @@
<Button Content="VIVE Facial Tracker" Name="LipTracking_ViveSettingButton" Click="LipTracking_ViveSettingButton_Click"/>
</UniformGrid>
</GroupBox>
<GroupBox Header="{DynamicResource SettingWindow_VMCMod}" Name="VMCModGroupBox">
<DockPanel>
<Button Content="Log" DockPanel.Dock="Right" Name="DebugLogButton" Click="DebugLogButton_Click"/>
<Button Content="{DynamicResource SettingWindow_VMCModSetting}" Name="ModSetting" Click="ModSetting_Click"/>
</DockPanel>
</GroupBox>
<GroupBox Header="CameraPlus (BeatSaber MOD)">
<UniformGrid Columns="2">
<Button Content="Import" Name="CameraPlus_ImportButton" Click="CameraPlus_ImportButton_Click"/>
Expand Down Expand Up @@ -154,6 +148,23 @@
<ComboBox Name="ControllerComboBox" VerticalAlignment="Center" ItemsSource="{Binding TrackersList}" ToolTip="{DynamicResource SettingWindow_ControllerNumber_ToolTip}"/>
</DockPanel>
</GroupBox>
<GroupBox Header="{DynamicResource SettingWindow_VirtualMotionTracker}">
<StackPanel Orientation="Vertical">
<DockPanel>
<CheckBox Content="{DynamicResource SettingWindow_VirtualMotionTrackerEnable}" Name="VirtualMotionTrackerEnableCheckBox" Checked="VirtualMotionTrackerEnableCheckBox_Changed" Unchecked="VirtualMotionTrackerEnableCheckBox_Changed" DockPanel.Dock="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="0"/>
<TextBlock Text="No: " DockPanel.Dock="Left" VerticalAlignment="Center" Margin="15,0,0,0"/>
<Button Content="Set" Name="VirtualMotionTrackerSetButton" Click="VirtualMotionTrackerSetButton_Click" Padding="5,0" Margin="5,0" Height="Auto" VerticalAlignment="Center" DockPanel.Dock="Right"/>
<TextBox Text="50" VerticalAlignment="Center" Name="VirtualMotionTrackerNumber"/>
</DockPanel>
<GroupBox Header="{DynamicResource SettingWindow_VMTInstall}" DockPanel.Dock="Top">
<UniformGrid Columns="2">
<Button Content="{DynamicResource SettingWindow_VMTInstallButton}" Name="VMTInstallButton" Click="VMTInstallButton_Click"/>
<Button Content="{DynamicResource SettingWindow_VMTUninstallButton}" Name="VMTUninstallButton" Click="VMTUninstallButton_Click"/>
</UniformGrid>
</GroupBox>
<Button DockPanel.Dock="Bottom" Content="{DynamicResource SettingWindow_ExportVMTExternalCameraConfig}" Name="LIVExternalCameraConigExportButton" Click="LIVExternalCameraConigExportButton_Click" ToolTip="{DynamicResource SettingWindow_ExportExternalCameraConfig_ToolTip}"/>
</StackPanel>
</GroupBox>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="2">
<GroupBox Header="{DynamicResource SettingWindow_ExternalMotionSender_Free}" Name="FreeExternalMotionSenderGroupBox">
Expand All @@ -175,7 +186,7 @@
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Address:" Grid.Column="0"/>
<TextBox Text="127.0.0.1" Grid.Column="1" VerticalAlignment="Center" Name="ExternalMotionSenderAddressTextBox"/>
<TextBox Text="127.0.0.1" VerticalAlignment="Top" Name="ExternalMotionSenderAddressTextBox" Grid.ColumnSpan="3" Margin="45,0,27,0"/>
<TextBlock Text=" Port:" Grid.Column="2"/>
<TextBox Text="39539" Grid.Column="3" VerticalAlignment="Center" Name="ExternalMotionSenderPortTextBox"/>
</Grid>
Expand Down Expand Up @@ -280,22 +291,11 @@
</GroupBox>
</DockPanel>
</GroupBox>
<GroupBox Header="{DynamicResource SettingWindow_VirtualMotionTracker}">
<StackPanel Orientation="Vertical">
<DockPanel>
<CheckBox Content="{DynamicResource SettingWindow_VirtualMotionTrackerEnable}" Name="VirtualMotionTrackerEnableCheckBox" Checked="VirtualMotionTrackerEnableCheckBox_Changed" Unchecked="VirtualMotionTrackerEnableCheckBox_Changed" DockPanel.Dock="Left" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="0"/>
<TextBlock Text="No: " DockPanel.Dock="Left" VerticalAlignment="Center" Margin="15,0,0,0"/>
<Button Content="Set" Name="VirtualMotionTrackerSetButton" Click="VirtualMotionTrackerSetButton_Click" Padding="5,0" Margin="5,0" Height="Auto" VerticalAlignment="Center" DockPanel.Dock="Right"/>
<TextBox Text="50" VerticalAlignment="Center" Name="VirtualMotionTrackerNumber"/>
</DockPanel>
<GroupBox Header="{DynamicResource SettingWindow_VMTInstall}" DockPanel.Dock="Top">
<UniformGrid Columns="2">
<Button Content="{DynamicResource SettingWindow_VMTInstallButton}" Name="VMTInstallButton" Click="VMTInstallButton_Click"/>
<Button Content="{DynamicResource SettingWindow_VMTUninstallButton}" Name="VMTUninstallButton" Click="VMTUninstallButton_Click"/>
</UniformGrid>
</GroupBox>
<Button DockPanel.Dock="Bottom" Content="{DynamicResource SettingWindow_ExportVMTExternalCameraConfig}" Name="LIVExternalCameraConigExportButton" Click="LIVExternalCameraConigExportButton_Click" ToolTip="{DynamicResource SettingWindow_ExportExternalCameraConfig_ToolTip}"/>
</StackPanel>
<GroupBox Header="{DynamicResource SettingWindow_VMCMod}" Name="VMCModGroupBox">
<DockPanel>
<Button Content="Log" DockPanel.Dock="Right" Name="DebugLogButton" Click="DebugLogButton_Click"/>
<Button Content="{DynamicResource SettingWindow_VMCModSetting}" Name="ModSetting" Click="ModSetting_Click"/>
</DockPanel>
</GroupBox>
<GroupBox Header="{DynamicResource SettingWindow_Language}">
<ComboBox Name="LanguageComboBox" SelectedIndex="0" SelectionChanged="LanguageComboBox_SelectionChanged">
Expand Down

0 comments on commit d14e109

Please sign in to comment.