Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-07 Kimmo
+ PATCH: [ 1652696 ] Add more options for backup files
+ Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
+ OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
+ Src new files: PropBackups.cpp PropBackups.h
+ Src/Common: PreferencesDlg.cpp PreferencesDlg.h
+ Src/Languages/*: Merge*.rc
+
2007-02-03 Kimmo
Remove unused enum definition
Src: PropCompare.h
* (http://www.abstractspoon.com/) but is modified to use in
* WinMerge.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
, m_pageCodepage(regOptions)
, m_pageEditor(regOptions)
, m_pageSystem(regOptions)
+, m_pageBackups(regOptions)
, m_pageVss(regOptions)
{
UNREFERENCED_PARAMETER(nMenuID);
AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_SYNTAXCOLORS);
AddPage(&m_pageArchive, IDS_OPTIONSPG_ARCHIVE);
AddPage(&m_pageSystem, IDS_OPTIONSPG_SYSTEM);
+ AddPage(&m_pageBackups, IDS_OPTIONSPG_BACKUPS);
AddPage(&m_pageVss, IDS_OPTIONSPG_VERSIONCONTROL);
AddPage(&m_pageCodepage, IDS_OPTIONSPG_CODEPAGE);
m_pageCodepage.ReadOptions();
m_pageVss.ReadOptions();
m_pageArchive.ReadOptions();
+ m_pageBackups.ReadOptions();
if (bUpdate)
{
SafeUpdatePage(&m_pageCodepage, FALSE);
SafeUpdatePage(&m_pageVss, FALSE);
SafeUpdatePage(&m_pageArchive, FALSE);
+ SafeUpdatePage(&m_pageBackups, FALSE);
}
}
m_pageCodepage.WriteOptions();
m_pageVss.WriteOptions();
m_pageArchive.WriteOptions();
+ m_pageBackups.WriteOptions();
}
void CPreferencesDlg::SetSyntaxColors(SyntaxColors *pColors)
* (http://www.abstractspoon.com/) but is modified to use in
* WinMerge.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "PropSyntaxColors.h"
#include "PropCodepage.h"
#include "PropArchive.h"
+#include "PropBackups.h"
#include "propertypagehost.h"
CPropTextColors m_pageTextColors;
CPropSyntaxColors m_pageSyntaxColors;
CPropArchive m_pageArchive;
+ CPropBackups m_pageBackups;
SyntaxColors *m_pSyntaxColors;
const FileActionItem act = m_actions.GetNext(pos);
if (act.atype == FileAction::ACT_COPY && !act.dirflag)
{
- int retVal = VCSCheckOut(act.src, bApplyToAll);
- if (retVal == SCRIPT_USERCANCEL)
- bContinue = FALSE;
- else if (retVal == SCRIPT_USERSKIP)
- bSkip = TRUE;
- else if (retVal == SCRIPT_FAIL)
- bContinue = FALSE;
+ if (GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM) != VCS_NONE)
+ {
+ int retVal = VCSCheckOut(act.src, bApplyToAll);
+ if (retVal == SCRIPT_USERCANCEL)
+ bContinue = FALSE;
+ else if (retVal == SCRIPT_USERSKIP)
+ bSkip = TRUE;
+ else if (retVal == SCRIPT_FAIL)
+ bContinue = FALSE;
+ }
+
+ if (bContinue)
+ {
+ if (!GetMainFrame()->CreateBackup(TRUE, act.src))
+ {
+ CString strErr = LoadResString(IDS_ERROR_BACKUP);
+ AfxMessageBox(strErr, MB_OK | MB_ICONERROR);
+ bContinue = FALSE;
+ }
+ }
}
if (act.atype == FileAction::ACT_COPY &&
CAPTION "Geral"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Guardar cópia de segurança do arquivo original",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Posicionar a&utomaticamente na primeira diferença",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Desabilitar Splash Screen",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Automatically verify paths in Open-dialog",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Îñíîâíè"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Ðåçåðâíî êîïèå íà îðèãèíàëíèÿ ôàéë",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Àâòîìàòè÷íî &ïðèäâèæâàíå êúì ïúðâàòà ðàçëèêà",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Çàáðàíè íà÷àëíèÿ ïðîçîðåö",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Çàòâîðè &ïðîçîðöèòå ïðè ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Àâòîìàòè÷íî ïðîâåðè ïúòèùàòà â äèàëîãà Îòâîðè",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Ïîçâîëè ñàìî &åäíî ñòàðòèðàíî êîïèå",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Ïîçâîëè ìíîãî ïðîçîðöè çà ñðàâíÿâàíå çà",IDC_STATIC,7,100,
+ GROUPBOX "Ïîçâîëè ìíîãî ïðîçîðöè çà ñðàâíÿâàíå çà",IDC_STATIC,7,90,
221,37
CONTROL "Ñðàâíÿâàíå íà &Ïàïêè",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Ñðàâíÿâàíå íà &Ôàéëîâå",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge ïîçâîëÿâà ñêðèâàíå íà íÿêîè ñúîáùåíèÿ. Íàòèñíåòå áóòîíà Âúçñòàíîâè, çà äà ïîêàæåòå ïàê òåçè ñúîáùåíèÿ.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Âúçñòàíîâè",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Âúçñòàíîâè",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Çàïèøè...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Êîíòðîë íà âåðñèÿòà"
IDS_OPTIONSPG_CODEPAGE "Êîäèðîâêà"
IDS_OPTIONSPG_ARCHIVE "Ïîääðúæêà íà àðõèâè"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Guarda una còpia del fitxer original",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "&Desplaça automàticament fins a la primera diferència",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Inhabilita la pantalla de &benvinguda",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "T&anca les finestres amb ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Verifica els trajectes automàticament al diàleg d'Obrir",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Permet d'executar només una instància",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Autocompletar al diàleg d'obrir:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Autocompletar al diàleg d'obrir:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Permet múltiples finestres de comparació per",IDC_STATIC,7,100,
+ GROUPBOX "Permet múltiples finestres de comparació per",IDC_STATIC,7,90,
221,37
CONTROL "Comparació de &carpetes",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Comparació de &fitxers",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el botó de Reinicialització per a fer visibles tots els quadres de missatges altre cop.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "De&sa...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Control de versions"
IDS_OPTIONSPG_CODEPAGE "Pàgina de codis"
IDS_OPTIONSPG_ARCHIVE "Suport d'arxivament"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "³£¹æ"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "±¸·ÝÔʼÎļþ(&B)",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "×Ô¶¯¹ö¶¯µ½µÚÒ»´¦²»Í¬(&S)",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Í£ÓÃÆô¶¯ÆÁÄ»(&D)",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "ESC¹Ø±Õ´°¿Ú(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "ÔÚ¡°´ò¿ª¡±¶Ô»°¿òÖÐ×Ô¶¯Ñé֤·¾¶",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Ö»ÔÊÐíÔËÐÐÒ»¸öʵÀý(&A)",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú",IDC_STATIC,7,100,221,37
+ GROUPBOX "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú",IDC_STATIC,7,90,221,37
CONTROL "Îļþ¼Ð¶Ô±È(&F)",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Îļþ¶Ô±È(&E)",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "ÖØÖÃ",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "ÖØÖÃ",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "°æ±¾¿ØÖÆ"
IDS_OPTIONSPG_CODEPAGE "´úÂëÒ³"
IDS_OPTIONSPG_ARCHIVE "ѹËõ°üÖ§³Ö"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "¤@¯ë"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "³Æ¥÷ì©lªºÀÉ®×(&B)",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "¦Û°Ê¦a±²°Ê¨ì²Ä¤@Ó¤£¦P(&S)",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "°±¥Î¤Þ¤Hª`¥Øªº¿Ã¹õ(&D)",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "«ö¤U ESC ®ÉÃö³¬µøµ¡(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "¦b¶}±Ò¹ï¸Ü²°¦Û°Ê¦aÅçÃÒ¸ô®|",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "«³]",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "«³]",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Obecné"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Zálohovat pùvodní soubory",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automaticky posunout na pr&vní rozdíl",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Nezobrazovat úvodní o&brazovku",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Zavírat okna klávesou &Esc",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Automaticky &ovìøovat cesty v dialogu Otevøít",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Povolit pouze jedno &hlavní okno aplikace",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Automatické &dokonèování:",IDC_STATIC,19,72,125,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Automatické &dokonèování:",IDC_STATIC,19,62,125,8
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Povolit více oken pro porovnání",IDC_STATIC,7,100,
+ GROUPBOX "Povolit více oken pro porovnání",IDC_STATIC,7,90,
221,37
CONTROL "s&lo\9eek",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "&souborù",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "Nìkterá obecná okna se zprávami je mo\9eno skrýt.\nPo stisknutí tlaèítka Vrátit se v\9aechna tato okna opìt budou objevovat.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "V&rátit",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "V&rátit",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "&Ulo\9eit...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Kontrola verzí"
IDS_OPTIONSPG_CODEPAGE "Kódování"
IDS_OPTIONSPG_ARCHIVE "Podpora archivù"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Generelt"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Backup originale filer",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatisk &scroll til første forskel",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Fjern Splash Screen",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "L&uk vinduer med ESC tasten",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Verificer automatisk stinavnene i åben dialogen",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Algemeen"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Reservekopie orginele bestand",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "&Automatisch naar eerste verschil gaan",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Splash Screen uitscha&kelen",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Vensters met ESC sl&uiten",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Paden automatisch controleren in het venster Openen",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Général"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Crée un &backup des fichiers originaux",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,145,10
CONTROL "&Atteindre automatiquement la première différence",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,183,10
+ 7,183,10
CONTROL "&Sans page de garde",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,80,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,80,10
CONTROL "Fermer les fenêtres avec la &touche ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Vérifier automatiquement les chemins de la fenêtre-Ouvrir",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Permetre une seule instance en exécution",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Qualifier plusieurs fenêtres pour",IDC_STATIC,7,100,
+ GROUPBOX "Qualifier plusieurs fenêtres pour",IDC_STATIC,7,90,
221,37
CONTROL "comparaison de Répert&oires",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "comparaison de &Fichiers",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_COMPARE "Comparaison"
IDS_OPTIONSPG_EDITOR "Éditeur"
IDS_OPTIONSPG_COLORS "Couleurs"
+ IDS_OPTIONSPG_SYNTAXCOLORS "Couleurs de la syntaxe"
+ IDS_OPTIONSPG_TEXTCOLORS "Text Colors"
IDS_OPTIONSPG_SYSTEM "Système"
IDS_OPTIONSPG_VERSIONCONTROL "Controle de version"
IDS_OPTIONSPG_CODEPAGE "Page de code"
- IDS_OPTIONSPG_SYNTAXCOLORS "Couleurs de la syntaxe"
IDS_OPTIONSPG_ARCHIVE "Support des archives"
- IDS_OPTIONSPG_TEXTCOLORS "Text Colors"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Allgemein"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Sicherheitskopie der Originaldatei",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Anzeige automatisch auf den ersten Unterschied &positionieren",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,210,10
+ 7,210,10
CONTROL "Startbildschirm &deaktivieren",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Fenster mit &ESC schliessen",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "P&fade im Öffnen-Dialog automatisch überprüfen",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Nur eine Programm-Instanz zulassen",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Öffnen-Dialog Auto&vervollständigung:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Öffnen-Dialog Auto&vervollständigung:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Aktivieren mehrfacher Vergleichsfenster für",IDC_STATIC,7,100,
+ GROUPBOX "Aktivieren mehrfacher Vergleichsfenster für",IDC_STATIC,7,90,
221,37
CONTROL "&Ordnervergleich",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "D&ateivergleich",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge erlaubt das Verstecken von einigen häufigen Meldungen.\nDrücken Sie die Zurücksetzen-Schaltfläche um alle Meldungen wieder sichtbar zumachen.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Zurücksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Zurücksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Speichern...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Versionskontrolle"
IDS_OPTIONSPG_CODEPAGE "Zeichensatz"
IDS_OPTIONSPG_ARCHIVE "Archiv-Unterstützung"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Általános"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Biztonsági másolat az eredeti fájlról",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatikus &ugrás az elsõ eltérésre",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Splash Screen letiltása",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Ablakok bezárása az &ESC billentyûvel",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Automatikus útvonalellenõrzés a &Megnyitás ablakban",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Csak &egy példány futásának engedélyezése",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Többszörös összehasonlító ablakok engedélyezése:",IDC_STATIC,7,100,
+ GROUPBOX "Többszörös összehasonlító ablakok engedélyezése:",IDC_STATIC,7,90,
221,37
CONTROL "&Mappa összehasonlításkor",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "&Fájl összehasonlításkor",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Visszaállít",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Visszaállít",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Verzió Kontroll"
IDS_OPTIONSPG_CODEPAGE "Kódlap"
IDS_OPTIONSPG_ARCHIVE "Archívum támogatás"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Generale"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Salva copia di bac&kup del file originale",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "&Visualizza automaticamente la prima differenza",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Disattiva la schermata iniziale",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "C&hiudi finestra con ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Verifica &automaticamente i percorsi nella finestra Apri",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Permetti l'esecuzione di un'unica istanza del programma",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Completamento automatico nella scelta dei file:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Completamento automatico nella scelta dei file:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Attiva finestra di confronto multiplo per",IDC_STATIC,7,100,
+ GROUPBOX "Attiva finestra di confronto multiplo per",IDC_STATIC,7,90,
221,37
CONTROL "Confron&to di cartelle",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Confronto di &file",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante Ripristina per rendere di nuovo visibili tutti i messaggi.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Ripristina",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Ripristina",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Salva...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Controllo versioni"
IDS_OPTIONSPG_CODEPAGE "Codice di pagina"
IDS_OPTIONSPG_ARCHIVE "Supporto per gli archivi"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "\88ê\94Ê"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "\8c³\83t\83@\83C\83\8b\82ð\83o\83b\83N\83A\83b\83v(&B)",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "\8e©\93®\93I\82É\8dÅ\8f\89\82Ì\8d·\88Ù\82É\83X\83N\83\8d\81[\83\8b\82·\82é(&S)",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "\83X\83v\83\89\83b\83V\83\85\89æ\96Ê\82ð\94ñ\95\\8e¦(&D)",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "ESC\83L\81[\82Å\83E\83C\83\93\83h\83E\82ð\95Â\82¶\82é(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "\8aJ\82\83_\83C\83A\83\8d\83O\82Å\8e©\93®\93I\82É\83p\83X\82ð\8c\9f\8d¸\82·\82é",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "\95¡\90\94\82Ì\83C\83\93\83X\83^\83\93\83X\82ð\8bN\93®\82µ\82È\82¢(&O)",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "\8aJ\82\83_\83C\83A\83\8d\83O\82Ì\83I\81[\83g\83R\83\93\83v\83\8a\81[\83g(&O):",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "\8aJ\82\83_\83C\83A\83\8d\83O\82Ì\83I\81[\83g\83R\83\93\83v\83\8a\81[\83g(&O):",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "\95¡\90\94\82Ì\94ä\8ar\83E\83C\83\93\83h\83E\82ð\97L\8cø",IDC_STATIC,7,100,
+ GROUPBOX "\95¡\90\94\82Ì\94ä\8ar\83E\83C\83\93\83h\83E\82ð\97L\8cø",IDC_STATIC,7,90,
221,37
CONTROL "\83t\83H\83\8b\83_\94ä\8ar(&F)",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "\83t\83@\83C\83\8b\94ä\8ar(&E)",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge \82Í\81A\82¢\82\82Â\82©\82Ì\8b¤\92Ê\83\81\83b\83Z\81[\83W\83{\83b\83N\83X\82ð\94ñ\95\\8e¦\82É\82Å\82«\82Ü\82·\81B \91S\82Ä\82Ì\83\81\83b\83Z\81[\83W\83{\83b\83N\83X\82ð\8dÄ\82Ñ\95\\8e¦\82³\82¹\82é\82É\82Í\81A\83\8a\83Z\83b\83g\83{\83^\83\93\82ð\89\9f\89º\82µ\82Ä\82\82¾\82³\82¢\81B",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "\83\8a\83Z\83b\83g",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "\83\8a\83Z\83b\83g",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "\95Û\91¶...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "\83o\81[\83W\83\87\83\93\8aÇ\97\9d"
IDS_OPTIONSPG_CODEPAGE "\83R\81[\83h\83y\81[\83W"
IDS_OPTIONSPG_ARCHIVE "\83A\81[\83J\83C\83u\83T\83|\81[\83g"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "ÀϹÝ"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "¿øº» ÆÄÀÏ ¹é¾÷(&B)",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "óÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î ÀÚµ¿ ½ºÅ©·Ñ(&S)",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "½ºÇ÷¡½¬ È¸é »ç¿ë ¾ÈÇÔ(&D)",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "ESC·Î ⠴ݱâ(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "¿±â ´ëÈ»óÀÚ¿¡¼ ÀÚµ¿À¸·Î ¿Ã¹Ù¸¥ °æ·ÎÀÎÁö °Ë»ç",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Allow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "ÃʱâÈ",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "ÃʱâÈ",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Generelt"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Sikkerhetskopier originale filer",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatisk &rulling til første forskjell",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Fjern oppstartsbilde",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "L&ukk vinduer med ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Verifiser stier automatisk i Åpne-dialoger",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Nullstill",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Nullstill",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Ogólne"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Kopia zapasowa orygina³u",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Przejd\9f automatycznie do pierwszej ró¿nicy",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Wy³¹cz ekran powitalny",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Zam&knij okna klawiszem ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Automatycznie weryfikuj \9ccie¿ki w oknie Otwórz",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Zezwól na uruchomienie tylko &jednej instancji programu",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Otwórz okno autouzupe³niania:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Otwórz okno autouzupe³niania:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "W³¹cz wiele okien porównania dla",IDC_STATIC,7,100,
+ GROUPBOX "W³¹cz wiele okien porównania dla",IDC_STATIC,7,90,
221,37
CONTROL "Porównania &folderów",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Porównania &plików",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge pozwala ukryæ niektóre komunikaty. Naci\9cnij przycisk, aby wy\9cwietlaæ wszystkie komunikaty.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Resetuj",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Resetuj",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Zapisz...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Kontrola wersji"
IDS_OPTIONSPG_CODEPAGE "Strona kodowa"
IDS_OPTIONSPG_ARCHIVE "Wsparcie dla archiwów"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Îñíîâíûå"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Äåëàòü ðåçåðâíóþ êîïèþ îðèãèíàëà",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Àâòîìàòè÷åñêè &óñòàíîâèòü íà ïåðâîå îòëè÷èå",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Îòêëþ÷èòü &çàñòàâêó",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Çà&êðûâàòü îêíà êëàâèøåé ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Àâòîìàòè÷åñêè ïðîâåðÿòü ïóòè â äèàëîãå îòðûòèÿ ôàéëîâ",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Ðàçðåøèòü çàïóñê òîëüêî îäíîé êîïèè",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Âêëþ÷èòü îêíà ìíîæåñòâåííîãî ñðàâíåíèÿ äëÿ",IDC_STATIC,7,100,
+ GROUPBOX "Âêëþ÷èòü îêíà ìíîæåñòâåííîãî ñðàâíåíèÿ äëÿ",IDC_STATIC,7,90,
221,37
CONTROL "Ñðàâíåíèÿ &ïàïîê",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Ñðàâíåíèÿ &ôàéëîâ",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Ñáðîñ",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Ñáðîñ",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Êîíòðîëü âåðñèé"
IDS_OPTIONSPG_CODEPAGE "Êîäîâàÿ ñòðàíèöà"
IDS_OPTIONSPG_ARCHIVE "Ïîääåðæêà àðõèâîâ"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Hlavné nastavenia"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Zálohova\9d originálne súbory",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatický &skok na prvý rozdiel",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Nezobrazuj spú\9a\9dací banner",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Zat&vára\9d okná klávesom ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Automaticky overova\9d cestu v dialógu Otvori\9d",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Um&o\9eni beh iba jednej in\9atancie",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
LTEXT "A&utomatické dopåòanie v dialógu Otvori\9d:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Povo¾ viaceré okná pre porovnanie",IDC_STATIC,7,100,
+ GROUPBOX "Povo¾ viaceré okná pre porovnanie",IDC_STATIC,7,90,
221,37
CONTROL "Porovnávanie &adresárov",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Porovnávanie &súborov",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge umo\9eòuje zamedzi\9d zobrazovaniu be\9ených správ. Stlaèením tlaèidla Reset sa znova správy zobrazia.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Ulo\9ei\9d...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Kontrola verzií"
IDS_OPTIONSPG_CODEPAGE "Kódová stránka"
IDS_OPTIONSPG_ARCHIVE "Podpora archívov"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Hacer copia de seguridad del fichero original",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "&Moverse automáticamente a la primera diferencia",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&No mostrar pantalla de bienvenida",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "C&errar ventanas con ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Verificar rutas automáticamente en la ventana de apertura",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Permitir solo una instancia en ejecución",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
LTEXT "A&uto-completar en diálogos de apertura:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Habilitar múltiples ventanas de comparación para",IDC_STATIC,7,100,
+ GROUPBOX "Habilitar múltiples ventanas de comparación para",IDC_STATIC,7,90,
221,37
CONTROL "Comparación de &directorios",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Comparación de &ficheros",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge permite ocultar algunos mensajes comunes. Pulse Reset para hacer todos los mensajes visibles de nuevo.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "M&ostrar",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "M&ostrar",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Guardar...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Control de Versiones"
IDS_OPTIONSPG_CODEPAGE "Página de Códigos"
IDS_OPTIONSPG_ARCHIVE "Soporte de Archivado"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "Generellt"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Gör backup på originalfiler",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Gå automati&skt till första skillnaden",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Visa inte Startskärm",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "St&äng fönster med ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Verifiera sökvägar i Öppna-dialogen",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Tillåt bara en upplaga att köra",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Ö&ppna-dialog Auto-Komplettera:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Ö&ppna-dialog Auto-Komplettera:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Starta flera jämförfönster för",IDC_STATIC,7,100,
+ GROUPBOX "Starta flera jämförfönster för",IDC_STATIC,7,90,
221,37
CONTROL "&Jämför kataloger",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Jäm&för filer",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge tillåter döljande av några meddelanderutor. Klicka på Återställ-knappen för att göra alla meddelanderutor synliga igen.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Återställ",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Återställ",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Spara...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Versionskontroll"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Arkivstöd"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Backup original file",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatically &scroll to first difference",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Automatically verify paths in Open-dialog",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "© 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "WinMerge\0"
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
#include "ProjectFilePathsDlg.h"
#include "MergeCmdLineInfo.h"
#include "FileOrFolderSelect.h"
+#include "PropBackups.h"
/*
One source file must compile the stubs for multimonitor
return TRUE;
}
-/// Creates backup before file is saved over
-BOOL CMainFrame::CreateBackup(LPCTSTR pszPath)
+/**
+ * @brief Creates backup before file is saved or copied over.
+ * This function handles formatting correct path and filename for
+ * backup file. Formatting is done based on several options available
+ * for users in Options/Backups dialog. After path is formatted, file
+ * is simply just copied. Not much error checking, just if copying
+ * succeeded or failed.
+ * @param [in] bFolder Are we creating backup in folder compare?
+ * @param [in] pszPath Full path to file to backup.
+ * @return TRUE if backup succeeds, or isn't just done.
+ */
+BOOL CMainFrame::CreateBackup(BOOL bFolder, LPCTSTR pszPath)
{
- // first, make a backup copy of the original
+ // If user doesn't want to backups in folder compare, return
+ // success so operations don't abort.
+ if (bFolder && !(GetOptionsMgr()->GetBool(OPT_BACKUP_FOLDERCMP)))
+ return TRUE;
+ // Likewise if user doesn't want backups in file compare
+ else if (!bFolder && !(GetOptionsMgr()->GetBool(OPT_BACKUP_FILECMP)))
+ return TRUE;
+
// create backup copy of file if destination file exists
- if (GetOptionsMgr()->GetBool(OPT_CREATE_BACKUPS)
- && paths_DoesPathExist(pszPath) == IS_EXISTING_FILE)
- {
- // Add backup extension if pathlength allows it
- BOOL success = TRUE;
- CString s = pszPath;
- if (s.GetLength() >= (MAX_PATH - _tcslen(BACKUP_FILE_EXT)))
- success = FALSE;
+ if (paths_DoesPathExist(pszPath) == IS_EXISTING_FILE)
+ {
+ CString bakPath;
+ CString path;
+ CString filename;
+ CString ext;
+
+ SplitFilename(pszPath, &path, &filename, &ext);
+
+ // Determine backup folder
+ if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
+ CPropBackups::FOLDER_ORIGINAL)
+ {
+ // Put backups to same folder than original file
+ bakPath = path;
+ }
+ else if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
+ CPropBackups::FOLDER_GLOBAL)
+ {
+ // Put backups to global folder defined in options
+ bakPath = GetOptionsMgr()->GetString(OPT_BACKUP_GLOBALFOLDER);
+ if (bakPath.IsEmpty())
+ bakPath = path;
+ }
else
- s += BACKUP_FILE_EXT;
+ {
+ _RPTF0(_CRT_ERROR, "Unknown backup location!");
+ }
+
+ if (bakPath[bakPath.GetLength() - 1] != '\\')
+ bakPath.AppendChar('\\');
+
+ BOOL success = FALSE;
+ if (GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_BAK))
+ ext += BACKUP_FILE_EXT;
+
+ // Append time to filename if wanted so
+ // NOTE just adds timestamp at the moment as I couldn't figure out
+ // nice way to add a real time (invalid chars etc).
+ if (GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_TIME))
+ {
+ time_t curtime = 0;
+ time(&curtime);
+ CString timestr;
+ timestr.Format(_T("%d"), curtime);
+ filename.AppendChar('-');
+ filename.Append(timestr);
+ }
+
+ // Append filename and extension (+ optional .bak) to path
+ if ((bakPath.GetLength() + filename.GetLength() + ext.GetLength())
+ < MAX_PATH)
+ {
+ success = TRUE;
+ bakPath.Append(filename);
+ bakPath.AppendChar('.');
+ bakPath.Append(ext);
+ }
if (success)
- success = CopyFile(pszPath, s, FALSE);
+ success = CopyFile(pszPath, bakPath, FALSE);
if (!success)
{
if (nRetVal == IDCANCEL || nRetVal == IDNO)
return nRetVal;
- if (!CreateBackup(strSavePath))
- {
- psError->LoadString(IDS_ERROR_BACKUP);
- return -1;
- }
-
// If VC project opened from VSS sync and version control used
if ((nVerSys == VCS_VSS4 || nVerSys == VCS_VSS5) && m_bVCProjSync)
{
LoadConfigBoolSetting(&configLog.m_miscSettings.bAutomaticRescan, options, OPT_AUTOMATIC_RESCAN, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bAllowMixedEol, options, OPT_ALLOW_MIXED_EOL, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bScrollToFirst, options, OPT_SCROLL_TO_FIRST, cfgdir);
- LoadConfigBoolSetting(&configLog.m_miscSettings.bBackup, options, OPT_CREATE_BACKUPS, cfgdir);
+// LoadConfigBoolSetting(&configLog.m_miscSettings.bBackup, options, OPT_CREATE_BACKUPS, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bViewWhitespace, options, OPT_VIEW_WHITESPACE, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bMovedBlocks, options, OPT_CMP_MOVED_BLOCKS, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bShowLinenumbers, options, OPT_VIEW_LINENUMBERS, cfgdir);
int ShowMergeDoc(CDirDoc * pDirDoc, const FileLocation & filelocLeft,
const FileLocation & filelocRight, BOOL bROLeft, BOOL bRORight, PackingInfo * infoUnpacker = NULL);
void UpdateResources();
- BOOL CreateBackup(LPCTSTR pszPath);
+ BOOL CreateBackup(BOOL bFolder, LPCTSTR pszPath);
int HandleReadonlySave(CString& strSavePath, BOOL bMultiFile, BOOL &bApplyToAll);
CString SetStatus(LPCTSTR status);
void ApplyViewWhitespace();
# End Source File
# Begin Source File
+SOURCE=.\PropBackups.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\PropCodepage.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\PropBackups.h
+# End Source File
+# Begin Source File
+
SOURCE=.\PropCodepage.h
# End Source File
# Begin Source File
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Backup original file",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatically &scroll to first difference",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Disable Splash Screen",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&Automatically verify paths in Open-dialog",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
if (nRetVal == IDCANCEL)
return FALSE;
- if (!GetMainFrame()->CreateBackup(strSavePath))
+ if (!GetMainFrame()->CreateBackup(FALSE, strSavePath))
return FALSE;
// FALSE as long as the user is not satisfied
const TCHAR OPT_SYNTAX_HIGHLIGHT[] = _T("Settings/HiliteSyntax");
const TCHAR OPT_WORDDIFF_HIGHLIGHT[] = _T("Settings/HiliteWordDiff");
const TCHAR OPT_DISABLE_SPLASH[] = _T("Settings/DisableSplash");
-const TCHAR OPT_CREATE_BACKUPS[] = _T("Settings/BackupFile");
const TCHAR OPT_VIEW_WHITESPACE[] = _T("Settings/ViewWhitespace");
const TCHAR OPT_CONNECT_MOVED_BLOCKS[] = _T("Settings/ConnectMovedBlocks");
const TCHAR OPT_SCROLL_TO_FIRST[] = _T("Settings/ScrollToFirst");
+// Backup options
+const TCHAR OPT_BACKUP_FOLDERCMP[] = _T("Backup/EnableFolder");
+const TCHAR OPT_BACKUP_FILECMP[] = _T("Backup/EnableFile");
+const TCHAR OPT_BACKUP_LOCATION[] = _T("Backup/Location");
+const TCHAR OPT_BACKUP_GLOBALFOLDER[] = _T("Backup/GlobalFolder");
+const TCHAR OPT_BACKUP_ADD_BAK[] = _T("Backup/NameAddBak");
+const TCHAR OPT_BACKUP_ADD_TIME[] = _T("Backup/NameAddTime");
+
const TCHAR OPT_DIRVIEW_SORT_COLUMN[] = _T("Settings/DirViewSortCol");
const TCHAR OPT_DIRVIEW_SORT_ASCENDING[] = _T("Settings/DirViewSortAscending");
m_pOptions->InitOption(OPT_WORDWRAP, false);
m_pOptions->InitOption(OPT_VIEW_LINENUMBERS, false);
m_pOptions->InitOption(OPT_DISABLE_SPLASH, false);
- m_pOptions->InitOption(OPT_CREATE_BACKUPS, true);
m_pOptions->InitOption(OPT_VIEW_WHITESPACE, false);
m_pOptions->InitOption(OPT_CONNECT_MOVED_BLOCKS, 0);
m_pOptions->InitOption(OPT_SCROLL_TO_FIRST, false);
m_pOptions->InitOption(OPT_VERIFY_OPEN_PATHS, true);
m_pOptions->InitOption(OPT_AUTO_COMPLETE_SOURCE, (int)0);
+ m_pOptions->InitOption(OPT_BACKUP_FOLDERCMP, false);
+ m_pOptions->InitOption(OPT_BACKUP_FILECMP, true);
+ m_pOptions->InitOption(OPT_BACKUP_LOCATION, (int)0);
+ m_pOptions->InitOption(OPT_BACKUP_GLOBALFOLDER, _T(""));
+ m_pOptions->InitOption(OPT_BACKUP_ADD_BAK, true);
+ m_pOptions->InitOption(OPT_BACKUP_ADD_TIME, false);
+
m_pOptions->InitOption(OPT_DIRVIEW_SORT_COLUMN, (int)-1);
m_pOptions->InitOption(OPT_DIRVIEW_SORT_ASCENDING, true);
--- /dev/null
+/** \r
+ * @file PropBackups.cpp\r
+ *\r
+ * @brief Implementation of CPropBackups propertysheet\r
+ */\r
+// ID line follows -- this is updated by SVN\r
+// $Id: PropArchive.cpp 3126 2006-03-04 02:36:46Z elsapo $\r
+\r
+#include "stdafx.h"\r
+#include "Merge.h"\r
+#include "PropBackups.h"\r
+#include "OptionsDef.h"\r
+#include "OptionsMgr.h"\r
+#include "FileOrFolderSelect.h"\r
+\r
+#ifdef _DEBUG\r
+#define new DEBUG_NEW\r
+#undef THIS_FILE\r
+static char THIS_FILE[] = __FILE__;\r
+#endif\r
+\r
+\r
+// CPropBackups dialog\r
+\r
+/** \r
+ * @brief Constructor taking OptionsManager parameter.\r
+ * @param [in] optionsMgr Pointer to OptionsManager.\r
+ */\r
+CPropBackups::CPropBackups(COptionsMgr *optionsMgr)\r
+ : CPropertyPage(CPropBackups::IDD)\r
+ , m_pOptionsMgr(optionsMgr)\r
+ , m_bCreateForFolderCmp(FALSE)\r
+ , m_bCreateForFileCmp(FALSE)\r
+ , m_bAppendBak(FALSE)\r
+ , m_bAppendTime(FALSE)\r
+ , m_nBackupFolder(0)\r
+{\r
+}\r
+\r
+/** \r
+ * @brief Destructor.\r
+ */\r
+CPropBackups::~CPropBackups()\r
+{\r
+}\r
+\r
+void CPropBackups::DoDataExchange(CDataExchange* pDX)\r
+{\r
+ CDialog::DoDataExchange(pDX);\r
+ DDX_Check(pDX, IDC_BACKUP_FOLDERCMP, m_bCreateForFolderCmp);\r
+ DDX_Check(pDX, IDC_BACKUP_FILECMP, m_bCreateForFileCmp);\r
+ DDX_Text(pDX, IDC_BACKUP_FOLDER, m_sGlobalFolder);\r
+ DDX_Check(pDX, IDC_BACKUP_APPEND_BAK, m_bAppendBak);\r
+ DDX_Check(pDX, IDC_BACKUP_APPEND_TIME, m_bAppendTime);\r
+ DDX_Radio(pDX, IDC_BACKUP_ORIGFOLD, m_nBackupFolder);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CPropBackups, CPropertyPage)\r
+ ON_BN_CLICKED(IDC_BACKUP_BROWSE, OnBnClickedBackupBrowse)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+/** \r
+ * @brief Reads options values from storage to UI.\r
+ */\r
+void CPropBackups::ReadOptions()\r
+{\r
+ m_bCreateForFolderCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FOLDERCMP);\r
+ m_bCreateForFileCmp = m_pOptionsMgr->GetBool(OPT_BACKUP_FILECMP);\r
+ m_nBackupFolder = m_pOptionsMgr->GetInt(OPT_BACKUP_LOCATION);\r
+ m_sGlobalFolder = m_pOptionsMgr->GetString(OPT_BACKUP_GLOBALFOLDER);\r
+ m_bAppendBak = m_pOptionsMgr->GetBool(OPT_BACKUP_ADD_BAK);\r
+ m_bAppendTime = m_pOptionsMgr->GetBool(OPT_BACKUP_ADD_TIME);\r
+}\r
+\r
+/** \r
+ * @brief Writes options values from UI to storage.\r
+ */\r
+void CPropBackups::WriteOptions()\r
+{\r
+ m_sGlobalFolder.TrimLeft();\r
+ m_sGlobalFolder.TrimRight();\r
+ if (m_sGlobalFolder[m_sGlobalFolder.GetLength() - 1] != '\\')\r
+ m_sGlobalFolder.AppendChar('\\');\r
+\r
+ m_pOptionsMgr->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE);\r
+ m_pOptionsMgr->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE);\r
+ m_pOptionsMgr->SaveOption(OPT_BACKUP_LOCATION, m_nBackupFolder);\r
+ m_pOptionsMgr->SaveOption(OPT_BACKUP_GLOBALFOLDER, m_sGlobalFolder);\r
+ m_pOptionsMgr->SaveOption(OPT_BACKUP_ADD_BAK, m_bAppendBak == TRUE);\r
+ m_pOptionsMgr->SaveOption(OPT_BACKUP_ADD_TIME, m_bAppendTime == TRUE);\r
+}\r
+\r
+/** \r
+ * @brief Called before propertysheet is drawn.\r
+ */\r
+BOOL CPropBackups::OnInitDialog()\r
+{\r
+ CPropertyPage::OnInitDialog();\r
+\r
+ return TRUE; // return TRUE unless you set the focus to a control\r
+ // EXCEPTION: OCX Property Pages should return FALSE\r
+}\r
+\r
+/** \r
+ * @brief Called when user selects Browse-button.\r
+ */\r
+void CPropBackups::OnBnClickedBackupBrowse()\r
+{\r
+ CString path;\r
+ if (SelectFolder(path, NULL, _T(""), GetSafeHwnd()))\r
+ {\r
+ m_sGlobalFolder = path;\r
+ UpdateData(FALSE);\r
+ }\r
+}\r
--- /dev/null
+/** \r
+ * @file PropBackups.h\r
+ *\r
+ * @brief Declaration file for CPropBackups propertyheet\r
+ *\r
+ */\r
+// ID line follows -- this is updated by SVN\r
+// $Id: PropArchive.h 3126 2006-03-04 02:36:46Z elsapo $\r
+\r
+#ifndef _PROPBACKUPS_H_\r
+#define _PROPBACKUPS_H_\r
+\r
+#ifndef _IOPTIONSPANEL_H_\r
+#include "IOptionsPanel.h"\r
+#endif\r
+\r
+class COptionsMgr;\r
+\r
+/**\r
+ * @brief A class for Backup file options page.\r
+ */\r
+class CPropBackups : public CPropertyPage\r
+{\r
+public:\r
+ CPropBackups(COptionsMgr *optionsMgr);\r
+ virtual ~CPropBackups();\r
+\r
+// Implement IOptionsPanel\r
+ virtual void ReadOptions();\r
+ virtual void WriteOptions();\r
+\r
+// Dialog Data\r
+ enum { IDD = IDD_PROPPAGE_BACKUPS };\r
+\r
+ /** @brief Backup file locations. */\r
+ enum BACKUP_FOLDER\r
+ {\r
+ FOLDER_ORIGINAL = 0,\r
+ FOLDER_GLOBAL,\r
+ };\r
+\r
+ BOOL m_bCreateForFolderCmp;\r
+ BOOL m_bCreateForFileCmp;\r
+ CString m_sGlobalFolder;\r
+ BOOL m_bAppendBak;\r
+ BOOL m_bAppendTime;\r
+ int m_nBackupFolder;\r
+\r
+protected:\r
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
+ virtual BOOL OnInitDialog();\r
+ afx_msg void OnBnClickedBackupBrowse();\r
+\r
+ DECLARE_MESSAGE_MAP()\r
+\r
+private:\r
+ COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */\r
+};\r
+\r
+#endif // _PROPBACKUPS_H_\r
*/
CPropGeneral::CPropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(CPropGeneral::IDD)
, m_pOptionsMgr(optionsMgr)
-, m_bBackup(FALSE)
, m_bScroll(FALSE)
, m_bDisableSplash(FALSE)
, m_bSingleInstance(FALSE)
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CPropGeneral)
- DDX_Check(pDX, IDC_BACKUP_CHECK, m_bBackup);
DDX_Check(pDX, IDC_SCROLL_CHECK, m_bScroll);
DDX_Check(pDX, IDC_DISABLE_SPLASH, m_bDisableSplash);
DDX_Check(pDX, IDC_SINGLE_INSTANCE, m_bSingleInstance);
*/
void CPropGeneral::ReadOptions()
{
- m_bBackup = m_pOptionsMgr->GetBool(OPT_CREATE_BACKUPS);
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);
*/
void CPropGeneral::WriteOptions()
{
- m_pOptionsMgr->SaveOption(OPT_CREATE_BACKUPS, m_bBackup == TRUE);
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);
// Dialog Data
//{{AFX_DATA(CPropGeneral)
enum { IDD = IDD_PROPPAGE_LARGE };
- BOOL m_bBackup;
BOOL m_bScroll;
BOOL m_bDisableSplash;
BOOL m_bSingleInstance;
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
// Used by Merge.rc
//
#define IDR_MAINFRAME 100
#define IDD_TEST_FILTER 231
#define IDD_PROPPAGE_COLORS_TEXT 232
#define IDD_PROJFILES_PATHS 233
+#define IDD_PROPPAGE_BACKUPS 234
#define IDR_SPLASH 308
#define IDB_WINMERGE 309
#define IDB_OLDSPLASH 310
#define IDC_EXPLORER_SUBFOLDERS 1310
#define IDC_FILTERFILE_INSTALL 1311
#define IDC_MATCH_SIMILAR_LINES 1312
+#define IDC_BACKUP_FILECMP 1313
+#define IDC_BACKUP_FOLDERCMP 1314
+#define IDC_BACKUP_ORIGFOLD 1315
+#define IDC_BACKUP_GLOBALFOLD 1316
+#define IDC_BACKUP_BROWSE 1317
+#define IDC_BACKUP_FOLDER 1318
+#define IDC_BACKUP_APPEND_BAK 1319
+#define IDC_BACKUP_APPEND_TIME 1320
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define IDS_OPTIONSPG_VERSIONCONTROL 9048
#define IDS_OPTIONSPG_CODEPAGE 9049
#define IDS_OPTIONSPG_ARCHIVE 9050
+#define IDS_OPTIONSPG_BACKUPS 9051
#define IDS_VERSION_FMT 16385
#define IDS_UNICODE 16387
#define IDS_OPTIONS_TITLE 16400
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 232
+#define _APS_NEXT_RESOURCE_VALUE 235
#define _APS_NEXT_COMMAND_VALUE 33120
-#define _APS_NEXT_CONTROL_VALUE 1309
+#define _APS_NEXT_CONTROL_VALUE 1328
#define _APS_NEXT_SYMED_VALUE 113
#endif
#endif
OSDN Git Service
