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: <sdo...@us...> - 2006-09-04 19:17:41
|
Revision: 3521
http://svn.sourceforge.net/winmerge/?rev=3521&view=rev
Author: sdottaka
Date: 2006-09-04 12:16:56 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
PATCH: [ 1551332 ] defer loading plugin
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/MainFrm.cpp
trunk/Src/Merge.rc
trunk/Src/MergeDoc.cpp
trunk/Src/MergeEditView.cpp
trunk/Src/MergeEditView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Changes.txt 2006-09-04 19:16:56 UTC (rev 3521)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-04 Takashi
+ PATCH: [ 1551332 ] defer loading plugin
+ Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
+ Src/Languages/*: Merge*.rc
+
2006-09-04 Kimmo
BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
Src: PropRegistry.cpp
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&\xCD\xE0\xEB\xE8\xF7\xED\xE8"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&\xCF\xF0\xE5\xE7\xE0\xF0\xE5\xE4\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8\xF2\xE5", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediferenciaci\xF3"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -443,7 +443,7 @@
MENUITEM SEPARATOR
POPUP "Ԥ\xB6Ա\xC8(&P)"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "\xD6\xD8\xD0\xC2װ\xC8\xEB\xB2\xE5\xBC\xFE(&R)", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "\xABe\xB8m\xA4\xA3\xA6P(&P)"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "\xAD\xAB\xB7s\xB8\xFC\xA4J\xA5~\xB1\xBE(&R)", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "Znovu &na\xE8\xEDst", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "Plug-ins he&rladen", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/French/MergeFrench.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -439,7 +439,7 @@
MENUITEM SEPARATOR
POPUP "&Pr\xE9-comparer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Recharger les plugiciels", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "Plugins &neu laden", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&El\xF5vizsg\xE1l\xF3"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&B\xF5v\xEDtm\xE9nyek bet\xF6lt\xE9se", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Ricarica plugin", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x83v\x83\x89\x83O\x83C\x83\x93(&P)"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "\x83v\x83\x89\x83O\x83C\x83\x93\x82̍ēǍ\x9E\x82\xDD(&R)", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "\xC7÷\xAF\xB1\xD7\xC0\xCE \xB4ٽ\xC3 \xB7ε\xE5(&R)", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Forh\xE5ndsforskjell"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Oppdater programtillegg", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&R\xF3\xBFnicowanie wst\xEApne"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Prze\xB3aduj wtyczki", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&\xCF\xF0\xE5\xE4\xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&\xCF\xE5\xF0\xE5\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE2\xF1\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&\xD6ppna plugins igen", ID_RELOAD_PLUGINS
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&\xD6ncelikli Fark"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "Eklentileri &Tekrar Y\xFCkle", ID_RELOAD_PLUGINS
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/MainFrm.cpp 2006-09-04 19:16:56 UTC (rev 3521)
@@ -453,11 +453,6 @@
m_pMenus[MENU_DEFAULT]->ModifyODMenu(NULL, ID_TOOLS_GENERATEPATCH, IDB_TOOLS_GENERATEPATCH);
m_pMenus[MENU_DEFAULT]->LoadToolbar(IDR_MAINFRAME);
- // append the scripts submenu
- HMENU scriptsSubmenu = GetScriptsSubmenu(m_pMenus[MENU_DEFAULT]->GetSafeHmenu());
- if (scriptsSubmenu != NULL)
- CMergeEditView::createScriptsSubmenu(scriptsSubmenu);
-
FixupDebugMenu(m_pMenus[MENU_DEFAULT]);
return(m_pMenus[MENU_DEFAULT]->Detach());
@@ -501,11 +496,6 @@
m_pMenus[MENU_MERGEVIEW]->ModifyODMenu(NULL, ID_EDIT_CLEAR_ALL_BOOKMARKS, IDB_EDIT_CLEAR_ALL_BOOKMARKS);
m_pMenus[MENU_MERGEVIEW]->LoadToolbar(IDR_MAINFRAME);
- // append the scripts submenu
- HMENU scriptsSubmenu = GetScriptsSubmenu(m_pMenus[MENU_MERGEVIEW]->GetSafeHmenu());
- if (scriptsSubmenu != NULL)
- CMergeEditView::createScriptsSubmenu(scriptsSubmenu);
-
FixupDebugMenu(m_pMenus[MENU_MERGEVIEW]);
return(m_pMenus[MENU_MERGEVIEW]->Detach());
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/Merge.rc 2006-09-04 19:16:56 UTC (rev 3521)
@@ -441,7 +441,7 @@
MENUITEM SEPARATOR
POPUP "&Prediffer"
BEGIN
- MENUITEM SEPARATOR
+ MENUITEM "", ID_NO_PREDIFFER
END
MENUITEM SEPARATOR
MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/MergeDoc.cpp 2006-09-04 19:16:56 UTC (rev 3521)
@@ -2799,10 +2799,6 @@
nRescanResult = Rescan(bBinary, bIdentical);
- // recreate the sub menu (to fill the "selected prediffers")
- // keep after Rescan (in automatic mode, prediffer is set during the first Rescan)
- GetMainFrame()->UpdatePrediffersMenu();
-
// Open filed if rescan succeed and files are not binaries
if (nRescanResult == RESCAN_OK && bBinary == FALSE)
{
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/MergeEditView.cpp 2006-09-04 19:16:56 UTC (rev 3521)
@@ -172,7 +172,7 @@
ON_COMMAND_RANGE(ID_SCRIPT_FIRST, ID_SCRIPT_LAST, OnScripts)
ON_UPDATE_COMMAND_UI_RANGE(ID_SCRIPT_FIRST, ID_SCRIPT_LAST, OnUpdateScripts)
ON_COMMAND(ID_NO_PREDIFFER, OnNoPrediffer)
- ON_UPDATE_COMMAND_UI(ID_NO_PREDIFFER, OnUpdatePrediffer)
+ ON_UPDATE_COMMAND_UI(ID_NO_PREDIFFER, OnUpdateNoPrediffer)
ON_COMMAND_RANGE(ID_PREDIFFERS_FIRST, ID_PREDIFFERS_LAST, OnPrediffer)
ON_UPDATE_COMMAND_UI_RANGE(ID_PREDIFFERS_FIRST, ID_PREDIFFERS_LAST, OnUpdatePrediffer)
ON_COMMAND(ID_FILE_MERGINGMODE, OnMergingMode)
@@ -193,6 +193,7 @@
ON_COMMAND(ID_FILE_OPEN_WITH, OnOpenFileWith)
ON_COMMAND(ID_VIEW_SWAPPANES, OnViewSwapPanes)
ON_UPDATE_COMMAND_UI(ID_VIEW_LINEDIFFS, OnUpdateViewSwapPanes)
+ ON_UPDATE_COMMAND_UI(ID_NO_EDIT_SCRIPTS, OnUpdateNoEditScripts)
ON_WM_SIZE()
ON_COMMAND(ID_HELP, OnHelp)
//}}AFX_MSG_MAP
@@ -324,7 +325,6 @@
CMergeDoc* pDoc = GetDocument();
pDoc->UpdateHeaderActivity(m_nThisPane, bActivate);
- GetMainFrame()->UpdatePrediffersMenu();
}
int CMergeEditView::GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf)
@@ -2318,6 +2318,19 @@
/**
* @brief Called when an editor script item is updated
*/
+void CMergeEditView::OnUpdateNoEditScripts(CCmdUI* pCmdUI)
+{
+ // append the scripts submenu
+ HMENU scriptsSubmenu = dynamic_cast<CMainFrame*>(AfxGetMainWnd())->GetScriptsSubmenu(AfxGetMainWnd()->GetMenu()->m_hMenu);
+ if (scriptsSubmenu != NULL)
+ createScriptsSubmenu(scriptsSubmenu);
+
+ pCmdUI->Enable(TRUE);
+}
+
+/**
+ * @brief Called when an editor script item is updated
+ */
void CMergeEditView::OnUpdatePrediffer(CCmdUI* pCmdUI)
{
pCmdUI->Enable(TRUE);
@@ -2340,6 +2353,16 @@
pCmdUI->SetRadio(pCmdUI->m_nID == m_CurrentPredifferID);
}
+/**
+ * @brief Update "Prediffer" menuitem
+ */
+void CMergeEditView::OnUpdateNoPrediffer(CCmdUI* pCmdUI)
+{
+ // recreate the sub menu (to fill the "selected prediffers")
+ GetMainFrame()->UpdatePrediffersMenu();
+ OnUpdatePrediffer(pCmdUI);
+}
+
void CMergeEditView::OnNoPrediffer()
{
OnPrediffer(ID_NO_PREDIFFER);
Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h 2006-09-04 16:23:48 UTC (rev 3520)
+++ trunk/Src/MergeEditView.h 2006-09-04 19:16:56 UTC (rev 3521)
@@ -262,6 +262,7 @@
afx_msg void OnUpdateWMGoto(CCmdUI* pCmdUI);
afx_msg void OnUpdateScripts(CCmdUI* pCmdUI);
afx_msg void OnScripts(UINT nID );
+ afx_msg void OnUpdateNoPrediffer(CCmdUI* pCmdUI);
afx_msg void OnUpdatePrediffer(CCmdUI* pCmdUI);
afx_msg void OnNoPrediffer();
afx_msg void OnPrediffer(UINT nID );
@@ -283,6 +284,7 @@
afx_msg void OnOpenFileWithEditor();
afx_msg void OnViewSwapPanes();
afx_msg void OnUpdateViewSwapPanes(CCmdUI* pCmdUI);
+ afx_msg void OnUpdateNoEditScripts(CCmdUI* pCmdUI);
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnHelp();
//}}AFX_MSG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-04 16:24:02
|
Revision: 3520
http://svn.sourceforge.net/winmerge/?rev=3520&view=rev
Author: kimmov
Date: 2006-09-04 09:23:48 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/PropRegistry.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-03 18:17:35 UTC (rev 3519)
+++ trunk/Src/Changes.txt 2006-09-04 16:23:48 UTC (rev 3520)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-04 Kimmo
+ BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
+ Src: PropRegistry.cpp
+
2006-09-01 Takashi
Japanese translation - update
Src/Languages/Japanese: MergeJapanese.rc
Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp 2006-09-03 18:17:35 UTC (rev 3519)
+++ trunk/Src/PropRegistry.cpp 2006-09-04 16:23:48 UTC (rev 3520)
@@ -75,6 +75,7 @@
DDX_Check(pDX, IDC_EXPLORER_ADVANCED, m_bContextAdvanced);
DDX_Check(pDX, IDC_IGNORE_SMALLTIMEDIFF, m_bIgnoreSmallTimeDiff);
DDX_Text(pDX, IDC_FILTER_USER_PATH, m_strUserFilterPath);
+ DDX_Check(pDX, IDC_EXPLORER_SUBFOLDERS, m_bContextSubfolders);
//}}AFX_DATA_MAP
}
@@ -214,6 +215,11 @@
else
dwContextEnabled &= ~CONTEXT_F_ADVANCED;
+ if (m_bContextSubfolders)
+ dwContextEnabled |= CONTEXT_F_SUBFOLDERS;
+ else
+ dwContextEnabled &= ~CONTEXT_F_SUBFOLDERS;
+
retVal = reg.WriteDword(f_RegValueEnabled, dwContextEnabled);
if (retVal != ERROR_SUCCESS)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-03 18:17:44
|
Revision: 3519
http://svn.sourceforge.net/winmerge/?rev=3519&view=rev
Author: gerundt
Date: 2006-09-03 11:17:35 -0700 (Sun, 03 Sep 2006)
Log Message:
-----------
PATCH: [ 1551217 ] Web: Tracker shortcuts (mod_rewrite version)
Modified Paths:
--------------
trunk/Web/.htaccess
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2006-09-03 17:23:25 UTC (rev 3518)
+++ trunk/Web/.htaccess 2006-09-03 18:17:35 UTC (rev 3519)
@@ -17,8 +17,10 @@
Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
#Tracker shortcuts...
-RedirectMatch permanent /bug/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=113216
-RedirectMatch permanent /patch/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=313216
-RedirectMatch permanent /support/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=213216
-RedirectMatch permanent /rfe/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=363216
-RedirectMatch permanent /todo/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=759426
\ No newline at end of file
+RewriteEngine On
+RewriteBase /
+RewriteRule ^bug/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=113216 [R]
+RewriteRule ^patch/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=313216 [R]
+RewriteRule ^support/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=213216 [R]
+RewriteRule ^rfe/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=363216 [R]
+RewriteRule ^todo/([0-9]+)$ http://sourceforge.net/tracker/index.php?func=detail&aid=$1&group_id=13216&atid=759426 [R]
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-03 17:23:36
|
Revision: 3518
http://svn.sourceforge.net/winmerge/?rev=3518&view=rev
Author: gerundt
Date: 2006-09-03 10:23:25 -0700 (Sun, 03 Sep 2006)
Log Message:
-----------
PATCH: [ 1551217 ] Web: Tracker shortcuts
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2006-09-02 20:35:37 UTC (rev 3517)
+++ trunk/Web/.htaccess 2006-09-03 17:23:25 UTC (rev 3518)
@@ -14,4 +14,11 @@
Redirect permanent /images/screenshot.png http://winmerge.org/2.0/images/screenshot.png
Redirect permanent /images/winmerge.gif http://winmerge.org/2.0/images/icon.gif
Redirect permanent /images/winmerge22.gif http://winmerge.org/2.2/images/icon.gif
-Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
\ No newline at end of file
+Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
+
+#Tracker shortcuts...
+RedirectMatch permanent /bug/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=113216
+RedirectMatch permanent /patch/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=313216
+RedirectMatch permanent /support/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=213216
+RedirectMatch permanent /rfe/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=363216
+RedirectMatch permanent /todo/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=759426
\ No newline at end of file
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-02 20:35:37 UTC (rev 3517)
+++ trunk/Web/Changes.txt 2006-09-03 17:23:25 UTC (rev 3518)
@@ -1,3 +1,18 @@
+2006-09-03 Tim
+ PATCH: [ 1551217 ] Web: Tracker shortcuts
+ Web: .htaccess
+
+2006-09-02 Tim
+ Fix the download link of the HTML manual.
+ Web: index.php
+ Use Dean's text changes for 2.4 subdirectory too.
+ Web\2.4: index.php
+
+2006-09-02 Dean
+ Edited text
+ Web: downloads.php index.php
+ Web\developer: index.php
+
2006-08-26 Tim
PATCH: [ 1547117 ] Web: Remove Ads
Web: page.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-02 20:35:48
|
Revision: 3517
http://svn.sourceforge.net/winmerge/?rev=3517&view=rev
Author: gerundt
Date: 2006-09-02 13:35:37 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Fix the download link of the HTML manual.
Modified Paths:
--------------
trunk/Web/index.php
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2006-09-02 20:33:58 UTC (rev 3516)
+++ trunk/Web/index.php 2006-09-02 20:35:37 UTC (rev 3517)
@@ -54,7 +54,7 @@
<h2>Using WinMerge</h2>
<p>For information on using WinMerge, see our <a href="2.4/manual/index.html">online Manual</a>, or you can
-<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy of the documentation for offline use.</p>
+<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=438564">download</a> a copy of the documentation for offline use.</p>
<h2>Support</h2>
<p>WinMerge is an Open Source project, that is covered
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-02 20:34:12
|
Revision: 3516
http://svn.sourceforge.net/winmerge/?rev=3516&view=rev
Author: gerundt
Date: 2006-09-02 13:33:58 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Use Dean's text changes for 2.4 subdirectory too.
Modified Paths:
--------------
trunk/Web/2.4/index.php
Modified: trunk/Web/2.4/index.php
===================================================================
--- trunk/Web/2.4/index.php 2006-09-02 16:48:18 UTC (rev 3515)
+++ trunk/Web/2.4/index.php 2006-09-02 20:33:58 UTC (rev 3516)
@@ -13,13 +13,13 @@
<li>Unicode support</li>
<li>Difference pane shows current difference in two vertical panes</li>
<li>Location pane shows map of files compared</li>
- <li>Highlights differences inside lines</li>
- <li>File filters in directory diff</li>
- <li>Moved lines detection in file compare</li>
+ <li>Highlights differences inside the lines</li>
+ <li>File filters in directory pane</li>
+ <li>Moved lines detection in file compare pane</li>
<li>Shell Integration</li>
<li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
<li>Archive file support using 7-zip</li>
- <li>Plugins</li>
+ <li>Plugin support</li>
<li>Localizable interface via resource DLL</li>
<li>HTML-based <a href="manual/index.html">Manual</a></li>
</ul>
@@ -32,11 +32,11 @@
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
-<p>For more details please look at the <a href="manual/installing.html">Installation section</a> from the <a href="manual/index.html">Manual</a>.</p>
+<p>For more information, please see the <a href="manual/installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
<h2>Using WinMerge</h2>
-<p>You can use the <a href="manual/index.html">online Manual</a>, or you can
-<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=438564">download</a> a copy.</p>
+<p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>, or you can
+<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=438564">download</a> a copy of the documentation for offline use.</p>
<h2>Support</h2>
<p>WinMerge is an Open Source project, that is covered
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gr...@us...> - 2006-09-02 16:48:23
|
Revision: 3515
http://svn.sourceforge.net/winmerge/?rev=3515&view=rev
Author: grimmdp
Date: 2006-09-02 09:48:18 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Edited text
Modified Paths:
--------------
trunk/Web/developer/index.php
trunk/Web/downloads.php
trunk/Web/index.php
Modified: trunk/Web/developer/index.php
===================================================================
--- trunk/Web/developer/index.php 2006-09-01 12:55:04 UTC (rev 3514)
+++ trunk/Web/developer/index.php 2006-09-02 16:48:18 UTC (rev 3515)
@@ -5,7 +5,7 @@
$page->printHead('WinMerge: Developers', WINMERGE_DEV);
?>
<h2>WinMerge developers</h2>
-<p>This is a list of some of the current developers on WinMerge</p>
+<p>Following is a list of the current developers on the WinMerge project:</p>
<?php
$xmlarray = $page->convertXml2Array('developers.xml');
@@ -36,9 +36,9 @@
}
print("</ul>\n");
?>
-<p>Look how to <a href="needed.php">develop</a> and
-<a href="l10n/index.php">translate WinMerge</a>
-and get some hints for <a href="wincvs.php">WinCVS</a>.</p>
+<p>Look here for more information on how to <a href="needed.php">develop</a> and/or
+<a href="l10n/index.php">translate</a> WinMerge,
+and read how to use <a href="wincvs.php">WinCVS</a> with our project.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2006-09-01 12:55:04 UTC (rev 3514)
+++ trunk/Web/downloads.php 2006-09-02 16:48:18 UTC (rev 3515)
@@ -19,7 +19,7 @@
<p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?group_id=13216&release_id=428331">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
</dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.zip">Manual</a></dt>
- <dd><p>This is the offline version from our Manual in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.7z">.7z</a>).</p></dd>
+ <dd><p>This is the offline version of the manual in archived format (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.7z">.7z</a>).</p></dd>
</dl>
<?php
$page->printFoot();
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2006-09-01 12:55:04 UTC (rev 3514)
+++ trunk/Web/index.php 2006-09-02 16:48:18 UTC (rev 3515)
@@ -13,13 +13,13 @@
<li>Unicode support</li>
<li>Difference pane shows current difference in two vertical panes</li>
<li>Location pane shows map of files compared</li>
- <li>Highlights differences inside lines</li>
- <li>File filters in directory diff</li>
- <li>Moved lines detection in file compare</li>
+ <li>Highlights differences inside the lines</li>
+ <li>File filters in directory pane</li>
+ <li>Moved lines detection in file compare pane</li>
<li>Shell Integration</li>
<li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
<li>Archive file support using 7-zip</li>
- <li>Plugins</li>
+ <li>Plugin support</li>
<li>Localizable interface via resource DLL</li>
<li>HTML-based <a href="2.4/manual/index.html">Manual</a></li>
</ul>
@@ -29,7 +29,7 @@
<p>See the <a href="2.4/screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>WinMerge 2.4.10 - latest stable version</h2>
-<p><a href="2.4/index.php">WinMerge 2.4.10</a> is the latest stable version, and it is recommended for most users.</p>
+<p><a href="2.4/index.php">WinMerge 2.4.10</a> is the latest stable version, and is recommended for most users.</p>
<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">Download WinMerge 2.4.10 Installer</a></p>
<h2>WinMerge 2.2.4 - older stable version</h2>
@@ -50,11 +50,11 @@
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
-<p>For more details please look at the <a href="2.4/manual/installing.html">Installation section</a> from the <a href="2.4/manual/index.html">Manual</a>.</p>
+<p>For more information, please see the <a href="2.4/manual/installing.html">Installation section</a> of the <a href="2.4/manual/index.html">Manual</a>.</p>
<h2>Using WinMerge</h2>
-<p>You can use the <a href="2.4/manual/index.html">online Manual</a>, or you can
-<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy.</p>
+<p>For information on using WinMerge, see our <a href="2.4/manual/index.html">online Manual</a>, or you can
+<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy of the documentation for offline use.</p>
<h2>Support</h2>
<p>WinMerge is an Open Source project, that is covered
@@ -79,12 +79,11 @@
to support the continued development of WinMerge.</p>
<h2>Developers</h2>
-<p>On the <a href="developer/index.php">developer page</a>
-you get more information about the development for WinMerge.</p>
-<p>You get a list from the current developers, how to
-<a href="developer/needed.php">develop</a> and
-<a href="developer/translate.php">translate WinMerge</a>
-and some hints for <a href="developer/wincvs.php">WinCVS</a>.</p>
+<p>As we said, WinMerge is an open source project, which means that the program is maintained and developed by
+volunteers. If you''re interested in contributing work to the project, see our <a href="developer/needed.php">developer page</a>
+for forther information on how you may contribute.</p>
+<p>In addition, WinMerge is translated into a number of different languages. <a href="developer/translate.php">Click here for more information on translating WinMerge</a> into your own language.</p>
+<p><a href="developer/index.php">The WinMerge Development Team</a></p>
<?php
$page->printFoot();
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
