Skip to content

✨ feat: Better size display #824

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

Closed
kalicyh wants to merge 1 commit into from
Closed

✨ feat: Better size display #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/App.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ void CApp::SetListSettings()
{
CPanel &panel = Panels[i];
panel._mySelectMode = st.AlternativeSelection;
// **************** NanaZip Modification Start ****************
panel._showSmartSizes = st.ShowSmartSizes;
// **************** NanaZip Modification End ****************
panel._showDots = st.ShowDots;
panel._showRealFileIcons = st.ShowRealFileIcons;
panel._exStyle = extendedStyle;
Expand Down
6 changes: 6 additions & 0 deletions NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/Panel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,9 @@ class CPanel: public NWindows::NControl::CWindow2
// CUIntVector _realIndices;
bool _enableItemChangeNotify;
bool _mySelectMode;
// **************** NanaZip Modification Start ****************
bool _showSmartSizes;
// **************** NanaZip Modification End ****************

int _timestampLevel;

Expand Down Expand Up @@ -586,6 +589,9 @@ class CPanel: public NWindows::NControl::CWindow2
// _virtualMode(flase),
_enableItemChangeNotify(true),
_mySelectMode(false),
// **************** NanaZip Modification Start ****************
_showSmartSizes(false),
// **************** NanaZip Modification End ****************
_timestampLevel(kTimestampPrintLevel_MIN),

_thereAreDeletedItems(false),
Expand Down
42 changes: 41 additions & 1 deletion NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/PanelListNotify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include "Panel.h"
#include "FormatUtils.h"

#include <Mile.Helpers.CppBase.h>

using namespace NWindows;

/* Unicode characters for space:
Expand Down Expand Up @@ -92,6 +94,38 @@ UString ConvertSizeToString(UInt64 value)
return s;
}

// **************** NanaZip Modification Start ****************
static void ConvertSizeToSmartString(UInt64 val, wchar_t *s, size_t cchTextMax) throw()
{
static const wchar_t *kUnits[] = { L"B", L"KB", L"MB", L"GB", L"TB", L"PB", L"EB" };

if (cchTextMax == 0)
return;

int unitIndex = 0;
double size = (double)val;
while (size >= 1024.0 && unitIndex < 6)
{
size /= 1024.0;
unitIndex++;
}

std::wstring text;
if (unitIndex == 0)
text = Mile::FormatWideString(L"%llu %ls", (unsigned long long)val, kUnits[unitIndex]);
else
text = Mile::FormatWideString(L"%.2f %ls", size, kUnits[unitIndex]);

if (text.empty())
{
ConvertSizeToString(val, s);
return;
}

::wcsncpy_s(s, cchTextMax, text.c_str(), _TRUNCATE);
}
// **************** NanaZip Modification End ****************

static inline unsigned GetHex_Upper(unsigned v)
{
return (v < 10) ? ('0' + v) : ('A' + (v - 10));
Expand Down Expand Up @@ -513,7 +547,13 @@ LRESULT CPanel::SetItemText(LVITEMW &item)
{
UInt64 v = 0;
ConvertPropVariantToUInt64(prop, v);
ConvertSizeToString(v, text);
// **************** NanaZip Modification Start ****************
if (_showSmartSizes)
::ConvertSizeToSmartString(v, text, (size_t)item.cchTextMax);
else
::ConvertSizeToString(v, text);
//ConvertSizeToString(v, text);
// **************** NanaZip Modification End ****************
}
else if (prop.vt == VT_BSTR)
{
Expand Down
12 changes: 12 additions & 0 deletions NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ static LPCTSTR const kCopyHistory = TEXT("WantCopyHistory");
static LPCTSTR const kFolderHistory = TEXT("WantFolderHistory");
static LPCTSTR const kLowercaseHashes = TEXT("LowercaseHashes");

// **************** NanaZip Modification Start ****************
static LPCTSTR const kShowSmartSizes = TEXT("ShowSmartSizes");
// **************** NanaZip Modification End ****************
static LPCTSTR const kFlatViewName = TEXT("FlatViewArc");
// static LPCTSTR const kShowDeletedFiles = TEXT("ShowDeleted");

Expand Down Expand Up @@ -152,6 +155,9 @@ void CFmSettings::Save() const
SaveOption(kCopyHistory, CopyHistory);
SaveOption(kFolderHistory, FolderHistory);
SaveOption(kLowercaseHashes, LowercaseHashes);
// **************** NanaZip Modification Start ****************
SaveOption(kShowSmartSizes, ShowSmartSizes);
// **************** NanaZip Modification End ****************
// SaveOption(kUnderline, Underline);

SaveOption(kShowSystemMenu, ShowSystemMenu);
Expand All @@ -170,6 +176,9 @@ void CFmSettings::Load()
CopyHistory = false;
FolderHistory = false;
LowercaseHashes = false;
// **************** NanaZip Modification Start ****************
ShowSmartSizes = false;
// **************** NanaZip Modification End ****************
// Underline = false;

ShowSystemMenu = false;
Expand All @@ -188,6 +197,9 @@ void CFmSettings::Load()
ReadOption(key, kCopyHistory, CopyHistory);
ReadOption(key, kFolderHistory, FolderHistory);
ReadOption(key, kLowercaseHashes, LowercaseHashes);
// **************** NanaZip Modification Start ****************
ReadOption(key, kShowSmartSizes, ShowSmartSizes);
// **************** NanaZip Modification End ****************
// ReadOption(key, kUnderline, Underline);

ReadOption(key, kShowSystemMenu, ShowSystemMenu );
Expand Down
3 changes: 3 additions & 0 deletions NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/RegistryUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ struct CFmSettings
bool CopyHistory;
bool FolderHistory;
bool LowercaseHashes;
// **************** NanaZip Modification Start ****************
bool ShowSmartSizes;
// **************** NanaZip Modification End ****************
// bool Underline;

bool ShowSystemMenu;
Expand Down
12 changes: 12 additions & 0 deletions NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ static const UInt32 kLangIDs[] =
IDX_SETTINGS_WANT_COPY_HISTORY,
IDX_SETTINGS_WANT_FOLDER_HISTORY,
IDX_SETTINGS_LOWERCASE_HASHES,
// **************** NanaZip Modification Start ****************
IDX_SETTINGS_SHOW_SMART_SIZES,
// **************** NanaZip Modification End ****************
// , IDT_COMPRESS_MEMORY
};

Expand Down Expand Up @@ -139,6 +142,9 @@ bool CSettingsPage::OnInit()
CheckButton(IDX_SETTINGS_WANT_COPY_HISTORY, st.CopyHistory);
CheckButton(IDX_SETTINGS_WANT_FOLDER_HISTORY, st.FolderHistory);
CheckButton(IDX_SETTINGS_LOWERCASE_HASHES, st.LowercaseHashes);
// **************** NanaZip Modification Start ****************
CheckButton(IDX_SETTINGS_SHOW_SMART_SIZES, st.ShowSmartSizes);
// **************** NanaZip Modification End ****************

/*
NCompression::CMemUse mu;
Expand Down Expand Up @@ -224,6 +230,9 @@ LONG CSettingsPage::OnApply()
st.CopyHistory = IsButtonCheckedBool(IDX_SETTINGS_WANT_COPY_HISTORY);
st.FolderHistory = IsButtonCheckedBool(IDX_SETTINGS_WANT_FOLDER_HISTORY);
st.LowercaseHashes = IsButtonCheckedBool(IDX_SETTINGS_LOWERCASE_HASHES);
// **************** NanaZip Modification Start ****************
st.ShowSmartSizes = IsButtonCheckedBool(IDX_SETTINGS_SHOW_SMART_SIZES);
// **************** NanaZip Modification End ****************
// st.Underline = IsButtonCheckedBool(IDX_SETTINGS_UNDERLINE);

st.ShowSystemMenu = IsButtonCheckedBool(IDX_SETTINGS_SHOW_SYSTEM_MENU);
Expand Down Expand Up @@ -346,6 +355,9 @@ bool CSettingsPage::OnButtonClicked(int buttonID, HWND buttonHWND)
case IDX_SETTINGS_WANT_COPY_HISTORY:
case IDX_SETTINGS_WANT_FOLDER_HISTORY:
case IDX_SETTINGS_LOWERCASE_HASHES:
// **************** NanaZip Modification Start ****************
case IDX_SETTINGS_SHOW_SMART_SIZES:
// **************** NanaZip Modification End ****************
_wasChanged = true;
break;

Expand Down
1 change: 1 addition & 0 deletions NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPage2.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ BEGIN
CONTROL "Want CopyHistory", IDX_SETTINGS_WANT_COPY_HISTORY, MY_CHECKBOX, m, 168, xc, 10
CONTROL "Want FolderHistory", IDX_SETTINGS_WANT_FOLDER_HISTORY, MY_CHECKBOX, m, 182, xc, 10
CONTROL "Use Lowercase Hashes", IDX_SETTINGS_LOWERCASE_HASHES, MY_CHECKBOX, m, 196, xc, 10
CONTROL "Show file size in KB/MB/GB", IDX_SETTINGS_SHOW_SMART_SIZES, MY_CHECKBOX, m, 210, xc, 10
// **************** NanaZip Modification End ****************

// LTEXT "Memory usage for Compressing:", IDT_COMPRESS_MEMORY, m, 140, xc, 8
Expand Down
3 changes: 3 additions & 0 deletions NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/SettingsPageRes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#define IDX_SETTINGS_WANT_FOLDER_HISTORY 2512
#define IDX_SETTINGS_LOWERCASE_HASHES 2513

// **************** NanaZip Modification Start ****************
#define IDX_SETTINGS_SHOW_SMART_SIZES 2514
// **************** NanaZip Modification End ****************

// #define IDT_SETTINGS_MEM 100
// #define IDC_SETTINGS_MEM 101
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/af/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,9 @@
<data name="Resource2505" xml:space="preserve">
<value>Wys &amp;roosterlyne</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Wys lêergrootte in KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Aangaande NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/ar/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,9 @@
<data name="Resource2508" xml:space="preserve">
<value>استعمال &amp;صفحات ذاكرة كبيرة</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>إظهار حجم الملف بوحدات KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>حول البرنامج</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/az-arab/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Böyük yaddaş səhifələri istifadəsi</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Fayl ölçüsünü KB/MB/GB ilə göstər</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>NanaZip Haqqında</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/be/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Выкарыстаць вялікія старонкі памяці</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Паказваць памер файла ў KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Аб праграме NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/bg/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Използване на &amp;големи страници от паметта</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Показвай размера на файла в KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Информация</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/bn/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@
<data name="Resource2508" xml:space="preserve">
<value>বেশি স্মৃতির ব্যবহার</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>ফাইলের আকার KB/MB/GB-এ দেখান</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>NanaZip সম্পর্কে</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/ca-es-valencia/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Utilitzar pàgines de memòria &amp;grans</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Mostra la mida de l'arxiu en KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Sobre NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/ca/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Utilitza pàgines de memòria &amp;grans</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Mostra la mida del fitxer en KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Quant al NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/cs/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,9 @@
<data name="Resource2508" xml:space="preserve">
<value>&amp;Používat velké stránky paměti</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Zobrazovat velikost souboru v KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>O programu NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/cy/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Defnyddiwch tudalenau cof &amp;mawr</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Dangos maint ffeil yn KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Manylion NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/da/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Brug &amp;store hukommelsessider</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Vis filstørrelse i KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Om NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/de/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Große &amp;Speicherseiten verwenden</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Dateigröße in KB/MB/GB anzeigen</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Info über NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/el/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,9 @@
<data name="Resource2513" xml:space="preserve">
<value>Χρήση Καταρ/σμου Πεζών Χαρακτήρων</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Εμφάνιση μεγέθους αρχείου σε KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Σχετικά με NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/en/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,9 @@
<data name="Resource2513" xml:space="preserve">
<value>Use Lowercase Hashes</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Show file size in KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>About NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/eo/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Uzu &amp;grandajn memorpaĝojn</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Montri dosiergrandon en KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Informo</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/es/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Usar páginas &amp;grandes de memoria</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Mostrar tamaño de archivo en KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Acerca de NanaZip</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/et/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Kasuta &amp;suuri mälulehekülgi</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Kuva faili suurus KB/MB/GB kujul</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>Teave NanaZipi kohta</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/eu/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,9 @@
<data name="Resource2508" xml:space="preserve">
<value>Erabili &amp;oroimen handiko orrialdeak</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>Erakutsi fitxategiaren tamaina KB/MB/GB-tan</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>NanaZip buruz</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions NanaZipPackage/Strings/fa/Legacy.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,9 @@
<data name="Resource2508" xml:space="preserve">
<value>استفاده از صفحات حافظه حجیم</value>
</data>
<data name="Resource2514" xml:space="preserve">
<value>نمایش اندازه فایل به KB/MB/GB</value>
</data>
<data name="Resource2900" xml:space="preserve">
<value>درباره برنامه</value>
</data>
Expand Down
Loading