Skip to content

Commit

Permalink
デフォルト検索の全項目を保存するように変更
Browse files Browse the repository at this point in the history 
キーワードや自動登録無効なども保存するようにした。
また、「あいまい検索」は「正規表現モード」時に使用されないので
チェックボックスをグレーアウトするようにした。

※以前の設定は反映されませんので、再度設定してください。
  • Loading branch information
@tkntrec
tkntrec committed Sep 7, 2015
1 parent 1a9e3b5 commit 375c901
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 203 deletions.
146 changes: 5 additions & 141 deletions EpgTimer/EpgTimer/Common/SettingClass.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,20 +207,7 @@ public class Settings
private string cust2BtnCmdOpt;
private List<string> andKeyList;
private List<string> notKeyList;
private bool searchKeyRegExp;
private bool searchKeyTitleOnly;
private bool searchKeyAimaiFlag;
private bool searchKeyNotContent;
private bool searchKeyNotDate;
private List<ContentKindInfo> searchKeyContentList;
private List<DateItem> searchKeyDateItemList;
private List<Int64> searchKeyServiceList;
private byte searchKeyFreeCA;
private byte searchKeyChkRecEnd;
private UInt16 searchKeyChkRecDay;
private byte searchKeyChkRecNoService;
private UInt16 searchKeyChkDurationMin;
private UInt16 searchKeyChkDurationMax;
private EpgSearchKeyInfo defSearchKey;
private List<RecPresetItem> recPresetList;
private string recInfoColumnHead;
private ListSortDirection recInfoSortDirection;
Expand Down Expand Up @@ -576,75 +563,10 @@ public List<string> NotKeyList
get { return notKeyList; }
set { notKeyList = value; }
}
public bool SearchKeyRegExp
public EpgSearchKeyInfo DefSearchKey
{
get { return searchKeyRegExp; }
set { searchKeyRegExp = value; }
}
public bool SearchKeyTitleOnly
{
get { return searchKeyTitleOnly; }
set { searchKeyTitleOnly = value; }
}
public bool SearchKeyAimaiFlag
{
get { return searchKeyAimaiFlag; }
set { searchKeyAimaiFlag = value; }
}
public bool SearchKeyNotContent
{
get { return searchKeyNotContent; }
set { searchKeyNotContent = value; }
}
public bool SearchKeyNotDate
{
get { return searchKeyNotDate; }
set { searchKeyNotDate = value; }
}
public List<ContentKindInfo> SearchKeyContentList
{
get { return searchKeyContentList; }
set { searchKeyContentList = value; }
}
public List<DateItem> SearchKeyDateItemList
{
get { return searchKeyDateItemList; }
set { searchKeyDateItemList = value; }
}
public List<Int64> SearchKeyServiceList
{
get { return searchKeyServiceList; }
set { searchKeyServiceList = value; }
}
public byte SearchKeyFreeCA
{
get { return searchKeyFreeCA; }
set { searchKeyFreeCA = value; }
}
public byte SearchKeyChkRecEnd
{
get { return searchKeyChkRecEnd; }
set { searchKeyChkRecEnd = value; }
}
public UInt16 SearchKeyChkRecDay
{
get { return searchKeyChkRecDay; }
set { searchKeyChkRecDay = value; }
}
public byte SearchKeyChkRecNoService
{
get { return searchKeyChkRecNoService; }
set { searchKeyChkRecNoService = value; }
}
public UInt16 SearchKeyChkDurationMin
{
get { return searchKeyChkDurationMin; }
set { searchKeyChkDurationMin = value; }
}
public UInt16 SearchKeyChkDurationMax
{
get { return searchKeyChkDurationMax; }
set { searchKeyChkDurationMax = value; }
get { return defSearchKey; }
set { defSearchKey = value; }
}
public List<RecPresetItem> RecPresetList
{
Expand Down Expand Up @@ -1097,20 +1019,7 @@ public Settings()
cust2BtnCmdOpt = "";
andKeyList = new List<string>();
notKeyList = new List<string>();
searchKeyRegExp = false;
searchKeyTitleOnly = false;
searchKeyAimaiFlag = false;
searchKeyNotContent = false;
searchKeyNotDate = false;
searchKeyFreeCA = 0;
searchKeyChkRecEnd = 0;
searchKeyChkRecDay = 6;
searchKeyChkRecNoService = 0;
searchKeyChkDurationMin = 0;
searchKeyChkDurationMax = 0;
searchKeyContentList = new List<ContentKindInfo>();
searchKeyDateItemList = new List<DateItem>();
searchKeyServiceList = new List<Int64>();
defSearchKey = new EpgSearchKeyInfo();
recPresetList = new List<RecPresetItem>();
recInfoColumnHead = "";
recInfoSortDirection = ListSortDirection.Ascending;
Expand Down Expand Up @@ -1529,51 +1438,6 @@ public static void UpdateDefRecSetting()
}
}

