Thread: [Winmerge-svn] SF.net SVN: winmerge: [3625] branches/R2_6/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-23 20:17:01
|
Revision: 3625 http://svn.sourceforge.net/winmerge/?rev=3625&view=rev Author: kimmov Date: 2006-09-23 13:16:47 -0700 (Sat, 23 Sep 2006) Log Message: ----------- Fix Visual C 6 compile by backouting (partly) patches: - Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope) - PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows - BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp Modified Paths: -------------- branches/R2_6/Src/7zCommon.cpp branches/R2_6/Src/Changes.txt branches/R2_6/Src/ChildFrm.cpp branches/R2_6/Src/Common/CSubclass.cpp branches/R2_6/Src/Common/MessageBoxDialog.cpp branches/R2_6/Src/Common/MessageBoxDialog.h branches/R2_6/Src/Common/sizecbar.cpp Modified: branches/R2_6/Src/7zCommon.cpp =================================================================== --- branches/R2_6/Src/7zCommon.cpp 2006-09-23 12:40:09 UTC (rev 3624) +++ branches/R2_6/Src/7zCommon.cpp 2006-09-23 20:16:47 UTC (rev 3625) @@ -199,7 +199,7 @@ static const DWORD m_dwVer7zRecommended; static const TCHAR m_strRegistryKey[]; static const TCHAR m_strDownloadURL[]; - static INT_PTR CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM); + static BOOL CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM); static DWORD FormatVersion(LPTSTR, LPTSTR, DWORD); }; @@ -363,7 +363,7 @@ /** * @brief DLGPROC for C7ZipMismatchException's ReportError() popup. */ -INT_PTR CALLBACK C7ZipMismatchException::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK C7ZipMismatchException::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -483,7 +483,7 @@ if (hCursor) { SetCursor(hCursor); - SetWindowLongPtr(hWnd, DWLP_MSGRESULT, 1); + SetWindowLong(hWnd, DWL_MSGRESULT, 1); return TRUE; } } return FALSE; @@ -522,7 +522,7 @@ */ int C7ZipMismatchException::ReportError(UINT nType, UINT nMessageID) { - UINT_PTR response = -1; + short response = -1; m_bShowAllways = nMessageID; if (!m_bShowAllways) { @@ -658,7 +658,7 @@ /** * @brief Callback to pass to EnumResourceLanguages. */ -BOOL CALLBACK FindNextResLang(HANDLE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG_PTR lParam) +BOOL CALLBACK FindNextResLang(HMODULE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG lParam) { LPWORD pwLanguage = (LPWORD)lParam; WORD wPrevious = *pwLanguage; @@ -736,7 +736,7 @@ if (HINSTANCE hinstLang = AfxGetResourceHandle()) { WORD wLangID = 0; - if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), (ENUMRESLANGPROC)FindNextResLang, (LPARAM)&wLangID) == 0) + if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), FindNextResLang, (LPARAM)&wLangID) == 0) { flags |= wLangID << 16; } Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-09-23 12:40:09 UTC (rev 3624) +++ branches/R2_6/Src/Changes.txt 2006-09-23 20:16:47 UTC (rev 3625) @@ -2,6 +2,14 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-23 Kimmo + Fix Visual C 6 compile by backouting (partly) patches: + - Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope) + - PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows + - BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp + Src: 7zCommon.cpp ChildFrm.cpp + Src/Common: CSubclass.cpp MessageBoxDialog.cpp MessageBoxDialog.h sizecbar.cpp + 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600) 2006-09-21 Kimmo Modified: branches/R2_6/Src/ChildFrm.cpp =================================================================== --- branches/R2_6/Src/ChildFrm.cpp 2006-09-23 12:40:09 UTC (rev 3624) +++ branches/R2_6/Src/ChildFrm.cpp 2006-09-23 20:16:47 UTC (rev 3625) @@ -361,7 +361,7 @@ EnumChildWindows(hwnd, EnumChildProc, FALSE); - pfnOldWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc); + pfnOldWndProc = (WNDPROC)SetWindowLong(hwnd, GWL_WNDPROC, (LONG)WndProc); SetProp(hwnd, _T("OldWndProc"), (HANDLE)pfnOldWndProc); return TRUE; } @@ -373,7 +373,7 @@ { WNDPROC pfnOldWndProc = (WNDPROC)RemoveProp(hwnd, _T("OldWndProc")); if (pfnOldWndProc) - SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)pfnOldWndProc); + SetWindowLong(hwnd, GWL_WNDPROC, (LONG)pfnOldWndProc); EnumChildWindows(hwnd, EnumChildProc, TRUE); Modified: branches/R2_6/Src/Common/CSubclass.cpp =================================================================== --- branches/R2_6/Src/Common/CSubclass.cpp 2006-09-23 12:40:09 UTC (rev 3624) +++ branches/R2_6/Src/Common/CSubclass.cpp 2006-09-23 20:16:47 UTC (rev 3625) @@ -2,7 +2,7 @@ \file CSubclass.cpp \author Perry Rapp, Creator, 1998-2003 \date Created: 1998 - \date Edited: 2006/09/20 Kimmo Varis: use Get/SetWindowLongPtr(). + \date Edited: 2001/12/12 PR \brief Implementation of CSubclass @@ -83,7 +83,7 @@ SubclassRec sdata; sdata.m_data = data; sdata.m_newproc = wndproc; - sdata.m_oldproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC); + sdata.m_oldproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC); sdata.m_suppressing = false; if (unsubclassSucceeded) sdata.m_succeededMsg = *unsubclassSucceeded; @@ -93,7 +93,7 @@ sdata.m_failedMsg = *unsubclassFailed; else sdata.m_failedMsg.msg = 0; - SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)wndproc); + SetWindowLong(hwnd, GWL_WNDPROC, (LPARAM)(WNDPROC)wndproc); pList->AddHead(sdata); return true; } @@ -114,12 +114,12 @@ SubclassRec srec = pList->GetNext(pos); if (srec.m_newproc == id) { // we're the latest subclass - WNDPROC curproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC); + WNDPROC curproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC); if (id != curproc) // We're not the current wndproc, so we can't safely unhook return false; ASSERT(srec.m_oldproc); // internal error - SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)srec.m_oldproc); + SetWindowLong(hwnd, GWL_WNDPROC, (LPARAM)(WNDPROC)srec.m_oldproc); pList->RemoveHead(); // fall thru to garbage collect list } Modified: branches/R2_6/Src/Common/MessageBoxDialog.cpp =================================================================== --- branches/R2_6/Src/Common/MessageBoxDialog.cpp 2006-09-23 12:40:09 UTC (rev 3624) +++ branches/R2_6/Src/Common/MessageBoxDialog.cpp 2006-09-23 20:16:47 UTC (rev 3625) @@ -394,7 +394,7 @@ * displaying the dialog. Otherwise the message box will be displayed in * the normal way. */ -INT_PTR CMessageBoxDialog::DoModal ( ) +int CMessageBoxDialog::DoModal ( ) { // Check whether the result may be retrieved from the registry. if ( ( m_nStyle & MB_DONT_DISPLAY_AGAIN ) || Modified: branches/R2_6/Src/Common/MessageBoxDialog.h =================================================================== --- branches/R2_6/Src/Common/MessageBoxDialog.h 2006-09-23 12:40:09 UTC (rev 3624) +++ branches/R2_6/Src/Common/MessageBoxDialog.h 2006-09-23 20:16:47 UTC (rev 3625) @@ -159,7 +159,7 @@ // Methods for handling common window functions. // Method for displaying the dialog. - virtual INT_PTR DoModal ( ); + virtual int DoModal ( ); // Method for closing the dialog. void EndDialog ( int nResult ); Modified: branches/R2_6/Src/Common/sizecbar.cpp =================================================================== --- branches/R2_6/Src/Common/sizecbar.cpp 2006-09-23 12:40:09 UTC (rev 3624) +++ branches/R2_6/Src/Common/sizecbar.cpp 2006-09-23 20:16:47 UTC (rev 3625) @@ -534,7 +534,7 @@ // erase the NC background mdc.FillRect(rcDraw, CBrush::FromHandle( - (HBRUSH) GetClassLongPtr(m_hWnd, GCLP_HBRBACKGROUND))); + (HBRUSH) GetClassLong(m_hWnd, GCL_HBRBACKGROUND))); if (m_dwSCBStyle & SCBS_SHOWEDGES) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-24 08:21:39
|
Revision: 3627 http://svn.sourceforge.net/winmerge/?rev=3627&view=rev Author: kimmov Date: 2006-09-24 01:21:33 -0700 (Sun, 24 Sep 2006) Log Message: ----------- PATCH: [ 1564280 ] Stack corruption in LanguageSelect Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Common/LanguageSelect.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-09-24 08:14:37 UTC (rev 3626) +++ branches/R2_6/Src/Changes.txt 2006-09-24 08:21:33 UTC (rev 3627) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-24 Kimmo + PATCH: [ 1564280 ] Stack corruption in LanguageSelect + Src/Common: LanguageSelect.cpp + 2006-09-23 Kimmo Fix Visual C 6 compile by backouting (partly) patches: - Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope) Modified: branches/R2_6/Src/Common/LanguageSelect.cpp =================================================================== --- branches/R2_6/Src/Common/LanguageSelect.cpp 2006-09-24 08:14:37 UTC (rev 3626) +++ branches/R2_6/Src/Common/LanguageSelect.cpp 2006-09-24 08:21:33 UTC (rev 3627) @@ -817,14 +817,14 @@ static WORD GetLangFromLocale(LCID lcid) { - TCHAR buff[8]; - if (GetLocaleInfo(lcid, LOCALE_IDEFAULTLANGUAGE, buff, countof(buff))) - { - LANGID langid = 0; - if (1 == _stscanf(buff, _T("%x"), &langid) && langid) - return langid; - } - return -1; + TCHAR buff[8] = {0}; + if (GetLocaleInfo(lcid, LOCALE_IDEFAULTLANGUAGE, buff, countof(buff))) + { + int langID = 0; + if ((1 == _stscanf(buff, _T("%4x"), &langID)) && langID) + return (WORD)langID; + } + return (WORD)-1; } void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-24 08:27:22
|
Revision: 3628 http://svn.sourceforge.net/winmerge/?rev=3628&view=rev Author: kimmov Date: 2006-09-24 01:27:14 -0700 (Sun, 24 Sep 2006) Log Message: ----------- PATCH: [ 1563386 ] Spanish translation update - submitted by Jesus M. Delgado 'Mack' Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-09-24 08:21:33 UTC (rev 3627) +++ branches/R2_6/Src/Changes.txt 2006-09-24 08:27:14 UTC (rev 3628) @@ -5,6 +5,9 @@ 2006-09-24 Kimmo PATCH: [ 1564280 ] Stack corruption in LanguageSelect Src/Common: LanguageSelect.cpp + PATCH: [ 1563386 ] Spanish translation update + Submitted by Jesus M. Delgado 'Mack' + Src/Languages/Spanish: MergeSpanish.rc 2006-09-23 Kimmo Fix Visual C 6 compile by backouting (partly) patches: Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2006-09-24 08:21:33 UTC (rev 3627) +++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2006-09-24 08:27:14 UTC (rev 3628) @@ -177,9 +177,9 @@ MENUITEM SEPARATOR MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS END - POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds + POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG END POPUP "Ve&ntana" BEGIN @@ -230,7 +230,7 @@ MENUITEM "Conf&iguraci\xF3n...", ID_OPTIONS MENUITEM SEPARATOR MENUITEM "&Refrescar\tF5", ID_REFRESH - MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN + MENUITEM "&Refrescar seleccionados\tCtrl+F5", ID_DIR_RESCAN END POPUP "&Ver" BEGIN @@ -284,9 +284,9 @@ MENUITEM SEPARATOR MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS END - POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds + POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG END POPUP "Ve&ntana" BEGIN @@ -341,7 +341,7 @@ MENUITEM "Lado i&zquierdo s\xF3lo lectura", ID_FILE_LEFT_READONLY MENUITEM "Lado d&erecho s\xF3lo lectura", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "&Convert Line Endings to" + POPUP "&Convertir saltos de l\xEDnea a" BEGIN MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX @@ -397,7 +397,7 @@ MENUITEM SEPARATOR MENUITEM "Mostrar &espacios", ID_VIEW_WHITESPACE MENUITEM "Mostrar diferencias de &l\xEDnea", ID_VIEW_LINEDIFFS - MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS + MENUITEM "Ver &n\xFAmeros de l\xEDnea", ID_VIEW_LINENUMBERS MENUITEM "&Ajuste de l\xEDnea", ID_VIEW_WORDWRAP MENUITEM SEPARATOR MENUITEM "&Intercambiar paneles", ID_VIEW_SWAPPANES @@ -446,9 +446,9 @@ MENUITEM SEPARATOR MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS END - POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds + POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG END POPUP "Ve&ntana" BEGIN @@ -499,7 +499,7 @@ MENUITEM "&Izquierda", ID_DIR_DEL_RIGHT MENUITEM "&Ambos", ID_DIR_DEL_BOTH END - MENUITEM "Re&name", ID_DIR_ITEM_RENAME + MENUITEM "Re&nombrar", ID_DIR_ITEM_RENAME MENUITEM "&Ocultar ficheros", ID_DIR_HIDE_FILENAMES MENUITEM SEPARATOR POPUP "Abrir fichero &izquierdo" @@ -740,7 +740,7 @@ WS_TABSTOP,7,47,206,10 CONTROL "&Permitir solo una instancia en ejecuci\xF3n",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 - LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 + LTEXT "A&uto-completar en di\xE1logos de apertura:",IDC_STATIC,19,72,125,8 COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Habilitar m\xFAltiples ventanas de comparaci\xF3n para",IDC_STATIC,7,100, @@ -783,7 +783,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10 CONTROL "E&xpresi\xF3n regular",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 - CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button", + CONTROL "No sobrepasar &fin de fichero",IDC_FINDDLG_DONTWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10 GROUPBOX "Direcci\xF3n",IDC_STATIC,148,23,70,36,WS_GROUP CONTROL "&Arriba",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | @@ -953,19 +953,19 @@ CONTROL "Ignorar diferencias de tiempo menores de 3 segundos.", IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10 - GROUPBOX "Integration",IDC_STATIC,7,30,218,46 + GROUPBOX "Integraci\xF3n",IDC_STATIC,7,30,218,46 CONTROL "&A\xF1adir al men\xFA contextual del explorador.",IDC_EXPLORER_CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10 CONTROL "Habilitar &men\xFA avanzado",IDC_EXPLORER_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10 - CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, + CONTROL "In&cluir subdirectorios por defecto",IDC_EXPLORER_SUBFOLDERS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10 LTEXT "Editor e&xterno:",IDC_STATIC,7,83,222,8 EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL PUSHBUTTON "&Buscar...",IDC_EXT_EDITOR_BROWSE,179,93,50,14 - LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8 + LTEXT "&Filtrar directorios:",IDC_STATIC,7,111,166,8 EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14 + PUSHBUTTON "Examinar...",IDC_FILTER_USER_BROWSE,179,121,50,14 END IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180 @@ -1137,8 +1137,8 @@ WS_VSCROLL | WS_TABSTOP CONTROL "&Parar despu\xE9s de la primera diferencia",IDC_COMPARE_STOPFIRST, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10 - GROUPBOX "Comments",IDC_STATIC,7,134,221,32 - CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button", + GROUPBOX "Comentarios",IDC_STATIC,7,134,221,32 + CONTROL "Filtrar comentarios",IDC_FILTERCOMMENTS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10 PUSHBUTTON "Por defecto",IDC_COMPARE_DEFAULTS,7,179,50,14 END @@ -1189,8 +1189,8 @@ CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100 - PUSHBUTTON "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14 - PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14 + PUSHBUTTON "Probar",IDC_FILTERFILE_TEST_BTN,7,114,50,14 + PUSHBUTTON "Instalar...",IDC_FILTERFILE_INSTALL,137,114,50,14 PUSHBUTTON "Nuevo...",IDC_FILTERFILE_NEWBTN,192,114,50,14 PUSHBUTTON "Editar...",IDC_FILTERFILE_EDITBTN,246,114,50,14 PUSHBUTTON "Eliminar...",IDC_FILTERFILE_DELETEBTN,300,114,50,14 @@ -1384,7 +1384,7 @@ LTEXT "&Estilo:",IDC_STATIC,7,37,35,8 COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button", + CONTROL "&Copiar al Portapapeles",IDC_REPORT_COPYCLIPBOARD,"Button", BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10 DEFPUSHBUTTON "&Aceptar",IDOK,157,60,50,14 PUSHBUTTON "Cancelar",IDCANCEL,211,60,50,14 @@ -1519,7 +1519,7 @@ CAPTION "Di\xE1logo" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "&Use customized text colors", + CONTROL "&Usar colores personalizados para el texto", IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,14,161,10 GROUPBOX "Colores elegidos para texto normal",IDC_CUSTOM_COLORS_GROUP,27,33,159, @@ -1555,11 +1555,11 @@ RTEXT "&Izquierda:",IDC_STATIC,7,11,40,8 EDITTEXT IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL PUSHBUTTON "Examinar...",IDC_PROJ_LFILE_BROWSE,265,8,50,14 - CONTROL "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10 + CONTROL "S&olo lectura",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10 RTEXT "&Derecha:",IDC_STATIC,7,42,40,8 EDITTEXT IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL PUSHBUTTON "Examinar...",IDC_PROJ_RFILE_BROWSE,265,40,50,14 - CONTROL "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10 + CONTROL "So&lo lectura",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10 RTEXT "&Filtro:",IDC_STATIC,7,74,40,8 EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL PUSHBUTTON "Seleccionar...",IDC_PROJ_FILTER_SELECT,265,72,50,14 @@ -1749,8 +1749,8 @@ IDS_UNK_ERROR_READING_PROJECT "Error desconocido al intentar abrir el proyecto" IDS_UNK_ERROR_SAVING_PROJECT "Error desconocido al intentar guardar el proyecto" IDS_PROJFILEDLG_CAPTION "Fichero de Proyecto" - IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded." - IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved." + IDS_PROJFILE_LOAD_SUCCESS "Fichero de proyecto cargado con \xE9xito." + IDS_PROJFILE_SAVE_SUCCESS "Fichero de proyecto guardado con \xE9xito." ID_FILE_SAVEPROJECT "Guardar las rutas y opciones actuales al fchero de proyecto\nGuardar Fichero de Proyecto" END @@ -1933,7 +1933,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" + IDS_CMDLINE_SYNTAX "Sintaxis : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "rutaizq rutadcha [rutasalida]" IDS_CMDLINE_SYNTAX_ARG_FILTER "mascara/nombre" IDS_CMDLINE_SYNTAX_LEFTDESC "descizq" @@ -1948,12 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f establece la mascara de ficheros o mascara de l\xEDneas para la comparaci\xF3n" - IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" - IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" + IDS_CMDLINE_FASTCLOSE "/x o -x cierra WinMerge si el resultado es identico." + IDS_CMDLINE_SINGLE_INST "/s o -s abre la comparaci\xF3n en una instancia de WinMerge existente." IDS_CMDLINE_LEFTPATH "rutaizq es el directorio o nombre de fichero a ser abierto en el lado izquierdo" IDS_CMDLINE_RIGHTPATH "rutadcha es el directorio o nombre de fichero a ser abierto en el lado derecho" IDS_CMDLINE_OUTPUTPATH "rutasalida es un directorio opcional donde se guardaran los ficheros combinados" - IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." + IDS_CMDLINE_SEEMANUAL "Lea el manual para una referencia completa de la linea de comandos." END // VARIOUS OPTIONS @@ -1964,7 +1964,7 @@ IDS_DIFF_OPEN_NO_SET_PROPS "Se han realizado modificaciones en los ficheros de la sesion de comparaci\xF3n actual. Algunos ajustes pueden no surtir efecto hasta que la comparaci\xF3n de ficheros se ejecute de nuevo." IDS_FONT_CHANGE "La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de diferencias abiertas actualmente." IDS_OPTIONS_INVALID_TABSIZE - "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." + "Valor en Tama\xF1o de Tab - el valor no esta en el rango aceptado por WinMerge.\n\nPor favor, urilice valores 1 - %1." END // BROWSE FILE @@ -1992,8 +1992,8 @@ IDS_COMPMETHOD_FULL_CONTENTS "Todo el contenido" IDS_COMPMETHOD_QUICK_CONTENTS "Contenido r\xE1pido" IDS_COMPMETHOD_MODDATE "Fecha de modificaci\xF3n" - IDS_COMPMETHOD_DATESIZE "Modified Date and Size" - IDS_COMPMETHOD_SIZE "Size" + IDS_COMPMETHOD_DATESIZE "Fecha de modificaci\xF3n y Tama\xF1o" + IDS_COMPMETHOD_SIZE "Tama\xF1o" END // FILTER OPTIONS @@ -2007,18 +2007,18 @@ IDS_FILEFILTER_SAVENEW "Seleccione nombre de fichero para el nuevo filtro" IDS_FILEFILTER_FILEMASK "Fichero de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||" IDS_FILEFILTER_TMPL_MISSING - "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder." + "No se pudo encontrar el fichero con la plantilla de filtros de fichero!\n\nPor favor, copie el fichero %1 al directorio WinMerge/Filters." IDS_FILEFILTER_TMPL_COPY - "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." + "No se pudo copiar el fichero con la plantilla de filtros de fichero al directorio:\n%1\n\nPor favor, compruebe que el directorio existe y que tiene permisos de escritura en \xE9l." IDS_FILEFILTER_NO_USERFOLDER - "User's filter file folder is not defined!\n\nPlease select filter folder in options/System." + "El directorio de filtos de usurio no est\xE1 definido!\n\nPor favor, seleccione el directorio de filtros en Opciones/Sistema." 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" + "Error al borrar el fichero de filtros:\n%1\n\n\xBFQuiza el fichero es de solo lectura?" + IDS_FILEFILTER_INSTALL "Seleccione el fichero de filtros a instalar." IDS_FILEFILTER_INSTALLFAIL - "Installing filter file failed.\n\nCould not copy new filter file to filter folder." + "La instalacion del fichero de filtros ha fallado.\n\nNo se pudo copiar el fichero de filtros al directorio de filtros." IDS_FILEFILTER_OVERWRITE - "Filter file already exists. Overwrite existing filter?" + "El fichero de filtros ya existe. \xBFDesea sobreescribirlo?" END // VERSION CONTROL OPTIONS @@ -2158,7 +2158,7 @@ ID_DIR_DEL_RIGHT "Eliminar elemento selecionado del lado derecho" ID_DIR_DEL_BOTH "Eliminar elementos seleccionados de ambos lados" ID_DIR_HIDE_FILENAMES "Ocultar elementos seleccionados (filtro al vuelo)" - ID_DIR_ITEM_RENAME "Rename selected item on both sides" + ID_DIR_ITEM_RENAME "Renombrar el elemento seleccionado en ambos lados" IDS_COPY_TO_LEFT "Lado derecho a lado izquierdo (%1)" IDS_COPY_TO_RIGHT "Lado izquierdo a lado derecho (%1)" IDS_COPY_TO_LEFT2 "Lado derecho a lado izquierdo (%1 de %2)" @@ -2267,8 +2267,8 @@ BEGIN IDS_COLHDR_LENCODING "Codificaci\xF3n izq." IDS_COLHDR_RENCODING "Codificaci\xF3n dcha." - IDS_COLHDR_NIDIFFS "Ignored Diff." - IDS_COLHDR_NSDIFFS "Differences" + IDS_COLHDR_NIDIFFS "Difs. ignoradas" + IDS_COLHDR_NSDIFFS "Diferencias" IDS_COLHDR_BINARY "Binario" END @@ -2332,8 +2332,8 @@ BEGIN IDS_COLDESC_LENCODING "Codificaci\xF3n del lado izquierdo." IDS_COLDESC_RENCODING "Codificaci\xF3n del lado derecho." - IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." - IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences." + IDS_COLDESC_NIDIFFS "N\xFAmero de diferencias ignoradas en el fichero. Estas diferencias son ignoradas por WinMerge y no se pueden combinar." + IDS_COLDESC_NSDIFFS "N\xFAmero de diferencias en el fichero. Este n\xFAmero no incluye las diferencias ignoradas." IDS_COLDESC_BINARY "Muestra un asterisco (*) si el fichero es binario." END @@ -2751,8 +2751,8 @@ IDS_EOL_DOS "Win" IDS_EOL_MAC "Mac" IDS_EOL_UNIX "Unix" - IDS_EOL_MIXED "Mixed" - IDS_EOL_BIN "Binary" + IDS_EOL_MIXED "Mezclado" + IDS_EOL_BIN "Binario" END // Folder compare short size suffixes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ga...@us...> - 2006-09-24 12:24:16
|
Revision: 3634 http://svn.sourceforge.net/winmerge/?rev=3634&view=rev Author: galh Date: 2006-09-24 05:24:04 -0700 (Sun, 24 Sep 2006) Log Message: ----------- BUG: [ 1564283 ] Parameter -x causes files to be closed after merging Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MergeDoc.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-09-24 09:54:27 UTC (rev 3633) +++ branches/R2_6/Src/Changes.txt 2006-09-24 12:24:04 UTC (rev 3634) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-24 Gal + BUG: [ 1564283 ] Parameter -x causes files to be closed after merging + Src: MergeDoc.cpp + 2006-09-24 Kimmo PATCH: [ 1564280 ] Stack corruption in LanguageSelect Src/Common: LanguageSelect.cpp Modified: branches/R2_6/Src/MergeDoc.cpp =================================================================== --- branches/R2_6/Src/MergeDoc.cpp 2006-09-24 09:54:27 UTC (rev 3633) +++ branches/R2_6/Src/MergeDoc.cpp 2006-09-24 12:24:04 UTC (rev 3634) @@ -2869,6 +2869,10 @@ { ShowRescanError(nRescanResult, bBinary, bIdentical); } + + // Exit if files are identical should only work for the first + // comparison and must be disabled afterward. + GetMainFrame()->m_bExitIfNoDiff = FALSE; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-26 16:05:19
|
Revision: 3644 http://svn.sourceforge.net/winmerge/?rev=3644&view=rev Author: kimmov Date: 2006-09-26 09:05:05 -0700 (Tue, 26 Sep 2006) Log Message: ----------- PATCH: [ 1563171 ] Catalan translation update (Open-dialog) - submitted by Jordi Vilar Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-09-26 15:18:40 UTC (rev 3643) +++ branches/R2_6/Src/Changes.txt 2006-09-26 16:05:05 UTC (rev 3644) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-26 Kimmo + PATCH: [ 1563171 ] Catalan translation update (Open-dialog) + Submitted by Jordi Vilar + Src/Languages/Catalan: MergeCatalan.rc + 2006-09-24 Gal BUG: [ 1564283 ] Parameter -x causes files to be closed after merging Src: MergeDoc.cpp Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-09-26 15:18:40 UTC (rev 3643) +++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-09-26 16:05:05 UTC (rev 3644) @@ -177,9 +177,9 @@ MENUITEM SEPARATOR MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS END - POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds + POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG END POPUP "Fi&nestra" BEGIN @@ -230,7 +230,7 @@ MENUITEM "&Opcions...", ID_OPTIONS MENUITEM SEPARATOR MENUITEM "Actualit&za\tF5", ID_REFRESH - MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN + MENUITEM "Actualitza &seleccionats\tCtrl+F5", ID_DIR_RESCAN END POPUP "&Visualitzaci\xF3" BEGIN @@ -284,9 +284,9 @@ MENUITEM SEPARATOR MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS END - POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds + POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG END POPUP "Fi&nestra" BEGIN @@ -341,7 +341,7 @@ MENUITEM "Fes l'es&querra nom\xE9s de lectura", ID_FILE_LEFT_READONLY MENUITEM "Fes la dre&ta nom\xE9s de lectura", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "&Convert Line Endings to" + POPUP "&Converteix retorns de l\xEDnia a" BEGIN MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX @@ -446,9 +446,9 @@ MENUITEM SEPARATOR MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS END - POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds + POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG END POPUP "Fi&nestra" BEGIN @@ -647,38 +647,38 @@ PUSHBUTTON "Col\xB7laboradors",IDC_OPEN_CONTRIBUTORS,7,103,65,14 END -IDD_OPEN DIALOGEX 0, 0, 376, 126 +IDD_OPEN DIALOGEX 0, 0, 374, 126 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Tria de fitxers o directoris..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN RTEXT "&Esquerra:",IDC_STATIC,13,24,65,8 - COMBOBOX IDC_LEFT_COMBO,81,22,162,94,CBS_DROPDOWN | + COMBOBOX IDC_LEFT_COMBO,81,22,167,94,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES - PUSHBUTTON "&Navega...",IDC_LEFT_BUTTON,242,22,50,14 + PUSHBUTTON "&Navega...",IDC_LEFT_BUTTON,252,22,50,14 RTEXT "&Dreta:",IDC_STATIC,13,40,65,8 - COMBOBOX IDC_RIGHT_COMBO,81,38,162,95,CBS_DROPDOWN | + COMBOBOX IDC_RIGHT_COMBO,81,38,167,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES - PUSHBUTTON "N&avega...",IDC_RIGHT_BUTTON,242,38,50,14 + PUSHBUTTON "N&avega...",IDC_RIGHT_BUTTON,252,38,50,14 RTEXT "&Filtre:",IDC_STATIC,13,56,65,8 - COMBOBOX IDC_EXT_COMBO,81,54,162,95,CBS_DROPDOWN | + COMBOBOX IDC_EXT_COMBO,81,54,167,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Tria...",IDC_SELECT_FILTER,242,54,50,14 - RTEXT "Desem&paquetador:",IDC_STATIC,9,72,65,8 - EDITTEXT IDC_UNPACKER_EDIT,81,70,162,12,ES_AUTOHSCROLL | + PUSHBUTTON "&Tria...",IDC_SELECT_FILTER,252,54,50,14 + RTEXT "Desem&paquetador:",IDC_STATIC,13,72,65,8 + EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "T&ria...",IDC_SELECT_UNPACKER,242,70,50,14 + PUSHBUTTON "T&ria...",IDC_SELECT_UNPACKER,252,70,50,14 CONTROL "&Inclou-hi les subcarpetes",IDC_RECURS_CHECK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,81,86,161,10 - LTEXT "Estat:",IDC_OPEN_STATUS,15,102,182,8 - DEFPUSHBUTTON "D'acord",IDOK,306,11,62,14 - PUSHBUTTON "Cancel\xB7la",IDCANCEL,306,28,62,14 - PUSHBUTTON "Ajuda",ID_HELP,306,45,50,14 + BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10 + LTEXT "Estat:",IDC_OPEN_STATUS,15,102,192,8 + DEFPUSHBUTTON "D'acord",IDOK,316,11,50,14 + PUSHBUTTON "Cancel\xB7la",IDCANCEL,316,28,50,14 + PUSHBUTTON "Ajuda",ID_HELP,316,45,50,14 GROUPBOX "Fitxers o directoris a comparar",IDC_FILES_DIRS_GROUP,7, - 7,292,111 + 7,302,111 END IDD_VSS DIALOGEX 0, 0, 257, 166 @@ -783,7 +783,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,37,140,10 CONTROL "&Expressi\xF3 regular",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 - CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button", + CONTROL "No facis la &volta al final del fitxer",IDC_FINDDLG_DONTWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10 GROUPBOX "Direcci\xF3",IDC_STATIC,148,23,70,36,WS_GROUP CONTROL "A&munt",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | @@ -953,12 +953,12 @@ CONTROL "Ignora difer\xE8ncies en l'&hora inferiors a 3 segons", IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10 - GROUPBOX "Integration",IDC_STATIC,7,30,218,46 + GROUPBOX "Integraci\xF3",IDC_STATIC,7,30,218,46 CONTROL "&Afegeix un men\xFA contextual a l'explorador del Windows",IDC_EXPLORER_CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10 CONTROL "Habilita el &men\xFA avan\xE7at",IDC_EXPLORER_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10 - CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, + CONTROL "In&clou subcarpetes de forma predeterminada",IDC_EXPLORER_SUBFOLDERS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10 LTEXT "&Editor extern:",IDC_STATIC,7,83,222,8 EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL @@ -1080,7 +1080,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "&Atura",IDC_COMPARISON_STOP,167,15,83,14 - CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8, + CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,9, 44,241,9 RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8 RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8 @@ -1190,7 +1190,7 @@ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100 PUSHBUTTON "&Prova",IDC_FILTERFILE_TEST_BTN,7,114,50,14 - PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14 + PUSHBUTTON "&Instal\xB7la...",IDC_FILTERFILE_INSTALL,137,114,50,14 PUSHBUTTON "&Nou...",IDC_FILTERFILE_NEWBTN,192,114,50,14 PUSHBUTTON "&Edita...",IDC_FILTERFILE_EDITBTN,246,114,50,14 PUSHBUTTON "&Suprimeix...",IDC_FILTERFILE_DELETEBTN,300,114,50,14 @@ -1384,7 +1384,7 @@ LTEXT "&Estil:",IDC_STATIC,7,37,35,8 COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button", + CONTROL "&Copia al Porta-retalls",IDC_REPORT_COPYCLIPBOARD,"Button", BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10 DEFPUSHBUTTON "D'acord",IDOK,157,60,50,14 PUSHBUTTON "Cancel\xB7la",IDCANCEL,211,60,50,14 @@ -1426,7 +1426,7 @@ END IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Estad\xEDstiques de comparaci\xF3" FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -1951,7 +1951,7 @@ // WINMERGE COMMAND LINE HELP#1 STRINGTABLE BEGIN - IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]" + IDS_CMDLINE_SYNTAX "Sintaxi : WinMerge [/r] [/e] [/x] [/s]" IDS_CMDLINE_SYNTAX_ARGS "camiesq camidreta [camisortida]" IDS_CMDLINE_SYNTAX_ARG_FILTER "m\xE0scara/nom" IDS_CMDLINE_SYNTAX_LEFTDESC "descesq" @@ -1966,12 +1966,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f o -f especifica la m\xE0scara de fitxers o el nom del filtre per a comparar" - IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" - IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" + IDS_CMDLINE_FASTCLOSE "/x or -x tanca el WinMerge si el resultat \xE9s id\xE8ntic" + IDS_CMDLINE_SINGLE_INST "/s or -s obre els camins a una inst\xE0ncia existent del WinMerge" IDS_CMDLINE_LEFTPATH "camiesq \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda esquerra" IDS_CMDLINE_RIGHTPATH "camidreta \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda dreta" IDS_CMDLINE_OUTPUTPATH "camisortida \xE9s un directori de sortida opcional on voleu que siguin desats els fitxers fusionats" - IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." + IDS_CMDLINE_SEEMANUAL "Veieu el manual per a una refer\xE8ncia completa de la l\xEDnia de comandes." END // VARIOUS OPTIONS @@ -2011,7 +2011,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 "Size" + IDS_COMPMETHOD_SIZE "Mida END // FILTER OPTIONS @@ -2029,14 +2029,14 @@ IDS_FILEFILTER_TMPL_COPY "No es pot copiar el fitxer de plantilla de filtre a la carpeta de filtres:\n%1\n\nVerifiqueu que la carpeta existeix i s'hi pot escriure." IDS_FILEFILTER_NO_USERFOLDER - "User's filter file folder is not defined!\n\nPlease select filter folder in options/System." + "La carpeta de fitxers de filtre d'usuari no est\xE0 definida!\n\nSeleccioneu la carpeta de filtres a opcions/sistema." 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" + "No s'ha pogut esborrar el fitxer de filtre:\n%1\n\nPotser el fitxer \xE9s nom\xE9s de lectura?" + IDS_FILEFILTER_INSTALL "Localitza el fitxer de filtre a instal\xB7lar" IDS_FILEFILTER_INSTALLFAIL - "Installing filter file failed.\n\nCould not copy new filter file to filter folder." + "No es pot instal\xB7lar el fitxer de filtre.\n\nNo s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres." IDS_FILEFILTER_OVERWRITE - "Filter file already exists. Overwrite existing filter?" + "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?" END // VERSION CONTROL OPTIONS @@ -2285,8 +2285,8 @@ BEGIN IDS_COLHDR_LENCODING "Codificaci\xF3 esquerra" IDS_COLHDR_RENCODING "Codificaci\xF3 dreta" - IDS_COLHDR_NIDIFFS "Ignored Diff." - IDS_COLHDR_NSDIFFS "Differences" + IDS_COLHDR_NIDIFFS "Difer\xE8ncies ignorades" + IDS_COLHDR_NSDIFFS "Difer\xE8ncies" IDS_COLHDR_BINARY "Binari" END @@ -2350,8 +2350,8 @@ BEGIN IDS_COLDESC_LENCODING "Codificaci\xF3 del costat esquerre." IDS_COLDESC_RENCODING "Codificaci\xF3 del costat dret." - IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." - IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences." + IDS_COLDESC_NIDIFFS "Nombre de difer\xE8ncies ignorades al fitxer. Aquestes difer\xE8ncies s\xF3n ignorades pel WinMerge i no es poden combinar." + IDS_COLDESC_NSDIFFS "Nombre de difer\xE8ncies al fitxer. Aquest nombre no inclou les difer\xE8ncies ignorades.." IDS_COLDESC_BINARY "Mostra un asterisc (*) si el fitxer \xE9s binari." END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2006-09-26 19:52:51
|
Revision: 3648 http://svn.sourceforge.net/winmerge/?rev=3648&view=rev Author: gerundt Date: 2006-09-26 12:52:40 -0700 (Tue, 26 Sep 2006) Log Message: ----------- PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6 Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Languages/German/MergeGerman.rc Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-09-26 19:46:35 UTC (rev 3647) +++ branches/R2_6/Src/Changes.txt 2006-09-26 19:52:40 UTC (rev 3648) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-26 Tim + PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6 + Src/Languages/German: MergeGerman.rc + 2006-09-26 Kimmo PATCH: [ 1563171 ] Catalan translation update (Open-dialog) Submitted by Jordi Vilar Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc =================================================================== --- branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-09-26 19:46:35 UTC (rev 3647) +++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-09-26 19:52:40 UTC (rev 3648) @@ -219,7 +219,7 @@ MENUITEM "L&inks schreibgesch\xFCtzt", ID_FILE_LEFT_READONLY MENUITEM "R&echts schreibgesch\xFCtzt", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File En&coding", ID_FILE_ENCODING + MENUITEM "Dateik&odierung", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Beenden", ID_APP_EXIT END @@ -774,7 +774,7 @@ CAPTION "Suchen" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "S&uchen nach:",IDC_STATIC,7,9,50,8 + LTEXT "&Suchen nach:",IDC_STATIC,7,9,50,8 COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "&Nur ganze W\xF6rter",IDC_EDIT_WHOLE_WORD,"Button", @@ -783,7 +783,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10 CONTROL "&Regul\xE4re Ausdr\xFCcke",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 - CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button", + CONTROL "Nicht am Dateiende um&brechen",IDC_FINDDLG_DONTWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10 GROUPBOX "Richtung",IDC_STATIC,148,23,70,36,WS_GROUP CONTROL "nach &oben",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | @@ -800,7 +800,7 @@ CAPTION "Ersetzen" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "S&uchen nach:",IDC_STATIC,7,9,65,8 + LTEXT "&Suchen nach:",IDC_STATIC,7,9,65,8 COMBOBOX IDC_EDIT_FINDTEXT,75,7,165,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Erse&tzen durch:",IDC_STATIC,7,24,65,8 @@ -812,7 +812,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10 CONTROL "&Regul\xE4re Ausdr\xFCcke",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10 - CONTROL "Nicht das Dateiende umbrechen",IDC_EDIT_SCOPE_DONT_WRAP,"Button", + CONTROL "Nicht am Dateiende um&brechen",IDC_EDIT_SCOPE_DONT_WRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10 GROUPBOX "Ersetze in",IDC_STATIC,149,40,90,36,WS_GROUP CONTROL "&Auswahl",IDC_EDIT_SCOPE_SELECTION,"Button", @@ -1471,28 +1471,28 @@ IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Codepage" +CAPTION "Zeichensatz" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Affects",IDC_AFFECTS_GROUP,5,7,166,36 - CONTROL "&Left",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX | + GROUPBOX "Betrifft",IDC_AFFECTS_GROUP,5,7,166,36 + CONTROL "&Links",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,54,8 LTEXT "(Affects)",IDC_LEFT_FILES_LABEL,70,18,93,8 - CONTROL "&Right",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX | + CONTROL "&Rechts",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,54,8 LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,29,93,8 - GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,48,166,63 - LTEXT "&File Loading:",IDC_LOAD_FILES_LABEL,12,64,72,10 + GROUPBOX "Zeichensatz ausw\xE4hlen f\xFCr",IDC_LOADING_GROUP,5,48,166,63 + LTEXT "&Datei laden:",IDC_LOAD_FILES_LABEL,12,64,72,10 EDITTEXT IDC_LOAD_CODEPAGE_TEXTBOX,86,63,45,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_LOAD_CODEPAGE_BROWSE,139,64,23,10 - LTEXT "File &Saving:",IDC_SAVE_FILES_LABEL,12,79,67,10 + LTEXT "Datei &speichern:",IDC_SAVE_FILES_LABEL,12,79,67,10 EDITTEXT IDC_SAVE_CODEPAGE_TEXTBOX,86,79,45,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_SAVE_CODEPAGE_BROWSE,139,80,23,10 - CONTROL "&Use same codepage for both", + CONTROL "&Gleichen Zeichensatz f\xFCr Beide verwenden", IDC_LOAD_SAVE_SAME_CODEPAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,96,150,10 - DEFPUSHBUTTON "&Apply",IDOK,65,117,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,121,117,50,14 + DEFPUSHBUTTON "An&wenden",IDOK,65,117,50,14 + PUSHBUTTON "&Abbruch",IDCANCEL,121,117,50,14 END IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142 @@ -1748,9 +1748,9 @@ ID_FILE_OPENPROJECT "\xD6ffnet eine Projektdatei.\nProjektdatei (Strg+J)" IDS_UNK_ERROR_READING_PROJECT "Unbekannter Fehler beim Versuch die Projektdatei zu \xF6ffnen." IDS_UNK_ERROR_SAVING_PROJECT "Unbekannter Fehler beim Versuch die Projektdatei zu speichern." - IDS_PROJFILEDLG_CAPTION "Projekt-Datei" - IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded." - IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved." + IDS_PROJFILEDLG_CAPTION "Projektdatei" + IDS_PROJFILE_LOAD_SUCCESS "Projektdatei erfolgreich geladen." + IDS_PROJFILE_SAVE_SUCCESS "Projektdatei erfolgreich gespeichert." ID_FILE_SAVEPROJECT "Speichert die aktuellen Pfade und Einstellungen in eine Projektdatei.\nProjektdatei speichern" END @@ -1948,12 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f oder -f setzt die Dateimaske oder den Filtername f\xFCr den Vergleich" - IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" - IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" + IDS_CMDLINE_FASTCLOSE "/x oder -x schlie\xDFt WinMerge, wenn das Ergebnis identisch ist" + IDS_CMDLINE_SINGLE_INST "/s oder -s \xF6ffnet Pfade zur bestehenden WinMerge-Instanz" IDS_CMDLINE_LEFTPATH "LinkerPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der linken Seite" IDS_CMDLINE_RIGHTPATH "RechterPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der rechten Seite" IDS_CMDLINE_OUTPUTPATH "AusgabePfad ist ein optionales Ausgabeverzeichnis, in dem Sie die vermischten Dateien speichern m\xF6chten" - IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." + IDS_CMDLINE_SEEMANUAL "Sehen Sie ins Handbuch f\xFCr eine komplette Befehlszeilen-Referenz." END // VARIOUS OPTIONS @@ -1993,7 +1993,7 @@ IDS_COMPMETHOD_QUICK_CONTENTS "Schneller Inhalt" IDS_COMPMETHOD_MODDATE "\xC4nderungsdatum" IDS_COMPMETHOD_DATESIZE "\xC4nderungsdatum und Gr\xF6\xDFe" - IDS_COMPMETHOD_SIZE "Size" + IDS_COMPMETHOD_SIZE "Gr\xF6\xDFe" END // FILTER OPTIONS @@ -2267,8 +2267,8 @@ BEGIN IDS_COLHDR_LENCODING "Linke Kodierung" IDS_COLHDR_RENCODING "Rechte Kodierung" - IDS_COLHDR_NIDIFFS "Ignored Diff." - IDS_COLHDR_NSDIFFS "Differences" + IDS_COLHDR_NIDIFFS "Ignorierte Unter." + IDS_COLHDR_NSDIFFS "Unterschiede" IDS_COLHDR_BINARY "Bin\xE4r" END @@ -2332,8 +2332,8 @@ BEGIN IDS_COLDESC_LENCODING "Linke Zeichensatz-Kodierung." IDS_COLDESC_RENCODING "Rechte Zeichensatz-Kodierung." - IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." - IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences." + IDS_COLDESC_NIDIFFS "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und k\xF6nnen nicht vermischt werden." + IDS_COLDESC_NSDIFFS "Anzahl der Unterschiede in der Datei. Die Zahl enth\xE4lt nicht die ignorierten Unterschiede." IDS_COLDESC_BINARY "Zeigt ein Asterisk (*), wenn die Datei bin\xE4r ist." END @@ -2376,7 +2376,7 @@ // 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.\nWould you like to treat both files as being in the default windows codepage (recommended)?" + 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" @@ -2780,7 +2780,7 @@ ID_EOL_TO_UNIX "Konvertiert Zeilenumbr\xFCche ins UNIX Format." ID_EOL_TO_MAC "Konvertiert Zeilenumbr\xFCche ins MAC Format." ID_FILE_MERGINGMODE "Wechselt zwischen Bearbeitungs- und Merging-Modus." - ID_FILE_ENCODING "View and adjust file encoding properties\nFile encoding properties" + ID_FILE_ENCODING "Zeigt und passt die Dateikodierungs-Eigenschaften an.\nDateikodierungs-Eigenschaften" END // EDIT MENU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2006-09-27 15:30:36
|
Revision: 3653 http://svn.sourceforge.net/winmerge/?rev=3653&view=rev Author: sdottaka Date: 2006-09-27 08:30:19 -0700 (Wed, 27 Sep 2006) Log Message: ----------- BUG: [ 1564572 ] Leak memory on undoing Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/GhostTextBuffer.h branches/R2_6/Src/editlib/ccrystaltextbuffer.h Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-09-27 14:32:16 UTC (rev 3652) +++ branches/R2_6/Src/Changes.txt 2006-09-27 15:30:19 UTC (rev 3653) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-27 Takashi + BUG: [ 1564572 ] Leak memory on undoing + Src: GhostTextBuffer.h + Src/editlib: ccrystaltextbuffer.h + 2006-09-27 Kimmo PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows ShellExtension: Register.bat Modified: branches/R2_6/Src/GhostTextBuffer.h =================================================================== --- branches/R2_6/Src/GhostTextBuffer.h 2006-09-27 14:32:16 UTC (rev 3652) +++ branches/R2_6/Src/GhostTextBuffer.h 2006-09-27 15:30:19 UTC (rev 3653) @@ -157,7 +157,8 @@ m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock; SetText(src.GetText()); INT_PTR size = src.m_paSavedRevisonNumbers->GetSize(); - m_paSavedRevisonNumbers = new CDWordArray(); + if (!m_paSavedRevisonNumbers) + m_paSavedRevisonNumbers = new CDWordArray(); m_paSavedRevisonNumbers->SetSize(size); INT_PTR i; for (i = 0; i < size; i++) Modified: branches/R2_6/Src/editlib/ccrystaltextbuffer.h =================================================================== --- branches/R2_6/Src/editlib/ccrystaltextbuffer.h 2006-09-27 14:32:16 UTC (rev 3652) +++ branches/R2_6/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:30:19 UTC (rev 3653) @@ -192,7 +192,8 @@ m_nAction = src.m_nAction; SetText(src.GetText()); int size = src.m_paSavedRevisonNumbers->GetSize(); - m_paSavedRevisonNumbers = new CDWordArray(); + if (!m_paSavedRevisonNumbers) + m_paSavedRevisonNumbers = new CDWordArray(); m_paSavedRevisonNumbers->SetSize(size); int i; for (i = 0; i < size; i++) @@ -203,7 +204,7 @@ { FreeText(); if (m_paSavedRevisonNumbers) - delete m_paSavedRevisonNumbers; + delete m_paSavedRevisonNumbers; } void SetText (LPCTSTR pszText); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-01 21:13:36
|
Revision: 3666 http://svn.sourceforge.net/winmerge/?rev=3666&view=rev Author: kimmov Date: 2006-10-01 14:13:30 -0700 (Sun, 01 Oct 2006) Log Message: ----------- PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MainFrm.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-01 21:11:14 UTC (rev 3665) +++ branches/R2_6/Src/Changes.txt 2006-10-01 21:13:30 UTC (rev 3666) @@ -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: branches/R2_6/Src/MainFrm.cpp =================================================================== --- branches/R2_6/Src/MainFrm.cpp 2006-10-01 21:11:14 UTC (rev 3665) +++ branches/R2_6/Src/MainFrm.cpp 2006-10-01 21:13:30 UTC (rev 3666) @@ -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:00:25
|
Revision: 3674 http://svn.sourceforge.net/winmerge/?rev=3674&view=rev Author: galh Date: 2006-10-02 09:23:06 -0700 (Mon, 02 Oct 2006) Log Message: ----------- BUG: [ 1566783 ] Crash on Save Project when no file is selected Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MainFrm.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-02 13:48:41 UTC (rev 3673) +++ branches/R2_6/Src/Changes.txt 2006-10-02 16:23:06 UTC (rev 3674) @@ -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: branches/R2_6/Src/MainFrm.cpp =================================================================== --- branches/R2_6/Src/MainFrm.cpp 2006-10-02 13:48:41 UTC (rev 3673) +++ branches/R2_6/Src/MainFrm.cpp 2006-10-02 16:23:06 UTC (rev 3674) @@ -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:55:13
|
Revision: 3681 http://svn.sourceforge.net/winmerge/?rev=3681&view=rev Author: gerundt Date: 2006-10-04 13:54:58 -0700 (Wed, 04 Oct 2006) Log Message: ----------- PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6 Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Languages/German/MergeGerman.rc Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-04 20:54:13 UTC (rev 3680) +++ branches/R2_6/Src/Changes.txt 2006-10-04 20:54:58 UTC (rev 3681) @@ -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: branches/R2_6/Src/Languages/German/MergeGerman.rc =================================================================== --- branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:13 UTC (rev 3680) +++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:58 UTC (rev 3681) @@ -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:44:53
|
Revision: 3683 http://svn.sourceforge.net/winmerge/?rev=3683&view=rev Author: gerundt Date: 2006-10-07 01:44:44 -0700 (Sat, 07 Oct 2006) Log Message: ----------- PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6 Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Languages/German/MergeGerman.rc Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-07 08:43:48 UTC (rev 3682) +++ branches/R2_6/Src/Changes.txt 2006-10-07 08:44:44 UTC (rev 3683) @@ -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: branches/R2_6/Src/Languages/German/MergeGerman.rc =================================================================== --- branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-07 08:43:48 UTC (rev 3682) +++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-07 08:44:44 UTC (rev 3683) @@ -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: <ki...@us...> - 2006-10-08 10:21:39
|
Revision: 3690 http://svn.sourceforge.net/winmerge/?rev=3690&view=rev Author: kimmov Date: 2006-10-08 03:21:26 -0700 (Sun, 08 Oct 2006) Log Message: ----------- BUG: [ 1563187 ] Can't close a file compare with -e switch Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MergeDoc.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-08 10:16:09 UTC (rev 3689) +++ branches/R2_6/Src/Changes.txt 2006-10-08 10:21:26 UTC (rev 3690) @@ -5,6 +5,8 @@ 2006-10-08 Kimmo PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt Docs/Users: Contributors.txt + BUG: [ 1563187 ] Can't close a file compare with -e switch + Src: MergeDoc.cpp 2006-10-07 Tim PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6 Modified: branches/R2_6/Src/MergeDoc.cpp =================================================================== --- branches/R2_6/Src/MergeDoc.cpp 2006-10-08 10:16:09 UTC (rev 3689) +++ branches/R2_6/Src/MergeDoc.cpp 2006-10-08 10:21:26 UTC (rev 3690) @@ -1253,7 +1253,7 @@ BOOL CMergeDoc::CanCloseFrame(CFrameWnd* /*pFrame*/) { // Allow user to cancel closing - if (!GetMainFrame()->m_bEscShutdown && PromptAndSaveIfNeeded(TRUE)) + if (PromptAndSaveIfNeeded(TRUE)) { // Set modified status to false so that we are not asking // about saving again in OnCloseDocument() 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:57:30
|
Revision: 3691 http://svn.sourceforge.net/winmerge/?rev=3691&view=rev Author: sdottaka Date: 2006-10-08 07:57:19 -0700 (Sun, 08 Oct 2006) Log Message: ----------- To fix the bug "BUG: [ 1570173 ] Crash when merging all differences", revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect" Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MergeDoc.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-08 10:21:26 UTC (rev 3690) +++ branches/R2_6/Src/Changes.txt 2006-10-08 14:57:19 UTC (rev 3691) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-10-08 Takashi + To fix the bug "BUG: [ 1570173 ] Crash when merging all differences", + revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect" + Src: MergeDoc.cpp + 2006-10-08 Kimmo PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt Docs/Users: Contributors.txt Modified: branches/R2_6/Src/MergeDoc.cpp =================================================================== --- branches/R2_6/Src/MergeDoc.cpp 2006-10-08 10:21:26 UTC (rev 3690) +++ branches/R2_6/Src/MergeDoc.cpp 2006-10-08 14:57:19 UTC (rev 3691) @@ -894,6 +894,7 @@ } // if the current diff contains missing lines, remove them from both sides + int deleted_lines=0; int limit = cd_dend; // curView is the view which is changed, so the opposite of the source view @@ -904,14 +905,19 @@ { // text was missing, so delete rest of lines on both sides // delete only on destination side since rescan will clear the other side - if (cd_dend + 1 < dbuf.GetLineCount()) + if(cd_blank==0) { dbuf.DeleteText(dstView, cd_blank, 0, cd_dend+1, 0, CE_ACTION_MERGE); } else { - dbuf.DeleteText(dstView, cd_blank, 0, cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE); + // If you are interesting in this code, please see at URL: + // https://sourceforge.net/tracker/index.php?func=detail&aid=1555664&group_id=13216&atid=113216 + // and + // https://sourceforge.net/tracker/index.php?func=detail&aid=1570173&group_id=13216&atid=113216 + dbuf.DeleteText(dstView, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE); } + deleted_lines=cd_dend-cd_blank+1; limit=cd_blank-1; dbuf.FlushUndoGroup(dstView); 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:55:29
|
Revision: 3695 http://svn.sourceforge.net/winmerge/?rev=3695&view=rev Author: sdottaka Date: 2006-10-09 15:55:15 -0700 (Mon, 09 Oct 2006) Log Message: ----------- BUG: [ 1570259 ] Bookmarks GUI get reset after save Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/editlib/ccrystaltextview.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-09 22:46:15 UTC (rev 3694) +++ branches/R2_6/Src/Changes.txt 2006-10-09 22:55:15 UTC (rev 3695) @@ -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 To fix the bug "BUG: [ 1570173 ] Crash when merging all differences", revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect" Modified: branches/R2_6/Src/editlib/ccrystaltextview.cpp =================================================================== --- branches/R2_6/Src/editlib/ccrystaltextview.cpp 2006-10-09 22:46:15 UTC (rev 3694) +++ branches/R2_6/Src/editlib/ccrystaltextview.cpp 2006-10-09 22:55:15 UTC (rev 3695) @@ -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:21:34
|
Revision: 3705 http://svn.sourceforge.net/winmerge/?rev=3705&view=rev Author: sdottaka Date: 2006-10-10 11:21:23 -0700 (Tue, 10 Oct 2006) Log Message: ----------- BUG: [ 1573240 ] Crash in subversion trunk Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MainFrm.cpp branches/R2_6/Src/MainFrm.h branches/R2_6/Src/OptionsInit.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-10 18:18:22 UTC (rev 3704) +++ branches/R2_6/Src/Changes.txt 2006-10-10 18:21:23 UTC (rev 3705) @@ -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: branches/R2_6/Src/MainFrm.cpp =================================================================== --- branches/R2_6/Src/MainFrm.cpp 2006-10-10 18:18:22 UTC (rev 3704) +++ branches/R2_6/Src/MainFrm.cpp 2006-10-10 18:21:23 UTC (rev 3705) @@ -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: branches/R2_6/Src/MainFrm.h =================================================================== --- branches/R2_6/Src/MainFrm.h 2006-10-10 18:18:22 UTC (rev 3704) +++ branches/R2_6/Src/MainFrm.h 2006-10-10 18:21:23 UTC (rev 3705) @@ -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: branches/R2_6/Src/OptionsInit.cpp =================================================================== --- branches/R2_6/Src/OptionsInit.cpp 2006-10-10 18:18:22 UTC (rev 3704) +++ branches/R2_6/Src/OptionsInit.cpp 2006-10-10 18:21:23 UTC (rev 3705) @@ -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:51:03
|
Revision: 3707 http://svn.sourceforge.net/winmerge/?rev=3707&view=rev Author: kimmov Date: 2006-10-11 08:50:56 -0700 (Wed, 11 Oct 2006) Log Message: ----------- PATCH: [ 1574696 ] Fix problem in saving filefilter to project file Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/ProjectFilePathsDlg.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-11 15:46:09 UTC (rev 3706) +++ branches/R2_6/Src/Changes.txt 2006-10-11 15:50:56 UTC (rev 3707) @@ -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: branches/R2_6/Src/ProjectFilePathsDlg.cpp =================================================================== --- branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-11 15:46:09 UTC (rev 3706) +++ branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-11 15:50:56 UTC (rev 3707) @@ -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-12 15:49:05
|
Revision: 3711 http://svn.sourceforge.net/winmerge/?rev=3711&view=rev Author: kimmov Date: 2006-10-12 08:48:56 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Fix building catalan language file Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-12 15:36:26 UTC (rev 3710) +++ branches/R2_6/Src/Changes.txt 2006-10-12 15:48:56 UTC (rev 3711) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-10-12 Kimmo + Fix building catalan language file + Src/Languages/Catalan: MergeCatalan.rc + 2006-10-11 Kimmo PATCH: [ 1574696 ] Fix problem in saving filefilter to project file Src: ProjectFilePathsDlg.cpp Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-10-12 15:36:26 UTC (rev 3710) +++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-10-12 15:48:56 UTC (rev 3711) @@ -2011,7 +2011,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 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:26:52
|
Revision: 3731 http://svn.sourceforge.net/winmerge/?rev=3731&view=rev Author: gerundt Date: 2006-10-24 14:26:39 -0700 (Tue, 24 Oct 2006) Log Message: ----------- PATCH: [ 1584004 ] Delete "Toolbar.bmp" Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Merge.dsp Removed Paths: ------------- branches/R2_6/Src/res/Toolbar.bmp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-24 21:23:22 UTC (rev 3730) +++ branches/R2_6/Src/Changes.txt 2006-10-24 21:26:39 UTC (rev 3731) @@ -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-12 2.6.0 Stable Release (R3712) 2006-10-12 Kimmo Modified: branches/R2_6/Src/Merge.dsp =================================================================== --- branches/R2_6/Src/Merge.dsp 2006-10-24 21:23:22 UTC (rev 3730) +++ branches/R2_6/Src/Merge.dsp 2006-10-24 21:26:39 UTC (rev 3731) @@ -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: branches/R2_6/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: <ki...@us...> - 2006-10-29 14:41:43
|
Revision: 3735 http://svn.sourceforge.net/winmerge/?rev=3735&view=rev Author: kimmov Date: 2006-10-29 06:41:26 -0800 (Sun, 29 Oct 2006) Log Message: ----------- PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MainFrm.cpp branches/R2_6/Src/MainFrm.h Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-27 15:18:59 UTC (rev 3734) +++ branches/R2_6/Src/Changes.txt 2006-10-29 14:41:26 UTC (rev 3735) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-10-29 Kimmo + PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always + Src: MainFrm.cpp MainFrm.h + 2006-10-24 Tim PATCH: [ 1584004 ] Delete "Toolbar.bmp" Src/res deleted file: Toolbar.bmp Modified: branches/R2_6/Src/MainFrm.cpp =================================================================== --- branches/R2_6/Src/MainFrm.cpp 2006-10-27 15:18:59 UTC (rev 3734) +++ branches/R2_6/Src/MainFrm.cpp 2006-10-29 14:41:26 UTC (rev 3735) @@ -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: branches/R2_6/Src/MainFrm.h =================================================================== --- branches/R2_6/Src/MainFrm.h 2006-10-27 15:18:59 UTC (rev 3734) +++ branches/R2_6/Src/MainFrm.h 2006-10-29 14:41:26 UTC (rev 3735) @@ -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-31 16:53:09
|
Revision: 3747 http://svn.sourceforge.net/winmerge/?rev=3747&view=rev Author: kimmov Date: 2006-10-31 08:52:47 -0800 (Tue, 31 Oct 2006) Log Message: ----------- PATCH: [ 1586869 ] Fix File Select -dialog modality Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Common/PreferencesDlg.cpp branches/R2_6/Src/DirCmpReportDlg.cpp branches/R2_6/Src/FileFiltersDlg.cpp branches/R2_6/Src/MainFrm.cpp branches/R2_6/Src/Merge.cpp branches/R2_6/Src/Merge.h branches/R2_6/Src/MergeDoc.cpp branches/R2_6/Src/PatchDlg.cpp branches/R2_6/Src/ProjectFilePathsDlg.cpp branches/R2_6/Src/PropRegistry.cpp branches/R2_6/Src/PropVss.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/Changes.txt 2006-10-31 16:52:47 UTC (rev 3747) @@ -2,6 +2,12 @@ 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 + Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h + MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp + Src/Common: PreferencesDlg.cpp + 2006-10-29 Kimmo PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always Src: MainFrm.cpp MainFrm.h Modified: branches/R2_6/Src/Common/PreferencesDlg.cpp =================================================================== --- branches/R2_6/Src/Common/PreferencesDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/Common/PreferencesDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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,7 @@ 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' Modified: branches/R2_6/Src/DirCmpReportDlg.cpp =================================================================== --- branches/R2_6/Src/DirCmpReportDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/DirCmpReportDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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: branches/R2_6/Src/FileFiltersDlg.cpp =================================================================== --- branches/R2_6/Src/FileFiltersDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/FileFiltersDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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: branches/R2_6/Src/MainFrm.cpp =================================================================== --- branches/R2_6/Src/MainFrm.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/MainFrm.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -896,7 +896,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; @@ -2722,7 +2722,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: branches/R2_6/Src/Merge.cpp =================================================================== --- branches/R2_6/Src/Merge.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/Merge.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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: branches/R2_6/Src/Merge.h =================================================================== --- branches/R2_6/Src/Merge.h 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/Merge.h 2006-10-31 16:52:47 UTC (rev 3747) @@ -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: branches/R2_6/Src/MergeDoc.cpp =================================================================== --- branches/R2_6/Src/MergeDoc.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/MergeDoc.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -982,6 +982,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); @@ -1012,7 +1014,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: branches/R2_6/Src/PatchDlg.cpp =================================================================== --- branches/R2_6/Src/PatchDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/PatchDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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: branches/R2_6/Src/ProjectFilePathsDlg.cpp =================================================================== --- branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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: branches/R2_6/Src/PropRegistry.cpp =================================================================== --- branches/R2_6/Src/PropRegistry.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/PropRegistry.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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: branches/R2_6/Src/PropVss.cpp =================================================================== --- branches/R2_6/Src/PropVss.cpp 2006-10-31 16:48:54 UTC (rev 3746) +++ branches/R2_6/Src/PropVss.cpp 2006-10-31 16:52:47 UTC (rev 3747) @@ -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-31 17:34:03
|
Revision: 3748 http://svn.sourceforge.net/winmerge/?rev=3748&view=rev Author: kimmov Date: 2006-10-31 09:33:53 -0800 (Tue, 31 Oct 2006) Log Message: ----------- PATCH: [ 1578494 ] 26Branch: Optimize binary files compare Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/DiffFileData.cpp branches/R2_6/Src/DiffItem.h Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-10-31 16:52:47 UTC (rev 3747) +++ branches/R2_6/Src/Changes.txt 2006-10-31 17:33:53 UTC (rev 3748) @@ -7,6 +7,8 @@ Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp Src/Common: PreferencesDlg.cpp + PATCH: [ 1578494 ] 26Branch: Optimize binary files compare + Src: DiffFileData.cpp DiffItem.h 2006-10-29 Kimmo PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always Modified: branches/R2_6/Src/DiffFileData.cpp =================================================================== --- branches/R2_6/Src/DiffFileData.cpp 2006-10-31 16:52:47 UTC (rev 3747) +++ branches/R2_6/Src/DiffFileData.cpp 2006-10-31 17:33:53 UTC (rev 3748) @@ -209,11 +209,10 @@ int DiffFileData::diffutils_compare_files(int depth) { int bin_flag = 0; - int bin_file = 0; // bitmap for binary files // Do the actual comparison (generating a change script) struct change *script = NULL; - BOOL success = Diff2Files(&script, depth, &bin_flag, FALSE, &bin_file); + BOOL success = Diff2Files(&script, depth, &bin_flag, FALSE, NULL); if (!success) { return DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR; @@ -250,18 +249,7 @@ // Clear text-flag, set binary flag // We don't know diff counts for binary files code = code & ~DIFFCODE::TEXT; - switch (bin_file) - { - case BINFILE_SIDE1: code |= DIFFCODE::BINSIDE1; - break; - case BINFILE_SIDE2: code |= DIFFCODE::BINSIDE2; - break; - case BINFILE_SIDE1 | BINFILE_SIDE2: code |= DIFFCODE::BIN; - break; - default: - _RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file); - break; - } + code |= DIFFCODE::BIN; m_ndiffs = DiffFileData::DIFFS_UNKNOWN; } @@ -694,16 +682,11 @@ // did we finish both files? if (eof[0] && eof[1]) { - BOOL bBin0 = (m_textStats0.nzeros>0); BOOL bBin1 = (m_textStats1.nzeros>0); - if (bBin0 && bBin1) + if (bBin0 || bBin1) diffcode |= DIFFCODE::BIN; - else if (bBin0) - diffcode |= DIFFCODE::BINSIDE1; - else if (bBin1) - diffcode |= DIFFCODE::BINSIDE2; // If either unfinished, they differ if (ptr0 != end0 || ptr1 != end1) Modified: branches/R2_6/Src/DiffItem.h =================================================================== --- branches/R2_6/Src/DiffItem.h 2006-10-31 16:52:47 UTC (rev 3747) +++ branches/R2_6/Src/DiffItem.h 2006-10-31 17:33:53 UTC (rev 3748) @@ -54,7 +54,7 @@ // and each set of flags is in a different hex digit // to make debugging easier // These can always be packed down in the future - TEXTFLAGS=0x7, TEXT=0x1, BINSIDE1=0x2, BINSIDE2=0x3, BIN=0x4, + TEXTFLAGS=0x7, TEXT=0x1, BIN=0x2, DIRFLAGS=0x30, FILE=0x10, DIR=0x20, SIDEFLAGS=0x300, LEFT=0x100, RIGHT=0x200, BOTH=0x300, COMPAREFLAGS=0x7000, NOCMP=0x0000, SAME=0x1000, DIFF=0x2000, CMPERR=0x3000, CMPABORT=0x4000, @@ -99,9 +99,7 @@ // filter status bool isResultFiltered() const { return CheckFilter(diffcode, DIFFCODE::SKIPPED); } // type - bool isBin() const { return Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BIN) || - Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BINSIDE1) || - Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BINSIDE2); } + bool isBin() const { return Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BIN); } void setBin() { Set(DIFFCODE::TEXTFLAGS, DIFFCODE::BIN); } // rescan bool isScanNeeded() const { return ((diffcode & DIFFCODE::SCANFLAGS) == DIFFCODE::NEEDSCAN); } 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:33:48
|
Revision: 3764 http://svn.sourceforge.net/winmerge/?rev=3764&view=rev Author: gerundt Date: 2006-11-03 08:33:28 -0800 (Fri, 03 Nov 2006) Log Message: ----------- PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/editlib/basic.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-11-03 16:30:52 UTC (rev 3763) +++ branches/R2_6/Src/Changes.txt 2006-11-03 16:33:28 UTC (rev 3764) @@ -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-02 Kimmo PATCH: [ 1588212 ] Add manifest file to resource file Src: Merge.rc Modified: branches/R2_6/Src/editlib/basic.cpp =================================================================== --- branches/R2_6/Src/editlib/basic.cpp 2006-11-03 16:30:52 UTC (rev 3763) +++ branches/R2_6/Src/editlib/basic.cpp 2006-11-03 16:33:28 UTC (rev 3764) @@ -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:39:30
|
Revision: 3767 http://svn.sourceforge.net/winmerge/?rev=3767&view=rev Author: kimmov Date: 2006-11-03 11:39:24 -0800 (Fri, 03 Nov 2006) Log Message: ----------- PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MainFrm.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-11-03 19:35:34 UTC (rev 3766) +++ branches/R2_6/Src/Changes.txt 2006-11-03 19:39:24 UTC (rev 3767) @@ -2,6 +2,9 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-11-03 Kimmo + 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 Src\editlib: basic.cpp Modified: branches/R2_6/Src/MainFrm.cpp =================================================================== --- branches/R2_6/Src/MainFrm.cpp 2006-11-03 19:35:34 UTC (rev 3766) +++ branches/R2_6/Src/MainFrm.cpp 2006-11-03 19:39:24 UTC (rev 3767) @@ -3072,6 +3072,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) { @@ -3085,6 +3087,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: <ga...@us...> - 2006-11-13 17:40:57
|
Revision: 3804 http://svn.sourceforge.net/winmerge/?rev=3804&view=rev Author: galh Date: 2006-11-13 03:34:04 -0800 (Mon, 13 Nov 2006) Log Message: ----------- BUG: [ 1594188 ] /x option does not work Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/MergeDoc.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-11-11 10:44:58 UTC (rev 3803) +++ branches/R2_6/Src/Changes.txt 2006-11-13 11:34:04 UTC (rev 3804) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-11-13 Gal + BUG: [ 1594188 ] /x option does not work + Src: MergeDoc.cpp + 2006-11-06 Takashi PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico) Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico Modified: branches/R2_6/Src/MergeDoc.cpp =================================================================== --- branches/R2_6/Src/MergeDoc.cpp 2006-11-11 10:44:58 UTC (rev 3803) +++ branches/R2_6/Src/MergeDoc.cpp 2006-11-13 11:34:04 UTC (rev 3804) @@ -2872,8 +2872,11 @@ // Inform user that files are identical // Don't show message if new buffers created - if (bIdentical && (m_nBufferType[0] == BUFFER_NORMAL || - m_nBufferType[1] == BUFFER_NORMAL)) + if ((TRUE == bIdentical) && + ((m_nBufferType[0] == BUFFER_NORMAL) || + (m_nBufferType[0] == BUFFER_NORMAL_NAMED) || + (m_nBufferType[1] == BUFFER_NORMAL) || + (m_nBufferType[1] == BUFFER_NORMAL_NAMED))) { ShowRescanError(nRescanResult, bBinary, bIdentical); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ga...@us...> - 2006-11-19 06:56:06
|
Revision: 3816 http://svn.sourceforge.net/winmerge/?rev=3816&view=rev Author: galh Date: 2006-11-18 22:56:04 -0800 (Sat, 18 Nov 2006) Log Message: ----------- PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351) Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Common/SplitterWndEx.cpp branches/R2_6/Src/Merge.cpp branches/R2_6/Src/MergeArgs.cpp branches/R2_6/Src/MergeDiffDetailView.cpp Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2006-11-17 18:51:50 UTC (rev 3815) +++ branches/R2_6/Src/Changes.txt 2006-11-19 06:56:04 UTC (rev 3816) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-11-19 Gal + PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351) + Src/Common: SplitterWndEx.cpp + Src: Merge.cpp MergeArgs.cpp MergeDiffDetailView.cpp + 2006-11-13 Gal BUG: [ 1594188 ] /x option does not work Src: MergeDoc.cpp Modified: branches/R2_6/Src/Common/SplitterWndEx.cpp =================================================================== --- branches/R2_6/Src/Common/SplitterWndEx.cpp 2006-11-17 18:51:50 UTC (rev 3815) +++ branches/R2_6/Src/Common/SplitterWndEx.cpp 2006-11-19 06:56:04 UTC (rev 3816) @@ -179,21 +179,27 @@ int i; int sum = 0; int hmin; + for (i = 0 ; i < m_nCols ; i++) { int v; GetColumnInfo(i, v, hmin); sum += v; } - int vEqual = sum/m_nCols; - for (i = 0 ; i < m_nCols-1 ; i++) + + // Sum is negative if WinMerge started minimized. + if (sum > 0) { - SetColumnInfo(i, vEqual, hmin); - sum -= vEqual; + int vEqual = sum/m_nCols; + for (i = 0 ; i < m_nCols-1 ; i++) + { + SetColumnInfo(i, vEqual, hmin); + sum -= vEqual; + } + SetColumnInfo(i, sum, hmin); + + RecalcLayout(); } - SetColumnInfo(i, sum, hmin); - - RecalcLayout(); } Modified: branches/R2_6/Src/Merge.cpp =================================================================== --- branches/R2_6/Src/Merge.cpp 2006-11-17 18:51:50 UTC (rev 3815) +++ branches/R2_6/Src/Merge.cpp 2006-11-19 06:56:04 UTC (rev 3816) @@ -103,10 +103,12 @@ public: BOOL m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */ + int m_nCmdShow /**< Initial state of the application's window. */; }; CMergeCmdLineInfo::CMergeCmdLineInfo() : CCommandLineInfo(), - m_bSingleInstance(FALSE) + m_bSingleInstance(FALSE), + m_nCmdShow(SW_SHOWNORMAL) { } @@ -122,6 +124,11 @@ { m_bSingleInstance = TRUE; } + else if (!lstrcmpi(pszParam, _T("minimize"))) + { + // /minimize means minimize the main window. + m_nCmdShow = SW_MINIMIZE; + } } } @@ -315,9 +322,8 @@ //Track it so any other instances can find it. instanceChecker.TrackFirstInstanceRunning(); - // The main window has been initialized, so show and update it. - //pMainFrame->ShowWindow(m_nCmdShow); - pMainFrame->ActivateFrame(m_nCmdShow); + // The main window has been initialized, so activate and update it. + pMainFrame->ActivateFrame(cmdInfo.m_nCmdShow); pMainFrame->UpdateWindow(); // Since this function actually opens paths for compare it must be Modified: branches/R2_6/Src/MergeArgs.cpp =================================================================== --- branches/R2_6/Src/MergeArgs.cpp 2006-11-17 18:51:50 UTC (rev 3815) +++ branches/R2_6/Src/MergeArgs.cpp 2006-11-19 06:56:04 UTC (rev 3816) @@ -204,12 +204,6 @@ GetMainFrame()->ResetOptions(); } - if (cmdArgs.HasSwitch(_T("minimize"))) - { - // /minimize means minimize the main window - m_nCmdShow = SW_MINIMIZE; - } - // Handle all switches in the f_ArgSettings table // this are arguments mapped to WinMerge options int i; Modified: branches/R2_6/Src/MergeDiffDetailView.cpp =================================================================== --- branches/R2_6/Src/MergeDiffDetailView.cpp 2006-11-17 18:51:50 UTC (rev 3815) +++ branches/R2_6/Src/MergeDiffDetailView.cpp 2006-11-19 06:56:04 UTC (rev 3816) @@ -316,16 +316,21 @@ ScrollToLine(m_lineBegin); // tell the others views about this diff (no need to call UpdateSiblingScrollPos) - CSplitterWnd *pSplitterWnd = GetParentSplitter (this, FALSE); - int nRows = pSplitterWnd->GetRowCount (); - int nCols = pSplitterWnd->GetColumnCount (); - for (int nRow = 0; nRow < nRows; nRow++) + CSplitterWnd *pSplitterWnd = GetParentSplitter(this, FALSE); + + // pSplitterWnd is NULL if WinMerge started minimized. + if (pSplitterWnd != NULL) { - for (int nCol = 0; nCol < nCols; nCol++) + int nRows = pSplitterWnd->GetRowCount (); + int nCols = pSplitterWnd->GetColumnCount (); + for (int nRow = 0; nRow < nRows; nRow++) { - CMergeDiffDetailView *pSiblingView = static_cast<CMergeDiffDetailView*>(GetSiblingView (nRow, nCol)); - if (pSiblingView != NULL) - pSiblingView->OnDisplayDiff(nDiff); + for (int nCol = 0; nCol < nCols; nCol++) + { + CMergeDiffDetailView *pSiblingView = static_cast<CMergeDiffDetailView*>(GetSiblingView (nRow, nCol)); + if (pSiblingView != NULL) + pSiblingView->OnDisplayDiff(nDiff); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |