* Vincent Osele
* Michael Richter
* Takashi Sawanaka
+* Schlundus
* Philippe Verdy
* Vikrant
* Gilbert Wellisch
BEGIN
MENUITEM "New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Abrir...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "Sal&var\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Cancelar",IDCANCEL,306,28,50,14
GROUPBOX "Arquivos ou Diretórios a Comparar",IDC_FILES_DIRS_GROUP,7,7,292,
111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Alterar a impressora e as configurações de impressão\nConfigurar impressora"
ID_FILE_PRINT "Imprimir o documento ativo\nImprimir"
ID_FILE_PRINT_PREVIEW "Visualizar impressão\nVisualizar Impressão"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Abrir"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "Todos Arquivos (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Íîâ\tCtrl+Í", ID_FILE_NEW
MENUITEM "&Îòâîðè...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Ñúõðàíè\tCtrl+Ñ", ID_FILE_SAVE
POPUP "Ñúõðàíè &ëÿâàòà ÷àñò"
"À", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"Ò", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Ïðåêðàòè",IDCANCEL,306,28,50,14
GROUPBOX "Ôàéëîâå èëè äèðåêòîðèè çà ñðàâíÿâàíå",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Ïðîìåíè íàñòðîèêèòå íà ïðèíòåðà è íàñòðîèêèòå çà ïðèíòèðàíå\nPrint Setup"
ID_FILE_PRINT "Ïðèíòèðàé òåêóùèÿ äîêóìåíò\nPrint"
ID_FILE_PRINT_PREVIEW "Ïðåäñòàâè ñòðàíèöàòà\nPrint Preview"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Îòâîðè"
IDS_PROGRAMFILES "Ïðîãðàìè|*.exe;*.bat;*.cmd|Âñè÷êè ôàéëîâå (*.*)|*.*||"
IDS_ALLFILES "Âñè÷êè ôàéëîâå (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Nou\tCtrl+N", ID_FILE_NEW
MENUITEM "&Obre...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Desa\tCtrl+S", ID_FILE_SAVE
POPUP "Desa l'&Esquerra"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Cancel·la",IDCANCEL,306,28,50,14
GROUPBOX "Fitxers o directoris a comparar",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Canvia la impressora i les opcions d'impressió\nConfiguració d'impressió"
ID_FILE_PRINT "Imprimeix el document actiu\nImprimeix"
ID_FILE_PRINT_PREVIEW "Visualitza pàgines senceres\nVisualització prèvia de la impressió"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Obre"
IDS_PROGRAMFILES "Programes|*.exe;*.bat;*.cmd|Tots els fitxers (*.*)|*.*||"
IDS_ALLFILES "Tots els fitxers (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "´ò¿ª(&O)...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "±£´æ(&S)\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
DEFPUSHBUTTON "È·¶¨",IDOK,306,11,50,14
PUSHBUTTON "È¡Ïû",IDCANCEL,306,28,50,14
GROUPBOX "Òª±È¶ÔµÄÎļþ»òÎļþ¼Ð",IDC_FILES_DIRS_GROUP,7,7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "±ä¸ü´òÓ¡»úºÍ´òÓ¡Ñ¡Ïî\n´òÓ¡É趨"
ID_FILE_PRINT "´òÓ¡×÷ÓÃÖÐÎļþ\n´òÓ¡"
ID_FILE_PRINT_PREVIEW "ÏÔʾÕûÒ³\nÔ¤ÀÀ´òÓ¡"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "´ò¿ª"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "ËùÓÐÎļþ (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "¶}±Ò(&O)...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "Àx¦s(&S)\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
ID_FILE_PRINT_SETUP "Åܧó¦Lªí¾÷©M¦C¦L¿ï¶µ\n¦C¦L³]©w"
ID_FILE_PRINT "¦C¦L§@¥Î¤¤¤å¥ó\n¦C¦L"
ID_FILE_PRINT_PREVIEW "Åã¥Ü¾ã¶\n¹wÄý¦C¦L"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "¶}±Ò"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "©Ò¦³ÀÉ®× (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Otevrít...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Ulo\9eit\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Storno",IDCANCEL,306,28,50,14
GROUPBOX "Soubory nebo adresáre pro porovnání",IDC_FILES_DIRS_GROUP,7,7,292,
111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Zmenit tiskárnu a parametry tisku\nPrint Setup"
ID_FILE_PRINT "Vytisknout aktivní dokument\nPrint"
ID_FILE_PRINT_PREVIEW "Náhled\nPrint Preview"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Otevrít"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "V\9aechny soubory (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW
MENUITEM "&Åben...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Gem\tCtrl+S", ID_FILE_SAVE
POPUP "Gem &venstre"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Afbryd",IDCANCEL,306,28,50,14
GROUPBOX "Filer eller mapper der skal sammenlignes",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Ændrer printer og printerens indstillinger\nPrinter setup"
ID_FILE_PRINT "Print det aktive dokument\nPrint"
ID_FILE_PRINT_PREVIEW "Vis de fulde sider\nPrinter preview"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Åben"
IDS_PROGRAMFILES "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||"
IDS_ALLFILES "Alle filer (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Openen...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "Op&slaan\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Annuleren",IDCANCEL,306,28,50,14
GROUPBOX "Bestanden of mappen om te vergelijken",IDC_FILES_DIRS_GROUP,7,7,
292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Wijzig de printer instellingen.\nPrinter instellingen"
ID_FILE_PRINT "Actieve document afdrukken.\nAfdrukken"
ID_FILE_PRINT_PREVIEW "Afdrukvoorbeeld.\nAfdruk voorbeeld"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Open"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "Alle bestanden (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Sauvegarder\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Annuler",IDCANCEL,306,28,50,14
GROUPBOX "Fichiers ou répertoires à comparer :",IDC_FILES_DIRS_GROUP,7,7,
292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Change les options d'imprimante et d'impression\nConfiguration de l'impression"
ID_FILE_PRINT "Imprime le document actif\nImprimer"
ID_FILE_PRINT_PREVIEW "Affiche des pages entières\nAperçu avant impression"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Ouvrir"
IDS_PROGRAMFILES "Programmes|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "Tous les fichiers (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Neu\tStrg+N", ID_FILE_NEW
MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE
POPUP "&Links speichern"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Abbrechen",IDCANCEL,312,28,50,14
GROUPBOX "Zu vergleichende Dateien oder Verzeichnisse",IDC_FILES_DIRS_GROUP,
7,7,298,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Ändert die Druckerkonfiguration.\nDrucker einrichten"
ID_FILE_PRINT "Druckt das aktive Dokument.\nDrucken"
ID_FILE_PRINT_PREVIEW "Zeigt die Druckvorschau an.\nDruckvorschau"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Öffnen"
IDS_PROGRAMFILES "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||"
IDS_ALLFILES "Alle Dateien (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Új\tCtrl+N", ID_FILE_NEW
MENUITEM "M&egnyitás...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Mentés\tCtrl+S", ID_FILE_SAVE
POPUP "&Bal oldal mentése"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Mégsem",IDCANCEL,306,28,50,14
GROUPBOX "Összehasonlítandó fájlok vagy könyvtárak",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "A nyomtató és a nyomtatási opciók megváltoztatása\nNyomtatóbeállítás"
ID_FILE_PRINT "Az aktív dokumentum nyomtatása\nNyomtatás"
ID_FILE_PRINT_PREVIEW "Az oldalak megjelenítése\nNyomtatási elõnézet"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Megnyitás"
IDS_PROGRAMFILES "Programok|*.exe;*.bat;*.cmd|Minden fájl (*.*)|*.*||"
IDS_ALLFILES "Minden fájl (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Nuovo\tCtrl+N", ID_FILE_NEW
MENUITEM "&Apri...\tCtrl+A", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Salva\tCtrl+S", ID_FILE_SAVE
POPUP "Sa&lva sinistro"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Annulla",IDCANCEL,306,28,50,14
GROUPBOX "File o cartelle da confrontare",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Modifica le impostazioni relative alla stampante e alla stampa\nImposta stampante"
ID_FILE_PRINT "Stampa il documento attivo\nStampa"
ID_FILE_PRINT_PREVIEW "Visualizza le pagine per intero\nAnteprima di stampa"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Apri"
IDS_PROGRAMFILES "Programmi|*.exe;*.bat;*.cmd|Tutti i file (*.*)|*.*||"
IDS_ALLFILES "Tutti i file (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "\90V\8bK\8dì\90¬(&N)\tCtrl+N", ID_FILE_NEW
MENUITEM "\8aJ\82(&O)...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "\95Û\91¶(&S)\tCtrl+S", ID_FILE_SAVE
POPUP "\8d¶\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶(&L)"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,306,28,50,14
GROUPBOX "\94ä\8ar\82·\82é\83t\83@\83C\83\8b\82Ü\82½\82Í\83f\83B\83\8c\83N\83g\83\8a",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "\83v\83\8a\83\93\83^/\88ó\8dü\83I\83v\83V\83\87\83\93\82Ì\95Ï\8dX\n\88ó\8dü\90Ý\92è"
ID_FILE_PRINT "\8dì\8bÆ\92\86\82Ì\83h\83L\83\85\83\81\83\93\83g\82ð\88ó\8dü\82µ\82Ü\82·\n\88ó\8dü"
ID_FILE_PRINT_PREVIEW "\88ó\8dü\83C\83\81\81[\83W\82ð\95\\8e¦\82µ\82Ü\82·\n\88ó\8dü\83v\83\8c\83r\83\85\81["
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "\8aJ\82"
IDS_PROGRAMFILES "\83v\83\8d\83O\83\89\83\80|*.exe;*.bat;*.cmd|\82·\82×\82Ä\82Ì\83t\83@\83C\83\8b(*.*)|*.*||"
IDS_ALLFILES "\82·\82×\82Ä\82Ì\83t\83@\83C\83\8b (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "»õ·Î ¸¸µé±â&(N)\tCtrl+N", ID_FILE_NEW
MENUITEM "¿±â(&O)...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "ÀúÀå(&S)\tCtrl+S", ID_FILE_SAVE
POPUP "¿ÞÂÊ ÀúÀå(&L)"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
DEFPUSHBUTTON "È®ÀÎ",IDOK,306,11,50,14
PUSHBUTTON "Ãë¼Ò",IDCANCEL,306,28,50,14
GROUPBOX "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ",IDC_FILES_DIRS_GROUP,7,7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "ÇÁ¸°Å͸¦ ¹Ù²Ù°Å³ª Àμ⠿ɼÇÀ» ¼öÁ¤ÇÕ´Ï´Ù.\nÀμ⠼³Á¤"
ID_FILE_PRINT "ÇöÀç ¹®¼¸¦ ÀμâÇÕ´Ï´Ù.\nÀμâ"
ID_FILE_PRINT_PREVIEW "¹Ì¸® º¸±â\n¹Ì¸® º¸±â"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "¿±â"
IDS_PROGRAMFILES "ÇÁ·Î±×·¥|*.exe;*.bat;*.cmd|¸ðµç ÆÄÀÏ (*.*)|*.*||"
IDS_ALLFILES "¸ðµç ÆÄÀÏ (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW
MENUITEM "&Åpne...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE
POPUP "Lagre &venstre"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Avbryt",IDCANCEL,306,28,50,14
GROUPBOX "Filer eller mapper som skal sammenlignes",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Endrer skriver og skriverens indstillinger\nSkriveroppsett"
ID_FILE_PRINT "Skriv ut det aktive dokumentet\nSkriv ut"
ID_FILE_PRINT_PREVIEW "Vis de fulle sidene\nUtskriftsforhåndsvisning"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Åpne"
IDS_PROGRAMFILES "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||"
IDS_ALLFILES "Alle filer (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Porównaj...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Zachowaj\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Anuluj",IDCANCEL,306,28,50,14
GROUPBOX "Obiekty do porównania",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Zmien opcje drukarki i wydruku\nUstawienia wydruku"
ID_FILE_PRINT "Wydrukuj biezacy dokument\nDrukuj"
ID_FILE_PRINT_PREVIEW "Wyswietl cale strony\nPodglad wydruku"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Otwórz"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "Wszystkie pliki (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "Íîâûé\tCtrl+N", ID_FILE_NEW
MENUITEM "&Îòêðûòü...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE
POPUP "Ñîõðàíèòü ôàéë ñ&ëåâà"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Îòìåíà",IDCANCEL,310,28,50,14
GROUPBOX "Ôàéëû èëè êàòàëîãè äëÿ ñðàâíèâàíèÿ",
IDC_FILES_DIRS_GROUP,7,7,298,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Èçìåíèòü íàñòðîéêè ïðèíòåðà è ïå÷àòè\nPrint Setup"
ID_FILE_PRINT "Ïå÷àòàòü àêòèâíûé äîêóìåíò\nPrint"
ID_FILE_PRINT_PREVIEW "Ïîêàçûâàòü ïîëíûå ñòðàíèöû\nPrint Preview"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Îòêðûòü"
IDS_PROGRAMFILES "Ïðîãðàììû|*.exe;*.bat;*.cmd|Âñå ôàéëû (*.*)|*.*||"
IDS_ALLFILES "Âñå ôàéëû (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Otvori\9d...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Ulo\9ei\9d\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Storno",IDCANCEL,307,28,50,14
GROUPBOX "Súbory alebo adresáre pre porovnanie",IDC_FILES_DIRS_GROUP,7,7,
293,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Zmeni\9d tlaèiareò a parametre tlaèe\nNastavenie tlaèiarne"
ID_FILE_PRINT "Vytlaèi\9d aktívny dokument\nTlaè"
ID_FILE_PRINT_PREVIEW "Náh¾ad\nPreh¾ad pred tlaèou"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Otvori\9d"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "V\9aetky súbory (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Comparar...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Guardar\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
DEFPUSHBUTTON "Comparar",IDOK,306,11,50,14
PUSHBUTTON "Cancelar",IDCANCEL,306,28,50,14
GROUPBOX "Objetos para Comparar",IDC_FILES_DIRS_GROUP,7,7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup"
ID_FILE_PRINT "Print the active document\nPrint"
ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Comparar"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "Todos los archivos (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
BEGIN
MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW
MENUITEM "&Öppna...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Spara\tCtrl+S", ID_FILE_SAVE
POPUP "Spara &Vänster fil"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Avbryt",IDCANCEL,306,28,50,14
GROUPBOX "Filer eller kataloger som skall jämföras",IDC_FILES_DIRS_GROUP,7,7,
292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Ändrar skrivare och skrivarens inställningar\nSkrivarinställningar"
ID_FILE_PRINT "Skriver ut det aktiva dokumentet\nSkriv ut"
ID_FILE_PRINT_PREVIEW "Visar helsida\nFörhandsgranska"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Öppna"
IDS_PROGRAMFILES "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||"
IDS_ALLFILES "Alla filer (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
ON_UPDATE_COMMAND_UI(ID_HELP_MERGE7ZMISMATCH, OnUpdateHelpMerge7zmismatch)
ON_COMMAND(ID_VIEW_STATUS_BAR, OnViewStatusBar)
ON_COMMAND(ID_VIEW_TOOLBAR, OnViewToolbar)
+ ON_COMMAND(ID_FILE_OPENPROJECT, OnFileOpenproject)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
CMDIFrameWnd::ShowControlBar(&m_wndToolBar, bShow, 0);
}
+
+/**
+ * @brief Open project-file.
+ */
+void CMainFrame::OnFileOpenproject()
+{
+ // show a fileopen dialog with the WinMerge extension
+ CString strFileFilter;
+ strFileFilter.LoadString(IDS_PROJECTFILES);
+ CString strFileExt;
+ strFileExt.LoadString(IDS_PROJECTFILES_EXT);
+ CFileDialog dlg(true,strFileExt,0,0,strFileFilter);
+
+ if (dlg.DoModal() != IDOK)
+ return;
+
+ CStringArray files;
+ files.Add(dlg.GetPathName());
+ files.Add("");
+
+ BOOL bRecursive = true;
+ //load the project file
+ if (theApp.LoadProjectFile(files,bRecursive))
+ {
+ //if the project file is read begin to compare
+ DWORD dwLeftFlags = FFILEOPEN_NONE;
+ DWORD dwRightFlags = FFILEOPEN_NONE;
+ //check if the paths are empty
+ if (!files[0].IsEmpty())
+ dwLeftFlags |= FFILEOPEN_PROJECT;
+ if (!files[1].IsEmpty())
+ dwRightFlags |= FFILEOPEN_PROJECT;
+ m_strSaveAsPath = _T("");
+ DoFileOpen(files[0], files[1], dwLeftFlags, dwRightFlags, bRecursive);
+ }
+}
afx_msg void OnUpdateHelpMerge7zmismatch(CCmdUI* pCmdUI);
afx_msg void OnViewStatusBar();
afx_msg void OnViewToolbar();
+ afx_msg void OnFileOpenproject();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM SEPARATOR
MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE
POPUP "Save &Left"
"F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
"H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
PUSHBUTTON "Cancel",IDCANCEL,306,28,50,14
GROUPBOX "Files or Directories to Compare",IDC_FILES_DIRS_GROUP,7,
7,292,111
+ PUSHBUTTON "Save project",IDC_SAVEPROJECT,306,56,50,14
END
IDD_VSS DIALOGEX 0, 0, 257, 166
ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup"
ID_FILE_PRINT "Print the active document\nPrint"
ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview"
+ ID_FILE_OPENPROJECT "Open project file\nProject file (Ctrl+J)"
END
STRINGTABLE
IDS_OPEN_TITLE "Open"
IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
IDS_ALLFILES "All Files (*.*)|*.*||"
+ IDS_PROJECTFILES "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+ IDS_PROJECTFILES_EXT "WinMerge"
END
// COMPARE OPTIONS
//{{AFX_MSG_MAP(COpenDlg)
ON_BN_CLICKED(IDC_LEFT_BUTTON, OnLeftButton)
ON_BN_CLICKED(IDC_RIGHT_BUTTON, OnRightButton)
+ ON_BN_CLICKED(IDC_SAVEPROJECT, OnSaveProjectButton)
ON_CBN_SELCHANGE(IDC_LEFT_COMBO, OnSelchangeLeftCombo)
ON_CBN_SELCHANGE(IDC_RIGHT_COMBO, OnSelchangeRightCombo)
ON_CBN_EDITCHANGE(IDC_LEFT_COMBO, OnEditEvent)
m_constraint.ConstrainItem(IDC_FILES_DIRS_GROUP, 0, 1, 0, 0); // grows right
m_constraint.ConstrainItem(IDC_LEFT_BUTTON, 1, 0, 0, 0); // slides right
m_constraint.ConstrainItem(IDC_RIGHT_BUTTON, 1, 0, 0, 0); // slides right
+ m_constraint.ConstrainItem(IDC_SAVEPROJECT, 1, 0, 0, 0); // slides right
m_constraint.ConstrainItem(IDC_SELECT_UNPACKER, 1, 0, 0, 0); // slides right
m_constraint.ConstrainItem(IDC_OPEN_STATUS, 0, 1, 0, 0); // grows right
m_constraint.ConstrainItem(IDC_SELECT_FILTER, 1, 0, 0, 0); // slides right
m_strRight.TrimLeft();
m_strRight.TrimRight();
}
+
+/**
+ * @brief Allows user to save current paths and filter as projectfile.
+ */
+void COpenDlg::OnSaveProjectButton()
+{
+ //load filter prefix
+ CString filterPrefix;
+ VERIFY(filterPrefix.LoadString(IDS_FILTER_PREFIX));
+
+ UpdateData(TRUE);
+
+
+ // get long name (optionally terminate directories with slash)
+ CString strRight = paths_GetLongPath(m_strRight, DIRSLASH);
+ CString strLeft = paths_GetLongPath(m_strLeft, DIRSLASH);
+ CString strExt = m_strExt;
+
+ //trim them
+ strExt.TrimLeft();
+ strExt.TrimRight();
+ strRight.TrimLeft();
+ strRight.TrimRight();
+ strLeft.TrimLeft();
+ strLeft.TrimRight();
+
+ //check if both paths exists
+ if (GetPairComparability(strLeft, strRight) == DOES_NOT_EXIST)
+ {
+ AfxMessageBox(IDS_ERROR_INCOMPARABLE, MB_ICONSTOP);
+ return;
+ }
+
+ CString strFileFilter;
+ strFileFilter.LoadString(IDS_PROJECTFILES);
+ CString strFileExt;
+ strFileExt.LoadString(IDS_PROJECTFILES_EXT);
+ // show a fileopen dialog with the WinMerge extension
+ CFileDialog dlg(false,strFileExt,0,0,strFileFilter);
+ if (dlg.DoModal() != IDOK)
+ return;
+ //get the chosen filename
+ CString strProjectFileName = dlg.GetPathName();
+
+ // If prefix found from start..
+ if (strExt.Find(filterPrefix, 0) == 0)
+ {
+ // Remove prefix + space
+ strExt.Delete(0, filterPrefix.GetLength());
+ }
+
+ ProjectFile pfile;
+
+ //set the member of the project file
+ pfile.SetLeft(strLeft);
+ pfile.SetFilter(strExt);
+ pfile.SetRight(strRight);
+ pfile.SetSubfolders(m_bRecurse);
+
+ CString err;
+ //save the project
+ pfile.Save(strProjectFileName,&err);
+ if (!err.IsEmpty())
+ {
+ CString msg;
+ AfxFormatString2(msg, IDS_ERROR_FILEOPEN, strProjectFileName, err);
+ AfxMessageBox(msg, MB_ICONSTOP);
+ }
+}
//{{AFX_MSG(COpenDlg)
afx_msg void OnLeftButton();
afx_msg void OnRightButton();
+ afx_msg void OnSaveProjectButton();
virtual void OnOK();
virtual BOOL OnInitDialog();
afx_msg void OnSelchangeLeftCombo();
/**
* @brief Save data from member variables to path-file.
+ * @note paths are converted to ASCII
*/
-BOOL ProjectFile::Save(LPCTSTR path)
+BOOL ProjectFile::Save(LPCTSTR path, CString *sError)
{
- UINT flags = CFile::modeCreate | CFile::modeNoTruncate | CFile::modeWrite;
+ UINT flags = CFile::modeCreate | CFile::modeWrite;
+ CFile file;
+ CFileException e;
+
+ if (!file.Open(path, flags,&e))
+ {
+ TCHAR szError[1024];
+ e.GetErrorMessage(szError, 1024);
+ *sError = szError;
+
+ return FALSE;
+ }
+
+ TCHAR buf2[4096] = {0};
+
+ _tcscpy(buf2,_T("<?xml version=\"1.0\"?>\n<project>\n\t<paths>\n\t\t"));
+
+ _tcscat(buf2,_T("<left>"));
+ _tcscat(buf2,GetLeft());
+ _tcscat(buf2,_T("</left>\n\t\t"));
+ _tcscat(buf2,_T("<right>"));
+ _tcscat(buf2,GetRight());
+ _tcscat(buf2,_T("</right>\n\t\t"));
+ _tcscat(buf2,_T("<filter>"));
+ _tcscat(buf2,GetFilter());
+ _tcscat(buf2,_T("</filter>\n\t\t"));
+ _tcscat(buf2,_T("<subfolders>"));
+ _tcscat(buf2,GetSubfolders() ? _T("1") : _T("0"));
+ _tcscat(buf2,_T("</subfolders>\n"));
+
+ _tcscat(buf2,_T("\t</paths>\n</project>"));
+
+ // convert the string from unicode to ascii, because Read is expecting ascii
+ char buf[4096] = {0};
+
+ USES_CONVERSION;
+ strncpy(buf, T2A(buf2), 4096);
+
+
+ file.Write(buf,strlen(buf));
+ file.Close();
return TRUE;
}
}
/**
+ * @brief Set left path, returns old left path.
+ */
+CString ProjectFile::SetLeft(const CString& sLeft)
+{
+ CString sLeftOld = GetLeft();
+ m_leftFile = sLeft;
+
+ return sLeftOld;
+}
+
+/**
* @brief Returns right path.
*/
CString ProjectFile::GetRight() const
}
/**
+ * @brief Set right path, returns old right path.
+ */
+CString ProjectFile::SetRight(const CString& sRight)
+{
+ CString sRightOld = GetRight();
+ m_rightFile = sRight;
+
+ return sRightOld;
+}
+
+/**
* @brief Returns filter.
*/
CString ProjectFile::GetFilter() const
}
/**
+ * @brief Set filter, returns old filter.
+ */
+CString ProjectFile::SetFilter(const CString& sFilter)
+{
+ CString sFilterOld = GetFilter();
+ m_filter = sFilter;
+
+ return sFilterOld;
+}
+
+/**
* @brief Returns subfolder included -setting.
*/
int ProjectFile::GetSubfolders() const
}
/**
+ * @brief set subfolder, returns old subfolder value.
+ */
+int ProjectFile::SetSubfolders(const int iSubfolder)
+{
+ int iSubfoldersOld = GetSubfolders();
+ m_subfolders = iSubfolder ? 1 : 0;
+
+ return iSubfoldersOld;
+}
+
+/**
* @brief Reads one value from XML data.
*/
BOOL ProjectFile::GetVal(TCHAR *pPaths, TCHAR *pVal, CString * sval,
const TCHAR PROJECTFILE_EXT[] = _T("WinMerge");
/**
- * @brief Class for reading paths from project file.
+ * @brief Class for handling project files.
+ *
+ * @todo open/save unicode paths - use UTF-8 for xml?
*/
class ProjectFile
{
public:
ProjectFile();
BOOL Read(LPCTSTR path, CString *sError);
- BOOL Save(LPCTSTR path);
+ BOOL Save(LPCTSTR path, CString *sError);
BOOL HasLeft() const;
BOOL HasRight() const;
CString GetFilter() const;
int GetSubfolders() const;
+ CString SetLeft(const CString& sLeft);
+ CString SetRight(const CString& sRight);
+ CString SetFilter(const CString& sFilter);
+ int SetSubfolders(const int iSubfolder);
+
void GetPaths(CString & sLeft, CString & sRight, BOOL & bSubFolders) const;
protected:
+2005-02-10 Kimmo
+ PATCH: [ 1116778 ] Project Handling patch
+ Submitted by Schlundus
+ Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp ProjectFile.h resource.h
+ Languages: *.rc resource.h
+ Docs/Users: Contributors.txt
+
2005-02-07 Kimmo
PATCH: [ 1117375 ] Rememer status/toolbar visible status
Src: MainFrm.cpp MainFrm.h OptionsDef.h
#define IDC_CP_UI 1148
#define IDC_CP_CUSTOM 1149
#define IDC_CUSTOM_CP_NUMBER 1150
+#define IDC_SAVEPROJECT 1151
#define IDC_EDIT_WHOLE_WORD 8603
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
+#define IDS_PROJECTFILES 16419
+#define IDS_PROJECTFILES_EXT 16420
#define IDS_COMPMETHOD_CONTENTS 16432
#define IDS_COMPMETHOD_MODDATE 16433
#define ID_LOCBAR_GOTODIFF_FMT 33092
#define ID_LOCBAR_GOTOLINE_FMT 33093
#define ID_HELP_MERGE7ZMISMATCH 33094
+#define ID_FILE_OPENPROJECT 33095
// Next default values for new objects
//
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 224
-#define _APS_NEXT_COMMAND_VALUE 33095
+#define _APS_NEXT_COMMAND_VALUE 33096
#define _APS_NEXT_CONTROL_VALUE 1151
#define _APS_NEXT_SYMED_VALUE 108
#endif
OSDN Git Service
