Skip to content

指定した検索条件を履歴に残したい (PatchUnicode-1046 各履歴のお気に入り) #1640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

指定した検索条件を履歴に残したい (PatchUnicode-1046 各履歴のお気に入り) #1640

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
47c5051
PatchUnicode-1046 各履歴のお気に入り
Apr 23, 2021
1c336a4
PatchUnicode-1046 v0.2 重複部分を変更
dep5 Apr 23, 2021
1a1e810
PatchUnicode-1046 v0.3 コンボボックスの履歴削除に対応 #1255
dep5 Apr 22, 2021
33b54fe
Revert "PatchUnicode-1046 v0.3 コンボボックスの履歴削除に対応 #1255"
dep5 May 1, 2021
1911a30
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 May 1, 2021
a6acb93
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Jun 7, 2021
0b5c0f3
PatchUnicode-1046 v0.4 お気に入りの上限を設定
dep5 Jun 7, 2021
7fd7d0a
PatchUnicode-1046 v0.5 CNativeWをstd::wstringで書き直す
dep5 Jun 9, 2021
f8654a9
PatchUnicode-1046 v0.6 レビュー対応 チェックの数をカウントする関数を作る
dep5 Jun 14, 2021
62717ad
PatchUnicode-1046 v0.7 チェックボックスを監視する
dep5 Jun 14, 2021
55eecf1
PatchUnicode-1046 v0.8 レビュー対応 変数名変更 ClearFavoriteの削除
dep5 Jun 16, 2021
4ba2014
PatchUnicode-1046 v0.9 チェックの数と上限を比較する関数を作る
dep5 Jun 16, 2021
4e2c132
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Jan 1, 2022
e64aefe
PatchUnicode-1046 v0.10 お気に入りと残りの履歴数を表示するようにした
dep5 Jan 1, 2022
2718c8c
PatchUnicode-1046 v0.11 チェックボックスにチェックを入れない条件を変更
dep5 Jan 1, 2022
7526f12
PatchUnicode-1046 v0.12 ダイアログを閉じるときの警告を削除
dep5 Jan 1, 2022
4f8a77a
PatchUnicode-1046 v0.13 コンボボックスの履歴削除に対応
dep5 Jun 1, 2022
56a772f
conflict修正1
dep5 Jun 1, 2022
2d8b31c
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Jun 1, 2022
e8efdf5
conflict修正2
dep5 Jun 1, 2022
e642bca
PatchUnicode-1046 v0.14 履歴削除に対応できていなかったので修正
dep5 Jun 10, 2022
a218f63
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Jul 16, 2022
c99c0c3
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Jul 28, 2022
946796b
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Aug 24, 2022
1d45351
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Oct 4, 2022
51689f2
Merge remote-tracking branch 'upstream/master' into favoriteall
dep5 Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sakura_core/config/system_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,12 +550,15 @@
Version 177:
WriteQuit廃止に伴い未使用となった IniFolder のメンバを削除した為、DLLSHAREDATA のメモリレイアウトを変更

Version 178:
各履歴のお気に入り

-- 統合されたので元に戻す（1000～1023が使用済み） 2008.11.16 nasukoji
-- Version 1000:
-- バージョン1000以降を本家統合までの間、使わせてください。かなり頻繁に構成が変更されると思われるので。by kobake 2008.03.02

*/
constexpr unsigned N_SHAREDATA_VERSION = 177;
constexpr unsigned N_SHAREDATA_VERSION = 178;
#define STR_SHAREDATA_VERSION NUM_TO_STR(N_SHAREDATA_VERSION)
#define GSTR_SHAREDATA (L"SakuraShareData" _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION))

