mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-16 06:11:48 -06:00
4.30 beta
This commit is contained in:
committed by
Kornel Lesiński
parent
bcd1db2f5a
commit
e18587ba51
@@ -41,7 +41,7 @@ static UString ConvertSizeToString(UINT64 value)
|
||||
return UString(s) + L" G";
|
||||
}
|
||||
|
||||
LRESULT CPanel::SetItemText(LVITEM &item)
|
||||
LRESULT CPanel::SetItemText(LVITEMW &item)
|
||||
{
|
||||
UINT32 realIndex = GetRealIndex(item);
|
||||
/*
|
||||
@@ -84,7 +84,7 @@ LRESULT CPanel::SetItemText(LVITEM &item)
|
||||
|
||||
if (realIndex == kParentIndex)
|
||||
return 0;
|
||||
UString string;
|
||||
UString s;
|
||||
UINT32 subItemIndex = item.iSubItem;
|
||||
PROPID propID = _visibleProperties[subItemIndex].ID;
|
||||
/*
|
||||
@@ -120,6 +120,7 @@ LRESULT CPanel::SetItemText(LVITEM &item)
|
||||
}
|
||||
if (needRead)
|
||||
*/
|
||||
|
||||
if (_folder->GetProperty(realIndex, propID, &propVariant) != S_OK)
|
||||
throw 2723407;
|
||||
|
||||
@@ -128,20 +129,16 @@ LRESULT CPanel::SetItemText(LVITEM &item)
|
||||
propID == kpidClusterSize)
|
||||
&&
|
||||
(propVariant.vt == VT_UI8 || propVariant.vt == VT_UI4))
|
||||
{
|
||||
string = ConvertSizeToString(ConvertPropVariantToUInt64(propVariant));
|
||||
}
|
||||
s = ConvertSizeToString(ConvertPropVariantToUInt64(propVariant));
|
||||
else
|
||||
{
|
||||
string = ConvertPropertyToString(propVariant, propID, false);
|
||||
}
|
||||
s = ConvertPropertyToString(propVariant, propID, false);
|
||||
|
||||
int size = item.cchTextMax;
|
||||
if(size > 0)
|
||||
{
|
||||
if(string.Length() + 1 > size)
|
||||
string = string.Left(size - 1);
|
||||
lstrcpy(item.pszText, GetSystemString(string));
|
||||
if(s.Length() + 1 > size)
|
||||
s = s.Left(size - 1);
|
||||
wcscpy(item.pszText, s);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -185,9 +182,9 @@ bool CPanel::OnNotifyList(LPNMHDR header, LRESULT &result)
|
||||
}
|
||||
*/
|
||||
|
||||
case LVN_GETDISPINFO:
|
||||
case LVN_GETDISPINFOW:
|
||||
{
|
||||
LV_DISPINFO *dispInfo = (LV_DISPINFO *)header;
|
||||
LV_DISPINFOW *dispInfo = (LV_DISPINFOW *)header;
|
||||
|
||||
//is the sub-item information being requested?
|
||||
|
||||
@@ -268,11 +265,11 @@ bool CPanel::OnNotifyList(LPNMHDR header, LRESULT &result)
|
||||
OnLeftClick((LPNMITEMACTIVATE)header);
|
||||
return false;
|
||||
}
|
||||
case LVN_BEGINLABELEDIT:
|
||||
result = OnBeginLabelEdit((LV_DISPINFO *)header);
|
||||
case LVN_BEGINLABELEDITW:
|
||||
result = OnBeginLabelEdit((LV_DISPINFOW *)header);
|
||||
return true;
|
||||
case LVN_ENDLABELEDIT:
|
||||
result = OnEndLabelEdit((LV_DISPINFO *)header);
|
||||
case LVN_ENDLABELEDITW:
|
||||
result = OnEndLabelEdit((LV_DISPINFOW *)header);
|
||||
return true;
|
||||
|
||||
case NM_CUSTOMDRAW:
|
||||
@@ -354,8 +351,7 @@ void CPanel::OnRefreshStatusBar()
|
||||
CRecordVector<UINT32> indices;
|
||||
GetOperatedItemIndices(indices);
|
||||
|
||||
_statusBar.SetText(0, GetSystemString(MyFormatNew(IDS_N_SELECTED_ITEMS,
|
||||
0x02000301, NumberToStringW(indices.Size()))));
|
||||
_statusBar.SetText(0, MyFormatNew(IDS_N_SELECTED_ITEMS, 0x02000301, NumberToString(indices.Size())));
|
||||
|
||||
UString selectSizeString;
|
||||
|
||||
@@ -366,12 +362,11 @@ void CPanel::OnRefreshStatusBar()
|
||||
totalSize += GetItemSize(indices[i]);
|
||||
selectSizeString = ConvertSizeToString(totalSize);
|
||||
}
|
||||
_statusBar.SetText(1, GetSystemString(selectSizeString));
|
||||
_statusBar.SetText(1, selectSizeString);
|
||||
|
||||
int focusedItem = _listView.GetFocusedItem();
|
||||
UString sizeString;
|
||||
UString dateString;
|
||||
// CSysString nameString;
|
||||
if (focusedItem >= 0 && _listView.GetSelectedCount() > 0)
|
||||
{
|
||||
int realIndex = GetRealItemIndex(focusedItem);
|
||||
@@ -382,16 +377,9 @@ void CPanel::OnRefreshStatusBar()
|
||||
if (_folder->GetProperty(realIndex, kpidLastWriteTime, &propVariant) == S_OK)
|
||||
dateString = ConvertPropertyToString(propVariant, kpidLastWriteTime, false);
|
||||
}
|
||||
// nameString = GetSystemString(GetItemName(realIndex));
|
||||
}
|
||||
_statusBar.SetText(2, GetSystemString(sizeString));
|
||||
_statusBar.SetText(3, GetSystemString(dateString));
|
||||
_statusBar.SetText(2, sizeString);
|
||||
_statusBar.SetText(3, dateString);
|
||||
// _statusBar.SetText(4, nameString);
|
||||
|
||||
|
||||
/*
|
||||
_statusBar2.SetText(1, GetSystemString(MyFormatNew(L"{0} bytes",
|
||||
NumberToStringW(totalSize))));
|
||||
*/
|
||||
// _statusBar.SetText(L"yyy"));
|
||||
// _statusBar2.SetText(1, MyFormatNew(L"{0} bytes", NumberToStringW(totalSize)));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user