diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-27 16:23:13 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-27 16:23:13 +0100 |
| commit | 7fbadf79122f06e80dd52937bfec8dea36cc2581 (patch) | |
| tree | 8c974568176e1644df7416b67a41b44c348ee2f7 /libcaja-private | |
| parent | d21e8d13f08a3c6cc89bec5e49ee4f76749ac89a (diff) | |
| download | caja-7fbadf79122f06e80dd52937bfec8dea36cc2581.tar.bz2 caja-7fbadf79122f06e80dd52937bfec8dea36cc2581.tar.xz | |
Add option to show file sizes with IEC units instead of SI units
Contains also a typo fix for the previous commit
Closes #203
https://github.com/mate-desktop/caja/issues/203
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-file-operations.c | 5 | ||||
| -rw-r--r-- | libcaja-private/caja-file.c | 20 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.h | 1 | ||||
| -rw-r--r-- | libcaja-private/org.mate.caja.gschema.xml.in | 5 |
4 files changed, 26 insertions, 5 deletions
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index 99fbe89f..04ee81ab 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -852,7 +852,10 @@ custom_size_to_string (char *format, va_list va) size = va_arg (va, goffset); #if GLIB_CHECK_VERSION(2, 30, 0) - return g_format_size(size); + if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) + return g_format_size_full (size, G_FORMAT_SIZE_IEC_UNITS); + else + return g_format_size(size); #else return g_format_size_for_display(size); #endif diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index fa00ac8c..3e642391 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -5957,7 +5957,10 @@ caja_file_get_size_as_string (CajaFile *file) } #if GLIB_CHECK_VERSION(2, 30, 0) - return g_format_size(file->details->size); + if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) + return g_format_size_full (file->details->size, G_FORMAT_SIZE_IEC_UNITS); + else + return g_format_size (file->details->size); #else // Since 2.16 return g_format_size_for_display(file->details->size); #endif @@ -6002,7 +6005,10 @@ caja_file_get_size_as_string_with_real_size (CajaFile *file) } #if GLIB_CHECK_VERSION(2, 30, 0) - formated = g_format_size(file->details->size); + if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) + formated = g_format_size_full (file->details->size, G_FORMAT_SIZE_IEC_UNITS); + else + formated = g_format_size(file->details->size); #else formated = g_format_size_for_display(file->details->size); #endif @@ -6074,7 +6080,10 @@ caja_file_get_deep_count_as_string_internal (CajaFile *file, if (report_size) { #if GLIB_CHECK_VERSION(2, 30, 0) - return g_format_size(total_size); + if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) + return g_format_size_full (total_size, G_FORMAT_SIZE_IEC_UNITS); + else + return g_format_size(total_size); #else return g_format_size_for_display(total_size); #endif @@ -6889,7 +6898,10 @@ caja_file_get_volume_free_space (CajaFile *file) if (directory->details->free_space != (guint64) -1) { #if GLIB_CHECK_VERSION(2, 30, 0) - res = g_format_size(directory->details->free_space); + if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_USE_IEC_UNITS)) + res = g_format_size_full (directory->details->free_space, G_FORMAT_SIZE_IEC_UNITS); + else + res = g_format_size(directory->details->free_space); #else res = g_format_size_for_display(directory->details->free_space); #endif diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 85fbe75f..ee76abb8 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -64,6 +64,7 @@ G_BEGIN_DECLS #define CAJA_PREFERENCES_SHOW_HIDDEN_FILES "show-hidden-files" #define CAJA_PREFERENCES_SHOW_ADVANCED_PERMISSIONS "show-advanced-permissions" #define CAJA_PREFERENCES_DATE_FORMAT "date-format" +#define CAJA_PREFERENCES_USE_IEC_UNITS "use-iec-units" /* Mouse */ #define CAJA_PREFERENCES_MOUSE_USE_EXTRA_BUTTONS "mouse-use-extra-buttons" diff --git a/libcaja-private/org.mate.caja.gschema.xml.in b/libcaja-private/org.mate.caja.gschema.xml.in index fc8fb5ca..1cf7fa0e 100644 --- a/libcaja-private/org.mate.caja.gschema.xml.in +++ b/libcaja-private/org.mate.caja.gschema.xml.in @@ -236,6 +236,11 @@ <_summary>Whether to show hidden files</_summary> <_description>If set to true, then hidden files are shown by default in the file manager. Hidden files are either dotfiles, listed in the folder's .hidden file or backup files ending with a tilde (~).</_description> </key> + <key name="use-iec-units" type="b"> + <default>false</default> + <_summary>Whether to show file sizes with IEC units</_summary> + <_description>If set to true, file sizes are shown using IEC (base 1024) units with "KiB" style suffixes, instead of default with SI units.</_description> + </key> </schema> <schema id="org.mate.caja.icon-view" path="/org/mate/caja/icon-view/" gettext-domain="caja"> |