diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp ./src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp --- ../abi-orig/src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp Sat Nov 6 16:58:38 1999 +++ ./src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp Tue Jun 27 13:20:08 2000 @@ -130,6 +130,7 @@ m_pOpenPanel = m_pSavePanel = NULL; switch (m_id) { + case XAP_DIALOG_ID_INSERT_PICTURE: case XAP_DIALOG_ID_FILE_OPEN: { szTitle = "AbiWord - Open File"; bCheckWritePermission = UT_FALSE; diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp ./src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp --- ../abi-orig/src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp Fri Apr 14 06:03:18 2000 +++ ./src/af/xap/qnx/xap_QNXDlg_FileOpenSaveAs.cpp Tue Jun 27 13:20:08 2000 @@ -73,6 +73,7 @@ int flags = 0; switch (m_id) { + case XAP_DIALOG_ID_INSERT_PICTURE: case XAP_DIALOG_ID_FILE_OPEN: { szTitle = pSS->getValue(XAP_STRING_ID_DLG_FOSA_OpenTitle); diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp ./src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- ../abi-orig/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp Sat Jun 10 15:43:30 2000 +++ ./src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp Tue Jun 27 13:20:10 2000 @@ -351,6 +351,7 @@ const XML_Char * szFileTypeLabel = NULL; switch (m_id) { + case XAP_DIALOG_ID_INSERT_PICTURE: case XAP_DIALOG_ID_FILE_OPEN: { szTitle = pSS->getValue(XAP_STRING_ID_DLG_FOSA_OpenTitle); diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp ./src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp --- ../abi-orig/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp Thu Jun 10 22:43:58 1999 +++ ./src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.cpp Tue Jun 27 12:15:54 2000 @@ -168,6 +168,7 @@ switch (m_id) { + case XAP_DIALOG_ID_INSERT_PICTURE: case XAP_DIALOG_ID_FILE_OPEN: ofn.Flags |= OFN_FILEMUSTEXIST; bDialogResult = GetOpenFileName(&ofn); diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/af/xap/xp/xap_Dialog_Id.h ./src/af/xap/xp/xap_Dialog_Id.h --- ../abi-orig/src/af/xap/xp/xap_Dialog_Id.h Wed Apr 26 09:12:22 2000 +++ ./src/af/xap/xp/xap_Dialog_Id.h Tue Jun 27 12:10:16 2000 @@ -44,6 +44,7 @@ XAP_DIALOG_ID_WINDOWMORE, XAP_DIALOG_ID_ZOOM, XAP_DIALOG_ID_INSERT_SYMBOL, + XAP_DIALOG_ID_INSERT_PICTURE, XAP_DIALOG_ID_ABOUT, /* about dialog */ /* ... add others here ... */ diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/hello/ap/win/ap_Win32Dialog_All.h ./src/hello/ap/win/ap_Win32Dialog_All.h --- ../abi-orig/src/hello/ap/win/ap_Win32Dialog_All.h Fri Apr 9 18:52:02 1999 +++ ./src/hello/ap/win/ap_Win32Dialog_All.h Tue Jun 27 12:29:16 2000 @@ -48,6 +48,7 @@ DeclareDialog(XAP_DIALOG_ID_PRINTTOFILE, XAP_Win32Dialog_FileOpenSaveAs) DeclareDialog(XAP_DIALOG_ID_FONT, XAP_Win32Dialog_FontChooser) DeclareDialog(XAP_DIALOG_ID_WINDOWMORE, XAP_Win32Dialog_WindowMore) + DeclareDialog(XAP_DIALOG_ID_INSERT_PICTURE, XAP_Win32Dialog_FileOpenSaveAs) DeclareDialog(XAP_DIALOG_ID_ABOUT, XAP_Win32Dialog_About) // ... also add new dialogs here ... diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/wp/ap/beos/ap_BeOSDialog_All.h ./src/wp/ap/beos/ap_BeOSDialog_All.h --- ../abi-orig/src/wp/ap/beos/ap_BeOSDialog_All.h Thu Jun 8 17:55:06 2000 +++ ./src/wp/ap/beos/ap_BeOSDialog_All.h Tue Jun 27 13:20:08 2000 @@ -61,6 +61,7 @@ DeclareDialog(XAP_DIALOG_ID_ZOOM, XAP_BeOSDialog_Zoom) DeclareDialog(XAP_DIALOG_ID_ABOUT, XAP_BeOSDialog_About) DeclareDialog(XAP_DIALOG_ID_INSERT_SYMBOL, XAP_BeOSDialog_Insert_Symbol) + DeclareDialog(XAP_DIALOG_ID_INSERT_PICTURE, XAP_BeOSDialog_FileOpenSaveAs) DeclareDialog(AP_DIALOG_ID_REPLACE, AP_BeOSDialog_Replace) DeclareDialog(AP_DIALOG_ID_FIND, AP_BeOSDialog_Replace) DeclareDialog(AP_DIALOG_ID_BREAK, AP_BeOSDialog_Break) diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/wp/ap/mac/ap_MacDlg_All.h ./src/wp/ap/mac/ap_MacDlg_All.h --- ../abi-orig/src/wp/ap/mac/ap_MacDlg_All.h Tue May 9 20:40:44 2000 +++ ./src/wp/ap/mac/ap_MacDlg_All.h Tue Jun 27 13:20:10 2000 @@ -54,6 +54,7 @@ DeclareDialog(XAP_DIALOG_ID_FONT, XAP_MacDialog_FontChooser) DeclareDialog(XAP_DIALOG_ID_WINDOWMORE, XAP_MacDialog_WindowMore) DeclareDialog(XAP_DIALOG_ID_INSERT_SYMBOL, XAP_MacDialog_Insert_Symbol) + DeclareDialog(XAP_DIALOG_ID_INSERT_PICTURE, XAP_MacDialog_FileOpenSaveAs) // DeclareDialog(XAP_DIALOG_ID_ABOUT, XAP_MacDialog_About) // DeclareDialog(AP_DIALOG_ID_REPLACE, AP_MacDialog_Replace) diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/wp/ap/qnx/ap_QNXDialog_All.h ./src/wp/ap/qnx/ap_QNXDialog_All.h --- ../abi-orig/src/wp/ap/qnx/ap_QNXDialog_All.h Wed May 3 05:14:46 2000 +++ ./src/wp/ap/qnx/ap_QNXDialog_All.h Tue Jun 27 13:20:10 2000 @@ -65,6 +65,7 @@ DeclareDialog(XAP_DIALOG_ID_ZOOM, XAP_QNXDialog_Zoom) DeclareDialog(XAP_DIALOG_ID_ABOUT, XAP_QNXDialog_About) DeclareDialog(XAP_DIALOG_ID_INSERT_SYMBOL, XAP_QNXDialog_Insert_Symbol) + DeclareDialog(XAP_DIALOG_ID_INSERT_PICTURE, XAP_QNXDialot_FileOpenSaveAs) DeclareDialog(AP_DIALOG_ID_REPLACE, AP_QNXDialog_Replace) DeclareDialog(AP_DIALOG_ID_FIND, AP_QNXDialog_Replace) diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/wp/ap/unix/ap_UnixDialog_All.h ./src/wp/ap/unix/ap_UnixDialog_All.h --- ../abi-orig/src/wp/ap/unix/ap_UnixDialog_All.h Fri Jun 9 16:07:10 2000 +++ ./src/wp/ap/unix/ap_UnixDialog_All.h Tue Jun 27 13:20:02 2000 @@ -85,6 +85,7 @@ DeclareDialog(XAP_DIALOG_ID_ZOOM, XAP_UnixGnomeDialog_Zoom) DeclareDialog(XAP_DIALOG_ID_ABOUT, XAP_UnixGnomeDialog_About) DeclareDialog(XAP_DIALOG_ID_INSERT_SYMBOL, XAP_UnixGnomeDialog_Insert_Symbol) + DeclareDialog(XAP_DIALOG_ID_INSERT_PICTURE, XAP_UnixDialog_FileOpenSaveAs) DeclareDialog(AP_DIALOG_ID_REPLACE, AP_UnixGnomeDialog_Replace) DeclareDialog(AP_DIALOG_ID_FIND, AP_UnixGnomeDialog_Replace) @@ -108,6 +109,7 @@ DeclareDialog(XAP_DIALOG_ID_WINDOWMORE, XAP_UnixDialog_WindowMore) DeclareDialog(XAP_DIALOG_ID_ZOOM, XAP_UnixDialog_Zoom) DeclareDialog(XAP_DIALOG_ID_INSERT_SYMBOL, XAP_UnixDialog_Insert_Symbol) + DeclareDialog(XAP_DIALOG_ID_INSERT_PICTURE, XAP_UnixDialog_FileOpenSaveAs) DeclareDialog(XAP_DIALOG_ID_ABOUT, XAP_UnixDialog_About) diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/wp/ap/win/ap_Win32Dialog_All.h ./src/wp/ap/win/ap_Win32Dialog_All.h --- ../abi-orig/src/wp/ap/win/ap_Win32Dialog_All.h Thu Jun 8 11:37:18 2000 +++ ./src/wp/ap/win/ap_Win32Dialog_All.h Tue Jun 27 12:37:22 2000 @@ -63,6 +63,7 @@ DeclareDialog(XAP_DIALOG_ID_ZOOM, XAP_Win32Dialog_Zoom) DeclareDialog(XAP_DIALOG_ID_ABOUT, XAP_Win32Dialog_About) DeclareDialog(XAP_DIALOG_ID_INSERT_SYMBOL, XAP_Win32Dialog_Insert_Symbol) + DeclareDialog(XAP_DIALOG_ID_INSERT_PICTURE, XAP_Win32Dialog_FileOpenSaveAs) DeclareDialog(AP_DIALOG_ID_REPLACE, AP_Win32Dialog_Replace) DeclareDialog(AP_DIALOG_ID_FIND, AP_Win32Dialog_Replace) diff -urNwb -x WIN32_1.1.1_i386_OBJ -x WIN32_x_i386_DBG ../abi-orig/src/wp/ap/xp/ap_EditMethods.cpp ./src/wp/ap/xp/ap_EditMethods.cpp --- ../abi-orig/src/wp/ap/xp/ap_EditMethods.cpp Sun Jun 18 21:53:52 2000 +++ ./src/wp/ap/xp/ap_EditMethods.cpp Tue Jun 27 12:44:14 2000 @@ -990,15 +990,9 @@ XAP_DialogFactory * pDialogFactory = (XAP_DialogFactory *)(pFrame->getDialogFactory()); - /* - TODO Use something like XAP_DIALOG_ID_INSERT_GRAPHIC rather - TODO than using XAP_DIALOG_ID_FILE_OPEN so that the insert - TODO image dialog can be different and so that it can - TODO have its own directory memory. - */ XAP_Dialog_FileOpenSaveAs * pDialog = (XAP_Dialog_FileOpenSaveAs *) - (pDialogFactory->requestDialog(XAP_DIALOG_ID_FILE_OPEN)); + (pDialogFactory->requestDialog(XAP_DIALOG_ID_INSERT_PICTURE)); UT_ASSERT(pDialog); pDialog->setCurrentPathname(pFrame->getFilename());