You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jt...@us...> - 2011-03-28 21:46:38
|
Revision: 7519
http://winmerge.svn.sourceforge.net/winmerge/?rev=7519&view=rev
Author: jtuc
Date: 2011-03-28 21:46:32 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
Scroll ranges of left and right pane were not always properly aligned.
Modified Paths:
--------------
trunk/Src/HexMergeDoc.cpp
Modified: trunk/Src/HexMergeDoc.cpp
===================================================================
--- trunk/Src/HexMergeDoc.cpp 2011-03-18 21:47:07 UTC (rev 7518)
+++ trunk/Src/HexMergeDoc.cpp 2011-03-28 21:46:32 UTC (rev 7519)
@@ -446,7 +446,9 @@
SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_RIGHT, pathRight, bRORight)))
{
UpdateDiffItem(0);
- pf->Invalidate();
+ // An extra ResizeWindow() on the left view aligns scroll ranges, and
+ // also triggers initial diff coloring by invalidating the client area.
+ m_pView[MERGE_VIEW_LEFT]->ResizeWindow();
if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST))
m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2011-03-18 21:47:13
|
Revision: 7518
http://winmerge.svn.sourceforge.net/winmerge/?rev=7518&view=rev
Author: kimmov
Date: 2011-03-18 21:47:07 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
PATCH: #3186717 drag items from folder compare listing view
Submitted by devlynx @ sourceforge.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Src/DirView.cpp
trunk/Src/DirView.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2011-02-06 19:30:24 UTC (rev 7517)
+++ trunk/Docs/Users/ChangeLog.txt 2011-03-18 21:47:07 UTC (rev 7518)
@@ -5,6 +5,7 @@
WinMerge 2.15.1
Update version number in trunk
+ Drag and drop items from the folder compare (#3186717)
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
Installer: Add OpenCandy to the InnoSetup installer (#3088720)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2011-02-06 19:30:24 UTC (rev 7517)
+++ trunk/Docs/Users/Contributors.txt 2011-03-18 21:47:07 UTC (rev 7518)
@@ -161,6 +161,7 @@
* Ferenc Kubatovics
* Ren\xE9 Leonhardt
* Vladimir Lukianov
+* LynX <de...@us...>
* David Maisonave
* Dmitry Maslov
* Denis Matiukha
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2011-02-06 19:30:24 UTC (rev 7517)
+++ trunk/Src/DirView.cpp 2011-03-18 21:47:07 UTC (rev 7518)
@@ -51,6 +51,7 @@
#include "CompareStatisticsDlg.h"
#include "PluginsListDlg.h"
#include "ShellContextMenu.h"
+#include "DiffItem.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -260,6 +261,7 @@
ON_NOTIFY_REFLECT(LVN_BEGINLABELEDIT, OnBeginLabelEdit)
ON_NOTIFY_REFLECT(LVN_ENDLABELEDIT, OnEndLabelEdit)
ON_NOTIFY_REFLECT(NM_CLICK, OnClick)
+ ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@@ -3770,3 +3772,99 @@
return res;
}
+
+/**
+ * @brief Retrives file list of all selected files, and store them like
+ * file_path1\nfile_path2\n...file_pathN
+ *
+ * @param [out] filesForDroping Reference to buffer where file list will be stored
+ */
+void CDirView::PrepareDragData(String& filesForDroping)
+{
+ int pos = GetFirstSelectedInd();
+ const int count = GetSelectedCount();
+ int i = 0;
+
+ // No selection - no diff to go
+ if (count == 0)
+ {
+ return;
+ }
+
+ while (i++ < count)
+ {
+ const DIFFITEM &diffitem = GetNextSelectedInd(pos);
+
+ // check for special items (e.g not "..")
+ if (diffitem.diffcode.diffcode == 0)
+ {
+ continue;
+ }
+
+ if (diffitem.diffcode.isSideLeftOnly())
+ {
+ String spath = diffitem.GetLeftFilepath(GetDocument()->GetDiffContext().GetNormalizedLeft());
+ spath = paths_ConcatPath(spath, diffitem.left.filename);
+ filesForDroping += spath;
+ }
+ else if (diffitem.diffcode.isSideRightOnly())
+ {
+ String spath = diffitem.GetRightFilepath(GetDocument()->GetDiffContext().GetNormalizedRight());
+ spath = paths_ConcatPath(spath, diffitem.right.filename);
+ filesForDroping += spath;
+ }
+ else if (diffitem.diffcode.isSideBoth())
+ {
+ // when both files equal, there is no difference between what file to drag
+ // so we put file from the left panel
+ String spath = diffitem.GetLeftFilepath(GetDocument()->GetDiffContext().GetNormalizedLeft());
+ spath = paths_ConcatPath(spath, diffitem.left.filename);
+ filesForDroping += spath;
+
+ // if both files are different then we also put file from the right panel
+ if (diffitem.diffcode.isResultDiff())
+ {
+ filesForDroping += _T('\n'); // end of left file path
+ String spath = diffitem.GetRightFilepath(GetDocument()->GetDiffContext().GetNormalizedRight());
+ spath = paths_ConcatPath(spath, diffitem.right.filename);
+ filesForDroping += spath;
+ }
+ }
+ filesForDroping += _T('\n'); // end of file path
+ }
+
+ if (!filesForDroping.empty())
+ {
+ filesForDroping.erase(filesForDroping.length() - 1); // omit final \n
+ }
+}
+
+/**
+ * @brief Drag files/directories from folder compare listing view.
+ */
+void CDirView::OnBeginDrag(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
+
+ COleDataSource *DropData = new COleDataSource();
+ String filesForDroping;
+
+ PrepareDragData(filesForDroping);
+
+ CSharedFile file(GMEM_DDESHARE | GMEM_MOVEABLE | GMEM_ZEROINIT);
+ file.Write(filesForDroping.data(), filesForDroping.length() * sizeof(TCHAR));
+ file.Write(_T("\0"), sizeof(TCHAR)); // include terminating zero
+
+ HGLOBAL hMem = file.Detach();
+ if (hMem)
+ {
+#ifdef _UNICODE
+ DropData->CacheGlobalData(CF_UNICODETEXT, hMem);
+#else
+ DropData->CacheGlobalData(CF_TEXT, hMem);
+#endif
+ DROPEFFECT de = DropData->DoDragDrop(DROPEFFECT_COPY | DROPEFFECT_MOVE, NULL);
+ }
+
+ *pResult = 0;
+}
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2011-02-06 19:30:24 UTC (rev 7517)
+++ trunk/Src/DirView.h 2011-03-18 21:47:07 UTC (rev 7518)
@@ -399,6 +399,7 @@
afx_msg void OnPluginsList();
afx_msg void OnExpandFolder();
afx_msg void OnCollapseFolder();
+ afx_msg void OnBeginDrag(NMHDR* pNMHDR, LRESULT* pResult);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
@@ -444,6 +445,7 @@
BOOL IsItemSelectedSpecial();
void CollapseSubdir(int sel);
void ExpandSubdir(int sel);
+ void PrepareDragData(String& filesForDroping);
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-02-06 19:30:30
|
Revision: 7517
http://winmerge.svn.sourceforge.net/winmerge/?rev=7517&view=rev
Author: jtuc
Date: 2011-02-06 19:30:24 +0000 (Sun, 06 Feb 2011)
Log Message:
-----------
Add missing file
Added Paths:
-----------
trunk/ArchiveSupport/Merge7z/Merge7z907.cpp
Added: trunk/ArchiveSupport/Merge7z/Merge7z907.cpp
===================================================================
--- trunk/ArchiveSupport/Merge7z/Merge7z907.cpp (rev 0)
+++ trunk/ArchiveSupport/Merge7z/Merge7z907.cpp 2011-02-06 19:30:24 UTC (rev 7517)
@@ -0,0 +1,352 @@
+/*/Merge7z453.cpp
+
+Copyright (c) Jochen Neubeck
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Please mind 2. b) of the GNU LGPL terms, and log your changes below.
+
+DATE: BY: DESCRIPTION:
+========== ================== ================================================
+2009-09-26 Jochen Neubeck Branched from Merge7z459.cpp
+2010-04-24 Jochen Neubeck Fix compression
+*/
+
+#include "stdafx.h"
+
+#define INITGUID
+#include <initguid.h>
+
+#include "Merge7zCommon.h"
+
+#include "7zip/UI/FileManager/OpenCallback.h"
+#include "7zip/UI/FileManager/ExtractCallback.h"
+
+#include "7zip/UI/Common/ArchiveExtractCallback.h"
+#include "7zip/UI/GUI/UpdateCallbackGUI.h"
+
+#include "Windows/Thread.h"
+
+/**
+ * @brief Extraction thread
+ */
+class CThreadExtracting : public CProgressThreadVirt
+{
+protected:
+ virtual HRESULT ProcessVirt()
+ {
+ HRESULT result = Archive->Extract(indices, numItems, false, ArchiveExtractCallback);
+ return result;
+ }
+ CExtractCallbackImp *ExtractCallbackSpec;
+ IInArchive *Archive;
+ IArchiveExtractCallback *ArchiveExtractCallback;
+ const UINT32 *indices;
+ UINT32 numItems;
+public:
+ //HRESULT result;
+
+ CThreadExtracting
+ (
+ CExtractCallbackImp *ExtractCallbackSpec,
+ IInArchive *Archive,
+ IArchiveExtractCallback *ArchiveExtractCallback,
+ const CSysString &title,
+ HWND hwndParent,
+ const UINT32 *indices = 0,
+ UINT32 numItems = -1
+ ):
+ ExtractCallbackSpec(ExtractCallbackSpec),
+ Archive(Archive),
+ ArchiveExtractCallback(ArchiveExtractCallback),
+ indices(indices),
+ numItems(numItems)
+ {
+ ExtractCallbackSpec->ProgressDialog = &ProgressDialog;
+ ProgressDialog.CompressingMode = false;
+ //result = E_FAIL;
+ if (HRESULT hr = Create(GetUnicodeString(title), hwndParent))
+ {
+ Complain(hr, NULL);
+ }
+ }
+};
+
+/**
+ * @brief Initialize Inspector
+ */
+Format7zDLL::Interface::Inspector::Inspector(Format7zDLL::Interface *format, LPCTSTR path)
+: format(format), archive(0), file(0), callback(0), path(path), ustrDefaultName(GetUnicodeString(path))
+{
+}
+
+/**
+ * @brief Initialize Inspector
+ */
+void Format7zDLL::Interface::Inspector::Init(HWND hwndParent)
+{
+ format->GetDefaultName(hwndParent, ustrDefaultName);
+ COpenArchiveCallback *callbackImpl = new COpenArchiveCallback;
+ //COpenCallbackImp *callbackImpl = new COpenCallbackImp;
+ (archive = format->GetInArchive()) -> AddRef();
+ (file = new CInFileStream) -> AddRef();
+ (callback = callbackImpl) -> AddRef();
+ callbackImpl->PasswordIsDefined = false;
+ callbackImpl->ParentWindow = hwndParent;
+ /*CMyComBSTR password;
+ callback->CryptoGetTextPassword(&password);*/
+ if COMPLAIN(!NFile::NFind::CFindFile().FindFirst(path, fileInfo))
+ {
+ Complain(ERROR_FILE_NOT_FOUND, path);
+ }
+ if COMPLAIN(!file->Open(path))
+ {
+ Complain(ERROR_OPEN_FAILED, path);
+ }
+ if COMPLAIN(archive->Open(file, 0, callback) != S_OK)
+ {
+ Complain(ERROR_CANT_ACCESS_FILE, path);
+ }
+ passwordIsDefined = callbackImpl->PasswordIsDefined;
+ password = callbackImpl->Password;
+}
+
+/**
+ * @brief Extract set of items specified by index
+ */
+HRESULT Format7zDLL::Interface::Inspector::Extract(HWND hwndParent, LPCTSTR folder, const UINT32 *indices, UINT32 numItems)
+{
+ CArchiveExtractCallback *extractCallbackSpec = 0;
+ CExtractCallbackImp *extractCallbackSpec2 = 0;
+ HRESULT result = 0;
+ try
+ {
+ if (*folder)
+ {
+ if COMPLAIN(!NFile::NDirectory::CreateComplexDirectory(folder))
+ {
+ Complain(ERROR_CANNOT_MAKE, folder);
+ }
+ }
+
+ (extractCallbackSpec2 = new CExtractCallbackImp) -> AddRef();
+
+ extractCallbackSpec2->Init();
+
+ extractCallbackSpec2->OverwriteMode = NExtract::NOverwriteMode::kWithoutPrompt;
+ extractCallbackSpec2->PasswordIsDefined = passwordIsDefined;
+ extractCallbackSpec2->Password = password;
+
+ (extractCallbackSpec = new CArchiveExtractCallback) -> AddRef();
+
+ extractCallbackSpec->InitForMulti
+ (
+ false,
+ NExtract::NPathMode::kFullPathnames,
+ NExtract::NOverwriteMode::kWithoutPrompt
+ );
+ CArc arc;
+ arc.Archive = archive;
+ arc.Path = GetUnicodeString(path);
+ arc.DefaultName = ustrDefaultName;
+ arc.FormatIndex = 0;
+ arc.SubfileIndex = 0;
+ extractCallbackSpec->Init
+ (
+ NULL,
+ &arc,
+ extractCallbackSpec2,
+ false, //stdOutMode
+ false, //testMode
+ false, //crcMode
+ GetUnicodeString(folder),
+ UStringVector(),
+ (UInt64)(Int64)-1
+ );
+
+ result = CThreadExtracting
+ (
+ extractCallbackSpec2,
+ archive,
+ extractCallbackSpec,
+ PathFindFileName(path),
+ hwndParent,
+ indices,
+ numItems
+ ).Result;
+
+ //.result;
+
+ /*if COMPLAIN(extractCallbackSpec->_numErrors)
+ {
+ // There is no canned system message for this one, so it won't
+ // localize. I can't help it.
+ Complain(_T("%s:\n%I64u error(s)"), path, extractCallbackSpec->_numErrors);
+ }*/
+ if COMPLAIN(result != S_OK && result != E_ABORT)
+ {
+ Complain(result, path);
+ }
+ }
+ catch (Complain *complain)
+ {
+ result = complain->Alert(hwndParent);
+ }
+ Release(static_cast<IArchiveExtractCallback*>(extractCallbackSpec));
+ Release(static_cast<IFolderArchiveExtractCallback*>(extractCallbackSpec2));
+ return result;
+}
+
+/**
+ * @brief Compression thread
+ */
+class CThreadUpdating : public CProgressThreadVirt
+{
+protected:
+ virtual HRESULT ProcessVirt()
+ {
+ HRESULT result = outArchive->UpdateItems(file, numItems, updateCallbackSpec);
+ return result;
+ }
+ CUpdateCallbackGUI *updateCallbackGUI;
+ IOutArchive *outArchive;
+ CArchiveUpdateCallback *updateCallbackSpec;
+ COutFileStream *file;
+public:
+ HRESULT result;
+ UINT32 numItems;
+ CThreadUpdating
+ (
+ CUpdateCallbackGUI *updateCallbackGUI,
+ IOutArchive *outArchive,
+ CArchiveUpdateCallback *updateCallbackSpec,
+ UINT32 numItems,
+ COutFileStream *file,
+ const CSysString &title,
+ HWND hwndParent
+ ):
+ updateCallbackGUI(updateCallbackGUI),
+ outArchive(outArchive),
+ updateCallbackSpec(updateCallbackSpec),
+ numItems(numItems),
+ file(file)
+ {
+ result = E_FAIL;
+ updateCallbackGUI->ProgressDialog = &ProgressDialog;
+ if (HRESULT hr = Create(GetUnicodeString(title), hwndParent))
+ {
+ Complain(hr, NULL);
+ }
+ }
+};
+
+/**
+ * @brief Construct Updater
+ */
+Format7zDLL::Interface::Updater::Updater(Format7zDLL::Interface *format, LPCTSTR path)
+: format(format), outArchive(0), file(0), path(path)
+{
+}
+
+/**
+ * @brief Initialize Updater
+ */
+void Format7zDLL::Interface::Updater::Init(HWND hwndParent)
+{
+ (outArchive = format->GetOutArchive()) -> AddRef();
+ (file = new COutFileStream) -> AddRef();
+ if COMPLAIN(!file->Create(path, true))
+ {
+ Complain(ERROR_CANNOT_MAKE, path);
+ }
+}
+
+/**
+ * @brief Commit update
+ */
+HRESULT Format7zDLL::Interface::Updater::Commit(HWND hwndParent)
+{
+ CArchiveUpdateCallback *updateCallbackSpec = 0;
+ CUpdateCallbackGUI *updateCallbackGUI = 0;
+ HRESULT result = 0;
+ try
+ {
+ // Ref counts are not always accurate with 7-Zip.
+ // An extra AddRef() ensures that interfaces remain valid until they
+ // are explicitly released at the end of this function.
+ (updateCallbackSpec = new CArchiveUpdateCallback) -> AddRef();
+ (updateCallbackGUI = new CUpdateCallbackGUI);// -> AddRef();
+
+ updateCallbackGUI->Init();
+
+ // No items in dest archive. We always recreate the dest archive
+ // Build the operationChain. One element per item
+ CRecordVector<CUpdatePair2> operationChain;
+ CUpdatePair2 pair2;
+ pair2.NewData = pair2.NewProps = true;
+
+ operationChain.Reserve(dirItems.Items.Size());
+ //
+ int i;
+ for (i = 0 ; i < dirItems.Items.Size() ; i++)
+ {
+ pair2.DirIndex = i;
+ operationChain.Add(pair2);
+ }
+ operationChain.ReserveDown();
+
+ /* The following code may or may not help implement update on existing
+ /* archives, which is currently not supported.
+ UINT32 fileTimeType;
+ outArchive->GetFileTimeType(&fileTimeType);
+
+ CObjectVector<CUpdatePair> updatePairs;
+ GetUpdatePairInfoList(dirItems, archiveItems, NFileTimeType::EEnum(fileTimeType), updatePairs); // must be done only once!!!
+
+ CObjectVector<CUpdatePair2> operationChain;
+ UpdateProduce(dirItems, archiveItems, updatePairs, NUpdateArchive::kAddActionSet, operationChain);*/
+
+ // Now compress...
+ updateCallbackSpec->DirItems = &dirItems;
+ updateCallbackSpec->ArcItems = &archiveItems;
+ updateCallbackSpec->UpdatePairs = &operationChain;
+ updateCallbackSpec->Callback = updateCallbackGUI;
+
+ result = CThreadUpdating
+ (
+ updateCallbackGUI,
+ outArchive,
+ updateCallbackSpec,
+ operationChain.Size(),
+ file,
+ PathFindFileName(path),
+ hwndParent
+ ).Result;
+
+ if COMPLAIN(result != S_OK && result != E_ABORT)
+ {
+ Complain(result, path);
+ }
+ }
+ catch (Complain *complain)
+ {
+ result = complain->Alert(hwndParent);
+ }
+ // Always release interfaces in this order, or else all hell will break
+ // loose!
+ Release(static_cast<IArchiveUpdateCallback*>(updateCallbackSpec));
+ delete updateCallbackGUI;
+ return result;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-01-30 14:03:20
|
Revision: 7516
http://winmerge.svn.sourceforge.net/winmerge/?rev=7516&view=rev
Author: jtuc
Date: 2011-01-30 14:03:14 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
PATCH: [ 3016907 ] Fix Bug #2968177 Ignoring comments wrongly recognizes // ... (merge from trunk revision 7195)
Revision Links:
--------------
http://winmerge.svn.sourceforge.net/winmerge/?rev=7195&view=rev
Modified Paths:
--------------
branches/R2_14/Src/DiffWrapper.cpp
Modified: branches/R2_14/Src/DiffWrapper.cpp
===================================================================
--- branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 13:35:56 UTC (rev 7515)
+++ branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 14:03:14 UTC (rev 7516)
@@ -324,6 +324,33 @@
}
/**
+ * @brief Find comment marker in string, excluding portions enclosed in quotation marks or apostrophes
+ * @param [in] target - string to search
+ * @param [in] marker - marker to search for
+ * @return Returns position of marker, or NULL if none is present
+ */
+static const char *FindCommentMarker(const char *target, const char *marker)
+{
+ char prev = '\0';
+ char quote = '\0';
+ size_t marker_len = strlen(marker);
+ while (const char c = *target)
+ {
+ if (quote == '\0' && memcmp(target, marker, marker_len) == 0)
+ return target;
+ if ((prev != '\\') &&
+ (c == '"' || c == '\'') &&
+ (quote == '\0' || quote == c))
+ {
+ quote ^= c;
+ }
+ prev = c;
+ ++target;
+ }
+ return NULL;
+}
+
+/**
@brief Performs post-filtering, by setting comment blocks to trivial
@param [in] StartPos - First line number to read
@param [in] EndPos - The line number PASS the last line number to read
@@ -352,16 +379,13 @@
OpShouldBeTrivial = true;
break;
}
- std::string LineData(files[FileNo].linbuf[i]);
- size_t EolPos = LineData.find_first_of(EolIndicators);
- if (EolPos != std::string::npos)
- {
- LineData.erase(EolPos);
- }
- const char * StartOfComment = strstr(LineData.c_str(), filtercommentsset.StartMarker.c_str());
- const char * EndOfComment = strstr(LineData.c_str(), filtercommentsset.EndMarker.c_str());
- const char * InLineComment = strstr(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
+ const char *LineStr = files[FileNo].linbuf[i];
+ std::string LineData(LineStr, linelen(LineStr));
+
+ const char * StartOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.StartMarker.c_str());
+ const char * EndOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.EndMarker.c_str());
+ const char * InLineComment = FindCommentMarker(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
//The following logic determines if the entire block is a comment block, and only marks it as trivial
//if all the changes are within a comment block.
if (Direction == -1)
@@ -584,38 +608,33 @@
else if (!filtercommentsset.InlineMarker.empty() && QtyLinesLeft == 1 && QtyLinesRight == 1)
{
//Lets test if only a post line comment is different.
- const char * LineStrLeft = files[0].linbuf[LineNumberLeft];
- const char * EndLineLeft = strchr(LineStrLeft, '\0');
- const char * LineStrRight = files[1].linbuf[LineNumberRight];
- const char * EndLineRight = strchr(LineStrRight, '\0');
- if (EndLineLeft && EndLineRight)
+ const char *LineStrLeft = files[0].linbuf[LineNumberLeft];
+ const char *LineStrRight = files[1].linbuf[LineNumberRight];
+ std::string LineDataLeft(LineStrLeft, linelen(LineStrLeft));
+ std::string LineDataRight(LineStrRight, linelen(LineStrRight));
+ const char *CommentStrLeft = FindCommentMarker(LineDataLeft.c_str(), filtercommentsset.InlineMarker.c_str());
+ const char *CommentStrRight = FindCommentMarker(LineDataRight.c_str(), filtercommentsset.InlineMarker.c_str());
+ //If neither side has comment string, then lets assume significant difference, and return
+ if (CommentStrLeft == NULL && CommentStrRight == NULL)
{
- std::string LineDataLeft(LineStrLeft, EndLineLeft);
- std::string LineDataRight(LineStrRight, EndLineRight);
- size_t CommentStrLeft = LineDataLeft.find(filtercommentsset.InlineMarker);
- size_t CommentStrRight = LineDataRight.find(filtercommentsset.InlineMarker);
- //If neither side has comment string, then lets assume significant difference, and return
- if (CommentStrLeft == std::string::npos && CommentStrRight == std::string::npos)
- {
- return;
- }
- //Do a quick test to see if both sides begin with comment character
- if (!CommentStrLeft && !CommentStrRight)
- {//If both sides begin with comment character, then this is a trivial difference
- Op = OP_TRIVIAL;
- return;
- }
+ return;
+ }
+ //Do a quick test to see if both sides begin with comment character
+ if (CommentStrLeft == LineDataLeft.c_str() && CommentStrRight == LineDataRight.c_str())
+ {//If both sides begin with comment character, then this is a trivial difference
+ Op = OP_TRIVIAL;
+ return;
+ }
- //Lets remove comments, and see if lines are equal
- if (CommentStrLeft != std::string::npos)
- LineDataLeft.erase(CommentStrLeft);
- if (CommentStrRight != std::string::npos)
- LineDataRight.erase(CommentStrRight);
- if (LineDataLeft == LineDataRight)
- {//If they're equal now, then only difference is comments, and that's a trivial difference
- Op = OP_TRIVIAL;
- return;
- }
+ //Lets remove comments, and see if lines are equal
+ if (CommentStrLeft != NULL)
+ LineDataLeft.erase(CommentStrLeft - LineDataLeft.c_str());
+ if (CommentStrRight != NULL)
+ LineDataRight.erase(CommentStrRight - LineDataRight.c_str());
+ if (LineDataLeft == LineDataRight)
+ {//If they're equal now, then only difference is comments, and that's a trivial difference
+ Op = OP_TRIVIAL;
+ return;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-01-30 13:36:02
|
Revision: 7515
http://winmerge.svn.sourceforge.net/winmerge/?rev=7515&view=rev
Author: jtuc
Date: 2011-01-30 13:35:56 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
Cleanup. Remove unused return value from method. (merge from trunk revision 7091)
Revision Links:
--------------
http://winmerge.svn.sourceforge.net/winmerge/?rev=7091&view=rev
Modified Paths:
--------------
branches/R2_14/Src/DiffWrapper.cpp
branches/R2_14/Src/DiffWrapper.h
Modified: branches/R2_14/Src/DiffWrapper.cpp
===================================================================
--- branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 13:21:00 UTC (rev 7514)
+++ branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 13:35:56 UTC (rev 7515)
@@ -907,7 +907,7 @@
}
ASSERT(dr.begin0 == dr.begin1);
- AddDiffRange(dr.begin0, dr.end0, dr.begin1, dr.end1, dr.op);
+ AddDiffRange(dr.begin0, dr.end0, dr.begin1, dr.end1, dr.op);
}
}
@@ -977,13 +977,14 @@
}
/**
- * @brief Enables/disables patch-file appending (files with same filename are appended)
+ * @brief Enables/disables patch-file appending.
+ * If the file for patch already exists then the patch will be appended to
+ * existing file.
+ * @param [in] bAppendFiles If TRUE patch will be appended to existing file.
*/
-BOOL CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)
+void CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)
{
- BOOL temp = m_bAppendFiles;
m_bAppendFiles = bAppendFiles;
- return temp;
}
/**
Modified: branches/R2_14/Src/DiffWrapper.h
===================================================================
--- branches/R2_14/Src/DiffWrapper.h 2011-01-30 13:21:00 UTC (rev 7514)
+++ branches/R2_14/Src/DiffWrapper.h 2011-01-30 13:35:56 UTC (rev 7515)
@@ -158,7 +158,7 @@
void SetPatchOptions(const PATCHOPTIONS *options);
void SetDetectMovedBlocks(bool bDetectMovedBlocks);
bool GetDetectMovedBlocks() { return (m_pMovedLines != NULL); }
- BOOL SetAppendFiles(BOOL bAppendFiles);
+ void SetAppendFiles(BOOL bAppendFiles);
void SetPaths(const String &filepath1, const String &filepath2, BOOL tempPaths);
void SetAlternativePaths(const String &altPath1, const String &altPath2);
void SetCodepage(int codepage) { m_codepage = codepage; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-01-30 13:21:07
|
Revision: 7514
http://winmerge.svn.sourceforge.net/winmerge/?rev=7514&view=rev
Author: jtuc
Date: 2011-01-30 13:21:00 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
Make DIFFRANGE::op and respective function parameters type-safe (merge from trunk revision 7222)
Revision Links:
--------------
http://winmerge.svn.sourceforge.net/winmerge/?rev=7222&view=rev
Modified Paths:
--------------
branches/R2_14/Src/DiffList.h
branches/R2_14/Src/DiffWrapper.cpp
branches/R2_14/Src/DiffWrapper.h
Modified: branches/R2_14/Src/DiffList.h
===================================================================
--- branches/R2_14/Src/DiffList.h 2011-01-30 12:56:27 UTC (rev 7513)
+++ branches/R2_14/Src/DiffList.h 2011-01-30 13:21:00 UTC (rev 7514)
@@ -28,6 +28,19 @@
#include <vector>
/**
+ * @brief Operations in diffranges.
+ * DIFFRANGE structs op-member can have these values
+ */
+enum OP_TYPE
+{
+ OP_NONE = 0,
+ OP_LEFTONLY,
+ OP_DIFF,
+ OP_RIGHTONLY,
+ OP_TRIVIAL
+};
+
+/**
* @brief One difference defined by linenumbers.
*
* This struct defines one set of different lines "diff".
@@ -50,7 +63,7 @@
UINT dend1; /**< Synchronised (ghost lines added) last diff line in file2 */
int blank0; /**< Number of blank lines in file1 */
int blank1; /**< Number of blank lines in file2 */
- BYTE op; /**< Operation done with this diff */
+ OP_TYPE op; /**< Operation done with this diff */
DIFFRANGE() { memset(this, 0, sizeof(*this)); }
void swap_sides();
};
@@ -106,19 +119,6 @@
};
/**
- * @brief Operations in diffranges.
- * DIFFRANGE structs op-member can have these values
- */
-enum
-{
- OP_NONE = 0,
- OP_LEFTONLY,
- OP_DIFF,
- OP_RIGHTONLY,
- OP_TRIVIAL
-};
-
-/**
* @brief Class for storing differences in files (difflist).
*
* This class stores diffs in list and also offers diff-related
Modified: branches/R2_14/Src/DiffWrapper.cpp
===================================================================
--- branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 12:56:27 UTC (rev 7513)
+++ branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 13:21:00 UTC (rev 7514)
@@ -68,12 +68,12 @@
const char * EndOfComment, const char * InLineComment,
const FilterCommentsSet& filtercommentsset);
static bool PostFilter(int StartPos, int EndPos, int Direction,
- int QtyLinesInBlock, int &Op, int FileNo,
+ int QtyLinesInBlock, OP_TYPE &Op, int FileNo,
const FilterCommentsSet& filtercommentsset);
-static void PostFilterSingleLine(const char* LineStr, int &Op,
+static void PostFilterSingleLine(const char* LineStr, OP_TYPE &Op,
const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck);
static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
- int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
+ int QtyLinesRight, OP_TYPE &Op, const FilterCommentsManager &filtercommentsmanager,
const TCHAR *FileNameExt);
@@ -336,7 +336,7 @@
In forward direction, returns false if none trivial data is found within QtyLinesInBlock
*/
static bool PostFilter(int StartPos, int EndPos, int Direction,
- int QtyLinesInBlock, int &Op, int FileNo,
+ int QtyLinesInBlock, OP_TYPE &Op, int FileNo,
const FilterCommentsSet& filtercommentsset)
{
const char* EolIndicators = "\r\n"; //List of characters used as EOL
@@ -461,7 +461,7 @@
@param [in] filtercommentsset - Comment marker set used to indicate comment blocks.
@param [in] PartOfMultiLineCheck- Set to true, if this block is a multiple line block
*/
-static void PostFilterSingleLine(const char* LineStr, int &Op,
+static void PostFilterSingleLine(const char* LineStr, OP_TYPE &Op,
const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck)
{
if (Op == OP_TRIVIAL)
@@ -504,7 +504,7 @@
@param [in] FileNameExt - The file name extension. Needs to be lower case string ("cpp", "java", "c")
*/
static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
- int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
+ int QtyLinesRight, OP_TYPE &Op, const FilterCommentsManager &filtercommentsmanager,
const TCHAR *FileNameExt)
{
if (Op == OP_TRIVIAL)
@@ -531,7 +531,7 @@
bool AllLinesAreComments = true;
for(int i = LineNumberLeft;i < LineNumberLeft + QtyLinesLeft;++i)
{
- int TestOp = 0;
+ OP_TYPE TestOp = OP_NONE;
PostFilterSingleLine(files[0].linbuf[i], TestOp, filtercommentsset, QtyLinesLeft > 1);
if (TestOp != OP_TRIVIAL)
{
@@ -556,7 +556,7 @@
bool AllLinesAreComments = true;
for(int i = LineNumberRight;i < LineNumberRight + QtyLinesRight;++i)
{
- int TestOp = 0;
+ OP_TYPE TestOp = OP_NONE;
PostFilterSingleLine(files[1].linbuf[i], TestOp, filtercommentsset, QtyLinesRight > 1);
if (TestOp != OP_TRIVIAL)
{
@@ -571,11 +571,11 @@
}
else
{
- int LeftOp = 0;
+ OP_TYPE LeftOp = OP_NONE;
if (PostFilter(LineNumberLeft, files[0].valid_lines, 1, QtyLinesLeft, LeftOp, 0, filtercommentsset))
PostFilter(LineNumberLeft, -1, -1, QtyLinesLeft, LeftOp, 0, filtercommentsset);
- int RightOp = 0;
+ OP_TYPE RightOp = OP_NONE;
if (PostFilter(LineNumberRight, files[1].valid_lines, 1, QtyLinesRight, RightOp, 1, filtercommentsset))
PostFilter(LineNumberRight, -1, -1, QtyLinesRight, RightOp, 1, filtercommentsset);
@@ -841,7 +841,7 @@
/**
* @brief Add diff to external diff-list
*/
-void CDiffWrapper::AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op)
+void CDiffWrapper::AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, OP_TYPE op)
{
TRY {
DIFFRANGE dr;
@@ -1119,7 +1119,7 @@
/* Determine range of line numbers involved in each file. */
int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;
analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
- int op=0;
+ OP_TYPE op = OP_NONE;
if (deletes || inserts || thisob->trivial)
{
if (deletes && inserts)
@@ -1185,7 +1185,7 @@
op = OP_TRIVIAL;
}
- AddDiffRange(trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, (BYTE)op);
+ AddDiffRange(trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);
TRACE(_T("left=%d,%d right=%d,%d op=%d\n"),
trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);
}
Modified: branches/R2_14/Src/DiffWrapper.h
===================================================================
--- branches/R2_14/Src/DiffWrapper.h 2011-01-30 12:56:27 UTC (rev 7513)
+++ branches/R2_14/Src/DiffWrapper.h 2011-01-30 13:21:00 UTC (rev 7514)
@@ -41,6 +41,7 @@
struct FilterCommentsSet;
class MovedLines;
class FilterList;
+enum OP_TYPE;
/** @enum COMPARE_TYPE
* @brief Different foldercompare methods.
@@ -163,7 +164,7 @@
void SetCodepage(int codepage) { m_codepage = codepage; }
BOOL RunFileDiff();
void GetDiffStatus(DIFFSTATUS *status);
- void AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op);
+ void AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, OP_TYPE op);
void FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left);
MovedLines * GetMovedLines() { return m_pMovedLines; }
void SetCompareFiles(const String &OriginalFile1, const String &OriginalFile2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-01-30 12:56:34
|
Revision: 7513
http://winmerge.svn.sourceforge.net/winmerge/?rev=7513&view=rev
Author: jtuc
Date: 2011-01-30 12:56:27 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
BUG: [ 2982964 ] Wrong time stamp even in latest revision (NOT old bug)
Modified Paths:
--------------
branches/R2_14/Src/DiffFileData.cpp
branches/R2_14/Src/DiffWrapper.cpp
branches/R2_14/Src/diffutils/src/DIFF.H
Modified: branches/R2_14/Src/DiffFileData.cpp
===================================================================
--- branches/R2_14/Src/DiffFileData.cpp 2011-01-30 12:27:27 UTC (rev 7512)
+++ branches/R2_14/Src/DiffFileData.cpp 2011-01-30 12:56:27 UTC (rev 7513)
@@ -102,7 +102,7 @@
return false;
// Get file stats (diffutils uses these)
- if (fstat(m_inf[i].desc, &m_inf[i].stat) != 0)
+ if (_fstat(m_inf[i].desc, &m_inf[i].stat) != 0)
{
return false;
}
Modified: branches/R2_14/Src/DiffWrapper.cpp
===================================================================
--- branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 12:27:27 UTC (rev 7512)
+++ branches/R2_14/Src/DiffWrapper.cpp 2011-01-30 12:56:27 UTC (rev 7513)
@@ -1221,18 +1221,19 @@
inf_patch[0].name = ansiconvert_SystemCP(path1.c_str());
inf_patch[1].name = ansiconvert_SystemCP(path2.c_str());
- // Fix timestamps for generated patch files
- // If there are translations needed (e.g. when comparing UTF-16 files)
- // then the stats in 'inf' are read from temp files. If the original
- // file's and read timestamps differ, use original file's timestamps.
- // See also sf.net bug item #2791506.
- struct __stat64 st;
- _tstat64(path1.c_str(), &st);
- if (st.st_mtime != inf_patch[0].stat.st_mtime)
- inf_patch[0].stat.st_mtime = st.st_mtime;
- _tstat64(path2.c_str(), &st);
- if (st.st_mtime != inf_patch[1].stat.st_mtime)
- inf_patch[1].stat.st_mtime = st.st_mtime;
+ // If paths in m_s1File and m_s2File point to original files, then we can use
+ // them to fix potentially meaningless stats from potentially temporary files,
+ // resulting from whatever transforms may have taken place.
+ // If not, then we can't help it, and hence ASSERT that this won't happen.
+ if (!m_bPathsAreTemp)
+ {
+ _tstat(m_s1File.c_str(), &inf_patch[0].stat);
+ _tstat(m_s2File.c_str(), &inf_patch[1].stat);
+ }
+ else
+ {
+ ASSERT(FALSE);
+ }
outfile = NULL;
if (!m_sPatchFile.IsEmpty())
Modified: branches/R2_14/Src/diffutils/src/DIFF.H
===================================================================
--- branches/R2_14/Src/diffutils/src/DIFF.H 2011-01-30 12:27:27 UTC (rev 7512)
+++ branches/R2_14/Src/diffutils/src/DIFF.H 2011-01-30 12:56:27 UTC (rev 7513)
@@ -227,7 +227,7 @@
struct file_data {
int desc; /* File descriptor */
char const *name; /* File name */
- struct stat stat; /* File status from fstat() */
+ struct _stat stat; /* File status from fstat() */
int dir_p; /* nonzero if file is a directory */
/* Buffer in which text of file is read. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-01-30 12:27:33
|
Revision: 7512
http://winmerge.svn.sourceforge.net/winmerge/?rev=7512&view=rev
Author: jtuc
Date: 2011-01-30 12:27:27 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
fix a warning
Modified Paths:
--------------
branches/R2_14/Src/diffutils/src/DIRENT.C
Modified: branches/R2_14/Src/diffutils/src/DIRENT.C
===================================================================
--- branches/R2_14/Src/diffutils/src/DIRENT.C 2011-01-30 11:56:57 UTC (rev 7511)
+++ branches/R2_14/Src/diffutils/src/DIRENT.C 2011-01-30 12:27:27 UTC (rev 7512)
@@ -324,7 +324,7 @@
if ( ff.ff_name[0] != '.' )
{
/* make a copy of the name */
- if ( (names[count] = strdup(ff.ff_name))
+ if ( (names[count] = _strdup(ff.ff_name))
== NULL )
{
/* free all if error (out of mem) */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-01-30 11:57:03
|
Revision: 7511
http://winmerge.svn.sourceforge.net/winmerge/?rev=7511&view=rev
Author: jtuc
Date: 2011-01-30 11:56:57 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
Respect diffutils code formatting
Modified Paths:
--------------
trunk/Src/diffutils/src/IO.C
Modified: trunk/Src/diffutils/src/IO.C
===================================================================
--- trunk/Src/diffutils/src/IO.C 2011-01-30 11:32:55 UTC (rev 7510)
+++ trunk/Src/diffutils/src/IO.C 2011-01-30 11:56:57 UTC (rev 7511)
@@ -42,12 +42,12 @@
/** @brief Known Unicode encodings. */
enum UNICODESET
{
- NONE = 0, /**< No unicode. */
- UCS2LE, /**< UCS-2 / UTF-16 little endian. */
- UCS2BE, /**< UCS-2 / UTF-16 big endian. */
- UTF8, /**< UTF-8. */
- UCS4LE, /**< UTF-32 little endian */
- UCS4BE, /**< UTF-32 big-endian */
+ NONE = 0, /**< No unicode. */
+ UCS2LE, /**< UCS-2 / UTF-16 little endian. */
+ UCS2BE, /**< UCS-2 / UTF-16 big endian. */
+ UTF8, /**< UTF-8. */
+ UCS4LE, /**< UTF-32 little endian */
+ UCS4BE, /**< UTF-32 big-endian */
};
/* Lines are put into equivalence classes (of lines that match in line_cmp).
@@ -100,19 +100,19 @@
memcpy(&sig, current->buffer, min(current->buffered_chars, 4));
// check for the two possible 4 bytes signatures
if (sig == 0x0000FEFF)
- return UCS4LE;
+ return UCS4LE;
if (sig == 0xFFFE0000)
- return UCS4BE;
+ return UCS4BE;
// check for the only possible 3 bytes signature
sig &= 0xFFFFFF;
if (sig == 0xBFBBEF)
- return UTF8;
+ return UTF8;
// check for the two possible 2 bytes signatures
sig &= 0xFFFF;
if (sig == 0xFEFF)
- return UCS2LE;
+ return UCS2LE;
if (sig == 0xFFFE)
- return UCS2BE;
+ return UCS2BE;
// none of the above checks has passed, so probably no unicode
return NONE;
}
@@ -181,37 +181,37 @@
;
else if (always_text_flag || current->buffered_chars != 0)
{
- enum UNICODESET sig = get_unicode_signature(current);
- size_t alloc_extra
- = (1 << sig) & ((1 << UCS2LE) | (1 << UCS2BE) | (1 << UCS4LE) | (1 << UCS4BE))
- // some flavor of non octet encoded unicode?
- ? ~0U // yes, allocate extra room for transcoding
- : 0U; // no, allocate no extra room for transcoding
+ enum UNICODESET sig = get_unicode_signature(current);
+ size_t alloc_extra
+ = (1 << sig) & ((1 << UCS2LE) | (1 << UCS2BE) | (1 << UCS4LE) | (1 << UCS4BE))
+ // some flavor of non octet encoded unicode?
+ ? ~0U // yes, allocate extra room for transcoding
+ : 0U; // no, allocate no extra room for transcoding
for (;;)
{
if (current->buffered_chars == current->bufsize)
{
- if (S_ISREG (current->stat.st_mode))
- {
- /* Get the size out of the stat block.
- Allocate 50% extra room for a necessary transcoding to UTF-8.
- Allocate enough room for appended newline and sentinel.
- Allocate at least one block, to prevent overrunning the buffer
- when comparing growing binary files. */
- current->bufsize = max (current->bufsize,
- current->stat.st_size + (alloc_extra & current->stat.st_size / 2) + sizeof (word) + 1);
- }
- else
- {
+ if (S_ISREG (current->stat.st_mode))
+ {
+ /* Get the size out of the stat block.
+ Allocate 50% extra room for a necessary transcoding to UTF-8.
+ Allocate enough room for appended newline and sentinel.
+ Allocate at least one block, to prevent overrunning the buffer
+ when comparing growing binary files. */
+ current->bufsize = max (current->bufsize,
+ current->stat.st_size + (alloc_extra & current->stat.st_size / 2) + sizeof (word) + 1);
+ }
+ else
+ {
#ifdef __MSDOS__
- current->bufsize += 4096;
+ current->bufsize += 4096;
#else
current->bufsize = current->bufsize * 2;
#endif /*__MSDOS__*/
- }
+ }
#ifdef __MSDOS__
- current->buffer = (char HUGE *) farrealloc (current->buffer, current->bufsize);
+ current->buffer = (char HUGE *) farrealloc (current->buffer, current->bufsize);
#else
current->buffer = xrealloc (current->buffer, current->bufsize);
#endif /*__MSDOS__*/
@@ -226,7 +226,7 @@
current->buffered_chars += cc;
}
#ifndef __MSDOS__
- /* Allocate 50% extra room for a necessary transcoding to UTF-8.
+ /* Allocate 50% extra room for a necessary transcoding to UTF-8.
Allocate enough room for appended newline and sentinel. */
current->bufsize = current->buffered_chars + (alloc_extra & current->buffered_chars / 2) + sizeof (word) + 1;
current->buffer = xrealloc (current->buffer, current->bufsize);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2011-01-30 11:33:02
|
Revision: 7510
http://winmerge.svn.sourceforge.net/winmerge/?rev=7510&view=rev
Author: jtuc
Date: 2011-01-30 11:32:55 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
PATCH: [ 3012200 ] Defer unicode conversion to diffutils
Modified Paths:
--------------
branches/R2_14/Src/diffutils/src/IO.C
Modified: branches/R2_14/Src/diffutils/src/IO.C
===================================================================
--- branches/R2_14/Src/diffutils/src/IO.C 2011-01-28 20:32:11 UTC (rev 7509)
+++ branches/R2_14/Src/diffutils/src/IO.C 2011-01-30 11:32:55 UTC (rev 7510)
@@ -38,7 +38,18 @@
/* Type used for fast prefix comparison in find_identical_ends. */
typedef unsigned word;
-
+
+/** @brief Known Unicode encodings. */
+enum UNICODESET
+{
+ NONE = 0, /**< No unicode. */
+ UCS2LE, /**< UCS-2 / UTF-16 little endian. */
+ UCS2BE, /**< UCS-2 / UTF-16 big endian. */
+ UTF8, /**< UTF-8. */
+ UCS4LE, /**< UTF-32 little endian */
+ UCS4BE, /**< UTF-32 big-endian */
+};
+
/* Lines are put into equivalence classes (of lines that match in line_cmp).
Each equivalence class is represented by one of these structures,
but only while the classes are being computed.
@@ -70,8 +81,9 @@
static void find_and_hash_each_line PARAMS((struct file_data *));
static void find_identical_ends PARAMS((struct file_data[]));
-static void prepare_text_end PARAMS((struct file_data *));
-
+static char *prepare_text_end PARAMS((struct file_data *));
+static enum UNICODESET get_unicode_signature(struct file_data *);
+
/* Check for binary files and compare them for exact identity. */
/* Return 1 if BUF contains a non text character.
@@ -79,6 +91,32 @@
#define binary_file_p(buf, size) (size != 0 && memchr (buf, '\0', size) != 0)
+/** @brief Get unicode signature from file_data. */
+static enum UNICODESET get_unicode_signature(struct file_data *current)
+{
+ // initialize to a pattern that differs everywhere from all possible unicode signatures
+ unsigned long sig = 0x3F3F3F3F;
+ // copy at most 4 bytes from buffer
+ memcpy(&sig, current->buffer, min(current->buffered_chars, 4));
+ // check for the two possible 4 bytes signatures
+ if (sig == 0x0000FEFF)
+ return UCS4LE;
+ if (sig == 0xFFFE0000)
+ return UCS4BE;
+ // check for the only possible 3 bytes signature
+ sig &= 0xFFFFFF;
+ if (sig == 0xBFBBEF)
+ return UTF8;
+ // check for the two possible 2 bytes signatures
+ sig &= 0xFFFF;
+ if (sig == 0xFEFF)
+ return UCS2LE;
+ if (sig == 0xFFFE)
+ return UCS2BE;
+ // none of the above checks has passed, so probably no unicode
+ return NONE;
+}
+
/* Get ready to read the current file.
Return nonzero if SKIP_TEST is zero,
and if it appears to be a binary file. */
@@ -101,15 +139,6 @@
{
current->bufsize = current->buffered_chars
= STAT_BLOCKSIZE (current->stat);
-
- if (S_ISREG (current->stat.st_mode))
- /* Get the size out of the stat block.
- Allocate enough room for appended newline and sentinel.
- Allocate at least one block, to prevent overrunning the buffer
- when comparing growing binary files. */
- current->bufsize = max (current->bufsize,
- current->stat.st_size + sizeof (word) + 1);
-
#ifdef __MSDOS__
if ((current->buffer = (char HUGE *) farmalloc (current->bufsize)) == NULL)
fatal ("far memory exhausted");
@@ -150,52 +179,40 @@
if (current->desc < 0)
/* The file is nonexistent. */
;
- else if (S_ISREG (current->stat.st_mode))
+ else if (always_text_flag || current->buffered_chars != 0)
{
- /* It's a regular file; slurp in the rest all at once. */
-#ifdef __MSDOS__
- /* read inside of segment boundaries */
- while ((current->stat.st_size - current->buffered_chars) > 0)
- {
- unsigned nr;
- char HUGE *rp;
+ enum UNICODESET sig = get_unicode_signature(current);
+ size_t alloc_extra
+ = (1 << sig) & ((1 << UCS2LE) | (1 << UCS2BE) | (1 << UCS4LE) | (1 << UCS4BE))
+ // some flavor of non octet encoded unicode?
+ ? ~0U // yes, allocate extra room for transcoding
+ : 0U; // no, allocate no extra room for transcoding
- rp = current->buffer + current->buffered_chars;
- nr = 0 - (unsigned)((long)rp & 0x0000FFFF);
- if (nr == 0)
- nr = 0xFFF0;
- nr = read (current->desc, rp, nr);
- if (nr == 0)
- break;
- if (nr == 0xFFFF)
- pfatal_with_name (current->name);
- current->buffered_chars += nr ;
- }
-#else
- cc = current->stat.st_size - current->buffered_chars;
- if (cc)
- {
- cc = read (current->desc,
- current->buffer + current->buffered_chars,
- cc);
- if (cc == -1)
- pfatal_with_name (current->name);
- current->buffered_chars += cc;
- }
-#endif /*__MSDOS__*/
- }
- /* It's not a regular file; read it, growing the buffer as needed. */
- else if (always_text_flag || current->buffered_chars != 0)
- {
for (;;)
{
if (current->buffered_chars == current->bufsize)
{
+ if (S_ISREG (current->stat.st_mode))
+ {
+ /* Get the size out of the stat block.
+ Allocate 50% extra room for a necessary transcoding to UTF-8.
+ Allocate enough room for appended newline and sentinel.
+ Allocate at least one block, to prevent overrunning the buffer
+ when comparing growing binary files. */
+ current->bufsize = max (current->bufsize,
+ current->stat.st_size + (alloc_extra & current->stat.st_size / 2) + sizeof (word) + 1);
+ }
+ else
+ {
#ifdef __MSDOS__
- current->bufsize += 4096;
+ current->bufsize += 4096;
+#else
+ current->bufsize = current->bufsize * 2;
+#endif /*__MSDOS__*/
+ }
+#ifdef __MSDOS__
current->buffer = (char HUGE *) farrealloc (current->buffer, current->bufsize);
#else
- current->bufsize = current->bufsize * 2;
current->buffer = xrealloc (current->buffer, current->bufsize);
#endif /*__MSDOS__*/
}
@@ -209,8 +226,9 @@
current->buffered_chars += cc;
}
#ifndef __MSDOS__
- /* Allocate just enough room for appended newline and sentinel. */
- current->bufsize = current->buffered_chars + sizeof (word) + 1;
+ /* Allocate 50% extra room for a necessary transcoding to UTF-8.
+ Allocate enough room for appended newline and sentinel. */
+ current->bufsize = current->buffered_chars + (alloc_extra & current->buffered_chars / 2) + sizeof (word) + 1;
current->buffer = xrealloc (current->buffer, current->bufsize);
#endif /*!__MSDOS__*/
}
@@ -503,32 +521,207 @@
equivs_alloc = eqs_alloc;
equivs_index = eqs_index;
}
-
-/* Prepare the end of the text. Make sure it's initialized.
+
+/* Convert any non octet encoded unicode text to UTF-8.
+ Prepare the end of the text. Make sure it's initialized.
Make sure text ends in a newline,
- but remember that we had to add one unless -B is in effect. */
+ but remember that we had to add one unless -B is in effect.
+ Return effective start of text to be compared. */
-static void
+static char *
prepare_text_end (current)
struct file_data *current;
{
FSIZE buffered_chars = current->buffered_chars;
- char HUGE *p = current->buffer;
+ char *const p = current->buffer;
+ char *r = p; // receives the return value
+ enum UNICODESET sig = get_unicode_signature(current);
+
+ if (sig == UCS4LE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned long *q = (unsigned long *)p + buffered_words / 2;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned long *)p) // exclude the BOM
+ {
+ unsigned long u = *q;
+ if (u >= 0x80000000)
+ {
+ *--r = '?';
+ }
+ else if (u >= 0x4000000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0x80 + ((u >> 24) & 0x3F);
+ *--r = 0xFC + (u >> 30);
+ }
+ else if (u >= 0x200000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0xF8 + (u >> 24);
+ }
+ else if (u >= 0x10000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0xF0 + (char)(u >> 18);
+ }
+ else if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (char)(u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (char)(u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UCS4BE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned long *q = (unsigned long *)p + buffered_words / 2;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned long *)p) // exclude the BOM
+ {
+ unsigned long u =
+ ((*q & 0x000000FF) << 24) |
+ ((*q & 0x0000FF00) << 8) |
+ ((*q & 0x00FF0000) >> 8) |
+ ((*q & 0xFF000000) >> 24); // fix byte order
+ if (u >= 0x80000000)
+ {
+ *--r = '?';
+ }
+ else if (u >= 0x4000000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0x80 + ((u >> 24) & 0x3F);
+ *--r = 0xFC + (u >> 30);
+ }
+ else if (u >= 0x200000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0xF8 + (u >> 24);
+ }
+ else if (u >= 0x10000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0xF0 + (char)(u >> 18);
+ }
+ else if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (char)(u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (char)(u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UCS2LE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned short *q = (unsigned short *)p + buffered_words;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned short *)p) // exclude the BOM
+ {
+ unsigned short u = *q;
+ if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UCS2BE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned short *q = (unsigned short *)p + buffered_words;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned short *)p) // exclude the BOM
+ {
+ unsigned short u = (*q << 8) | (*q >> 8); // fix byte order
+ if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UTF8)
+ {
+ r = p + 3; // skip the BOM
+ }
+
if (buffered_chars == 0 || p[buffered_chars - 1] == '\n' || p[buffered_chars - 1] == '\r')
current->missing_newline = 0;
else
{
p[buffered_chars++] = '\n';
- current->buffered_chars = buffered_chars;
- current->missing_newline = p[buffered_chars-2] != '\r' && ! ignore_blank_lines_flag;
+ current->missing_newline = 1;
}
+ current->buffered_chars = buffered_chars;
/* Don't use uninitialized storage when planting or using sentinels. */
if (p)
bzero (p + buffered_chars, sizeof (word));
+ return r;
}
-
+
/* Given a vector of two file_data objects, find the identical
prefixes and suffixes of each object. */
@@ -548,24 +741,27 @@
int ttt;
slurp (&filevec[0]);
+ buffer0 = prepare_text_end (&filevec[0]);
if (filevec[0].desc != filevec[1].desc)
- slurp (&filevec[1]);
+ {
+ slurp (&filevec[1]);
+ buffer1 = prepare_text_end (&filevec[1]);
+ }
else
{
filevec[1].buffer = filevec[0].buffer;
filevec[1].bufsize = filevec[0].bufsize;
filevec[1].buffered_chars = filevec[0].buffered_chars;
+ buffer1 = buffer0;
}
- for (i = 0; i < 2; i++)
- prepare_text_end (&filevec[i]);
/* Find identical prefix. */
- p0 = buffer0 = filevec[0].buffer;
- p1 = buffer1 = filevec[1].buffer;
+ p0 = buffer0;
+ p1 = buffer1;
- n0 = filevec[0].buffered_chars;
- n1 = filevec[1].buffered_chars;
+ n0 = filevec[0].buffered_chars - (buffer0 - filevec[0].buffer);
+ n1 = filevec[1].buffered_chars - (buffer1 - filevec[1].buffer);
if (p0 == p1)
/* The buffers are the same; sentinels won't work. */
@@ -763,7 +959,7 @@
filevec[1].alloc_lines = alloc_lines1 - buffered_prefix;
filevec[0].prefix_lines = filevec[1].prefix_lines = lines;
}
-
+
/* Largest primes less than some power of two, for nbuckets. Values range
from useful to preposterous. If one of these numbers isn't prime
after all, don't blame it on me, blame it on primes (6) . . . */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-28 20:32:20
|
Revision: 7509
http://winmerge.svn.sourceforge.net/winmerge/?rev=7509&view=rev
Author: gerundt
Date: 2011-01-28 20:32:11 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
PATCH: [ 3164982 ] Hungarian language file
Submitted by Mihalicza J?\195?\179zsef
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Docs/Users/Contributors.txt
branches/R2_14/Src/Languages/Hungarian.po
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2011-01-28 20:12:55 UTC (rev 7508)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2011-01-28 20:32:11 UTC (rev 7509)
@@ -28,6 +28,8 @@
Bugfix: Created new matching folder to wrong folder (#2890961)
Bugfix: Strange scrolling effect in location pane (#2942869)
Bugfix: Plugin error after interrupting folder compare (#2919475)
+ Translation updates:
+ - Hungarian (#3164982)
WinMerge 2.13.20 - 2010-10-20 (r7319)
Add missing keywords to Pascal highlighter (#2834192)
Modified: branches/R2_14/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_14/Docs/Users/Contributors.txt 2011-01-28 20:12:55 UTC (rev 7508)
+++ branches/R2_14/Docs/Users/Contributors.txt 2011-01-28 20:32:11 UTC (rev 7509)
@@ -75,6 +75,7 @@
* Hungarian:
M\xE1rton Bal\xE1zs <do...@us...>
+ Mihalicza J\xF3zsef <jmi...@gm...>
* Italian:
Andrea Decorte <dec...@ho...>
Modified: branches/R2_14/Src/Languages/Hungarian.po
===================================================================
--- branches/R2_14/Src/Languages/Hungarian.po 2011-01-28 20:12:55 UTC (rev 7508)
+++ branches/R2_14/Src/Languages/Hungarian.po 2011-01-28 20:32:11 UTC (rev 7509)
@@ -3,6 +3,7 @@
#
# Translators:
# * M\xE1rton Bal\xE1zs <documan at users.sourceforge.net>
+# * Mihalicza J\xF3zsef <jmihalicza at gmail.com>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -12,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2011-01-24 21:42+0100\n"
"Last-Translator: \n"
"Language-Team: Hungarian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -140,7 +141,7 @@
#: Merge.rc:316
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Konfliktus f\xE1jl megnyit\xE1sa..."
#: Merge.rc:116
#: Merge.rc:197
@@ -154,12 +155,12 @@
#: Merge.rc:319
#, c-format
msgid "Sa&ve Project..."
-msgstr ""
+msgstr "Projekt ment\xE9se..."
#: Merge.rc:119
#, c-format
msgid "Recent Projects"
-msgstr ""
+msgstr "Legut\xF3bbi projektek"
#: Merge.rc:121
#: Merge.rc:205
@@ -208,35 +209,35 @@
#: Merge.rc:413
#, c-format
msgid "&Toolbar"
-msgstr ""
+msgstr "Eszk\xF6zt\xE1r"
#: Merge.rc:134
#: Merge.rc:233
#: Merge.rc:415
#, c-format
msgid "&None"
-msgstr ""
+msgstr "&Nincs"
#: Merge.rc:135
#: Merge.rc:234
#: Merge.rc:416
#, c-format
msgid "&Small"
-msgstr ""
+msgstr "Kic&si"
#: Merge.rc:136
#: Merge.rc:235
#: Merge.rc:417
#, c-format
msgid "&Big"
-msgstr ""
+msgstr "Nagy"
#: Merge.rc:138
#: Merge.rc:237
#: Merge.rc:419
#, c-format
msgid "&Status Bar"
-msgstr "&\xC1lapotsor"
+msgstr "&\xC1llapotsor"
#: Merge.rc:139
#: Merge.rc:238
@@ -285,7 +286,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
#: Merge.rc:152
#: Merge.rc:273
@@ -388,7 +389,7 @@
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
-#: Merge.rc:1933
+#: Merge.rc:1935
#, c-format
msgid "&Help"
msgstr "&S\xFAg\xF3"
@@ -398,7 +399,7 @@
#: Merge.rc:486
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge S\xFAg\xF3\tF1"
#: Merge.rc:179
#: Merge.rc:300
@@ -412,7 +413,7 @@
#: Merge.rc:489
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "Ford\xED&t\xE1sok"
#: Merge.rc:181
#: Merge.rc:302
@@ -457,7 +458,7 @@
#: Merge.rc:203
#, c-format
msgid "File En&coding"
-msgstr ""
+msgstr "F\xE1jl k\xF3dol\xE1s"
#: Merge.rc:209
#: Merge.rc:363
@@ -468,32 +469,32 @@
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr ""
+msgstr "Egyez\xF5 elemek mutat\xE1sa"
#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
-msgstr ""
+msgstr "K\xFCl\xF6nb\xF6z\xF5 elemek mutat\xE1sa"
#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
-msgstr ""
+msgstr "Csak bal oldali elemek mutat\xE1sa"
#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr ""
+msgstr "Csak jobb oldali elemek mutat\xE1sa"
#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
-msgstr ""
+msgstr "Kihagyott elemek mutat\xE1sa"
#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
-msgstr ""
+msgstr "Bin\xE1ris f\xE1jlok mutat\xE1sa"
#: Merge.rc:222
#, c-format
@@ -503,22 +504,22 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "Fa &m\xF3d"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r kibont\xE1sa"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r bez\xE1r\xE1sa"
#: Merge.rc:239
#, c-format
msgid "Compa&re Statistics"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDt\xE1si statisztika"
#: Merge.rc:243
#: Merge.rc:426
@@ -529,7 +530,7 @@
#: Merge.rc:244
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "Kijel\xF6ltek friss\xEDt\xE9se\tCtrl+F5"
#: Merge.rc:246
#: Merge.rc:428
@@ -631,37 +632,37 @@
#: Merge.rc:333
#, c-format
msgid "&Print..."
-msgstr ""
+msgstr "Nyomtat\xE1s..."
#: Merge.rc:334
#, c-format
msgid "Page Se&tup"
-msgstr ""
+msgstr "Oldalbe\xE1ll\xEDt\xE1s"
#: Merge.rc:335
#, c-format
msgid "Print Previe&w"
-msgstr ""
+msgstr "Nyomtat\xE1si k\xE9p"
#: Merge.rc:340
#, c-format
msgid "&Convert Line Endings to"
-msgstr ""
+msgstr "Sorv\xE9gek \xE1talak\xEDt\xE1sa"
#: Merge.rc:342
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:343
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:344
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:347
#, c-format
@@ -671,7 +672,7 @@
#: Merge.rc:349
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "&F\xE1jl k\xF3dol\xE1s..."
#: Merge.rc:355
#, c-format
@@ -719,7 +720,7 @@
msgstr "&Szkriptek"
#: Merge.rc:370
-#: Merge.rc:2789
+#: Merge.rc:2791
#, c-format
msgid "< Empty >"
msgstr "< \xDCres >"
@@ -737,27 +738,27 @@
#: Merge.rc:378
#, c-format
msgid "&Bookmarks"
-msgstr ""
+msgstr "K\xF6nyvjelz\xF5k"
#: Merge.rc:380
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr ""
+msgstr "K\xF6nyvjelz\xF5 ki/be\tCtrl+F2"
#: Merge.rc:381
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr ""
+msgstr "K\xF6vetkez\xF5 k\xF6nyvjelz\xF5\tF2"
#: Merge.rc:382
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr ""
+msgstr "El\xF5z\xF5 k\xF6nyvjelz\xF5\tShift+F2"
#: Merge.rc:383
#, c-format
msgid "&Clear All Bookmarks"
-msgstr ""
+msgstr "\xD6sszes k\xF6nyvjelz\xF5 t\xF6rl\xE9se"
#: Merge.rc:385
#, c-format
@@ -767,17 +768,17 @@
#: Merge.rc:393
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "Nagy\xEDt\xE1s"
#: Merge.rc:395
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Nagy\xEDt\xE1s\tCtrl++"
#: Merge.rc:396
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Kicsiny\xEDt\xE9s\tCtrl+-"
#. Zoom to normal
#: Merge.rc:397
@@ -793,7 +794,7 @@
#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "Pane&lek r\xF6gz\xEDt\xE9se"
#: Merge.rc:405
#, c-format
@@ -808,22 +809,22 @@
#: Merge.rc:407
#, c-format
msgid "View Line &Numbers"
-msgstr ""
+msgstr "Sorsz\xE1mok megjelen\xEDt\xE9se"
#: Merge.rc:408
#, c-format
msgid "View &Margins"
-msgstr ""
+msgstr "Marg\xF3k megjelen\xEDt\xE9se"
#: Merge.rc:409
#, c-format
msgid "W&rap Lines"
-msgstr ""
+msgstr "Sort\xF6rdel\xE9s"
#: Merge.rc:411
#, c-format
msgid "Sw&ap Panes"
-msgstr ""
+msgstr "Panelek megcser\xE9l\xE9se"
#: Merge.rc:421
#, c-format
@@ -873,7 +874,7 @@
#: Merge.rc:505
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:510
#, c-format
@@ -916,15 +917,15 @@
msgstr "&T\xF6rl\xE9s"
#: Merge.rc:522
-#: Merge.rc:1135
-#: Merge.rc:1517
+#: Merge.rc:1137
+#: Merge.rc:1519
#, c-format
msgid "&Left"
msgstr "&Bal oldal"
#: Merge.rc:523
-#: Merge.rc:1137
-#: Merge.rc:1520
+#: Merge.rc:1139
+#: Merge.rc:1522
#, c-format
msgid "&Right"
msgstr "&Jobb oldal"
@@ -937,7 +938,7 @@
#: Merge.rc:526
#, c-format
msgid "Re&name"
-msgstr ""
+msgstr "\xC1t&nevez\xE9s"
#: Merge.rc:527
#, c-format
@@ -982,7 +983,7 @@
#: Merge.rc:550
#, c-format
msgid "&Zip"
-msgstr ""
+msgstr "&Zip"
#: Merge.rc:552
#, c-format
@@ -1054,1003 +1055,1003 @@
msgid "Moved Block for &Current Diff"
msgstr "A &jelenlegi Elt\xE9r\xE9s mozgatott blokkja"
-#: Merge.rc:662
+#: Merge.rc:664
#, c-format
msgid "About WinMerge"
msgstr "A WinMerge n\xE9vjegye"
-#: Merge.rc:668
+#: Merge.rc:670
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(Priv\xE1t build)"
-#: Merge.rc:669
+#: Merge.rc:671
#, c-format
msgid "All rights reserved."
msgstr "Minden jog fenntartva."
-#: Merge.rc:670
+#: Merge.rc:672
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "L\xE1togasd meg a WinMerge honlapj\xE1t!"
-#: Merge.rc:673
-#: Merge.rc:705
-#: Merge.rc:797
-#: Merge.rc:983
-#: Merge.rc:1054
-#: Merge.rc:1083
-#: Merge.rc:1093
-#: Merge.rc:1259
-#: Merge.rc:1323
-#: Merge.rc:1336
-#: Merge.rc:1428
-#: Merge.rc:1443
-#: Merge.rc:1665
+#: Merge.rc:675
+#: Merge.rc:707
+#: Merge.rc:799
+#: Merge.rc:985
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1095
+#: Merge.rc:1261
+#: Merge.rc:1325
+#: Merge.rc:1338
+#: Merge.rc:1430
+#: Merge.rc:1445
+#: Merge.rc:1667
#, c-format
msgid "OK"
msgstr "Vissza"
-#: Merge.rc:674
+#: Merge.rc:676
#, c-format
msgid "Contributors"
msgstr "K\xF6zrem\xFBk\xF6d\xF5k"
-#: Merge.rc:681
+#: Merge.rc:683
#, c-format
msgid "Select Files or Folders"
msgstr "V\xE1laszd ki a f\xE1jlokat vagy k\xF6nyvt\xE1rakat..."
-#: Merge.rc:684
-#: Merge.rc:1594
+#: Merge.rc:686
+#: Merge.rc:1596
#, c-format
msgid "&Left:"
msgstr "&Bal:"
-#: Merge.rc:688
-#: Merge.rc:749
-#: Merge.rc:997
-#: Merge.rc:1019
+#: Merge.rc:690
+#: Merge.rc:751
+#: Merge.rc:999
+#: Merge.rc:1021
#, c-format
msgid "&Browse..."
msgstr "&Tall\xF3z\xE1s..."
-#: Merge.rc:689
-#: Merge.rc:1598
+#: Merge.rc:691
+#: Merge.rc:1600
#, c-format
msgid "&Right:"
msgstr "&Jobb:"
-#: Merge.rc:693
-#: Merge.rc:1030
+#: Merge.rc:695
+#: Merge.rc:1032
#, c-format
msgid "Bro&wse..."
msgstr "T&all\xF3z\xE1s..."
-#: Merge.rc:694
-#: Merge.rc:1602
+#: Merge.rc:696
+#: Merge.rc:1604
#, c-format
msgid "&Filter:"
msgstr "&Sz\xFBr\xF5:"
-#: Merge.rc:697
-#: Merge.rc:1604
+#: Merge.rc:699
+#: Merge.rc:1606
#, c-format
msgid "Select..."
msgstr "Kiv\xE1laszt\xE1s..."
-#: Merge.rc:698
+#: Merge.rc:700
#, c-format
msgid "&Unpacker:"
msgstr "&Csomagol\xF3:"
-#: Merge.rc:701
+#: Merge.rc:703
#, c-format
msgid "&Select..."
msgstr "&Kiv\xE1laszt\xE1s..."
-#: Merge.rc:702
-#: Merge.rc:1605
+#: Merge.rc:704
+#: Merge.rc:1607
#, c-format
msgid "&Include Subfolders"
msgstr "&Alk\xF6nyvt\xE1rakkal egy\xFCtt"
-#: Merge.rc:704
+#: Merge.rc:706
#, c-format
msgid "Status:"
msgstr "\xC1llapot:"
-#: Merge.rc:706
-#: Merge.rc:736
-#: Merge.rc:798
-#: Merge.rc:828
-#: Merge.rc:860
-#: Merge.rc:870
-#: Merge.rc:1055
-#: Merge.rc:1084
-#: Merge.rc:1094
-#: Merge.rc:1145
-#: Merge.rc:1260
-#: Merge.rc:1337
-#: Merge.rc:1429
-#: Merge.rc:1444
-#: Merge.rc:1666
+#: Merge.rc:708
+#: Merge.rc:738
+#: Merge.rc:800
+#: Merge.rc:830
+#: Merge.rc:862
+#: Merge.rc:872
+#: Merge.rc:1057
+#: Merge.rc:1086
+#: Merge.rc:1096
+#: Merge.rc:1147
+#: Merge.rc:1262
+#: Merge.rc:1339
+#: Merge.rc:1431
+#: Merge.rc:1446
+#: Merge.rc:1668
#, c-format
msgid "Cancel"
msgstr "M\xE9gsem"
-#: Merge.rc:707
-#: Merge.rc:1338
+#: Merge.rc:709
+#: Merge.rc:1340
#, c-format
msgid "Help"
msgstr "S\xFAg\xF3"
-#: Merge.rc:708
+#: Merge.rc:710
#, c-format
msgid "Files or Folders to Compare"
msgstr "\xD6sszehasonl\xEDtand\xF3 f\xE1jlok vagy k\xF6nyvt\xE1rak"
-#: Merge.rc:715
+#: Merge.rc:717
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
-#: Merge.rc:720
+#: Merge.rc:722
#, c-format
msgid "Database:"
msgstr "Adatb\xE1zis:"
-#: Merge.rc:723
+#: Merge.rc:725
#, c-format
msgid "Project:"
msgstr "Projekt:"
-#: Merge.rc:726
+#: Merge.rc:728
#, c-format
msgid "User:"
msgstr "Felhaszn\xE1l\xF3:"
-#: Merge.rc:728
+#: Merge.rc:730
#, c-format
msgid "Password:"
msgstr "Jelsz\xF3:"
-#: Merge.rc:730
+#: Merge.rc:732
#, c-format
msgid "Link to Destination VSS project"
msgstr "Link a c\xE9l VSS projekthez"
-#: Merge.rc:732
-#: Merge.rc:875
+#: Merge.rc:734
+#: Merge.rc:877
#, c-format
msgid "Apply to all items"
msgstr "Alkalmaz\xE1s minden elemen"
-#: Merge.rc:734
+#: Merge.rc:736
#, c-format
msgid "Check Out"
msgstr "Ellen\xF5rz\xE9s"
-#: Merge.rc:735
-#: Merge.rc:871
+#: Merge.rc:737
+#: Merge.rc:873
#, c-format
msgid "Save As..."
msgstr "Ment\xE9s m\xE1sk\xE9nt..."
-#: Merge.rc:741
+#: Merge.rc:743
#, c-format
msgid "Versioning System"
msgstr "Verzi\xF3 Rendszer"
-#: Merge.rc:744
+#: Merge.rc:746
#, c-format
msgid "&Versioning System:"
msgstr "&Verzi\xF3 Rendszer:"
-#: Merge.rc:747
-#: Merge.rc:2065
+#: Merge.rc:749
+#: Merge.rc:2067
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "A &cleartool.exe el\xE9r\xE9si \xFAtvonala:"
-#: Merge.rc:754
-#: Merge.rc:1941
+#: Merge.rc:756
+#: Merge.rc:1943
#, c-format
msgid "General"
msgstr "\xC1ltal\xE1nos"
-#: Merge.rc:757
+#: Merge.rc:759
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Automatikus &ugr\xE1s az els\xF5 elt\xE9r\xE9sre"
-#: Merge.rc:760
+#: Merge.rc:762
#, c-format
msgid "&Disable Splash Screen"
msgstr "&Splash Screen letilt\xE1sa"
-#: Merge.rc:762
+#: Merge.rc:764
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Ablakok bez\xE1r\xE1sa az &ESC billenty\xFBvel"
-#: Merge.rc:764
+#: Merge.rc:766
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "Automatikus \xFAtvonalellen\xF5rz\xE9s a &Megnyit\xE1s ablakban"
-#: Merge.rc:767
+#: Merge.rc:769
#, c-format
msgid "All&ow only one instance to run"
msgstr "Csak &egy p\xE9ld\xE1ny fut\xE1s\xE1nak enged\xE9lyez\xE9se"
-#: Merge.rc:769
+#: Merge.rc:771
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "R\xE1&k\xE9rdez\xE9s t\xF6bb ablak bez\xE1r\xE1sakor"
-#: Merge.rc:771
+#: Merge.rc:773
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "F\xE1jl id\xF5k meg\xF5rz\xE9se \xF6sszehasonl\xEDt\xE1skor"
-#: Merge.rc:774
+#: Merge.rc:776
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\"V\xE1laszd ki a f\xE1jlokat vagy k\xF6nyvt\xE1rakat\" ablak indul\xE1skor"
-#: Merge.rc:776
+#: Merge.rc:778
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:779
+#: Merge.rc:781
#, c-format
msgid "Enable multiple compare windows for"
msgstr "T\xF6bbsz\xF6r\xF6s \xF6sszehasonl\xEDt\xF3 ablakok enged\xE9lyez\xE9se:"
-#: Merge.rc:781
-#: Merge.rc:1617
+#: Merge.rc:783
+#: Merge.rc:1619
#, c-format
msgid "&Folder compare"
msgstr "&Mappa \xF6sszehasonl\xEDt\xE1skor"
-#: Merge.rc:783
-#: Merge.rc:1619
+#: Merge.rc:785
+#: Merge.rc:1621
#, c-format
msgid "Fil&e compare"
msgstr "&F\xE1jl \xF6sszehasonl\xEDt\xE1skor"
-#: Merge.rc:785
+#: Merge.rc:787
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr ""
+msgstr "A WinMerge lehet\xF5v\xE9 teszi \xE1ltal\xE1nos \xFCzenetablakok elrejt\xE9s\xE9t. A Vissza\xE1ll\xEDt gombbal minden \xFCzenetablak \xFAjra l\xE1that\xF3v\xE1 tehet\xF5."
-#: Merge.rc:787
+#: Merge.rc:789
#, c-format
msgid "Reset"
msgstr "Vissza\xE1ll\xEDt"
-#: Merge.rc:794
+#: Merge.rc:796
#, c-format
msgid "Language"
msgstr "Nyelv"
-#: Merge.rc:801
+#: Merge.rc:803
#, c-format
msgid "Available languages:"
msgstr "V\xE1laszthat\xF3 nyelvek:"
-#: Merge.rc:807
+#: Merge.rc:809
#, c-format
msgid "Find"
msgstr "Keres\xE9s"
-#: Merge.rc:810
-#: Merge.rc:837
+#: Merge.rc:812
+#: Merge.rc:839
#, c-format
msgid "Fi&nd what:"
msgstr "&Sz\xF6veg:"
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:815
+#: Merge.rc:845
#, c-format
msgid "Match &whole word only"
msgstr "Csak &teljes szavak mutat\xE1sa"
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:817
+#: Merge.rc:847
#, c-format
msgid "Match &case"
msgstr "Kis-nagybet\xFB &\xE9rz\xE9kenys\xE9g"
-#: Merge.rc:817
-#: Merge.rc:847
+#: Merge.rc:819
+#: Merge.rc:849
#, c-format
msgid "Regular &expression"
msgstr "&Regul\xE1ris kifejez\xE9sek"
-#: Merge.rc:819
+#: Merge.rc:821
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:822
+#: Merge.rc:824
#, c-format
msgid "Direction"
msgstr "Ir\xE1ny"
-#: Merge.rc:823
+#: Merge.rc:825
#, c-format
msgid "&Up"
msgstr "&Fel"
-#: Merge.rc:825
+#: Merge.rc:827
#, c-format
msgid "&Down"
msgstr "&Le"
-#: Merge.rc:827
-#: Merge.rc:857
+#: Merge.rc:829
+#: Merge.rc:859
#, c-format
msgid "&Find Next"
msgstr "Kere&s\xE9s"
-#: Merge.rc:834
+#: Merge.rc:836
#, c-format
msgid "Replace"
msgstr "Csere"
-#: Merge.rc:840
+#: Merge.rc:842
#, c-format
msgid "Re&place with:"
msgstr "Cs&ere erre:"
-#: Merge.rc:849
+#: Merge.rc:851
#, c-format
msgid "&Don't wrap end of file"
msgstr "&\xC1lljon meg a f\xE1jl v\xE9g\xE9n\xE9l"
-#: Merge.rc:852
+#: Merge.rc:854
#, c-format
msgid "Replace in"
msgstr "A csere tartom\xE1nya"
-#: Merge.rc:853
+#: Merge.rc:855
#, c-format
msgid "&Selection"
msgstr "&Kijel\xF6l\xE9s"
-#: Merge.rc:855
+#: Merge.rc:857
#, c-format
msgid "Wh&ole file"
msgstr "Teljes &f\xE1jl"
-#: Merge.rc:858
+#: Merge.rc:860
#, c-format
msgid "&Replace"
msgstr "&Csere"
-#: Merge.rc:859
+#: Merge.rc:861
#, c-format
msgid "Replace &All"
msgstr "&Mindet"
-#: Merge.rc:866
-#: Merge.rc:2187
+#: Merge.rc:868
+#: Merge.rc:2189
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
-#: Merge.rc:869
+#: Merge.rc:871
#, c-format
msgid "CheckOut"
msgstr "Ellen\xF5riz"
-#: Merge.rc:874
-#: Merge.rc:1179
+#: Merge.rc:876
+#: Merge.rc:1181
#, c-format
msgid "Comments"
msgstr "Megjegyz\xE9sek"
-#: Merge.rc:877
+#: Merge.rc:879
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:883
+#: Merge.rc:885
#, c-format
msgid "Linefilters"
msgstr "Sorsz\xFBr\xF5k"
-#: Merge.rc:886
+#: Merge.rc:888
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:889
+#: Merge.rc:891
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Regul\xE1ris kifejez\xE9sek (soronk\xE9nt egy):"
-#: Merge.rc:896
+#: Merge.rc:898
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:897
+#: Merge.rc:899
#, c-format
msgid "New"
-msgstr ""
+msgstr "\xDAj"
-#: Merge.rc:898
+#: Merge.rc:900
#, c-format
msgid "Edit"
-msgstr ""
+msgstr "Szerkeszt\xE9s"
-#: Merge.rc:899
+#: Merge.rc:901
#, c-format
msgid "Remove"
-msgstr ""
+msgstr "Elt\xE1vol\xEDt\xE1s"
-#: Merge.rc:904
-#: Merge.rc:1944
+#: Merge.rc:906
+#: Merge.rc:1946
#, c-format
msgid "Colors"
msgstr "Sz\xEDnek"
-#: Merge.rc:907
+#: Merge.rc:909
#, c-format
msgid "Difference:"
msgstr "Elt\xE9r\xE9s:"
-#: Merge.rc:911
+#: Merge.rc:913
#, c-format
msgid "Selected Difference:"
msgstr "Kijel\xF6lt Elt\xE9r\xE9s:"
-#: Merge.rc:915
-#: Merge.rc:1569
+#: Merge.rc:917
+#: Merge.rc:1571
#, c-format
msgid "Background"
msgstr "H\xE1tt\xE9r"
-#: Merge.rc:916
+#: Merge.rc:918
#, c-format
msgid "Deleted"
msgstr "T\xF6r\xF6lt"
-#: Merge.rc:929
-#: Merge.rc:1364
-#: Merge.rc:1570
+#: Merge.rc:931
+#: Merge.rc:1366
+#: Merge.rc:1572
#, c-format
msgid "Text"
msgstr "Sz\xF6veg"
-#: Merge.rc:933
+#: Merge.rc:935
#, c-format
msgid "Ignored Difference:"
msgstr "Kihagyott Elt\xE9r\xE9s:"
-#: Merge.rc:943
+#: Merge.rc:945
#, c-format
msgid "Moved:"
msgstr "\xC1thelyezett:"
-#: Merge.rc:953
+#: Merge.rc:955
#, c-format
msgid "Selected Moved:"
msgstr "Kijel\xF6lt \xE1thelyezett:"
-#: Merge.rc:960
+#: Merge.rc:962
#, c-format
msgid "Word Difference:"
msgstr "Sz\xF3 elt\xE9r\xE9s:"
-#: Merge.rc:967
+#: Merge.rc:969
#, c-format
msgid "Selected Word Diff:"
msgstr "Kijel\xF6lt sz\xF3 elt\xE9r\xE9s:"
-#: Merge.rc:974
-#: Merge.rc:1053
-#: Merge.rc:1082
-#: Merge.rc:1182
-#: Merge.rc:1410
+#: Merge.rc:976
+#: Merge.rc:1055
+#: Merge.rc:1084
+#: Merge.rc:1184
+#: Merge.rc:1412
#, c-format
msgid "Defaults"
msgstr "Alap\xE9rt\xE9kek"
-#: Merge.rc:980
-#: Merge.rc:1352
-#: Merge.rc:1558
+#: Merge.rc:982
+#: Merge.rc:1354
+#: Merge.rc:1560
#, c-format
msgid "Dialog"
msgstr "K\xE9rd\xE9s"
-#: Merge.rc:990
-#: Merge.rc:1947
+#: Merge.rc:992
+#: Merge.rc:1949
#, c-format
msgid "System"
msgstr "Rendszer"
-#: Merge.rc:993
+#: Merge.rc:995
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "A t\xF6r\xF6lt f\xE1jlok a &Lomt\xE1rba ker\xFCljenek"
-#: Merge.rc:995
+#: Merge.rc:997
#, c-format
msgid "&External editor:"
msgstr "&Bels\xF5 szerkeszt\xF5:"
-#: Merge.rc:998
+#: Merge.rc:1000
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:1000
+#: Merge.rc:1002
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "Tall\xF3z..."
-#: Merge.rc:1001
+#: Merge.rc:1003
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "\xC1tmeneti f\xE1jlok k\xF6nyvt\xE1ra"
-#: Merge.rc:1002
+#: Merge.rc:1004
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "A rendszer temp k\xF6nyvt\xE1ra"
-#: Merge.rc:1004
+#: Merge.rc:1006
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "Egyedi k\xF6nyvt\xE1r:"
-#: Merge.rc:1007
-#: Merge.rc:1023
+#: Merge.rc:1009
+#: Merge.rc:1025
#, c-format
msgid "Br&owse..."
msgstr "T&all\xF3z\xE1s..."
-#: Merge.rc:1013
+#: Merge.rc:1015
#, c-format
msgid "Patch Generator"
msgstr "Patch Gener\xE1tor"
-#: Merge.rc:1016
+#: Merge.rc:1018
#, c-format
msgid "File&1:"
msgstr "F\xE1jl&1:"
-#: Merge.rc:1020
+#: Merge.rc:1022
#, c-format
msgid "File&2:"
msgstr "F\xE1jl&2:"
-#: Merge.rc:1024
+#: Merge.rc:1026
#, c-format
msgid "&Swap"
msgstr "&Megford\xEDt\xE1s"
-#: Merge.rc:1025
+#: Merge.rc:1027
#, c-format
msgid "&Append to existing file"
msgstr "&Hozz\xE1f\xFBz\xE9s a l\xE9tez\xF5 f\xE1jlhoz"
-#: Merge.rc:1027
+#: Merge.rc:1029
#, c-format
msgid "&Result:"
msgstr "&Eredm\xE9ny:"
-#: Merge.rc:1031
+#: Merge.rc:1033
#, c-format
msgid "&Format"
msgstr "&Form\xE1tum"
-#: Merge.rc:1032
+#: Merge.rc:1034
#, c-format
msgid "St&yle:"
msgstr "St&\xEDlus:"
-#: Merge.rc:1035
+#: Merge.rc:1037
#, c-format
msgid "&Context:"
msgstr "&K\xF6rnyezet:"
-#: Merge.rc:1038
+#: Merge.rc:1040
#, c-format
msgid "W&hitespaces"
msgstr "&Sz\xF3k\xF6z\xF6k"
-#: Merge.rc:1039
+#: Merge.rc:1041
#, c-format
msgid "Com&pare"
msgstr "&\xD6sszehasonl\xEDt"
-#: Merge.rc:1041
+#: Merge.rc:1043
#, c-format
msgid "I&gnore changes"
msgstr "&V\xE1ltoz\xE1sok kihagy\xE1sa"
-#: Merge.rc:1043
+#: Merge.rc:1045
#, c-format
msgid "Ig&nore all"
msgstr "Minden kihagy\xE1sa"
-#: Merge.rc:1045
+#: Merge.rc:1047
#, c-format
msgid "Ignor&e blank lines"
msgstr "\xDCres sorok kihagy\xE1sa"
-#: Merge.rc:1047
+#: Merge.rc:1049
#, c-format
msgid "Case sensi&tive"
msgstr "&Kis-nagybet\xFB \xE9rz\xE9kenys\xE9g"
-#: Merge.rc:1049
+#: Merge.rc:1051
#, c-format
msgid "Inclu&de command line"
msgstr "&Parancssor mell\xE9kel\xE9se"
-#: Merge.rc:1051
+#: Merge.rc:1053
#, c-format
msgid "Open to e&xternal editor"
msgstr "Megnyit\xE1s a &Bels\xF5 Szerkeszt\xF5vel"
-#: Merge.rc:1073
+#: Merge.rc:1075
#, c-format
msgid "Display Columns"
msgstr "Oszlopok mutat\xE1sa"
-#: Merge.rc:1079
+#: Merge.rc:1081
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "Mozgat\xE1s fel"
-#: Merge.rc:1080
+#: Merge.rc:1082
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "Mozgat\xE1s le"
-#: Merge.rc:1090
+#: Merge.rc:1092
#, c-format
msgid "Select Unpacker"
msgstr "Kicsomagol\xF3 kiv\xE1laszt\xE1sa"
-#: Merge.rc:1095
+#: Merge.rc:1097
#, c-format
msgid "File unpacker:"
msgstr "F\xE1jl kicsomagol\xF3:"
-#: Merge.rc:1098
+#: Merge.rc:1100
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Minden kicsomagol\xF3 mutat\xE1sa kiterjeszt\xE9st\xF5l f\xFCggetlen\xFCl"
-#: Merge.rc:1101
+#: Merge.rc:1103
#, c-format
msgid "Extensions list:"
msgstr "Kiterjeszt\xE9sek list\xE1ja:"
-#: Merge.rc:1102
+#: Merge.rc:1104
#, c-format
msgid "Description:"
msgstr "Le\xEDr\xE1s:"
-#: Merge.rc:1113
+#: Merge.rc:1115
#, c-format
msgid " Folder Compare Progress"
-msgstr ""
+msgstr " K\xF6nyvt\xE1r \xF6sszehasonl\xEDt\xE1s folyamata"
-#: Merge.rc:1116
-#: Merge.rc:1894
+#: Merge.rc:1118
+#: Merge.rc:1896
#, c-format
msgid "Stop"
msgstr "Le\xE1ll\xEDt\xE1s"
-#: Merge.rc:1121
+#: Merge.rc:1123
#, c-format
msgid "Comparing items..."
-msgstr ""
+msgstr "Elemek \xF6sszehasonl\xEDt\xE1sa..."
-#: Merge.rc:1122
+#: Merge.rc:1124
#, c-format
msgid "Items compared:"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDtott elemek:"
-#: Merge.rc:1123
+#: Merge.rc:1125
#, c-format
msgid "Items total:"
-msgstr ""
+msgstr "\xD6sszes elem:"
-#: Merge.rc:1129
+#: Merge.rc:1131
#, c-format
msgid "Go To"
msgstr "Ugr\xE1s"
-#: Merge.rc:1132
+#: Merge.rc:1134
#, c-format
msgid "G&oto:"
msgstr "U&gr\xE1s:"
-#: Merge.rc:1134
+#: Merge.rc:1136
#, c-format
msgid "File"
msgstr "F\xE1jl"
-#: Merge.rc:1139
+#: Merge.rc:1141
#, c-format
msgid "Goto what"
msgstr "Mire ugorjon:"
-#: Merge.rc:1140
+#: Merge.rc:1142
#, c-format
msgid "Li&ne"
msgstr "&Sorra"
-#: Merge.rc:1142
+#: Merge.rc:1144
#, c-format
msgid "&Difference"
msgstr "&Elt\xE9r\xE9sre"
-#: Merge.rc:1144
+#: Merge.rc:1146
#, c-format
msgid "&Go To"
msgstr "&Ugr\xE1s"
-#: Merge.rc:1150
-#: Merge.rc:1942
+#: Merge.rc:1152
+#: Merge.rc:1944
#, c-format
msgid "Compare"
msgstr "\xD6sszehasonl\xEDt\xE1s"
-#: Merge.rc:1153
+#: Merge.rc:1155
#, c-format
msgid "Whitespace"
msgstr "Sz\xF3k\xF6z\xF6k"
-#: Merge.rc:1154
+#: Merge.rc:1156
#, c-format
msgid "&Compare"
msgstr "&\xD6sszehasonl\xEDt\xE1s"
-#: Merge.rc:1156
+#: Merge.rc:1158
#, c-format
msgid "&Ignore change"
msgstr "&V\xE1ltoztat\xE1sok kihagy\xE1sa"
-#: Merge.rc:1158
+#: Merge.rc:1160
#, c-format
msgid "I&gnore all"
msgstr "&Minden kihagy\xE1sa"
-#: Merge.rc:1160
+#: Merge.rc:1162
#, c-format
msgid "Ignore blan&k lines"
msgstr "&\xDCres sorok kihagy\xE1sa"
-#: Merge.rc:1162
+#: Merge.rc:1164
#, c-format
msgid "Ignore &case"
msgstr "&Kis-nagybet\xFB k\xFCl\xF6nbs\xE9gek kihagy\xE1sa"
-#: Merge.rc:1164
+#: Merge.rc:1166
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Sorv\xE9g k\xFCl\xF6nbs\xE9gek figyelmen k\xEDv\xFCl hagy\xE1sa (Windows/Unix/Mac)"
-#: Merge.rc:1167
+#: Merge.rc:1169
#, c-format
msgid "E&nable moved block detection"
msgstr "Mozgatott &blokk \xE9szlel\xE9s bekapcsol\xE1sa"
-#: Merge.rc:1169
+#: Merge.rc:1171
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1171
+#: Merge.rc:1173
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
+msgstr "3 m\xE1sodperc alatti id\xF5k\xFCl\xF6nbs\xE9gek mell\xF5z\xE9se"
-#: Merge.rc:1174
+#: Merge.rc:1176
#, c-format
msgid "&File Compare method:"
-msgstr "&F\xE1jl \xF6sszehasonl\xEDt\xE1si m\xF3dszer:"
+msgstr ""
-#: Merge.rc:1177
+#: Merge.rc:1179
#, c-format
msgid "S&top after first difference"
msgstr "Meg\xE1ll\xE1s az &els\xF5 k\xFCl\xF6nbs\xE9gn\xE9l"
-#: Merge.rc:1180
+#: Merge.rc:1182
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1187
-#: Merge.rc:1943
+#: Merge.rc:1189
+#: Merge.rc:1945
#, c-format
msgid "Editor"
msgstr "Szerkeszt\xF5"
-#: Merge.rc:1190
+#: Merge.rc:1192
#, c-format
msgid "&Highlight syntax"
msgstr "&Szintaxis kiemel\xE9s"
-#: Merge.rc:1192
+#: Merge.rc:1194
#, c-format
msgid "&Automatic rescan"
msgstr "&Automatikus \xFAjraolvas\xE1s"
-#: Merge.rc:1194
+#: Merge.rc:1196
#, c-format
msgid "&Preserve original EOL chars"
msgstr "&Eredeti \xFAjsor-karakterek meg\xF5rz\xE9se"
-#: Merge.rc:1196
+#: Merge.rc:1198
#, c-format
msgid "Tabs"
msgstr "Tabul\xE1torok"
-#: Merge.rc:1197
+#: Merge.rc:1199
#, c-format
msgid "&Tab size:"
msgstr "Tab. &m\xE9rete:"
-#: Merge.rc:1200
+#: Merge.rc:1202
#, c-format
msgid "&Insert Tabs"
msgstr "&Tabul\xE1torok haszn\xE1lata"
-#: Merge.rc:1202
+#: Merge.rc:1204
#, c-format
msgid "Insert &Spaces"
msgstr "&Sz\xF3k\xF6z\xF6k haszn\xE1lata"
-#: Merge.rc:1204
+#: Merge.rc:1206
#, c-format
msgid "Line Difference Coloring"
msgstr "Sorok elt\xE9r\xE9s\xE9nek sz\xEDnez\xE9se"
-#: Merge.rc:1206
+#: Merge.rc:1208
#, c-format
msgid "View line differences"
msgstr "Sorok elt\xE9r\xE9s\xE9nek mutat\xE1sa"
-#: Merge.rc:1208
+#: Merge.rc:1210
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1210
+#: Merge.rc:1212
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1225
+#: Merge.rc:1227
#, c-format
msgid "Filefilters"
msgstr "F\xE1jlSz\xFBr\xF5k"
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1232
+#: Merge.rc:1234
#, c-format
msgid "Install..."
-msgstr ""
+msgstr "Telep\xEDt\xE9s..."
-#: Merge.rc:1233
+#: Merge.rc:1235
#, c-format
msgid "New..."
msgstr "\xDAj..."
-#: Merge.rc:1234
+#: Merge.rc:1236
#, c-format
msgid "Edit..."
msgstr "Szerkeszt..."
-#: Merge.rc:1235
+#: Merge.rc:1237
#, c-format
msgid "Delete..."
msgstr "T\xF6r\xF6l..."
-#: Merge.rc:1241
+#: Merge.rc:1243
#, c-format
msgid "Save modified files?"
msgstr "M\xF3dos\xEDtott f\xE1jlok ment\xE9se?"
-#: Merge.rc:1244
+#: Merge.rc:1246
#, c-format
msgid "Left side file"
msgstr "Bal oldali f\xE1jl"
-#: Merge.rc:1247
+#: Merge.rc:1249
#, c-format
msgid "&Save changes"
msgstr "&V\xE1ltoztat\xE1sok ment\xE9se"
-#: Merge.rc:1249
+#: Merge.rc:1251
#, c-format
msgid "&Discard changes"
msgstr "V\xE1ltoztat\xE1sok &elvet\xE9se"
-#: Merge.rc:1251
+#: Merge.rc:1253
#, c-format
msgid "Right side file"
msgstr "Jobb oldali f\xE1jl"
-#: Merge.rc:1254
+#: Merge.rc:1256
#, c-format
msgid "S&ave changes"
msgstr "V&\xE1ltoztat\xE1sok ment\xE9se"
-#: Merge.rc:1256
+#: Merge.rc:1258
#, c-format
msgid "Dis&card changes"
msgstr "V\xE1ltoztat\xE1sok e&lvet\xE9se"
-#: Merge.rc:1258
+#: Merge.rc:1260
#, c-format
msgid "Discard All"
-msgstr "Elvet mindent"
+msgstr ""
-#: Merge.rc:1265
-#: Merge.rc:1513
-#: Merge.rc:1949
+#: Merge.rc:1267
+#: Merge.rc:1515
+#: Merge.rc:1951
#, c-format
msgid "Codepage"
msgstr "K\xF3dlap"
-#: Merge.rc:1268
+#: Merge.rc:1270
#, c-format
msgid "Default Codepage"
msgstr "Alap\xE9rtelmezett k\xF3dlap"
-#: Merge.rc:1269
+#: Merge.rc:1271
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "V\xE1laszd ki az alap\xE9rtelmezett k\xF3dlapot a nem-Unicode f\xE1jlokhoz:"
-#: Merge.rc:1271
+#: Merge.rc:1273
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "K\xF3dlap inform\xE1ci\xF3 detekt\xE1l\xE1sa ezen f\xE1jlokn\xE1l: .html, .rc, .xml \nprogram \xFAjraind\xEDt\xE1s sz\xFCks\xE9ges"
-#: Merge.rc:1274
+#: Merge.rc:1276
#, c-format
msgid "System codepage"
msgstr "Rendszer k\xF3dlap"
-#: Merge.rc:1276
+#: Merge.rc:1278
#, c-format
msgid "According to WinMerge User Interface"
msgstr "A Winmerge felhaszn\xE1l\xF3i fel\xFClet\xE9hez igazodva"
-#: Merge.rc:1278
+#: Merge.rc:1280
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Egyedi k\xF3dlap:"
-#: Merge.rc:1286
+#: Merge.rc:1288
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Arch\xEDvum t\xE1mogat\xE1s letiltva"
-#: Merge.rc:1289
+#: Merge.rc:1291
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Nem ismerhet\xF5 fel a 7-Zip verzi\xF3ja (nincs telep\xEDtve?)"
-#: Merge.rc:1292
+#: Merge.rc:1294
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2059,12 +2060,12 @@
"Az Arch\xEDvum t\xE1mogat\xE1s a 7-Zip 3.11-es vagy \xFAjabb verzi\xF3j\xE1t ig\xE9nyli, melynek telep\xEDtve kell lennie a helyi g\xE9pen, vagy a\n"
"sz\xFCks\xE9ges komponenseknek megtal\xE1lhat\xF3aknak kell lenni\xFCk a program k\xF6nyvt\xE1r\xE1ban."
-#: Merge.rc:1294
+#: Merge.rc:1296
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Sz\xFCks\xE9ges tov\xE1bb\xE1 egy megfelel\xF5 fel\xFCleti b\xF5v\xEDtm\xE9ny (Merge7z*.dll) az \xFAtvonalban."
-#: Merge.rc:1296
+#: Merge.rc:1298
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2073,12 +2074,12 @@
"K\xE9rlek haszn\xE1ld a 7-Zip lentebb megjel\xF6lt verzi\xF3j\xE1t, am\xEDg a fel\xFCleti b\xF5v\xEDtm\xE9ny \xFAjabb\n"
"verzi\xF3ja meg nem jelenik."
-#: Merge.rc:1298
+#: Merge.rc:1300
#, c-format
msgid "Version"
msgstr "Verzi\xF3"
-#: Merge.rc:1300
+#: Merge.rc:1302
#, c-format
msgid ""
"Plugin required\n"
@@ -2087,587 +2088,587 @@
"Sz\xFCks\xE9ges b\xF5v\xEDtm\xE9ny\n"
"(dllbuild %04u)"
-#: Merge.rc:1302
+#: Merge.rc:1304
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "A 7-Zip javasolt verzi\xF3ja:"
-#: Merge.rc:1305
-#: Merge.rc:1308
+#: Merge.rc:1307
+#: Merge.rc:1310
#, c-format
msgid "present"
msgstr "megvan"
-#: Merge.rc:1306
+#: Merge.rc:1308
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1309
+#: Merge.rc:1311
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "A sz\xE1m\xEDt\xF3g\xE9pen telep\xEDtett 7-Zip szoftver:"
-#: Merge.rc:1311
-#: Merge.rc:1316
+#: Merge.rc:1313
+#: Merge.rc:1318
#, c-format
msgid "none"
msgstr "nincs"
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "missing"
msgstr "hi\xE1nyzik"
-#: Merge.rc:1314
+#: Merge.rc:1316
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "Az \xF6n\xE1ll\xF3 m\xFBk\xF6d\xE9shez sz\xFCks\xE9ges 7-Zip komponensek:"
-#: Merge.rc:1318
+#: Merge.rc:1320
#, c-format
msgid "outdated"
msgstr "lej\xE1rt"
-#: Merge.rc:1319
+#: Merge.rc:1321
#, c-format
msgid "Plugins on path:"
msgstr "El\xE9rhet\xF5 b\xF5v\xEDtm\xE9nyek:"
-#: Merge.rc:1320
+#: Merge.rc:1322
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "Ne jelenjen &meg \xFAjra ez az \xFCzenet.\n(A S\xFAg\xF3 men\xFCb\xF5l az \xFCzenet b\xE1rmikor \xFAjra bekapcsolhat\xF3.)"
-#: Merge.rc:1324
+#: Merge.rc:1326
#, c-format
msgid "Plugin Download"
msgstr "B\xF5v\xEDtm\xE9ny let\xF6lt\xE9se"
-#: Merge.rc:1333
+#: Merge.rc:1335
#, c-format
msgid "Options"
msgstr "Opci\xF3k"
-#: Merge.rc:1344
+#: Merge.rc:1346
#, c-format
msgid " Categories"
msgstr " Kateg\xF3ri\xE1k"
-#: Merge.rc:1346
+#: Merge.rc:1348
#, c-format
msgid "Import..."
-msgstr ""
+msgstr "Import\xE1l\xE1s..."
-#: Merge.rc:1347
+#: Merge.rc:1349
#, c-format
msgid "Export..."
-msgstr ""
+msgstr "Export\xE1l\xE1s..."
-#: Merge.rc:1355
+#: Merge.rc:1357
#, c-format
msgid "Keywords:"
msgstr "Kulcsszavak:"
-#: Merge.rc:1356
+#: Merge.rc:1358
#, c-format
msgid "Function names:"
msgstr "F\xFCggv\xE9ny nevek:"
-#: Merge.rc:1357
+#: Merge.rc:1359
#, c-format
msgid "Comments:"
msgstr "Megjegyz\xE9sek:"
-#: Merge.rc:1358
+#: Merge.rc:1360
#, c-format
msgid "Numbers:"
msgstr "Sz\xE1mok:"
-#: Merge.rc:1359
+#: Merge.rc:1361
#, c-format
msgid "Operators:"
msgstr "Oper\xE1torok:"
-#: Merge.rc:1360
+#: Merge.rc:1362
#, c-format
msgid "Strings:"
msgstr "Sztringek:"
-#: Merge.rc:1361
+#: Merge.rc:1363
#, c-format
msgid "Preprocessor:"
msgstr "El\xF5feldolgoz\xF3:"
-#: Merge.rc:1362
+#: Merge.rc:1364
#, c-format
msgid "User 1:"
msgstr "Felhaszn\xE1l\xF3 1:"
-#: Merge.rc:1363
+#: Merge.rc:1365
#, c-format
msgid "User 2:"
msgstr "Felhaszn\xE1l\xF3 2:"
-#: Merge.rc:1368
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
-#: Merge.rc:1398
-#: Merge.rc:1403
-#: Merge.rc:1408
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
+#: Merge.rc:1410
#, c-format
msgid "Bold"
msgstr "F\xE9lk\xF6v\xE9r"
-#: Merge.rc:1416
+#: Merge.rc:1418
#, c-format
msgid "Folder Compare Report"
msgstr "K\xF6nyvt\xE1r \xF6sszehason\xEDt\xE1si jelent\xE9s"
-#: Merge.rc:1419
+#: Merge.rc:1421
#, c-format
msgid "Report &File:"
msgstr "Jelent\xE9s &f\xE1jl:"
-#: Merge.rc:1422
-#: Merge.rc:1596
-#: Merge.rc:1600
-#: Merge.rc:1627
+#: Merge.rc:1424
+#: Merge.rc:1598
+#: Merge.rc:1602
+#: Merge.rc:1629
#, c-format
msgid "Browse..."
msgstr "Tall\xF3z\xE1s..."
-#: Merge.rc:1423
+#: Merge.rc:1425
#, c-format
msgid "&Style:"
msgstr "&St\xEDlus:"
-#: Merge.rc:1426
+#: Merge.rc:1428
#, c-format
msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "M\xE1sol\xE1s v\xE1g\xF3lapra"
-#: Merge.rc:1434
+#: Merge.rc:1436
#, c-format
msgid "Shared or Private Filter"
msgstr "Megosztott vagy saj\xE1t sz\xFBr\xF5"
-#: Merge.rc:1437
+#: Merge.rc:1439
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Milyen t\xEDpus\xFA sz\xFBr\xF5t szeretn\xE9l l\xE9trehozni?"
-#: Merge.rc:1439
+#: Merge.rc:1441
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Megosztott sz\xFBr\xF5 (a g\xE9p minden felhaszn\xE1l\xF3j\xE1nak)"
-#: Merge.rc:1441
+#: Merge.rc:1443
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Saj\xE1t sz\xFBr\xF5 (csak a jelenlegi felhaszn\xE1l\xF3nak)"
-#: Merge.rc:1449
-#: Merge.rc:1950
+#: Merge.rc:1451
+#: Merge.rc:1952
#, c-format
msgid "Archive Support"
msgstr "Arch\xEDvum t\xE1mogat\xE1s"
-#: Merge.rc:1452
+#: Merge.rc:1454
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "Az arch\xEDvum t\xE1mogat\xE1shoz a 7-Zip b\xF5v\xEDtm\xE9ny telep\xEDt\xE9se sz\xFCks\xE9ges:"
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "Download 7-zip Plugin"
msgstr "7-Zip b\xF5v\xEDtm\xE9ny let\xF6lt\xE9se"
-#: Merge.rc:1455
+#: Merge.rc:1457
#, c-format
msgid "&Enable archive file support"
msgstr "Arch\xEDv f\xE1jlok t\xE1mogat\xE1s\xE1nak &enged\xE9lyez\xE9se"
-#: Merge.rc:1457
+#: Merge.rc:1459
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Haszn\xE1lja a k\xFCl\xF6n\xE1ll\xF3 7-Zip programot, ha el\xE9rhet\xF5"
-#: Merge.rc:1460
+#: Merge.rc:1462
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "H&aszn\xE1lja a helyi 7-Zip programot a WinMerge mapp\xE1j\xE1ban"
-#: Merge.rc:1462
+#: Merge.rc:1464
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Arch\xEDv f\xE1jl t\xEDpus\xE1nak meg\xE1llap\xEDt\xE1sa a f\xE1jl &szignat\xFAr\xE1ja alapj\xE1n"
-#: Merge.rc:1470
+#: Merge.rc:1472
#, c-format
msgid "Compare Statistics"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDt\xE1si statisztika"
-#: Merge.rc:1473
+#: Merge.rc:1475
#, c-format
msgid "Folders:"
-msgstr ""
+msgstr "K\xF6nyvt\xE1rak:"
-#: Merge.rc:1474
+#: Merge.rc:1476
#, c-format
msgid "Files:"
-msgstr ""
+msgstr "F\xE1jlok:"
-#: Merge.rc:1475
-#: Merge.rc:2341
+#: Merge.rc:1477
+#: Merge.rc:2343
#, c-format
msgid "Different"
msgstr "K\xFCl\xF6nb\xF6z\xF5"
-#: Merge.rc:1476
+#: Merge.rc:1478
#, c-format
msgid "Text:"
-msgstr ""
+msgstr "Sz\xF6veg:"
-#: Merge.rc:1479
-#: Merge.rc:1498
+#: Merge.rc:1481
+#: Merge.rc:1500
#, c-format
msgid "Binary:"
-msgstr ""
+msgstr "Bin\xE1ris:"
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1483
+#: Merge.rc:1485
#, c-format
msgid "Left:"
-msgstr ""
+msgstr "Bal:"
-#: Merge.rc:1488
+#: Merge.rc:1490
#, c-format
msgid "Right:"
-msgstr ""
+msgstr "Jobb:"
-#: Merge.rc:1493
-#: Merge.rc:2335
+#: Merge.rc:1495
+#: Merge.rc:2337
#, c-format
msgid "Identical"
msgstr "Egyez\xF5"
-#: Merge.rc:1502
+#: Merge.rc:1504
#, c-format
msgid "Total:"
-msgstr ""
+msgstr "\xD6sszesen:"
-#: Merge.rc:1507
+#: Merge.rc:1509
#, c-format
msgid "Close"
-msgstr ""
+msgstr "Bez\xE1r"
-#: Merge.rc:1516
+#: Merge.rc:1518
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1519
-#: Merge.rc:1522
+#: Merge.rc:1521
+#: Merge.rc:1524
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1523
+#: Merge.rc:1525
#, c-format
msgid "Select Codepage for"
-msgstr ""
+msgstr "K\xF3dlap kiv\xE1laszt\xE1sa"
-#: Merge.rc:1524
+#: Merge.rc:1526
#, c-format
msgid "&File Loading:"
-msgstr ""
+msgstr "F\xE1jl t\xF6lt\xE9se:"
-#: Merge.rc:1526
-#: Merge.rc:1529
+#: Merge.rc:1528
+#: Merge.rc:1531
#, c-format
msgid "..."
-msgstr ""
+msgstr "..."
-#: Merge.rc:1527
+#: Merge.rc:1529
#, c-format
msgid "File &Saving:"
-msgstr ""
+msgstr "F\xE1jl ment\xE9&se:"
-#: Merge.rc:1530
+#: Merge.rc:1532
#, c-format
msgid "&Use same codepage for both"
-msgstr ""
+msgstr "&Ugyanazon k\xF3dlap haszn\xE1lata mindkett\xF5h\xF6z"
-#: Merge.rc:1533
+#: Merge.rc:1535
#, c-format
msgid "&Apply"
-msgstr ""
+msgstr "&Alkalmaz"
-#: Merge.rc:1534
-#: Merge.rc:1916
+#: Merge.rc:1536
+#: Merge.rc:1918
#, c-format
msgid "&Cancel"
msgstr "&M\xE9gsem"
-#: Merge.rc:1539
+#: Merge.rc:1541
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1542
+#: Merge.rc:1544
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1546
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1546
+#: Merge.rc:1548
#, c-format
msgid "&Folder Name"
-msgstr ""
+msgstr "K\xF6nyvt\xE1r neve"
-#: Merge.rc:1548
+#: Merge.rc:1550
#, c-format
msgid "Result:"
-msgstr ""
+msgstr "Eredm\xE9ny:"
-#: Merge.rc:1552
+#: Merge.rc:1554
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1553
+#: Merge.rc:1555
#, c-format
msgid "&Close"
-msgstr ""
+msgstr "Bez\xE1r"
-#: Merge.rc:1561
+#: Merge.rc:1563
#, c-format
msgid "&Use customized text colors"
-msgstr ""
+msgstr "Egy\xE9ni sz\xF6vegsz\xEDnek haszn\xE1lata"
-#: Merge.rc:1564
+#: Merge.rc:1566
#, c-format
msgid "Custom text colors"
-msgstr ""
+msgstr "Egy\xE9ni sz\xF6vegsz\xEDnek"
-#: Merge.rc:1566
+#: Merge.rc:1568
#, c-format
msgid "Whitespace:"
-msgstr ""
+msgstr "Sz\xF3k\xF6z, tab:"
-#: Merge.rc:1567
+#: Merge.rc:1569
#, c-format
msgid "Regular text:"
-msgstr ""
+msgstr "Sima sz\xF6veg:"
-#: Merge.rc:1568
+#: Merge.rc:1570
#, c-format
msgid "Selection:"
-msgstr ""
+msgstr "Kijel\xF6l\xE9s:"
-#: Merge.rc:1591
+#: Merge.rc:1593
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1597
+#: Merge.rc:1599
#, c-format
msgid "R&ead-only"
-msgstr ""
+msgstr "Csak olvashat\xF3"
-#: Merge.rc:1601
+#: Merge.rc:1603
#, c-format
msgid "Re&ad-only"
-msgstr ""
+msgstr "Cs&ak olvashat\xF3"
-#: Merge.rc:1607
+#: Merge.rc:1609
#, c-format
msgid "Open..."
-msgstr ""
+msgstr "Megnyit\xE1s..."
-#: Merge.rc:1608
+#: Merge.rc:1610
#, c-format
msgid "Save..."
-msgstr ""
+msgstr "Ment\xE9s..."
-#: Merge.rc:1613
-#: Merge.rc:1951
+#: Merge.rc:1615
+#: Merge.rc:1953
#, c-format
msgid "Backup Files"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok"
-#: Merge.rc:1616
+#: Merge.rc:1618
#, c-format
msgid "Create backup files in:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok k\xE9sz\xEDt\xE9se itt:"
-#: Merge.rc:1621
+#: Merge.rc:1623
#, c-format
msgid "Create backup files into:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok k\xE9sz\xEDt\xE9se ide:"
-#: Merge.rc:1622
+#: Merge.rc:1624
#, c-format
msgid "&Original file's folder"
-msgstr ""
+msgstr "Eredeti f\xE1jl k\xF6nyvt\xE1ra"
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "&Global backup folder:"
-msgstr ""
+msgstr "Glob\xE1lis vissza\xE1ll\xEDt\xE1si k\xF6nyvt\xE1r:"
-#: Merge.rc:1628
+#: Merge.rc:1630
#, c-format
msgid "Backup filename:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jl neve:"
-#: Merge.rc:1629
+#: Merge.rc:1631
#, c-format
msgid "&Append .bak -extension"
-msgstr ""
+msgstr ".bak kiterjeszt\xE9s hozz\xE1f\xFBz\xE9se"
-#: Merge.rc:1631
+#: Merge.rc:1633
#, c-format
msgid "A&ppend timestamp"
-msgstr ""
+msgstr "Id\xF5pecs\xE9t hozz\xE1f\xFBz\xE9se"
-#: Merge.rc:1638
-#: Merge.rc:2243
+#: Merge.rc:1640
+#: Merge.rc:2245
#, c-format
msgid "Confirm Copy"
-msgstr ""
+msgstr "M\xE1sol\xE1s meger\xF5s\xEDt\xE9se"
-#: Merge.rc:1642
+#: Merge.rc:1644
#, c-format
msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "Biztosan m\xE1solni szeretne XXX elemet?"
-#: Merge.rc:1644
+#: Merge.rc:1646
#, c-format
msgid "From left"
-msgstr ""
+msgstr "Balr\xF3l"
-#: Merge.rc:1647
+#: Merge.rc:1649
#, c-format
msgid "To right"
-msgstr ""
+msgstr "Jobbra"
-#: Merge.rc:1650
+#: Merge.rc:1652
#, c-format
msgid "Yes"
-msgstr ""
+msgstr "Igen"
-#: Merge.rc:1651
+#: Merge.rc:1653
#, c-format
msgid "No"
-msgstr ""
+msgstr "Nem"
-#: Merge.rc:1657
+#: Merge.rc:1659
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "B\xF5v\xEDtm\xE9nyek"
-#: Merge.rc:1660
+#: Merge.rc:1662
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "B\xF5v\xEDtm\xE9ny&ek bekapcsol\xE1sa"
-#: Merge.rc:1671
-#: Merge.rc:1952
+#: Merge.rc:1673
+#: Merge.rc:1954
#, c-format
msgid "Shell Integration"
msgstr ""
-#: Merge.rc:1674
+#: Merge.rc:1676
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Int\xE9z\xF5"
-#: Merge.rc:1675
+#: Merge.rc:1677
#, c-format
msgid "E&nable advanced menu"
msgstr "&B\xF5v\xEDtett men\xFC enged\xE9lyez\xE9se"
-#: Merge.rc:1677
+#: Merge.rc:1679
#, c-format
msgid "In&clude subfolders by default"
-msgstr ""
+msgstr "Alk\xF6nyvt\xE1rakat is alap\xE9rtelmez\xE9sk\xE9nt"
-#: Merge.rc:1679
+#: Merge.rc:1681
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "Hozz\xE1ad\xE1s a helyi men\xFCh\xF6z"
-#: Merge.rc:1681
+#: Merge.rc:1683
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "K\xF6nyvt\xE1r \xF6sszehasonl\xEDt\xE1s"
-#: Merge.rc:1682
+#: Merge.rc:1684
#, c-format
msgid "Add &Shell menu to context menu"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1708
+#: Merge.rc:1710
#, c-format
msgid "040904e4"
msgstr "040E04e2"
#. VarFileInfo.Translation
-#: Merge.rc:1724
+#: Merge.rc:1726
#, c-format
msgid "0x409, 1252"
msgstr "0x040E, 1250"
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "Ready"
msgstr "K\xE9sz"
-#: Merge.rc:1745
+#: Merge.rc:1747
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1746
+#: Merge.rc:1748
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1747
+#: Merge.rc:1749
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1748
+#: Merge.rc:1750
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1749
+#: Merge.rc:1751
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "\xC1T\xCDR"
-#: Merge.rc:1750
+#: Merge.rc:1752
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1756
+#: Merge.rc:1758
#, c-format
msgid ""
"Create empty documents\n"
@@ -2676,7 +2677,7 @@
"\xDAj dokumentumok l\xE9trehoz\xE1sa\n"
"\xDAj dokumentum (Ctrl+N)"
-#: Merge.rc:1757
+#: Merge.rc:1759
#, c-format
msgid ""
"Open an existing document\n"
@@ -2685,7 +2686,7 @@
"L\xE9tez\xF5 dokumentum megnyit\xE1sa\n"
"Megnyit\xE1s (Ctrl+O)"
-#: Merge.rc:1758
+#: Merge.rc:1760
#, c-format
msgid ""
"Close the active document\n"
@@ -2694,7 +2695,7 @@
"Az akt\xEDv dokumentum bez\xE1r\xE1sa\n"
"Bez\xE1r\xE1s"
-#: Merge.rc:1759
+#: Merge.rc:1761
#, c-format
msgid ""
"Save the active document\n"
@@ -2703,7 +2704,7 @@
"Az akt\xEDv dokumentum ment\xE9se\n"
"Ment\xE9s (Ctrl+S)"
-#: Merge.rc:1760
+#: Merge.rc:1762
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2712,7 +2713,7 @@
"Az akt\xEDv dokumntum ment\xE9se \xFAj n\xE9ven\n"
"Ment\xE9s m\xE9sk\xE9nt"
-#: Merge.rc:1761
+#: Merge.rc:1763
#, c-format
msgid ""
"Change the printing options\n"
@@ -2721,7 +2722,7 @@
"A nyomtat\xE1si be\xE1ll\xEDt\xE1sok megv\xE1ltoztat\xE1sa\n"
"Oldalbe\xE1ll\xEDt\xE1s"
-#: Merge.rc:1762
+#: Merge.rc:1764
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2730,7 +2731,7 @@
"A nyomtat\xF3 \xE9s a nyomtat\xE1si opci\xF3k megv\xE1ltoztat\xE1sa\n"
"Nyomtat\xF3be\xE1ll\xEDt\xE1s"
-#: Merge.rc:1763
+#: Merge.rc:1765
#, c-format
msgid ""
"Print the active document\n"
@@ -2739,7 +2740,7 @@
"Az akt\xEDv dokumentum nyomtat\xE1sa\n"
"Nyomtat\xE1s"
-#: Merge.rc:1764
+#: Merge.rc:1766
#, c-format
msgid ""
"Display full pages\n"
@@ -2748,27 +2749,27 @@
"Az oldalak megjelen\xEDt\xE9se\n"
"Nyomtat\xE1si el\xF5n\xE9zet"
-#: Merge.rc:1769
+#: Merge.rc:1771
#, c-format
msgid "Make all hidden items visible again"
msgstr "Minden rejtett elem legyen \xFAjb\xF3l l\xE1that\xF3"
-#: Merge.rc:1770
+#: Merge.rc:1772
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Fa m\xF3d ki/be"
-#: Merge.rc:1771
+#: Merge.rc:1773
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r kibont\xE1sa"
-#: Merge.rc:1772
+#: Merge.rc:1774
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r bez\xE1r\xE1sa"
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid ""
"Open project file\n"
@@ -2777,39 +2778,41 @@
"Projekt f\xE1jl megnyit\xE1sa\n"
"Projekt f\xE1jl (Ctrl+J)"
-#: Merge.rc:1779
+#: Merge.rc:1781
#, c-format
msgid "Unknown error attempting to open project file"
-msgstr ""
+msgstr "Ismeretlen hiba a projekt f\xE1jl megnyit\xE1sakor"
-#: Merge.rc:1780
+#: Merge.rc:1782
#, c-format
msgid "Unknown error attempting to save project file"
-msgstr ""
+msgstr "Ismeretlen hiba a projekt f\xE1jl ment\xE9sekor"
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid "Project File"
-msgstr ""
+msgstr "Projekt f\xE1jl"
-#: Merge.rc:1782
+#: Merge.rc:1784
#, c-format
msgid "Project file successfully loaded."
-msgstr ""
+msgstr "Projekt f\xE1jl sikeresen bet\xF6ltve."
-#: Merge.rc:1783
+#: Merge.rc:1785
#, c-format
msgid "Project file successfully saved."
-msgstr ""
+msgstr "Projekt f\xE1jl sikeresen elmentve."
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid ""
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
+"Aktu\xE1lis el\xE9r\xE9si utak \xE9s be\xE1ll\xEDt\xE1sok ment\xE9se a projekt f\xE1jlba\n"
+"Projekt f\xE1jl ment\xE9se"
-#: Merge.rc:1789
+#: Merge.rc:1791
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2818,7 +2821,7 @@
"A programmal kapcsolatos inform\xE1ci\xF3k megjelen\xEDt\xE9se\n"
"N\xE9vjegy"
-#: Merge.rc:1790
+#: Merge.rc:1792
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2827,8 +2830,6 @@
"A program bez\xE1r\xE1sa; a nem mentett f\xE1jlok elment\xE9s\xE9nek lehet\xF5s\xE9g\xE9vel\n"
"Kil\xE9p\xE9s"
-#: Merge.rc:1796
-#: Merge.rc:1797
#: Merge.rc:1798
#: Merge.rc:1799
#: Merge.rc:1800
@@ -2843,11 +2844,13 @@
#: Merge.rc:1809
#: Merge.rc:1810
#: Merge.rc:1811
+#: Merge.rc:1812
+#: Merge.rc:1813
#, c-format
msgid "Open this document"
msgstr "A dokumentum megnyit\xE1sa"
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2856,7 +2859,7 @@
"V\xE1lt\xE1s a k\xF6vetkez\xF5 ablak panelj\xE1ra\n"
"K\xF6vetkez\xF5 panel"
-#: Merge.rc:1817
+#: Merge.rc:1819
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2865,7 +2868,7 @@
"V\xE1lt\xE1s az el\xF5z\xF5 ablak panelj\xE1ra\n"
"El\xF5z\xF5 panel"
-#: Merge.rc:1823
+#: Merge.rc:1825
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2874,7 +2877,7 @@
"Az Ablakok egym\xE1sra helyez\xE9se\n"
"Ablakok egym\xE1sra elhelyez\xE9se"
-#: Merge.rc:1824
+#: Merge.rc:1826
#, fuzzy, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2883,7 +2886,7 @@
"Az ablakok feloszt\xE1sa egym\xE1st nem fed\xF5 m\xF3don\n"
"Ablakok feloszt\xE1sa"
-#: Merge.rc:1825
+#: Merge.rc:1827
#, fuzzy, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2892,7 +2895,7 @@
"Az ablakok feloszt\xE1sa egym\xE1st nem fed\xF5 m\xF3don\n"
"Ablakok feloszt\xE1sa"
-#: Merge.rc:1831
+#: Merge.rc:1833
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2901,7 +2904,7 @@
"A kijel\xF6l\xE9s m\xE1sol\xE1sa a v\xE1g\xF3lapra\n"
"M\xE1sol\xE1s"
-#: Merge.rc:1832
+#: Merge.rc:1834
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2910,7 +2913,7 @@
"A kijel\xF6l\xE9s kiv\xE1g\xE1sa a v\xE1g\xF3lapra\n"
"Kiv\xE1g\xE1s"
-#: Merge.rc:1833
+#: Merge.rc:1835
#, c-format
msgid ""
"Find the specified text\n"
@@ -2919,7 +2922,7 @@
"A megadott sz\xF6veg keres\xE9se\n"
"Keres\xE9s"
-#: Merge.rc:1834
+#: Merge.rc:1836
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2928,7 +2931,7 @@
"A v\xE1g\xF3lap tartalm\xE1nak beilleszt\xE9se\n"
"Beilleszt\xE9s"
-#: Merge.rc:1835
+#: Merge.rc:1837
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2937,7 +2940,7 @@
"Az utols\xF3 m\xFBvelet megism\xE9tl\xE9se\n"
"Ism\xE9t"
-#: Merge.rc:1836
+#: Merge.rc:1838
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2946,7 +2949,7 @@
"A megadott sz\xF6veg cser\xE9je a k\xEDv\xE1nt \xFAj sz\xF6veggel\n"
"Csere"
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid ""
"Select the entire document\n"
@@ -2955,7 +2958,7 @@
"A teljes dokumentum kijel\xF6l\xE9se\n"
"Kijel\xF6l mindent"
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid ""
"Undo the last action\n"
@@ -2964,7 +2967,7 @@
"Az utols\xF3 m\xFBvelet visszavon\xE1sa\n"
"Visszavon\xE1s (Ctrl+Z)"
-#: Merge.rc:1839
+#: Merge.rc:1841
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -2973,7 +2976,7 @@
"Az utolj\xE1ra visszavont m\xFBvelet megism\xE9tl\xE9se\n"
"M\xE9gis (Ctrl+Y)"
-#: Merge.rc:1845
+#: Merge.rc:1847
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -2982,7 +2985,7 @@
"Megmutatja vagy elrejti az Eszk\xF6zt\xE1rat\n"
"Eszk\xF6zt\xE1r"
-#: Merge.rc:1846
+#: Merge.rc:1848
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -2991,69 +2994,69 @@
"Megmutatja vagy elrejti az \xC1llapotsort\n"
"\xC1llapotsor"
-#: Merge.rc:1847
+#: Merge.rc:1849
#, c-format
msgid ""
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-#: Merge.rc:1848
+#: Merge.rc:1850
#, c-format
msgid "Automatically resize panes\nLock Panes"
-msgstr ""
+msgstr "Panelek automatikus \xE1tm\xE9retez\xE9se\nPanelek r\xF6gz\xEDt\xE9se"
-#: Merge.rc:1854
+#: Merge.rc:1856
#, c-format
msgid "Change the window size"
msgstr "Az ablak m\xE9ret\xE9nek v\xE1ltoztat\xE1sa"
-#: Merge.rc:1855
+#: Merge.rc:1857
#, c-format
msgid "Change the window position"
msgstr "Az ablak poz\xEDci\xF3j\xE1nak v\xE1ltoztat\xE1sa"
-#: Merge.rc:1856
+#: Merge.rc:1858
#, c-format
msgid "Reduce the window to an icon"
msgstr "Az ablak ikon\xE1llapotra kicsiny\xEDt\xE9se"
-#: Merge.rc:1857
+#: Merge.rc:1859
#, c-format
msgid "Enlarge the window to full size"
msgstr "Az ablak teljes m\xE9ret\xFBv\xE9 t\xE9tele"
-#: Merge.rc:1858
+#: Merge.rc:1860
#, c-format
msgid "Switch to the next document window"
msgstr "V\xE1lt\xE1s a k\xF6vetkez\xF5 dokumentum ablak\xE1ra"
-#: Merge.rc:1859
+#: Merge.rc:1861
#, c-format
msgid "Switch to the previous document window"
msgstr "V\xE1lt\xE1s az el\xF5z\xF5 dokumentum ablak\xE1ra"
-#: Merge.rc:1860
+#: Merge.rc:1862
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Az akt\xEDv ablak bez\xE1r\xE1sa a v\xE1ltoztat\xE1sok ment\xE9s\xE9nek lehet\xF5s\xE9g\xE9vel"
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "Restore the window to normal size"
msgstr "Az ablak vissaz\xE1ll\xEDt\xE1sa az eredeti m\xE9ret\xE9re"
-#: Merge.rc:1866
+#: Merge.rc:1868
#, c-format
msgid "Activate Task List"
msgstr "A Feladat Lista aktiv\xE1l\xE1sa"
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "Activate this window"
msgstr "Ennek az ablaknak az aktiv\xE1l\xE1sa"
-#: Merge.rc:1873
+#: Merge.rc:1875
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3062,188 +3065,188 @@
"A Nyomtat\xE1si el\xF5n\xE9zet bez\xE1r\xE1sa\n"
"Nyomtat\xE1si el\xF5n\xE9zet bez\xE1r\xE1sa"
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
-#: Merge.rc:1881
+#: Merge.rc:1883
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-#: Merge.rc:1888
+#: Merge.rc:1890
#, c-format
msgid "Preserve original EOL chars"
msgstr "Az eredeti \xFAjsor-karakterek meg\xF5rz\xE9se"
-#: Merge.rc:1895
+#: Merge.rc:1897
#, c-format
msgid "Press any key"
msgstr "Nyomj egy billenty\xFBt"
-#: Merge.rc:1901
-#: Merge.rc:1902
+#: Merge.rc:1903
+#: Merge.rc:1904
#, c-format
msgid "Right click on the path to copy"
msgstr "Kattints a jobb eg\xE9rgombbal az \xFAtvonalra annak m\xE1sol\xE1s\xE1hoz"
-#: Merge.rc:1908
+#: Merge.rc:1910
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1911
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1915
+#: Merge.rc:1917
#, c-format
msgid "&Ok"
msgstr "&Rendben"
-#: Merge.rc:1917
+#: Merge.rc:1919
#, c-format
msgid "&Abort"
msgstr "&Le\xE1ll\xEDt"
-#: Merge.rc:1918
+#: Merge.rc:1920
#, c-format
msgid "&Retry"
msgstr "&Ism\xE9t"
-#: Merge.rc:1919
+#: Merge.rc:1921
#, c-format
msgid "&Ignore"
msgstr "&Kihagy"
-#: Merge.rc:1920
+#: Merge.rc:1922
#, c-format
msgid "Ignore &all"
msgstr "Kihagy M&indent"
-#: Merge.rc:1921
+#: Merge.rc:1923
#, c-format
msgid "&Yes"
msgstr "&Igen"
-#: Merge.rc:1927
+#: Merge.rc:1929
#, c-format
msgid "Yes to &all"
msgstr "Igen &mindenre"
-#: Merge.rc:1928
+#: Merge.rc:1930
#, c-format
msgid "&No"
msgstr "&Nem"
-#: Merge.rc:1929
+#: Merge.rc:1931
#, c-format
msgid "No to a&ll"
msgstr "Nem m&indenre"
-#: Merge.rc:1930
+#: Merge.rc:1932
#, c-format
msgid "&Continue"
msgstr "&Folytat\xE1s"
-#: Merge.rc:1931
+#: Merge.rc:1933
#, c-format
msgid "&Skip"
msgstr "&Kihagy"
-#: Merge.rc:1932
+#: Merge.rc:1934
#, c-format
msgid "Skip &all"
msgstr "Kihagy &mindent"
-#: Merge.rc:1934
+#: Merge.rc:1936
#, c-format
msgid "Don't display this &message again."
msgstr "&Ne jelenjen meg t\xF6bbet ez az \xFCzenet."
-#: Merge.rc:1935
+#: Merge.rc:1937
#, c-format
msgid "Don't ask this &question again."
msgstr "&Ne jelenjen meg t\xF6bbet ez a k\xE9rd\xE9s."
-#: Merge.rc:1945
+#: Merge.rc:1947
#, c-format
msgid "Syntax colors"
-msgstr "Szintaxis sz\xEDnek"
+msgstr ""
-#: Merge.rc:1946
+#: Merge.rc:1948
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1948
+#: Merge.rc:1950
#, c-format
msgid "Version Control"
msgstr "Verzi\xF3 Kontroll"
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1962
#, c-format
msgid "From left:"
-msgstr ""
+msgstr "Balr\xF3l:"
-#: Merge.rc:1961
+#: Merge.rc:1963
#, c-format
msgid "To left:"
-msgstr ""
+msgstr "Jobbra:"
-#: Merge.rc:1962
+#: Merge.rc:1964
#, c-format
msgid "From right:"
-msgstr ""
+msgstr "Jobbr\xF3l:"
-#: Merge.rc:1963
+#: Merge.rc:1965
#, c-format
msgid "To right:"
-msgstr ""
+msgstr "Jobbra:"
-#: Merge.rc:1969
+#: Merge.rc:1971
#, c-format
msgid "Version %1"
msgstr "Verzi\xF3 %1"
-#: Merge.rc:1970
+#: Merge.rc:1972
#, c-format
msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
-#: Merge.rc:1971
+#: Merge.rc:1973
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
-#: Merge.rc:1977
+#: Merge.rc:19...
[truncated message content] |
|
From: <ge...@us...> - 2011-01-28 20:13:02
|
Revision: 7508
http://winmerge.svn.sourceforge.net/winmerge/?rev=7508&view=rev
Author: gerundt
Date: 2011-01-28 20:12:55 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
PATCH: [ 3164982 ] Hungarian language file
Submitted by Mihalicza J?\195?\179zsef
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Translations/WinMerge/Hungarian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2011-01-21 08:42:41 UTC (rev 7507)
+++ trunk/Docs/Users/ChangeLog.txt 2011-01-28 20:12:55 UTC (rev 7508)
@@ -14,6 +14,7 @@
Bugfix: Crash after deleting text (#3109521)
Translation updates:
- Bulgarian (#3082392)
+ - Hungarian (#3164982)
WinMerge 2.13.14 - 2010-09-15 (r7263)
Update release compiler and runtimes to VS2008
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2011-01-21 08:42:41 UTC (rev 7507)
+++ trunk/Docs/Users/Contributors.txt 2011-01-28 20:12:55 UTC (rev 7508)
@@ -75,6 +75,7 @@
* Hungarian:
M\xE1rton Bal\xE1zs <do...@us...>
+ Mihalicza J\xF3zsef <jmi...@gm...>
* Italian:
Andrea Decorte <dec...@ho...>
Modified: trunk/Translations/WinMerge/Hungarian.po
===================================================================
--- trunk/Translations/WinMerge/Hungarian.po 2011-01-21 08:42:41 UTC (rev 7507)
+++ trunk/Translations/WinMerge/Hungarian.po 2011-01-28 20:12:55 UTC (rev 7508)
@@ -3,6 +3,7 @@
#
# Translators:
# * M\xE1rton Bal\xE1zs <documan at users.sourceforge.net>
+# * Mihalicza J\xF3zsef <jmihalicza at gmail.com>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -12,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2011-01-24 21:42+0100\n"
"Last-Translator: \n"
"Language-Team: Hungarian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -140,7 +141,7 @@
#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Konfliktus f\xE1jl megnyit\xE1sa..."
#: Merge.rc:116
#: Merge.rc:200
@@ -154,12 +155,12 @@
#: Merge.rc:322
#, c-format
msgid "Sa&ve Project..."
-msgstr ""
+msgstr "Projekt ment\xE9se..."
#: Merge.rc:119
#, c-format
msgid "Recent Projects"
-msgstr ""
+msgstr "Legut\xF3bbi projektek"
#: Merge.rc:121
#: Merge.rc:208
@@ -208,35 +209,35 @@
#: Merge.rc:416
#, c-format
msgid "&Toolbar"
-msgstr ""
+msgstr "Eszk\xF6zt\xE1r"
#: Merge.rc:134
#: Merge.rc:236
#: Merge.rc:418
#, c-format
msgid "&None"
-msgstr ""
+msgstr "&Nincs"
#: Merge.rc:135
#: Merge.rc:237
#: Merge.rc:419
#, c-format
msgid "&Small"
-msgstr ""
+msgstr "Kic&si"
#: Merge.rc:136
#: Merge.rc:238
#: Merge.rc:420
#, c-format
msgid "&Big"
-msgstr ""
+msgstr "Nagy"
#: Merge.rc:138
#: Merge.rc:240
#: Merge.rc:422
#, c-format
msgid "&Status Bar"
-msgstr "&\xC1lapotsor"
+msgstr "&\xC1llapotsor"
#: Merge.rc:139
#: Merge.rc:241
@@ -285,7 +286,7 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
#: Merge.rc:152
#, c-format
@@ -408,7 +409,7 @@
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge S\xFAg\xF3\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -422,7 +423,7 @@
#: Merge.rc:492
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "Ford\xED&t\xE1sok"
#: Merge.rc:184
#: Merge.rc:305
@@ -467,7 +468,7 @@
#: Merge.rc:206
#, c-format
msgid "File En&coding"
-msgstr ""
+msgstr "F\xE1jl k\xF3dol\xE1s"
#: Merge.rc:212
#: Merge.rc:366
@@ -478,32 +479,32 @@
#: Merge.rc:218
#, c-format
msgid "Show &Identical Items"
-msgstr ""
+msgstr "Egyez\xF5 elemek mutat\xE1sa"
#: Merge.rc:219
#, c-format
msgid "Show &Different Items"
-msgstr ""
+msgstr "K\xFCl\xF6nb\xF6z\xF5 elemek mutat\xE1sa"
#: Merge.rc:220
#, c-format
msgid "Show L&eft Unique Items"
-msgstr ""
+msgstr "Csak bal oldali elemek mutat\xE1sa"
#: Merge.rc:221
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr ""
+msgstr "Csak jobb oldali elemek mutat\xE1sa"
#: Merge.rc:222
#, c-format
msgid "Show S&kipped Items"
-msgstr ""
+msgstr "Kihagyott elemek mutat\xE1sa"
#: Merge.rc:223
#, c-format
msgid "S&how Binary Files"
-msgstr ""
+msgstr "Bin\xE1ris f\xE1jlok mutat\xE1sa"
#: Merge.rc:225
#, c-format
@@ -513,22 +514,22 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "Fa &m\xF3d"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r kibont\xE1sa"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r bez\xE1r\xE1sa"
#: Merge.rc:242
#, c-format
msgid "Compa&re Statistics"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDt\xE1si statisztika"
#: Merge.rc:246
#: Merge.rc:429
@@ -539,7 +540,7 @@
#: Merge.rc:247
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "Kijel\xF6ltek friss\xEDt\xE9se\tCtrl+F5"
#: Merge.rc:249
#: Merge.rc:431
@@ -641,37 +642,37 @@
#: Merge.rc:336
#, c-format
msgid "&Print..."
-msgstr ""
+msgstr "Nyomtat\xE1s..."
#: Merge.rc:337
#, c-format
msgid "Page Se&tup"
-msgstr ""
+msgstr "Oldalbe\xE1ll\xEDt\xE1s"
#: Merge.rc:338
#, c-format
msgid "Print Previe&w"
-msgstr ""
+msgstr "Nyomtat\xE1si k\xE9p"
#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
-msgstr ""
+msgstr "Sorv\xE9gek \xE1talak\xEDt\xE1sa"
#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:346
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:347
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:350
#, c-format
@@ -681,7 +682,7 @@
#: Merge.rc:352
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "&F\xE1jl k\xF3dol\xE1s..."
#: Merge.rc:358
#, c-format
@@ -747,27 +748,27 @@
#: Merge.rc:381
#, c-format
msgid "&Bookmarks"
-msgstr ""
+msgstr "K\xF6nyvjelz\xF5k"
#: Merge.rc:383
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr ""
+msgstr "K\xF6nyvjelz\xF5 ki/be\tCtrl+F2"
#: Merge.rc:384
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr ""
+msgstr "K\xF6vetkez\xF5 k\xF6nyvjelz\xF5\tF2"
#: Merge.rc:385
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr ""
+msgstr "El\xF5z\xF5 k\xF6nyvjelz\xF5\tShift+F2"
#: Merge.rc:386
#, c-format
msgid "&Clear All Bookmarks"
-msgstr ""
+msgstr "\xD6sszes k\xF6nyvjelz\xF5 t\xF6rl\xE9se"
#: Merge.rc:388
#, c-format
@@ -777,17 +778,17 @@
#: Merge.rc:396
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "Nagy\xEDt\xE1s"
#: Merge.rc:398
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Nagy\xEDt\xE1s\tCtrl++"
#: Merge.rc:399
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Kicsiny\xEDt\xE9s\tCtrl+-"
#. Zoom to normal
#: Merge.rc:400
@@ -803,7 +804,7 @@
#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "Pane&lek r\xF6gz\xEDt\xE9se"
#: Merge.rc:408
#, c-format
@@ -818,22 +819,22 @@
#: Merge.rc:410
#, c-format
msgid "View Line &Numbers"
-msgstr ""
+msgstr "Sorsz\xE1mok megjelen\xEDt\xE9se"
#: Merge.rc:411
#, c-format
msgid "View &Margins"
-msgstr ""
+msgstr "Marg\xF3k megjelen\xEDt\xE9se"
#: Merge.rc:412
#, c-format
msgid "W&rap Lines"
-msgstr ""
+msgstr "Sort\xF6rdel\xE9s"
#: Merge.rc:414
#, c-format
msgid "Sw&ap Panes"
-msgstr ""
+msgstr "Panelek megcser\xE9l\xE9se"
#: Merge.rc:424
#, c-format
@@ -883,7 +884,7 @@
#: Merge.rc:508
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:509
#, c-format
@@ -952,7 +953,7 @@
#: Merge.rc:530
#, c-format
msgid "Re&name"
-msgstr ""
+msgstr "\xC1t&nevez\xE9s"
#: Merge.rc:531
#, c-format
@@ -997,7 +998,7 @@
#: Merge.rc:554
#, c-format
msgid "&Zip"
-msgstr ""
+msgstr "&Zip"
#: Merge.rc:556
#, c-format
@@ -1077,7 +1078,7 @@
#: Merge.rc:674
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(Priv\xE1t build)"
#: Merge.rc:675
#, c-format
@@ -1208,7 +1209,7 @@
#: Merge.rc:721
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
#: Merge.rc:726
#, c-format
@@ -1303,17 +1304,17 @@
#: Merge.rc:775
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "R\xE1&k\xE9rdez\xE9s t\xF6bb ablak bez\xE1r\xE1sakor"
#: Merge.rc:777
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "F\xE1jl id\xF5k meg\xF5rz\xE9se \xF6sszehasonl\xEDt\xE1skor"
#: Merge.rc:780
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\"V\xE1laszd ki a f\xE1jlokat vagy k\xF6nyvt\xE1rakat\" ablak indul\xE1skor"
#: Merge.rc:782
#, c-format
@@ -1340,7 +1341,7 @@
#: Merge.rc:791
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr ""
+msgstr "A WinMerge lehet\xF5v\xE9 teszi \xE1ltal\xE1nos \xFCzenetablakok elrejt\xE9s\xE9t. A Vissza\xE1ll\xEDt gombbal minden \xFCzenetablak \xFAjra l\xE1that\xF3v\xE1 tehet\xF5."
#: Merge.rc:793
#, c-format
@@ -1456,7 +1457,7 @@
#: Merge.rc:2202
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
#: Merge.rc:875
#, c-format
@@ -1492,17 +1493,17 @@
#: Merge.rc:900
#, c-format
msgid "New"
-msgstr ""
+msgstr "\xDAj"
#: Merge.rc:901
#, c-format
msgid "Edit"
-msgstr ""
+msgstr "Szerkeszt\xE9s"
#: Merge.rc:902
#, c-format
msgid "Remove"
-msgstr ""
+msgstr "Elt\xE1vol\xEDt\xE1s"
#: Merge.rc:907
#: Merge.rc:1956
@@ -1605,22 +1606,22 @@
#: Merge.rc:1009
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "Tall\xF3z..."
#: Merge.rc:1010
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "\xC1tmeneti f\xE1jlok k\xF6nyvt\xE1ra"
#: Merge.rc:1011
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "A rendszer temp k\xF6nyvt\xE1ra"
#: Merge.rc:1013
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "Egyedi k\xF6nyvt\xE1r:"
#: Merge.rc:1016
#: Merge.rc:1032
@@ -1721,12 +1722,12 @@
#: Merge.rc:1088
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "Mozgat\xE1s fel"
#: Merge.rc:1089
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "Mozgat\xE1s le"
#: Merge.rc:1099
#, c-format
@@ -1756,7 +1757,7 @@
#: Merge.rc:1122
#, c-format
msgid " Folder Compare Progress"
-msgstr ""
+msgstr " K\xF6nyvt\xE1r \xF6sszehasonl\xEDt\xE1s folyamata"
#: Merge.rc:1125
#: Merge.rc:1906
@@ -1767,17 +1768,17 @@
#: Merge.rc:1130
#, c-format
msgid "Comparing items..."
-msgstr ""
+msgstr "Elemek \xF6sszehasonl\xEDt\xE1sa..."
#: Merge.rc:1131
#, c-format
msgid "Items compared:"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDtott elemek:"
#: Merge.rc:1132
#, c-format
msgid "Items total:"
-msgstr ""
+msgstr "\xD6sszes elem:"
#: Merge.rc:1138
#, c-format
@@ -1853,7 +1854,7 @@
#: Merge.rc:1168
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Sorv\xE9g k\xFCl\xF6nbs\xE9gek figyelmen k\xEDv\xFCl hagy\xE1sa (Windows/Unix/Mac)"
#: Merge.rc:1170
#, c-format
@@ -1949,7 +1950,7 @@
#: Merge.rc:1226
#, c-format
msgid "Install..."
-msgstr ""
+msgstr "Telep\xEDt\xE9s..."
#: Merge.rc:1227
#, c-format
@@ -2026,7 +2027,7 @@
#: Merge.rc:1265
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "K\xF3dlap inform\xE1ci\xF3 detekt\xE1l\xE1sa ezen f\xE1jlokn\xE1l: .html, .rc, .xml \nprogram \xFAjraind\xEDt\xE1s sz\xFCks\xE9ges"
#: Merge.rc:1268
#, c-format
@@ -2041,7 +2042,7 @@
#: Merge.rc:1272
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Egyedi k\xF3dlap:"
#: Merge.rc:1280
#, c-format
@@ -2140,7 +2141,7 @@
#: Merge.rc:1314
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "Ne jelenjen &meg \xFAjra ez az \xFCzenet.\n(A S\xFAg\xF3 men\xFCb\xF5l az \xFCzenet b\xE1rmikor \xFAjra bekapcsolhat\xF3.)"
#: Merge.rc:1318
#, c-format
@@ -2160,12 +2161,12 @@
#: Merge.rc:1340
#, c-format
msgid "Import..."
-msgstr ""
+msgstr "Import\xE1l\xE1s..."
#: Merge.rc:1341
#, c-format
msgid "Export..."
-msgstr ""
+msgstr "Export\xE1l\xE1s..."
#: Merge.rc:1349
#, c-format
@@ -2251,7 +2252,7 @@
#: Merge.rc:1420
#, c-format
msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "M\xE1sol\xE1s v\xE1g\xF3lapra"
#: Merge.rc:1428
#, c-format
@@ -2312,17 +2313,17 @@
#: Merge.rc:1464
#, c-format
msgid "Compare Statistics"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDt\xE1si statisztika"
#: Merge.rc:1467
#, c-format
msgid "Folders:"
-msgstr ""
+msgstr "K\xF6nyvt\xE1rak:"
#: Merge.rc:1468
#, c-format
msgid "Files:"
-msgstr ""
+msgstr "F\xE1jlok:"
#: Merge.rc:1469
#: Merge.rc:2356
@@ -2333,13 +2334,13 @@
#: Merge.rc:1470
#, c-format
msgid "Text:"
-msgstr ""
+msgstr "Sz\xF6veg:"
#: Merge.rc:1473
#: Merge.rc:1492
#, c-format
msgid "Binary:"
-msgstr ""
+msgstr "Bin\xE1ris:"
#: Merge.rc:1476
#, c-format
@@ -2349,12 +2350,12 @@
#: Merge.rc:1477
#, c-format
msgid "Left:"
-msgstr ""
+msgstr "Bal:"
#: Merge.rc:1482
#, c-format
msgid "Right:"
-msgstr ""
+msgstr "Jobb:"
#: Merge.rc:1487
#: Merge.rc:2350
@@ -2365,12 +2366,12 @@
#: Merge.rc:1496
#, c-format
msgid "Total:"
-msgstr ""
+msgstr "\xD6sszesen:"
#: Merge.rc:1501
#, c-format
msgid "Close"
-msgstr ""
+msgstr "Bez\xE1r"
#: Merge.rc:1510
#, c-format
@@ -2386,33 +2387,33 @@
#: Merge.rc:1517
#, c-format
msgid "Select Codepage for"
-msgstr ""
+msgstr "K\xF3dlap kiv\xE1laszt\xE1sa"
#: Merge.rc:1518
#, c-format
msgid "&File Loading:"
-msgstr ""
+msgstr "F\xE1jl t\xF6lt\xE9se:"
#: Merge.rc:1520
#: Merge.rc:1523
#, c-format
msgid "..."
-msgstr ""
+msgstr "..."
#: Merge.rc:1521
#, c-format
msgid "File &Saving:"
-msgstr ""
+msgstr "F\xE1jl ment\xE9&se:"
#: Merge.rc:1524
#, c-format
msgid "&Use same codepage for both"
-msgstr ""
+msgstr "&Ugyanazon k\xF3dlap haszn\xE1lata mindkett\xF5h\xF6z"
#: Merge.rc:1527
#, c-format
msgid "&Apply"
-msgstr ""
+msgstr "&Alkalmaz"
#: Merge.rc:1528
#: Merge.rc:1928
@@ -2438,12 +2439,12 @@
#: Merge.rc:1540
#, c-format
msgid "&Folder Name"
-msgstr ""
+msgstr "K\xF6nyvt\xE1r neve"
#: Merge.rc:1542
#, c-format
msgid "Result:"
-msgstr ""
+msgstr "Eredm\xE9ny:"
#: Merge.rc:1546
#, c-format
@@ -2453,32 +2454,32 @@
#: Merge.rc:1547
#, c-format
msgid "&Close"
-msgstr ""
+msgstr "Bez\xE1r"
#: Merge.rc:1555
#, c-format
msgid "&Use customized text colors"
-msgstr ""
+msgstr "Egy\xE9ni sz\xF6vegsz\xEDnek haszn\xE1lata"
#: Merge.rc:1558
#, c-format
msgid "Custom text colors"
-msgstr ""
+msgstr "Egy\xE9ni sz\xF6vegsz\xEDnek"
#: Merge.rc:1560
#, c-format
msgid "Whitespace:"
-msgstr ""
+msgstr "Sz\xF3k\xF6z, tab:"
#: Merge.rc:1561
#, c-format
msgid "Regular text:"
-msgstr ""
+msgstr "Sima sz\xF6veg:"
#: Merge.rc:1562
#, c-format
msgid "Selection:"
-msgstr ""
+msgstr "Kijel\xF6l\xE9s:"
#: Merge.rc:1585
#, c-format
@@ -2488,104 +2489,104 @@
#: Merge.rc:1591
#, c-format
msgid "R&ead-only"
-msgstr ""
+msgstr "Csak olvashat\xF3"
#: Merge.rc:1595
#, c-format
msgid "Re&ad-only"
-msgstr ""
+msgstr "Cs&ak olvashat\xF3"
#: Merge.rc:1601
#, c-format
msgid "Open..."
-msgstr ""
+msgstr "Megnyit\xE1s..."
#: Merge.rc:1602
#, c-format
msgid "Save..."
-msgstr ""
+msgstr "Ment\xE9s..."
#: Merge.rc:1607
#: Merge.rc:1963
#, c-format
msgid "Backup Files"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok"
#: Merge.rc:1610
#, c-format
msgid "Create backup files in:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok k\xE9sz\xEDt\xE9se itt:"
#: Merge.rc:1615
#, c-format
msgid "Create backup files into:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok k\xE9sz\xEDt\xE9se ide:"
#: Merge.rc:1616
#, c-format
msgid "&Original file's folder"
-msgstr ""
+msgstr "Eredeti f\xE1jl k\xF6nyvt\xE1ra"
#: Merge.rc:1618
#, c-format
msgid "&Global backup folder:"
-msgstr ""
+msgstr "Glob\xE1lis vissza\xE1ll\xEDt\xE1si k\xF6nyvt\xE1r:"
#: Merge.rc:1622
#, c-format
msgid "Backup filename:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jl neve:"
#: Merge.rc:1623
#, c-format
msgid "&Append .bak -extension"
-msgstr ""
+msgstr ".bak kiterjeszt\xE9s hozz\xE1f\xFBz\xE9se"
#: Merge.rc:1625
#, c-format
msgid "A&ppend timestamp"
-msgstr ""
+msgstr "Id\xF5pecs\xE9t hozz\xE1f\xFBz\xE9se"
#: Merge.rc:1632
#: Merge.rc:2258
#, c-format
msgid "Confirm Copy"
-msgstr ""
+msgstr "M\xE1sol\xE1s meger\xF5s\xEDt\xE9se"
#: Merge.rc:1636
#, c-format
msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "Biztosan m\xE1solni szeretne XXX elemet?"
#: Merge.rc:1638
#, c-format
msgid "From left"
-msgstr ""
+msgstr "Balr\xF3l"
#: Merge.rc:1641
#, c-format
msgid "To right"
-msgstr ""
+msgstr "Jobbra"
#: Merge.rc:1644
#, c-format
msgid "Yes"
-msgstr ""
+msgstr "Igen"
#: Merge.rc:1645
#, c-format
msgid "No"
-msgstr ""
+msgstr "Nem"
#: Merge.rc:1651
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "B\xF5v\xEDtm\xE9nyek"
#: Merge.rc:1654
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "B\xF5v\xEDtm\xE9ny&ek bekapcsol\xE1sa"
#: Merge.rc:1665
#: Merge.rc:1964
@@ -2596,7 +2597,7 @@
#: Merge.rc:1668
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Int\xE9z\xF5"
#: Merge.rc:1669
#, c-format
@@ -2606,17 +2607,17 @@
#: Merge.rc:1671
#, c-format
msgid "In&clude subfolders by default"
-msgstr ""
+msgstr "Alk\xF6nyvt\xE1rakat is alap\xE9rtelmez\xE9sk\xE9nt"
#: Merge.rc:1673
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "Hozz\xE1ad\xE1s a helyi men\xFCh\xF6z"
#: Merge.rc:1675
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "K\xF6nyvt\xE1r \xF6sszehasonl\xEDt\xE1s"
#: Merge.rc:1676
#, c-format
@@ -2643,7 +2644,7 @@
#: Merge.rc:1690
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
+msgstr "3 m\xE1sodperc alatti id\xF5k\xFCl\xF6nbs\xE9gek mell\xF5z\xE9se"
#: Merge.rc:1692
#, c-format
@@ -2695,7 +2696,7 @@
#: Merge.rc:1761
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "\xC1T\xCDR"
#: Merge.rc:1762
#, c-format
@@ -2791,17 +2792,17 @@
#: Merge.rc:1782
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Fa m\xF3d ki/be"
#: Merge.rc:1783
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r kibont\xE1sa"
#: Merge.rc:1784
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r bez\xE1r\xE1sa"
#: Merge.rc:1790
#, c-format
@@ -2815,27 +2816,27 @@
#: Merge.rc:1791
#, c-format
msgid "Unknown error attempting to open project file"
-msgstr ""
+msgstr "Ismeretlen hiba a projekt f\xE1jl megnyit\xE1sakor"
#: Merge.rc:1792
#, c-format
msgid "Unknown error attempting to save project file"
-msgstr ""
+msgstr "Ismeretlen hiba a projekt f\xE1jl ment\xE9sekor"
#: Merge.rc:1793
#, c-format
msgid "Project File"
-msgstr ""
+msgstr "Projekt f\xE1jl"
#: Merge.rc:1794
#, c-format
msgid "Project file successfully loaded."
-msgstr ""
+msgstr "Projekt f\xE1jl sikeresen bet\xF6ltve."
#: Merge.rc:1795
#, c-format
msgid "Project file successfully saved."
-msgstr ""
+msgstr "Projekt f\xE1jl sikeresen elmentve."
#: Merge.rc:1796
#, c-format
@@ -2843,6 +2844,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
+"Aktu\xE1lis el\xE9r\xE9si utak \xE9s be\xE1ll\xEDt\xE1sok ment\xE9se a projekt f\xE1jlba\n"
+"Projekt f\xE1jl ment\xE9se"
#: Merge.rc:1801
#, c-format
@@ -3036,7 +3039,7 @@
#: Merge.rc:1860
#, c-format
msgid "Automatically resize panes\nLock Panes"
-msgstr ""
+msgstr "Panelek automatikus \xE1tm\xE9retez\xE9se\nPanelek r\xF6gz\xEDt\xE9se"
#: Merge.rc:1866
#, c-format
@@ -3217,7 +3220,7 @@
#: Merge.rc:2336
#, c-format
msgid "Differences"
-msgstr ""
+msgstr "Elt\xE9r\xE9sek"
#: Merge.rc:1974
#, c-format
@@ -3227,22 +3230,22 @@
#: Merge.rc:1975
#, c-format
msgid "From left:"
-msgstr ""
+msgstr "Balr\xF3l:"
#: Merge.rc:1976
#, c-format
msgid "To left:"
-msgstr ""
+msgstr "Jobbra:"
#: Merge.rc:1977
#, c-format
msgid "From right:"
-msgstr ""
+msgstr "Jobbr\xF3l:"
#: Merge.rc:1978
#, c-format
msgid "To right:"
-msgstr ""
+msgstr "Jobbra:"
#: Merge.rc:1984
#, c-format
@@ -3252,12 +3255,12 @@
#: Merge.rc:1985
#, c-format
msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
#: Merge.rc:1986
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1992
#, c-format
@@ -3378,7 +3381,7 @@
#: Merge.rc:2037
#, c-format
msgid "Size"
-msgstr ""
+msgstr "M\xE9ret"
#: Merge.rc:2043
#: Merge.rc:2569
@@ -3473,7 +3476,7 @@
#: Merge.rc:2068
#, c-format
msgid "Regular expression"
-msgstr ""
+msgstr "Regul\xE1ris kifejez\xE9s"
#: Merge.rc:2074
#, c-format
@@ -3568,12 +3571,12 @@
#: Merge.rc:2108
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Utols\xF3 m\xFBvelet visszavon\xE1sa..."
#: Merge.rc:2109
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "El\xF5z\xF5 m\xFBvelet \xFAjb\xF3li alkalmaz\xE1sa..."
#: Merge.rc:2115
#, c-format
@@ -3692,12 +3695,12 @@
#: Merge.rc:2151
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "Hiba a konfliktusf\xE1jl \xE9rtelmez\xE9sekor."
#: Merge.rc:2152
#, c-format
msgid "The file\n%1\nis not a conflict file."
-msgstr ""
+msgstr "A f\xE1jl\n%1\nnem egy konfliktus f\xE1jl."
#: Merge.rc:2158
#, c-format
@@ -3811,7 +3814,7 @@
#: Merge.rc:2170
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
-msgstr ""
+msgstr "Egy m\xE1sik alkalmaz\xE1s m\xF3dos\xEDtotta a f\xE1jlt\n%1\nmi\xF3ta a WinMerge utolj\xE1ra vizsg\xE1lta.\n\nSzeretn\xE9 \xFAjra bet\xF6lteni a f\xE1jlt?"
#: Merge.rc:2171
#, c-format
@@ -3826,7 +3829,7 @@
#: Merge.rc:2173
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
-msgstr ""
+msgstr "A f\xE1jl\n%1\nelt\xFBnt. A folytat\xE1shoz mentse el a f\xE1jlt."
#: Merge.rc:2179
#, c-format
@@ -4097,7 +4100,7 @@
#: Merge.rc:2259
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Mozgat\xE1s meger\xF5s\xEDt\xE9se"
#: Merge.rc:2265
#, c-format
@@ -4132,7 +4135,7 @@
#: Merge.rc:2271
#, c-format
msgid "Failed to execute external editor: %1"
-msgstr ""
+msgstr "Nem siker\xFClt elind\xEDtani a k\xFCls\xF5 szerkeszt\xF5t: %1"
#: Merge.rc:2272
#, c-format
@@ -4343,12 +4346,12 @@
#: Merge.rc:2347
#, c-format
msgid "Left only: %1"
-msgstr ""
+msgstr "Csak bal: %1"
#: Merge.rc:2348
#, c-format
msgid "Right only: %1"
-msgstr ""
+msgstr "Csak jobb: %1"
#: Merge.rc:2349
#, c-format
@@ -4368,7 +4371,7 @@
#: Merge.rc:2353
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "A k\xF6nyvt\xE1rak k\xFCl\xF6nb\xF6znek"
#: Merge.rc:2354
#, c-format
@@ -4383,17 +4386,17 @@
#: Merge.rc:2357
#, c-format
msgid "Error"
-msgstr ""
+msgstr "Hiba"
#: Merge.rc:2358
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "A sz\xF6vegf\xE1jlok megegyeznek"
#: Merge.rc:2363
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "A sz\xF6vegf\xE1jlok k\xFCl\xF6nb\xF6znek"
#: Merge.rc:2369
#, c-format
@@ -4523,12 +4526,12 @@
#: Merge.rc:2409
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr ""
+msgstr "Mell\xF5z\xF6tt k\xFCl\xF6nbs\xE9gek sz\xE1ma a f\xE1jlban. Ezeket a k\xFCl\xF6nbs\xE9geket a WinMerge mell\xF5zte \xE9s nem olvaszthat\xF3k."
#: Merge.rc:2410
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
-msgstr ""
+msgstr "K\xFCl\xF6nbs\xE9gek sz\xE1ma a f\xE1jlban. Ez a sz\xE1m nem tartalmazza a mell\xF5z\xF6tt k\xFCl\xF6nbs\xE9geket."
#: Merge.rc:2411
#, c-format
@@ -4558,7 +4561,7 @@
#: Merge.rc:2421
#, c-format
msgid "Simple XML"
-msgstr ""
+msgstr "Egyszer\xFB XML"
#: Merge.rc:2423
#, c-format
@@ -4858,6 +4861,9 @@
"\n"
"Do you want to continue?"
msgstr ""
+"T\xF6bb nyitott \xF6sszehasonl\xEDt\xF3 ablak bez\xE1r\xE1sa k\xF6vetkezik.\n"
+"\n"
+"Biztosan folytatja?"
#: Merge.rc:2519
#, c-format
@@ -5133,27 +5139,27 @@
#: Merge.rc:2603
#, c-format
msgid "Refresh selected items"
-msgstr ""
+msgstr "Kiv\xE1lasztott elemek friss\xEDt\xE9se"
#: Merge.rc:2604
#, c-format
msgid "Toggle bookmark"
-msgstr ""
+msgstr "K\xF6nyvjelz\xF5 ki/be"
#: Merge.rc:2605
#, c-format
msgid "Go to next bookmark"
-msgstr ""
+msgstr "Ugr\xE1s a k\xF6vetkez\xF5 k\xF6nyvjelz\xF5re"
#: Merge.rc:2606
#, c-format
msgid "Go to previous bookmark"
-msgstr ""
+msgstr "Ugr\xE1s az el\xF5z\xF5 k\xF6nyvjelz\xF5re"
#: Merge.rc:2607
#, c-format
msgid "Clear all bookmarks"
-msgstr ""
+msgstr "\xD6sszes k\xF6nyvjelz\xF5 t\xF6rl\xE9se"
#: Merge.rc:2613
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-21 08:42:48
|
Revision: 7507
http://winmerge.svn.sourceforge.net/winmerge/?rev=7507&view=rev
Author: gerundt
Date: 2011-01-21 08:42:41 +0000 (Fri, 21 Jan 2011)
Log Message:
-----------
Fixing 64-bit build warnings.
Modified Paths:
--------------
trunk/Src/DirViewColItems.cpp
trunk/Src/paths.cpp
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2011-01-04 15:53:35 UTC (rev 7506)
+++ trunk/Src/DirViewColItems.cpp 2011-01-21 08:42:41 UTC (rev 7507)
@@ -219,15 +219,15 @@
return s;
}
- int i = 0, j = 0;
+ size_t i = 0, j = 0;
do
{
- int i_ahead = s.find('\\', i);
- int j_ahead = t.find('\\', j);
- int length_s = (i_ahead != String::npos ? i_ahead : s.length()) - i;
- int length_t = (j_ahead != String::npos ? j_ahead : t.length()) - j;
+ size_t i_ahead = s.find('\\', i);
+ size_t j_ahead = t.find('\\', j);
+ size_t length_s = (i_ahead != String::npos ? i_ahead : s.length()) - i;
+ size_t length_t = (j_ahead != String::npos ? j_ahead : t.length()) - j;
if (length_s != length_t ||
- !StrIsIntlEqual(FALSE, s.c_str() + i, t.c_str() + j, length_s))
+ !StrIsIntlEqual(FALSE, s.c_str() + i, t.c_str() + j, (int)length_s))
{
String u(t.c_str() + j, length_t + 1);
u[length_t] = '|';
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2011-01-04 15:53:35 UTC (rev 7506)
+++ trunk/Src/paths.cpp 2011-01-21 08:42:41 UTC (rev 7507)
@@ -38,8 +38,8 @@
*/
bool paths_EndsWithSlash(LPCTSTR s)
{
- if (int len = _tcslen(s))
- return IsSlash(s, len - 1);
+ if (size_t len = _tcslen(s))
+ return IsSlash(s, (int)len - 1);
return false;
}
@@ -101,7 +101,7 @@
*/
void paths_normalize(String & sPath)
{
- int len = sPath.length();
+ size_t len = sPath.length();
if (!len)
return;
@@ -167,7 +167,7 @@
String paths_GetLongPath(LPCTSTR szPath, BOOL bExpandEnvs)
{
String sPath = szPath;
- int len = sPath.length();
+ size_t len = sPath.length();
if (len < 1)
return sPath;
@@ -492,7 +492,7 @@
String paths_GetParentPath(LPCTSTR path)
{
String parentPath(path);
- int len = parentPath.length();
+ size_t len = parentPath.length();
// Remove last '\' from paths
if (parentPath[len - 1] == '\\')
@@ -502,7 +502,7 @@
}
// Remove last part of path
- int pos = parentPath.rfind('\\');
+ size_t pos = parentPath.rfind('\\');
if (pos > -1)
{
@@ -523,7 +523,7 @@
String paths_GetLastSubdir(const String & path)
{
String parentPath(path);
- int len = parentPath.length();
+ size_t len = parentPath.length();
// Remove last '\' from paths
if (parentPath[len - 1] == '\\')
@@ -533,7 +533,7 @@
}
// Find last part of path
- int pos = parentPath.find_last_of('\\');
+ size_t pos = parentPath.find_last_of('\\');
if (pos >= 2)
parentPath.erase(0, pos);
return parentPath;
@@ -549,7 +549,7 @@
if (path.length() < 3)
return FALSE;
- int pos = path.find_last_of('\\');
+ size_t pos = path.find_last_of('\\');
// Absolute path must have "\" and cannot start with it.
// Also "\\blahblah" is invalid.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-04 15:53:41
|
Revision: 7506
http://winmerge.svn.sourceforge.net/winmerge/?rev=7506&view=rev
Author: gerundt
Date: 2011-01-04 15:53:35 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Update copyright to 2011
Modified Paths:
--------------
branches/R2_14/Src/Merge.rc
Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc 2011-01-04 15:53:22 UTC (rev 7505)
+++ branches/R2_14/Src/Merge.rc 2011-01-04 15:53:35 UTC (rev 7506)
@@ -1715,7 +1715,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(c) 1996-2010 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(c) 1996-2011 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-04 15:53:28
|
Revision: 7505
http://winmerge.svn.sourceforge.net/winmerge/?rev=7505&view=rev
Author: gerundt
Date: 2011-01-04 15:53:22 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Update copyright to 2011
Modified Paths:
--------------
trunk/Src/Merge.rc
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2011-01-03 14:54:32 UTC (rev 7504)
+++ trunk/Src/Merge.rc 2011-01-04 15:53:22 UTC (rev 7505)
@@ -1724,7 +1724,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(c) 1996-2010 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(c) 1996-2011 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-03 14:54:38
|
Revision: 7504
http://winmerge.svn.sourceforge.net/winmerge/?rev=7504&view=rev
Author: gerundt
Date: 2011-01-03 14:54:32 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
VC2010 does not accept a dot to serve as a class resolution operator
Modified Paths:
--------------
branches/R2_14/Src/Common/coretools.cpp
Modified: branches/R2_14/Src/Common/coretools.cpp
===================================================================
--- branches/R2_14/Src/Common/coretools.cpp 2011-01-03 14:53:07 UTC (rev 7503)
+++ branches/R2_14/Src/Common/coretools.cpp 2011-01-03 14:54:32 UTC (rev 7504)
@@ -275,7 +275,7 @@
{
String sViewName(s);
size_t nOffset = sViewName.find(_T("@@"));
- if (nOffset != std::string::npos)
+ if (nOffset != String::npos)
{
sViewName.erase(nOffset);
SplitFilename(sViewName.c_str(), path, name, ext);
@@ -770,7 +770,7 @@
sCmdLine.erase(clpos, clpos - sCmdLine.length());
std::string::size_type pos = sCmdLine.find(_T(" "));
- if (pos != std::string.npos)
+ if (pos != String::npos)
{
// First space was before switch, we don't need "s
// (executable path didn't contain spaces)
@@ -790,7 +790,7 @@
prevPos = pos;
pos = sCmdLine.find(_T(" "), prevPos + 1);
- if (pos != std::string.npos)
+ if (pos != String::npos)
{
if (sCmdLine[pos + 1] == '/' || sCmdLine[pos + 1] == '-')
{
@@ -805,7 +805,7 @@
if (addQuote)
{
- if (pos != std::string.npos)
+ if (pos != String::npos)
{
sExecutable = sCmdLine.substr(0, pos);
sDecoratedCmdLine += sExecutable;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-03 14:53:13
|
Revision: 7503
http://winmerge.svn.sourceforge.net/winmerge/?rev=7503&view=rev
Author: gerundt
Date: 2011-01-03 14:53:07 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Fix couple of 64-bit build warnings.
Modified Paths:
--------------
branches/R2_14/Src/Common/coretools.cpp
Modified: branches/R2_14/Src/Common/coretools.cpp
===================================================================
--- branches/R2_14/Src/Common/coretools.cpp 2011-01-03 13:46:19 UTC (rev 7502)
+++ branches/R2_14/Src/Common/coretools.cpp 2011-01-03 14:53:07 UTC (rev 7503)
@@ -237,7 +237,7 @@
if (pPath)
{
// Grab directory (omit trailing slash)
- int len = pszChar - pathLeft;
+ size_t len = pszChar - pathLeft;
if (*pszChar == ':')
++len; // Keep trailing colon ( eg, C:filename.txt)
*pPath = pathLeft;
@@ -265,7 +265,7 @@
if (pFile && pExt && extptr)
{
- int extlen = pend - extptr;
+ size_t extlen = pend - extptr;
pFile->erase(pFile->length() - extlen);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-03 13:46:25
|
Revision: 7502
http://winmerge.svn.sourceforge.net/winmerge/?rev=7502&view=rev
Author: gerundt
Date: 2011-01-03 13:46:19 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
PATCH: #3010934 custom code as String or integer
Fixes bug item #2813825
Patch submitted by Matthias Mayer
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/PropCodepage.cpp
branches/R2_14/Src/PropCodepage.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2011-01-03 13:29:00 UTC (rev 7501)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2011-01-03 13:46:19 UTC (rev 7502)
@@ -15,6 +15,7 @@
Add /xq command line switch for closing WinMerge after identical files
and not showing message (#2827836)
Allow setting codepage from command line (#2725549)
+ Allow giving encoding name as custom codepage (#2813825, #3010934)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Bugfix: Pane headers not updated after language change (#2923684)
Modified: branches/R2_14/Src/PropCodepage.cpp
===================================================================
--- branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:29:00 UTC (rev 7501)
+++ branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:46:19 UTC (rev 7502)
@@ -33,6 +33,7 @@
#include "OptionsDef.h"
#include "OptionsMgr.h"
#include "OptionsPanel.h"
+#include "charsets.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -53,7 +54,7 @@
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(PropCodepage)
DDX_Radio(pDX, IDC_CP_SYSTEM, m_nCodepageSystem);
- DDX_Text(pDX, IDC_CUSTOM_CP_NUMBER, m_nCustomCodepageValue);
+ DDX_Text(pDX, IDC_CUSTOM_CP_NUMBER, m_cCustomCodepageValue);
DDX_Check(pDX, IDC_DETECT_CODEPAGE, m_bDetectCodepage);
//}}AFX_DATA_MAP
}
@@ -74,6 +75,7 @@
{
m_nCodepageSystem = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_MODE);
m_nCustomCodepageValue = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_CUSTOM);
+ m_cCustomCodepageValue.Format(_T("%d"),m_nCustomCodepageValue);
m_bDetectCodepage = GetOptionsMgr()->GetBool(OPT_CP_DETECT);
}
@@ -83,6 +85,7 @@
void PropCodepage::WriteOptions()
{
GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
+ GetEncodingCodePageFromNameString();
GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
GetOptionsMgr()->SaveOption(OPT_CP_DETECT, m_bDetectCodepage == TRUE);
}
@@ -118,3 +121,20 @@
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);
}
+
+void PropCodepage::GetEncodingCodePageFromNameString()
+{
+ int nCustomCodepageValue = _ttol(m_cCustomCodepageValue);
+ if (nCustomCodepageValue == 0)
+ {
+ char *result= new char[80];
+ long len = wcslen(m_cCustomCodepageValue);
+ _wcstombsz(result, m_cCustomCodepageValue, len); //conversion to char *
+ result[len] = '\0'; //don't forget to put the caracter of terminated string
+ nCustomCodepageValue = GetEncodingCodePageFromName(result);
+ delete [] result;
+ }
+ //if found a new codepage valid
+ if (nCustomCodepageValue)
+ m_nCustomCodepageValue = nCustomCodepageValue;
+}
Modified: branches/R2_14/Src/PropCodepage.h
===================================================================
--- branches/R2_14/Src/PropCodepage.h 2011-01-03 13:29:00 UTC (rev 7501)
+++ branches/R2_14/Src/PropCodepage.h 2011-01-03 13:46:19 UTC (rev 7502)
@@ -45,6 +45,7 @@
// Generated message map functions
//{{AFX_MSG(PropCodepage)
virtual BOOL OnInitDialog();
+ void GetEncodingCodePageFromNameString();
afx_msg void OnCpSystem();
afx_msg void OnCpCustom();
afx_msg void OnCpUi();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-03 13:29:08
|
Revision: 7501
http://winmerge.svn.sourceforge.net/winmerge/?rev=7501&view=rev
Author: gerundt
Date: 2011-01-03 13:29:00 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Add new OptionsPanel class as base class for WinMerge option dialogs.
Modified Paths:
--------------
branches/R2_14/Src/Merge.vcproj
branches/R2_14/Src/MergeX64.vcproj
branches/R2_14/Src/PropArchive.cpp
branches/R2_14/Src/PropArchive.h
branches/R2_14/Src/PropBackups.cpp
branches/R2_14/Src/PropBackups.h
branches/R2_14/Src/PropCodepage.cpp
branches/R2_14/Src/PropCodepage.h
branches/R2_14/Src/PropColors.cpp
branches/R2_14/Src/PropColors.h
branches/R2_14/Src/PropCompare.cpp
branches/R2_14/Src/PropCompare.h
branches/R2_14/Src/PropEditor.cpp
branches/R2_14/Src/PropEditor.h
branches/R2_14/Src/PropGeneral.cpp
branches/R2_14/Src/PropGeneral.h
branches/R2_14/Src/PropRegistry.cpp
branches/R2_14/Src/PropRegistry.h
branches/R2_14/Src/PropShell.cpp
branches/R2_14/Src/PropShell.h
branches/R2_14/Src/PropSyntaxColors.cpp
branches/R2_14/Src/PropSyntaxColors.h
branches/R2_14/Src/PropTextColors.cpp
branches/R2_14/Src/PropTextColors.h
branches/R2_14/Src/PropVss.cpp
branches/R2_14/Src/PropVss.h
Added Paths:
-----------
branches/R2_14/Src/OptionsPanel.cpp
branches/R2_14/Src/OptionsPanel.h
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/Merge.vcproj 2011-01-03 13:29:00 UTC (rev 7501)
@@ -2544,6 +2544,35 @@
</FileConfiguration>
</File>
<File
+ RelativePath="OptionsPanel.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="OutputDlg.cpp"
>
<FileConfiguration
@@ -4492,6 +4521,10 @@
>
</File>
<File
+ RelativePath="OptionsPanel.h"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.h"
>
</File>
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/MergeX64.vcproj 2011-01-03 13:29:00 UTC (rev 7501)
@@ -4576,6 +4576,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\OptionsPanel.cpp"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.cpp"
>
<FileConfiguration
@@ -7707,6 +7711,10 @@
>
</File>
<File
+ RelativePath=".\OptionsPanel.h"
+ >
+ </File>
+ <File
RelativePath="OutputDlg.h"
>
</File>
Added: branches/R2_14/Src/OptionsPanel.cpp
===================================================================
--- branches/R2_14/Src/OptionsPanel.cpp (rev 0)
+++ branches/R2_14/Src/OptionsPanel.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -0,0 +1,20 @@
+/**
+ * @file OptionsPanel.cpp
+ *
+ * @brief Implementation of OptionsPanel class.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include "OptionsMgr.h"
+#include "OptionsPanel.h"
+
+/**
+ * @brief Constructor.
+ */
+OptionsPanel::OptionsPanel(COptionsMgr *optionsMgr, UINT nIDTemplate)
+ : CPropertyPage(nIDTemplate)
+ , m_pOptionsMgr(optionsMgr)
+{
+}
Property changes on: branches/R2_14/Src/OptionsPanel.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Src/OptionsPanel.h
===================================================================
--- branches/R2_14/Src/OptionsPanel.h (rev 0)
+++ branches/R2_14/Src/OptionsPanel.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -0,0 +1,32 @@
+/**
+ * @file OptionsPanel.h
+ *
+ * @brief Declaration file for OptionsPanel class.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _OPTIONS_PANEL_H_
+#define _OPTIONS_PANEL_H_
+
+#include "IOptionsPanel.h"
+
+class COptionsMgr;
+
+/**
+ * @brief A base class for WinMerge options dialogs.
+ */
+class OptionsPanel : public CPropertyPage, public IOptionsPanel
+{
+public:
+ OptionsPanel(COptionsMgr *optionsMgr, UINT nIDTemplate);
+
+protected:
+ COptionsMgr * GetOptionsMgr() const { return m_pOptionsMgr; }
+
+private:
+ COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
+};
+
+#endif // _OPTIONS_PANEL_H_
Property changes on: branches/R2_14/Src/OptionsPanel.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/R2_14/Src/PropArchive.cpp
===================================================================
--- branches/R2_14/Src/PropArchive.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropArchive.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -12,6 +12,7 @@
#include "PropArchive.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -22,18 +23,13 @@
// PropArchive dialog
PropArchive::PropArchive(COptionsMgr *optionsMgr)
-: CPropertyPage(PropArchive::IDD)
-, m_pOptionsMgr(optionsMgr)
+: OptionsPanel(optionsMgr, PropArchive::IDD)
, m_bEnableSupport(false)
, m_nInstallType(0)
, m_bProbeType(false)
{
}
-PropArchive::~PropArchive()
-{
-}
-
/**
* @brief Sets update handlers for dialog controls.
*/
@@ -56,10 +52,10 @@
*/
void PropArchive::ReadOptions()
{
- int enable = m_pOptionsMgr->GetInt(OPT_ARCHIVE_ENABLE);
+ int enable = GetOptionsMgr()->GetInt(OPT_ARCHIVE_ENABLE);
m_bEnableSupport = enable > 0;
m_nInstallType = enable > 1 ? enable - 1 : 0;
- m_bProbeType = m_pOptionsMgr->GetBool(OPT_ARCHIVE_PROBETYPE);
+ m_bProbeType = GetOptionsMgr()->GetBool(OPT_ARCHIVE_PROBETYPE);
}
/**
@@ -68,10 +64,10 @@
void PropArchive::WriteOptions()
{
if (m_bEnableSupport)
- m_pOptionsMgr->SaveOption(OPT_ARCHIVE_ENABLE, m_nInstallType + 1);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, m_nInstallType + 1);
else
- m_pOptionsMgr->SaveOption(OPT_ARCHIVE_ENABLE, (int)0);
- m_pOptionsMgr->SaveOption(OPT_ARCHIVE_PROBETYPE, m_bProbeType == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, (int)0);
+ GetOptionsMgr()->SaveOption(OPT_ARCHIVE_PROBETYPE, m_bProbeType == TRUE);
}
/**
Modified: branches/R2_14/Src/PropArchive.h
===================================================================
--- branches/R2_14/Src/PropArchive.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropArchive.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,18 +11,17 @@
#define _PROP_ARCHIVE_H_
#include "StatLink.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
/**
* @brief Class for Archive Support options page.
*/
-class PropArchive : public CPropertyPage
+class PropArchive : public OptionsPanel
{
public:
PropArchive(COptionsMgr *optionsMgr);
- virtual ~PropArchive();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -44,8 +43,5 @@
BOOL m_bEnableSupport;
int m_nInstallType;
BOOL m_bProbeType;
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
};
#endif // _PROP_ARCHIVE_H_
Modified: branches/R2_14/Src/PropBackups.cpp
===================================================================
--- branches/R2_14/Src/PropBackups.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropBackups.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropBackups.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#include "FileOrFolderSelect.h"
#ifdef _DEBUG
@@ -19,16 +20,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-
-// PropBackups dialog
-
/**
* @brief Constructor taking OptionsManager parameter.
* @param [in] optionsMgr Pointer to OptionsManager.
*/
PropBackups::PropBackups(COptionsMgr *optionsMgr)
- : CPropertyPage(PropBackups::IDD)
- , m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropBackups::IDD)
, m_bCreateForFolderCmp(FALSE)
, m_bCreateForFileCmp(FALSE)
, m_bAppendBak(FALSE)
@@ -37,13 +34,6 @@
{
}
-/**
- * @brief Destructor.
- */
-PropBackups::~PropBackups()
-{
-}
-
void PropBackups::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -66,12 +56,12 @@
*/
void PropBackups::ReadOptions()
{
- m_bCreateForFolderCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FOLDERCMP);
- m_bCreateForFileCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FILECMP);
- m_nBackupFolder = m_pOptionsMgr->GetInt(OPT_BACKUP_LOCATION);
- m_sGlobalFolder = m_pOptionsMgr->GetString(OPT_BACKUP_GLOBALFOLDER).c_str();
- m_bAppendBak = m_pOptionsMgr->GetBool(OPT_BACKUP_ADD_BAK);
- m_bAppendTime = m_pOptionsMgr->GetBool(OPT_BACKUP_ADD_TIME);
+ m_bCreateForFolderCmp = GetOptionsMgr()->GetBool(OPT_BACKUP_FOLDERCMP);
+ m_bCreateForFileCmp = GetOptionsMgr()->GetBool(OPT_BACKUP_FILECMP);
+ m_nBackupFolder = GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION);
+ m_sGlobalFolder = GetOptionsMgr()->GetString(OPT_BACKUP_GLOBALFOLDER).c_str();
+ m_bAppendBak = GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_BAK);
+ m_bAppendTime = GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_TIME);
}
/**
@@ -87,12 +77,12 @@
m_sGlobalFolder += "\\";
}
- m_pOptionsMgr->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_LOCATION, m_nBackupFolder);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_GLOBALFOLDER, m_sGlobalFolder);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_ADD_BAK, m_bAppendBak == TRUE);
- m_pOptionsMgr->SaveOption(OPT_BACKUP_ADD_TIME, m_bAppendTime == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_LOCATION, m_nBackupFolder);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_GLOBALFOLDER, m_sGlobalFolder);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_ADD_BAK, m_bAppendBak == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_BACKUP_ADD_TIME, m_bAppendTime == TRUE);
}
/**
Modified: branches/R2_14/Src/PropBackups.h
===================================================================
--- branches/R2_14/Src/PropBackups.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropBackups.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -10,18 +10,17 @@
#ifndef _PROPBACKUPS_H_
#define _PROPBACKUPS_H_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
/**
* @brief A class for Backup file options page.
*/
-class PropBackups : public CPropertyPage
+class PropBackups : public OptionsPanel
{
public:
PropBackups(COptionsMgr *optionsMgr);
- virtual ~PropBackups();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -50,9 +49,6 @@
afx_msg void OnBnClickedBackupBrowse();
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
};
#endif // _PROPBACKUPS_H_
Modified: branches/R2_14/Src/PropCodepage.cpp
===================================================================
--- branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -32,6 +32,7 @@
#include "PropCodepage.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -39,22 +40,14 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropCodepage property page
-
PropCodepage::PropCodepage(COptionsMgr *optionsMgr)
- : CPropertyPage(PropCodepage::IDD)
-, m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropCodepage::IDD)
, m_nCodepageSystem(-1)
, m_nCustomCodepageValue(0)
, m_bDetectCodepage(FALSE)
{
}
-PropCodepage::~PropCodepage()
-{
-}
-
void PropCodepage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
@@ -79,9 +72,9 @@
*/
void PropCodepage::ReadOptions()
{
- m_nCodepageSystem = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_MODE);
- m_nCustomCodepageValue = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_CUSTOM);
- m_bDetectCodepage = m_pOptionsMgr->GetBool(OPT_CP_DETECT);
+ m_nCodepageSystem = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_MODE);
+ m_nCustomCodepageValue = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_CUSTOM);
+ m_bDetectCodepage = GetOptionsMgr()->GetBool(OPT_CP_DETECT);
}
/**
@@ -89,14 +82,11 @@
*/
void PropCodepage::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
- m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
- m_pOptionsMgr->SaveOption(OPT_CP_DETECT, m_bDetectCodepage == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
+ GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
+ GetOptionsMgr()->SaveOption(OPT_CP_DETECT, m_bDetectCodepage == TRUE);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropCodepage message handlers
-
BOOL PropCodepage::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
Modified: branches/R2_14/Src/PropCodepage.h
===================================================================
--- branches/R2_14/Src/PropCodepage.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCodepage.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,19 +9,15 @@
#if !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)
#define AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropCodepage dialog
-
-class PropCodepage : public CPropertyPage, public IOptionsPanel
+class PropCodepage : public OptionsPanel
{
// Construction
public:
PropCodepage(COptionsMgr *optionsMgr);
- ~PropCodepage();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -32,6 +28,7 @@
enum { IDD = IDD_PROPPAGE_CODEPAGE };
int m_nCodepageSystem;
int m_nCustomCodepageValue;
+ CString m_cCustomCodepageValue;
BOOL m_bDetectCodepage;
//}}AFX_DATA
@@ -53,9 +50,6 @@
afx_msg void OnCpUi();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropColors.cpp
===================================================================
--- branches/R2_14/Src/PropColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropColors.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropColors.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -20,15 +21,11 @@
static const TCHAR Section[] = _T("Custom Colors");
-/////////////////////////////////////////////////////////////////////////////
-// PropMergeColors dialog
-
/**
* @brief Default constructor.
*/
PropMergeColors::PropMergeColors(COptionsMgr *optionsMgr)
- : CPropertyPage(PropMergeColors::IDD)
-, m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropMergeColors::IDD)
{
}
@@ -293,16 +290,16 @@
switch (op)
{
case SET_DEFAULTS:
- m_pOptionsMgr->GetDefault(optionName, color);
+ GetOptionsMgr()->GetDefault(optionName, color);
btn.SetColor(color);
return;
case WRITE_OPTIONS:
- m_pOptionsMgr->SaveOption(optionName, (int)color);
+ GetOptionsMgr()->SaveOption(optionName, (int)color);
return;
case READ_OPTIONS:
- color = m_pOptionsMgr->GetInt(optionName);
+ color = GetOptionsMgr()->GetInt(optionName);
// Set colors for buttons, do NOT invalidate
btn.SetColor(color, FALSE);
return;
Modified: branches/R2_14/Src/PropColors.h
===================================================================
--- branches/R2_14/Src/PropColors.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropColors.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -12,17 +12,14 @@
#include "ColorButton.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
const int CustomColorsAmount = 16;
-/////////////////////////////////////////////////////////////////////////////
-// PropMergeColors dialog
-
/** @brief Property page for colors options; used in options property sheet */
-class PropMergeColors : public CPropertyPage, public IOptionsPanel
+class PropMergeColors : public OptionsPanel
{
// Construction
public:
@@ -123,9 +120,6 @@
afx_msg void OnDefaults();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropCompare.cpp
===================================================================
--- branches/R2_14/Src/PropCompare.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCompare.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropCompare.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -18,16 +19,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropCompare property page
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to COptionsMgr.
*/
-PropCompare::PropCompare(COptionsMgr *optionsMgr) : CPropertyPage(PropCompare::IDD)
- , m_pOptionsMgr(optionsMgr)
- , m_compareMethod(-1)
+PropCompare::PropCompare(COptionsMgr *optionsMgr)
+ : OptionsPanel(optionsMgr, PropCompare::IDD)
, m_bIgnoreCase(FALSE)
, m_bIgnoreBlankLines(FALSE)
, m_bIgnoreEol(TRUE)
@@ -72,16 +69,16 @@
*/
void PropCompare::ReadOptions()
{
- m_nIgnoreWhite = m_pOptionsMgr->GetInt(OPT_CMP_IGNORE_WHITESPACE);
- m_bIgnoreBlankLines = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_BLANKLINES);
- m_bFilterCommentsLines = m_pOptionsMgr->GetBool(OPT_CMP_FILTER_COMMENTLINES);
- m_bIgnoreCase = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_CASE);
- m_bIgnoreEol = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_EOL) ? true : false;
- m_bMovedBlocks = m_pOptionsMgr->GetBool(OPT_CMP_MOVED_BLOCKS);
- m_bMatchSimilarLines = m_pOptionsMgr->GetBool(OPT_CMP_MATCH_SIMILAR_LINES);
- m_compareMethod = m_pOptionsMgr->GetInt(OPT_CMP_METHOD);
- m_bStopAfterFirst = m_pOptionsMgr->GetBool(OPT_CMP_STOP_AFTER_FIRST);
- m_bIgnoreSmallTimeDiff = m_pOptionsMgr->GetBool(OPT_IGNORE_SMALL_FILETIME);
+ m_nIgnoreWhite = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
+ m_bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
+ m_bFilterCommentsLines = GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES);
+ m_bIgnoreCase = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CASE);
+ m_bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL) ? true : false;
+ m_bMovedBlocks = GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS);
+ m_bMatchSimilarLines = GetOptionsMgr()->GetBool(OPT_CMP_MATCH_SIMILAR_LINES);
+ m_compareMethod = GetOptionsMgr()->GetInt(OPT_CMP_METHOD);
+ m_bStopAfterFirst = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
+ m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
}
/**
@@ -91,21 +88,18 @@
*/
void PropCompare::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_WHITESPACE, m_nIgnoreWhite);
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_BLANKLINES, m_bIgnoreBlankLines == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_FILTER_COMMENTLINES, m_bFilterCommentsLines == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_EOL, m_bIgnoreEol == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_CASE, m_bIgnoreCase == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
- m_pOptionsMgr->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
- m_pOptionsMgr->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_WHITESPACE, m_nIgnoreWhite);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_BLANKLINES, m_bIgnoreBlankLines == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_FILTER_COMMENTLINES, m_bFilterCommentsLines == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_EOL, m_bIgnoreEol == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_CASE, m_bIgnoreCase == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
+ GetOptionsMgr()->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropCompare message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
@@ -143,23 +137,23 @@
void PropCompare::OnDefaults()
{
DWORD tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_METHOD, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_METHOD, tmp);
m_compareMethod = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_WHITESPACE, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_WHITESPACE, tmp);
m_nIgnoreWhite = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_EOL, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_EOL, tmp);
m_bIgnoreEol = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_BLANKLINES, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_BLANKLINES, tmp);
m_bIgnoreBlankLines = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_FILTER_COMMENTLINES, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_FILTER_COMMENTLINES, tmp);
m_bFilterCommentsLines = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_IGNORE_CASE, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_CASE, tmp);
m_bIgnoreCase = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_MOVED_BLOCKS, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_MOVED_BLOCKS, tmp);
m_bMovedBlocks = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_MATCH_SIMILAR_LINES, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_MATCH_SIMILAR_LINES, tmp);
m_bMatchSimilarLines = tmp;
- m_pOptionsMgr->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
+ GetOptionsMgr()->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
m_bStopAfterFirst = tmp;
UpdateData(FALSE);
}
Modified: branches/R2_14/Src/PropCompare.h
===================================================================
--- branches/R2_14/Src/PropCompare.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropCompare.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,13 +9,10 @@
#ifndef _PROPPAGE_COMPARE_H_
#define _PROPPAGE_COMPARE_H_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropCompare dialog
-
/**
* @brief Property page to set compare options for WinMerge.
*
@@ -33,7 +30,7 @@
*
* @author Tim Musschoot, several modifications by others
*/
-class PropCompare : public CPropertyPage, public IOptionsPanel
+class PropCompare : public OptionsPanel
{
// Construction
public:
@@ -75,9 +72,6 @@
afx_msg void OnCbnSelchangeComparemethodcombo();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropEditor.cpp
===================================================================
--- branches/R2_14/Src/PropEditor.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropEditor.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "PropEditor.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -21,15 +22,12 @@
/** @brief Maximum size for tabs in spaces. */
static const int MAX_TABSIZE = 64;
-/////////////////////////////////////////////////////////////////////////////
-// PropEditor dialog
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to options manager for handling options.
*/
-PropEditor::PropEditor(COptionsMgr *optionsMgr) : CPropertyPage(PropEditor::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropEditor::PropEditor(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropEditor::IDD)
, m_bHiliteSyntax(FALSE)
, m_nTabType(-1)
, m_nTabSize(0)
@@ -74,14 +72,14 @@
*/
void PropEditor::ReadOptions()
{
- m_nTabSize = m_pOptionsMgr->GetInt(OPT_TAB_SIZE);
- m_nTabType = m_pOptionsMgr->GetInt(OPT_TAB_TYPE);
- m_bAutomaticRescan = m_pOptionsMgr->GetBool(OPT_AUTOMATIC_RESCAN);
- m_bHiliteSyntax = m_pOptionsMgr->GetBool(OPT_SYNTAX_HIGHLIGHT);
- m_bAllowMixedEol = m_pOptionsMgr->GetBool(OPT_ALLOW_MIXED_EOL);
- m_bViewLineDifferences = m_pOptionsMgr->GetBool(OPT_WORDDIFF_HIGHLIGHT);
- m_bBreakOnWords = m_pOptionsMgr->GetBool(OPT_BREAK_ON_WORDS);
- m_nBreakType = m_pOptionsMgr->GetInt(OPT_BREAK_TYPE);
+ m_nTabSize = GetOptionsMgr()->GetInt(OPT_TAB_SIZE);
+ m_nTabType = GetOptionsMgr()->GetInt(OPT_TAB_TYPE);
+ m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
+ m_bHiliteSyntax = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
+ m_bAllowMixedEol = GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL);
+ m_bViewLineDifferences = GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT);
+ m_bBreakOnWords = GetOptionsMgr()->GetBool(OPT_BREAK_ON_WORDS);
+ m_nBreakType = GetOptionsMgr()->GetInt(OPT_BREAK_TYPE);
}
/**
@@ -94,19 +92,16 @@
m_nTabSize = 1;
if (m_nTabSize > MAX_TABSIZE)
m_nTabSize = MAX_TABSIZE;
- m_pOptionsMgr->SaveOption(OPT_TAB_SIZE, (int)m_nTabSize);
- m_pOptionsMgr->SaveOption(OPT_TAB_TYPE, (int)m_nTabType);
- m_pOptionsMgr->SaveOption(OPT_AUTOMATIC_RESCAN, m_bAutomaticRescan == TRUE);
- m_pOptionsMgr->SaveOption(OPT_ALLOW_MIXED_EOL, m_bAllowMixedEol == TRUE);
- m_pOptionsMgr->SaveOption(OPT_SYNTAX_HIGHLIGHT, m_bHiliteSyntax == TRUE);
- m_pOptionsMgr->SaveOption(OPT_WORDDIFF_HIGHLIGHT, !!m_bViewLineDifferences);
- m_pOptionsMgr->SaveOption(OPT_BREAK_ON_WORDS, !!m_bBreakOnWords);
- m_pOptionsMgr->SaveOption(OPT_BREAK_TYPE, m_nBreakType);
+ GetOptionsMgr()->SaveOption(OPT_TAB_SIZE, (int)m_nTabSize);
+ GetOptionsMgr()->SaveOption(OPT_TAB_TYPE, (int)m_nTabType);
+ GetOptionsMgr()->SaveOption(OPT_AUTOMATIC_RESCAN, m_bAutomaticRescan == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_ALLOW_MIXED_EOL, m_bAllowMixedEol == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_SYNTAX_HIGHLIGHT, m_bHiliteSyntax == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_WORDDIFF_HIGHLIGHT, !!m_bViewLineDifferences);
+ GetOptionsMgr()->SaveOption(OPT_BREAK_ON_WORDS, !!m_bBreakOnWords);
+ GetOptionsMgr()->SaveOption(OPT_BREAK_TYPE, m_nBreakType);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropEditor message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
Modified: branches/R2_14/Src/PropEditor.h
===================================================================
--- branches/R2_14/Src/PropEditor.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropEditor.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -10,20 +10,17 @@
#if !defined(AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_)
#define AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropEditor dialog
-
/**
* @brief Property page for editor options.
*
* Editor options affect to editor behavior. For example syntax highlighting
* and tabs.
*/
-class PropEditor : public CPropertyPage, public IOptionsPanel
+class PropEditor : public OptionsPanel
{
// Construction
public:
@@ -71,9 +68,6 @@
afx_msg void OnEnKillfocusTabEdit();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options manager used for loading/saving values. */
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropGeneral.cpp
===================================================================
--- branches/R2_14/Src/PropGeneral.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropGeneral.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -32,6 +32,7 @@
#include "PropGeneral.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -39,14 +40,11 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropGeneral property page
-
/**
* @brief Constructor initialising members.
*/
-PropGeneral::PropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(PropGeneral::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropGeneral::PropGeneral(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropGeneral::IDD)
, m_bScroll(FALSE)
, m_bDisableSplash(FALSE)
, m_bSingleInstance(FALSE)
@@ -112,17 +110,17 @@
*/
void PropGeneral::ReadOptions()
{
- m_bScroll = m_pOptionsMgr->GetBool(OPT_SCROLL_TO_FIRST);
- m_bDisableSplash = m_pOptionsMgr->GetBool(OPT_DISABLE_SPLASH);
- m_bSingleInstance = m_pOptionsMgr->GetBool(OPT_SINGLE_INSTANCE);
- m_bVerifyPaths = m_pOptionsMgr->GetBool(OPT_VERIFY_OPEN_PATHS);
- m_bCloseWindowWithEsc = m_pOptionsMgr->GetBool(OPT_CLOSE_WITH_ESC);
- m_bAskMultiWindowClose = m_pOptionsMgr->GetBool(OPT_ASK_MULTIWINDOW_CLOSE);
- m_bMultipleFileCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_MERGEDOCS);
- m_bMultipleDirCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_DIRDOCS);
- m_nAutoCompleteSource = m_pOptionsMgr->GetInt(OPT_AUTO_COMPLETE_SOURCE);
- m_bPreserveFiletime = m_pOptionsMgr->GetBool(OPT_PRESERVE_FILETIMES);
- m_bShowSelectFolderOnStartup = m_pOptionsMgr->GetBool(OPT_SHOW_SELECT_FILES_AT_STARTUP);
+ m_bScroll = GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST);
+ m_bDisableSplash = GetOptionsMgr()->GetBool(OPT_DISABLE_SPLASH);
+ m_bSingleInstance = GetOptionsMgr()->GetBool(OPT_SINGLE_INSTANCE);
+ m_bVerifyPaths = GetOptionsMgr()->GetBool(OPT_VERIFY_OPEN_PATHS);
+ m_bCloseWindowWithEsc = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
+ m_bAskMultiWindowClose = GetOptionsMgr()->GetBool(OPT_ASK_MULTIWINDOW_CLOSE);
+ m_bMultipleFileCmp = GetOptionsMgr()->GetBool(OPT_MULTIDOC_MERGEDOCS);
+ m_bMultipleDirCmp = GetOptionsMgr()->GetBool(OPT_MULTIDOC_DIRDOCS);
+ m_nAutoCompleteSource = GetOptionsMgr()->GetInt(OPT_AUTO_COMPLETE_SOURCE);
+ m_bPreserveFiletime = GetOptionsMgr()->GetBool(OPT_PRESERVE_FILETIMES);
+ m_bShowSelectFolderOnStartup = GetOptionsMgr()->GetBool(OPT_SHOW_SELECT_FILES_AT_STARTUP);
}
/**
@@ -130,22 +128,19 @@
*/
void PropGeneral::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
- m_pOptionsMgr->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
- m_pOptionsMgr->SaveOption(OPT_SINGLE_INSTANCE, m_bSingleInstance == TRUE);
- m_pOptionsMgr->SaveOption(OPT_VERIFY_OPEN_PATHS, m_bVerifyPaths == TRUE);
- m_pOptionsMgr->SaveOption(OPT_CLOSE_WITH_ESC, m_bCloseWindowWithEsc == TRUE);
- m_pOptionsMgr->SaveOption(OPT_ASK_MULTIWINDOW_CLOSE, m_bAskMultiWindowClose == TRUE);
- m_pOptionsMgr->SaveOption(OPT_MULTIDOC_MERGEDOCS, m_bMultipleFileCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_MULTIDOC_DIRDOCS, m_bMultipleDirCmp == TRUE);
- m_pOptionsMgr->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
- m_pOptionsMgr->SaveOption(OPT_PRESERVE_FILETIMES, m_bPreserveFiletime);
- m_pOptionsMgr->SaveOption(OPT_SHOW_SELECT_FILES_AT_STARTUP, m_bShowSelectFolderOnStartup);
+ GetOptionsMgr()->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_SINGLE_INSTANCE, m_bSingleInstance == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_VERIFY_OPEN_PATHS, m_bVerifyPaths == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CLOSE_WITH_ESC, m_bCloseWindowWithEsc == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_ASK_MULTIWINDOW_CLOSE, m_bAskMultiWindowClose == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_MULTIDOC_MERGEDOCS, m_bMultipleFileCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_MULTIDOC_DIRDOCS, m_bMultipleDirCmp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
+ GetOptionsMgr()->SaveOption(OPT_PRESERVE_FILETIMES, m_bPreserveFiletime);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_SELECT_FILES_AT_STARTUP, m_bShowSelectFolderOnStartup);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropGeneral message handlers
-
/**
* @brief Called when user wants to see all messageboxes again.
*/
Modified: branches/R2_14/Src/PropGeneral.h
===================================================================
--- branches/R2_14/Src/PropGeneral.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropGeneral.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,17 +9,14 @@
#if !defined(AFX_PROPGENERAL_H__30AD07B0_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
#define AFX_PROPGENERAL_H__30AD07B0_E420_11D1_BBC5_00A024706EDC__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropGeneral dialog
-
/**
* @brief Class for General options -propertypage.
*/
-class PropGeneral : public CPropertyPage, public IOptionsPanel
+class PropGeneral : public OptionsPanel
{
// Construction
public:
@@ -63,9 +60,6 @@
afx_msg void OnResetAllMessageBoxes();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr *m_pOptionsMgr;
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropRegistry.cpp
===================================================================
--- branches/R2_14/Src/PropRegistry.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropRegistry.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -31,6 +31,7 @@
#include "Merge.h" // GetDefaultEditor()
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -45,13 +46,8 @@
static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
static LPCTSTR f_RegValuePath = _T("Executable");
-/////////////////////////////////////////////////////////////////////////////
-// PropRegistry dialog
-
-
PropRegistry::PropRegistry(COptionsMgr *optionsMgr)
- : CPropertyPage(PropRegistry::IDD)
-, m_pOptionsMgr(optionsMgr)
+: OptionsPanel(optionsMgr, PropRegistry::IDD)
, m_bUseRecycleBin(TRUE)
, m_tempFolderType(0)
{
@@ -82,11 +78,11 @@
*/
void PropRegistry::ReadOptions()
{
- m_strEditorPath = m_pOptionsMgr->GetString(OPT_EXT_EDITOR_CMD).c_str();
- m_bUseRecycleBin = m_pOptionsMgr->GetBool(OPT_USE_RECYCLE_BIN);
- m_strUserFilterPath = m_pOptionsMgr->GetString(OPT_FILTER_USERPATH).c_str();
- m_tempFolderType = m_pOptionsMgr->GetBool(OPT_USE_SYSTEM_TEMP_PATH) ? 0 : 1;
- m_tempFolder = m_pOptionsMgr->GetString(OPT_CUSTOM_TEMP_PATH).c_str();
+ m_strEditorPath = GetOptionsMgr()->GetString(OPT_EXT_EDITOR_CMD).c_str();
+ m_bUseRecycleBin = GetOptionsMgr()->GetBool(OPT_USE_RECYCLE_BIN);
+ m_strUserFilterPath = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH).c_str();
+ m_tempFolderType = GetOptionsMgr()->GetBool(OPT_USE_SYSTEM_TEMP_PATH) ? 0 : 1;
+ m_tempFolder = GetOptionsMgr()->GetString(OPT_CUSTOM_TEMP_PATH).c_str();
}
/**
@@ -97,32 +93,29 @@
CMergeApp *app = static_cast<CMergeApp*>(AfxGetApp());
CString sDefaultEditor = app->GetDefaultEditor();
- m_pOptionsMgr->SaveOption(OPT_USE_RECYCLE_BIN, m_bUseRecycleBin == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_USE_RECYCLE_BIN, m_bUseRecycleBin == TRUE);
CString sExtEditor = m_strEditorPath;
sExtEditor.TrimLeft();
sExtEditor.TrimRight();
if (sExtEditor.IsEmpty())
sExtEditor = sDefaultEditor;
- m_pOptionsMgr->SaveOption(OPT_EXT_EDITOR_CMD, sExtEditor);
+ GetOptionsMgr()->SaveOption(OPT_EXT_EDITOR_CMD, sExtEditor);
CString sFilterPath = m_strUserFilterPath;
sFilterPath.TrimLeft();
sFilterPath.TrimRight();
- m_pOptionsMgr->SaveOption(OPT_FILTER_USERPATH, sFilterPath);
+ GetOptionsMgr()->SaveOption(OPT_FILTER_USERPATH, sFilterPath);
bool useSysTemp = m_tempFolderType == 0;
- m_pOptionsMgr->SaveOption(OPT_USE_SYSTEM_TEMP_PATH, useSysTemp);
+ GetOptionsMgr()->SaveOption(OPT_USE_SYSTEM_TEMP_PATH, useSysTemp);
CString tempFolder = m_tempFolder;
tempFolder.TrimLeft();
tempFolder.TrimRight();
- m_pOptionsMgr->SaveOption(OPT_CUSTOM_TEMP_PATH, tempFolder);
+ GetOptionsMgr()->SaveOption(OPT_CUSTOM_TEMP_PATH, tempFolder);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropRegistry message handlers
-
BOOL PropRegistry::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
Modified: branches/R2_14/Src/PropRegistry.h
===================================================================
--- branches/R2_14/Src/PropRegistry.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropRegistry.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -25,13 +25,10 @@
#ifndef PropRegistry_h_included
#define PropRegistry_h_included
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropRegistry dialog
-
/**
* @brief Property page for system options; used in options property sheet.
*
@@ -39,7 +36,7 @@
* It allows user to select options like whether to use Recycle Bin for
* deleted files and External text editor.
*/
-class PropRegistry : public CPropertyPage, public IOptionsPanel
+class PropRegistry : public OptionsPanel
{
// Construction
public:
@@ -76,10 +73,6 @@
afx_msg void OnBrowseTmpFolder();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-// Implementation data
-private:
- COptionsMgr * m_pOptionsMgr; /**< Pointer to options manager */
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/PropShell.cpp
===================================================================
--- branches/R2_14/Src/PropShell.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropShell.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -14,6 +14,7 @@
#include "RegKey.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -34,8 +35,8 @@
static LPCTSTR f_RegValuePath = _T("Executable");
-PropShell::PropShell(COptionsMgr *optionsMgr) : CPropertyPage(PropShell::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropShell::PropShell(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropShell::IDD)
, m_bEnableShellContextMenu(FALSE)
, m_bContextAdded(FALSE)
, m_bContextAdvanced(FALSE)
@@ -80,7 +81,7 @@
void PropShell::ReadOptions()
{
GetContextRegValues();
- m_bEnableShellContextMenu = m_pOptionsMgr->GetBool(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU);
+ m_bEnableShellContextMenu = GetOptionsMgr()->GetBool(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU);
}
/**
@@ -88,7 +89,7 @@
*/
void PropShell::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu);
+ GetOptionsMgr()->SaveOption(OPT_DIRVIEW_ENABLE_SHELL_CONTEXT_MENU, m_bEnableShellContextMenu);
SaveMergePath(); // saves context menu settings as well
}
Modified: branches/R2_14/Src/PropShell.h
===================================================================
--- branches/R2_14/Src/PropShell.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropShell.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,12 +9,12 @@
#ifndef _PROP_SHELL_H_
#define _PROP_SHELL_H_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
/**
* @brief Class for Shell options -propertypage.
*/
-class PropShell : public CPropertyPage, public IOptionsPanel
+class PropShell : public OptionsPanel
{
// Construction
public:
@@ -47,10 +47,6 @@
DECLARE_MESSAGE_MAP()
void SaveMergePath();
-
-private:
- COptionsMgr *m_pOptionsMgr;
-
};
#endif // _PROP_SHELL_H_
Modified: branches/R2_14/Src/PropSyntaxColors.cpp
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,6 +11,7 @@
#include "SyntaxColors.h"
#include "PropSyntaxColors.h"
#include "Merge.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -18,14 +19,10 @@
static char THIS_FILE[] = __FILE__;
#endif
-
-// PropEditorColor dialog
-
IMPLEMENT_DYNAMIC(PropSyntaxColors, CPropertyPage)
PropSyntaxColors::PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
-: CPropertyPage(PropSyntaxColors::IDD)
-, m_pOptionsMgr(optionsMgr)
+: OptionsPanel(optionsMgr, PropSyntaxColors::IDD)
, m_nKeywordsBold(0)
, m_nFunctionsBold(0)
, m_nCommentsBold(0)
@@ -60,10 +57,6 @@
m_nUser2Bold = GetCheckVal(COLORINDEX_USER2);
}
-PropSyntaxColors::~PropSyntaxColors()
-{
-}
-
void PropSyntaxColors::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
@@ -119,8 +112,6 @@
ON_BN_CLICKED(IDC_SCOLOR_USER2_BOLD, OnBnClickedEcolorUser2Bold)
END_MESSAGE_MAP()
-// CPropSyntaxColor message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
@@ -318,4 +309,3 @@
else
m_pTempColors->SetBold(colorIndex, FALSE);
}
-
Modified: branches/R2_14/Src/PropSyntaxColors.h
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropSyntaxColors.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,20 +11,19 @@
#define _PROP_SYNTAX_COLORS_H_
#include "ColorButton.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class SyntaxColors;
const int NumCustomColors = 16;
-class PropSyntaxColors : public CPropertyPage, public IOptionsPanel
+class PropSyntaxColors : public OptionsPanel
{
DECLARE_DYNAMIC(PropSyntaxColors)
// Construction & Destruction
public:
PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
- virtual ~PropSyntaxColors();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -37,8 +36,6 @@
enum { IDD = IDD_PROPPAGE_COLORS_SYNTAX };
protected:
-
-
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
afx_msg void OnBnClickedEcolorKeywords();
@@ -100,6 +97,5 @@
SyntaxColors *m_pTempColors;
COLORREF m_cCustColors[COLORINDEX_COUNT];
- COptionsMgr * m_pOptionsMgr;
};
#endif // _PROP_SYNTAX_COLORS_H_
Modified: branches/R2_14/Src/PropTextColors.cpp
===================================================================
--- branches/R2_14/Src/PropTextColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropTextColors.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -13,6 +13,7 @@
#include "PropTextColors.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -23,24 +24,16 @@
/** @brief Section name for settings in registry. */
static const TCHAR Section[] = _T("Custom Colors");
-/////////////////////////////////////////////////////////////////////////////
-// PropTextColors dialog
-
/**
* @brief Default constructor.
*/
PropTextColors::PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
- : CPropertyPage(PropTextColors::IDD)
-, m_pOptionsMgr(optionsMgr)
+ : OptionsPanel(optionsMgr, PropTextColors::IDD)
, m_bCustomColors(FALSE)
, m_pTempColors(pColors)
{
}
-PropTextColors::~PropTextColors()
-{
-}
-
void PropTextColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -99,14 +92,14 @@
*/
void PropTextColors::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_CLR_DEFAULT_TEXT_COLORING, m_bCustomColors == FALSE);
+ GetOptionsMgr()->SaveOption(OPT_CLR_DEFAULT_TEXT_COLORING, m_bCustomColors == FALSE);
// User can only change colors via BrowseColorAndSave,
// which writes to m_pTempColors
// so user's latest choices are in m_pTempColors
// (we don't have to read them from screen)
- // Also, PropSyntaxColors writes m_pTempColors out, so we don't have to
- // We share m_pTempColors with PropSyntaxColors
+ // Also, CPropSyntaxColors writes m_pTempColors out, so we don't have to
+ // We share m_pTempColors with CPropSyntaxColors
}
/**
Modified: branches/R2_14/Src/PropTextColors.h
===================================================================
--- branches/R2_14/Src/PropTextColors.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropTextColors.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -11,24 +11,19 @@
#define PropTextColors_h_included
#include "ColorButton.h"
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
class SyntaxColors;
-
-/////////////////////////////////////////////////////////////////////////////
-// PropTextColors dialog
-
/** @brief Property page for colors options; used in options property sheet */
-class PropTextColors : public CPropertyPage, public IOptionsPanel
+class PropTextColors : public OptionsPanel
{
// Construction
public:
PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
- virtual ~PropTextColors();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -39,7 +34,6 @@
SyntaxColors *m_pTempColors;
COLORREF m_cCustColors[COLORINDEX_COUNT];
- COptionsMgr * m_pOptionsMgr;
//{{AFX_DATA(PropTextColors)
enum { IDD = IDD_PROPPAGE_COLORS_TEXT };
Modified: branches/R2_14/Src/PropVss.cpp
===================================================================
--- branches/R2_14/Src/PropVss.cpp 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropVss.cpp 2011-01-03 13:29:00 UTC (rev 7501)
@@ -33,6 +33,7 @@
#include "PropVss.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
+#include "OptionsPanel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -40,15 +41,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// PropVss property page
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to options manager.
*/
-PropVss::PropVss(COptionsMgr *optionsMgr) : CPropertyPage(PropVss::IDD)
-, m_pOptionsMgr(optionsMgr)
+PropVss::PropVss(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropVss::IDD)
, m_nVerSys(-1)
{
}
@@ -78,8 +76,8 @@
*/
void PropVss::ReadOptions()
{
- m_nVerSys = m_pOptionsMgr->GetInt(OPT_VCS_SYSTEM);
- m_strPath = m_pOptionsMgr->GetString(OPT_VSS_PATH).c_str();
+ m_nVerSys = GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM);
+ m_strPath = GetOptionsMgr()->GetString(OPT_VSS_PATH).c_str();
}
/**
@@ -87,13 +85,10 @@
*/
void PropVss::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_VCS_SYSTEM, (int)m_nVerSys);
- m_pOptionsMgr->SaveOption(OPT_VSS_PATH, m_strPath);
+ GetOptionsMgr()->SaveOption(OPT_VCS_SYSTEM, (int)m_nVerSys);
+ GetOptionsMgr()->SaveOption(OPT_VSS_PATH, m_strPath);
}
-/////////////////////////////////////////////////////////////////////////////
-// PropVss message handlers
-
/**
* @brief Called when Browse-button is selected.
*/
Modified: branches/R2_14/Src/PropVss.h
===================================================================
--- branches/R2_14/Src/PropVss.h 2011-01-03 13:07:18 UTC (rev 7500)
+++ branches/R2_14/Src/PropVss.h 2011-01-03 13:29:00 UTC (rev 7501)
@@ -9,15 +9,12 @@
#if !defined(AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
#define AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_
-#include "IOptionsPanel.h"
+#include "OptionsPanel.h"
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// PropVss dialog
-
/** @brief Options property page covering Visual SourceSafe integration */
-class PropVss : public CPropertyPage, public IOptionsPanel
+class PropVss : public OptionsPanel
{
// Construction & Destruction
@@ -58,9 +55,6 @@
afx_msg void OnSelendokVerSys();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-
-private:
- COptionsMgr * m_pOptionsMgr; /**< Options manager. */
};
//{{AFX_INSERT_LOCATION}}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-03 13:07:26
|
Revision: 7500
http://winmerge.svn.sourceforge.net/winmerge/?rev=7500&view=rev
Author: gerundt
Date: 2011-01-03 13:07:18 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Rename CProp* classes to Prop* to keep them named in same way.
Modified Paths:
--------------
branches/R2_14/Src/Common/PreferencesDlg.h
branches/R2_14/Src/MainFrm.cpp
branches/R2_14/Src/PropArchive.cpp
branches/R2_14/Src/PropArchive.h
branches/R2_14/Src/PropBackups.cpp
branches/R2_14/Src/PropBackups.h
branches/R2_14/Src/PropCodepage.cpp
branches/R2_14/Src/PropCodepage.h
branches/R2_14/Src/PropColors.cpp
branches/R2_14/Src/PropColors.h
branches/R2_14/Src/PropCompare.cpp
branches/R2_14/Src/PropCompare.h
branches/R2_14/Src/PropEditor.cpp
branches/R2_14/Src/PropEditor.h
branches/R2_14/Src/PropGeneral.cpp
branches/R2_14/Src/PropGeneral.h
branches/R2_14/Src/PropRegistry.cpp
branches/R2_14/Src/PropRegistry.h
branches/R2_14/Src/PropSyntaxColors.cpp
branches/R2_14/Src/PropSyntaxColors.h
branches/R2_14/Src/PropTextColors.cpp
branches/R2_14/Src/PropTextColors.h
branches/R2_14/Src/PropVss.cpp
branches/R2_14/Src/PropVss.h
Modified: branches/R2_14/Src/Common/PreferencesDlg.h
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/Common/PreferencesDlg.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -58,17 +58,17 @@
CPropertyPageHost m_pphost;
- CPropGeneral m_pageGeneral;
- CPropCompare m_pageCompare;
- CPropEditor m_pageEditor;
- CPropVss m_pageVss;
- CPropRegistry m_pageSystem;
- CPropCodepage m_pageCodepage;
- CPropMergeColors m_pageMergeColors;
- CPropTextColors m_pageTextColors;
- CPropSyntaxColors m_pageSyntaxColors;
- CPropArchive m_pageArchive;
- CPropBackups m_pageBackups;
+ PropGeneral m_pageGeneral;
+ PropCompare m_pageCompare;
+ PropEditor m_pageEditor;
+ PropVss m_pageVss;
+ PropRegistry m_pageSystem;
+ PropCodepage m_pageCodepage;
+ PropMergeColors m_pageMergeColors;
+ PropTextColors m_pageTextColors;
+ PropSyntaxColors m_pageSyntaxColors;
+ PropArchive m_pageArchive;
+ PropBackups m_pageBackups;
PropShell m_pageShell;
SyntaxColors *m_pSyntaxColors;
Modified: branches/R2_14/Src/MainFrm.cpp
===================================================================
--- branches/R2_14/Src/MainFrm.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/MainFrm.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1290,13 +1290,13 @@
// Determine backup folder
if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
- CPropBackups::FOLDER_ORIGINAL)
+ PropBackups::FOLDER_ORIGINAL)
{
// Put backups to same folder than original file
bakPath = path;
}
else if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
- CPropBackups::FOLDER_GLOBAL)
+ PropBackups::FOLDER_GLOBAL)
{
// Put backups to global folder defined in options
bakPath = GetOptionsMgr()->GetString(OPT_BACKUP_GLOBALFOLDER);
Modified: branches/R2_14/Src/PropArchive.cpp
===================================================================
--- branches/R2_14/Src/PropArchive.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropArchive.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropArchive.cpp
*
- * @brief Implementation of CPropArchive propertysheet
+ * @brief Implementation of PropArchive propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -19,10 +19,10 @@
static char THIS_FILE[] = __FILE__;
#endif
-// CPropArchive dialog
+// PropArchive dialog
-CPropArchive::CPropArchive(COptionsMgr *optionsMgr)
-: CPropertyPage(CPropArchive::IDD)
+PropArchive::PropArchive(COptionsMgr *optionsMgr)
+: CPropertyPage(PropArchive::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bEnableSupport(false)
, m_nInstallType(0)
@@ -30,14 +30,14 @@
{
}
-CPropArchive::~CPropArchive()
+PropArchive::~PropArchive()
{
}
/**
* @brief Sets update handlers for dialog controls.
*/
-void CPropArchive::DoDataExchange(CDataExchange* pDX)
+void PropArchive::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
DDX_Control(pDX, IDC_ARCHIVE_WWW, m_wwwLink);
@@ -47,14 +47,14 @@
}
-BEGIN_MESSAGE_MAP(CPropArchive, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropArchive, CPropertyPage)
ON_BN_CLICKED(IDC_ARCHIVE_ENABLE, OnEnableClicked)
END_MESSAGE_MAP()
/**
* @brief Reads options values from storage to UI.
*/
-void CPropArchive::ReadOptions()
+void PropArchive::ReadOptions()
{
int enable = m_pOptionsMgr->GetInt(OPT_ARCHIVE_ENABLE);
m_bEnableSupport = enable > 0;
@@ -65,7 +65,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropArchive::WriteOptions()
+void PropArchive::WriteOptions()
{
if (m_bEnableSupport)
m_pOptionsMgr->SaveOption(OPT_ARCHIVE_ENABLE, m_nInstallType + 1);
@@ -77,7 +77,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropArchive::OnInitDialog()
+BOOL PropArchive::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
m_wwwLink.m_link = DownloadUrl;
@@ -92,7 +92,7 @@
/**
* @brief Called when archive support is enabled or disabled.
*/
-void CPropArchive::OnEnableClicked()
+void PropArchive::OnEnableClicked()
{
UpdateControls();
}
@@ -100,7 +100,7 @@
/**
* @brief Called Updates controls enabled/disables state.
*/
-void CPropArchive::UpdateControls()
+void PropArchive::UpdateControls()
{
CButton *chkEnabled = (CButton *) GetDlgItem(IDC_ARCHIVE_ENABLE);
CButton *btnLocal = (CButton *) GetDlgItem(IDC_ARCHIVE_INSTALLOCAL);
Modified: branches/R2_14/Src/PropArchive.h
===================================================================
--- branches/R2_14/Src/PropArchive.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropArchive.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropArchive.h
*
- * @brief Declaration file for CPropArchive propertyheet
+ * @brief Declaration file for PropArchive propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -18,11 +18,11 @@
/**
* @brief Class for Archive Support options page.
*/
-class CPropArchive : public CPropertyPage
+class PropArchive : public CPropertyPage
{
public:
- CPropArchive(COptionsMgr *optionsMgr);
- virtual ~CPropArchive();
+ PropArchive(COptionsMgr *optionsMgr);
+ virtual ~PropArchive();
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: branches/R2_14/Src/PropBackups.cpp
===================================================================
--- branches/R2_14/Src/PropBackups.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropBackups.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropBackups.cpp
*
- * @brief Implementation of CPropBackups propertysheet
+ * @brief Implementation of PropBackups propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -20,14 +20,14 @@
#endif
-// CPropBackups dialog
+// PropBackups dialog
/**
* @brief Constructor taking OptionsManager parameter.
* @param [in] optionsMgr Pointer to OptionsManager.
*/
-CPropBackups::CPropBackups(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropBackups::IDD)
+PropBackups::PropBackups(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropBackups::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bCreateForFolderCmp(FALSE)
, m_bCreateForFileCmp(FALSE)
@@ -40,11 +40,11 @@
/**
* @brief Destructor.
*/
-CPropBackups::~CPropBackups()
+PropBackups::~PropBackups()
{
}
-void CPropBackups::DoDataExchange(CDataExchange* pDX)
+void PropBackups::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
DDX_Check(pDX, IDC_BACKUP_FOLDERCMP, m_bCreateForFolderCmp);
@@ -56,7 +56,7 @@
}
-BEGIN_MESSAGE_MAP(CPropBackups, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropBackups, CPropertyPage)
ON_BN_CLICKED(IDC_BACKUP_BROWSE, OnBnClickedBackupBrowse)
END_MESSAGE_MAP()
@@ -64,7 +64,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropBackups::ReadOptions()
+void PropBackups::ReadOptions()
{
m_bCreateForFolderCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FOLDERCMP);
m_bCreateForFileCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FILECMP);
@@ -77,7 +77,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropBackups::WriteOptions()
+void PropBackups::WriteOptions()
{
m_sGlobalFolder.TrimLeft();
m_sGlobalFolder.TrimRight();
@@ -98,7 +98,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropBackups::OnInitDialog()
+BOOL PropBackups::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -110,7 +110,7 @@
/**
* @brief Called when user selects Browse-button.
*/
-void CPropBackups::OnBnClickedBackupBrowse()
+void PropBackups::OnBnClickedBackupBrowse()
{
CString path;
if (SelectFolder(path, m_sGlobalFolder, 0, GetSafeHwnd()))
Modified: branches/R2_14/Src/PropBackups.h
===================================================================
--- branches/R2_14/Src/PropBackups.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropBackups.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropBackups.h
*
- * @brief Declaration file for CPropBackups propertyheet
+ * @brief Declaration file for PropBackups propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -17,11 +17,11 @@
/**
* @brief A class for Backup file options page.
*/
-class CPropBackups : public CPropertyPage
+class PropBackups : public CPropertyPage
{
public:
- CPropBackups(COptionsMgr *optionsMgr);
- virtual ~CPropBackups();
+ PropBackups(COptionsMgr *optionsMgr);
+ virtual ~PropBackups();
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: branches/R2_14/Src/PropCodepage.cpp
===================================================================
--- branches/R2_14/Src/PropCodepage.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCodepage.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -21,10 +21,10 @@
/**
* @file PropCodepage.h
*
- * @brief Implementation file for CPropCodepage propertyheet
+ * @brief Implementation file for PropCodepage propertyheet
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -40,10 +40,10 @@
#endif
/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage property page
+// PropCodepage property page
-CPropCodepage::CPropCodepage(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropCodepage::IDD)
+PropCodepage::PropCodepage(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropCodepage::IDD)
, m_pOptionsMgr(optionsMgr)
, m_nCodepageSystem(-1)
, m_nCustomCodepageValue(0)
@@ -51,14 +51,14 @@
{
}
-CPropCodepage::~CPropCodepage()
+PropCodepage::~PropCodepage()
{
}
-void CPropCodepage::DoDataExchange(CDataExchange* pDX)
+void PropCodepage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropCodepage)
+ //{{AFX_DATA_MAP(PropCodepage)
DDX_Radio(pDX, IDC_CP_SYSTEM, m_nCodepageSystem);
DDX_Text(pDX, IDC_CUSTOM_CP_NUMBER, m_nCustomCodepageValue);
DDX_Check(pDX, IDC_DETECT_CODEPAGE, m_bDetectCodepage);
@@ -66,8 +66,8 @@
}
-BEGIN_MESSAGE_MAP(CPropCodepage, CPropertyPage)
- //{{AFX_MSG_MAP(CPropCodepage)
+BEGIN_MESSAGE_MAP(PropCodepage, CPropertyPage)
+ //{{AFX_MSG_MAP(PropCodepage)
ON_BN_CLICKED(IDC_CP_SYSTEM, OnCpSystem)
ON_BN_CLICKED(IDC_CP_CUSTOM, OnCpCustom)
ON_BN_CLICKED(IDC_CP_UI, OnCpUi)
@@ -77,7 +77,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropCodepage::ReadOptions()
+void PropCodepage::ReadOptions()
{
m_nCodepageSystem = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_MODE);
m_nCustomCodepageValue = m_pOptionsMgr->GetInt(OPT_CP_DEFAULT_CUSTOM);
@@ -87,7 +87,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropCodepage::WriteOptions()
+void PropCodepage::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
m_pOptionsMgr->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
@@ -95,9 +95,9 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage message handlers
+// PropCodepage message handlers
-BOOL CPropCodepage::OnInitDialog()
+BOOL PropCodepage::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -114,17 +114,17 @@
// EXCEPTION: OCX Property Pages should return FALSE
}
-void CPropCodepage::OnCpSystem()
+void PropCodepage::OnCpSystem()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);
}
-void CPropCodepage::OnCpCustom()
+void PropCodepage::OnCpCustom()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(TRUE);
}
-void CPropCodepage::OnCpUi()
+void PropCodepage::OnCpUi()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);
}
Modified: branches/R2_14/Src/PropCodepage.h
===================================================================
--- branches/R2_14/Src/PropCodepage.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCodepage.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropCodepage.h
*
- * @brief Declaration of CPropCodepage class
+ * @brief Declaration of PropCodepage class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)
@@ -14,21 +14,21 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage dialog
+// PropCodepage dialog
-class CPropCodepage : public CPropertyPage, public IOptionsPanel
+class PropCodepage : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropCodepage(COptionsMgr *optionsMgr);
- ~CPropCodepage();
+ PropCodepage(COptionsMgr *optionsMgr);
+ ~PropCodepage();
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropCodepage)
+ //{{AFX_DATA(PropCodepage)
enum { IDD = IDD_PROPPAGE_CODEPAGE };
int m_nCodepageSystem;
int m_nCustomCodepageValue;
@@ -38,7 +38,7 @@
// Overrides
// ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropCodepage)
+ //{{AFX_VIRTUAL(PropCodepage)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -46,7 +46,7 @@
// Implementation
protected:
// Generated message map functions
- //{{AFX_MSG(CPropCodepage)
+ //{{AFX_MSG(PropCodepage)
virtual BOOL OnInitDialog();
afx_msg void OnCpSystem();
afx_msg void OnCpCustom();
Modified: branches/R2_14/Src/PropColors.cpp
===================================================================
--- branches/R2_14/Src/PropColors.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropColors.cpp
*
- * @brief Implementation of CPropMergeColors propertysheet
+ * @brief Implementation of PropMergeColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -21,21 +21,21 @@
static const TCHAR Section[] = _T("Custom Colors");
/////////////////////////////////////////////////////////////////////////////
-// CPropMergeColors dialog
+// PropMergeColors dialog
/**
* @brief Default constructor.
*/
-CPropMergeColors::CPropMergeColors(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropMergeColors::IDD)
+PropMergeColors::PropMergeColors(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropMergeColors::IDD)
, m_pOptionsMgr(optionsMgr)
{
}
-void CPropMergeColors::DoDataExchange(CDataExchange* pDX)
+void PropMergeColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropMergeColors)
+ //{{AFX_DATA_MAP(PropMergeColors)
DDX_Control(pDX, IDC_TRIVIAL_DIFF_DELETED_COLOR, m_cTrivialDeleted);
DDX_Control(pDX, IDC_TRIVIAL_DIFF_COLOR, m_cTrivial);
DDX_Control(pDX, IDC_SEL_DIFFERENCE_TEXT_COLOR, m_cSelDiffText);
@@ -59,8 +59,8 @@
}
-BEGIN_MESSAGE_MAP(CPropMergeColors, CDialog)
- //{{AFX_MSG_MAP(CPropMergeColors)
+BEGIN_MESSAGE_MAP(PropMergeColors, CDialog)
+ //{{AFX_MSG_MAP(PropMergeColors)
ON_BN_CLICKED(IDC_DIFFERENCE_COLOR, OnDifferenceColor)
ON_BN_CLICKED(IDC_DIFFERENCE_DELETED_COLOR, OnDifferenceDeletedColor)
ON_BN_CLICKED(IDC_SEL_DIFFERENCE_DELETED_COLOR, OnSelDifferenceDeletedColor)
@@ -87,7 +87,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropMergeColors::OnInitDialog()
+BOOL PropMergeColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
return CPropertyPage::OnInitDialog();
@@ -97,7 +97,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropMergeColors::ReadOptions()
+void PropMergeColors::ReadOptions()
{
SerializeColors(READ_OPTIONS);
}
@@ -106,7 +106,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropMergeColors::WriteOptions()
+void PropMergeColors::WriteOptions()
{
SerializeColors(WRITE_OPTIONS);
}
@@ -114,7 +114,7 @@
/**
* @brief Let user browse common color dialog, and select a color
*/
-void CPropMergeColors::BrowseColor(CColorButton & colorButton, COLORREF & currentColor)
+void PropMergeColors::BrowseColor(CColorButton & colorButton, COLORREF & currentColor)
{
CColorDialog dialog(currentColor);
LoadCustomColors();
@@ -131,7 +131,7 @@
/**
* @brief User wants to change difference color
*/
-void CPropMergeColors::OnDifferenceColor()
+void PropMergeColors::OnDifferenceColor()
{
BrowseColor(m_cDiff, m_clrDiff);
}
@@ -139,7 +139,7 @@
/**
* @brief User wants to change selected difference color
*/
-void CPropMergeColors::OnSelDifferenceColor()
+void PropMergeColors::OnSelDifferenceColor()
{
BrowseColor(m_cSelDiff, m_clrSelDiff);
}
@@ -147,7 +147,7 @@
/**
* @brief User wants to change deleted difference color
*/
-void CPropMergeColors::OnDifferenceDeletedColor()
+void PropMergeColors::OnDifferenceDeletedColor()
{
BrowseColor(m_cDiffDeleted, m_clrDiffDeleted);
}
@@ -155,7 +155,7 @@
/**
* @brief User wants to change selected & deleted difference color
*/
-void CPropMergeColors::OnSelDifferenceDeletedColor()
+void PropMergeColors::OnSelDifferenceDeletedColor()
{
BrowseColor(m_cSelDiffDeleted, m_clrSelDiffDeleted);
}
@@ -163,7 +163,7 @@
/**
* @brief User wants to change difference text color
*/
-void CPropMergeColors::OnDifferenceTextColor()
+void PropMergeColors::OnDifferenceTextColor()
{
BrowseColor(m_cDiffText, m_clrDiffText);
}
@@ -171,7 +171,7 @@
/**
* @brief User wants to change selected difference text color
*/
-void CPropMergeColors::OnSelDifferenceTextColor()
+void PropMergeColors::OnSelDifferenceTextColor()
{
BrowseColor(m_cSelDiffText, m_clrSelDiffText);
}
@@ -179,7 +179,7 @@
/**
* @brief User wants to change trivial difference color
*/
-void CPropMergeColors::OnTrivialDiffColor()
+void PropMergeColors::OnTrivialDiffColor()
{
BrowseColor(m_cTrivial, m_clrTrivial);
}
@@ -187,42 +187,42 @@
/**
* @brief User wants to change deleted trivial difference color
*/
-void CPropMergeColors::OnTrivialDiffDeletedColor()
+void PropMergeColors::OnTrivialDiffDeletedColor()
{
BrowseColor(m_cTrivialDeleted, m_clrTrivialDeleted);
}
-void CPropMergeColors::OnTrivialDiffTextColor()
+void PropMergeColors::OnTrivialDiffTextColor()
{
BrowseColor(m_cTrivialText, m_clrTrivialText);
}
-void CPropMergeColors::OnMovedColor()
+void PropMergeColors::OnMovedColor()
{
BrowseColor(m_cMoved, m_clrMoved);
}
-void CPropMergeColors::OnMovedDeletedColor()
+void PropMergeColors::OnMovedDeletedColor()
{
BrowseColor(m_cMovedDeleted, m_clrMovedDeleted);
}
-void CPropMergeColors::OnMovedTextColor()
+void PropMergeColors::OnMovedTextColor()
{
BrowseColor(m_cMovedText, m_clrMovedText);
}
-void CPropMergeColors::OnSelMovedColor()
+void PropMergeColors::OnSelMovedColor()
{
BrowseColor(m_cSelMoved, m_clrSelMoved);
}
-void CPropMergeColors::OnSelMovedDeletedColor()
+void PropMergeColors::OnSelMovedDeletedColor()
{
BrowseColor(m_cSelMovedDeleted, m_clrSelMovedDeleted);
}
-void CPropMergeColors::OnSelMovedTextColor()
+void PropMergeColors::OnSelMovedTextColor()
{
BrowseColor(m_cSelMovedText, m_clrSelMovedText);
}
@@ -230,7 +230,7 @@
/**
* @brief User wants to change word difference color
*/
-void CPropMergeColors::OnWordDifferenceColor()
+void PropMergeColors::OnWordDifferenceColor()
{
BrowseColor(m_cWordDiff, m_clrWordDiff);
}
@@ -238,7 +238,7 @@
/**
* @brief User wants to change selected word difference color
*/
-void CPropMergeColors::OnSelWordDifferenceColor()
+void PropMergeColors::OnSelWordDifferenceColor()
{
BrowseColor(m_cSelWordDiff, m_clrSelWordDiff);
}
@@ -246,7 +246,7 @@
/**
* @brief User wants to change word difference text color
*/
-void CPropMergeColors::OnWordDifferenceTextColor()
+void PropMergeColors::OnWordDifferenceTextColor()
{
BrowseColor(m_cWordDiffText, m_clrWordDiffText);
}
@@ -254,12 +254,12 @@
/**
* @brief User wants to change selected word difference text color
*/
-void CPropMergeColors::OnSelWordDifferenceTextColor()
+void PropMergeColors::OnSelWordDifferenceTextColor()
{
BrowseColor(m_cSelWordDiffText, m_clrSelWordDiffText);
}
-void CPropMergeColors::SerializeColors(OPERATION op)
+void PropMergeColors::SerializeColors(OPERATION op)
{
SerializeColor(op, m_cDiff, OPT_CLR_DIFF, m_clrDiff);
SerializeColor(op, m_cDiffDeleted, OPT_CLR_DIFF_DELETED, m_clrDiffDeleted);
@@ -288,7 +288,7 @@
SerializeColor(op, m_cSelWordDiffText, OPT_CLR_SELECTED_WORDDIFF_TEXT, m_clrSelWordDiffText);
}
-void CPropMergeColors::SerializeColor(OPERATION op, CColorButton & btn, LPCTSTR optionName, COLORREF & color)
+void PropMergeColors::SerializeColor(OPERATION op, CColorButton & btn, LPCTSTR optionName, COLORREF & color)
{
switch (op)
{
@@ -312,7 +312,7 @@
/**
* @brief Resets colors to defaults
*/
-void CPropMergeColors::OnDefaults()
+void PropMergeColors::OnDefaults()
{
SerializeColors(SET_DEFAULTS);
}
@@ -320,7 +320,7 @@
/**
* @brief Loads color selection dialog's custom colors from registry
*/
-void CPropMergeColors::LoadCustomColors()
+void PropMergeColors::LoadCustomColors()
{
for (int i = 0; i < CustomColorsAmount; i++)
{
@@ -334,7 +334,7 @@
/**
* @brief Saves color selection dialog's custom colors to registry
*/
-void CPropMergeColors::SaveCustomColors()
+void PropMergeColors::SaveCustomColors()
{
for (int i = 0; i < CustomColorsAmount; i++)
{
Modified: branches/R2_14/Src/PropColors.h
===================================================================
--- branches/R2_14/Src/PropColors.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropColors.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,10 +1,10 @@
/**
* @file PropColors.h
*
- * @brief Declaration file for CPropMergeColors propertyheet
+ * @brief Declaration file for PropMergeColors propertyheet
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_)
@@ -19,14 +19,14 @@
const int CustomColorsAmount = 16;
/////////////////////////////////////////////////////////////////////////////
-// CPropMergeColors dialog
+// PropMergeColors dialog
/** @brief Property page for colors options; used in options property sheet */
-class CPropMergeColors : public CPropertyPage, public IOptionsPanel
+class PropMergeColors : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropMergeColors(COptionsMgr *optionsMgr);
+ PropMergeColors(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -34,7 +34,7 @@
// Dialog Data
private:
- //{{AFX_DATA(CPropMergeColors)
+ //{{AFX_DATA(PropMergeColors)
enum { IDD = IDD_PROPPAGE_COLORS_WINMERGE };
CColorButton m_cTrivialDeleted;
CColorButton m_cTrivial;
@@ -80,7 +80,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropMergeColors)
+ //{{AFX_VIRTUAL(PropMergeColors)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
@@ -100,7 +100,7 @@
COLORREF m_cCustColors[CustomColorsAmount];
// Generated message map functions
- //{{AFX_MSG(CPropMergeColors)
+ //{{AFX_MSG(PropMergeColors)
afx_msg void OnDifferenceColor();
afx_msg void OnDifferenceDeletedColor();
afx_msg void OnSelDifferenceDeletedColor();
Modified: branches/R2_14/Src/PropCompare.cpp
===================================================================
--- branches/R2_14/Src/PropCompare.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCompare.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropCompare.cpp
*
- * @brief Implementation of CPropCompare propertysheet
+ * @brief Implementation of PropCompare propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -19,13 +19,13 @@
#endif
/////////////////////////////////////////////////////////////////////////////
-// CPropCompare property page
+// PropCompare property page
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to COptionsMgr.
*/
-CPropCompare::CPropCompare(COptionsMgr *optionsMgr) : CPropertyPage(CPropCompare::IDD)
+PropCompare::PropCompare(COptionsMgr *optionsMgr) : CPropertyPage(PropCompare::IDD)
, m_pOptionsMgr(optionsMgr)
, m_compareMethod(-1)
, m_bIgnoreCase(FALSE)
@@ -40,10 +40,10 @@
{
}
-void CPropCompare::DoDataExchange(CDataExchange* pDX)
+void PropCompare::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropCompare)
+ //{{AFX_DATA_MAP(PropCompare)
DDX_CBIndex(pDX, IDC_COMPAREMETHODCOMBO, m_compareMethod);
DDX_Check(pDX, IDC_IGNCASE_CHECK, m_bIgnoreCase);
DDX_Check(pDX, IDC_IGNBLANKS_CHECK, m_bIgnoreBlankLines);
@@ -58,8 +58,8 @@
}
-BEGIN_MESSAGE_MAP(CPropCompare, CPropertyPage)
- //{{AFX_MSG_MAP(CPropCompare)
+BEGIN_MESSAGE_MAP(PropCompare, CPropertyPage)
+ //{{AFX_MSG_MAP(PropCompare)
ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults)
//}}AFX_MSG_MAP
ON_CBN_SELCHANGE(IDC_COMPAREMETHODCOMBO, OnCbnSelchangeComparemethodcombo)
@@ -70,7 +70,7 @@
* Property sheet calls this before displaying GUI to load values
* into members.
*/
-void CPropCompare::ReadOptions()
+void PropCompare::ReadOptions()
{
m_nIgnoreWhite = m_pOptionsMgr->GetInt(OPT_CMP_IGNORE_WHITESPACE);
m_bIgnoreBlankLines = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_BLANKLINES);
@@ -89,7 +89,7 @@
* Property sheet calls this after dialog is closed with OK button to
* store values in member variables.
*/
-void CPropCompare::WriteOptions()
+void PropCompare::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_WHITESPACE, m_nIgnoreWhite);
m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_BLANKLINES, m_bIgnoreBlankLines == TRUE);
@@ -104,12 +104,12 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropCompare message handlers
+// PropCompare message handlers
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropCompare::OnInitDialog()
+BOOL PropCompare::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -140,7 +140,7 @@
/**
* @brief Sets options to defaults
*/
-void CPropCompare::OnDefaults()
+void PropCompare::OnDefaults()
{
DWORD tmp;
m_pOptionsMgr->GetDefault(OPT_CMP_METHOD, tmp);
@@ -169,7 +169,7 @@
* Enables / disables "Stop compare after first difference" checkbox.
* That checkbox is valid only for quick contents compare method.
*/
-void CPropCompare::OnCbnSelchangeComparemethodcombo()
+void PropCompare::OnCbnSelchangeComparemethodcombo()
{
CComboBox * pCombo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
CButton * pBtn = (CButton*) GetDlgItem(IDC_COMPARE_STOPFIRST);
Modified: branches/R2_14/Src/PropCompare.h
===================================================================
--- branches/R2_14/Src/PropCompare.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropCompare.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropCompare.h
*
- * @brief Declaration of CPropCompare propertysheet
+ * @brief Declaration of PropCompare propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -14,7 +14,7 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropCompare dialog
+// PropCompare dialog
/**
* @brief Property page to set compare options for WinMerge.
@@ -33,18 +33,18 @@
*
* @author Tim Musschoot, several modifications by others
*/
-class CPropCompare : public CPropertyPage, public IOptionsPanel
+class PropCompare : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropCompare(COptionsMgr *optionsMgr);
+ PropCompare(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropCompare)
+ //{{AFX_DATA(PropCompare)
enum { IDD = IDD_PROPPAGE_COMPARE };
int m_compareMethod;
BOOL m_bIgnoreEol;
@@ -61,7 +61,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropCompare)
+ //{{AFX_VIRTUAL(PropCompare)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -69,7 +69,7 @@
// Implementation
protected:
// Generated message map functions
- //{{AFX_MSG(CPropCompare)
+ //{{AFX_MSG(PropCompare)
afx_msg BOOL OnInitDialog();
afx_msg void OnDefaults();
afx_msg void OnCbnSelchangeComparemethodcombo();
Modified: branches/R2_14/Src/PropEditor.cpp
===================================================================
--- branches/R2_14/Src/PropEditor.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropEditor.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropEditor.cpp
*
- * @brief Implementation of CPropEditor propertysheet
+ * @brief Implementation of PropEditor propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -22,13 +22,13 @@
static const int MAX_TABSIZE = 64;
/////////////////////////////////////////////////////////////////////////////
-// CPropEditor dialog
+// PropEditor dialog
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to options manager for handling options.
*/
-CPropEditor::CPropEditor(COptionsMgr *optionsMgr) : CPropertyPage(CPropEditor::IDD)
+PropEditor::PropEditor(COptionsMgr *optionsMgr) : CPropertyPage(PropEditor::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bHiliteSyntax(FALSE)
, m_nTabType(-1)
@@ -44,10 +44,10 @@
/**
* @brief Function handling dialog data exchange between GUI and variables.
*/
-void CPropEditor::DoDataExchange(CDataExchange* pDX)
+void PropEditor::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropEditor)
+ //{{AFX_DATA_MAP(PropEditor)
DDX_Check(pDX, IDC_HILITE_CHECK, m_bHiliteSyntax);
DDX_Radio(pDX, IDC_PROP_INSERT_TABS, m_nTabType);
DDX_Text(pDX, IDC_TAB_EDIT, m_nTabSize);
@@ -60,8 +60,8 @@
}
-BEGIN_MESSAGE_MAP(CPropEditor, CDialog)
- //{{AFX_MSG_MAP(CPropEditor)
+BEGIN_MESSAGE_MAP(PropEditor, CDialog)
+ //{{AFX_MSG_MAP(PropEditor)
ON_BN_CLICKED(IDC_VIEW_LINE_DIFFERENCES, OnLineDiffControlClicked)
ON_BN_CLICKED(IDC_EDITOR_CHARLEVEL, OnLineDiffControlClicked)
ON_BN_CLICKED(IDC_EDITOR_WORDLEVEL, OnLineDiffControlClicked)
@@ -72,7 +72,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropEditor::ReadOptions()
+void PropEditor::ReadOptions()
{
m_nTabSize = m_pOptionsMgr->GetInt(OPT_TAB_SIZE);
m_nTabType = m_pOptionsMgr->GetInt(OPT_TAB_TYPE);
@@ -87,7 +87,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropEditor::WriteOptions()
+void PropEditor::WriteOptions()
{
// Sanity check tabsize
if (m_nTabSize < 1)
@@ -105,12 +105,12 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropEditor message handlers
+// PropEditor message handlers
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropEditor::OnInitDialog()
+BOOL PropEditor::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -132,7 +132,7 @@
/**
* @brief Load strings (from resource) into combobox for break type
*/
-void CPropEditor::LoadBreakTypeStrings()
+void PropEditor::LoadBreakTypeStrings()
{
CComboBox * cbo = (CComboBox *)GetDlgItem(IDC_BREAK_TYPE);
cbo->AddString(theApp.LoadString(IDS_BREAK_ON_WHITESPACE).c_str());
@@ -142,7 +142,7 @@
/**
* @brief Handlers any clicks in any of the line differencing controls
*/
-void CPropEditor::OnLineDiffControlClicked()
+void PropEditor::OnLineDiffControlClicked()
{
UpdateLineDiffControls();
}
@@ -152,7 +152,7 @@
* @param [in] item ID of dialog control to enable/disable.
* @param [in] enable if true control is enabled, else disabled.
*/
-void CPropEditor::EnableDlgItem(int item, bool enable)
+void PropEditor::EnableDlgItem(int item, bool enable)
{
GetDlgItem(item)->EnableWindow(!!enable);
}
@@ -160,7 +160,7 @@
/**
* @brief Update availability of line difference controls
*/
-void CPropEditor::UpdateLineDiffControls()
+void PropEditor::UpdateLineDiffControls()
{
UpdateDataFromWindow();
// Can only choose char/word level if line differences are enabled
@@ -173,7 +173,7 @@
/**
* @brief Check tabsize value when control loses focus.
*/
-void CPropEditor::OnEnKillfocusTabEdit()
+void PropEditor::OnEnKillfocusTabEdit()
{
CEdit * pEdit = (CEdit *)GetDlgItem(IDC_TAB_EDIT);
CString valueAsText;
Modified: branches/R2_14/Src/PropEditor.h
===================================================================
--- branches/R2_14/Src/PropEditor.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropEditor.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,10 +1,10 @@
/**
* @file PropEditor.h
*
- * @brief Declaration file for CPropEditor propertyheet
+ * @brief Declaration file for PropEditor propertyheet
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_)
@@ -15,7 +15,7 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropEditor dialog
+// PropEditor dialog
/**
* @brief Property page for editor options.
@@ -23,18 +23,18 @@
* Editor options affect to editor behavior. For example syntax highlighting
* and tabs.
*/
-class CPropEditor : public CPropertyPage, public IOptionsPanel
+class PropEditor : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropEditor(COptionsMgr *optionsMgr);
+ PropEditor(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropEditor)
+ //{{AFX_DATA(PropEditor)
enum { IDD = IDD_PROPPAGE_EDITOR };
BOOL m_bHiliteSyntax;
int m_nTabType;
@@ -56,7 +56,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropEditor)
+ //{{AFX_VIRTUAL(PropEditor)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -65,7 +65,7 @@
protected:
// Generated message map functions
- //{{AFX_MSG(CPropEditor)
+ //{{AFX_MSG(PropEditor)
afx_msg BOOL OnInitDialog();
afx_msg void OnLineDiffControlClicked();
afx_msg void OnEnKillfocusTabEdit();
Modified: branches/R2_14/Src/PropGeneral.cpp
===================================================================
--- branches/R2_14/Src/PropGeneral.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropGeneral.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -21,7 +21,7 @@
/**
* @file PropGeneral.h
*
- * @brief Implementation file for CPropGeneral propertyheet
+ * @brief Implementation file for PropGeneral propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -40,12 +40,12 @@
#endif
/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral property page
+// PropGeneral property page
/**
* @brief Constructor initialising members.
*/
-CPropGeneral::CPropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(CPropGeneral::IDD)
+PropGeneral::PropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(PropGeneral::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bScroll(FALSE)
, m_bDisableSplash(FALSE)
@@ -61,11 +61,11 @@
{
}
-CPropGeneral::~CPropGeneral()
+PropGeneral::~PropGeneral()
{
}
-BOOL CPropGeneral::OnInitDialog()
+BOOL PropGeneral::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -82,10 +82,10 @@
return TRUE; // return TRUE unless you set the focus to a control
}
-void CPropGeneral::DoDataExchange(CDataExchange* pDX)
+void PropGeneral::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropGeneral)
+ //{{AFX_DATA_MAP(PropGeneral)
DDX_Check(pDX, IDC_SCROLL_CHECK, m_bScroll);
DDX_Check(pDX, IDC_DISABLE_SPLASH, m_bDisableSplash);
DDX_Check(pDX, IDC_SINGLE_INSTANCE, m_bSingleInstance);
@@ -101,8 +101,8 @@
}
-BEGIN_MESSAGE_MAP(CPropGeneral, CPropertyPage)
- //{{AFX_MSG_MAP(CPropGeneral)
+BEGIN_MESSAGE_MAP(PropGeneral, CPropertyPage)
+ //{{AFX_MSG_MAP(PropGeneral)
ON_BN_CLICKED(IDC_RESET_ALL_MESSAGE_BOXES, OnResetAllMessageBoxes)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -110,7 +110,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropGeneral::ReadOptions()
+void PropGeneral::ReadOptions()
{
m_bScroll = m_pOptionsMgr->GetBool(OPT_SCROLL_TO_FIRST);
m_bDisableSplash = m_pOptionsMgr->GetBool(OPT_DISABLE_SPLASH);
@@ -128,7 +128,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropGeneral::WriteOptions()
+void PropGeneral::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
m_pOptionsMgr->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
@@ -144,12 +144,12 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral message handlers
+// PropGeneral message handlers
/**
* @brief Called when user wants to see all messageboxes again.
*/
-void CPropGeneral::OnResetAllMessageBoxes()
+void PropGeneral::OnResetAllMessageBoxes()
{
CMessageBoxDialog::ResetMessageBoxes();
LangMessageBox(IDS_MESSAGE_BOX_ARE_RESET, MB_ICONINFORMATION);
Modified: branches/R2_14/Src/PropGeneral.h
===================================================================
--- branches/R2_14/Src/PropGeneral.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropGeneral.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropGeneral.h
*
- * @brief Declaration of CPropGeneral class
+ * @brief Declaration of PropGeneral class
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -14,24 +14,24 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral dialog
+// PropGeneral dialog
/**
* @brief Class for General options -propertypage.
*/
-class CPropGeneral : public CPropertyPage, public IOptionsPanel
+class PropGeneral : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropGeneral(COptionsMgr *optionsMgr);
- ~CPropGeneral();
+ PropGeneral(COptionsMgr *optionsMgr);
+ ~PropGeneral();
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropGeneral)
+ //{{AFX_DATA(PropGeneral)
enum { IDD = IDD_PROPPAGE_GENERAL };
BOOL m_bScroll;
BOOL m_bDisableSplash;
@@ -49,7 +49,7 @@
// Overrides
// ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropGeneral)
+ //{{AFX_VIRTUAL(PropGeneral)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -59,7 +59,7 @@
virtual BOOL OnInitDialog();
// Generated message map functions
- //{{AFX_MSG(CPropGeneral)
+ //{{AFX_MSG(PropGeneral)
afx_msg void OnResetAllMessageBoxes();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: branches/R2_14/Src/PropRegistry.cpp
===================================================================
--- branches/R2_14/Src/PropRegistry.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropRegistry.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -17,7 +17,7 @@
/**
* @file PropRegistry.cpp
*
- * @brief CPropRegistry implementation file
+ * @brief PropRegistry implementation file
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -46,21 +46,21 @@
static LPCTSTR f_RegValuePath = _T("Executable");
/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry dialog
+// PropRegistry dialog
-CPropRegistry::CPropRegistry(COptionsMgr *optionsMgr)
- : CPropertyPage(CPropRegistry::IDD)
+PropRegistry::PropRegistry(COptionsMgr *optionsMgr)
+ : CPropertyPage(PropRegistry::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bUseRecycleBin(TRUE)
, m_tempFolderType(0)
{
}
-void CPropRegistry::DoDataExchange(CDataExchange* pDX)
+void PropRegistry::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropRegistry)
+ //{{AFX_DATA_MAP(PropRegistry)
DDX_Text(pDX, IDC_EXT_EDITOR_PATH, m_strEditorPath);
DDX_Check(pDX, IDC_USE_RECYCLE_BIN, m_bUseRecycleBin);
DDX_Text(pDX, IDC_FILTER_USER_PATH, m_strUserFilterPath);
@@ -69,8 +69,8 @@
//}}AFX_DATA_MAP
}
-BEGIN_MESSAGE_MAP(CPropRegistry, CDialog)
- //{{AFX_MSG_MAP(CPropRegistry)
+BEGIN_MESSAGE_MAP(PropRegistry, CDialog)
+ //{{AFX_MSG_MAP(PropRegistry)
ON_BN_CLICKED(IDC_EXT_EDITOR_BROWSE, OnBrowseEditor)
ON_BN_CLICKED(IDC_FILTER_USER_BROWSE, OnBrowseFilterPath)
ON_BN_CLICKED(IDC_TMPFOLDER_BROWSE, OnBrowseTmpFolder)
@@ -80,7 +80,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropRegistry::ReadOptions()
+void PropRegistry::ReadOptions()
{
m_strEditorPath = m_pOptionsMgr->GetString(OPT_EXT_EDITOR_CMD).c_str();
m_bUseRecycleBin = m_pOptionsMgr->GetBool(OPT_USE_RECYCLE_BIN);
@@ -92,7 +92,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropRegistry::WriteOptions()
+void PropRegistry::WriteOptions()
{
CMergeApp *app = static_cast<CMergeApp*>(AfxGetApp());
CString sDefaultEditor = app->GetDefaultEditor();
@@ -121,9 +121,9 @@
}
/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry message handlers
+// PropRegistry message handlers
-BOOL CPropRegistry::OnInitDialog()
+BOOL PropRegistry::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -135,7 +135,7 @@
}
/// Open file browse dialog to locate editor
-void CPropRegistry::OnBrowseEditor()
+void PropRegistry::OnBrowseEditor()
{
CString path;
if (SelectFile(GetSafeHwnd(), path, NULL, IDS_OPEN_TITLE, IDS_PROGRAMFILES, TRUE))
@@ -145,7 +145,7 @@
}
/// Open Folder selection dialog for user to select filter folder.
-void CPropRegistry::OnBrowseFilterPath()
+void PropRegistry::OnBrowseFilterPath()
{
CString path;
if (SelectFolder(path, m_strUserFilterPath, IDS_OPEN_TITLE, GetSafeHwnd()))
@@ -155,7 +155,7 @@
}
/// Select temporary files folder.
-void CPropRegistry::OnBrowseTmpFolder()
+void PropRegistry::OnBrowseTmpFolder()
{
CString path;
if (SelectFolder(path, m_tempFolder, NULL, GetSafeHwnd()))
Modified: branches/R2_14/Src/PropRegistry.h
===================================================================
--- branches/R2_14/Src/PropRegistry.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropRegistry.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -17,7 +17,7 @@
/**
* @file PropRegistry.h
*
- * @brief Declaration file CPropRegistry
+ * @brief Declaration file PropRegistry
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -30,7 +30,7 @@
class COptionsMgr;
/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry dialog
+// PropRegistry dialog
/**
* @brief Property page for system options; used in options property sheet.
@@ -39,18 +39,18 @@
* It allows user to select options like whether to use Recycle Bin for
* deleted files and External text editor.
*/
-class CPropRegistry : public CPropertyPage, public IOptionsPanel
+class PropRegistry : public CPropertyPage, public IOptionsPanel
{
// Construction
public:
- CPropRegistry(COptionsMgr *optionsMgr);
+ PropRegistry(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropRegistry)
+ //{{AFX_DATA(PropRegistry)
enum { IDD = IDD_PROPPAGE_SYSTEM };
CString m_strEditorPath;
BOOL m_bUseRecycleBin;
@@ -61,7 +61,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropRegistry)
+ //{{AFX_VIRTUAL(PropRegistry)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -69,7 +69,7 @@
// Implementation methods
protected:
// Generated message map functions
- //{{AFX_MSG(CPropRegistry)
+ //{{AFX_MSG(PropRegistry)
virtual BOOL OnInitDialog();
afx_msg void OnBrowseEditor();
afx_msg void OnBrowseFilterPath();
Modified: branches/R2_14/Src/PropSyntaxColors.cpp
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropSyntaxColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropSyntaxColors.cpp
*
- * @brief Implementation of CPropSyntaxColors propertysheet
+ * @brief Implementation of PropSyntaxColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -19,12 +19,12 @@
#endif
-// CPropEditorColor dialog
+// PropEditorColor dialog
-IMPLEMENT_DYNAMIC(CPropSyntaxColors, CPropertyPage)
+IMPLEMENT_DYNAMIC(PropSyntaxColors, CPropertyPage)
-CPropSyntaxColors::CPropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
-: CPropertyPage(CPropSyntaxColors::IDD)
+PropSyntaxColors::PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
+: CPropertyPage(PropSyntaxColors::IDD)
, m_pOptionsMgr(optionsMgr)
, m_nKeywordsBold(0)
, m_nFunctionsBold(0)
@@ -60,11 +60,11 @@
m_nUser2Bold = GetCheckVal(COLORINDEX_USER2);
}
-CPropSyntaxColors::~CPropSyntaxColors()
+PropSyntaxColors::~PropSyntaxColors()
{
}
-void CPropSyntaxColors::DoDataExchange(CDataExchange* pDX)
+void PropSyntaxColors::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
DDX_Control(pDX, IDC_SCOLOR_KEYWORDS, m_btnKeywordsText);
@@ -97,7 +97,7 @@
}
-BEGIN_MESSAGE_MAP(CPropSyntaxColors, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropSyntaxColors, CPropertyPage)
ON_BN_CLICKED(IDC_SCOLOR_KEYWORDS, OnBnClickedEcolorKeywords)
ON_BN_CLICKED(IDC_SCOLOR_FUNCTIONS, OnBnClickedEcolorFunctions)
ON_BN_CLICKED(IDC_SCOLOR_COMMENTS, OnBnClickedEcolorComments)
@@ -124,7 +124,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropSyntaxColors::OnInitDialog()
+BOOL PropSyntaxColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
return CPropertyPage::OnInitDialog();
@@ -134,7 +134,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropSyntaxColors::ReadOptions()
+void PropSyntaxColors::ReadOptions()
{
}
@@ -142,7 +142,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropSyntaxColors::WriteOptions()
+void PropSyntaxColors::WriteOptions()
{
// User can only change colors via BrowseColorAndSave,
// which writes to m_pTempColors
@@ -154,7 +154,7 @@
/**
* @brief Let user browse common color dialog, and select a color & save to registry
*/
-void CPropSyntaxColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
+void PropSyntaxColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
{
COLORREF currentColor = m_pTempColors->GetColor(colorIndex);
CColorDialog dialog(currentColor);
@@ -170,52 +170,52 @@
SaveCustomColors();
}
-void CPropSyntaxColors::OnBnClickedEcolorKeywords()
+void PropSyntaxColors::OnBnClickedEcolorKeywords()
{
BrowseColorAndSave(m_btnKeywordsText, COLORINDEX_KEYWORD);
}
-void CPropSyntaxColors::OnBnClickedEcolorFunctions()
+void PropSyntaxColors::OnBnClickedEcolorFunctions()
{
BrowseColorAndSave(m_btnFunctionsText, COLORINDEX_FUNCNAME);
}
-void CPropSyntaxColors::OnBnClickedEcolorComments()
+void PropSyntaxColors::OnBnClickedEcolorComments()
{
BrowseColorAndSave(m_btnCommentsText, COLORINDEX_COMMENT);
}
-void CPropSyntaxColors::OnBnClickedEcolorNumbers()
+void PropSyntaxColors::OnBnClickedEcolorNumbers()
{
BrowseColorAndSave(m_btnNumbersText, COLORINDEX_NUMBER);
}
-void CPropSyntaxColors::OnBnClickedEcolorOperators()
+void PropSyntaxColors::OnBnClickedEcolorOperators()
{
BrowseColorAndSave(m_btnOperatorsText, COLORINDEX_OPERATOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorStrings()
+void PropSyntaxColors::OnBnClickedEcolorStrings()
{
BrowseColorAndSave(m_btnStringsText, COLORINDEX_STRING);
}
-void CPropSyntaxColors::OnBnClickedEcolorPreprocessor()
+void PropSyntaxColors::OnBnClickedEcolorPreprocessor()
{
BrowseColorAndSave(m_btnPreprocessorText, COLORINDEX_PREPROCESSOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser1()
+void PropSyntaxColors::OnBnClickedEcolorUser1()
{
BrowseColorAndSave(m_btnUser1Text, COLORINDEX_USER1);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser2()
+void PropSyntaxColors::OnBnClickedEcolorUser2()
{
BrowseColorAndSave(m_btnUser2Text, COLORINDEX_USER2);
}
-void CPropSyntaxColors::OnBnClickedEcolorsBdefaults()
+void PropSyntaxColors::OnBnClickedEcolorsBdefaults()
{
m_pTempColors->SetDefaults();
m_btnKeywordsText.SetColor(m_pTempColors->GetColor(COLORINDEX_KEYWORD));
@@ -244,7 +244,7 @@
/**
* @brief Loads color selection dialog's custom colors from registry
*/
-void CPropSyntaxColors::LoadCustomColors()
+void PropSyntaxColors::LoadCustomColors()
{
SyntaxColors_Load(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
@@ -252,57 +252,57 @@
/**
* @brief Saves color selection dialog's custom colors to registry
*/
-void CPropSyntaxColors::SaveCustomColors()
+void PropSyntaxColors::SaveCustomColors()
{
SyntaxColors_Save(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
-void CPropSyntaxColors::OnBnClickedEcolorKeywordsBold()
+void PropSyntaxColors::OnBnClickedEcolorKeywordsBold()
{
UpdateBoldStatus(m_btnKeywordsBold, COLORINDEX_KEYWORD);
}
-void CPropSyntaxColors::OnBnClickedEcolorFunctionsBold()
+void PropSyntaxColors::OnBnClickedEcolorFunctionsBold()
{
UpdateBoldStatus(m_btnFunctionsBold, COLORINDEX_FUNCNAME);
}
-void CPropSyntaxColors::OnBnClickedEcolorCommentsBold()
+void PropSyntaxColors::OnBnClickedEcolorCommentsBold()
{
UpdateBoldStatus(m_btnCommentsBold, COLORINDEX_COMMENT);
}
-void CPropSyntaxColors::OnBnClickedEcolorNumbersBold()
+void PropSyntaxColors::OnBnClickedEcolorNumbersBold()
{
UpdateBoldStatus(m_btnNumbersBold, COLORINDEX_NUMBER);
}
-void CPropSyntaxColors::OnBnClickedEcolorOperatorsBold()
+void PropSyntaxColors::OnBnClickedEcolorOperatorsBold()
{
UpdateBoldStatus(m_btnOperatorsBold, COLORINDEX_OPERATOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorStringsBold()
+void PropSyntaxColors::OnBnClickedEcolorStringsBold()
{
UpdateBoldStatus(m_btnStringsBold, COLORINDEX_STRING);
}
-void CPropSyntaxColors::OnBnClickedEcolorPreprocessorBold()
+void PropSyntaxColors::OnBnClickedEcolorPreprocessorBold()
{
UpdateBoldStatus(m_btnPreProcessorBold, COLORINDEX_PREPROCESSOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser1Bold()
+void PropSyntaxColors::OnBnClickedEcolorUser1Bold()
{
UpdateBoldStatus(m_btnUser1Bold, COLORINDEX_USER1);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser2Bold()
+void PropSyntaxColors::OnBnClickedEcolorUser2Bold()
{
UpdateBoldStatus(m_btnUser2Bold, COLORINDEX_USER2);
}
-int CPropSyntaxColors::GetCheckVal(UINT nColorIndex)
+int PropSyntaxColors::GetCheckVal(UINT nColorIndex)
{
if (m_pTempColors->GetBold(nColorIndex))
return BST_CHECKED;
@@ -310,7 +310,7 @@
return BST_UNCHECKED;
}
-void CPropSyntaxColors::UpdateBoldStatus(CButton &btn, UINT colorIndex)
+void PropSyntaxColors::UpdateBoldStatus(CButton &btn, UINT colorIndex)
{
int state = btn.GetCheck();
if (state == BST_CHECKED)
Modified: branches/R2_14/Src/PropSyntaxColors.h
===================================================================
--- branches/R2_14/Src/PropSyntaxColors.h 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropSyntaxColors.h 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,7 +1,7 @@
/**
* @file PropSyntaxColors.h
*
- * @brief Declaration file for CPropSyntaxColors propertyheet
+ * @brief Declaration file for PropSyntaxColors propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -17,14 +17,14 @@
const int NumCustomColors = 16;
-class CPropSyntaxColors : public CPropertyPage, public IOptionsPanel
+class PropSyntaxColors : public CPropertyPage, public IOptionsPanel
{
- DECLARE_DYNAMIC(CPropSyntaxColors)
+ DECLARE_DYNAMIC(PropSyntaxColors)
// Construction & Destruction
public:
- CPropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
- virtual ~CPropSyntaxColors();
+ PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
+ virtual ~PropSyntaxColors();
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: branches/R2_14/Src/PropTextColors.cpp
===================================================================
--- branches/R2_14/Src/PropTextColors.cpp 2011-01-02 13:55:55 UTC (rev 7499)
+++ branches/R2_14/Src/PropTextColors.cpp 2011-01-03 13:07:18 UTC (rev 7500)
@@ -1,9 +1,9 @@
/**
* @file PropTextColors.cpp
*
- * @brief Implementation of CPropTextColors propertysheet
+ * @brief Implementation of PropTextColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -24,27 +24,27 @@
static const TCHAR Section[] = _T("Custom Colors");
/////////////////////////////////////////////////////////////////////////////
-// CPropTextColors dialog
+// PropTextColors dialog
/**
* @brief Default constructor.
*/
-CPropTextColors::CPropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
- : CPropertyPage(CPropTextColors::IDD)
+PropTextColors::PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
+ : CPropertyPage(PropTextColors::IDD)
, m_pOptionsMgr(optionsMgr)
, m_bCustomColors(FALSE)
, m_pTempColors(pColors)
{
}
-CPropTextColors::~CPropTextColors()
+PropTextColors::~PropTextColors()
{
}
-void CPropTextColors::DoDataExchange(CDataExchange* pDX)
+void PropTextColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropTextColors)
+ //{{AFX_DATA_MAP(PropTextColors)
DDX_Control(pDX, IDC_DEFAULT_STANDARD_COLORS, m_btnDefaultStandardColors);
DDX_Check(pDX, IDC_DEFAULT_STANDARD_COLORS, m_bCustomColors);
DDX_Control(pDX, IDC_WHITESPACE_BKGD_COLOR, m_btnWhitespaceBackground);
@@ -56,8 +56,8 @@
}
-BEGIN_MESSAGE_MAP(CPropTextColors, CDialog)
- //{{AFX_MSG_MAP(CPropTextColors)
+BEGIN_MESSAGE_MAP(PropTextColors, CDialog)
+ //{{AFX_MSG_MAP(PropTextColors)
ON_BN_CLICKED(IDC_DEFAULT_STANDARD_COLORS, OnDefaultsStandardColors)
ON_BN_CLICKED(IDC_WHITESPACE_BKGD_COLOR, OnWhitespaceBackgroundColor)
ON_BN_CLICKED(IDC_REGULAR_BKGD_COLOR, OnRegularBackgroundColor)
@@ -70,7 +70,7 @@
/**
* @brief Enable/Disable controls when dialog is shown.
*/
-BOOL CPropTextColors::OnInitDialog()
+BOOL PropTextColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -87,7 +87,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropTextColors::ReadOptions()
+void PropTextColors::ReadOptions()
{
m_bCustomColors = GetOptionsMgr()->GetBool(OPT_CLR_DEFAULT_TEXT_COLORING) ? FALSE : TRUE;
SerializeColorsToFromScreen(LOAD_COLORS);
@@ -97,7 +97,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropTextColors::WriteOptions()
+void PropTextColors::WriteOptions()
{
m_pOptionsMgr->SaveOption(OPT_CLR_DEFAULT_TEXT_COLORING, m_bCustomColors == FALSE);
// User can only change colors via BrowseColorAndSave,
@@ -105,8 +105,8 @@
// so user's latest choices are in m_pTempColors
// (we don't have to read them from screen)
- // Also, CPropSyntaxColors writes m_pTempColors out, so we don't have to
- // We share m_pTempColors with CPropSyntaxColors
+ // Also, PropSyntaxColors writes m_pTempColors out, so we don't have to
+ // We share m_pTempColors with PropSyntaxColors
}
/**
@@ -114,7 +114,7 @@
* @param [in] colorButton Button for which to change color.
* @param [in] colorIndex Index to color table.
*/
-void CPropTextColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
+void PropTextColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
{
// Ignore user if colors are slaved to system
if (m_btnDefaultStandardColors.GetCheck() == BST_UNCHECKED)
@@ -137,7 +137,7 @@
/**
* @brief User wants to change whitespace color
*/
-void CPropTextColors::OnWhitespaceBackgroundColor()
+void PropTextColors::OnWhitespaceBackgroundColor()
{
BrowseColorAndSave(m_btnWhitespaceBackground, COLORINDEX_WHITESPACE);
}
@@ -145,7 +145,7 @@
/**
* @brief User wants to change regular background color
*/
-void CPropTextColors::OnRegularBackgroundColor()
+void PropTextColors::OnRegularBackgroundColor()
{
BrowseColorAndSave(m_btnRegularBackground, COLORINDEX_BKGND);
}
@@ -153,7 +153,7 @@
/**
* @brief User wants to change regular text color
*/
-void CPropTextColors::OnRegularTextColor()
+void PropTextColors::OnRegularTextColor()
{
BrowseColorAndSave(m_btnRegularText, COLORINDEX_NORMALTEXT);
}
@@ -161,7 +161,7 @@
/**
* @brief User wants to change regular selection background color
*/
-void CPropTextColors::OnSelectionBackgroundColor()
+void PropTextColors::OnSelectionBackgroundColor()
{
BrowseColorAndSave(m_btnSelectionBackground, COLORINDEX_SELBKGND);
}
@@ -169,7 +169,7 @@
/**
* @brief User wants to change regular selection text color
*/
-void CPropTextColors::OnSelectionTextColor()
+void PropTextColors::OnSelectionTextColor()
{
BrowseColorAndSave(m_btnSelectionText, COLORINDEX_SELTEXT);
}
@@ -181,7 +181,7 @@
* - LOAD_COLORS : Loads colors from registry
* (No save operation because BrowseColorAndSave saves immediately when user chooses)
*/
-void CPropTextColors::SerializeColorsToFromScreen(OPERATION op)
+void PropTextColors::SerializeColorsToFromScreen(OPERATION op)
{
if (op == SET_DEFAULTS)
m_pTempColors->SetDefaults();
@@ -202,7 +202,7 @@
* - LOAD_COLORS : Loads colors from registry
* (No save operation because BrowseColorAndSave saves immediately when user chooses)
*/
-void CPropTextColors::SerializeColorToFromScreen(OPERATION op, CColorButton & btn, int colorIndex)
+void PropTextColors::SerializeColorToFromScreen(OPERATION op, CColorButton & btn, int colorIndex)
{
switch (op)
@@ -227,7 +227,7 @@
/**
* @brief Set colors to track standard (theme) colors
*/
-void CPropTextColors::OnDefaultsStandardColors()
+void PropTextColors::OnDefaultsStandardColors()
{
// Reset all text colors to default every ti...
[truncated message content] |
|
From: <ge...@us...> - 2011-01-02 13:56:01
|
Revision: 7499
http://winmerge.svn.sourceforge.net/winmerge/?rev=7499&view=rev
Author: gerundt
Date: 2011-01-02 13:55:55 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Fix a signed vs. unsigned warning
Modified Paths:
--------------
branches/R2_14/Src/LineFiltersList.cpp
branches/R2_14/Src/LineFiltersList.h
Modified: branches/R2_14/Src/LineFiltersList.cpp
===================================================================
--- branches/R2_14/Src/LineFiltersList.cpp 2011-01-02 13:52:24 UTC (rev 7498)
+++ branches/R2_14/Src/LineFiltersList.cpp 2011-01-02 13:55:55 UTC (rev 7499)
@@ -105,7 +105,7 @@
* @return Filter item from the index. If the index is beyond table limit,
* return the last item in the list.
*/
-const LineFilterItem & LineFiltersList::GetAt(int ind) const
+const LineFilterItem & LineFiltersList::GetAt(size_t ind) const
{
if (ind < m_items.size())
return *m_items[ind];
@@ -166,7 +166,7 @@
m_pOptionsMgr = pOptionsMgr;
- unsigned int count = m_items.size();
+ size_t count = m_items.size();
valuename += _T("/Values");
m_pOptionsMgr->InitOption(valuename.c_str(), static_cast<int>(count));
count = m_pOptionsMgr->GetInt(valuename.c_str());
Modified: branches/R2_14/Src/LineFiltersList.h
===================================================================
--- branches/R2_14/Src/LineFiltersList.h 2011-01-02 13:52:24 UTC (rev 7498)
+++ branches/R2_14/Src/LineFiltersList.h 2011-01-02 13:55:55 UTC (rev 7499)
@@ -36,7 +36,7 @@
int GetCount() const;
void Empty();
String GetAsString() const;
- const LineFilterItem & GetAt(int ind) const;
+ const LineFilterItem & GetAt(size_t ind) const;
void CloneFrom(const LineFiltersList *list);
bool Compare(const LineFiltersList *list) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-02 13:52:30
|
Revision: 7498
http://winmerge.svn.sourceforge.net/winmerge/?rev=7498&view=rev
Author: gerundt
Date: 2011-01-02 13:52:24 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Optimize merging list of differences. Give diff number instead of activating diff and letting code to determine active difference for every diff.
Modified Paths:
--------------
branches/R2_14/Src/MergeDoc.cpp
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:46:20 UTC (rev 7497)
+++ branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:52:24 UTC (rev 7498)
@@ -779,9 +779,8 @@
// Note we don't care about m_nDiffs count to become zero,
// because we don't rescan() so it does not change
- SetCurrentDiff(lastDiff);
bool bGroupWithPrevious = false;
- if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious))
+ if (!ListCopy(srcPane, dstPane, lastDiff, bGroupWithPrevious))
return; // sync failure
// copy from bottom up is more efficient
@@ -789,10 +788,9 @@
{
if (m_diffList.IsDiffSignificant(i))
{
- SetCurrentDiff(i);
// Group merge with previous (merge undo data to one action)
bGroupWithPrevious = true;
- if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious))
+ if (!ListCopy(srcPane, dstPane, i, bGroupWithPrevious))
return; // sync failure
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-02 13:46:26
|
Revision: 7497
http://winmerge.svn.sourceforge.net/winmerge/?rev=7497&view=rev
Author: gerundt
Date: 2011-01-02 13:46:20 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
PATCH: [ 2931558 ] some smal cleanups
mergedoc7097.patch
Submitted by Matthias Mayer
Modified Paths:
--------------
branches/R2_14/Src/MergeDoc.cpp
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:41:33 UTC (rev 7496)
+++ branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:46:20 UTC (rev 7497)
@@ -450,6 +450,7 @@
if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
{
ReloadDoc(0);
+ return RESCAN_OK;
}
}
else if (rightFileChanged == FileChanged)
@@ -459,6 +460,7 @@
if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
{
ReloadDoc(1);
+ return RESCAN_OK;
}
}
@@ -1440,6 +1442,7 @@
// Show possible error after updating screen
if (nRescanResult != RESCAN_SUPPRESSED)
ShowRescanError(nRescanResult, bIdentical);
+ m_LastRescan = COleDateTime::GetCurrentTime();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-02 13:41:39
|
Revision: 7496
http://winmerge.svn.sourceforge.net/winmerge/?rev=7496&view=rev
Author: gerundt
Date: 2011-01-02 13:41:33 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
PATCH: [ 2921555 ] selected codepage is not used
Fixes bug #2907951.
Submitted by Matthias Mayer.
Modified Paths:
--------------
branches/R2_14/Src/MergeDoc.cpp
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:31:42 UTC (rev 7495)
+++ branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:41:33 UTC (rev 7496)
@@ -83,7 +83,7 @@
_T ("\x0d") // Macintosh style
};
-static void SaveBuffForDiff(CDiffTextBuffer & buf, LPCTSTR filepath);
+static void SaveBuffForDiff(CDiffTextBuffer & buf, CDiffTextBuffer & buf2, LPCTSTR filepath);
static void UnescapeControlChars(CString &s);
/////////////////////////////////////////////////////////////////////////////
@@ -335,14 +335,14 @@
* (the plugins are optional, not the conversion)
* @todo Show SaveToFile() errors?
*/
-static void SaveBuffForDiff(CDiffTextBuffer & buf, LPCTSTR filepath)
+static void SaveBuffForDiff(CDiffTextBuffer & buf, CDiffTextBuffer & buf2, LPCTSTR filepath)
{
ASSERT(buf.m_nSourceEncoding == buf.m_nDefaultEncoding);
int orig_codepage = buf.getCodepage();
ucr::UNICODESET orig_unicoding = buf.getUnicoding();
// If file was in Unicode
- if (orig_unicoding!=ucr::NONE)
+ if ((orig_unicoding != ucr::NONE) || (buf2.getUnicoding() != ucr::NONE))
{
// we subvert the buffer's memory of the original file encoding
buf.setUnicoding(ucr::UCS2LE); // write as UCS-2LE (for preprocessing)
@@ -484,8 +484,8 @@
// output buffers to temp files (in UTF-8 if TCHAR=wchar_t or buffer was Unicode)
if (bBinary == FALSE)
{
- SaveBuffForDiff(*m_ptBuf[0], m_tempFiles[0].GetPath().c_str());
- SaveBuffForDiff(*m_ptBuf[1], m_tempFiles[1].GetPath().c_str());
+ SaveBuffForDiff(*m_ptBuf[0], *m_ptBuf[1], m_tempFiles[0].GetPath().c_str());
+ SaveBuffForDiff(*m_ptBuf[1], *m_ptBuf[0], m_tempFiles[1].GetPath().c_str());
}
// Set up DiffWrapper
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2011-01-02 13:31:49
|
Revision: 7495
http://winmerge.svn.sourceforge.net/winmerge/?rev=7495&view=rev
Author: gerundt
Date: 2011-01-02 13:31:42 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Make few variables consts.
Modified Paths:
--------------
branches/R2_14/Src/MergeDoc.cpp
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:26:21 UTC (rev 7494)
+++ branches/R2_14/Src/MergeDoc.cpp 2011-01-02 13:31:42 UTC (rev 7495)
@@ -811,8 +811,8 @@
*/
bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr) const
{
- int cd_dbegin = dr.dbegin0;
- int cd_dend = dr.dend0;
+ const int cd_dbegin = dr.dbegin0;
+ const int cd_dend = dr.dend0;
// Must ensure line number is in range before getting line flags
if (cd_dend >= m_ptBuf[0]->GetLineCount())
@@ -892,9 +892,9 @@
CDiffTextBuffer& sbuf = *m_ptBuf[srcPane];
CDiffTextBuffer& dbuf = *m_ptBuf[dstPane];
BOOL bSrcWasMod = sbuf.IsModified();
- int cd_dbegin = srcPane == 0 ? cd.dbegin0 : cd.dbegin1;
- int cd_dend = srcPane == 0 ? cd.dend0 : cd.dend1;
- int cd_blank = srcPane == 0 ? cd.blank0 : cd.blank1;
+ const int cd_dbegin = srcPane == 0 ? cd.dbegin0 : cd.dbegin1;
+ const int cd_dend = srcPane == 0 ? cd.dend0 : cd.dend1;
+ const int cd_blank = srcPane == 0 ? cd.blank0 : cd.blank1;
bool bInSync = SanityCheckDiff(cd);
if (!bInSync)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
