Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- EpgWeekMainView.xaml.org 2013-05-07 01:22:44.000000000 +0900
- +++ EpgWeekMainView.xaml 2013-05-08 12:50:27.812500000 +0900
- @@ -30,5 +30,6 @@
- <local:WeekDayView Grid.Column="1" x:Name="weekDayView" Margin="0,0,18,0"/>
- <local:ProgramView Grid.Column="1" Grid.Row="1" x:Name="epgProgramView" />
- </Grid>
- + <Button Content="標準モード" Height="23" HorizontalAlignment="Left" Margin="273,12,0,0" Name="button1" VerticalAlignment="Top" Width="66" Click="button1_Click" />
- </Grid>
- </UserControl>
- --- EpgWeekMainView.xaml.cs.org 2013-05-07 01:22:44.000000000 +0900
- +++ EpgWeekMainView.xaml.cs 2013-05-08 13:09:28.687500000 +0900
- @@ -567,12 +567,11 @@
- {
- menuItemChgViewMode1.IsChecked = true;
- }
- - menuItemView.Items.Add(menuItemViewSetDlg);
- - menuItemView.Items.Add(separate3);
- menuItemView.Items.Add(menuItemChgViewMode1);
- - menuItemView.Items.Add(menuItemChgViewMode2);
- + //menuItemView.Items.Add(menuItemChgViewMode2);
- menuItemView.Items.Add(menuItemChgViewMode3);
- -
- + menuItemView.Items.Add(separate3);
- + menuItemView.Items.Add(menuItemViewSetDlg);
- if (noItem == true)
- {
- menuItemAdd.IsEnabled = false;
- @@ -1133,6 +1132,18 @@
- CustomEpgTabInfo setInfo = new CustomEpgTabInfo();
- setViewInfo.CopyTo(ref setInfo);
- setInfo.ViewMode = (int)item.DataContext;
- + EpgEventInfo program = new EpgEventInfo();
- + if (GetProgramItem(clickPos, ref program) == true)
- + {
- + SearchItem searchitem = new SearchItem();
- + searchitem.EventInfo = program;
- + BlackoutWindow.selectedSearchItem = searchitem;
- + }
- + else
- + {
- + BlackoutWindow.selectedSearchItem = null;
- + }
- +
- ViewSettingClick(this, setInfo);
- }
- }
- @@ -1919,7 +1930,12 @@
- BlackoutWindow.selectedSearchItem = null;
- }
- }
- -
- -
- + private void button1_Click(object sender, RoutedEventArgs e)
- + {
- + CustomEpgTabInfo setInfo = new CustomEpgTabInfo();
- + setViewInfo.CopyTo(ref setInfo);
- + setInfo.ViewMode = 0;
- + ViewSettingClick(this, setInfo);
- + }
- }
- }
- --- EpgMainView.xaml.cs.org 2013-05-07 01:22:44.000000000 +0900
- +++ EpgMainView.xaml.cs 2013-05-08 13:10:28.734375000 +0900
- @@ -535,12 +535,11 @@
- {
- menuItemChgViewMode1.IsChecked = true;
- }
- - menuItemView.Items.Add(menuItemViewSetDlg);
- - menuItemView.Items.Add(separate3);
- - menuItemView.Items.Add(menuItemChgViewMode1);
- + //menuItemView.Items.Add(menuItemChgViewMode1);
- menuItemView.Items.Add(menuItemChgViewMode2);
- menuItemView.Items.Add(menuItemChgViewMode3);
- -
- + menuItemView.Items.Add(separate3);
- + menuItemView.Items.Add(menuItemViewSetDlg);
- if (noItem == true)
- {
- menuItemNew.IsEnabled = false;
- @@ -1104,6 +1103,17 @@
- CustomEpgTabInfo setInfo = new CustomEpgTabInfo();
- setViewInfo.CopyTo(ref setInfo);
- setInfo.ViewMode = (int)item.DataContext;
- + EpgEventInfo program = new EpgEventInfo();
- + if (GetProgramItem(clickPos, ref program) == true)
- + {
- + SearchItem searchitem = new SearchItem();
- + searchitem.EventInfo = program;
- + BlackoutWindow.selectedSearchItem = searchitem;
- + }
- + else
- + {
- + BlackoutWindow.selectedSearchItem = null;
- + }
- ViewSettingClick(this, setInfo);
- }
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
