"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Properties.cpp" between
xfe-1.43.1.tar.gz and xfe-1.43.2.tar.gz

About: Xfe (X File Explorer) is a file manager and browser (using the FOX toolkit).

Properties.cpp  (xfe-1.43.1):Properties.cpp  (xfe-1.43.2)
skipping to change at line 1110 skipping to change at line 1110
} }
if ((nbseldirs >= 1) && (nbselfiles >= 1)) if ((nbseldirs >= 1) && (nbselfiles >= 1))
{ {
type = _("Multiple types"); type = _("Multiple types");
} }
// Number of selected files // Number of selected files
snprintf(buf, sizeof(buf)-1, _("%d items"), num); snprintf(buf, sizeof(buf)-1, _("%d items"), num);
filesSelected->setText(buf); filesSelected->setText(buf);
snprintf(buf, sizeof(buf)-1, _("%d files, %d folders"), nbselfiles, nbseldir
s+dotdot); if (nbselfiles <= 1 && nbseldirs+dotdot <= 1)
{
snprintf(buf, sizeof(buf)-1, _("%d file, %d folder"), nbselfiles, nbs
eldirs+dotdot);
}
else if (nbselfiles <= 1 && nbseldirs+dotdot > 1)
{
snprintf(buf, sizeof(buf)-1, _("%d file, %d folders"), nbselfiles, nb
seldirs+dotdot);
}
else if (nbselfiles > 1 && nbseldirs+dotdot <= 1)
{
snprintf(buf, sizeof(buf)-1, _("%d files, %d folder"), nbselfiles, nb
seldirs+dotdot);
}
else
{
snprintf(buf, sizeof(buf)-1, _("%d files, %d folders"), nbselfiles, n
bseldirs+dotdot);
}
filesSelectedDetails->setText(buf); filesSelectedDetails->setText(buf);
// Display type of selected files // Display type of selected files
filesType->setText(type); filesType->setText(type);
// Flag used to avoid computing recursive size more than once // Flag used to avoid computing recursive size more than once
recsize = true; recsize = true;
// Class variable initializations // Class variable initializations
executable = false; executable = false;
skipping to change at line 2054 skipping to change at line 2071
nbsubdirs--; nbsubdirs--;
} }
#if __WORDSIZE == 64 #if __WORDSIZE == 64
snprintf(size,sizeof(size)-1,_("%s (%lu b ytes)"),hsize.text(),dirsize); snprintf(size,sizeof(size)-1,_("%s (%lu b ytes)"),hsize.text(),dirsize);
#else #else
snprintf(size,sizeof(size)-1,_("%s (%llu bytes)"),hsize.text(),dirsize); snprintf(size,sizeof(size)-1,_("%s (%llu bytes)"),hsize.text(),dirsize);
#endif #endif
fileSize->setText(size); fileSize->setText(size);
snprintf(size, sizeof(size)-1, _("%u file if (nbfiles-nbsubdirs-nbseldirs <= 1 && n
s, %u subfolders"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs); bsubdirs <= 1)
{
snprintf(size, sizeof(size)-1, _(
"%u file, %u subfolder"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
else if (nbfiles-nbsubdirs-nbseldirs <= 1
&& nbsubdirs > 1)
{
snprintf(size, sizeof(size)-1, _(
"%u file, %u subfolders"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
else if (nbfiles-nbsubdirs-nbseldirs > 1
&& nbsubdirs <= 1)
{
snprintf(size, sizeof(size)-1, _(
"%u files, %u subfolder"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
else
{
snprintf(size, sizeof(size)-1, _(
"%u files, %u subfolders"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
fileSizeDetails->setText(size); fileSizeDetails->setText(size);
if (nread < (int)(sizeof(buf)-1)) if (nread < (int)(sizeof(buf)-1))
{ {
break; break;
} }
} }
} }
} }
} }
skipping to change at line 2104 skipping to change at line 2137
nbsubdirs--; nbsubdirs--;
} }
#if __WORDSIZE == 64 #if __WORDSIZE == 64
snprintf(size,sizeof(size)-1,_("%s (%lu bytes)"), hsize.text(),dirsize); snprintf(size,sizeof(size)-1,_("%s (%lu bytes)"), hsize.text(),dirsize);
#else #else
snprintf(size,sizeof(size)-1,_("%s (%llu bytes)") ,hsize.text(),dirsize); snprintf(size,sizeof(size)-1,_("%s (%llu bytes)") ,hsize.text(),dirsize);
#endif #endif
fileSize->setText(size); fileSize->setText(size);
snprintf(size, sizeof(size)-1, _("%u files, %u su if (nbfiles-nbsubdirs-nbseldirs <= 1 && nbsubdirs
bfolders"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs); <= 1)
{
snprintf(size, sizeof(size)-1, _("%u file
, %u subfolder"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
else if (nbfiles-nbsubdirs-nbseldirs <= 1 && nbsu
bdirs > 1)
{
snprintf(size, sizeof(size)-1, _("%u file
, %u subfolders"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
else if (nbfiles-nbsubdirs-nbseldirs > 1 && nbsub
dirs <= 1)
{
snprintf(size, sizeof(size)-1, _("%u file
s, %u subfolder"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
else
{
snprintf(size, sizeof(size)-1, _("%u file
s, %u subfolders"), nbfiles-nbsubdirs-nbseldirs, nbsubdirs);
}
fileSizeDetails->setText(size); fileSizeDetails->setText(size);
} }
if (nread < (int)(sizeof(buf)-1)) if (nread < (int)(sizeof(buf)-1))
{ {
break; break;
} }
} }
// Close pipes // Close pipes
 End of changes. 3 change blocks. 
6 lines changed or deleted 70 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)