BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Des&carta els canvis",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "D'acord",IDOK,149,133,50,14
PUSHBUTTON "Cancel·la",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "F&jern ændringer",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Afbryd",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "I&gnorer les changements",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Ann&uler",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Änderungen ver&werfen",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Abbruch",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Változtatások e&lvetése",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "Rendben",IDOK,149,133,50,14
PUSHBUTTON "Mégsem",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Sca&rta le modifiche",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Annulla",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "\95Ï\8dX\82ð\94j\8aü\82·\82é(&C)",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "ÀúÀåÇÏÁö ¾ÊÀ½(&C)",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "È®ÀÎ",IDOK,149,133,50,14
PUSHBUTTON "Ãë¼Ò",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Ka&st endringer",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Avbryt",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Odr&zuæ zmiany",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Anuluj",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Î&òêëîíèòü èçìåíåíèÿ",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "ÎÊ",IDOK,149,133,50,14
PUSHBUTTON "Îòìåíà",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "&Descartar cambios",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancelar",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Ign&orera ändringar",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Avbryt",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
MENUITEM "Ko&pyala\tCtrl+C", ID_EDIT_COPY
MENUITEM "&Yapýþtýr\tCtrl+V", ID_EDIT_PASTE
MENUITEM SEPARATOR
+ MENUITEM "Select &All\tCtrl+A", ID_EDIT_SELECT_ALL
+ MENUITEM SEPARATOR
MENUITEM "&Seçenekler...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Ta&zele\tF5", ID_REFRESH
MENUITEM "&Copy With Line Numbers\tCtrl+Shift+C",
ID_EDIT_COPY_LINENUMBERS
END
- MENUITEM SEPARATOR
MENUITEM "&Git...\tCtrl+G", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
MENUITEM "&Seçenekler...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Tümünü Saða Kopyala", ID_ALL_RIGHT
MENUITEM "T&ümünü Sola Kopyala", ID_ALL_LEFT
- MENUITEM SEPARATOR
END
POPUP "&Araçlar"
BEGIN
POPUP "&Copy"
BEGIN
MENUITEM "&Left to Right", ID_DIR_COPY_LEFT_TO_RIGHT
-
MENUITEM "L&eft to...", ID_DIR_COPY_LEFT_TO_BROWSE
-
MENUITEM "&Right to Left", ID_DIR_COPY_RIGHT_TO_LEFT
-
MENUITEM "R&ight to...", ID_DIR_COPY_RIGHT_TO_BROWSE
-
END
POPUP "&Move"
BEGIN
MENUITEM "&Left to...", ID_DIR_MOVE_LEFT_TO_BROWSE
-
MENUITEM "&Right to...", ID_DIR_MOVE_RIGHT_TO_BROWSE
-
END
POPUP "&Delete"
BEGIN
MENUITEM "&Right", ID_DIR_DEL_RIGHT
MENUITEM "&Both", ID_DIR_DEL_BOTH
END
+ MENUITEM "&Hide Files", ID_DIR_HIDE_FILENAMES
MENUITEM SEPARATOR
POPUP "&Open Left"
BEGIN
MENUITEM "with &Registered Application", ID_DIR_OPEN_LEFT
MENUITEM "with &External Editor", ID_DIR_OPEN_LEFT_WITHEDITOR
-
MENUITEM "&with...", ID_DIR_OPEN_LEFT_WITH
END
POPUP "O&pen Right"
BEGIN
MENUITEM "with &Registered Application", ID_DIR_OPEN_RIGHT
MENUITEM "with &External Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
-
MENUITEM "&with...", ID_DIR_OPEN_RIGHT_WITH
END
MENUITEM SEPARATOR
POPUP "Cop&y Pathnames"
BEGIN
MENUITEM "&Left (%1 of %2)", ID_DIR_COPY_PATHNAMES_LEFT
-
MENUITEM "&Right (%1 of %2)", ID_DIR_COPY_PATHNAMES_RIGHT
-
MENUITEM "&Both (%1 of %2)", ID_DIR_COPY_PATHNAMES_BOTH
-
END
MENUITEM "Copy &Filenames", ID_DIR_COPY_FILENAMES
MENUITEM SEPARATOR
MENUITEM "&Right... (%1 of %2)", ID_DIR_ZIP_RIGHT
MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
-
END
END
POPUP "_HDR_POPUP_"
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,99,230,10
CONTROL "Dis&card changes",IDC_SAVECLOSING_DISCARDRIGHT,"Button",
BS_AUTORADIOBUTTON,16,109,230,10
+ PUSHBUTTON "Discard All",IDC_SAVECLOSING_DISCARDALL,7,133,65,14
DEFPUSHBUTTON "OK",IDOK,149,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,205,133,50,14
END
if (dlg.DoModal() == IDOK)
{
- if (bLModified && dlg.m_leftSave == 0)
+ if (bLModified && dlg.m_leftSave == SAVECLOSING_SAVE)
{
if (!DoSave(m_filePaths.GetLeft(), bLSaveSuccess, TRUE))
result = FALSE;
}
- if (bRModified && dlg.m_rightSave == 0)
+ if (bRModified && dlg.m_rightSave == SAVECLOSING_SAVE)
{
if (!DoSave(m_filePaths.GetRight(), bRSaveSuccess, FALSE))
result = FALSE;
: CDialog(SaveClosingDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(SaveClosingDlg)
- m_leftSave = 0; // Default to save
- m_rightSave = 0;
+ m_leftSave = SAVECLOSING_SAVE; // Default to save
+ m_rightSave = SAVECLOSING_SAVE;
m_bAskForLeft = FALSE;
m_bAskForRight = FALSE;
m_bDisableCancel = FALSE;
BEGIN_MESSAGE_MAP(SaveClosingDlg, CDialog)
//{{AFX_MSG_MAP(SaveClosingDlg)
+ ON_BN_CLICKED(IDC_SAVECLOSING_DISCARDALL, OnDiscardAll)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
m_bAskForLeft = bLeft;
m_bAskForRight = bRight;
}
+
+/**
+ * @brief Called when 'Discard All' button is selected.
+ */
+void SaveClosingDlg::OnDiscardAll()
+{
+ m_leftSave = SAVECLOSING_DISCARD;
+ m_rightSave = SAVECLOSING_DISCARD;
+ UpdateData(FALSE);
+ OnOK();
+}
#ifndef _SAVECLOSINGDLG_H_
#define _SAVECLOSINGDLG_H_
+/**
+ * @brief Choices for modified files: save/discard changes.
+ */
+enum SAVECLOSING_CHOICE
+{
+ SAVECLOSING_SAVE = 0, //*< Save changes */
+ SAVECLOSING_DISCARD, //*< Discard changes */
+};
+
/////////////////////////////////////////////////////////////////////////////
// SaveClosingDlg dialog
// Generated message map functions
//{{AFX_MSG(SaveClosingDlg)
afx_msg BOOL OnInitDialog();
+ afx_msg void OnDiscardAll();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
2005-05-11 Kimmo
PATCH: [ 1199194 ] Optimization for difflist
Src: DiffList.cpp DiffList.h
+ PATCH: [ 1198955 ] Discard all button on Save modified pane
+ Submitted by Ferenc Kubatovics
+ Src: Merge.rc MergeDoc.cpp resource.h SaveClosingDlg.cpp SaveClosingDlg.h
+ Src/Languages: *.rc resource.h
2005-05-10 Perry
BUG [ 1198622 ] Generated patch is broken when comparing UTF8 files
#define IDC_SCOLOR_PREPROCESSOR_BOLD 1185
#define IDC_SCOLOR_USER1_BOLD 1186
#define IDC_SCOLOR_USER2_BOLD 1187
+#define IDC_SAVECLOSING_DISCARDALL 1188
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605