public static void GetDefSearchSetting(ref EpgSearchKeyInfo defKey)
{
if (Settings.Instance.SearchKeyRegExp == true)
{
defKey.regExpFlag = 1;
}
if (Settings.Instance.SearchKeyAimaiFlag == true)
{
defKey.aimaiFlag = 1;
}
if (Settings.Instance.SearchKeyTitleOnly == true)
{
defKey.titleOnlyFlag = 1;
}
if (Settings.Instance.SearchKeyNotContent == true)
{
defKey.notContetFlag = 1;
}
if (Settings.Instance.SearchKeyNotDate == true)
{
defKey.notDateFlag = 1;
}
foreach (ContentKindInfo info in Settings.Instance.SearchKeyContentList)
{
EpgContentData item = new EpgContentData();
item.content_nibble_level_1 = info.Nibble1;
item.content_nibble_level_2 = info.Nibble2;
defKey.contentList.Add(item);
}
foreach (DateItem info in Settings.Instance.SearchKeyDateItemList)
{
defKey.dateList.Add(info.DateInfo);
}
foreach (Int64 info in Settings.Instance.SearchKeyServiceList)
{
defKey.serviceList.Add(info);
}
defKey.freeCAFlag = Settings.Instance.SearchKeyFreeCA;
defKey.chkRecEnd = Settings.Instance.SearchKeyChkRecEnd;
defKey.chkRecDay = Settings.Instance.SearchKeyChkRecDay;
defKey.chkRecNoService = Settings.Instance.SearchKeyChkRecNoService;
defKey.chkDurationMin = Settings.Instance.SearchKeyChkDurationMin;
defKey.chkDurationMax = Settings.Instance.SearchKeyChkDurationMax;
}

public static List<string> GetDefRecFolders()
{
var folders = new List<string>();
Expand Down
5 changes: 1 addition & 4 deletions EpgTimer/EpgTimer/SearchWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,7 @@ public SearchWindow()
this.Height = Settings.Instance.SearchWndHeight;
}

EpgSearchKeyInfo defKey = new EpgSearchKeyInfo();
Settings.GetDefSearchSetting(ref defKey);

searchKeyView.SetSearchKey(defKey);
searchKeyView.SetSearchKey(Settings.Instance.DefSearchKey);
}
catch (Exception ex)
{
Expand Down
40 changes: 4 additions & 36 deletions EpgTimer/EpgTimer/Setting/SetAppView.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ public partial class SetAppView : UserControl
public bool ngFileStreaming = false;
public bool ngShareFile = false;

MenuSettingData ctxmSetInfo;
private MenuSettingData ctxmSetInfo;
private EpgSearchKeyInfo defSearchKey;

private List<String> extList = new List<string>();
private List<String> delChkFolderList = new List<string>();
private EpgSearchKeyInfo defSearchKey = new EpgSearchKeyInfo();

private List<ViewMenuItem> buttonItem = new List<ViewMenuItem>();
private List<ViewMenuItem> taskItem = new List<ViewMenuItem>();
Expand Down Expand Up @@ -285,7 +285,7 @@ public SetAppView()
}
textBox_tcpPort.Text = IniFileHandler.GetPrivateProfileInt("SET", "TCPPort", 4510, SettingPath.TimerSrvIniPath).ToString();

Settings.GetDefSearchSetting(ref defSearchKey);
defSearchKey = Settings.Instance.DefSearchKey.Clone();

checkBox_showAsTab.IsChecked = Settings.Instance.ViewButtonShowAsTab;
checkBox_suspendChk.IsChecked = (Settings.Instance.SuspendChk == 1);
Expand Down Expand Up @@ -538,39 +538,7 @@ public void SaveSetting()
Settings.Instance.SuspendCloseNW = (checkBox_suspendClose.IsChecked == true);
Settings.Instance.NgAutoEpgLoadNW = (checkBox_ngAutoEpgLoad.IsChecked == true);

Settings.Instance.SearchKeyRegExp = (defSearchKey.regExpFlag != 0);
Settings.Instance.SearchKeyAimaiFlag = (defSearchKey.aimaiFlag != 0);
Settings.Instance.SearchKeyTitleOnly = (defSearchKey.titleOnlyFlag != 0);

Settings.Instance.SearchKeyContentList.Clear();
foreach (EpgContentData info in defSearchKey.contentList)
{
ContentKindInfo item = new ContentKindInfo();
item.Nibble1 = info.content_nibble_level_1;
item.Nibble2 = info.content_nibble_level_2;
Settings.Instance.SearchKeyContentList.Add(item);
}
Settings.Instance.SearchKeyDateItemList.Clear();
foreach (EpgSearchDateInfo info in defSearchKey.dateList)
{
DateItem item = new DateItem();
item.DateInfo = info;
Settings.Instance.SearchKeyDateItemList.Add(item);
}
Settings.Instance.SearchKeyServiceList.Clear();
foreach (Int64 info in defSearchKey.serviceList)
{
Settings.Instance.SearchKeyServiceList.Add(info);
}