Expand Down
67 changes: 45 additions & 22 deletions sakura_core/dlg/CDlgFavorite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ CDlgFavorite::CDlgFavorite()
m_aFavoriteInfo[i].m_strCaption = LS( STR_DLGFAV_SEARCH );
m_aFavoriteInfo[i].m_pszCaption = m_aFavoriteInfo[i].m_strCaption.c_str();
m_aFavoriteInfo[i].m_nId = IDC_LIST_FAVORITE_SEARCH;
m_aFavoriteInfo[i].m_bHaveFavorite = false;
m_aFavoriteInfo[i].m_bHaveFavorite = true;
m_aFavoriteInfo[i].m_bFilePath = false;
m_aFavoriteInfo[i].m_bHaveView = false;
m_aFavoriteInfo[i].m_bEditable = true;
Expand All @@ -167,7 +167,7 @@ CDlgFavorite::CDlgFavorite()
m_aFavoriteInfo[i].m_strCaption = LS( STR_DLGFAV_REPLACE );
m_aFavoriteInfo[i].m_pszCaption = m_aFavoriteInfo[i].m_strCaption.c_str();
m_aFavoriteInfo[i].m_nId = IDC_LIST_FAVORITE_REPLACE;
m_aFavoriteInfo[i].m_bHaveFavorite = false;
m_aFavoriteInfo[i].m_bHaveFavorite = true;
m_aFavoriteInfo[i].m_bFilePath = false;
m_aFavoriteInfo[i].m_bHaveView = false;
m_aFavoriteInfo[i].m_bEditable = true;
Expand All @@ -178,7 +178,7 @@ CDlgFavorite::CDlgFavorite()
m_aFavoriteInfo[i].m_strCaption = LS( STR_DLGFAV_GREP_FILE );
m_aFavoriteInfo[i].m_pszCaption = m_aFavoriteInfo[i].m_strCaption.c_str();
m_aFavoriteInfo[i].m_nId = IDC_LIST_FAVORITE_GREP_FILE;
m_aFavoriteInfo[i].m_bHaveFavorite = false;
m_aFavoriteInfo[i].m_bHaveFavorite = true;
m_aFavoriteInfo[i].m_bFilePath = false;
m_aFavoriteInfo[i].m_bHaveView = false;
m_aFavoriteInfo[i].m_bEditable = true;
Expand All @@ -189,7 +189,7 @@ CDlgFavorite::CDlgFavorite()
m_aFavoriteInfo[i].m_strCaption = LS( STR_DLGFAV_GREP_FOLDER );
m_aFavoriteInfo[i].m_pszCaption = m_aFavoriteInfo[i].m_strCaption.c_str();
m_aFavoriteInfo[i].m_nId = IDC_LIST_FAVORITE_GREP_FOLDER;
m_aFavoriteInfo[i].m_bHaveFavorite = false;
m_aFavoriteInfo[i].m_bHaveFavorite = true;
m_aFavoriteInfo[i].m_bFilePath = true;
m_aFavoriteInfo[i].m_bHaveView = false;
m_aFavoriteInfo[i].m_bEditable = false;
Expand All @@ -200,7 +200,7 @@ CDlgFavorite::CDlgFavorite()
m_aFavoriteInfo[i].m_strCaption = LS( STR_DLGFAV_EXT_COMMAND );
m_aFavoriteInfo[i].m_pszCaption = m_aFavoriteInfo[i].m_strCaption.c_str();
m_aFavoriteInfo[i].m_nId = IDC_LIST_FAVORITE_CMD;
m_aFavoriteInfo[i].m_bHaveFavorite = false;
m_aFavoriteInfo[i].m_bHaveFavorite = true;
m_aFavoriteInfo[i].m_bFilePath = false;
m_aFavoriteInfo[i].m_bHaveView = false;
m_aFavoriteInfo[i].m_bEditable = true;
Expand All @@ -211,7 +211,7 @@ CDlgFavorite::CDlgFavorite()
m_aFavoriteInfo[i].m_strCaption = LS( STR_DLGFAV_CURRENT_DIR );
m_aFavoriteInfo[i].m_pszCaption = m_aFavoriteInfo[i].m_strCaption.c_str();
m_aFavoriteInfo[i].m_nId = IDC_LIST_FAVORITE_CUR_DIR;
m_aFavoriteInfo[i].m_bHaveFavorite = false;
m_aFavoriteInfo[i].m_bHaveFavorite = true;
m_aFavoriteInfo[i].m_bFilePath = true;
m_aFavoriteInfo[i].m_bHaveView = false;
m_aFavoriteInfo[i].m_bEditable = false;
Expand Down Expand Up @@ -351,18 +351,30 @@ void CDlgFavorite::SetDataOne( int nIndex, int nLvItemIndex )
int CDlgFavorite::GetData( void )
{
int nTab;
const int nFavoriteMax = 3;
std::wstring FavoriteMaxMessage(L"");

for( nTab = 0; m_aFavoriteInfo[nTab].m_pRecent; nTab++ )
{
if( m_aFavoriteInfo[nTab].m_bHaveFavorite )
{
GetFavorite( nTab );
int nFavoriteCount = GetFavorite(nTab, true);
if (nTab >= 3 && nFavoriteCount >= nFavoriteMax) {
std::wstring buffer = strprintf(L"%s : %d\n", m_aFavoriteInfo[nTab].m_strCaption.c_str(), nFavoriteCount);
FavoriteMaxMessage.append(buffer);
}

//リストを更新する。
CRecent* pRecent = m_aFavoriteInfo[nTab].m_pRecent;
pRecent->UpdateView();
}
}
if (!FavoriteMaxMessage.empty())
{
FavoriteMaxMessage += L"お気に入りの上限を超えています";
WarningMessage(GetHwnd(), FavoriteMaxMessage.c_str());
FavoriteMaxMessage.clear();
}

return TRUE;
}
Expand Down Expand Up @@ -486,6 +498,32 @@ BOOL CDlgFavorite::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam )
return CDialog::OnInitDialog( GetHwnd(), wParam, lParam );
}

// お気に入りのフラグだけ適用
int CDlgFavorite::GetFavorite(int nIndex, bool bFavoriteCount = false)
{
CRecent* const pRecent = m_aFavoriteInfo[nIndex].m_pRecent;
const HWND hwndList = m_aListViewInfo[nIndex].hListView;
if (m_aFavoriteInfo[nIndex].m_bHaveFavorite) {
int nFavoriteCount = 0;
const int nCount = ListView_GetItemCount(hwndList);
for (int i = 0; i < nCount; i++) {
const int recIndex = ListView_GetLParamInt(hwndList, i);
const BOOL bret = ListView_GetCheckState(hwndList, i);
if (bret) {
pRecent->SetFavorite(recIndex, true);
nFavoriteCount++;
}
else {
pRecent->SetFavorite(recIndex, false);
}
}
if (bFavoriteCount) {
return nFavoriteCount;
}
}
return 0;
}

BOOL CDlgFavorite::OnBnClicked( int wID )
{
switch( wID )
Expand Down Expand Up @@ -817,21 +855,6 @@ bool CDlgFavorite::RefreshListOne( int nIndex )
return true;
}

// お気に入りのフラグだけ適用
void CDlgFavorite::GetFavorite( int nIndex )
{
CRecent * const pRecent = m_aFavoriteInfo[nIndex].m_pRecent;
const HWND hwndList = m_aListViewInfo[nIndex].hListView;
if( m_aFavoriteInfo[nIndex].m_bHaveFavorite ){
const int nCount = ListView_GetItemCount( hwndList );
for( int i = 0; i < nCount; i++ ){
const int recIndex = ListView_GetLParamInt( hwndList, i );
const BOOL bret = ListView_GetCheckState( hwndList, i );
pRecent->SetFavorite( recIndex, bret ? true : false );
}
}
}

