Thread: [Winmerge-svn] SF.net SVN: winmerge: [3665] trunk/Src (Page 3)
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
winmerge-svn
|
From: <ki...@us...> - 2006-10-01 21:11:22
|
Revision: 3665
http://svn.sourceforge.net/winmerge/?rev=3665&view=rev
Author: kimmov
Date: 2006-10-01 14:11:14 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-30 23:50:47 UTC (rev 3664)
+++ trunk/Src/Changes.txt 2006-10-01 21:11:14 UTC (rev 3665)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-01 Kimmo
+ PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
+ Src: MainFrm.cpp
+
2006-09-27 Takashi
BUG: [ 1564572 ] Leak memory on undoing
Src: GhostTextBuffer.h
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-09-30 23:50:47 UTC (rev 3664)
+++ trunk/Src/MainFrm.cpp 2006-10-01 21:11:14 UTC (rev 3665)
@@ -177,7 +177,7 @@
* @brief URL to help indes in internet.
* We use internet help when local help file is not found (not installed).
*/
-static const TCHAR DocsURL[] = _T("http://winmerge.org/2.4/manual/index.html");
+static const TCHAR DocsURL[] = _T("http://winmerge.org/2.6/manual/index.html");
/**
* @brief Default relative path to "My Documents" for private filters.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-10-02 21:02:44
|
Revision: 3673
http://svn.sourceforge.net/winmerge/?rev=3673&view=rev
Author: galh
Date: 2006-10-02 06:48:41 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
BUG: [ 1566783 ] Crash on Save Project when no file is selected
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-02 11:11:23 UTC (rev 3672)
+++ trunk/Src/Changes.txt 2006-10-02 13:48:41 UTC (rev 3673)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-02 Gal
+ BUG: [ 1566783 ] Crash on Save Project when no file is selected
+ Src: MainFrm.cpp
+
2006-10-01 Kimmo
PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
Src: MainFrm.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-02 11:11:23 UTC (rev 3672)
+++ trunk/Src/MainFrm.cpp 2006-10-02 13:48:41 UTC (rev 3673)
@@ -3060,7 +3060,8 @@
{
CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument();
CDirView *pView = pDoc->GetMainView();
- int ind = pView->GetFirstSelectedInd();
+ // Use first item if no item is selected.
+ int ind = max(pView->GetFirstSelectedInd(), 0);
const DIFFITEM item = pView->GetItemAt(ind);
left = item.getLeftFilepath(pDoc->GetLeftBasePath());
left += "\\";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-04 20:54:24
|
Revision: 3680
http://svn.sourceforge.net/winmerge/?rev=3680&view=rev
Author: gerundt
Date: 2006-10-04 13:54:13 -0700 (Wed, 04 Oct 2006)
Log Message:
-----------
PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/German/MergeGerman.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-03 20:30:37 UTC (rev 3679)
+++ trunk/Src/Changes.txt 2006-10-04 20:54:13 UTC (rev 3680)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-04 Tim
+ PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
2006-10-02 Gal
BUG: [ 1566783 ] Crash on Save Project when no file is selected
Src: MainFrm.cpp
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-10-03 20:30:37 UTC (rev 3679)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:13 UTC (rev 3680)
@@ -230,7 +230,7 @@
MENUITEM "&Einstellungen...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Aktualisieren\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "Ausge&w\xE4hlte aktualisieren\tStrg+F5", ID_DIR_RESCAN
END
POPUP "&Ansicht"
BEGIN
@@ -341,7 +341,7 @@
MENUITEM "L&inks schreibgesch\xFCtzt", ID_FILE_LEFT_READONLY
MENUITEM "R&echts schreibgesch\xFCtzt", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Zeilenenden konvertieren nach"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -650,7 +650,7 @@
IDD_OPEN DIALOGEX 0, 0, 374, 126
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
-CAPTION "Dateien oder Verzeichnisse ausw\xE4hlen..."
+CAPTION "Dateien oder Ordner ausw\xE4hlen..."
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "&Links:",IDC_STATIC,13,24,65,8
@@ -671,13 +671,13 @@
EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL |
ES_READONLY
PUSHBUTTON "Ausw\xE4hlen...",IDC_SELECT_UNPACKER,252,70,50,14
- CONTROL "&Unterverzeichnisse einbeziehen",IDC_RECURS_CHECK,"Button",
+ CONTROL "&Unterordner einbeziehen",IDC_RECURS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10
LTEXT "Status:",IDC_OPEN_STATUS,15,102,192,8
DEFPUSHBUTTON "OK",IDOK,316,11,50,14
PUSHBUTTON "Abbrechen",IDCANCEL,316,28,50,14
PUSHBUTTON "Hilfe",ID_HELP,316,45,50,14
- GROUPBOX "Zu vergleichende Dateien oder Verzeichnisse",IDC_FILES_DIRS_GROUP,7,
+ GROUPBOX "Zu vergleichende Dateien oder Ordner",IDC_FILES_DIRS_GROUP,7,
7,302,111
END
@@ -1190,7 +1190,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "Testen",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "Installieren...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "Neu...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "Bearbeiten...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "L\xF6schen...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1596,7 +1596,7 @@
VALUE "FileDescription", "WinMerge Anwendung\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
@@ -2018,7 +2018,7 @@
IDS_FILEFILTER_INSTALLFAIL
"Installing filter file failed.\n\nCould not copy new filter file to filter folder."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
END
// VERSION CONTROL OPTIONS
@@ -2075,14 +2075,14 @@
// OPEN DIALOG
STRINGTABLE
BEGIN
- IDS_ERROR_INCOMPARABLE "W\xE4hlen Sie zwei Dateien oder Verzeichnisse zum Vergleichen aus"
- IDS_DIRSEL_TAG "Verzeichnis-Auswahl"
- IDS_OPEN_FILESDIRS "Zwei Verzeichnisse oder zwei Dateien zum Vergleichen ausw\xE4hlen."
+ IDS_ERROR_INCOMPARABLE "W\xE4hlen Sie zwei Dateien oder Ordner zum Vergleichen aus"
+ IDS_DIRSEL_TAG "Ordnerauswahl"
+ IDS_OPEN_FILESDIRS "Zwei Ordner oder zwei Dateien zum Vergleichen ausw\xE4hlen."
IDS_OPEN_LEFTINVALID "Der linke Pfad ist ung\xFCltig!"
IDS_OPEN_RIGHTINVALID "Der rechte Pfad ist ung\xFCltig!"
IDS_OPEN_BOTHINVALID "Beide Pfade sind ung\xFCltig!"
IDS_OPEN_UNPACKERDISABLED "Zwei Dateien zum Aktivieren der Entpacker-Auswahl ausw\xE4hlen."
- IDS_OPEN_MISMATCH "Datei und Verzeichnis k\xF6nnen nicht verglichen werden!"
+ IDS_OPEN_MISMATCH "Datei und Ordner k\xF6nnen nicht verglichen werden!"
END
// LOADING FILE
@@ -2127,13 +2127,13 @@
BEGIN
IDS_NOPROJECT "Sie m\xFCssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)"
IDS_VSS_CHECKOUT_STATUS "Dateien auschecken vom VSS..."
- IDS_VSSERROR "SourceSafe hat beim Versuch die Datei auszuchecken einen Fehler gemeldet. Der Vorgang kann nicht fortgesetzt werden..."
- IDS_VSS_RUN_ERROR "Fehler beim Versionieren."
+ IDS_VSSERROR "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..."
+ IDS_VSS_RUN_ERROR "Fehler beim Ausf\xFChren eines Befehles des Versionierungssystems."
IDS_VSSFOLDER_AND_FILE_NOMATCH "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht \xFCberein. Fortsetzen?"
IDS_VSS_NODATABASES "Keine VSS Datenbank(en) gefunden!"
IDS_VSS_ERRORFROM "Fehler vom VSS:"
- IDS_VSS_CHECKINERROR "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
- IDS_VSS_UNCOERROR "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
+ IDS_VSS_CHECKINERROR "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei einzuchecken.\n Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht.\n Auschecken r\xFCckg\xE4ngig machen?"
+ IDS_VSS_UNCOERROR "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei r\xFCckg\xE4ngig zu machen.\n Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht."
END
// VSS system
@@ -2178,7 +2178,7 @@
IDS_DEL_LEFT_FMT2 "Links (%1 von %2)"
IDS_DEL_RIGHT_FMT2 "Rechts (%1 von %2)"
IDS_DEL_BOTH_FMT2 "Beide (%1 von %2)"
- IDS_SELECT_DESTFOLDER "Zielverzeichnis ausw\xE4hlen."
+ IDS_SELECT_DESTFOLDER "Zielordner ausw\xE4hlen."
IDS_MOVE_LEFT_TO "Links nach... (%1)"
IDS_MOVE_RIGHT_TO "Rechts nach... (%1)"
IDS_MOVE_LEFT_TO2 "Links nach... (%1 von %2)"
@@ -2236,7 +2236,7 @@
STRINGTABLE
BEGIN
IDS_COLHDR_FILENAME "Dateiname"
- IDS_COLHDR_DIR "Verzeichnis"
+ IDS_COLHDR_DIR "Ordner"
IDS_COLHDR_RESULT "Vergleichs-Ergebnis"
IDS_COLHDR_LTIMEM "Linkes Datum"
IDS_COLHDR_RTIMEM "Rechtes Datum"
@@ -2258,8 +2258,8 @@
IDS_COLHDR_RESULT_ABBR "Kurz-Ergebnis"
IDS_COLHDR_LATTRIBUTES "Linke Attribute"
IDS_COLHDR_RATTRIBUTES "Rechte Attribute"
- IDS_COLHDR_LEOL_TYPE "Left EOL"
- IDS_COLHDR_REOL_TYPE "Right EOL"
+ IDS_COLHDR_LEOL_TYPE "Linkes Zeilenende"
+ IDS_COLHDR_REOL_TYPE "Rechtes Zeilenende"
END
// DIRECTORY DIFFING : COLUMN TITLES #3
@@ -2278,7 +2278,7 @@
IDS_CANT_COMPARE_FILES "Dateien k\xF6nnen nicht verglichen werden"
IDS_ABORTED_ITEM "Objekt abgebrochen"
IDS_FILE_SKIPPED "Datei \xFCbersprungen"
- IDS_DIR_SKIPPED "Verzeichnis \xFCbersprungen"
+ IDS_DIR_SKIPPED "Ordner \xFCbersprungen"
IDS_ONLY_IN_FMT "Nur in %1"
IDS_BIN_FILES_SAME "Bin\xE4rdateien sind identisch"
IDS_IDENTICAL "Identisch"
@@ -2300,8 +2300,8 @@
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1
STRINGTABLE
BEGIN
- IDS_COLDESC_FILENAME "Dateiname oder Verzeichnisname."
- IDS_COLDESC_DIR "Unterverzeichnisname, wenn Unterverzeichnisse vorhanden sind."
+ IDS_COLDESC_FILENAME "Dateiname oder Ordnername."
+ IDS_COLDESC_DIR "Unterordnername, wenn Unterordner vorhanden sind."
IDS_COLDESC_RESULT "Vergleichs-Ergebnis, langes Format."
IDS_COLDESC_LTIMEM "Linkes \xC4nderungsdatum."
IDS_COLDESC_RTIMEM "Rechtes \xC4nderungsdatum."
@@ -2323,8 +2323,8 @@
IDS_COLDESC_RESULT_ABBR "Vergleichs-Ergebnis, kurzes Format."
IDS_COLDESC_LATTRIBUTES "Linke Attribute."
IDS_COLDESC_RATTRIBUTES "Rechte Attribute."
- IDS_COLDESC_LEOL_TYPE "Left side file EOL type"
- IDS_COLDESC_REOL_TYPE "Right side file EOL type"
+ IDS_COLDESC_LEOL_TYPE "Linker Zeilenenden-Typ"
+ IDS_COLDESC_REOL_TYPE "Rechter Zeilenenden-Typ"
END
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2)
@@ -2376,11 +2376,11 @@
// Encoding issues
STRINGTABLE
BEGIN
- IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWollen Sie like to treat both files as being in the default windows codepage (recommended)?"
- IDS_DIFFERENT_UNICODINGS "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
- IDS_LOSSY_TRANSCODING_BOTH "Information lost due to encoding errors: both files"
- IDS_LOSSY_TRANSCODING_RIGHT "Information lost due to encoding errors: right file"
- IDS_LOSSY_TRANSCODING_LEFT "Information lost due to encoding errors: left file"
+ IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWollen Sie beide Dateien behandeln, als w\xE4ren sie im gleichen Zeichensatz (empfohlen)?"
+ IDS_DIFFERENT_UNICODINGS "Warnung: Die Dateien haben unterschiedliche Kodierungen, links=%s und rechts=%s, und das Vermischen f\xFChrt m\xF6glicherweise zu Informationsverlusten."
+ IDS_LOSSY_TRANSCODING_BOTH "Informationsverlust wegen Kodierungsfehlern: Beide Dateien"
+ IDS_LOSSY_TRANSCODING_RIGHT "Informationsverlust wegen Kodierungsfehlern: Rechte Datei"
+ IDS_LOSSY_TRANSCODING_LEFT "Informationsverlust wegen Kodierungsfehlern: Linke Datei"
END
// EDITOR : SHOW LINE DIFF
@@ -2437,8 +2437,8 @@
IDS_NO_ZIP_SUPPORT "Die Archiv-Unterst\xFCtzung ist nicht aktiviert.\n
Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) f\xFCr die Archiv-Unterst\xFCtzung k\xF6nnen nicht gefunden werden.
Entnehmen Sie dem Handbuch mehr Informationen \xFCber die Archiv-Unterst\xFCtzung und wie sie aktiviert wird."
- IDS_MERGE7Z_ENABLE_0 "\nNote: 7-Zip integration is disabled in WinMerge settings."
- IDS_MERGE7Z_ENABLE_2 "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
+ IDS_MERGE7Z_ENABLE_0 "\nHinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen deaktiviert."
+ IDS_MERGE7Z_ENABLE_2 "\nHinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen auf eigenst\xE4ndige Arbeitsweise beschr\xE4nkt."
IDS_OPT_EXPORT_CAPTION "Datei zum Exportieren ausw\xE4hlen"
IDS_OPT_IMPORT_CAPTION "Datei zum Importieren ausw\xE4hlen"
IDS_OPT_IMPORT_DONE "Einstellungen aus der Datei importiert."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 08:43:59
|
Revision: 3682
http://svn.sourceforge.net/winmerge/?rev=3682&view=rev
Author: gerundt
Date: 2006-10-07 01:43:48 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/German/MergeGerman.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-04 20:54:58 UTC (rev 3681)
+++ trunk/Src/Changes.txt 2006-10-07 08:43:48 UTC (rev 3682)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-07 Tim
+ PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
2006-10-04 Tim
PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
Src/Languages/German: MergeGerman.rc
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:58 UTC (rev 3681)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-10-07 08:43:48 UTC (rev 3682)
@@ -248,7 +248,7 @@
MENUITEM SEPARATOR
MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR
MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
+ MENUITEM "V&ergleichsstatistik", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "Spra&che...", ID_VIEW_LANGUAGE
END
@@ -922,7 +922,7 @@
CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button",
BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- RTEXT "Wortunterschied (Selektiert):",IDC_STATIC,7,149,90,8
+ RTEXT "Wortunterschied (Selektiert):",IDC_STATIC,2,149,95,8
CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -950,7 +950,7 @@
BEGIN
CONTROL "Gel\xF6schte Dateien in den &Papierkorb verschieben",IDC_USE_RECYCLE_BIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10
- CONTROL "Ignoriere Zeitunterschiede kleiner als 3 Sekunden",
+ CONTROL "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
GROUPBOX "Integration",IDC_STATIC,7,30,218,46
@@ -958,7 +958,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "Er&weitertes Men\xFC verwenden",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "Standardm\xE4\xDFig &Unterordner einbeziehen",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "&Externer Editor:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -1076,7 +1076,7 @@
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION " Folder Compare Progress"
+CAPTION " Ordnervergleichsfortschritt"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14
@@ -1428,7 +1428,7 @@
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Compare Statistics"
+CAPTION "Vergleichsstatistik"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Ordner:",IDC_STATIC,72,7,38,8
@@ -1878,7 +1878,7 @@
STRINGTABLE
BEGIN
IDS_SPLASH_DEVELOPERS "Entwickler:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
- IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
+ IDS_SPLASH_GPLTEXT "WinMerge kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie k\xF6nnen sie unter bestimmten Bedingungen weiter vertreiben; f\xFCr Details sehen Sie sich die GNU Public Lizenz unter dem Hilfe-Men\xFC an."
END
// "DO NOT SHOW AGAIN" MESSAGEBOXES
@@ -1964,7 +1964,7 @@
IDS_DIFF_OPEN_NO_SET_PROPS "Datei(en) dieses Vergleichs wurden ge\xE4ndert. Einige Einstellungen werden erste wirksam, wenn der aktuelle Dateivergleich neu gestartet wurde."
IDS_FONT_CHANGE "Die \xC4nderung der Schriftart wird auf keines der offenen Diff-Fenster angewendet werden."
IDS_OPTIONS_INVALID_TABSIZE
- "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ "Der Wert im Feld der Tabulator-Gr\xF6\xDFe ist nicht im Bereich den WinMerge akzeptiert.\n\nBitte benutzen Sie Werte von 1 - %1."
END
// BROWSE FILE
@@ -2007,16 +2007,16 @@
IDS_FILEFILTER_SAVENEW "Dateinamen f\xFCr neuen Filter ausw\xE4hlen"
IDS_FILEFILTER_FILEMASK "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||"
IDS_FILEFILTER_TMPL_MISSING
- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder."
+ "Die Filtervorlage konnte nicht gefunden werden!\n\nBitte kopieren Sie die Datei %1 in den WinMerge/Filters-Ordner."
IDS_FILEFILTER_TMPL_COPY
- "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
+ "Die Filtervorlage konnte nicht Filterordner kopiert werden:\n%1\n\nBitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist."
IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
+ "Der Benutzer-Filterordner ist nicht definiert!\n\nBitte w\xE4hlen Sie den Filterordner unter Einstellungen/System aus."
IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ "Fehler beim L\xF6schen der Filterdatei:\n%1\n\nIst die Datei m\xF6glicherweise schreibgesch\xFCtzt?"
+ IDS_FILEFILTER_INSTALL "Zu installierenden Filter ausw\xE4hlen"
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "Installieren der Filterdatei fehlgeschlagen.\n\nDie Filterdatei konnte nicht in den Filterordner kopiert werden."
IDS_FILEFILTER_OVERWRITE
"Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
END
@@ -2649,11 +2649,11 @@
// CODEPAGE GEOGRAPHIC GROUPS
STRINGTABLE
BEGIN
- IDS_CPG_WESTERN_EUROPEAN "Western European"
- IDS_CPG_EASTERN_EUROPEAN "Eastern European"
- IDS_CPG_EAST_ASIAN "East Asian"
- IDS_CPG_SOUTH_ASIAN "SE & SW Asian"
- IDS_CPG_MIDDLE_EASTERN "Middle Eastern"
+ IDS_CPG_WESTERN_EUROPEAN "Westeurop\xE4isch"
+ IDS_CPG_EASTERN_EUROPEAN "Osteurop\xE4isch"
+ IDS_CPG_EAST_ASIAN "Ostasiatisch"
+ IDS_CPG_SOUTH_ASIAN "SO & SW-Asiatisch"
+ IDS_CPG_MIDDLE_EASTERN "Mitteleurop\xE4isch"
IDS_CPG_NA "Nicht anwendbar"
END
@@ -2817,7 +2817,7 @@
ID_VIEW_WHITESPACE "Zeigt Leerzeichen an."
ID_VIEW_DETAIL_BAR "Blendet die Unterschiedsleiste ein oder aus."
ID_VIEW_LOCATION_BAR "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien."
- ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
+ ID_VIEW_DIR_STATISTICS "Zeigt die Vergleichsstatistik an."
ID_VIEW_LANGUAGE "W\xE4hlt die Sprache der Benutzeroberfl\xE4che.\nSprache"
ID_VIEW_LINEDIFFS "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe.\nZeilenunterschied anzeigen"
ID_VIEW_SWAPPANES "Vertauscht die Position der beiden Ausschnitte."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-08 14:59:57
|
Revision: 3692
http://svn.sourceforge.net/winmerge/?rev=3692&view=rev
Author: sdottaka
Date: 2006-10-08 07:59:46 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
BUG: [ 1570173 ] Crash when merging all differences
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-08 14:57:19 UTC (rev 3691)
+++ trunk/Src/Changes.txt 2006-10-08 14:59:46 UTC (rev 3692)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-08 Takashi
+ BUG: [ 1570173 ] Crash when merging all differences
+ Src: MergeDoc.cpp
+
2006-10-08 Kimmo
PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
Docs/Users: Contributors.txt
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-10-08 14:57:19 UTC (rev 3691)
+++ trunk/Src/MergeDoc.cpp 2006-10-08 14:59:46 UTC (rev 3692)
@@ -910,7 +910,9 @@
}
else
{
- dbuf.DeleteText(dstView, cd_blank, 0, cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
+ // To removing EOL chars of last line, deletes from the end of the line (cd_blank - 1).
+ ASSERT(cd_blank > 0);
+ dbuf.DeleteText(dstView, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
}
limit=cd_blank-1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-09 22:46:24
|
Revision: 3694
http://svn.sourceforge.net/winmerge/?rev=3694&view=rev
Author: sdottaka
Date: 2006-10-09 15:46:15 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
BUG: [ 1570259 ] Bookmarks GUI get reset after save
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-08 20:24:11 UTC (rev 3693)
+++ trunk/Src/Changes.txt 2006-10-09 22:46:15 UTC (rev 3694)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-09 Takashi
+ BUG: [ 1570259 ] Bookmarks GUI get reset after save
+ Src/editlib: ccrystaltextview.cpp
+
2006-10-08 Takashi
BUG: [ 1570173 ] Crash when merging all differences
Src: MergeDoc.cpp
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2006-10-08 20:24:11 UTC (rev 3693)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2006-10-09 22:46:15 UTC (rev 3694)
@@ -487,6 +487,7 @@
m_bWordWrap = FALSE;
m_bDragSelection = FALSE;
m_bLastSearch = FALSE;
+ m_bBookmarkExist = FALSE;
//BEGIN SW
m_panSubLines = new CArray<int, int>();
ASSERT( m_panSubLines );
@@ -1968,8 +1969,6 @@
m_bPrintHeader = FALSE;
m_bPrintFooter = TRUE;
- m_bBookmarkExist = FALSE; // More bookmarks
-
m_bMultipleSearch = FALSE; // More search
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-10 18:18:30
|
Revision: 3704
http://svn.sourceforge.net/winmerge/?rev=3704&view=rev
Author: sdottaka
Date: 2006-10-10 11:18:22 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
BUG: [ 1573240 ] Crash in subversion trunk
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/OptionsInit.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/Changes.txt 2006-10-10 18:18:22 UTC (rev 3704)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-10 Takashi
+ BUG: [ 1573240 ] Crash in subversion trunk
+ Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
+
2006-10-09 Takashi
BUG: [ 1570259 ] Bookmarks GUI get reset after save
Src/editlib: ccrystaltextview.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/MainFrm.cpp 2006-10-10 18:18:22 UTC (rev 3704)
@@ -241,26 +241,7 @@
CString pathMyFolders = m_options.GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
{
- pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
- CString pathFilters(pathMyFolders);
- if (pathFilters.Right(1) != _T("\\"))
- pathFilters += _T("\\");
- pathFilters += DefaultRelativeFilterPath;
-
- if (!paths_CreateIfNeeded(pathFilters))
- {
- // Failed to create a folder, check it didn't already
- // exist.
- DWORD errCode = GetLastError();
- if (errCode != ERROR_ALREADY_EXISTS)
- {
- // Failed to create a folder for filters, fallback to
- // "My Documents"-folder. It is not worth the trouble to
- // bother user about this or user more clever solutions.
- pathFilters = pathMyFolders;
- }
- }
-
+ CString pathFilters = GetDefaultFilterUserPath();
m_options.SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
@@ -2339,6 +2320,33 @@
return path;
}
+/**
+ * @brief Get default user filter folder path
+ */
+CString CMainFrame::GetDefaultFilterUserPath()
+{
+ CString pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
+ CString pathFilters(pathMyFolders);
+ if (pathFilters.Right(1) != _T("\\"))
+ pathFilters += _T("\\");
+ pathFilters += DefaultRelativeFilterPath;
+
+ if (!paths_CreateIfNeeded(pathFilters))
+ {
+ // Failed to create a folder, check it didn't already
+ // exist.
+ DWORD errCode = GetLastError();
+ if (errCode != ERROR_ALREADY_EXISTS)
+ {
+ // Failed to create a folder for filters, fallback to
+ // "My Documents"-folder. It is not worth the trouble to
+ // bother user about this or user more clever solutions.
+ pathFilters = pathMyFolders;
+ }
+ }
+ return pathFilters;
+}
+
typedef enum { ToConfigLog, FromConfigLog } ConfigLogDirection;
/**
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/MainFrm.h 2006-10-10 18:18:22 UTC (rev 3704)
@@ -117,6 +117,7 @@
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
CString GetDefaultEditor();
+ CString GetDefaultFilterUserPath();
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/OptionsInit.cpp 2006-10-10 18:18:22 UTC (rev 3704)
@@ -112,7 +112,7 @@
m_options.InitOption(OPT_LINEFILTER_ENABLED, false);
m_options.InitOption(OPT_LINEFILTER_REGEXP, _T(""));
m_options.InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
- m_options.InitOption(OPT_FILTER_USERPATH, _T(""));
+ m_options.InitOption(OPT_FILTER_USERPATH, GetDefaultFilterUserPath());
m_options.InitOption(OPT_CP_DEFAULT_MODE, (int)0);
m_options.InitOption(OPT_CP_DEFAULT_CUSTOM, (int)GetACP());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-11 15:46:23
|
Revision: 3706
http://svn.sourceforge.net/winmerge/?rev=3706&view=rev
Author: kimmov
Date: 2006-10-11 08:46:09 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ProjectFilePathsDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-10 18:21:23 UTC (rev 3705)
+++ trunk/Src/Changes.txt 2006-10-11 15:46:09 UTC (rev 3706)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-11 Kimmo
+ PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
+ Src: ProjectFilePathsDlg.cpp
+
2006-10-10 Takashi
BUG: [ 1573240 ] Crash in subversion trunk
Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2006-10-10 18:21:23 UTC (rev 3705)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2006-10-11 15:46:09 UTC (rev 3706)
@@ -158,6 +158,13 @@
{
UpdateData(TRUE);
+ m_sLeftFile.TrimLeft();
+ m_sLeftFile.TrimRight();
+ m_sLeftFile.TrimLeft();
+ m_sLeftFile.TrimRight();
+ m_sFilter.TrimLeft();
+ m_sFilter.TrimRight();
+
CString fileName = AskProjectFileName(FALSE);
if (fileName.IsEmpty())
return;
@@ -169,7 +176,17 @@
if (!m_sRightFile.IsEmpty())
project.SetRight(m_sRightFile, &m_bRightPathReadOnly);
if (!m_sFilter.IsEmpty())
+ {
+ // Remove possbile prefix from the filter name
+ CString prefix = LoadResString(IDS_FILTER_PREFIX);
+ int ind = m_sFilter.Find(prefix, 0);
+ if (ind == 0)
+ {
+ m_sFilter.Delete(0, prefix.GetLength());
+ }
+ m_sFilter.TrimLeft();
project.SetFilter(m_sFilter);
+ }
project.SetSubfolders(m_bIncludeSubfolders);
CString sErr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-18 21:43:26
|
Revision: 3719
http://svn.sourceforge.net/winmerge/?rev=3719&view=rev
Author: kimmov
Date: 2006-10-18 14:43:13 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-18 21:24:09 UTC (rev 3718)
+++ trunk/Src/Changes.txt 2006-10-18 21:43:13 UTC (rev 3719)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-19 Kimmo
+ PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
+ Src: MainFrm.cpp MainFrm.h
+
2006-10-11 Kimmo
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Src: ProjectFilePathsDlg.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-18 21:24:09 UTC (rev 3718)
+++ trunk/Src/MainFrm.cpp 2006-10-18 21:43:13 UTC (rev 3719)
@@ -241,7 +241,8 @@
CString pathMyFolders = m_options.GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
{
- CString pathFilters = GetDefaultFilterUserPath();
+ // No filter path, set it to default and make sure it exists.
+ CString pathFilters = GetDefaultFilterUserPath(TRUE);
m_options.SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
@@ -2321,9 +2322,16 @@
}
/**
- * @brief Get default user filter folder path
+ * @brief Get default user filter folder path.
+ * This function returns the default filter path for user filters.
+ * If wanted so (@p bCreate) path can be created if it does not
+ * exist yet. But you really want to create the patch only when
+ * there is no user path defined.
+ * @param [in] bCreate If TRUE filter path is created if it does
+ * not exist.
+ * @return Default folder for user filters.
*/
-CString CMainFrame::GetDefaultFilterUserPath()
+CString CMainFrame::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
{
CString pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
CString pathFilters(pathMyFolders);
@@ -2331,7 +2339,7 @@
pathFilters += _T("\\");
pathFilters += DefaultRelativeFilterPath;
- if (!paths_CreateIfNeeded(pathFilters))
+ if (bCreate && !paths_CreateIfNeeded(pathFilters))
{
// Failed to create a folder, check it didn't already
// exist.
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2006-10-18 21:24:09 UTC (rev 3718)
+++ trunk/Src/MainFrm.h 2006-10-18 21:43:13 UTC (rev 3719)
@@ -117,7 +117,7 @@
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
CString GetDefaultEditor();
- CString GetDefaultFilterUserPath();
+ CString GetDefaultFilterUserPath(BOOL bCreate = FALSE);
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-19 21:05:50
|
Revision: 3724
http://svn.sourceforge.net/winmerge/?rev=3724&view=rev
Author: kimmov
Date: 2006-10-19 14:05:41 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
Trivial type fixes, coding style fixes and converting comments to doxygen
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-19 20:09:15 UTC (rev 3723)
+++ trunk/Src/Changes.txt 2006-10-19 21:05:41 UTC (rev 3724)
@@ -5,6 +5,8 @@
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Src: MainFrm.cpp MainFrm.h
+ Trivial type fixes, coding style fixes and converting comments to doxygen
+ Src: StdAfx.cpp StdAfx.h
2006-10-11 Kimmo
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2006-10-19 20:09:15 UTC (rev 3723)
+++ trunk/Src/StdAfx.cpp 2006-10-19 21:05:41 UTC (rev 3724)
@@ -43,7 +43,7 @@
// This is ok for the UNICODE build because UCS-2LE code bytes
// do not extend as high as 2Gig (actually even full Unicode
// codepoints don't extend that high).
-int normch(int c)
+static wint_t normch(wint_t c)
{
#ifdef _UNICODE
return (unsigned short)(short)c;
@@ -52,38 +52,44 @@
#endif
}
-// Returns nonzero if input is outside ASCII or is underline
-int
-xisspecial (int c)
+/** @brief Return nonzero if input is outside ASCII or is underline. */
+int xisspecial (wint_t c)
{
return normch(c) > (unsigned) _T ('\x7f') || c == _T ('_');
}
-// Returns non-zero if input is alphabetic or "special" (see xisspecial)
-// Also converts any negative inputs to negative char equivalents (see normch)
-int
-xisalpha (int c)
+/**
+ * @brief Return non-zero if input is alphabetic or "special" (see xisspecial).
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisalpha (wint_t c)
{
return _istalpha (normch(c)) || xisspecial (normch(c));
}
-// Returns non-zero if input is alphanumeric or "special" (see xisspecial)
-// Also converts any negative inputs to negative char equivalents (see normch)
-int
-xisalnum (int c)
+/**
+ * @brief Return non-zero if input is alphanumeric or "special" (see xisspecial).
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisalnum (wint_t c)
{
return _istalnum (normch(c)) || xisspecial (normch(c));
}
-// Returns non-zero if input character is a space
-// Also converts any negative inputs to negative char equivalents (see normch)
-int
-xisspace (int c)
+/**
+ * @brief Return non-zero if input character is a space.
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisspace (wint_t c)
{
return _istspace (normch(c));
}
-// Load string resource and return as CString
+/**
+ * @brief Load string resource and return as CString.
+ * @param [in] id Resource string ID.
+ * @return Resource string as CString.
+ */
CString LoadResString(int id)
{
CString s;
@@ -91,13 +97,20 @@
return s;
}
-// Combines AfxFormatString1 with AfxMessageBox
-int
-ResMsgBox1(int msgid, LPCTSTR arg, UINT nType, UINT nIDHelp)
+/**
+ * @brief Show messagebox with resource string having parameter.
+ * @param [in] msgid Resource string ID.
+ * @param [in] arg Argument string.
+ * @param [in] nType Messagebox type flags (e.g. MB_OK).
+ * @param [in] nIDHelp Help string ID.
+ * @return User choice from the messagebox (see MessageBox()).
+ */
+int ResMsgBox1(int msgid, LPCTSTR arg, UINT nType, UINT nIDHelp)
{
CString msg;
AfxFormatString1(msg, msgid, arg);
- if (!nIDHelp) nIDHelp = msgid;
+ if (!nIDHelp)
+ nIDHelp = msgid;
return AfxMessageBox(msg, nType, nIDHelp);
}
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2006-10-19 20:09:15 UTC (rev 3723)
+++ trunk/Src/StdAfx.h 2006-10-19 21:05:41 UTC (rev 3724)
@@ -70,10 +70,10 @@
// Miscellaneous functions defined in StdAfx.cpp
-int xisspecial (int c);
-int xisalpha (int c);
-int xisalnum (int c);
-int xisspace (int c);
+int xisspecial (wint_t c);
+int xisalpha (wint_t c);
+int xisalnum (wint_t c);
+int xisspace (wint_t c);
/** @brief Load string from string resources; shortcut for CString::LoadString */
CString LoadResString(int id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-19 22:19:23
|
Revision: 3725
http://svn.sourceforge.net/winmerge/?rev=3725&view=rev
Author: kimmov
Date: 2006-10-19 15:19:17 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
Fix misuse of reference parameters (compiler warning)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-19 21:05:41 UTC (rev 3724)
+++ trunk/Src/Changes.txt 2006-10-19 22:19:17 UTC (rev 3725)
@@ -7,6 +7,8 @@
Src: MainFrm.cpp MainFrm.h
Trivial type fixes, coding style fixes and converting comments to doxygen
Src: StdAfx.cpp StdAfx.h
+ Fix misuse of reference parameters (compiler warning)
+ Src: DirView.cpp
2006-10-11 Kimmo
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-10-19 21:05:41 UTC (rev 3724)
+++ trunk/Src/DirView.cpp 2006-10-19 22:19:17 UTC (rev 3725)
@@ -382,8 +382,9 @@
DeleteAllDisplayItems();
// If non-recursive compare, add special item(s)
+ CString leftParent, rightParent;
if (!pDoc->GetRecursive() ||
- pDoc->AllowUpwardDirectory(CString(), CString()) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
+ pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
{
cnt += AddSpecialItems();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-20 16:01:58
|
Revision: 3726
http://svn.sourceforge.net/winmerge/?rev=3726&view=rev
Author: kimmov
Date: 2006-10-20 09:01:51 -0700 (Fri, 20 Oct 2006)
Log Message:
-----------
Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-19 22:19:17 UTC (rev 3725)
+++ trunk/Src/Changes.txt 2006-10-20 16:01:51 UTC (rev 3726)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-20 Kimmo
+ Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
+ Src: MainFrm.cpp
+
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Src: MainFrm.cpp MainFrm.h
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-19 22:19:17 UTC (rev 3725)
+++ trunk/Src/MainFrm.cpp 2006-10-20 16:01:51 UTC (rev 3726)
@@ -609,7 +609,6 @@
PackingInfo * infoUnpacker /*= NULL*/)
{
BOOL docNull;
- BOOL bOpenSuccess = FALSE;
CMergeDoc * pMergeDoc = GetMergeDocToShow(pDirDoc, &docNull);
// Make local copies, so we can change encoding if we guess it below
@@ -949,8 +948,6 @@
while (!docs.IsEmpty())
{
CMergeDoc * pMergeDoc = docs.RemoveHead();
- CMergeEditView * pLeft = pMergeDoc->GetLeftView();
- CMergeEditView * pRight = pMergeDoc->GetRightView();
// Re-read MergeDoc settings (also updates view settings)
// and rescan using new options
@@ -1237,15 +1234,6 @@
}
/**
- * @brief Trim trailing line returns.
- */
-static void RemoveLineReturns(CString & str)
-{
- str.Remove('\n');
- str.Remove('\r');
-}
-
-/**
* @brief Sync file to Version Control System
* @param pszSrc [in] File to copy
* @param pszDest [in] Where to copy (incl. filename)
@@ -1254,6 +1242,7 @@
* @return User selection or -1 if error happened
* @sa CMainFrame::HandleReadonlySave()
* @sa CDirView::PerformActionList()
+ * @todo Parameter @p pszSrc is ununsed.
*/
int CMainFrame::SyncFileToVCS(LPCTSTR pszSrc, LPCTSTR pszDest,
BOOL &bApplyToAll, CString *psError)
@@ -1299,7 +1288,6 @@
CString sFontPath = fileFontPath; // Default to change file compare font
CFrameWnd * pFrame = GetActiveFrame();
- BOOL bMergeFrame = pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame));
BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame));
if (bDirFrame)
@@ -1566,7 +1554,7 @@
q.pszWindow = NULL;
q.cbStruct = sizeof(q);
- ::HtmlHelp(GetSafeHwnd(), sPath, HH_DISPLAY_SEARCH, (DWORD)&q);
+ ::HtmlHelp(GetSafeHwnd(), sPath, HH_DISPLAY_SEARCH, (DWORD_PTR)&q);
}
else
ShellExecute(NULL, _T("open"), DocsURL, NULL, NULL, SW_SHOWNORMAL);
@@ -1711,7 +1699,6 @@
USES_CONVERSION;
TCHAR tmp[_MAX_PATH] = {0};
- TCHAR tokenStr[_MAX_PATH] = {0};
TCHAR* token;
TCHAR sep[] = _T("\r\n");
BOOL valid = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-20 16:50:36
|
Revision: 3727
http://svn.sourceforge.net/winmerge/?rev=3727&view=rev
Author: kimmov
Date: 2006-10-20 09:50:30 -0700 (Fri, 20 Oct 2006)
Log Message:
-----------
Remove unused function, fix inproper pointer usage
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileFilterHelper.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-20 16:01:51 UTC (rev 3726)
+++ trunk/Src/Changes.txt 2006-10-20 16:50:30 UTC (rev 3727)
@@ -5,6 +5,8 @@
2006-10-20 Kimmo
Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
Src: MainFrm.cpp
+ Remove unused function, fix inproper pointer usage
+ Src: FileFilterHelper.cpp
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2006-10-20 16:01:51 UTC (rev 3726)
+++ trunk/Src/FileFilterHelper.cpp 2006-10-20 16:50:30 UTC (rev 3727)
@@ -407,15 +407,15 @@
FILEFILTER_INFOLIST filters;
FileInfo fileInfo;
FileInfo *fileInfoStored = NULL;
- FileFilterInfo * filter = NULL;
+ FileFilterInfo filter;
CString selected;
GetFileFilters(&filters, selected);
for (int i = 0; i < filters.GetSize(); i++)
{
- filter = &filters.GetAt(i);
- CString path = filter->fullpath;
- fileInfoStored = &filter->fileinfo;
+ filter = filters.GetAt(i);
+ CString path = filter.fullpath;
+ fileInfoStored = &filter.fileinfo;
fileInfo.Update(path);
if (fileInfo.mtime != fileInfoStored->mtime ||
@@ -435,21 +435,6 @@
}
/**
- * @ brief Returns true if directory exists or successfully created
- * Tries to create multiple directories if needed
- */
-static bool
-EnsureDirectoryExists(const CString & sPath)
-{
- // paths_CanUse will
- if (paths_CreateIfNeeded(sPath))
- return true;
- else
- return false;
-
-}
-
-/**
* @brief Load any known file filters
* @todo Preserve filter selection? How?
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-20 21:10:41
|
Revision: 3728
http://svn.sourceforge.net/winmerge/?rev=3728&view=rev
Author: kimmov
Date: 2006-10-20 14:10:25 -0700 (Fri, 20 Oct 2006)
Log Message:
-----------
Fix casting a pointer type to DWORD (not 64-bit compatible)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
trunk/Src/DirView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-20 16:50:30 UTC (rev 3727)
+++ trunk/Src/Changes.txt 2006-10-20 21:10:25 UTC (rev 3728)
@@ -7,6 +7,8 @@
Src: MainFrm.cpp
Remove unused function, fix inproper pointer usage
Src: FileFilterHelper.cpp
+ Fix casting a pointer type to DWORD (not 64-bit compatible)
+ Src: DirView.cpp DirView.h
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-10-20 16:50:30 UTC (rev 3727)
+++ trunk/Src/DirView.cpp 2006-10-20 21:10:25 UTC (rev 3728)
@@ -633,8 +633,11 @@
AfxGetMainWnd());
}
-/** @brief Convert number to string, with commas
-between digits in locale-appropriate manner */
+/**
+ * @brief Convert number to string.
+ * Converts number to string, with commas between digits in
+ * locale-appropriate manner.
+*/
CString NumToStr(int n)
{
CString s = locality::NumToLocaleStr(n);
@@ -815,7 +818,7 @@
m_ctlSortHeader.SetSortImage(ColLogToPhys(sortCol), bSortAscending);
//sort using static CompareFunc comparison function
CompareState cs(this, sortCol, bSortAscending);
- GetListCtrl().SortItems(cs.CompareFunc, reinterpret_cast<DWORD>(&cs));
+ GetListCtrl().SortItems(cs.CompareFunc, reinterpret_cast<DWORD_PTR>(&cs));
}
/// Do any last minute work as view closes
@@ -1340,8 +1343,9 @@
}
/**
- * @brief Get keydata associated with item in given index
- * @param idx Item's index to list in UI
+ * @brief Get keydata associated with item in given index.
+ * @param [in] idx Item's index to list in UI.
+ * @return Key for item in given index.
*/
POSITION CDirView::GetItemKey(int idx) const
{
@@ -1350,13 +1354,23 @@
// SetItemKey & GetItemKey encapsulate how the display list items
// are mapped to DiffItems, which in turn are DiffContext keys to the actual DIFFITEM data
-POSITION CDirView::GetItemKeyFromData(DWORD dw) const
+
+/**
+ * @brief Convert item's data to item's key.
+ * Use this function to get item's key when item's data is known.
+ * @param [in] dw Item's data.
+ * @return Item's key.
+ */
+POSITION CDirView::GetItemKeyFromData(DWORD_PTR dw) const
{
return (POSITION)dw;
}
/**
- * Given index in list control, get its associated DIFFITEM data
+ * @brief Get DIFFITEM data for item.
+ * This function returns DIFFITEM data for item in given index in GUI.
+ * @param [in] sel Item's index in folder compare GUI list.
+ * @return DIFFITEM for item.
*/
DIFFITEM CDirView::GetDiffItem(int sel) const
{
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2006-10-20 16:50:30 UTC (rev 3727)
+++ trunk/Src/DirView.h 2006-10-20 21:10:25 UTC (rev 3728)
@@ -396,7 +396,7 @@
void DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI);
void DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI);
void DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI);
- POSITION GetItemKeyFromData(DWORD dw) const;
+ POSITION GetItemKeyFromData(DWORD_PTR dw) const;
DIFFITEM GetDiffItem(int sel) const;
DIFFITEM & GetDiffItemRef(int sel);
const DIFFITEM & GetDiffItemConstRef(int sel) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-24 21:23:31
|
Revision: 3730
http://svn.sourceforge.net/winmerge/?rev=3730&view=rev
Author: gerundt
Date: 2006-10-24 14:23:22 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
PATCH: [ 1584004 ] Delete "Toolbar.bmp"
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
Removed Paths:
-------------
trunk/Src/res/Toolbar.bmp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-23 21:24:05 UTC (rev 3729)
+++ trunk/Src/Changes.txt 2006-10-24 21:23:22 UTC (rev 3730)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-24 Tim
+ PATCH: [ 1584004 ] Delete "Toolbar.bmp"
+ Src/res deleted file: Toolbar.bmp
+
2006-10-20 Kimmo
Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
Src: MainFrm.cpp
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-10-23 21:24:05 UTC (rev 3729)
+++ trunk/Src/Merge.dsp 2006-10-24 21:23:22 UTC (rev 3730)
@@ -1665,10 +1665,6 @@
# End Source File
# Begin Source File
-SOURCE=.\res\Toolbar.bmp
-# End Source File
-# Begin Source File
-
SOURCE=.\res\unknown.bmp
# End Source File
# Begin Source File
Deleted: trunk/Src/res/Toolbar.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-10-26 12:58:47
|
Revision: 3732
http://svn.sourceforge.net/winmerge/?rev=3732&view=rev
Author: galh
Date: 2006-10-26 05:58:37 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme.
Modified Paths:
--------------
trunk/Src/BCMenu.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/BCMenu.cpp
===================================================================
--- trunk/Src/BCMenu.cpp 2006-10-24 21:26:39 UTC (rev 3731)
+++ trunk/Src/BCMenu.cpp 2006-10-26 12:58:37 UTC (rev 3732)
@@ -659,7 +659,7 @@
else{
BOOL standardflag=FALSE,selectedflag=FALSE,disableflag=FALSE;
BOOL checkflag=FALSE;
- COLORREF crText = GetSysColor(COLOR_MENUTEXT);
+ COLORREF crText = RGB(0, 0, 0); // Original was GetSysColor(COLOR_MENUTEXT);
COLORREF crSelect = GetSysColor(COLOR_HIGHLIGHT);
COLORREF crSelectFill;
if(!IsWinXPLuna())crSelectFill=LightenColor(crSelect,0.85);
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-24 21:26:39 UTC (rev 3731)
+++ trunk/Src/Changes.txt 2006-10-26 12:58:37 UTC (rev 3732)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-26 Gal
+ BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
+ Src/: BCMenu.cpp
+
2006-10-24 Tim
PATCH: [ 1584004 ] Delete "Toolbar.bmp"
Src/res deleted file: Toolbar.bmp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-30 16:30:30
|
Revision: 3737
http://svn.sourceforge.net/winmerge/?rev=3737&view=rev
Author: kimmov
Date: 2006-10-30 08:30:00 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1586869 ] Fix File Select -dialog modality
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirCmpReportDlg.cpp
trunk/Src/FileFiltersDlg.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/MergeDoc.cpp
trunk/Src/PatchDlg.cpp
trunk/Src/ProjectFilePathsDlg.cpp
trunk/Src/PropRegistry.cpp
trunk/Src/PropVss.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/Changes.txt 2006-10-30 16:30:00 UTC (rev 3737)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-30 Kimmo
+ PATCH: [ 1586869 ] Fix File Select -dialog modality
+ Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
+ MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
+
2006-10-26 Gal
BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
Src/: BCMenu.cpp
Modified: trunk/Src/DirCmpReportDlg.cpp
===================================================================
--- trunk/Src/DirCmpReportDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/DirCmpReportDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -118,7 +118,8 @@
int filterid = f_types[m_ctlStyle.GetCurSel()].browseFilter;
CString chosenFilepath;
- if (SelectFile(chosenFilepath, folder, title, filterid, FALSE))
+ if (SelectFile(GetSafeHwnd(), chosenFilepath, folder, title,
+ filterid, FALSE))
{
CString name;
SplitFilename(chosenFilepath, &folder, &name, NULL);
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/FileFiltersDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -408,7 +408,8 @@
path += '\\';
CString s;
- if (SelectFile(s, path, title, IDS_FILEFILTER_FILEMASK, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ FALSE))
{
// Fix file extension
TCHAR file[_MAX_FNAME] = {0};
@@ -537,7 +538,8 @@
CString userPath = theApp.m_globalFileFilter.GetUserFilterPathWithCreate();
CString title = LoadResString(IDS_FILEFILTER_INSTALL);
- if (SelectFile(s, path, title, IDS_FILEFILTER_FILEMASK, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ TRUE))
{
CString filename, ext;
SplitFilename(s, NULL, &filename, &ext);
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/MainFrm.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -895,7 +895,7 @@
if (!bMultiFile)
{
VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
- if (SelectFile(s, strSavePath, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, strSavePath, title, NULL, FALSE))
{
strSavePath = s;
nRetVal = IDNO;
@@ -2709,7 +2709,8 @@
// get the default projects path
CString strProjectPath = m_options.GetString(OPT_PROJECTS_PATH);
- if (!SelectFile(sFilepath, strProjectPath, title, IDS_PROJECTFILES, TRUE))
+ if (!SelectFile(GetSafeHwnd(), sFilepath, strProjectPath, title, IDS_PROJECTFILES,
+ TRUE))
return;
strProjectPath = paths_GetParentPath(sFilepath);
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/Merge.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -364,18 +364,18 @@
/**
* @brief Helper function for selecting dir/file
+ * @param [in] parent Handle to parent window. Can be a NULL, but then
+ * CMainFrame is used which can cause modality problems.
* @param [out] path Selected path is returned in this string
* @param [in] initialPath Initial path (and file) shown when dialog is opened
* @param [in] title Title for path selection dialog
- * @param [in] filterid 0 or STRING ID for filter string - 0 means "All files (*.*)"
+ * @param [in] filterid 0 or STRING ID for filter string
+ * - 0 means "All files (*.*)"
* @param [in] is_open Selects Open/Save -dialog
*/
-BOOL SelectFile(
- CString& path,
- LPCTSTR initialPath /*=NULL*/,
- LPCTSTR title /*= _T("Open")*/,
- UINT filterid /*=0*/,
- BOOL is_open /*=TRUE*/)
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
+ LPCTSTR title /*= _T("Open")*/, UINT filterid /*=0*/,
+ BOOL is_open /*=TRUE*/)
{
path.Empty(); // Clear output param
@@ -394,20 +394,24 @@
SplitFilename(initialPath, 0, &sSelectedFile, 0);
}
}
+
+ if (parent == NULL)
+ parent = AfxGetMainWnd()->GetSafeHwnd();
if (!filterid)
filterid = IDS_ALLFILES;
- CString filters;
- VERIFY(filters.LoadString(filterid));
+ CString filters = LoadResString(filterid);
+
// Convert extension mask from MFC style separators ('|')
// to Win32 style separators ('\0')
LPTSTR filtersStr = filters.GetBuffer(0);
ConvertFilter(filtersStr);
+ filters.ReleaseBuffer();
OPENFILENAME ofn;
memset(&ofn, 0, sizeof(ofn));
ofn.lStructSize = sizeof(ofn);
- ofn.hwndOwner = AfxGetMainWnd()->GetSafeHwnd();
+ ofn.hwndOwner = parent;
ofn.lpstrFilter = filtersStr;
ofn.lpstrCustomFilter = NULL;
ofn.nFilterIndex = 1;
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/Merge.h 2006-10-30 16:30:00 UTC (rev 3737)
@@ -119,9 +119,8 @@
/////////////////////////////////////////////////////////////////////////////
CMergeDoc *GetDoc();
-BOOL SelectFile(CString& path, LPCTSTR root_path = NULL,
- LPCTSTR title = _T("Open"),
- UINT filterid =0,
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR root_path = NULL,
+ LPCTSTR title = _T("Open"), UINT filterid = 0,
BOOL is_open =TRUE);
BOOL SelectFolder(CString& path, LPCTSTR root_path = NULL,
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/MergeDoc.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -978,6 +978,8 @@
CString title;
BOOL result = TRUE;
int answer = IDOK; // Set default we use for scratchpads
+ int nActiveViewIndexType = GetActiveMergeViewIndexType();
+ HWND parent = m_pView[nActiveViewIndexType]->GetSafeHwnd();
// We shouldn't get here if saving is succeed before
ASSERT(nSaveResult != SAVE_DONE);
@@ -1008,7 +1010,7 @@
else
VERIFY(title.LoadString(IDS_SAVE_RIGHT_AS));
- if (SelectFile(s, strPath, title, NULL, FALSE))
+ if (SelectFile(parent, s, strPath, title, NULL, FALSE))
{
CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer];
strSavePath = s;
Modified: trunk/Src/PatchDlg.cpp
===================================================================
--- trunk/Src/PatchDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/PatchDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -257,7 +257,7 @@
VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file1;
- if (SelectFile(s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
{
ChangeFile(s, TRUE);
m_ctlFile1.SetWindowText(s);
@@ -276,7 +276,7 @@
VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file2;
- if (SelectFile(s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
{
ChangeFile(s, FALSE);
m_ctlFile2.SetWindowText(s);
@@ -334,7 +334,7 @@
VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
folder = m_fileResult;
- if (SelectFile(s, folder, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, FALSE))
{
SplitFilename(s, &folder, &name, NULL);
m_fileResult = s;
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -73,7 +73,8 @@
void ProjectFilePathsDlg::OnBnClickedProjLfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(m_sLeftFile, m_sLeftFile, NULL, NULL, TRUE))
+ if (::SelectFile(GetSafeHwnd(), m_sLeftFile, m_sLeftFile, NULL, NULL,
+ TRUE))
UpdateData(FALSE);
}
@@ -83,7 +84,8 @@
void ProjectFilePathsDlg::OnBnClickedProjRfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(m_sRightFile, m_sRightFile, NULL, NULL, TRUE))
+ if (::SelectFile(GetSafeHwnd(), m_sRightFile, m_sRightFile, NULL, NULL,
+ TRUE))
UpdateData(FALSE);
}
@@ -227,7 +229,8 @@
CString strProjectFileName;
CString strProjectPath = GetOptionsMgr()->GetString(OPT_PROJECTS_PATH);
- if (!::SelectFile(strProjectFileName, strProjectPath, NULL, IDS_PROJECTFILES, bOpen))
+ if (!::SelectFile(GetSafeHwnd(), strProjectFileName, strProjectPath, NULL,
+ IDS_PROJECTFILES, bOpen))
return _T("");
if (strProjectFileName.IsEmpty())
Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/PropRegistry.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -237,7 +237,7 @@
CString title;
VERIFY(title.LoadString(IDS_OPEN_TITLE));
- if (SelectFile(path, NULL, title, IDS_PROGRAMFILES, TRUE))
+ if (SelectFile(GetSafeHwnd(), path, NULL, title, IDS_PROGRAMFILES, TRUE))
{
m_strEditorPath = path;
UpdateData(FALSE);
Modified: trunk/Src/PropVss.cpp
===================================================================
--- trunk/Src/PropVss.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/PropVss.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -91,7 +91,7 @@
void CPropVss::OnBrowseButton()
{
CString s;
- if (SelectFile(s))
+ if (SelectFile(GetSafeHwnd(), s))
{
m_strPath = s;
m_ctlPath.SetWindowText(s);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-30 17:03:24
|
Revision: 3738
http://svn.sourceforge.net/winmerge/?rev=3738&view=rev
Author: kimmov
Date: 2006-10-30 09:02:39 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
trunk/Src/resource.h
Removed Paths:
-------------
trunk/Src/res/unknown.ico
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Changes.txt 2006-10-30 17:02:39 UTC (rev 3738)
@@ -6,6 +6,10 @@
PATCH: [ 1586869 ] Fix File Select -dialog modality
Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
+ PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
+ Src: DirView.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ Remove file: Src/Res: unknown.ico
2006-10-26 Gal
BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/DirView.cpp 2006-10-30 17:02:39 UTC (rev 3738)
@@ -65,6 +65,32 @@
*/
const int TimeToSignalCompare = 3;
+/**
+ * @brief Folder compare icon indexes.
+ * This enum defines indexes for imagelist used for folder compare icons.
+ * Note that this enum must be in synch with code in OnInitialUpdate() and
+ * GetColImage(). Also remember that icons are in resource file...
+ */
+static enum
+{
+ DIFFIMG_LUNIQUE,
+ DIFFIMG_RUNIQUE,
+ DIFFIMG_DIFF,
+ DIFFIMG_SAME,
+ DIFFIMG_BINSAME,
+ DIFFIMG_BINDIFF,
+ DIFFIMG_LDIRUNIQUE,
+ DIFFIMG_RDIRUNIQUE,
+ DIFFIMG_SKIP,
+ DIFFIMG_DIRSKIP,
+ DIFFIMG_DIR,
+ DIFFIMG_ERROR,
+ DIFFIMG_DIRUP,
+ DIFFIMG_DIRUP_DISABLE,
+ DIFFIMG_ABORT,
+};
+
+
/////////////////////////////////////////////////////////////////////////////
// CDirView
@@ -240,7 +266,6 @@
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALFILE)));
- VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_UNKNOWN)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALBINARY)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_BINARYDIFF)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_LFOLDER)));
@@ -272,24 +297,6 @@
m_pList->SetExtendedStyle(exstyle);
}
-// These are the offsets into the image list created in OnInitDialog
-#define DIFFIMG_LUNIQUE 0
-#define DIFFIMG_RUNIQUE 1
-#define DIFFIMG_DIFF 2
-#define DIFFIMG_SAME 3
-#define DIFFIMG_UNKNOWN 4
-#define DIFFIMG_BINSAME 5
-#define DIFFIMG_BINDIFF 6
-#define DIFFIMG_LDIRUNIQUE 7
-#define DIFFIMG_RDIRUNIQUE 8
-#define DIFFIMG_SKIP 9
-#define DIFFIMG_DIRSKIP 10
-#define DIFFIMG_DIR 11
-#define DIFFIMG_ERROR 12
-#define DIFFIMG_DIRUP 13
-#define DIFFIMG_DIRUP_DISABLE 14
-#define DIFFIMG_ABORT 15
-
/**
* @brief Return image index appropriate for this row
*/
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
@@ -2011,7 +2010,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Contingut en un cop d'ull"
IDS_COMPMETHOD_MODDATE "Data de modificaci\xF3"
IDS_COMPMETHOD_DATESIZE "Data de modificaci\xF3 i mida"
- IDS_COMPMETHOD_SIZE "Mida
+ IDS_COMPMETHOD_SIZE "Mida"
END
// FILTER OPTIONS
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -82,7 +82,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/French/MergeFrench.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -78,7 +78,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Merge.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "res\\folderskip.ico"
IDI_EQUALFILE ICON "res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "res\\notequalfile.ico"
-IDI_UNKNOWN ICON "res\\unknown.ico"
IDI_EQUALBINARY ICON "res\\equalbinary.ico"
IDI_LFILE ICON "res\\lfile.ico"
IDI_RFILE ICON "res\\rfile.ico"
Deleted: trunk/Src/res/unknown.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/resource.h 2006-10-30 17:02:39 UTC (rev 3738)
@@ -89,17 +89,16 @@
#define IDI_FOLDERSKIP 503
#define IDI_EQUALFILE 504
#define IDI_NOTEQUALFILE 505
-#define IDI_UNKNOWN 506
-#define IDI_EQUALBINARY 507
-#define IDI_LFILE 508
-#define IDI_RFILE 509
-#define IDI_BINARYDIFF 510
-#define IDI_FILESKIP 511
-#define IDI_COMPARE_ERROR 512
-#define IDI_FOLDERUP 513
-#define IDI_FOLDERUP_DISABLE 514
-#define IDI_SIGMA 515
-#define IDI_COMPARE_ABORTED 516
+#define IDI_EQUALBINARY 506
+#define IDI_LFILE 507
+#define IDI_RFILE 508
+#define IDI_BINARYDIFF 509
+#define IDI_FILESKIP 510
+#define IDI_COMPARE_ERROR 511
+#define IDI_FOLDERUP 512
+#define IDI_FOLDERUP_DISABLE 513
+#define IDI_SIGMA 514
+#define IDI_COMPARE_ABORTED 515
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-31 16:49:10
|
Revision: 3746
http://svn.sourceforge.net/winmerge/?rev=3746&view=rev
Author: kimmov
Date: 2006-10-31 08:48:54 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/PreferencesDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-31 00:14:57 UTC (rev 3745)
+++ trunk/Src/Changes.txt 2006-10-31 16:48:54 UTC (rev 3746)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-31 Kimmo
+ PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
+ Src/Common: PreferencesDlg.cpp
+
2006-10-30 Kimmo
PATCH: [ 1586869 ] Fix File Select -dialog modality
Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
Modified: trunk/Src/Common/PreferencesDlg.cpp
===================================================================
--- trunk/Src/Common/PreferencesDlg.cpp 2006-10-31 00:14:57 UTC (rev 3745)
+++ trunk/Src/Common/PreferencesDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746)
@@ -296,7 +296,7 @@
CString s;
CString caption;
VERIFY(caption.LoadString(IDS_OPT_IMPORT_CAPTION));
- if (SelectFile(s, NULL, caption, IDS_INIFILES, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, NULL, caption, IDS_INIFILES, TRUE))
{
if (m_pOptionsMgr->ImportOptions(s) == OPT_OK)
{
@@ -316,7 +316,8 @@
CString settingsFile;
CString caption;
VERIFY(caption.LoadString(IDS_OPT_EXPORT_CAPTION));
- if (SelectFile(settingsFile, NULL, caption, IDS_INIFILES, FALSE))
+ if (SelectFile(GetSafeHwnd(), settingsFile, NULL, caption, IDS_INIFILES,
+ FALSE))
{
// Add settings file extension if it is missing
// So we allow 'filename.otherext' but add extension for 'filename'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-01 15:48:22
|
Revision: 3752
http://svn.sourceforge.net/winmerge/?rev=3752&view=rev
Author: kimmov
Date: 2006-11-01 07:48:02 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
trunk/Src/ProjectFile.cpp
trunk/Src/ProjectFile.h
Removed Paths:
-------------
trunk/Src/ExpatLib/
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/Changes.txt 2006-11-01 15:48:02 UTC (rev 3752)
@@ -7,6 +7,9 @@
New folder: /Externals/Expat
Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
New folder: /Externals/scew
+ PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
+ Src: Merge.dsp ProjectFile.cpp ProjectFile.h
+ Remove folder: Src/ExpatLib/*
2006-10-31 Kimmo
PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/Merge.dsp 2006-11-01 15:48:02 UTC (rev 3752)
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -55,7 +55,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeDebug/WinMerge.exe" /pdbtype:sept /libpath:"..\Build\expat"
!ELSEIF "$(CFG)" == "Merge - Win32 UnicodeDebug"
@@ -72,7 +72,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "..\common" /I ".\editlib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /FR /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /FR /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FR /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMerge.exe" /pdbtype:sept
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /out:"..\Build\MergeUnicodeDebug/WinMergeU.exe" /pdbtype:sept /libpath:"..\Build\expat"
!ELSEIF "$(CFG)" == "Merge - Win32 Release"
@@ -99,7 +99,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -110,7 +110,7 @@
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeRelease/WinMerge.exe" /libpath:"..\Build\expat" /verbose:lib
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Merge - Win32 UnicodeRelease"
@@ -128,7 +128,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /EHa /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /FD /EHa /c
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O1 /I "." /I ".\Common" /I ".\editlib" /I ".\diffutils" /I ".\diffutils\lib" /I ".\diffutils\src" /I "..\Externals\expat\lib" /I "..\Externals\expat\xmlwf" /I "..\Externals\scew" /D "WIN32" /D "_WINDOWS" /D "_AFXDLL" /D "HAVE_STDLIB_H" /D "STDC_HEADERS" /D HAVE_STRING_H=1 /D PR_FILE_NAME=\"pr\" /D DIFF_PROGRAM=\"diff\" /D "REGEX_MALLOC" /D "__MSC__" /D "__NT__" /D USG=1 /D EDITPADC_CLASS= /D "COMPILE_MULTIMON_STUBS" /D "UNICODE" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /Yu"stdafx.h" /FD /EHa /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -139,7 +139,7 @@
LINK32=link.exe
# ADD BASE LINK32 version.lib shlwapi.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /verbose:lib
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /verbose:lib
+# ADD LINK32 version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpatw.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\Build\MergeUnicodeRelease\WinMergeU.exe" /libpath:"..\Build\expat" /verbose:lib
# SUBTRACT LINK32 /pdb:none
!ENDIF
Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp 2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/ProjectFile.cpp 2006-11-01 15:48:02 UTC (rev 3752)
@@ -17,15 +17,23 @@
/**
* @file ProjectFile.cpp
*
- * @brief Implementation file for ProjectFile class
+ * @brief Implementation file for ProjectFile class.
*/
// RCS ID line follows -- this is updated by CVS
// $Id$
#include "stdafx.h"
+#include <scew/scew.h>
+
#include "ProjectFile.h"
-#include "XmlDoc.h"
+// Constants for xml element names
+const TCHAR Root_element_name[] = _T("project");
+const TCHAR Paths_element_name[] = _T("paths");
+const TCHAR Left_element_name[] = _T("left");
+const TCHAR Right_element_name[] = _T("right");
+const TCHAR Filter_element_name[] = _T("filter");
+const TCHAR Subfolders_element_name[] = _T("subfolders");
/**
* @brief Standard constructor.
@@ -38,96 +46,239 @@
}
/**
- * @brief Get message from exception into sError, or else throw it.
- *
- * If this successfully extracts the error description into the string, it simply returns FALSE
- * If it fails to extract the error description, it rethrows the exception
- */
-static BOOL NTAPI False(CException *e, CString *sError)
-{
- if (sError == NULL)
- throw e;
- TCHAR szError[1024];
- e->GetErrorMessage(szError, 1024);
- *sError = szError;
- e->Delete();
- return FALSE;
-}
-
-/**
* @brief Open given path-file and read data from it to member variables.
* @param [in] path Path to project file.
* @param [out] sError Error string if error happened.
* @return TRUE if reading succeeded, FALSE if error happened.
+ * @bug This doesn't handle unicode paths!
*/
BOOL ProjectFile::Read(LPCTSTR path, CString *sError)
{
- return Serialize(false, path, sError);
+ BOOL loaded = FALSE;
+ LPCSTR pathAnsi;
+
+#ifdef UNICODE
+ USES_CONVERSION;
+ pathAnsi = T2A(path);
+#else
+ pathAnsi = path;
+#endif
+
+ scew_tree* tree = NULL;
+ scew_parser* parser = NULL;
+
+ parser = scew_parser_create();
+ scew_parser_ignore_whitespaces(parser, 1);
+
+ if (scew_parser_load_file(parser, pathAnsi))
+ {
+ tree = scew_parser_tree(parser);
+
+ scew_element * root = GetRootElement(tree);
+ if (root)
+ {
+ loaded = TRUE;
+ GetPathsData(root);
+ };
+ }
+ scew_tree_free(tree);
+
+ /* Frees the SCEW parser */
+ scew_parser_free(parser);
+
+ return loaded;
}
/**
+ * @brief Return project file XML's root element.
+ * @param [in] tree XML tree we got from the parser.
+ * @return Root element pointer.
+ */
+scew_element* ProjectFile::GetRootElement(scew_tree * tree)
+{
+ scew_element * root = NULL;
+
+ if (tree != NULL)
+ {
+ root = scew_tree_root(tree);
+ }
+
+ if (root != NULL)
+ {
+ // Make sure we have correct root element
+ if (_tcscmp(Root_element_name, scew_element_name(root)) != 0)
+ {
+ root = NULL;
+ }
+ }
+ return root;
+}
+
+/**
+ * @brief Reads the paths data from the XML data.
+ * This function reads the paths data inside given element in XML data.
+ * @param [in] parent Parent element for the paths data.
+ */
+void ProjectFile::GetPathsData(scew_element * parent)
+{
+ scew_element *paths = NULL;
+
+ if (parent != NULL)
+ {
+ paths = scew_element_by_name(parent, Paths_element_name);
+ }
+
+ if (paths != NULL)
+ {
+ scew_element *left = NULL;
+ scew_element *right = NULL;
+ scew_element *filter = NULL;
+ scew_element *subfolders = NULL;
+
+ left = scew_element_by_name(paths, Left_element_name);
+ right = scew_element_by_name(paths, Right_element_name);
+ filter = scew_element_by_name(paths, Filter_element_name);
+ subfolders = scew_element_by_name(paths, Subfolders_element_name);
+
+ if (left)
+ {
+ LPCTSTR path = NULL;
+ path = scew_element_contents(right);
+ m_leftFile = path;
+ }
+ if (right)
+ {
+ LPCTSTR path = NULL;
+ path = scew_element_contents(right);
+ m_rightFile = path;
+ }
+ if (filter)
+ {
+ LPCTSTR filtername = NULL;
+ filtername = scew_element_contents(filter);
+ m_filter = filtername;
+ }
+ if (subfolders)
+ {
+ LPCTSTR folders = NULL;
+ folders = scew_element_contents(subfolders);
+ m_subfolders = _ttoi(folders);
+ }
+ }
+}
+
+/**
* @brief Save data from member variables to path-file.
* @param [in] path Path to project file.
* @param [out] sError Error string if error happened.
* @return TRUE if saving succeeded, FALSE if error happened.
- * @note paths are converted to UTF-8
*/
BOOL ProjectFile::Save(LPCTSTR path, CString *sError)
{
- return Serialize(true, path, sError);
+ BOOL success = TRUE;
+ LPCSTR pathAnsi;
+
+#ifdef UNICODE
+ USES_CONVERSION;
+ pathAnsi = T2A(path);
+#else
+ pathAnsi = path;
+#endif
+
+ scew_tree* tree = NULL;
+ scew_element* root = NULL;
+ scew_element* paths = NULL;
+
+ tree = scew_tree_create();
+ root = scew_tree_add_root(tree, Root_element_name);
+ if (root != NULL)
+ {
+ paths = AddPathsElement(root);
+ }
+ else
+ success = FALSE;
+
+ if (paths != NULL)
+ {
+ AddPathsContent(paths);
+ }
+ else
+ success = FALSE;
+
+ scew_tree_set_xml_encoding(tree, _T("UTF-8"));
+
+ // Set the XML file standalone
+ scew_tree_set_xml_standalone(tree, 1);
+
+ if (!scew_writer_tree_file(tree, pathAnsi))
+ success = FALSE;
+
+ /* Frees the SCEW tree */
+ scew_tree_free(tree);
+
+ return success;
+ // return Serialize(true, path, sError);
}
-
-/**
- * @brief Read or write project file
- * @param [in] writing TRUE if project file is saved, FALSE if it is loaded.
- * @param [in] path Path to project file.
- * @param [out] sError Error string if error happened.
- * @return TRUE if operation succeeded, FALSE if error happened.
+/**
+ * @brief Add paths element into XML tree.
+ * @param [in] parent Parent element for the paths element.
+ * @return pointer to added paths element.
*/
-BOOL ProjectFile::Serialize(bool writing, LPCTSTR path, CString *sError)
+scew_element* ProjectFile::AddPathsElement(scew_element * parent)
{
- int leftReadOnly = m_bLeftReadOnly ? 1 : 0;
- int rightReadOnly = m_bRightReadOnly ? 1 : 0;
+ scew_element* element = NULL;
+ element = scew_element_add(parent, Paths_element_name);
+ return element;
+}
- try
+/**
+ * @brief Add paths data to the XML tree.
+ * This function adds our paths data to the XML tree.
+ * @param [in] parent Parent element for paths data.
+ * @return TRUE if we succeeded, FALSE otherwise.
+ */
+BOOL ProjectFile::AddPathsContent(scew_element * parent)
+{
+ scew_element* element = NULL;
+
+ if (!m_leftFile.IsEmpty())
{
- XmlDoc::XML_LOADSAVE loadSave = (writing ? XmlDoc::XML_SAVE : XmlDoc::XML_LOAD);
+ LPCTSTR path;
+ element = scew_element_add(parent, Left_element_name);
+ path = m_leftFile.GetBuffer(MAX_PATH);
+ scew_element_set_contents(element, path);
+ m_leftFile.ReleaseBuffer();
+ }
- XmlDoc doc(path, loadSave, _T("UTF-8"));
- doc.Begin();
- {
- XmlElement project(doc, _T("project"));
- {
- XmlElement paths(doc, _T("paths"));
- {
- XmlElement(doc, _T("left"), m_leftFile);
- } {
- XmlElement(doc, _T("left-readonly"), leftReadOnly);
- } {
- XmlElement(doc, _T("right"), m_rightFile);
- } {
- XmlElement(doc, _T("right-readonly"), rightReadOnly);
- } {
- XmlElement(doc, _T("filter"), m_filter);
- } {
- XmlElement(doc, _T("subfolders"), m_subfolders);
- }
- }
- }
- doc.End();
+ if (!m_rightFile.IsEmpty())
+ {
+ LPCTSTR path;
+ element = scew_element_add(parent, Right_element_name);
+ path = m_rightFile.GetBuffer(MAX_PATH);
+ scew_element_set_contents(element, path);
+ m_rightFile.ReleaseBuffer();
+ }
- }
- catch (CException *e)
+ if (!m_filter.IsEmpty())
{
- return False(e, sError);
+ LPCTSTR filter;
+ element = scew_element_add(parent, Filter_element_name);
+ filter = m_filter.GetBuffer(MAX_PATH);
+ scew_element_set_contents(element, filter);
+ m_filter.ReleaseBuffer();
}
- if (!writing)
+ LPCTSTR path;
+ element = scew_element_add(parent, Subfolders_element_name);
+ if (m_subfolders != 0)
{
- m_bLeftReadOnly = (leftReadOnly == 1);
- m_bRightReadOnly = (rightReadOnly == 1);
+ scew_element_set_contents(element, _T("1"));
}
+ else
+ {
+ scew_element_set_contents(element, _T("0"));
+ }
return TRUE;
}
@@ -270,27 +421,6 @@
}
/**
- * @brief Reads one value from XML data.
- */
-BOOL ProjectFile::GetVal(TCHAR *pPaths, TCHAR *pVal, CString * sval,
- TCHAR *ptag1, TCHAR *ptag2, TCHAR *pbuf)
-{
- if (pPaths && pVal && pVal > pPaths)
- {
- TCHAR tmpPath[MAX_PATH] = {0};
- TCHAR *pTagEnd = _tcsstr(pbuf, ptag2);
- if ((pTagEnd - pVal) < (MAX_PATH * sizeof(TCHAR)))
- {
- pVal += _tcslen(ptag1);
- _tcsncpy(tmpPath, pVal, pTagEnd - pVal);
- *sval = tmpPath;
- return TRUE;
- }
- }
- return FALSE;
-}
-
-/**
* @brief Returns left and right paths and recursive from project file
*
* @param [out] sLeft Left path
Modified: trunk/Src/ProjectFile.h
===================================================================
--- trunk/Src/ProjectFile.h 2006-11-01 15:44:01 UTC (rev 3751)
+++ trunk/Src/ProjectFile.h 2006-11-01 15:48:02 UTC (rev 3752)
@@ -22,6 +22,8 @@
// RCS ID line follows -- this is updated by CVS
// $Id$
+#include <scew/scew.h>
+
/** @brief File extension for path files */
const TCHAR PROJECTFILE_EXT[] = _T("WinMerge");
@@ -59,10 +61,12 @@
void GetPaths(CString & sLeft, CString & sRight, BOOL & bSubFolders) const;
protected:
- BOOL Serialize(bool writing, LPCTSTR path, CString *sError);
- BOOL GetVal(TCHAR *pPaths, TCHAR *pVal, CString * sval,
- TCHAR *ptag1, TCHAR *ptag2, TCHAR *pbuf);
+ scew_element* GetRootElement(scew_tree * tree);
+ void GetPathsData(scew_element * parent);
+ scew_element* AddPathsElement(scew_element * parent);
+ BOOL AddPathsContent(scew_element * parent);
+
private:
CString m_leftFile; /**< Left path */
CString m_rightFile; /**< Right path */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-03 16:31:10
|
Revision: 3763
http://svn.sourceforge.net/winmerge/?rev=3763&view=rev
Author: gerundt
Date: 2006-11-03 08:30:52 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/basic.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-03 16:25:32 UTC (rev 3762)
+++ trunk/Src/Changes.txt 2006-11-03 16:30:52 UTC (rev 3763)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-03 Tim
+ PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
+ Src\editlib: basic.cpp
+
2006-11-01 Kimmo
Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
New folder: /Externals/Expat
Modified: trunk/Src/editlib/basic.cpp
===================================================================
--- trunk/Src/editlib/basic.cpp 2006-11-03 16:25:32 UTC (rev 3762)
+++ trunk/Src/editlib/basic.cpp 2006-11-03 16:30:52 UTC (rev 3763)
@@ -173,6 +173,7 @@
_T ("Public"),
_T ("Private"),
_T ("Property"),
+ _T ("ReDim"),
_T ("Rem"),
_T ("Resume"),
_T ("Right"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-03 19:30:32
|
Revision: 3765
http://svn.sourceforge.net/winmerge/?rev=3765&view=rev
Author: kimmov
Date: 2006-11-03 11:30:14 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
PATCH: [ 1589427 ] Add back read-only handling for project files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ProjectFile.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-03 16:33:28 UTC (rev 3764)
+++ trunk/Src/Changes.txt 2006-11-03 19:30:14 UTC (rev 3765)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-03 Kimmo
+ PATCH: [ 1589427 ] Add back read-only handling for project files
+ Src: ProjectFile.cpp
+
2006-11-03 Tim
PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
Src\editlib: basic.cpp
Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp 2006-11-03 16:33:28 UTC (rev 3764)
+++ trunk/Src/ProjectFile.cpp 2006-11-03 19:30:14 UTC (rev 3765)
@@ -34,6 +34,8 @@
const TCHAR Right_element_name[] = _T("right");
const TCHAR Filter_element_name[] = _T("filter");
const TCHAR Subfolders_element_name[] = _T("subfolders");
+const TCHAR Left_ro_element_name[] = _T("left-readonly");
+const TCHAR Right_ro_element_name[] = _T("right-readonly");
/**
* @brief Standard constructor.
@@ -134,11 +136,15 @@
scew_element *right = NULL;
scew_element *filter = NULL;
scew_element *subfolders = NULL;
+ scew_element *left_ro = NULL;
+ scew_element *right_ro = NULL;
left = scew_element_by_name(paths, Left_element_name);
right = scew_element_by_name(paths, Right_element_name);
filter = scew_element_by_name(paths, Filter_element_name);
subfolders = scew_element_by_name(paths, Subfolders_element_name);
+ left_ro = scew_element_by_name(paths, Left_ro_element_name);
+ right_ro = scew_element_by_name(paths, Right_ro_element_name);
if (left)
{
@@ -164,6 +170,18 @@
folders = scew_element_contents(subfolders);
m_subfolders = _ttoi(folders);
}
+ if (left_ro)
+ {
+ LPCTSTR readonly = NULL;
+ readonly = scew_element_contents(left_ro);
+ m_bLeftReadOnly = (_ttoi(readonly) != 0);
+ }
+ if (right_ro)
+ {
+ LPCTSTR readonly = NULL;
+ readonly = scew_element_contents(right_ro);
+ m_bRightReadOnly = (_ttoi(readonly) != 0);
+ }
}
}
@@ -269,16 +287,24 @@
m_filter.ReleaseBuffer();
}
- LPCTSTR path;
element = scew_element_add(parent, Subfolders_element_name);
if (m_subfolders != 0)
- {
scew_element_set_contents(element, _T("1"));
- }
else
- {
scew_element_set_contents(element, _T("0"));
- }
+
+ element = scew_element_add(parent, Left_ro_element_name);
+ if (m_bLeftReadOnly)
+ scew_element_set_contents(element, _T("1"));
+ else
+ scew_element_set_contents(element, _T("0"));
+
+ element = scew_element_add(parent, Right_ro_element_name);
+ if (m_bRightReadOnly)
+ scew_element_set_contents(element, _T("1"));
+ else
+ scew_element_set_contents(element, _T("0"));
+
return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-03 19:35:49
|
Revision: 3766
http://svn.sourceforge.net/winmerge/?rev=3766&view=rev
Author: kimmov
Date: 2006-11-03 11:35:34 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-03 19:30:14 UTC (rev 3765)
+++ trunk/Src/Changes.txt 2006-11-03 19:35:34 UTC (rev 3766)
@@ -5,6 +5,8 @@
2006-11-03 Kimmo
PATCH: [ 1589427 ] Add back read-only handling for project files
Src: ProjectFile.cpp
+ PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
+ Src: MainFrm.cpp
2006-11-03 Tim
PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-11-03 19:30:14 UTC (rev 3765)
+++ trunk/Src/MainFrm.cpp 2006-11-03 19:35:34 UTC (rev 3766)
@@ -3059,6 +3059,8 @@
left = pMergeDoc->m_filePaths.GetLeft();
right = pMergeDoc->m_filePaths.GetRight();
pathsDlg.SetPaths(left, right);
+ pathsDlg.m_bLeftPathReadOnly = pMergeDoc->m_ptBuf[0]->GetReadOnly();
+ pathsDlg.m_bRightPathReadOnly = pMergeDoc->m_ptBuf[1]->GetReadOnly();
}
else if (bDirFrame)
{
@@ -3072,6 +3074,9 @@
right = item.getRightFilepath(pDoc->GetRightBasePath());
right += "\\";
pathsDlg.SetPaths(left, right);
+ pathsDlg.m_bIncludeSubfolders = pDoc->GetRecursive();
+ pathsDlg.m_bLeftPathReadOnly = pDoc->GetReadOnly(TRUE);
+ pathsDlg.m_bRightPathReadOnly = pDoc->GetReadOnly(FALSE);
}
CString filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-03 19:52:42
|
Revision: 3768
http://svn.sourceforge.net/winmerge/?rev=3768&view=rev
Author: kimmov
Date: 2006-11-03 11:52:27 -0800 (Fri, 03 Nov 2006)
Log Message:
-----------
PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffFileInfo.cpp
trunk/Src/DiffFileInfo.h
trunk/Src/DirScan.cpp
trunk/Src/DirViewColHandler.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/FileInfo.cpp
trunk/Src/FileInfo.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/Changes.txt 2006-11-03 19:52:27 UTC (rev 3768)
@@ -7,6 +7,9 @@
Src: ProjectFile.cpp
PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
Src: MainFrm.cpp
+ PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
+ Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
+ DirViewColItems.cpp FileInfo.cpp FileInfo.h
2006-11-03 Tim
PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
Modified: trunk/Src/DiffFileInfo.cpp
===================================================================
--- trunk/Src/DiffFileInfo.cpp 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DiffFileInfo.cpp 2006-11-03 19:52:27 UTC (rev 3768)
@@ -28,45 +28,6 @@
#include "unicoder.h"
/**
- * @brief Convert a FILETIME to a long (standard time)
- */
-static __int64 FileTimeToInt64(FILETIME & ft)
-{
- return CTime(ft).GetTime();
-}
-
-/**
- * @brief Update fileinfo from given file
- * @param [in] sFilePath Full path to file/directory to update
- * @return TRUE if file exists
- */
-BOOL DiffFileInfo::Update(LPCTSTR sFilePath)
-{
- // CFileFind doesn't expose the attributes
- // CFileStatus doesn't expose 64 bit size
- BOOL Update = FALSE;
- WIN32_FIND_DATA wfd;
- HANDLE h = FindFirstFile(sFilePath, &wfd);
- __int64 mtime64 = 0;
- size = -1;
- flags.reset();
- mtime = 0;
- if (h != INVALID_HANDLE_VALUE)
- {
- mtime64 = FileTimeToInt64(wfd.ftLastWriteTime);
- flags.attributes = wfd.dwFileAttributes;
-
- // Folders don't have a size (size remains as -1)
- if ((flags.attributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
- size = FileInfo::GetSizeFromFindData(wfd);
- FindClose(h);
- Update = TRUE;
- }
- mtime = mtime64;
- return Update;
-}
-
-/**
* @brief Clears FileInfo data.
*/
void DiffFileInfo::Clear()
@@ -77,7 +38,6 @@
m_textStats.clear();
}
-
/**
* @brief Return true if file is in any Unicode encoding
*/
Modified: trunk/Src/DiffFileInfo.h
===================================================================
--- trunk/Src/DiffFileInfo.h 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DiffFileInfo.h 2006-11-03 19:52:27 UTC (rev 3768)
@@ -84,7 +84,9 @@
/**
- * @brief Information for file
+ * @brief Information for file.
+ * This class expands FileInfo class with encoding information and
+ * text stats information.
*/
struct DiffFileInfo : public FileInfo
{
@@ -100,7 +102,6 @@
// methods
DiffFileInfo() { Clear(); }
- BOOL Update(LPCTSTR sFilePath);
void Clear();
bool IsEditableEncoding() const;
};
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DirScan.cpp 2006-11-03 19:52:27 UTC (rev 3768)
@@ -8,6 +8,8 @@
#include "stdafx.h"
#include <shlwapi.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "DirScan.h"
#include "CompareStats.h"
#include "common/unicoder.h"
@@ -36,13 +38,11 @@
*/
struct fentry
{
- CString name;
- // storing __time_t if MSVC6 (__MSC_VER<1300)
- // storing __time64_t if MSVC7 (VC.NET)
+ CString name; /**< Item name */
__int64 mtime; /**< Last modify time */
__int64 ctime; /**< Creation modify time */
- __int64 size;
- int attrs;
+ __int64 size; /**< File size */
+ int attrs; /**< Item attributes */
};
typedef CArray<fentry, fentry&> fentryArray;
@@ -356,6 +356,8 @@
*
* @param [in] di DiffItem to compare
* @param [in,out] pCtxt Compare context: contains difflist, encoding info etc.
+ * @todo For date compare, maybe we should use creation date if modification
+ * date is missing?
*/
void CompareDiffItem(DIFFITEM di, CDiffContext * pCtxt)
{
@@ -405,19 +407,33 @@
pCtxt->m_nCompMethod == CMP_DATE_SIZE)
{
// Compare by modified date
- __int64 nTimeDiff = di.left.mtime - di.right.mtime;
- // Remove sign
- nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
- if (pCtxt->m_bIgnoreSmallTimeDiff)
+ // Check that we have both filetimes
+ if (di.left.mtime != 0 && di.right.mtime != 0)
{
- // If option to ignore small timediffs (couple of seconds)
- // is set, decrease absolute difference by allowed diff
- nTimeDiff -= SmallTimeDiff;
+ __int64 nTimeDiff = di.left.mtime - di.right.mtime;
+ // Remove sign
+ nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
+ if (pCtxt->m_bIgnoreSmallTimeDiff)
+ {
+ // If option to ignore small timediffs (couple of seconds)
+ // is set, decrease absolute difference by allowed diff
+ nTimeDiff -= SmallTimeDiff;
+ }
+ if (nTimeDiff <= 0)
+ di.diffcode |= DIFFCODE::TEXT | DIFFCODE::SAME;
+ else
+ di.diffcode |= DIFFCODE::TEXT | DIFFCODE::DIFF;
}
- if (nTimeDiff <= 0)
- di.diffcode |= DIFFCODE::TEXT | DIFFCODE::SAME;
else
- di.diffcode |= DIFFCODE::TEXT | DIFFCODE::DIFF;
+ {
+ // Filetimes for item(s) could not be read. So we have to
+ // set error status, unless we have DATE_SIZE -compare
+ // when we have still hope for size compare..
+ if (pCtxt->m_nCompMethod == CMP_DATE_SIZE)
+ di.diffcode |= DIFFCODE::TEXT | DIFFCODE::SAME;
+ else
+ di.diffcode |= DIFFCODE::TEXT | DIFFCODE::CMPERR;
+ }
// This is actual CMP_DATE_SIZE method..
// If file sizes differ mark them different
@@ -472,7 +488,16 @@
}
/**
- * @brief Load arrays with all directories & files in specified dir
+ * @brief Find files and subfolders from given folder.
+ * This function saves all files and subfolders in given folder to arrays.
+ * We use 64-bit version of stat() to get times since find doesn't return
+ * valid times for very old files (around year 1970). Even stat() seems to
+ * give negative time values but we can live with that. Those around 1970
+ * times can happen when file is created so that it doesn't get valid
+ * creation or modificatio dates.
+ * @param [in] sDir Base folder for files and subfolders.
+ * @param [in, out] dirs Array where subfolders are stored.
+ * @param [in, out] files Array where files are stored.
*/
void LoadFiles(const CString & sDir, fentryArray * dirs, fentryArray * files)
{
@@ -489,14 +514,28 @@
DWORD dwIsDirectory = ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
if (dwIsDirectory && StrStr(_T(".."), ff.cFileName))
continue;
+
fentry ent;
- // Save filetimes as seconds since January 1, 1970
- ent.ctime = CTime(ff.ftCreationTime).GetTime();
- ent.mtime = CTime(ff.ftLastWriteTime).GetTime();
- if (!dwIsDirectory)
- ent.size = FileInfo::GetSizeFromFindData(ff);
- else
- ent.size = -1; // No size for directories
+ CString fullpath = paths_ConcatPath(sDir, ff.cFileName);
+ struct _stati64 fstats;
+ if (_tstati64(fullpath, &fstats) == 0)
+ {
+ // Save filetimes as seconds since January 1, 1970
+ // Note that times can be < 0 if they are around that 1970..
+ // Anyway that is not sensible case for normal files so we can
+ // just use zero for their time.
+ ent.ctime = fstats.st_ctime;
+ if (ent.ctime < 0)
+ ent.ctime = 0;
+ ent.mtime = fstats.st_mtime;
+ if (ent.mtime < 0)
+ ent.mtime = 0;
+
+ if (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ ent.size = -1; // No size for directories
+ else
+ ent.size = fstats.st_size;
+ }
ent.name = ff.cFileName;
ent.attrs = ff.dwFileAttributes;
(dwIsDirectory ? dirs : files) -> Add(ent);
Modified: trunk/Src/DirViewColHandler.cpp
===================================================================
--- trunk/Src/DirViewColHandler.cpp 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DirViewColHandler.cpp 2006-11-03 19:52:27 UTC (rev 3768)
@@ -199,7 +199,7 @@
int nIdx = pParam->item.iItem;
int i = ColPhysToLog(pParam->item.iSubItem);
POSITION key = GetItemKey(nIdx);
- if (key == (POSITION) SPECIAL_ITEM_POS)
+ if (key == SPECIAL_ITEM_POS)
{
if (IsColName(i))
{
@@ -215,13 +215,13 @@
{
CString s = ColGetTextToDisplay(&ctxt, i, di);
// Add '*' to newer time field
- if
- (
- (IsColLmTime(i) && di.left.mtime > di.right.mtime) // Left modification time
- || (IsColRmTime(i) && di.left.mtime < di.right.mtime) // Right modification time
- )
+ if (di.left.mtime != 0 || di.right.mtime != 0)
{
- s.Insert(0, _T("* "));
+ if ((IsColLmTime(i) && di.left.mtime > di.right.mtime) ||
+ (IsColRmTime(i) && di.left.mtime < di.right.mtime))
+ {
+ s.Insert(0, _T("* "));
+ }
}
// Don't show result for folderitems appearing both sides
if ((IsColStatus(i) || IsColStatusAbbr(i)) &&
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/DirViewColItems.cpp 2006-11-03 19:52:27 UTC (rev 3768)
@@ -66,10 +66,10 @@
}
/**
* @brief Function to compare two diffcodes for a sort
+ * @todo How shall we order diff statuses?
*/
static int cmpdiffcode(int diffcode1, int diffcode2)
{
- // TODO: How shall we order these ?
return diffcode1-diffcode2;
}
/**
Modified: trunk/Src/FileInfo.cpp
===================================================================
--- trunk/Src/FileInfo.cpp 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/FileInfo.cpp 2006-11-03 19:52:27 UTC (rev 3768)
@@ -23,42 +23,45 @@
// $Id$
#include "stdafx.h"
+#include <sys/types.h>
+#include <sys/stat.h>
#include "FileInfo.h"
/**
- * @brief Convert a FILETIME to a long (standard time)
- */
-static __int64 FileTimeToInt64(FILETIME & ft)
-{
- return CTime(ft).GetTime();
-}
-
-/**
* @brief Update fileinfo from given file
* @param [in] sFilePath Full path to file/directory to update
+ * @return TRUE if information was updated (item was found).
*/
-void FileInfo::Update(CString sFilePath)
+BOOL FileInfo::Update(CString sFilePath)
{
- // CFileFind doesn't expose the attributes
- // CFileStatus doesn't expose 64 bit size
-
- WIN32_FIND_DATA wfd;
- HANDLE h = FindFirstFile(sFilePath, &wfd);
+ struct _stati64 fstats;
__int64 mtime64 = 0;
+ BOOL retVal = FALSE;
+
size = -1;
flags.reset();
mtime = 0;
- if (h != INVALID_HANDLE_VALUE)
+
+ if (_tstati64(sFilePath, &fstats) == 0)
{
- mtime64 = FileTimeToInt64(wfd.ftLastWriteTime);
- flags.attributes = wfd.dwFileAttributes;
+ // There can be files without modification date.
+ // Then we must use creation date. Of course we assume
+ // creation date then exists...
+ if (fstats.st_mtime == 0)
+ mtime64 = fstats.st_ctime;
+ else
+ mtime64 = fstats.st_mtime;
- // No size for directory ( size remains as -1)$
+ flags.attributes = GetFileAttributes(sFilePath);
+
+ // No size for directory ( size remains as -1)
if ((flags.attributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
- size = FileInfo::GetSizeFromFindData(wfd);
- FindClose(h);
+ size = fstats.st_size;
+
+ retVal = TRUE;
}
mtime = mtime64;
+ return retVal;
}
/**
@@ -72,28 +75,3 @@
version.Empty();
flags.reset();
}
-
-/**
- * @brief Returns 64-bit filesize from Windows Find Data.
- * This function calculates 64-bit filesize from given find-data where
- * filesize is in two variables.
- * @param [in] findData Find-data to get filesize.
- * @return 64-bit filesize.
- */
-__int64 FileInfo::GetSizeFromFindData(const WIN32_FIND_DATA & findData)
-{
- __int64 tmpSize = 0;
- // Get file's size. If more than 31 bits is needed then we need to
- // calculate full 64 bits. Since size is signed variable.
- if (findData.nFileSizeHigh > 0 || findData.nFileSizeLow > INT_MAX)
- {
- tmpSize = findData.nFileSizeHigh;
- tmpSize = tmpSize << 32;
- tmpSize += findData.nFileSizeLow;
- }
- else
- {
- tmpSize = findData.nFileSizeLow;
- }
- return tmpSize;
-}
Modified: trunk/Src/FileInfo.h
===================================================================
--- trunk/Src/FileInfo.h 2006-11-03 19:39:24 UTC (rev 3767)
+++ trunk/Src/FileInfo.h 2006-11-03 19:52:27 UTC (rev 3768)
@@ -36,12 +36,13 @@
};
/**
- * @brief Information for file
+ * @brief Information for file.
+ * This class stores basic information from a file or folder.
+ * Information consists of file times, size and attributes.
+ * Also version info can be get for files supporting it.
*/
struct FileInfo
{
- // storing __time_t if MSVC6 (__MSC_VER<1300)
- // storing __time64_t if MSVC7 (VC.NET)
__int64 ctime; /**< time of creation */
__int64 mtime; /**< time of last modify */
__int64 size; /**< file size in bytes, -1 means file does not exist*/
@@ -49,10 +50,8 @@
FileFlags flags; /**< file attributes */
FileInfo() { Clear(); }
- void Update(CString sFilePath);
+ BOOL Update(CString sFilePath);
void Clear();
-
- static __int64 GetSizeFromFindData(const WIN32_FIND_DATA & findData);
};
#endif // _FILE_INFO_H_INCLUDED
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-06 17:07:43
|
Revision: 3773
http://svn.sourceforge.net/winmerge/?rev=3773&view=rev
Author: kimmov
Date: 2006-11-06 09:07:27 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
PATCH: [ 1590892 ] Handle unicode paths for project files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ProjectFile.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-04 23:59:31 UTC (rev 3772)
+++ trunk/Src/Changes.txt 2006-11-06 17:07:27 UTC (rev 3773)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-06 Kimmo
+ PATCH: [ 1590892 ] Handle unicode paths for project files
+ Src: ProjectFile.cpp
+
2006-11-03 Kimmo
PATCH: [ 1589427 ] Add back read-only handling for project files
Src: ProjectFile.cpp
Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp 2006-11-04 23:59:31 UTC (rev 3772)
+++ trunk/Src/ProjectFile.cpp 2006-11-06 17:07:27 UTC (rev 3773)
@@ -52,42 +52,36 @@
* @param [in] path Path to project file.
* @param [out] sError Error string if error happened.
* @return TRUE if reading succeeded, FALSE if error happened.
- * @bug This doesn't handle unicode paths!
*/
BOOL ProjectFile::Read(LPCTSTR path, CString *sError)
{
BOOL loaded = FALSE;
- LPCSTR pathAnsi;
-
-#ifdef UNICODE
- USES_CONVERSION;
- pathAnsi = T2A(path);
-#else
- pathAnsi = path;
-#endif
-
scew_tree* tree = NULL;
scew_parser* parser = NULL;
parser = scew_parser_create();
scew_parser_ignore_whitespaces(parser, 1);
- if (scew_parser_load_file(parser, pathAnsi))
+ FILE * fp = _tfopen(path, _T("r"));
+ if (fp)
{
- tree = scew_parser_tree(parser);
-
- scew_element * root = GetRootElement(tree);
- if (root)
+ if (scew_parser_load_file_fp(parser, fp))
{
- loaded = TRUE;
- GetPathsData(root);
- };
- }
- scew_tree_free(tree);
+ tree = scew_parser_tree(parser);
- /* Frees the SCEW parser */
- scew_parser_free(parser);
+ scew_element * root = GetRootElement(tree);
+ if (root)
+ {
+ loaded = TRUE;
+ GetPathsData(root);
+ };
+ }
+ scew_tree_free(tree);
+ /* Frees the SCEW parser */
+ scew_parser_free(parser);
+ fclose(fp);
+ }
return loaded;
}
@@ -194,15 +188,6 @@
BOOL ProjectFile::Save(LPCTSTR path, CString *sError)
{
BOOL success = TRUE;
- LPCSTR pathAnsi;
-
-#ifdef UNICODE
- USES_CONVERSION;
- pathAnsi = T2A(path);
-#else
- pathAnsi = path;
-#endif
-
scew_tree* tree = NULL;
scew_element* root = NULL;
scew_element* paths = NULL;
@@ -228,14 +213,29 @@
// Set the XML file standalone
scew_tree_set_xml_standalone(tree, 1);
- if (!scew_writer_tree_file(tree, pathAnsi))
+ FILE * fp = _tfopen(path, _T("w"));
+ if (fp)
+ {
+ if (!scew_writer_tree_fp(tree, fp))
+ {
+ success = FALSE;
+ *sError = LoadResString(IDS_FILEWRITE_ERROR);
+ }
+ fclose(fp);
+ }
+ else
+ {
success = FALSE;
+ }
/* Frees the SCEW tree */
scew_tree_free(tree);
+ if (success == FALSE)
+ {
+ *sError = LoadResString(IDS_FILEWRITE_ERROR);
+ }
return success;
- // return Serialize(true, path, sError);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X