Settings.Instance.SearchKeyNotContent = (defSearchKey.notContetFlag != 0);
Settings.Instance.SearchKeyNotDate = (defSearchKey.notDateFlag != 0);
Settings.Instance.SearchKeyFreeCA = defSearchKey.freeCAFlag;
Settings.Instance.SearchKeyChkRecEnd = defSearchKey.chkRecEnd;
Settings.Instance.SearchKeyChkRecDay = defSearchKey.chkRecDay;
Settings.Instance.SearchKeyChkRecNoService = defSearchKey.chkRecNoService;
Settings.Instance.SearchKeyChkDurationMin = defSearchKey.chkDurationMin;
Settings.Instance.SearchKeyChkDurationMax = defSearchKey.chkDurationMax;
Settings.Instance.DefSearchKey = defSearchKey.Clone();

Settings.Instance.ViewButtonShowAsTab = checkBox_showAsTab.IsChecked == true;
Settings.Instance.SuspendChk = (uint)(checkBox_suspendChk.IsChecked == true ? 1 : 0);
Expand Down
4 changes: 2 additions & 2 deletions EpgTimer/EpgTimer/UserCtrlView/SearchKeyDescView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<RowDefinition Height="32" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<CheckBox Content="正規表現モード" Height="16" Margin="0,12,605,0" Name="checkBox_regExp" VerticalAlignment="Top" HorizontalAlignment="Right" Width="95" />
<CheckBox Content="あいまい検索モード" Height="16" Margin="0,12,473,0" Name="checkBox_aimai" VerticalAlignment="Top" HorizontalAlignment="Right" Width="110" />
<CheckBox Content="正規表現モード" Height="16" Margin="0,12,605,0" Name="checkBox_regExp" VerticalAlignment="Top" HorizontalAlignment="Right" Width="95" Checked="checkBox_regExp_Checked" Unchecked="checkBox_regExp_Checked" />
<CheckBox Content="あいまい検索モード" Height="16" Margin="0,12,473,0" Name="checkBox_aimai" VerticalAlignment="Top" HorizontalAlignment="Right" Width="110" ToolTip="正規表現モードでは無効" ToolTipService.ShowOnDisabled="True" />
<CheckBox Content="番組名のみ検索対象にする" Height="16" Margin="0,12,298,0" Name="checkBox_titleOnly" VerticalAlignment="Top" HorizontalAlignment="Right" Width="153" />
<CheckBox Content="大小文字区別" Height="16" Margin="0,12,184,0" Name="checkBox_case" VerticalAlignment="Top" HorizontalAlignment="Right" Width="92" />
<CheckBox Content="自動登録を無効にする" Height="16" Margin="0,12,32,0" Name="checkBox_keyDisabled" VerticalAlignment="Top" HorizontalAlignment="Right" Width="130" />
Expand Down
29 changes: 9 additions & 20 deletions EpgTimer/EpgTimer/UserCtrlView/SearchKeyDescView.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,8 @@ public void GetSearchKey(ref EpgSearchKeyInfo key)
{
try
{
if (checkBox_regExp.IsChecked == true)
{
key.regExpFlag = 1;
key.aimaiFlag = 0;
}
else
{
key.regExpFlag = 0;
key.aimaiFlag = (byte)(checkBox_aimai.IsChecked == true ? 1 : 0);
}
key.regExpFlag = (byte)(checkBox_regExp.IsChecked == true ? 1 : 0);
key.aimaiFlag = (byte)(checkBox_aimai.IsChecked == true ? 1 : 0);
key.titleOnlyFlag = (byte)(checkBox_titleOnly.IsChecked == true ? 1 : 0);
key.caseFlag = (byte)(checkBox_case.IsChecked == true ? 1 : 0);
key.keyDisabledFlag = (byte)(checkBox_keyDisabled.IsChecked == true ? 1 : 0);
Expand Down Expand Up @@ -164,16 +156,8 @@ private void UpdateView()
{
try
{
if (defKey.regExpFlag == 1)
{
checkBox_regExp.IsChecked = true;
checkBox_aimai.IsChecked = false;
}
else
{
checkBox_regExp.IsChecked = false;
checkBox_aimai.IsChecked = (defKey.aimaiFlag == 1);
}
checkBox_regExp.IsChecked = (defKey.regExpFlag == 1);
checkBox_aimai.IsChecked = (defKey.aimaiFlag == 1);
checkBox_titleOnly.IsChecked = (defKey.titleOnlyFlag == 1);
checkBox_case.IsChecked = (defKey.caseFlag == 1);
checkBox_keyDisabled.IsChecked = (defKey.keyDisabledFlag == 1);
Expand Down Expand Up @@ -646,5 +630,10 @@ private void button_other_on2_Click(object sender, RoutedEventArgs e)
}
}

private void checkBox_regExp_Checked(object sender, RoutedEventArgs e)
{
checkBox_aimai.IsEnabled = checkBox_regExp.IsChecked != true;
}

}
}

0 comments on commit 375c901

Please sign in to comment.