Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/windirstat/windirstat.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.txt8
-rw-r--r--common/version.h5
-rw-r--r--wdsh0407/configuration.htm2
-rwxr-xr-xwdsh0415/configuration.htm2
-rw-r--r--wdshelp/configuration.htm2
-rw-r--r--wdsr040c/windirstat.rc12
-rwxr-xr-xwdsr0415/windirstat.rc16
-rw-r--r--wdsr0419/windirstat.rc14
-rw-r--r--windirstat/SelectDrivesDlg.cpp5
-rw-r--r--windirstat/item.cpp7
-rw-r--r--windirstat/mountpoints.cpp14
-rw-r--r--windirstat/sortinglistcontrol.cpp12
-rw-r--r--windirstat/typeview.cpp7
13 files changed, 72 insertions, 34 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0cc7ca2..c44440d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,14 @@ changelog.txt - What has been done to WinDirStat (newest top)
Last modified: $Date$
=============================================================
+2004-12-31 bseifert
+ * Added English phrases to IDS_LANGUAGERESTARTNOW (Russian and Polish).
+ * Untranslated Polish, French and Russian IDS_SEV_*** and IDS_FROMsPLATFORMs strings.
+ * Unicode CString::CompareNoCase doesn't return -1,0,+1 always. Used signum().
+ * Bugfix in CMountPoints::IsJunctionPoint().
+ * Minor correction configuration.htm.
+ * Minor correction in Polish menu.
+
2004-12-30 bseifert
* setup.exe is no compiled optimizing size (-> ca. -15 KB)
* Updated testplan.
diff --git a/common/version.h b/common/version.h
index 014c686..0b17ea5 100644
--- a/common/version.h
+++ b/common/version.h
@@ -44,7 +44,7 @@
// Format: #define blank LINKCOUNT blanks decimal
// Reset this to zero only when you increment VERNUM_MAJOR/MINOR/REVISION.
-#define LINKCOUNT 2
+#define LINKCOUNT 17
//-------------------------------------------------------------------
// Release candidate number. Relevant for BC_RELEASECANDIDATE.
@@ -114,6 +114,9 @@
// $Log$
+// Revision 1.27 2004/12/31 16:01:38 bseifert
+// Bugfixes. See changelog 2004-12-31.
+//
// Revision 1.26 2004/12/30 11:26:12 bseifert
// Decided to use serif font for help files. Incremented version number. rc1.
//
diff --git a/wdsh0407/configuration.htm b/wdsh0407/configuration.htm
index 4914618..d90e3a5 100644
--- a/wdsh0407/configuration.htm
+++ b/wdsh0407/configuration.htm
@@ -18,7 +18,7 @@
Unter NTFS können Zielverzeichnisse in ein anderes Verzeichnis eingepfropft werden
(Junction Points).
(Sie brauchen ein Produkt wie z.B. awxlink, downloadbar von
- <a href="http://www.arniworld.de/">http://www.arniworld.de/</a>, um Junction points anzulegen.)
+ <a href="http://www.arniworld.de/" target="_blank">http://www.arniworld.de/</a>, um Junction points anzulegen.)
Standardmäßig stoppt WinDirStat mit dem Einlesen an diesen Punkten.
Hier können Sie dieses Verhalten ändern.
</p>
diff --git a/wdsh0415/configuration.htm b/wdsh0415/configuration.htm
index 900d800..71305aa 100755
--- a/wdsh0415/configuration.htm
+++ b/wdsh0415/configuration.htm
@@ -18,7 +18,7 @@
W systemie NTFS katalog docelowy mo¿e byæ "przeszczepiany" do innego katalogu
przez u¿ycie punktów krzy¿owych (z angielskiego "node points") (Do tworzenia
takich punktów potrzeba oddzielnego oprogramowania, np. awxlink, który mo¿na
- za³adowaæ z <a href="http://www.arniworld.de/">http://www.arniworld.de/</a>.)
+ za³adowaæ z <a href="http://www.arniworld.de/" target="_blank">http://www.arniworld.de/</a>.)
Domy¶lnie WinDirStat zatrzymuje skanowanie katalogu po napotkaniu takiego
punktu. Tutaj mo¿na zmieniæ to zachowanie.
</p>
diff --git a/wdshelp/configuration.htm b/wdshelp/configuration.htm
index 23ccb78..14e05c4 100644
--- a/wdshelp/configuration.htm
+++ b/wdshelp/configuration.htm
@@ -16,7 +16,7 @@
<p><u>Follow Junction Points (except Volume Mount Points) (only NT and higher)</u>.
Under NTFS target folders can be grafted onto another folder by using junction points.
(You need a third-party tool, e.g. awxlink, downloadable from
- <a href="http://www.arniworld.de/">http://www.arniworld.de/</a>, to create junction points.)
+ <a href="http://www.arniworld.de/" target="_blank">http://www.arniworld.de/</a>, to create junction points.)
By default WinDirStat stops reading at these junction points. Here you can
change this behavior.
</p>
diff --git a/wdsr040c/windirstat.rc b/wdsr040c/windirstat.rc
index 054727b..62953f3 100644
--- a/wdsr040c/windirstat.rc
+++ b/wdsr040c/windirstat.rc
@@ -830,12 +830,12 @@ BEGIN
IDS_POLICY_REFRESHPARENT "Rafraichir le dossier parent de cette entrée"
IDS_BUGREPORTHINT "Pour signaler une erreur, il est préférable de décrire les symptômes, en donnant le message d'erreur complet, et si possible, la manière de provoquer l'erreur en question."
IDS_FEEDBACKHINT "Les commentaires sont toujours les bienvenus."
- IDS_FROMsPLATFORMs "De : %1!s!. Platte-forme : %2!s!.\r\n\r\n"
- IDS_SEV_CRITICAL "Erreur critique"
- IDS_SEV_GRAVE "Erreur grave"
- IDS_SEV_NORMAL "Erreur"
- IDS_SEV_WISH "Idée"
- IDS_SEV_FEEDBACK "Commentaire"
+ IDS_FROMsPLATFORMs "From: %1!s!. Platform: %2!s!.\r\n\r\n"
+ IDS_SEV_CRITICAL "Critical Bug"
+ IDS_SEV_GRAVE "Serious Bug"
+ IDS_SEV_NORMAL "Bug"
+ IDS_SEV_WISH "Wish"
+ IDS_SEV_FEEDBACK "Feedback"
IDS_DRIVECOL_NAME "Nom"
IDS_DRIVECOL_TOTAL "Total"
IDS_DRIVECOL_FREE "Libre"
diff --git a/wdsr0415/windirstat.rc b/wdsr0415/windirstat.rc
index e7e440a..ef04cec 100755
--- a/wdsr0415/windirstat.rc
+++ b/wdsr0415/windirstat.rc
@@ -143,7 +143,7 @@ BEGIN
END
POPUP "&Mapa drzewa"
BEGIN
- MENUITEM "&Poka¿ Mapê D rzewa\tF9", ID_VIEW_SHOWTREEMAP
+ MENUITEM "&Poka¿ Mapê Drzewa\tF9", ID_VIEW_SHOWTREEMAP
MENUITEM SEPARATOR
MENUITEM "Po&wiêksz\t+", ID_TREEMAP_ZOOMIN
MENUITEM "Po&mniejsz\t-", ID_TREEMAP_ZOOMOUT
@@ -772,7 +772,7 @@ BEGIN
IDS_EXPAND "&Rozwiñ"
IDS_CREATEPROCESSsFAILEDs
"Tworzenie procesu(%1!s!) nie powiod³o siê: %2!s!"
- IDS_LANGUAGERESTARTNOW "Jêzyk zostanie zmieniony po ponownym uruchomieniu programu.\r\n\r\nUruchomiæ ponownie teraz?"
+ IDS_LANGUAGERESTARTNOW "Jêzyk zostanie zmieniony po ponownym uruchomieniu programu.\r\n\r\nLanguage changes take not effect until the application is restarted.\r\n\r\nUruchomiæ ponownie teraz?"
IDS_ABOUT_AUTHORS "Autorzy"
IDS_ABOUT_AUTHORSTEXTs "=== Programiœci ===\r\n\r\nBernhard Seifert\r\nTwórca projektu i koordynator\r\n(mailto:%1!s!)\r\n\r\nOliver Schneider\r\n(mailto:assarbad@users.sourceforge.net)\r\n\r\n\r\n=== T³umacz¹cy ===\r\n\r\n--- Francuski ---\r\n\r\nPascal Delrot\r\n(mailto:tigroo@users.sourceforge.net)\r\n\r\nUltraSam\r\n(mailto:sam.fd@wanadoo.fr)\r\n\r\n\r\n--- Polski ---\r\n\r\nDariusz Ma³achowski\r\n(mailto:d_malachowski@pf.pl)\r\n\r\n\r\n--- Rosyjski ---\r\n\r\nSergiy 'Polet' Polyetayev\r\n(mailto:s_polyetayev@hotmail.com)\r\n"
END
@@ -826,12 +826,12 @@ BEGIN
IDS_POLICY_REFRESHPARENT "Odœwie¿ poziom wy¿ej dla elementu"
IDS_BUGREPORTHINT "W przypadku b³êdu, opisz jego symptomy w³¹czaj¹c dok³adny tekst komunikatu o b³êdzie, oraz je¿eli to mo¿liwe kolejne kroki, w celu wygenerowania b³êdu ponownie."
IDS_FEEDBACKHINT "Uwagi s¹ zawsze mile widziane."
- IDS_FROMsPLATFORMs "Od: %1!s!. Platforma: %2!s!.\r\n\r\n"
- IDS_SEV_CRITICAL "B³¹d krytyczny"
- IDS_SEV_GRAVE "B³¹d powa¿ny"
- IDS_SEV_NORMAL "B³¹d normalny"
- IDS_SEV_WISH "Proœba"
- IDS_SEV_FEEDBACK "Opinia"
+ IDS_FROMsPLATFORMs "From: %1!s!. Platform: %2!s!.\r\n\r\n"
+ IDS_SEV_CRITICAL "Critical Bug"
+ IDS_SEV_GRAVE "Serious Bug"
+ IDS_SEV_NORMAL "Bug"
+ IDS_SEV_WISH "Wish"
+ IDS_SEV_FEEDBACK "Feedback"
IDS_DRIVECOL_NAME "Nazwa"
IDS_DRIVECOL_TOTAL "PojemnoϾ"
IDS_DRIVECOL_FREE "Wolne"
diff --git a/wdsr0419/windirstat.rc b/wdsr0419/windirstat.rc
index f5ee33f..292b2f3 100644
--- a/wdsr0419/windirstat.rc
+++ b/wdsr0419/windirstat.rc
@@ -775,7 +775,7 @@ BEGIN
IDS_COLLAPSE "Ñâåðíóòü"
IDS_EXPAND "Ðàçâåðíóòü"
IDS_CREATEPROCESSsFAILEDs "Ñîçäàíèå ïðîöåññà (%1!s!) íåóñïåøíî: %2!s!"
- IDS_LANGUAGERESTARTNOW "Èçìåíåíèå ÿçûêà âñòóïèò â ñèëó òîëüêî ïîñëå ïåðåçàïóñêà ïðèîæåíèÿ.\r\n\r\nÏåðåçàïóñòèòü WinDirStat ñåé÷àñ?"
+ IDS_LANGUAGERESTARTNOW "Èçìåíåíèå ÿçûêà âñòóïèò â ñèëó òîëüêî ïîñëå ïåðåçàïóñêà ïðèîæåíèÿ.\r\n\r\nLanguage changes take not effect until the application is restarted.\r\n\r\nÏåðåçàïóñòèòü WinDirStat ñåé÷àñ?"
IDS_ABOUT_AUTHORS "Authors"
IDS_ABOUT_AUTHORSTEXTs "=== Programmers ===\r\n\r\nBernhard Seifert\r\nCreator of the project and coordinator\r\n(mailto:%1!s!)\r\n\r\nOliver Schneider\r\n(mailto:assarbad@users.sourceforge.net)\r\n\r\n\r\n=== Translators ===\r\n\r\n--- French ---\r\n\r\nPascal Delrot\r\n(mailto:tigroo@users.sourceforge.net)\r\n\r\nUltraSam\r\n(mailto:sam.fd@wanadoo.fr)\r\n\r\n\r\n--- Polish ---\r\n\r\nDariusz Malachowski\r\n(mailto:d_malachowski@pf.pl)\r\n\r\n\r\n--- Russian ---\r\n\r\nSergiy 'Polet' Polyetayev\r\n(mailto:s_polyetayev@hotmail.com)\r\n"
END
@@ -828,12 +828,12 @@ BEGIN
IDS_POLICY_REFRESHPARENT "Îáíîâèòü íàäóðîâåíü"
IDS_BUGREPORTHINT "Äëÿ ñîîáùåíèÿ îá îøèáêå, áûëî áû èäåàëüíî, åñëè áû âû îïèñàëè ñèìïòîì, äîñëîâíî ïðèâåëè òåêñò îøèáêè, è, ïðè âîçìîæíîñòè, øàãè ÷òîáû âîñïðîèçâåñòè ïîâäåíèå."
IDS_FEEDBACKHINT "Îòçûâû âñåãäà ïðèâåòñòâóþòñÿ."
- IDS_FROMsPLATFORMs "Îò: %1!s!. Ïëàòôîðìà: %2!s!.\r\n\r\n"
- IDS_SEV_CRITICAL "Êðèòè÷åñêàÿ îøèáêà"
- IDS_SEV_GRAVE "Ñåðüåçíàÿ îøèáêà"
- IDS_SEV_NORMAL "Îøèáêà"
- IDS_SEV_WISH "Ïîæåëàíèå"
- IDS_SEV_FEEDBACK "Îòçûâ"
+ IDS_FROMsPLATFORMs "From: %1!s!. Platform: %2!s!.\r\n\r\n"
+ IDS_SEV_CRITICAL "Critical Bug"
+ IDS_SEV_GRAVE "Serious Bug"
+ IDS_SEV_NORMAL "Bug"
+ IDS_SEV_WISH "Wish"
+ IDS_SEV_FEEDBACK "Feedback"
IDS_DRIVECOL_NAME "Èìÿ"
IDS_DRIVECOL_TOTAL "Âñåãî"
IDS_DRIVECOL_FREE "Ñâîáîäíî"
diff --git a/windirstat/SelectDrivesDlg.cpp b/windirstat/SelectDrivesDlg.cpp
index 37a5a68..1de8d42 100644
--- a/windirstat/SelectDrivesDlg.cpp
+++ b/windirstat/SelectDrivesDlg.cpp
@@ -153,7 +153,7 @@ int CDriveItem::Compare(const CSortingListItem *baseOther, int subitem) const
switch (subitem)
{
- case COL_NAME: r= GetPath().CompareNoCase(other->GetPath()); break;
+ case COL_NAME: r= signum(GetPath().CompareNoCase(other->GetPath())); break;
case COL_TOTAL: r= signum(m_totalBytes - other->m_totalBytes); break;
case COL_FREE: r= signum(m_freeBytes - other->m_freeBytes); break;
case COL_GRAPH:
@@ -857,6 +857,9 @@ int CALLBACK CSelectDrivesDlg::BrowseCallbackProc( HWND hWnd,
}
// $Log$
+// Revision 1.20 2004/12/31 16:01:42 bseifert
+// Bugfixes. See changelog 2004-12-31.
+//
// Revision 1.19 2004/12/19 10:52:39 bseifert
// Minor fixes.
//
diff --git a/windirstat/item.cpp b/windirstat/item.cpp
index 0f15797..eb2f0b0 100644
--- a/windirstat/item.cpp
+++ b/windirstat/item.cpp
@@ -251,11 +251,11 @@ int CItem::CompareSibling(const CTreeListItem *tlib, int subitem) const
if (GetType() == IT_DRIVE)
{
ASSERT(other->GetType() == IT_DRIVE);
- r = GetPath().CompareNoCase(other->GetPath());
+ r = signum(GetPath().CompareNoCase(other->GetPath()));
}
else
{
- r = m_name.CompareNoCase(other->m_name);
+ r = signum(m_name.CompareNoCase(other->m_name));
}
break;
@@ -1660,6 +1660,9 @@ void CItem::DrivePacman()
// $Log$
+// Revision 1.26 2004/12/31 16:01:42 bseifert
+// Bugfixes. See changelog 2004-12-31.
+//
// Revision 1.25 2004/12/12 08:34:59 bseifert
// Aboutbox: added Authors-Tab. Removed license.txt from resource dlls (saves 16 KB per dll).
//
diff --git a/windirstat/mountpoints.cpp b/windirstat/mountpoints.cpp
index ca60517..fe7553f 100644
--- a/windirstat/mountpoints.cpp
+++ b/windirstat/mountpoints.cpp
@@ -211,9 +211,14 @@ bool CMountPoints::IsMountPoint(CString path)
// as the latter ones are treated differently (see above).
bool CMountPoints::IsJunctionPoint(CString path)
{
- return ( !IsMountPoint(path) &&
- bool(GetFileAttributes(path) & FILE_ATTRIBUTE_REPARSE_POINT)
- );
+ if (IsMountPoint(path))
+ return false;
+
+ DWORD attr = GetFileAttributes(path);
+ if (attr == INVALID_FILE_ATTRIBUTES)
+ return false;
+
+ return ((attr & FILE_ATTRIBUTE_REPARSE_POINT) != 0);
}
bool CMountPoints::IsVolumeMountPoint(CString volume, CString path)
@@ -246,6 +251,9 @@ bool CMountPoints::IsVolumeMountPoint(CString volume, CString path)
}
// $Log$
+// Revision 1.5 2004/12/31 16:01:42 bseifert
+// Bugfixes. See changelog 2004-12-31.
+//
// Revision 1.4 2004/11/05 16:53:07 assarbad
// Added Date and History tag where appropriate.
//
diff --git a/windirstat/sortinglistcontrol.cpp b/windirstat/sortinglistcontrol.cpp
index f0ba981..51be1e5 100644
--- a/windirstat/sortinglistcontrol.cpp
+++ b/windirstat/sortinglistcontrol.cpp
@@ -45,10 +45,17 @@ int CSortingListItem::GetImage() const
return 0;
}
+// Return value:
+// <= -2: this is less than other regardless of ascending flag
+// -1: this is less than other
+// 0: this equals other
+// +1: this is greater than other
+// >= +1: this is greater than other regardless of ascending flag.
+//
int CSortingListItem::Compare(const CSortingListItem *other, int subitem) const
{
// Default implementation compares strings
- return GetText(subitem).CompareNoCase(other->GetText(subitem));
+ return signum(GetText(subitem).CompareNoCase(other->GetText(subitem)));
}
int CSortingListItem::CompareS(const CSortingListItem *other, const SSorting& sorting) const
@@ -288,6 +295,9 @@ void CSortingListControl::OnDestroy()
}
// $Log$
+// Revision 1.4 2004/12/31 16:01:42 bseifert
+// Bugfixes. See changelog 2004-12-31.
+//
// Revision 1.3 2004/11/05 16:53:07 assarbad
// Added Date and History tag where appropriate.
//
diff --git a/windirstat/typeview.cpp b/windirstat/typeview.cpp
index 2386464..5e5f9bd 100644
--- a/windirstat/typeview.cpp
+++ b/windirstat/typeview.cpp
@@ -155,7 +155,7 @@ int CExtensionListControl::CListItem::Compare(const CSortingListItem *baseOther,
switch (subitem)
{
case COL_EXTENSION:
- r= GetExtension().CompareNoCase(other->GetExtension());
+ r= signum(GetExtension().CompareNoCase(other->GetExtension()));
break;
case COL_COLOR:
@@ -168,7 +168,7 @@ int CExtensionListControl::CListItem::Compare(const CSortingListItem *baseOther,
break;
case COL_DESCRIPTION:
- r= GetDescription().CompareNoCase(other->GetDescription());
+ r= signum(GetDescription().CompareNoCase(other->GetDescription()));
break;
case COL_BYTESPERCENT:
@@ -535,6 +535,9 @@ void CTypeView::OnSetFocus(CWnd* /*pOldWnd*/)
// $Log$
+// Revision 1.12 2004/12/31 16:01:42 bseifert
+// Bugfixes. See changelog 2004-12-31.
+//
// Revision 1.11 2004/11/12 22:14:16 bseifert
// Eliminated CLR_NONE. Minor corrections.
//
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 08:00:51 +0300