/*
選択中の項目を削除
リストの更新もする
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/dlg/CDlgFavorite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class CDlgFavorite final : public CDialog
//void ChangeSlider( int nIndex );
void UpdateUIState();

void GetFavorite( int nIndex );
int GetFavorite( int nIndex, bool bFavoriteCount );
int DeleteSelected();
void AddItem();
void EditItem();
Expand Down
5 changes: 5 additions & 0 deletions sakura_core/env/CSearchKeywordManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ struct SShare_SearchKeywords{
StaticVector< StaticString<WCHAR, MAX_GREP_PATH>, MAX_GREPFOLDER, const WCHAR*> m_aGrepFolders;
StaticVector< StaticString<WCHAR, MAX_EXCLUDE_PATH>, MAX_EXCLUDEFILE, const WCHAR*> m_aExcludeFiles;
StaticVector< StaticString<WCHAR, MAX_EXCLUDE_PATH>, MAX_EXCLUDEFOLDER, const WCHAR*> m_aExcludeFolders;

bool m_aSearchKeysFav[MAX_SEARCHKEY];
bool m_aReplaceKeysFav[MAX_REPLACEKEY];
bool m_aGrepFilesFav[MAX_GREPFILE];
bool m_aGrepFoldersFav[MAX_GREPFOLDER];
};

struct DLLSHAREDATA;
Expand Down
15 changes: 15 additions & 0 deletions sakura_core/env/CShareData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ CMutex& CShareData::GetMutexShareWork(){
return g_cMutexShareWork;
}

static void ClearFavorite(bool* aBoolArr, size_t size)
{
for(size_t i = 0; i < size; i++){
aBoolArr[i] = false;
}
}

//! CShareDataクラスの初期化処理
/*!
CShareDataクラスを利用する前に必ず呼び出すこと。
Expand Down Expand Up @@ -694,11 +701,16 @@ bool CShareData::InitShareData()
}

{
SShare_SearchKeywords& sKeys = m_pShareData->m_sSearchKeywords;
m_pShareData->m_sSearchKeywords.m_aSearchKeys.clear();
m_pShareData->m_sSearchKeywords.m_aReplaceKeys.clear();
m_pShareData->m_sSearchKeywords.m_aGrepFiles.clear();
m_pShareData->m_sSearchKeywords.m_aGrepFiles.push_back(L"*.*");
m_pShareData->m_sSearchKeywords.m_aGrepFolders.clear();
ClearFavorite(sKeys.m_aSearchKeysFav, _countof(sKeys.m_aSearchKeysFav));
ClearFavorite(sKeys.m_aReplaceKeysFav, _countof(sKeys.m_aReplaceKeysFav));
ClearFavorite(sKeys.m_aGrepFilesFav, _countof(sKeys.m_aGrepFilesFav));
ClearFavorite(sKeys.m_aGrepFoldersFav, _countof(sKeys.m_aGrepFoldersFav));

// 2004/06/21 novice タグジャンプ機能追加
m_pShareData->m_sTagJump.m_TagJumpNum = 0;
Expand All @@ -714,8 +726,11 @@ bool CShareData::InitShareData()

wcscpy( m_pShareData->m_sHistory.m_szIMPORTFOLDER, szIniFolder ); /* 設定インポート用フォルダ */

SShare_History& sHis = m_pShareData->m_sHistory;
m_pShareData->m_sHistory.m_aCommands.clear();
m_pShareData->m_sHistory.m_aCurDirs.clear();
ClearFavorite(sHis.m_aCommandsFav, _countof(sHis.m_aCommandsFav));
ClearFavorite(sHis.m_aCurDirsFav, _countof(sHis.m_aCurDirsFav));

m_pShareData->m_nExecFlgOpt = 1; /* 外部コマンド実行の「標準出力を得る」 */ // 2006.12.03 maru オプションの拡張のため

