Skip to content

Commit bac062d

Browse files
ryu-sryu-s
committed
予約プラグインの一覧と設定の切り替えにTabControlを使うように変更
1 parent f05bc6c commit bac062d

File tree

1 file changed

+67
-64
lines changed

1 file changed

+67
-64
lines changed

‎YoyakuPlugin/SettingsView.xaml

Lines changed: 67 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</Window.Resources>
1313
<Grid Margin="0,0,0,8" Background="#F0F0F0">
1414
<CheckBox x:Name="checkBox" Content="有効" IsChecked="{Binding IsEnabled}" HorizontalAlignment="Left" Margin="16,10,0,0" VerticalAlignment="Top"/>
15+
<Label x:Name="label" Content="呼び出し" Padding="0" HorizontalAlignment="Left" Margin="1,25,0,0" VerticalAlignment="Top"/>
1516
<Button x:Name="button" Content="5人" Command="{Binding Call5People}" HorizontalAlignment="Left" Margin="10,41,0,0" VerticalAlignment="Top" Width="75"/>
1617
<Button x:Name="button1" Content="4人" Command="{Binding Call4People}" HorizontalAlignment="Left" Margin="10,66,0,0" VerticalAlignment="Top" Width="75"/>
1718
<Button x:Name="button2" Content="3人" Command="{Binding Call3People}" HorizontalAlignment="Left" Margin="10,91,0,0" VerticalAlignment="Top" Width="75"/>
@@ -21,41 +22,43 @@
2122
<Button x:Name="button6" Content="呼出済を削除" Command="{Binding RemoveCalledUsersCommand}" HorizontalAlignment="Left" Margin="10,202,0,0" VerticalAlignment="Top" Width="75"/>
2223
<Button x:Name="button7" Content="全て削除" Command="{Binding ClearCommand}" HorizontalAlignment="Left" Margin="10,264,0,0" VerticalAlignment="Top" Width="75" RenderTransformOrigin="0.545,1.6"/>
2324
<Button x:Name="button8" Content="選択行削除" Command="{Binding DeleteCommand}" HorizontalAlignment="Left" Margin="10,239,0,0" VerticalAlignment="Top" Width="75" RenderTransformOrigin="0.122,0.553"/>
24-
<RadioButton x:Name="radioButton" IsChecked="{Binding IsListSelected}" Content="一覧" HorizontalAlignment="Left" Margin="10,289,0,0" VerticalAlignment="Top"/>
25-
<RadioButton x:Name="radioButton1" IsChecked="{Binding ElementName=radioButton, Path=IsChecked, Converter={StaticResource notConverter}}" Content="設定" HorizontalAlignment="Left" Margin="58,289,0,0" VerticalAlignment="Top"/>
26-
<ScrollViewer HorizontalAlignment="Stretch" Visibility="{Binding SettingsVisibility}" Margin="109,10,10,10" VerticalAlignment="Stretch" Background="#F0F0F0" VerticalScrollBarVisibility="Visible">
27-
<Grid Height="400" >
28-
<Button x:Name="button9" Content="保存して一覧を表示" Command="{Binding SaveAndShowListCommand}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="105"/>
29-
<Button x:Name="button10" Content="保存されている設定を戻す" Command="{Binding LoadSettingsCommand}" HorizontalAlignment="Left" Margin="120,10,0,0" VerticalAlignment="Top" Width="131" RenderTransformOrigin="0.013,0.738"/>
30-
<Button x:Name="button11" Content="デフォルト" Command="{Binding DefaultCommand}" HorizontalAlignment="Left" Margin="256,10,0,0" VerticalAlignment="Top" Width="75"/>
31-
<Label Content="予約受付メッセージ" VerticalAlignment="Top" HorizontalAlignment="Left" Padding="0" Margin="12,44,0,0" />
32-
<Label Content="取り消し受付メッセージ" VerticalAlignment="Top" Padding="0" Margin="12,83,212,0" />
33-
<Label Content="呼出メッセージ" VerticalAlignment="Top" Padding="0" Margin="12,122,252,0" RenderTransformOrigin="0.479,-0.354"/>
34-
<TextBox x:Name="textBox" HorizontalAlignment="Left" Height="23" Margin="12,60,0,0" TextWrapping="NoWrap" Text="{Binding Reserved_Se}" VerticalAlignment="Top" Width="80" RenderTransformOrigin="0.5,2.118"/>
35-
<TextBox x:Name="textBox_Copy" HorizontalAlignment="Left" Height="23" Margin="97,60,0,0" TextWrapping="NoWrap" Text="{Binding Reserved_Message}" VerticalAlignment="Top" Width="224"/>
36-
<TextBox x:Name="textBox_Copy1" HorizontalAlignment="Left" Height="23" Margin="12,99,0,0" TextWrapping="NoWrap" Text="{Binding Delete_Se}" VerticalAlignment="Top" Width="80"/>
37-
<TextBox x:Name="textBox_Copy2" HorizontalAlignment="Left" Height="23" Margin="97,99,0,0" TextWrapping="NoWrap" Text="{Binding Delete_Message}" VerticalAlignment="Top" Width="224"/>
38-
<TextBox x:Name="textBox_Copy3" HorizontalAlignment="Left" Height="23" Margin="12,138,0,0" TextWrapping="NoWrap" Text="{Binding Call_Se}" VerticalAlignment="Top" Width="80" RenderTransformOrigin="0.544,-0.706"/>
39-
<TextBox x:Name="textBox_Copy4" HorizontalAlignment="Left" Height="23" Margin="97,138,0,0" TextWrapping="NoWrap" Text="{Binding Call_Message}" VerticalAlignment="Top" Width="224"/>
40-
<TextBox x:Name="textBox_Copy5" HorizontalAlignment="Left" Height="23" Margin="12,177,0,0" TextWrapping="NoWrap" Text="{Binding AlreadyReserved_Se}" VerticalAlignment="Top" Width="80"/>
41-
<TextBox x:Name="textBox_Copy6" HorizontalAlignment="Left" Height="23" Margin="97,177,0,0" TextWrapping="NoWrap" Text="{Binding AlreadyReserved_Message}" VerticalAlignment="Top" Width="224"/>
42-
<Label Content="既に予約されているとき" VerticalAlignment="Top" Padding="0" Margin="12,161,212,0"/>
43-
<Label Content="コテハンなしの人の時のエラー" VerticalAlignment="Top" Padding="0" Margin="12,200,191,0"/>
44-
<TextBox x:Name="textBox_Copy7" HorizontalAlignment="Left" Height="23" Margin="12,216,0,0" TextWrapping="NoWrap" Text="{Binding HandleNameNotSubscribed_Se}" VerticalAlignment="Top" Width="80"/>
45-
<TextBox x:Name="textBox_Copy8" HorizontalAlignment="Left" Height="23" Margin="97,216,0,0" TextWrapping="NoWrap" Text="{Binding HandleNameNotSubscribed_Message}" VerticalAlignment="Top" Width="224"/>
46-
<Label Content="予約がされていないとき" VerticalAlignment="Top" Padding="0" Margin="12,239,214,0"/>
47-
<TextBox x:Name="textBox_Copy9" HorizontalAlignment="Left" Height="23" Margin="12,255,0,0" TextWrapping="NoWrap" Text="{Binding NotReserved_Se}" VerticalAlignment="Top" Width="80"/>
48-
<TextBox x:Name="textBox_Copy10" HorizontalAlignment="Left" Height="23" Margin="97,255,0,0" TextWrapping="NoWrap" Text="{Binding NotReserved_Message}" VerticalAlignment="Top" Width="224"/>
49-
<Label Content="予約した人以外が取り消し" VerticalAlignment="Top" Padding="0" Margin="12,278,193,0"/>
50-
<TextBox x:Name="textBox_Copy11" HorizontalAlignment="Left" Height="23" Margin="12,294,0,0" TextWrapping="NoWrap" Text="{Binding DeleteByOther_Se}" VerticalAlignment="Top" Width="80"/>
51-
<TextBox x:Name="textBox_Copy12" HorizontalAlignment="Left" Height="23" Margin="97,294,0,0" TextWrapping="NoWrap" Text="{Binding DeleteByOther_Message}" VerticalAlignment="Top" Width="224"/>
52-
<Label Content="説明" VerticalAlignment="Top" Padding="0" Margin="12,317,296,0"/>
53-
<TextBox x:Name="textBox_Copy13" HorizontalAlignment="Left" Height="23" Margin="12,333,0,0" TextWrapping="NoWrap" Text="{Binding Explain_Se}" VerticalAlignment="Top" Width="80" RenderTransformOrigin="0.338,0.551"/>
54-
<TextBox x:Name="textBox_Copy14" HorizontalAlignment="Left" Height="41" Margin="97,333,0,0" TextWrapping="NoWrap" Text="{Binding Explain_Message}" VerticalAlignment="Top" Width="224"/>
55-
</Grid>
56-
</ScrollViewer>
57-
<ScrollViewer HorizontalAlignment="Stretch" Visibility="{Binding ListVisibility}" Margin="109,10,10,10" VerticalAlignment="Stretch" Background="#F0F0F0" VerticalScrollBarVisibility="Visible">
58-
<DataGrid
25+
<TabControl Margin="106,10,0,0">
26+
<TabItem Header="設定">
27+
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="#F0F0F0" VerticalScrollBarVisibility="Visible">
28+
<Grid>
29+
<Button x:Name="button9" Content="保存して一覧を表示" Command="{Binding SaveAndShowListCommand}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="105"/>
30+
<Button x:Name="button10" Content="保存されている設定を戻す" Command="{Binding LoadSettingsCommand}" HorizontalAlignment="Left" Margin="120,10,0,0" VerticalAlignment="Top" Width="131" RenderTransformOrigin="0.013,0.738"/>
31+
<Button x:Name="button11" Content="デフォルト" Command="{Binding DefaultCommand}" HorizontalAlignment="Left" Margin="256,10,0,0" VerticalAlignment="Top" Width="75"/>
32+
<Label Content="予約受付メッセージ" VerticalAlignment="Top" HorizontalAlignment="Left" Padding="0" Margin="12,44,0,0" />
33+
<Label Content="取り消し受付メッセージ" VerticalAlignment="Top" Padding="0" Margin="12,83,212,0" />
34+
<Label Content="呼出メッセージ" VerticalAlignment="Top" Padding="0" Margin="12,122,252,0" RenderTransformOrigin="0.479,-0.354"/>
35+
<TextBox x:Name="textBox" HorizontalAlignment="Left" Height="23" Margin="12,60,0,0" TextWrapping="NoWrap" Text="{Binding Reserved_Se}" VerticalAlignment="Top" Width="80" RenderTransformOrigin="0.5,2.118"/>
36+
<TextBox x:Name="textBox_Copy" HorizontalAlignment="Left" Height="23" Margin="97,60,0,0" TextWrapping="NoWrap" Text="{Binding Reserved_Message}" VerticalAlignment="Top" Width="224"/>
37+
<TextBox x:Name="textBox_Copy1" HorizontalAlignment="Left" Height="23" Margin="12,99,0,0" TextWrapping="NoWrap" Text="{Binding Delete_Se}" VerticalAlignment="Top" Width="80"/>
38+
<TextBox x:Name="textBox_Copy2" HorizontalAlignment="Left" Height="23" Margin="97,99,0,0" TextWrapping="NoWrap" Text="{Binding Delete_Message}" VerticalAlignment="Top" Width="224"/>
39+
<TextBox x:Name="textBox_Copy3" HorizontalAlignment="Left" Height="23" Margin="12,138,0,0" TextWrapping="NoWrap" Text="{Binding Call_Se}" VerticalAlignment="Top" Width="80" RenderTransformOrigin="0.544,-0.706"/>
40+
<TextBox x:Name="textBox_Copy4" HorizontalAlignment="Left" Height="23" Margin="97,138,0,0" TextWrapping="NoWrap" Text="{Binding Call_Message}" VerticalAlignment="Top" Width="224"/>
41+
<TextBox x:Name="textBox_Copy5" HorizontalAlignment="Left" Height="23" Margin="12,177,0,0" TextWrapping="NoWrap" Text="{Binding AlreadyReserved_Se}" VerticalAlignment="Top" Width="80"/>
42+
<TextBox x:Name="textBox_Copy6" HorizontalAlignment="Left" Height="23" Margin="97,177,0,0" TextWrapping="NoWrap" Text="{Binding AlreadyReserved_Message}" VerticalAlignment="Top" Width="224"/>
43+
<Label Content="既に予約されているとき" VerticalAlignment="Top" Padding="0" Margin="12,161,212,0"/>
44+
<Label Content="コテハンなしの人の時のエラー" VerticalAlignment="Top" Padding="0" Margin="12,200,191,0"/>
45+
<TextBox x:Name="textBox_Copy7" HorizontalAlignment="Left" Height="23" Margin="12,216,0,0" TextWrapping="NoWrap" Text="{Binding HandleNameNotSubscribed_Se}" VerticalAlignment="Top" Width="80"/>
46+
<TextBox x:Name="textBox_Copy8" HorizontalAlignment="Left" Height="23" Margin="97,216,0,0" TextWrapping="NoWrap" Text="{Binding HandleNameNotSubscribed_Message}" VerticalAlignment="Top" Width="224"/>
47+
<Label Content="予約がされていないとき" VerticalAlignment="Top" Padding="0" Margin="12,239,214,0"/>
48+
<TextBox x:Name="textBox_Copy9" HorizontalAlignment="Left" Height="23" Margin="12,255,0,0" TextWrapping="NoWrap" Text="{Binding NotReserved_Se}" VerticalAlignment="Top" Width="80"/>
49+
<TextBox x:Name="textBox_Copy10" HorizontalAlignment="Left" Height="23" Margin="97,255,0,0" TextWrapping="NoWrap" Text="{Binding NotReserved_Message}" VerticalAlignment="Top" Width="224"/>
50+
<Label Content="予約した人以外が取り消し" VerticalAlignment="Top" Padding="0" Margin="12,278,193,0"/>
51+
<TextBox x:Name="textBox_Copy11" HorizontalAlignment="Left" Height="23" Margin="12,294,0,0" TextWrapping="NoWrap" Text="{Binding DeleteByOther_Se}" VerticalAlignment="Top" Width="80"/>
52+
<TextBox x:Name="textBox_Copy12" HorizontalAlignment="Left" Height="23" Margin="97,294,0,0" TextWrapping="NoWrap" Text="{Binding DeleteByOther_Message}" VerticalAlignment="Top" Width="224"/>
53+
<Label Content="説明" VerticalAlignment="Top" Padding="0" Margin="12,317,296,0"/>
54+
<TextBox x:Name="textBox_Copy13" HorizontalAlignment="Left" Height="23" Margin="12,333,0,0" TextWrapping="NoWrap" Text="{Binding Explain_Se}" VerticalAlignment="Top" Width="80" RenderTransformOrigin="0.338,0.551"/>
55+
<TextBox x:Name="textBox_Copy14" HorizontalAlignment="Left" Height="41" Margin="97,333,0,0" TextWrapping="NoWrap" Text="{Binding Explain_Message}" VerticalAlignment="Top" Width="224"/>
56+
</Grid>
57+
</ScrollViewer>
58+
</TabItem>
59+
<TabItem Header="一覧">
60+
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="#F0F0F0" VerticalScrollBarVisibility="Visible">
61+
<DataGrid
5962
AutoGenerateColumns="False"
6063
CanUserAddRows="False"
6164
CanUserDeleteRows="False"
@@ -64,34 +67,34 @@
6467
SelectionMode="Extended"
6568
SelectedValue="{Binding SelectedUser}"
6669
ItemsSource="{Binding RegisteredUsers, IsAsync=True}">
67-
<DataGrid.Columns>
68-
<DataGridTemplateColumn Header="登録日時">
69-
<DataGridTemplateColumn.CellTemplate>
70-
<DataTemplate>
71-
<TextBlock Text="{Binding Date, StringFormat={}{0:yyyy/MM/dd HH:mm}}" Margin="5,0,5,0"/>
72-
</DataTemplate>
73-
</DataGridTemplateColumn.CellTemplate>
74-
</DataGridTemplateColumn>
75-
<DataGridTemplateColumn Header="登録ID">
76-
<DataGridTemplateColumn.CellTemplate>
77-
<DataTemplate>
78-
<TextBlock Text="{Binding Id}" Margin="5,0,5,0"/>
79-
</DataTemplate>
80-
</DataGridTemplateColumn.CellTemplate>
81-
</DataGridTemplateColumn>
82-
<DataGridTemplateColumn Header="名前">
83-
<DataGridTemplateColumn.CellTemplate>
84-
<DataTemplate>
85-
<TextBlock Text="{Binding Name}" Margin="5,0,5,0"/>
86-
</DataTemplate>
87-
</DataGridTemplateColumn.CellTemplate>
88-
</DataGridTemplateColumn>
89-
<DataGridCheckBoxColumn Header="呼出済" Binding="{Binding HadCalled, Mode=TwoWay}">
90-
</DataGridCheckBoxColumn>
91-
</DataGrid.Columns>
92-
</DataGrid>
93-
</ScrollViewer>
94-
<Label x:Name="label" Content="呼び出し" Padding="0" HorizontalAlignment="Left" Margin="1,25,0,0" VerticalAlignment="Top"/>
95-
<!--<Grid HorizontalAlignment="Left" Visibility="Collapsed" Height="306" Margin="109,10,0,0" VerticalAlignment="Top" Width="332"/>-->
70+
<DataGrid.Columns>
71+
<DataGridTemplateColumn Header="登録日時">
72+
<DataGridTemplateColumn.CellTemplate>
73+
<DataTemplate>
74+
<TextBlock Text="{Binding Date, StringFormat={}{0:yyyy/MM/dd HH:mm}}" Margin="5,0,5,0"/>
75+
</DataTemplate>
76+
</DataGridTemplateColumn.CellTemplate>
77+
</DataGridTemplateColumn>
78+
<DataGridTemplateColumn Header="登録ID">
79+
<DataGridTemplateColumn.CellTemplate>
80+
<DataTemplate>
81+
<TextBlock Text="{Binding Id}" Margin="5,0,5,0"/>
82+
</DataTemplate>
83+
</DataGridTemplateColumn.CellTemplate>
84+
</DataGridTemplateColumn>
85+
<DataGridTemplateColumn Header="名前">
86+
<DataGridTemplateColumn.CellTemplate>
87+
<DataTemplate>
88+
<TextBlock Text="{Binding Name}" Margin="5,0,5,0"/>
89+
</DataTemplate>
90+
</DataGridTemplateColumn.CellTemplate>
91+
</DataGridTemplateColumn>
92+
<DataGridCheckBoxColumn Header="呼出済" Binding="{Binding HadCalled, Mode=TwoWay}">
93+
</DataGridCheckBoxColumn>
94+
</DataGrid.Columns>
95+
</DataGrid>
96+
</ScrollViewer>
97+
</TabItem>
98+
</TabControl>
9699
</Grid>
97100
</Window>

0 commit comments

Comments
 (0)