Expand Down
24 changes: 24 additions & 0 deletions sakura_core/env/CShareData_IO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,10 @@ void CShareData_IO::ShareData_IO_Keys( CDataProfile& cProfile )
for( i = 0; i < nSize; ++i ){
auto_sprintf( szKeyName, LTEXT("SEARCHKEY[%02d]"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aSearchKeys[i] );
if( cProfile.IsReadingMode() || pShare->m_sSearchKeywords.m_aSearchKeysFav[i] ){
auto_sprintf( szKeyName, LTEXT("SEARCHKEY[%02d].Fav"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aSearchKeysFav[i] );
}
}

cProfile.IOProfileData( pszSecName, LTEXT("_REPLACEKEY_Counts"), pShare->m_sSearchKeywords.m_aReplaceKeys._GetSizeRef() );
Expand All @@ -319,6 +323,10 @@ void CShareData_IO::ShareData_IO_Keys( CDataProfile& cProfile )
for( i = 0; i < nSize; ++i ){
auto_sprintf( szKeyName, LTEXT("REPLACEKEY[%02d]"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aReplaceKeys[i] );
if( cProfile.IsReadingMode() || pShare->m_sSearchKeywords.m_aReplaceKeysFav[i] ){
auto_sprintf( szKeyName, LTEXT("REPLACEKEY[%02d].Fav"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aReplaceKeysFav[i] );
}
}
}

Expand All @@ -343,6 +351,10 @@ void CShareData_IO::ShareData_IO_Grep( CDataProfile& cProfile )
for( i = 0; i < nSize; ++i ){
auto_sprintf( szKeyName, LTEXT("GREPFILE[%02d]"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aGrepFiles[i] );
if( cProfile.IsReadingMode() || pShare->m_sSearchKeywords.m_aGrepFilesFav[i] ){
auto_sprintf( szKeyName, LTEXT("GREPFILE[%02d].Fav"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aGrepFilesFav[i] );
}
}

cProfile.IOProfileData( pszSecName, LTEXT("_GREPFOLDER_Counts"), pShare->m_sSearchKeywords.m_aGrepFolders._GetSizeRef() );
Expand All @@ -351,6 +363,10 @@ void CShareData_IO::ShareData_IO_Grep( CDataProfile& cProfile )
for( i = 0; i < nSize; ++i ){
auto_sprintf( szKeyName, LTEXT("GREPFOLDER[%02d]"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aGrepFolders[i] );
if( cProfile.IsReadingMode() || pShare->m_sSearchKeywords.m_aGrepFoldersFav[i] ){
auto_sprintf( szKeyName, LTEXT("GREPFOLDER[%02d].Fav"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sSearchKeywords.m_aGrepFoldersFav[i] );
}
}

/* 除外ファイルパターン */
Expand Down Expand Up @@ -409,6 +425,10 @@ void CShareData_IO::ShareData_IO_Cmd( CDataProfile& cProfile )
for( i = 0; i < nSize; ++i ){
auto_sprintf( szKeyName, LTEXT("szCmdArr[%02d]"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sHistory.m_aCommands[i] );
if( cProfile.IsReadingMode() || pShare->m_sHistory.m_aCommandsFav[i] ){
auto_sprintf( szKeyName, LTEXT("szCmdArr[%02d].Fav"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sHistory.m_aCommandsFav[i] );
}
}

cProfile.IOProfileData( pszSecName, LTEXT("nCurDirArrNum"), pShare->m_sHistory.m_aCurDirs._GetSizeRef() );
Expand All @@ -417,6 +437,10 @@ void CShareData_IO::ShareData_IO_Cmd( CDataProfile& cProfile )
for( i = 0; i < nSize; ++i ){
auto_sprintf( szKeyName, LTEXT("szCurDirArr[%02d]"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sHistory.m_aCurDirs[i] );
if( cProfile.IsReadingMode() || pShare->m_sHistory.m_aCurDirsFav[i] ){
auto_sprintf( szKeyName, LTEXT("szCurDirArr[%02d].Fav"), i );
cProfile.IOProfileData( pszSecName, szKeyName, pShare->m_sHistory.m_aCurDirsFav[i] );
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion sakura_core/recent/CRecentCmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CRecentCmd::CRecentCmd()
GetShareData()->m_sHistory.m_aCommands.dataPtr(),
GetShareData()->m_sHistory.m_aCommands.dataPtr()->GetBufferCount(),
&GetShareData()->m_sHistory.m_aCommands._GetSizeRef(),
NULL,
GetShareData()->m_sHistory.m_aCommandsFav,
MAX_CMDARR,
NULL
);
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/recent/CRecentCurDir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CRecentCurDir::CRecentCurDir()
GetShareData()->m_sHistory.m_aCurDirs.dataPtr(),
GetShareData()->m_sHistory.m_aCurDirs.dataPtr()->GetBufferCount(),
&GetShareData()->m_sHistory.m_aCurDirs._GetSizeRef(),
NULL,
GetShareData()->m_sHistory.m_aCurDirsFav,
MAX_CMDARR,
NULL
);
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/recent/CRecentGrepFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ CRecentGrepFile::CRecentGrepFile()
GetShareData()->m_sSearchKeywords.m_aGrepFiles.dataPtr(),
GetShareData()->m_sSearchKeywords.m_aGrepFiles.dataPtr()->GetBufferCount(),
&GetShareData()->m_sSearchKeywords.m_aGrepFiles._GetSizeRef(),
NULL,
GetShareData()->m_sSearchKeywords.m_aGrepFilesFav,
MAX_GREPFILE,
NULL
);
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/recent/CRecentGrepFolder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ CRecentGrepFolder::CRecentGrepFolder()
GetShareData()->m_sSearchKeywords.m_aGrepFolders.dataPtr(),
GetShareData()->m_sSearchKeywords.m_aGrepFolders.dataPtr()->GetBufferCount(),
&GetShareData()->m_sSearchKeywords.m_aGrepFolders._GetSizeRef(),
NULL,
GetShareData()->m_sSearchKeywords.m_aGrepFoldersFav,
MAX_GREPFOLDER,
NULL
);
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/recent/CRecentReplace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ CRecentReplace::CRecentReplace()
GetShareData()->m_sSearchKeywords.m_aReplaceKeys.dataPtr(),
GetShareData()->m_sSearchKeywords.m_aReplaceKeys.dataPtr()->GetBufferCount(),
&GetShareData()->m_sSearchKeywords.m_aReplaceKeys._GetSizeRef(),
NULL,
GetShareData()->m_sSearchKeywords.m_aReplaceKeysFav,
MAX_REPLACEKEY,
NULL
);
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/recent/CRecentSearch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CRecentSearch::CRecentSearch()
GetShareData()->m_sSearchKeywords.m_aSearchKeys.dataPtr(),
GetShareData()->m_sSearchKeywords.m_aSearchKeys.dataPtr()->GetBufferCount(),
&GetShareData()->m_sSearchKeywords.m_aSearchKeys._GetSizeRef(),
NULL,
GetShareData()->m_sSearchKeywords.m_aSearchKeysFav,
MAX_SEARCHKEY,
NULL
);
Expand Down
3 changes: 3 additions & 0 deletions sakura_core/recent/SShare_History.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ struct SShare_History{
//MRU以外の情報
SFilePath m_szIMPORTFOLDER; // インポートディレクトリの履歴
StaticVector< StaticString<TCHAR, MAX_CMDLEN>, MAX_CMDARR > m_aCommands; // 外部コマンド実行履歴
bool m_aCommandsFav[MAX_CMDARR]; //!< 外部コマンド実行お気に入り
StaticVector< StaticString<TCHAR, _MAX_PATH>, MAX_CMDARR > m_aCurDirs; // カレントディレクトリ履歴
bool m_aCurDirsFav[MAX_CMDARR]; //!< カレントディレクトリお気に入り

};

#endif /* SAKURA_SSHARE_HISTORY_9F7E6200_FEE2_4CAC_A5D3_32EEC4130CFC_H_ */
Expand Down