Only in ../abi: .tm_project.cache Only in ../abi: GNUmakefile Only in ../abi: GNUmakefile.in diff -ru ../../abiword-2.0.11.abicvs/abi/Makefile ../abi/Makefile --- ../../abiword-2.0.11.abicvs/abi/Makefile 2002-01-28 12:40:05.000000000 +0000 +++ ../abi/Makefile 2004-09-02 12:27:27.000000000 +0100 @@ -82,6 +82,13 @@ $(MAKE) prefix=$(prefix) ABI_OPT_DEBUG=1 -C src install ################################################################## +# ipkg + +install_ipkg: + @echo Installing AbiSuite for ipkg + $(MAKE) prefix=$(ABI_ROOT)/../ipkg_dist/$(prefix) -C src install + +################################################################## install_redhat: @echo Installing AbiSuite for Red Hat Linux systems diff -ru ../../abiword-2.0.11.abicvs/abi/abiword.prj ../abi/abiword.prj --- ../../abiword-2.0.11.abicvs/abi/abiword.prj 2002-09-04 19:46:57.000000000 +0100 +++ ../abi/abiword.prj 2004-09-02 12:27:27.000000000 +0100 @@ -1,4 +1,4 @@ -# Anjuta Version 0.9.99 +# Anjuta Version 1.2.2 Compatibility Level: 1 @@ -22,7 +22,7 @@ props.file.type=project -anjuta.version=0.9.99 +anjuta.version=1.2.2 anjuta.compatibility.level=1 project.name=abiword @@ -31,12 +31,15 @@ project.version=1.1.1 project.author=Abi the Ant project.source.target=abiword - -project.excluded.modules= - project.has.gettext=0 - +project.gui.command= project.programming.language=C++ +project.excluded.modules=intl + +project.config.extra.modules.before= +project.config.extra.modules.after= +project.config.blocked=0 +project.config.disable.overwriting=1 1 1 1 1 1 1 1 1 project.menu.entry=AbiWord Version 0.1 project.menu.group=Applications @@ -45,70 +48,60 @@ project.menu.need.terminal=0 project.configure.options= - anjuta.program.arguments= - -project.config.blocked=0 - -project.config.disable.overwriting=1 1 1 1 1 1 1 1 1 -project.config.extra.modules.before= -project.config.extra.modules.after= +preferences.build.option.jobs=0 +preferences.build.option.silent=0 +preferences.build.option.autosave=1 +preferences.make=make +preferences.build.option.keep.going=1 +preferences.build.option.warn.undef=0 +preferences.autoformat.custom.style= -i8 -sc -bli0 -bl0 -cbi0 -ss +preferences.indent.opening=0 +preferences.autoformat.disable=0 +preferences.indent.automatic=1 +preferences.use.tabs=1 +preferences.indent.size=4 +preferences.tabsize=4 +preferences.indent.closing=0 module.include.name=include module.include.type= -module.include.expanded=0 module.include.files= module.source.name=src module.source.type= -module.source.expanded=0 module.source.files= module.pixmap.name=pixmaps module.pixmap.type= -module.pixmap.expanded=0 module.pixmap.files= module.data.name=data module.data.type= -module.data.expanded=0 module.data.files= module.help.name=help module.help.type= -module.help.expanded=0 module.help.files= module.doc.name=doc module.doc.type= -module.doc.expanded=0 module.doc.files= -module.po.expanded=0 module.po.files= compiler.options.supports= - compiler.options.include.paths= - compiler.options.library.paths= - compiler.options.libraries= compiler.options.libraries.selected= - compiler.options.defines= - +compiler.options.defines.selected= compiler.options.warning.buttons=0 0 1 1 1 1 1 1 1 1 1 0 1 1 0 1 - compiler.options.optimize.buttons=0 1 0 0 - compiler.options.other.buttons=1 0 - compiler.options.other.c.flags= - compiler.options.other.l.flags= - compiler.options.other.l.libs= -project.source.paths= - +project.src.paths= Only in ../abi: abiword.pws Only in ../abi/ac-helpers: config.guess Only in ../abi/ac-helpers: config.sub Only in ../abi/ac-helpers: install-sh Only in ../abi/ac-helpers: missing Only in ../abi/ac-helpers: mkinstalldirs Only in ../abi: aclocal.m4 Only in ../abi: autogen.err Only in ../abi: autom4te.cache Only in ../abi: config.log Only in ../abi: config.status Only in ../abi: configure diff -ru ../../abiword-2.0.11.abicvs/abi/configure.ac ../abi/configure.ac --- ../../abiword-2.0.11.abicvs/abi/configure.ac 2004-08-27 12:30:18.000000000 +0100 +++ ../abi/configure.ac 2004-09-02 12:27:29.000000000 +0100 @@ -112,7 +112,7 @@ ABI_DETECT_ICONV -ABIWORD_APP_NAME="AbiWord" +ABIWORD_APP_NAME="Word" AC_SUBST(ABIWORD_APP_NAME) ABIWORD_APP_LIBDIR="AbiWord" AC_SUBST(ABIWORD_APP_LIBDIR) diff -ru ../../abiword-2.0.11.abicvs/abi/configure.in ../abi/configure.in --- ../../abiword-2.0.11.abicvs/abi/configure.in 2004-08-27 12:30:18.000000000 +0100 +++ ../abi/configure.in 2004-09-02 12:27:29.000000000 +0100 @@ -106,7 +106,7 @@ ABI_DETECT_ICONV -ABIWORD_APP_NAME="AbiWord" +ABIWORD_APP_NAME="Word" AC_SUBST(ABIWORD_APP_NAME) ABIWORD_APP_LIBDIR="AbiWord" AC_SUBST(ABIWORD_APP_LIBDIR) Only in ../abi/src: GNUmakefile Only in ../abi/src: GNUmakefile.in Only in ../abi/src/af: GNUmakefile Only in ../abi/src/af: GNUmakefile.in Only in ../abi/src/af/ev: GNUmakefile Only in ../abi/src/af/ev: GNUmakefile.in Only in ../abi/src/af/ev/cocoa: GNUmakefile Only in ../abi/src/af/ev/cocoa: GNUmakefile.in Only in ../abi/src/af/ev: libEv.a Only in ../abi/src/af/ev/qnx: GNUmakefile Only in ../abi/src/af/ev/qnx: GNUmakefile.in Only in ../abi/src/af/ev/unix: .deps Only in ../abi/src/af/ev/unix: GNUmakefile Only in ../abi/src/af/ev/unix: GNUmakefile.in Only in ../abi/src/af/ev/unix: ev_UnixKeyboard.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/ev/unix/ev_UnixMenu.cpp ../abi/src/af/ev/unix/ev_UnixMenu.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/ev/unix/ev_UnixMenu.cpp 2004-05-20 01:58:06.000000000 +0100 +++ ../abi/src/af/ev/unix/ev_UnixMenu.cpp 2004-09-02 12:27:30.000000000 +0100 @@ -522,7 +522,7 @@ {AP_MENU_ID_FILE_PRINT_PREVIEW, GTK_STOCK_PRINT_PREVIEW}, {AP_MENU_ID_FILE_EXIT, GTK_STOCK_QUIT}, {AP_MENU_ID_FILE_REVERT, GTK_STOCK_REVERT_TO_SAVED}, - + {AP_MENU_ID_FILE_RECENT_1, GTK_STOCK_NEW}, {AP_MENU_ID_FILE_RECENT_2, GTK_STOCK_NEW}, {AP_MENU_ID_FILE_RECENT_3, GTK_STOCK_NEW}, Only in ../abi/src/af/ev/unix: ev_UnixMenu.o Only in ../abi/src/af/ev/unix: ev_UnixMouse.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/ev/unix/ev_UnixToolbar.cpp ../abi/src/af/ev/unix/ev_UnixToolbar.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/ev/unix/ev_UnixToolbar.cpp 2004-05-20 01:58:06.000000000 +0100 +++ ../abi/src/af/ev/unix/ev_UnixToolbar.cpp 2004-09-12 16:54:55.000000000 +0100 @@ -570,6 +570,9 @@ case AP_TOOLBAR_ID_EDIT_CUT: stock_id = GTK_STOCK_CUT ; break ; case AP_TOOLBAR_ID_EDIT_COPY: stock_id = GTK_STOCK_COPY ; break ; case AP_TOOLBAR_ID_EDIT_PASTE: stock_id = GTK_STOCK_PASTE ; break ; + + case AP_TOOLBAR_ID_ZOOM_IN: stock_id = GTK_STOCK_ZOOM_IN ; break ; + case AP_TOOLBAR_ID_ZOOM_OUT: stock_id = GTK_STOCK_ZOOM_OUT ; break ; case AP_TOOLBAR_ID_FMT_BOLD: stock_id = GTK_STOCK_BOLD ; break ; case AP_TOOLBAR_ID_FMT_ITALIC: stock_id = GTK_STOCK_ITALIC ; break ; diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/ev/unix/ev_UnixToolbar.h ../abi/src/af/ev/unix/ev_UnixToolbar.h --- ../../abiword-2.0.11.abicvs/abi/src/af/ev/unix/ev_UnixToolbar.h 2003-03-06 22:17:38.000000000 +0000 +++ ../abi/src/af/ev/unix/ev_UnixToolbar.h 2004-09-02 12:27:30.000000000 +0100 @@ -80,12 +80,3 @@ }; #endif /* EV_UNIXTOOLBAR_H */ - - - - - - - - - Only in ../abi/src/af/ev/unix: ev_UnixToolbar.o Only in ../abi/src/af/ev/unix: ev_UnixToolbar_ViewListener.o Only in ../abi/src/af/ev/unix: libEv_unix.a Only in ../abi/src/af/ev/xp: .deps Only in ../abi/src/af/ev/xp: GNUmakefile Only in ../abi/src/af/ev/xp: GNUmakefile.in diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/ev/xp/ev_EditBinding.cpp ../abi/src/af/ev/xp/ev_EditBinding.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/ev/xp/ev_EditBinding.cpp 2003-08-16 16:39:54.000000000 +0100 +++ ../abi/src/af/ev/xp/ev_EditBinding.cpp 2004-09-09 18:29:00.000000000 +0100 @@ -23,6 +23,7 @@ #include #include #include +#include #include "ut_assert.h" #include "ut_debugmsg.h" @@ -404,7 +405,11 @@ // translate into displayable string static char buf[128]; memset(buf,0,NrElements(buf)); - + + // PSION-ABL to enable Shifted key mappings in menus. + if((i-1) >= 'A' && (i-1) <='Z') + ems|=EV_EMS_SHIFT; + if (ems&EV_EMS_CONTROL) strcat(buf, "Ctrl+"); @@ -430,6 +435,10 @@ case EV_NVK_DELETE: szNVK = "Del"; break; + + case EV_NVK_HELP: + szNVK = "Fn+Help"; + break; case EV_NVK_F1: szNVK = "F1"; Only in ../abi/src/af/ev/xp: ev_EditBinding.o Only in ../abi/src/af/ev/xp: ev_EditEventMapper.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/ev/xp/ev_EditMethod.cpp ../abi/src/af/ev/xp/ev_EditMethod.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/ev/xp/ev_EditMethod.cpp 2003-03-15 01:56:18.000000000 +0000 +++ ../abi/src/af/ev/xp/ev_EditMethod.cpp 2004-09-02 12:27:30.000000000 +0100 @@ -364,5 +364,3 @@ { return ev_EditMethod_lookup ( methodName.c_str() ) ; } - - Only in ../abi/src/af/ev/xp: ev_EditMethod.o Only in ../abi/src/af/ev/xp: ev_Keyboard.o Only in ../abi/src/af/ev/xp: ev_Menu.o Only in ../abi/src/af/ev/xp: ev_Menu_Actions.o Only in ../abi/src/af/ev/xp: ev_Menu_Labels.o Only in ../abi/src/af/ev/xp: ev_Menu_Layouts.o Only in ../abi/src/af/ev/xp: ev_Mouse.o Only in ../abi/src/af/ev/xp: ev_NamedVirtualKey.o Only in ../abi/src/af/ev/xp: ev_Toolbar.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/ev/xp/ev_Toolbar_Actions.h ../abi/src/af/ev/xp/ev_Toolbar_Actions.h --- ../../abiword-2.0.11.abicvs/abi/src/af/ev/xp/ev_Toolbar_Actions.h 2001-09-28 21:56:18.000000000 +0100 +++ ../abi/src/af/ev/xp/ev_Toolbar_Actions.h 2004-09-02 12:27:30.000000000 +0100 @@ -73,9 +73,9 @@ EV_TBIT_DropDown = 5, /* list box w/no text entry */ EV_TBIT_ComboBox = 6, /* list box w/ text entry */ EV_TBIT_StaticLabel = 7, /* a static control */ - EV_TBIT_Spacer = 8, /* for extra space between buttons */ - EV_TBIT_ColorFore = 9, /* control to set the foreground color */ - EV_TBIT_ColorBack = 10 /* control to set the background color */ + EV_TBIT_Spacer = 8, /* for extra space between buttons */ + EV_TBIT_ColorFore = 9, /* control to set the foreground color */ + EV_TBIT_ColorBack = 10 /* control to set the background color */ } EV_Toolbar_ItemType; Only in ../abi/src/af/ev/xp: ev_Toolbar_Actions.o Only in ../abi/src/af/ev/xp: ev_Toolbar_Control.o Only in ../abi/src/af/ev/xp: ev_Toolbar_Labels.o Only in ../abi/src/af/ev/xp: ev_Toolbar_Layouts.o Only in ../abi/src/af/ev/xp: libEv_xp.a Only in ../abi/src/af/gr: GNUmakefile Only in ../abi/src/af/gr: GNUmakefile.in Only in ../abi/src/af/gr/cocoa: GNUmakefile Only in ../abi/src/af/gr/cocoa: GNUmakefile.in Only in ../abi/src/af/gr: libGr.a Only in ../abi/src/af/gr/qnx: GNUmakefile Only in ../abi/src/af/gr/qnx: GNUmakefile.in Only in ../abi/src/af/gr/unix: .deps Only in ../abi/src/af/gr/unix: GNUmakefile Only in ../abi/src/af/gr/unix: GNUmakefile.in diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/gr/unix/gr_UnixGraphics.cpp ../abi/src/af/gr/unix/gr_UnixGraphics.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/gr/unix/gr_UnixGraphics.cpp 2004-03-24 14:02:05.000000000 +0000 +++ ../abi/src/af/gr/unix/gr_UnixGraphics.cpp 2004-09-02 12:27:30.000000000 +0100 @@ -1014,7 +1014,8 @@ GtkStyle *tempStyle = gtk_style_new(); const char *guiFontName = pango_font_description_get_family(tempStyle->font_desc); if (!guiFontName) - guiFontName = "Times New Roman"; +// guiFontName = "Times New Roman"; + guiFontName = "Thorndale AMT"; XAP_UnixFont * font = static_cast(m_pFontManager->searchFont(guiFontName)); // this operation should never fail g_object_unref(G_OBJECT(tempStyle)); UT_ASSERT(font); @@ -1304,6 +1305,7 @@ { gdk_window_scroll(m_pWin,ddx,ddy); } + setExposePending(true); // PSION-ABL AbiBug #7148 Backport. #else GdkRectangle xRect; GdkRectangle yRect; Only in ../abi/src/af/gr/unix: gr_UnixGraphics.o Only in ../abi/src/af/gr/unix: gr_UnixImage.o Only in ../abi/src/af/gr/unix: libGr_unix.a Only in ../abi/src/af/gr/xp: .deps Only in ../abi/src/af/gr/xp: GNUmakefile Only in ../abi/src/af/gr/xp: GNUmakefile.in Only in ../abi/src/af/gr/xp: gr_Caret.o Only in ../abi/src/af/gr/xp: gr_CharWidths.o Only in ../abi/src/af/gr/xp: gr_CharWidthsCache.o Only in ../abi/src/af/gr/xp: gr_DrawArgs.o Only in ../abi/src/af/gr/xp: gr_Graphics.o Only in ../abi/src/af/gr/xp: gr_Image.o Only in ../abi/src/af/gr/xp: gr_Transform.o Only in ../abi/src/af/gr/xp: gr_VectorImage.o Only in ../abi/src/af/gr/xp: libGr_xp.a Only in ../abi/src/af/util: GNUmakefile Only in ../abi/src/af/util: GNUmakefile.in Only in ../abi/src/af/util: libUtil.a Only in ../abi/src/af/util/qnx: GNUmakefile Only in ../abi/src/af/util/qnx: GNUmakefile.in Only in ../abi/src/af/util/unix: .deps Only in ../abi/src/af/util/unix: GNUmakefile Only in ../abi/src/af/util/unix: GNUmakefile.in Only in ../abi/src/af/util/unix: libUtil_unix.a Only in ../abi/src/af/util/unix: ut_debugmsg.o Only in ../abi/src/af/util/unix: ut_files.o Only in ../abi/src/af/util/unix: ut_path.o Only in ../abi/src/af/util/unix: ut_unixAssert.o Only in ../abi/src/af/util/unix: ut_unixDirent.o Only in ../abi/src/af/util/unix: ut_unixIdle.o Only in ../abi/src/af/util/unix: ut_unixString.o Only in ../abi/src/af/util/unix: ut_unixTimer.o Only in ../abi/src/af/util/xp: .deps Only in ../abi/src/af/util/xp: GNUmakefile Only in ../abi/src/af/util/xp: GNUmakefile.in Only in ../abi/src/af/util/xp: libUtil_xp.a Only in ../abi/src/af/util/xp: ut_AbiObject.o Only in ../abi/src/af/util/xp: ut_AdobeEncoding.o Only in ../abi/src/af/util/xp: ut_Encoding.o Only in ../abi/src/af/util/xp: ut_IntStrMap.o Only in ../abi/src/af/util/xp: ut_Language.o Only in ../abi/src/af/util/xp: ut_OverstrikingChars.o Only in ../abi/src/af/util/xp: ut_Script.o Only in ../abi/src/af/util/xp: ut_allocator.o Only in ../abi/src/af/util/xp: ut_base64.o Only in ../abi/src/af/util/xp: ut_base64_TestRoutines.o Only in ../abi/src/af/util/xp: ut_bijection.o Only in ../abi/src/af/util/xp: ut_bytebuf.o Only in ../abi/src/af/util/xp: ut_contextGlyph.o Only in ../abi/src/af/util/xp: ut_decompress.o Only in ../abi/src/af/util/xp: ut_growbuf.o Only in ../abi/src/af/util/xp: ut_hash.o Only in ../abi/src/af/util/xp: ut_iconv.o Only in ../abi/src/af/util/xp: ut_idle.o Only in ../abi/src/af/util/xp: ut_locale.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_map.h ../abi/src/af/util/xp/ut_map.h --- ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_map.h 2002-08-15 14:14:56.000000000 +0100 +++ ../abi/src/af/util/xp/ut_map.h 2004-09-02 12:27:30.000000000 +0100 @@ -61,7 +61,8 @@ #ifdef DEBUG void print() const { m_rbtree.print(); } // This method should be const. See UT_RBTree::checkInvariants comment - bool checkInvariants() { return m_rbtree.checkInvariants(); } + // PSION-ABL Arm compiler problem with this + // bool checkInvariants() { return m_rbtree.checkInvariants(); } #endif private: Only in ../abi/src/af/util/xp: ut_map.o Only in ../abi/src/af/util/xp: ut_math.o Only in ../abi/src/af/util/xp: ut_mbtowc.o Only in ../abi/src/af/util/xp: ut_misc.o Only in ../abi/src/af/util/xp: ut_mutex.o Only in ../abi/src/af/util/xp: ut_pair.o Only in ../abi/src/af/util/xp: ut_png.o Only in ../abi/src/af/util/xp: ut_rand.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_rbtree.cpp ../abi/src/af/util/xp/ut_rbtree.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_rbtree.cpp 2001-07-20 01:12:41.000000000 +0100 +++ ../abi/src/af/util/xp/ut_rbtree.cpp 2004-09-02 12:27:30.000000000 +0100 @@ -635,6 +635,7 @@ return retval; } +/* PSION-ABL Arm compiler problem with this bool UT_RBTree::checkInvariants() { @@ -657,6 +658,7 @@ return true; } +*/ #endif UT_RBTree::Node* @@ -680,4 +682,3 @@ { return (strcmp(static_cast (x), static_cast (y)) == 0); } - Only in ../abi/src/af/util/xp: ut_rbtree.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_set.h ../abi/src/af/util/xp/ut_set.h --- ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_set.h 2002-08-15 14:15:03.000000000 +0100 +++ ../abi/src/af/util/xp/ut_set.h 2004-09-02 12:27:30.000000000 +0100 @@ -54,7 +54,8 @@ #ifdef DEBUG void print() const { m_rbtree.print(); } // This method should be const. See UT_RBTree::checkInvariants comment - bool checkInvariants() { return m_rbtree.checkInvariants(); } + // PSION-ABL Arm compiler problem with this + // bool checkInvariants() { return m_rbtree.checkInvariants(); } #endif private: Only in ../abi/src/af/util/xp: ut_set.o Only in ../abi/src/af/util/xp: ut_spi.o Only in ../abi/src/af/util/xp: ut_stack.o Only in ../abi/src/af/util/xp: ut_string.o Only in ../abi/src/af/util/xp: ut_string_class.o Only in ../abi/src/af/util/xp: ut_stringbuf.o Only in ../abi/src/af/util/xp: ut_svg.o Only in ../abi/src/af/util/xp: ut_test.o Only in ../abi/src/af/util/xp: ut_thread.o Only in ../abi/src/af/util/xp: ut_timer.o Only in ../abi/src/af/util/xp: ut_types.o Only in ../abi/src/af/util/xp: ut_units.o Only in ../abi/src/af/util/xp: ut_vector.o Only in ../abi/src/af/util/xp: ut_wctomb.o Only in ../abi/src/af/util/xp: ut_worker.o Only in ../abi/src/af/util/xp: ut_xml.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_xml_libxml2.cpp ../abi/src/af/util/xp/ut_xml_libxml2.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/util/xp/ut_xml_libxml2.cpp 2003-08-05 20:53:04.000000000 +0100 +++ ../abi/src/af/util/xp/ut_xml_libxml2.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -182,7 +182,7 @@ if (xmlParseChunk (ctxt, buffer, static_cast(length), 0)) { - UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); +// PSION-ABL UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); ret = UT_IE_IMPORTERROR; break; } @@ -192,7 +192,7 @@ { if (xmlParseChunk (ctxt, "", 0, 1)) { - UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); +// PSION-ABL UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt))); ret = UT_IE_IMPORTERROR; } } Only in ../abi/src/af/util/xp: ut_xml_libxml2.o Only in ../abi/src/af/xap: GNUmakefile Only in ../abi/src/af/xap: GNUmakefile.in Only in ../abi/src/af/xap/cocoa: GNUmakefile Only in ../abi/src/af/xap/cocoa: GNUmakefile.in Only in ../abi/src/af/xap: libXap.a Only in ../abi/src/af/xap/qnx: GNUmakefile Only in ../abi/src/af/xap/qnx: GNUmakefile.in Only in ../abi/src/af/xap/unix: .deps Only in ../abi/src/af/xap/unix: GNUmakefile Only in ../abi/src/af/xap/unix: GNUmakefile.in Only in ../abi/src/af/xap/unix/gnome: GNUmakefile Only in ../abi/src/af/xap/unix/gnome: GNUmakefile.in diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp ../abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp 2004-04-28 10:51:11.000000000 +0100 +++ ../abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_About.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -83,4 +83,3 @@ abiSetupModelessDialog (GTK_DIALOG(mainWindow), pFrame, this, GTK_RESPONSE_CLOSE, false); gtk_widget_show (mainWindow); } - Only in ../abi/src/af/xap/unix: libXap_unix.a Only in ../abi/src/af/xap/unix: xap_UnixApp.o Only in ../abi/src/af/xap/unix: xap_UnixClipboard.o Only in ../abi/src/af/xap/unix: xap_UnixDialogHelper.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixDlg_About.cpp ../abi/src/af/xap/unix/xap_UnixDlg_About.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixDlg_About.cpp 2003-07-24 23:14:11.000000000 +0100 +++ ../abi/src/af/xap/unix/xap_UnixDlg_About.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -150,9 +150,12 @@ abiDialogSetTitle(window, XAP_ABOUT_TITLE, m_pApp->getApplicationName()); - UT_String title = UT_String_sprintf("%s %s", m_pApp->getApplicationName(), XAP_App::s_szBuild_Version); + UT_String title = UT_String_sprintf("%s %s", "AbiWord", XAP_App::s_szBuild_Version); setLabelMarkup(glade_xml_get_widget(xml, "lbTitle"), title.c_str()); + //UT_String description = UT_String_sprintf(XAP_ABOUT_APP_VERSION_DESCRIPTION"%s %s", "AbiWord", XAP_App::s_szBuild_Version); + setLabelMarkup(glade_xml_get_widget(xml, "lbDesc"), XAP_ABOUT_APP_VERSION_DESCRIPTION);//description.c_str()); + UT_String license = UT_String_sprintf(XAP_ABOUT_GPL_LONG_LINE_BROKEN, m_pApp->getApplicationName()); setLabelMarkup(glade_xml_get_widget(xml, "lbLicense"), license.c_str()); diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixDlg_About.glade ../abi/src/af/xap/unix/xap_UnixDlg_About.glade --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixDlg_About.glade 2003-04-24 01:23:45.000000000 +0100 +++ ../abi/src/af/xap/unix/xap_UnixDlg_About.glade 2004-09-02 12:27:31.000000000 +0100 @@ -11,6 +11,11 @@ True True False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST True @@ -32,6 +37,7 @@ http://www.abisource.com True GTK_RELIEF_NORMAL + True 1 @@ -44,6 +50,7 @@ gtk-ok True GTK_RELIEF_NORMAL + True 0 @@ -59,20 +66,20 @@ True - 4 + 5 1 False 0 0 - + True - <span size="smaller">%s</span> + <span weight="ultrabold" size="xx-large">%s</span> False True - GTK_JUSTIFY_CENTER - True + GTK_JUSTIFY_LEFT + False False 0.5 0.5 @@ -82,8 +89,25 @@ 0 1 - 2 - 3 + 1 + 2 + 12 + + + + + + + + 0 + 1 + 0 + 1 + @@ -105,21 +129,21 @@ 0 1 - 3 - 4 + 4 + 5 12 - + True - <span weight="ultrabold" size="xx-large">%s</span> + <span size="smaller">%s</span> False True - GTK_JUSTIFY_LEFT - False + GTK_JUSTIFY_CENTER + True False 0.5 0.5 @@ -129,25 +153,32 @@ 0 1 - 1 - 2 - 12 + 3 + 4 - Only in ../abi/src/af/xap/unix: xap_UnixDlg_About.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_ClipArt.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_Encoding.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_FileOpenSaveAs.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp ../abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2003-09-30 13:29:22.000000000 +0100 +++ ../abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -868,7 +868,10 @@ foundAt = searchCList(GTK_CLIST(m_fontList), const_cast(getVal("font-family"))); if (foundAt >= 0) + { gtk_clist_select_row(GTK_CLIST(m_fontList), foundAt, 0); + gtk_clist_moveto(GTK_CLIST(m_fontList), foundAt, 0, 0, 0); + } // this is pretty messy listStyle st = LIST_STYLE_NORMAL; @@ -1014,8 +1017,3 @@ else event_previewClear(); } - - - - - Only in ../abi/src/af/xap/unix: xap_UnixDlg_FontChooser.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_HTMLOptions.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_Image.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_Insert_Symbol.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_Language.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_MessageBox.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_Password.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_PluginManager.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_Print.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_PrintPreview.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_WindowMore.o Only in ../abi/src/af/xap/unix: xap_UnixDlg_Zoom.o Only in ../abi/src/af/xap/unix: xap_UnixEncodingManager.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixFont.cpp ../abi/src/af/xap/unix/xap_UnixFont.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixFont.cpp 2004-03-24 14:02:19.000000000 +0000 +++ ../abi/src/af/xap/unix/xap_UnixFont.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -281,6 +281,7 @@ if (stFontFile > 4) { if (!UT_stricmp(m_fontfile + stFontFile - 4, ".ttf") || + !UT_stricmp(m_fontfile + stFontFile - 4, ".otf") || !UT_stricmp(m_fontfile + stFontFile - 5, ".font")) m_fontType = FONT_TYPE_TTF; else if (!UT_stricmp(m_fontfile + stFontFile - 4, ".pfa")) Only in ../abi/src/af/xap/unix: xap_UnixFont.o Only in ../abi/src/af/xap/unix: xap_UnixFontManager.o Only in ../abi/src/af/xap/unix: xap_UnixFontPreview.o Only in ../abi/src/af/xap/unix: xap_UnixFontXLFD.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixFrameImpl.cpp ../abi/src/af/xap/unix/xap_UnixFrameImpl.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/unix/xap_UnixFrameImpl.cpp 2004-02-15 21:48:32.000000000 +0000 +++ ../abi/src/af/xap/unix/xap_UnixFrameImpl.cpp 2004-09-08 15:43:20.000000000 +0100 @@ -503,7 +503,7 @@ pUnixFrameImpl->setTimeOfLastEvent(e->time); AV_View * pView = pFrame->getCurrentView(); EV_UnixMouse * pUnixMouse = static_cast(pFrame->getMouse()); - + gtk_grab_add(w); pUnixFrameImpl->resetIMContext (); @@ -672,7 +672,17 @@ // Let IM handle the event first. if (gtk_im_context_filter_keypress(pUnixFrameImpl->getIMContext(), e)) { pUnixFrameImpl->queueIMReset (); - return 0; + + if ((e->state & GDK_MOD1_MASK) || + (e->state & GDK_MOD3_MASK) || + (e->state & GDK_MOD4_MASK)) + return 0; + + // ... else, stop this signal + g_signal_stop_emission (G_OBJECT(w), + g_signal_lookup ("key_press_event", + G_OBJECT_TYPE (w)), 0); + return 1; } XAP_Frame* pFrame = pUnixFrameImpl->getFrame(); @@ -764,7 +774,7 @@ rClip.top = pGr->tlu(pExposeEvent->area.y); rClip.width = pGr->tlu(pExposeEvent->area.width); rClip.height = pGr->tlu(pExposeEvent->area.height); - + pGr->setExposePending(false); // PSION-ABL AbiBug #7148 Backport. pView->draw(&rClip); } return FALSE; Only in ../abi/src/af/xap/unix: xap_UnixFrameImpl.cpp.orig Only in ../abi/src/af/xap/unix: xap_UnixFrameImpl.o Only in ../abi/src/af/xap/unix: xap_UnixGtkColorPicker.o Only in ../abi/src/af/xap/unix: xap_UnixModule.o Only in ../abi/src/af/xap/unix: xap_UnixNullGraphics.o Only in ../abi/src/af/xap/unix: xap_UnixPSFont.o Only in ../abi/src/af/xap/unix: xap_UnixPSGenerate.o Only in ../abi/src/af/xap/unix: xap_UnixPSGraphics.o Only in ../abi/src/af/xap/unix: xap_UnixPSImage.o Only in ../abi/src/af/xap/unix: xap_UnixPSParseAFM.o Only in ../abi/src/af/xap/unix: xap_UnixTableWidget.o Only in ../abi/src/af/xap/unix: xap_UnixToolbar_Icons.o Only in ../abi/src/af/xap/xp: .deps Only in ../abi/src/af/xap/xp: GNUmakefile Only in ../abi/src/af/xap/xp: GNUmakefile.in Only in ../abi/src/af/xap/xp: libXap_xp.a Only in ../abi/src/af/xap/xp: xad_Document.o Only in ../abi/src/af/xap/xp: xap_App.o Only in ../abi/src/af/xap/xp: xap_Args.o Only in ../abi/src/af/xap/xp: xap_Clipboard.o Only in ../abi/src/af/xap/xp: xap_Dialog.o Only in ../abi/src/af/xap/xp: xap_DialogFactory.o Only in ../abi/src/af/xap/xp: xap_Dictionary.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Dlg_About.h ../abi/src/af/xap/xp/xap_Dlg_About.h --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Dlg_About.h 2004-04-28 10:51:12.000000000 +0100 +++ ../abi/src/af/xap/xp/xap_Dlg_About.h 2004-09-06 14:50:03.000000000 +0100 @@ -33,7 +33,8 @@ #define XAP_ABOUT_VERSION "Version: %s" #define XAP_ABOUT_BUILD "Build options: %s" #define XAP_ABOUT_URL "For more information: http://www.abisource.com/" -#define XAP_ABOUT_GPL_LONG "AbiWord and AbiSource are trademarks of AbiSource, Inc.\r\n\r\n%s is free software; you can redistribute it and/or \ +#define XAP_ABOUT_GPL_LONG "AbiWord and AbiSource are trademarks of AbiSource, Inc.\r\n \ PSION and the PSION Logo are trademarks of PSION PLC.\r\n\ +\r\n%s / AbiWord is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License \ as published by the Free Software Foundation; either version 2 \ of the License, or (at your option) any later version.\r\n\r\n\ @@ -42,7 +43,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \ GNU General Public License for more details." -#define XAP_ABOUT_GPL_LONG_LINE_BROKEN "AbiWord and AbiSource are trademarks of\nAbiSource, Inc.\n\n%s is free software; you can redistribute it\n \ +#define XAP_ABOUT_APP_VERSION_DESCRIPTION "The Word Processor on your Psion" + +#define XAP_ABOUT_GPL_LONG_LINE_BROKEN "AbiWord and AbiSource are trademarks of\nAbiSource, Inc.\n\nPSION and the PSION Logo are trademarks of PSION PLC.\n\ +\n\%s / AbiWord is free software; you can redistribute it\n \ and/or modify it under the terms of the GNU General\n \ Public License as published by the Free Software\n \ Foundation; either version 2 of the License, or (at your\n \ @@ -53,7 +57,7 @@ FOR A PARTICULAR PURPOSE. See the GNU General\n \ Public License for more details." -#define XAP_ABOUT_GPL_LONG_LF "AbiWord and AbiSource are trademarks of AbiSource, Inc.\n\n%s is free software; you can redistribute it and/or \ +#define XAP_ABOUT_GPL_LONG_LF "AbiWord and AbiSource are trademarks of AbiSource, Inc.\n\n%s / AbiWord is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License \ as published by the Free Software Foundation; either version 2 \ of the License, or (at your option) any later version.\n\n\ Only in ../abi/src/af/xap/xp: xap_Dlg_About.o Only in ../abi/src/af/xap/xp: xap_Dlg_ClipArt.o Only in ../abi/src/af/xap/xp: xap_Dlg_Encoding.o Only in ../abi/src/af/xap/xp: xap_Dlg_FileOpenSaveAs.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Dlg_FontChooser.cpp ../abi/src/af/xap/xp/xap_Dlg_FontChooser.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2003-08-11 20:50:26.000000000 +0100 +++ ../abi/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -611,7 +611,8 @@ const char* pszStretch = getVal("font-stretch"); const char* pszSize = getVal("font-size"); if(!pszFamily) - pszFamily = "Times New Roman"; +// pszFamily = "Times New Roman"; + pszFamily = "Thorndale AMT"; if(!pszStyle) pszStyle = "normal"; Only in ../abi/src/af/xap/xp: xap_Dlg_FontChooser.o Only in ../abi/src/af/xap/xp: xap_Dlg_HTMLOptions.o Only in ../abi/src/af/xap/xp: xap_Dlg_Image.o Only in ../abi/src/af/xap/xp: xap_Dlg_Insert_Symbol.o Only in ../abi/src/af/xap/xp: xap_Dlg_Language.o Only in ../abi/src/af/xap/xp: xap_Dlg_MessageBox.o Only in ../abi/src/af/xap/xp: xap_Dlg_Password.o Only in ../abi/src/af/xap/xp: xap_Dlg_PluginManager.o Only in ../abi/src/af/xap/xp: xap_Dlg_Print.o Only in ../abi/src/af/xap/xp: xap_Dlg_PrintPreview.o Only in ../abi/src/af/xap/xp: xap_Dlg_WindowMore.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Dlg_Zoom.cpp ../abi/src/af/xap/xp/xap_Dlg_Zoom.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Dlg_Zoom.cpp 2003-03-19 20:37:45.000000000 +0000 +++ ../abi/src/af/xap/xp/xap_Dlg_Zoom.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -143,7 +143,8 @@ UT_ASSERT(m_zoomPreview); m_zoomPreview->setWindowSize(width, height); - m_zoomPreview->setString("10-pt Times New Roman"); +// m_zoomPreview->setString("10-pt Times New Roman"); + m_zoomPreview->setString("10-pt Thorndale AMT"); m_zoomPreview->setFont(XAP_Preview_Zoom::font_NORMAL); m_zoomPreview->setZoomPercent(m_zoomPercent); Only in ../abi/src/af/xap/xp: xap_Dlg_Zoom.o Only in ../abi/src/af/xap/xp: xap_Draw_Symbol.o Only in ../abi/src/af/xap/xp: xap_EncodingManager.o Only in ../abi/src/af/xap/xp: xap_FakeClipboard.o Only in ../abi/src/af/xap/xp: xap_FontPreview.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Frame.cpp ../abi/src/af/xap/xp/xap_Frame.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Frame.cpp 2003-12-10 16:51:55.000000000 +0000 +++ ../abi/src/af/xap/xp/xap_Frame.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -697,7 +697,7 @@ bool XAP_Frame::repopulateCombos(void) { - // +// // Update the styles combo box. // EV_Toolbar * pTbar = NULL; @@ -706,7 +706,9 @@ { pTbar = getToolbar(ibar++); if(pTbar) + { pTbar->repopulateStyles(); + } } while(pTbar); return true; @@ -1145,4 +1147,3 @@ return NULL; } - Only in ../abi/src/af/xap/xp: xap_Frame.o Only in ../abi/src/af/xap/xp: xap_FrameImpl.o Only in ../abi/src/af/xap/xp: xap_LoadBindings.o Only in ../abi/src/af/xap/xp: xap_Log.o Only in ../abi/src/af/xap/xp: xap_Module.o Only in ../abi/src/af/xap/xp: xap_ModuleManager.o Only in ../abi/src/af/xap/xp: xap_Prefs.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Prefs_SchemeIds.h ../abi/src/af/xap/xp/xap_Prefs_SchemeIds.h --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Prefs_SchemeIds.h 2003-08-11 20:50:27.000000000 +0100 +++ ../abi/src/af/xap/xp/xap_Prefs_SchemeIds.h 2004-09-02 12:27:31.000000000 +0100 @@ -42,7 +42,7 @@ ////////////////////////////////////////////////////////////////////////////////////// #define XAP_PREF_KEY_ToolbarAppearance "ToolbarAppearance" -#define XAP_PREF_DEFAULT_ToolbarAppearance "icon" /* {icon,text,both} */ +#define XAP_PREF_DEFAULT_ToolbarAppearance "icon"//"both"//"icon" /* {icon,text,both} */ #define XAP_PREF_KEY_RemapGlyphsDefault "RemapGlyphsDefault" /* default replacement glyph for originals not mentioned in the table */ @@ -52,7 +52,7 @@ /* smart quotes */ #define XAP_PREF_KEY_SmartQuotesEnable "SmartQuotesEnable" /* substitute curly smart quotes on the fly */ -#define XAP_PREF_DEFAULT_SmartQuotesEnable "0" +#define XAP_PREF_DEFAULT_SmartQuotesEnable "1" #define XAP_PREF_KEY_UseSuffix "UseSuffix" /* append suffixes to saved files */ @@ -123,7 +123,7 @@ #define XAP_PREF_DEFAULT_ColorForRevision10 "ff0000" #define XAP_PREF_KEY_DefaultSaveDirectory "DefaultSaveDirectory" -#define XAP_PREF_DEFAULT_DefaultSaveDirectory "" /* empty for $PWD basically */ +#define XAP_PREF_DEFAULT_DefaultSaveDirectory "~/My\ Documents" /* empty for $PWD basically */ #define XAP_PREF_KEY_ZoomType "ZoomType" #define XAP_PREF_DEFAULT_ZoomType "Width" /* 100, Width, Page */ @@ -133,13 +133,13 @@ #define XAP_PREF_DEFAULT_ZoomPercentage "100" #define XAP_PREF_KEY_AllowCustomToolbars "AllowCustomToolbars" -#define XAP_PREF_DEFAULT_AllowCustomToolbars "0" +#define XAP_PREF_DEFAULT_AllowCustomToolbars "0"//"0" #define XAP_PREF_KEY_EnableSmoothScrolling "EnableSmoothScrolling" -#define XAP_PREF_DEFAULT_EnableSmoothScrolling "1" +#define XAP_PREF_DEFAULT_EnableSmoothScrolling "0"//"1" #define XAP_PREF_KEY_HaveCustomToolbars "HaveCustomToolbars" -#define XAP_PREF_DEFAULT_HaveCustomToolbars "0" +#define XAP_PREF_DEFAULT_HaveCustomToolbars "0"//"0" #define XAP_PREF_KEY_AutoLoadPlugins "AutoLoadPlugins" #define XAP_PREF_DEFAULT_AutoLoadPlugins "1" Only in ../abi/src/af/xap/xp: xap_Preview.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Preview_Zoom.cpp ../abi/src/af/xap/xp/xap_Preview_Zoom.cpp --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_Preview_Zoom.cpp 2003-03-19 20:37:46.000000000 +0000 +++ ../abi/src/af/xap/xp/xap_Preview_Zoom.cpp 2004-09-02 12:27:31.000000000 +0100 @@ -81,7 +81,8 @@ { case XAP_Preview_Zoom::font_NORMAL: sprintf (fontString, "%dpt", (10 * m_zoomPercent / 100)); - found = m_gc->findFont("Times New Roman", "normal", "", "normal", "", fontString); + //found = m_gc->findFont("Times New Roman", "normal", "", "normal", "", fontString); + found = m_gc->findFont("Thorndale", "normal", "", "normal", "", fontString); if (found) { Only in ../abi/src/af/xap/xp: xap_Preview_Zoom.o Only in ../abi/src/af/xap/xp: xap_Scrollbar_ViewListener.o Only in ../abi/src/af/xap/xp: xap_Spider.o Only in ../abi/src/af/xap/xp: xap_StatusBar.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_String_Id.h ../abi/src/af/xap/xp/xap_String_Id.h --- ../../abiword-2.0.11.abicvs/abi/src/af/xap/xp/xap_String_Id.h 2004-08-07 20:05:55.000000000 +0100 +++ ../abi/src/af/xap/xp/xap_String_Id.h 2004-09-02 12:27:31.000000000 +0100 @@ -112,17 +112,17 @@ dcl(DLG_UFS_UnderlineCheck, "Underline") dcl(DLG_UFS_OverlineCheck, "Overline") dcl(DLG_UFS_HiddenCheck, "Hidden") -dcl(DLG_UFS_TransparencyCheck, "Set no Highlight Color") -dcl(DLG_UFS_FontTab, " Font ") -dcl(DLG_UFS_ColorTab, "Text Color") -dcl(DLG_UFS_BGColorTab, "HighLight Color") +dcl(DLG_UFS_TransparencyCheck, "Set no Highlight Colour") +dcl(DLG_UFS_FontTab, "Font") +dcl(DLG_UFS_ColorTab, "Text Colour") +dcl(DLG_UFS_BGColorTab, "HighLight Colour") dcl(DLG_UFS_StyleRegular, "Regular") dcl(DLG_UFS_StyleItalic, "Italic") dcl(DLG_UFS_StyleBold, "Bold") dcl(DLG_UFS_StyleBoldItalic, "Bold Italic") dcl(DLG_UFS_ToplineCheck, "Topline") dcl(DLG_UFS_BottomlineCheck, "Bottomline") -dcl(DLG_UFS_ColorLabel, "Color:") +dcl(DLG_UFS_ColorLabel, "Colour:") dcl(DLG_UFS_ScriptLabel, "Script:") dcl(DLG_UFS_SampleFrameLabel, "Sample") dcl(DLG_UFS_SuperScript, "Superscript") @@ -187,7 +187,7 @@ dcl(DLG_UP_PrintIn, "Print in: ") dcl(DLG_UP_BlackWhite, "Black & White") dcl(DLG_UP_Grayscale, "Grayscale") -dcl(DLG_UP_Color, "Color") +dcl(DLG_UP_Color, "Colour") /* Insert Symbol dialog */ dcl(DLG_Insert_SymbolTitle, "Insert Symbol") Only in ../abi/src/af/xap/xp: xap_Strings.o Only in ../abi/src/af/xap/xp: xap_Toolbar_ControlFactory.o Only in ../abi/src/af/xap/xp: xap_ViewListener.o Only in ../abi/src/af/xap/xp: xav_View.o Only in ../abi/src/bindings: GNUmakefile Only in ../abi/src/bindings: GNUmakefile.in Only in ../abi/src/bindings/perl: GNUmakefile Only in ../abi/src/bindings/perl: GNUmakefile.in diff -ru ../../abiword-2.0.11.abicvs/abi/src/hello/ap/xp/ap_Prefs_SchemeIds.h ../abi/src/hello/ap/xp/ap_Prefs_SchemeIds.h --- ../../abiword-2.0.11.abicvs/abi/src/hello/ap/xp/ap_Prefs_SchemeIds.h 2002-10-29 19:45:54.000000000 +0000 +++ ../abi/src/hello/ap/xp/ap_Prefs_SchemeIds.h 2004-09-02 12:27:31.000000000 +0100 @@ -36,7 +36,7 @@ // // Note: These are in addition to the application-independent ones defined in // abi/src/xap/xp/xap_Prefs_SchemeIds.h. -////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////1///// #define AP_PREF_KEY_StringSet "StringSet" #define AP_PREF_DEFAULT_StringSet "EnUS" /* name of dialog/msgbox strings */ Only in ../abi/src/other: GNUmakefile Only in ../abi/src/other: GNUmakefile.in Only in ../abi/src/other/spell: GNUmakefile Only in ../abi/src/other/spell: GNUmakefile.in Only in ../abi/src/other/spell/xp: .deps Only in ../abi/src/other/spell/xp: GNUmakefile Only in ../abi/src/other/spell/xp: GNUmakefile.in Only in ../abi/src/other/spell/xp: barbarisms.o Only in ../abi/src/other/spell/xp: correct.o Only in ../abi/src/other/spell/xp: good.o Only in ../abi/src/other/spell/xp: hash.o Only in ../abi/src/other/spell/xp: ispell_checker.o Only in ../abi/src/other/spell/xp: libSpell.a Only in ../abi/src/other/spell/xp: lookup.o Only in ../abi/src/other/spell/xp: makedent.o Only in ../abi/src/other/spell/xp: spell_manager.o Only in ../abi/src/other/spell/xp: tgood.o Only in ../abi/src/other/ttftool: GNUmakefile Only in ../abi/src/other/ttftool: GNUmakefile.in Only in ../abi/src/other/ttftool/unix: .deps Only in ../abi/src/other/ttftool/unix: GNUmakefile Only in ../abi/src/other/ttftool/unix: GNUmakefile.in Only in ../abi/src/other/ttftool/unix: libTtfTool.a Only in ../abi/src/other/ttftool/unix: parse.o Only in ../abi/src/other/ttftool/unix: ps.o Only in ../abi/src/other/ttftool/unix: ttfutils.o Only in ../abi/src/text: GNUmakefile Only in ../abi/src/text: GNUmakefile.in Only in ../abi/src/text/fmt: GNUmakefile Only in ../abi/src/text/fmt: GNUmakefile.in Only in ../abi/src/text/fmt/xp: .deps Only in ../abi/src/text/fmt/xp: GNUmakefile Only in ../abi/src/text/fmt/xp: GNUmakefile.in Only in ../abi/src/text/fmt/xp: fb_Alignment.o Only in ../abi/src/text/fmt/xp: fb_ColumnBreaker.o Only in ../abi/src/text/fmt/xp: fb_LineBreaker.o Only in ../abi/src/text/fmt/xp: fg_Graphic.o Only in ../abi/src/text/fmt/xp: fg_GraphicRaster.o Only in ../abi/src/text/fmt/xp: fg_GraphicVector.o Only in ../abi/src/text/fmt/xp: fl_AutoLists.o Only in ../abi/src/text/fmt/xp: fl_AutoNum.o Only in ../abi/src/text/fmt/xp: fl_BlockLayout.o Only in ../abi/src/text/fmt/xp: fl_ContainerLayout.o Only in ../abi/src/text/fmt/xp: fl_DocLayout.o Only in ../abi/src/text/fmt/xp: fl_DocListener.o Only in ../abi/src/text/fmt/xp: fl_FootnoteLayout.o Only in ../abi/src/text/fmt/xp: fl_Layout.o Only in ../abi/src/text/fmt/xp: fl_SectionLayout.o Only in ../abi/src/text/fmt/xp: fl_SelectionPreserver.o Only in ../abi/src/text/fmt/xp: fl_Squiggles.o Only in ../abi/src/text/fmt/xp: fl_TableLayout.o Only in ../abi/src/text/fmt/xp: fl_TestRoutines.o Only in ../abi/src/text/fmt/xp: fp_Column.o Only in ../abi/src/text/fmt/xp: fp_ContainerObject.o Only in ../abi/src/text/fmt/xp: fp_DirectionMarkerRun.o Only in ../abi/src/text/fmt/xp: fp_FieldListLabelRun.o Only in ../abi/src/text/fmt/xp: fp_FmtMarkRun.o Only in ../abi/src/text/fmt/xp: fp_FootnoteContainer.o Only in ../abi/src/text/fmt/xp: fp_Line.o Only in ../abi/src/text/fmt/xp: fp_Page.o Only in ../abi/src/text/fmt/xp: fp_PageSize.o Only in ../abi/src/text/fmt/xp: fp_Run.o Only in ../abi/src/text/fmt/xp: fp_TableContainer.o Only in ../abi/src/text/fmt/xp: fp_TestRoutines.o Only in ../abi/src/text/fmt/xp: fp_TextRun.o Only in ../abi/src/text/fmt/xp: fv_View.o Only in ../abi/src/text/fmt/xp: fv_View_TestRoutines.o Only in ../abi/src/text/fmt/xp: fv_View_cmd.o Only in ../abi/src/text/fmt/xp: fv_View_protected.o Only in ../abi/src/text/fmt/xp: libFmt.a Only in ../abi/src/text/ptbl: GNUmakefile Only in ../abi/src/text/ptbl: GNUmakefile.in Only in ../abi/src/text/ptbl/xp: .deps Only in ../abi/src/text/ptbl/xp: GNUmakefile Only in ../abi/src/text/ptbl/xp: GNUmakefile.in Only in ../abi/src/text/ptbl/xp: fd_Field.o Only in ../abi/src/text/ptbl/xp: libPtbl.a Only in ../abi/src/text/ptbl/xp: pd_Document.o Only in ../abi/src/text/ptbl/xp: pd_Document_TestRoutines.o Only in ../abi/src/text/ptbl/xp: pd_Style.o Only in ../abi/src/text/ptbl/xp: pf_Frag.o Only in ../abi/src/text/ptbl/xp: pf_Frag_FmtMark.o Only in ../abi/src/text/ptbl/xp: pf_Frag_Object.o Only in ../abi/src/text/ptbl/xp: pf_Frag_Strux.o Only in ../abi/src/text/ptbl/xp: pf_Frag_Strux_Block.o Only in ../abi/src/text/ptbl/xp: pf_Frag_Strux_Section.o Only in ../abi/src/text/ptbl/xp: pf_Frag_TestRoutines.o Only in ../abi/src/text/ptbl/xp: pf_Frag_Text.o Only in ../abi/src/text/ptbl/xp: pf_Fragments.o Only in ../abi/src/text/ptbl/xp: pf_Frags_TestRoutines.o Only in ../abi/src/text/ptbl/xp: po_Bookmark.o Only in ../abi/src/text/ptbl/xp: pp_AttrProp.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/text/ptbl/xp/pp_Property.cpp ../abi/src/text/ptbl/xp/pp_Property.cpp --- ../../abiword-2.0.11.abicvs/abi/src/text/ptbl/xp/pp_Property.cpp 2003-07-24 23:14:32.000000000 +0100 +++ ../abi/src/text/ptbl/xp/pp_Property.cpp 2004-09-02 12:27:32.000000000 +0100 @@ -84,7 +84,8 @@ { "field-color", "dcdcdc", true, NULL, PP_LEVEL_FIELD}, { "field-font", "NULL", true, NULL, PP_LEVEL_FIELD}, - { "font-family", "Times New Roman", true, NULL, PP_LEVEL_CHAR}, +// { "font-family", "Times New Roman", true, NULL, PP_LEVEL_CHAR}, + { "font-family", "Thorndale AMT", true, NULL, PP_LEVEL_CHAR}, { "font-size", "12pt", true, NULL, PP_LEVEL_CHAR}, // MS word defaults to 10pt, but it just seems too small { "font-stretch", "normal", true, NULL, PP_LEVEL_CHAR}, { "font-style", "normal", true, NULL, PP_LEVEL_CHAR}, Only in ../abi/src/text/ptbl/xp: pp_Property.o Only in ../abi/src/text/ptbl/xp: pp_PropertyMap.o Only in ../abi/src/text/ptbl/xp: pp_Revision.o Only in ../abi/src/text/ptbl/xp: pp_TableAttrProp.o Only in ../abi/src/text/ptbl/xp: pt_PT_Append.o Only in ../abi/src/text/ptbl/xp: pt_PT_ChangeObject.o Only in ../abi/src/text/ptbl/xp: pt_PT_ChangeSpan.o Only in ../abi/src/text/ptbl/xp: pt_PT_ChangeStrux.o Only in ../abi/src/text/ptbl/xp: pt_PT_DeleteObject.o Only in ../abi/src/text/ptbl/xp: pt_PT_DeleteSpan.o Only in ../abi/src/text/ptbl/xp: pt_PT_DeleteStrux.o Only in ../abi/src/text/ptbl/xp: pt_PT_FmtMark.o Only in ../abi/src/text/ptbl/xp: pt_PT_Glob.o Only in ../abi/src/text/ptbl/xp: pt_PT_InsertObject.o Only in ../abi/src/text/ptbl/xp: pt_PT_InsertSpan.o Only in ../abi/src/text/ptbl/xp: pt_PT_InsertStrux.o Only in ../abi/src/text/ptbl/xp: pt_PT_Listener.o Only in ../abi/src/text/ptbl/xp: pt_PT_Styles.o Only in ../abi/src/text/ptbl/xp: pt_PT_TestRoutines.o Only in ../abi/src/text/ptbl/xp: pt_PT_Undo.o Only in ../abi/src/text/ptbl/xp: pt_PieceTable.o Only in ../abi/src/text/ptbl/xp: pt_VarSet.o Only in ../abi/src/text/ptbl/xp: px_CH_TestRoutines.o Only in ../abi/src/text/ptbl/xp: px_CR_FmtMark.o Only in ../abi/src/text/ptbl/xp: px_CR_FmtMarkChange.o Only in ../abi/src/text/ptbl/xp: px_CR_Glob.o Only in ../abi/src/text/ptbl/xp: px_CR_Object.o Only in ../abi/src/text/ptbl/xp: px_CR_ObjectChange.o Only in ../abi/src/text/ptbl/xp: px_CR_Span.o Only in ../abi/src/text/ptbl/xp: px_CR_SpanChange.o Only in ../abi/src/text/ptbl/xp: px_CR_Strux.o Only in ../abi/src/text/ptbl/xp: px_CR_StruxChange.o Only in ../abi/src/text/ptbl/xp: px_CR_TestRoutines.o Only in ../abi/src/text/ptbl/xp: px_ChangeHistory.o Only in ../abi/src/text/ptbl/xp: px_ChangeRecord.o Only in ../abi/src/tools: GNUmakefile Only in ../abi/src/tools: GNUmakefile.in Only in ../abi/src/tools/cdump: GNUmakefile Only in ../abi/src/tools/cdump: GNUmakefile.in Only in ../abi/src/tools/cdump/qnx: GNUmakefile Only in ../abi/src/tools/cdump/qnx: GNUmakefile.in Only in ../abi/src/tools/cdump/xp: .deps Only in ../abi/src/tools/cdump/xp: GNUmakefile Only in ../abi/src/tools/cdump/xp: GNUmakefile.in Only in ../abi/src/tools/cdump/xp: cdump Only in ../abi/src/tools/cdump/xp: cdump.o Only in ../abi/src/tools/pfa2afm: GNUmakefile Only in ../abi/src/tools/pfa2afm: GNUmakefile.in Only in ../abi/src/tools/pfa2afm/unix: .deps Only in ../abi/src/tools/pfa2afm/unix: GNUmakefile Only in ../abi/src/tools/pfa2afm/unix: GNUmakefile.in Only in ../abi/src/tools/pfa2afm/unix: parsepfa.o Only in ../abi/src/tools/pfa2afm/unix: pfa2afm Only in ../abi/src/tools/pfa2afm/unix: pfa2afm.o Only in ../abi/src/tools/pfa2afm/unix: pfautil.o Only in ../abi/src/tools/pfa2afm/unix: psisolatin1names.o Only in ../abi/src/tools/pfa2afm/unix: splinesaveafm.o Only in ../abi/src/tools/pfa2afm/unix: splineutil.o Only in ../abi/src/tools/scripts: GNUmakefile Only in ../abi/src/tools/scripts: GNUmakefile.in Only in ../abi/src/tools/scripts/unix: GNUmakefile Only in ../abi/src/tools/scripts/unix: GNUmakefile.in Only in ../abi/src/tools/ttftool: GNUmakefile Only in ../abi/src/tools/ttftool: GNUmakefile.in Only in ../abi/src/tools/ttftool/unix: .deps Only in ../abi/src/tools/ttftool/unix: GNUmakefile Only in ../abi/src/tools/ttftool/unix: GNUmakefile.in Only in ../abi/src/tools/ttftool/unix: parse.o Only in ../abi/src/tools/ttftool/unix: ps.o Only in ../abi/src/tools/ttftool/unix: ttftool Only in ../abi/src/tools/ttftool/unix: ttftool.o Only in ../abi/src/tools/ttftool/unix: ttfutils.o Only in ../abi/src/wp: GNUmakefile Only in ../abi/src/wp: GNUmakefile.in Only in ../abi/src/wp/ap: GNUmakefile Only in ../abi/src/wp/ap: GNUmakefile.in Only in ../abi/src/wp/ap/cocoa: GNUmakefile Only in ../abi/src/wp/ap/cocoa: GNUmakefile.in Only in ../abi/src/wp/ap: libAp.a Only in ../abi/src/wp/ap/qnx: GNUmakefile Only in ../abi/src/wp/ap/qnx: GNUmakefile.in Only in ../abi/src/wp/ap/unix: .deps Only in ../abi/src/wp/ap/unix: GNUmakefile Only in ../abi/src/wp/ap/unix: GNUmakefile.in Only in ../abi/src/wp/ap/unix: abiwidget.o Only in ../abi/src/wp/ap/unix: ap_UnixApp.o Only in ../abi/src/wp/ap/unix: ap_UnixClipboard.o Only in ../abi/src/wp/ap/unix: ap_UnixDialogFactory.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Background.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Break.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Columns.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Field.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_FormatFootnotes.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_FormatTable.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Goto.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_HdrFtr.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_InsertBookmark.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_InsertHyperlink.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_InsertTable.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Insert_DateTime.glade ../abi/src/wp/ap/unix/ap_UnixDialog_Insert_DateTime.glade --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Insert_DateTime.glade 2003-06-01 00:18:33.000000000 +0100 +++ ../abi/src/wp/ap/unix/ap_UnixDialog_Insert_DateTime.glade 2004-09-02 12:27:32.000000000 +0100 @@ -10,10 +10,15 @@ True Insert Date and Time GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER_ON_PARENT True True False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST False @@ -35,6 +40,7 @@ gtk-cancel True GTK_RELIEF_NORMAL + True -6 @@ -48,6 +54,7 @@ _Insert True GTK_RELIEF_NORMAL + True 1 Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Insert_DateTime.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_ListRevisions.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Lists.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_MailMerge.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_MarkRevisions.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_MergeCells.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_MetaData.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_New.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Options.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_PageNumbers.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_PageSetup.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Paragraph.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Replace.cpp ../abi/src/wp/ap/unix/ap_UnixDialog_Replace.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Replace.cpp 2003-09-30 13:29:59.000000000 +0100 +++ ../abi/src/wp/ap/unix/ap_UnixDialog_Replace.cpp 2004-09-02 12:27:32.000000000 +0100 @@ -239,7 +239,11 @@ void AP_UnixDialog_Replace::event_MatchCaseToggled(void) { - setMatchCase(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_checkbuttonMatchCase))); + //ABL-PSION 16/08/2004 - PSIBUG# + bool caseSensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_checkbuttonMatchCase)); + setMatchCase(caseSensitive); + gtk_combo_set_case_sensitive(GTK_COMBO(m_comboFind), caseSensitive); + gtk_combo_set_case_sensitive(GTK_COMBO(m_comboReplace), caseSensitive); } void AP_UnixDialog_Replace::event_WholeWordToggled(void) diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Replace.glade ../abi/src/wp/ap/unix/ap_UnixDialog_Replace.glade --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Replace.glade 2003-05-26 22:59:08.000000000 +0100 +++ ../abi/src/wp/ap/unix/ap_UnixDialog_Replace.glade 2004-09-02 12:27:32.000000000 +0100 @@ -11,6 +11,11 @@ False True False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST True @@ -32,6 +37,7 @@ gtk-close True GTK_RELIEF_NORMAL + True -7 @@ -215,6 +221,7 @@ Match case True GTK_RELIEF_NORMAL + True False False True @@ -229,10 +236,10 @@ True - True Whole word True GTK_RELIEF_NORMAL + False False False True @@ -247,10 +254,10 @@ True - True Reverse find True GTK_RELIEF_NORMAL + False False False True @@ -279,10 +286,12 @@ True True + True True gtk-find True GTK_RELIEF_NORMAL + True @@ -294,6 +303,7 @@ gtk-find-and-replace True GTK_RELIEF_NORMAL + True @@ -303,6 +313,7 @@ True True GTK_RELIEF_NORMAL + True @@ -311,6 +322,10 @@ 0.5 0 0 + 0 + 0 + 0 + 0 Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Replace.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Spell.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp ../abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp 2003-12-29 21:55:28.000000000 +0000 +++ ../abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp 2004-09-12 18:09:10.000000000 +0100 @@ -20,6 +20,11 @@ // for gtkclist and gtklist #undef GTK_DISABLE_DEPRECATED +// Preview in modify style dialog does not work so remove it. +// It is fixed in latest (10/08/04) unstable AbiWord Code but can not be easily +// back ported. - ABL +//#define ABL_ENABLE_MODIFYSTYLE_PREVIEW + #include #include "ut_string.h" @@ -40,6 +45,8 @@ #include "pd_Style.h" #include "ut_string_class.h" +#define STR_COMPARE UT_stricmp + // define to 0 to popup dialogs on top of each other, 1 to hide them #define HIDE_MAIN_DIALOG 0 @@ -294,6 +301,10 @@ static_cast(m_wCharPreviewArea->allocation.width), static_cast(m_wCharPreviewArea->allocation.height)); +// connect the select_row signal to the clist +// g_signal_connect (G_OBJECT (m_wclistStyles), "select_row", + // G_CALLBACK (s_clist_clicked), reinterpret_cast(this)); + // Populate the window's data items _populateWindowData(); @@ -312,21 +323,63 @@ g_signal_connect (G_OBJECT (m_wclistStyles), "select_row", G_CALLBACK (s_clist_clicked), reinterpret_cast(this)); - // main loop for the dialog - while(true) - { - if(abiRunModalDialog(GTK_DIALOG(m_windowMain), false) == BUTTON_APPLY) + if(m_ModType != SMD_ALL) + { +#if HIDE_MAIN_DIALOG +// +// Hide the old window +// + gtk_widget_hide(m_windowMain); +#endif + switch(m_ModType) { - event_Apply(); - } - else + case SMD_PARAGRAPH: + ModifyParagraph(); + break; + case SMD_FONT: + ModifyFont(); + break; + case SMD_TABS: + ModifyTabs(); + break; + case SMD_NUMBERING: + ModifyLists(); + break; + case SMD_LANGUAGE: + ModifyLang(); + break; + default: + UT_ASSERT(m_ModType); + }; + +#if HIDE_MAIN_DIALOG +// +// Show the old window +// + // gtk_widget_show(m_windowMain); +#endif + applyModifiedStyleToDoc(); + getDoc()->updateDocForStyleChange(getCurrentStyle(),true); + getDoc()->signalListeners(PD_SIGNAL_UPDATE_LAYOUT); + event_Apply(); + } + else + { + // main loop for the dialog + while(true) { - event_Close(); + if(abiRunModalDialog(GTK_DIALOG(m_windowMain), false) == BUTTON_APPLY) + { + event_Apply(); + } + else + { + event_Close(); + } + break ; // exit the loop } - break ; // exit the loop } - DELETEP (m_pParaPreviewWidget); DELETEP (m_pCharPreviewWidget); @@ -668,7 +721,7 @@ { } -void AP_UnixDialog_Styles::_populateCList(void) const +void AP_UnixDialog_Styles::_populateCList(void)// const { const PD_Style * pStyle; const char * name = NULL; @@ -679,6 +732,19 @@ gtk_clist_freeze (GTK_CLIST (m_wclistStyles)); gtk_clist_clear (GTK_CLIST (m_wclistStyles)); + UT_uint32 CurStyleIndex = 1; + /*UT_uint32*/ int StyleIndex=0; + const XML_Char *pCurStyle; + PD_Style * pSelStyle = NULL; + UT_DEBUGMSG(("about to get current style\n")); + getView()->getStyle(&pCurStyle); +// { + // PD_Style * pSelStyle = NULL; + // UT_DEBUGMSG(("about to get style name\n")); + //getLDoc()->getStyle(pCurStyle, &pSelStyle); + //} +// const char * szStyle = getCurrentStyle(); + for (UT_uint32 i = 0; i < nStyles; i++) { const char * data[1]; @@ -697,11 +763,27 @@ (m_whichType == USER_STYLES && pStyle->isUserDefined())) { gtk_clist_append (GTK_CLIST(m_wclistStyles), const_cast(reinterpret_cast(&data[0]))); + //UT_DEBUGMSG(("about to compare style [%s]=?[%s]\n",szStyle, name)); + // if(pStyle == pSelStyle) + UT_DEBUGMSG(("about to compare style [%s]=?[%s]\n",pCurStyle, name)); + if(STR_COMPARE(pCurStyle, name)==0) + //if(STR_COMPARE(szStyle, name)==0) + { + CurStyleIndex = StyleIndex; + + m_whichRow = StyleIndex; + UT_DEBUGMSG(("Style Match !\n")); + } + StyleIndex++; } } - +//UT_DEBUGMSG(("added font widths to cache for font with hashkey '%s'\n", pFont->hashKey().c_str())); +UT_DEBUGMSG(("about to select style\n")); gtk_clist_thaw (GTK_CLIST (m_wclistStyles)); - gtk_clist_select_row (GTK_CLIST (m_wclistStyles), 0, 0); + gtk_clist_select_row (GTK_CLIST (m_wclistStyles), CurStyleIndex, 0); + gtk_clist_moveto (GTK_CLIST (m_wclistStyles), CurStyleIndex, 0, 0, 0); +// event_ClistClicked((int)StyleIndex, 0); +// updateCurrentStyle(); } void AP_UnixDialog_Styles::_populateWindowData(void) @@ -900,7 +982,7 @@ (GtkAttachOptions) (0), 0, 0); gtk_widget_set_size_request (styleTypeEntry, 158, -1); } - +#ifdef ABL_DISABLE_MODIFYSTYLE_PREVIEW previewFrame = gtk_frame_new (pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_ModifyPreview).utf8_str()); gtk_frame_set_shadow_type(GTK_FRAME(previewFrame), GTK_SHADOW_NONE); gtk_widget_show (previewFrame); @@ -911,7 +993,7 @@ gtk_widget_show (modifyDrawingArea); gtk_container_add (GTK_CONTAINER (previewFrame), modifyDrawingArea); gtk_widget_set_size_request (modifyDrawingArea, -1, 120); - +#endif GtkWidget * descriptionFrame = gtk_frame_new (pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_ModifyDescription).utf8_str()); gtk_frame_set_shadow_type(GTK_FRAME(descriptionFrame), GTK_SHADOW_NONE); gtk_widget_show (descriptionFrame); @@ -1261,6 +1343,7 @@ XAP_UnixApp * unixapp = static_cast (m_pApp); UT_ASSERT(unixapp); +#ifdef ABL_ENABLE_MODIFYSTYLE_PREVIEW DELETEP (m_pAbiPreviewWidget); m_pAbiPreviewWidget = new GR_UnixGraphics(m_wModifyDrawingArea->window, unixapp->getFontManager(), m_pApp); @@ -1271,7 +1354,8 @@ static_cast(m_wModifyDrawingArea->allocation.height)); _populateAbiPreview(isNew()); - +#endif + switch(abiRunModalDialog(GTK_DIALOG(m_wModifyDialog), false)) { case BUTTON_MODIFY_OK: @@ -1279,7 +1363,8 @@ default: event_Modify_Cancel(); break ; } - + + if(m_wModifyDialog && GTK_IS_WIDGET(m_wModifyDialog)) { // @@ -1304,6 +1389,7 @@ } gtk_widget_destroy(m_wModifyDialog); } + // // Have to delete this now since the destructor is not run till later // @@ -1358,6 +1444,14 @@ setIsNew(false); modifyRunModal(); + +#if HIDE_MAIN_DIALOG +// +// Reveal main window again +// + gtk_widget_show( m_windowMain); +#endif + if(m_answer == AP_Dialog_Styles::a_OK) { applyModifiedStyleToDoc(); @@ -1374,12 +1468,7 @@ // Restore the values in the main dialog // -#if HIDE_MAIN_DIALOG -// -// Reveal main window again -// - gtk_widget_show( m_windowMain); -#endif + } void AP_UnixDialog_Styles::setModifyDescription( const char * desc) diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Styles.h ../abi/src/wp/ap/unix/ap_UnixDialog_Styles.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/unix/ap_UnixDialog_Styles.h 2002-08-01 21:19:06.000000000 +0100 +++ ../abi/src/wp/ap/unix/ap_UnixDialog_Styles.h 2004-09-02 12:27:32.000000000 +0100 @@ -103,7 +103,7 @@ virtual GtkWidget * _constructWindow(void); GtkWidget * _constructWindowContents(GtkWidget * parent); void _populateWindowData(void); - void _populateCList(void) const; + void _populateCList(void);// const; void _storeWindowData(void) const; void _connectsignals(void) const; virtual const char * getCurrentStyle (void) const; @@ -183,10 +183,3 @@ }; #endif /* AP_UnixDialog_Styles_H */ - - - - - - - Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Styles.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_Tab.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_ToggleCase.o Only in ../abi/src/wp/ap/unix: ap_UnixDialog_WordCount.o Only in ../abi/src/wp/ap/unix: ap_UnixFrame.o Only in ../abi/src/wp/ap/unix: ap_UnixFrameImpl.o Only in ../abi/src/wp/ap/unix: ap_UnixLeftRuler.o Only in ../abi/src/wp/ap/unix: ap_UnixPrefs.o Only in ../abi/src/wp/ap/unix: ap_UnixStatusBar.o Only in ../abi/src/wp/ap/unix: ap_UnixToolbar_FontCombo.o Only in ../abi/src/wp/ap/unix: ap_UnixToolbar_SizeCombo.o Only in ../abi/src/wp/ap/unix: ap_UnixToolbar_StyleCombo.o Only in ../abi/src/wp/ap/unix: ap_UnixToolbar_ZoomCombo.o Only in ../abi/src/wp/ap/unix: ap_UnixTopRuler.o Only in ../abi/src/wp/ap/unix: ap_UnixViewListener.o Only in ../abi/src/wp/ap/unix: ap_Unix_TB_CFactory.o Only in ../abi/src/wp/ap/unix/gnome: GNUmakefile Only in ../abi/src/wp/ap/unix/gnome: GNUmakefile.in Only in ../abi/src/wp/ap/unix: libWpAp_unix.a Only in ../abi/src/wp/ap/xp: .deps Only in ../abi/src/wp/ap/xp: GNUmakefile Only in ../abi/src/wp/ap/xp: GNUmakefile.in Only in ../abi/src/wp/ap/xp: ap_App.o Only in ../abi/src/wp/ap/xp: ap_Args.o Only in ../abi/src/wp/ap/xp: ap_Convert.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Background.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Break.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Columns.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Field.o Only in ../abi/src/wp/ap/xp: ap_Dialog_FormatFootnotes.o Only in ../abi/src/wp/ap/xp: ap_Dialog_FormatTable.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Goto.o Only in ../abi/src/wp/ap/xp: ap_Dialog_HdrFtr.o Only in ../abi/src/wp/ap/xp: ap_Dialog_InsertBookmark.o Only in ../abi/src/wp/ap/xp: ap_Dialog_InsertHyperlink.o Only in ../abi/src/wp/ap/xp: ap_Dialog_InsertTable.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Insert_DateTime.o Only in ../abi/src/wp/ap/xp: ap_Dialog_ListRevisions.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Lists.o Only in ../abi/src/wp/ap/xp: ap_Dialog_MailMerge.o Only in ../abi/src/wp/ap/xp: ap_Dialog_MarkRevisions.o Only in ../abi/src/wp/ap/xp: ap_Dialog_MergeCells.o Only in ../abi/src/wp/ap/xp: ap_Dialog_New.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Options.o Only in ../abi/src/wp/ap/xp: ap_Dialog_PageNumbers.o Only in ../abi/src/wp/ap/xp: ap_Dialog_PageSetup.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Paragraph.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Replace.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Spell.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Dialog_Styles.cpp ../abi/src/wp/ap/xp/ap_Dialog_Styles.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Dialog_Styles.cpp 2004-06-03 09:13:01.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Dialog_Styles.cpp 2004-09-02 12:27:32.000000000 +0100 @@ -49,6 +49,7 @@ : XAP_Dialog_NonPersistent(pDlgFactory,id, "interface/dialogstyles") { + m_ModType = SMD_ALL; m_answer = a_OK; m_pParaPreview = NULL; m_pCharPreview = NULL; @@ -1228,6 +1229,7 @@ UT_ASSERT(m_pAbiPreview); } + /*! * This is the FV_View pointer for our mini-abi in the second pane preview. */ @@ -1698,3 +1700,8 @@ } } } + +void AP_Dialog_Styles::SetModifyType(SytleModType type) +{ + m_ModType = type; +} diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Dialog_Styles.h ../abi/src/wp/ap/xp/ap_Dialog_Styles.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Dialog_Styles.h 2004-06-03 09:13:01.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Dialog_Styles.h 2004-09-02 12:27:32.000000000 +0100 @@ -31,6 +31,8 @@ #include "xap_Preview.h" #include "ap_Preview_Paragraph.h" +typedef enum SytleModType {SMD_ALL, SMD_PARAGRAPH, SMD_FONT, SMD_TABS, SMD_NUMBERING, SMD_LANGUAGE}; + class AP_Dialog_Styles : public XAP_Dialog_NonPersistent { public: @@ -44,6 +46,7 @@ // wish that this could be protected void _tabCallback(const char *, const char *); + void SetModifyType(SytleModType); protected: void event_paraPreviewUpdated (const XML_Char * pageLeftMargin, @@ -78,7 +81,7 @@ void ModifyParagraph(void); void ModifyTabs(void); void ModifyLang(void); - + void updateCurrentStyle(void); bool createNewStyle(const XML_Char * szName); bool applyModifiedStyleToDoc(void); @@ -105,6 +108,7 @@ AP_Preview_Abi * m_pAbiPreview; UT_Vector m_vecAllProps; UT_Vector m_vecAllAttribs; + SytleModType m_ModType; private: XAP_Frame * m_pFrame; @@ -115,17 +119,7 @@ PT_DocPosition m_posAfter; UT_Vector m_vecCharProps; UT_String m_ListProps[8]; + }; #endif /* AP_Dialog_Styles_H */ - - - - - - - - - - - Only in ../abi/src/wp/ap/xp: ap_Dialog_Styles.o Only in ../abi/src/wp/ap/xp: ap_Dialog_Tab.o Only in ../abi/src/wp/ap/xp: ap_Dialog_ToggleCase.o Only in ../abi/src/wp/ap/xp: ap_Dialog_WordCount.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_EditMethods.cpp ../abi/src/wp/ap/xp/ap_EditMethods.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_EditMethods.cpp 2004-07-11 22:47:02.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_EditMethods.cpp 2004-09-02 12:27:32.000000000 +0100 @@ -162,7 +162,8 @@ static EV_EditMethod_Fn warpInsPtBOB; static EV_EditMethod_Fn warpInsPtEOB; static EV_EditMethod_Fn warpInsPtBOD; - static EV_EditMethod_Fn warpInsPtEOD; + static EV_EditMethod_Fn warpInsPtEOD;; + static EV_EditMethod_Fn warpInsPtPrevPage; static EV_EditMethod_Fn warpInsPtNextPage; static EV_EditMethod_Fn warpInsPtPrevScreen; @@ -408,6 +409,11 @@ static EV_EditMethod_Fn style; static EV_EditMethod_Fn dlgBackground; static EV_EditMethod_Fn dlgStyle; + static EV_EditMethod_Fn dlgStyleParagraph; + static EV_EditMethod_Fn dlgStyleFont; + static EV_EditMethod_Fn dlgStyleTabs; + static EV_EditMethod_Fn dlgStyleNumbering; + static EV_EditMethod_Fn dlgStyleLanguage; static EV_EditMethod_Fn dlgTabs; static EV_EditMethod_Fn formatFootnotes; static EV_EditMethod_Fn dlgToggleCase; @@ -732,6 +738,11 @@ EV_EditMethod(NF(dlgSpell), 0, ""), EV_EditMethod(NF(dlgSpellPrefs), 0, ""), EV_EditMethod(NF(dlgStyle), 0, ""), + EV_EditMethod(NF(dlgStyleFont), 0, ""), + EV_EditMethod(NF(dlgStyleLanguage), 0, ""), + EV_EditMethod(NF(dlgStyleNumbering), 0, ""), + EV_EditMethod(NF(dlgStyleParagraph), 0, ""), + EV_EditMethod(NF(dlgStyleTabs), 0, ""), EV_EditMethod(NF(dlgTabs), 0, ""), EV_EditMethod(NF(dlgToggleCase), 0, ""), EV_EditMethod(NF(dlgWordCount), 0, ""), @@ -3611,6 +3622,16 @@ { CHECK_FRAME; ABIWORD_VIEW; +// PSION-ABL AbiBug #7148 Backport. +// +// Finish handling current expose before doing the next movement +// + GR_Graphics * pG = pView->getGraphics(); + if(pG && pG->isExposePending()) + { + return true; + } +// PSION-ABL END. pView->warpInsPtNextPrevLine(false); return true; } @@ -3619,6 +3640,16 @@ { CHECK_FRAME; ABIWORD_VIEW; +// PSION-ABL AbiBug #7148 Backport. +// +// Finish handling current expose before doing the next movement +// + GR_Graphics * pG = pView->getGraphics(); + if(pG && pG->isExposePending()) + { + return true; + } +// PSION-ABL END. pView->warpInsPtNextPrevLine(true); return true; } @@ -9105,6 +9136,66 @@ return bOK; } +static bool s_doStylesModifyDlg(FV_View * pView, SytleModType type) +{ + XAP_Frame * pFrame = static_cast(pView->getParentData()); + UT_ASSERT(pFrame); + + pFrame->raise(); + + XAP_DialogFactory * pDialogFactory + = static_cast(pFrame->getDialogFactory()); + + AP_Dialog_Styles * pDialog + = static_cast(pDialogFactory->requestDialog(AP_DIALOG_ID_STYLES)); + UT_ASSERT(pDialog); + if (!pDialog) + return false; + if(pView->isHdrFtrEdit()) + { + pView->clearHdrFtrEdit(); + pView->warpInsPtToXY(0,0,false); + } + + pDialog->SetModifyType(type); + pDialog->runModal(pFrame); + +// AP_Dialog_Styles::tAnswer ans = pDialog->getAnswer(); + bool bOK = true; +// +// update the combo box with the new styles. +// + XAP_App * pApp = pFrame->getApp(); + UT_ASSERT(pApp); + // + // Get all clones of this frame and set styles combo box + // + UT_Vector vClones; + if(pFrame->getViewNumber() > 0) + { + pApp->getClones(&vClones,pFrame); + for (UT_uint32 i = 0; i < vClones.getItemCount(); i++) + { + XAP_Frame * f = static_cast(vClones.getNthItem(i)); + f->repopulateCombos(); + } + } + else + { + pFrame->repopulateCombos(); + } +// +// Now update all views on the document. Do this always to be safe. +// + { + PD_Document * pDoc = pView->getLayout()->getDocument(); + pDoc->signalListeners(PD_SIGNAL_UPDATE_LAYOUT); + } + + pDialogFactory->releaseDialog(pDialog); + return bOK; +} + Defun1(formatFootnotes) { CHECK_FRAME; @@ -9154,6 +9245,7 @@ #endif return true; } + Defun1(dlgStyle) { CHECK_FRAME; @@ -9164,6 +9256,56 @@ return s_doStylesDlg(pView); } +Defun1(dlgStyleParagraph) +{ + CHECK_FRAME; + XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); + UT_ASSERT(pFrame); + ABIWORD_VIEW; + + return s_doStylesModifyDlg(pView, SMD_PARAGRAPH); +} + +Defun1(dlgStyleFont) +{ + CHECK_FRAME; + XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); + UT_ASSERT(pFrame); + ABIWORD_VIEW; + + return s_doStylesModifyDlg(pView, SMD_FONT); +} + +Defun1(dlgStyleTabs) +{ + CHECK_FRAME; + XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); + UT_ASSERT(pFrame); + ABIWORD_VIEW; + + return s_doStylesModifyDlg(pView, SMD_TABS); +} + +Defun1(dlgStyleNumbering) +{ + CHECK_FRAME; + XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); + UT_ASSERT(pFrame); + ABIWORD_VIEW; + + return s_doStylesModifyDlg(pView, SMD_NUMBERING); +} + +Defun1(dlgStyleLanguage) +{ + CHECK_FRAME; + XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); + UT_ASSERT(pFrame); + ABIWORD_VIEW; + + return s_doStylesModifyDlg(pView, SMD_LANGUAGE); +} + Defun1(dlgTabs) { CHECK_FRAME; diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_EditMethods.h ../abi/src/wp/ap/xp/ap_EditMethods.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_EditMethods.h 2002-08-02 06:38:58.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_EditMethods.h 2004-09-02 12:27:32.000000000 +0100 @@ -22,6 +22,7 @@ #include "fv_View.h" + UT_Error fileOpen(XAP_Frame * pFrame, const char * pNewFile, IEFileType ieft); // defined in ap_editmethods.cpp Only in ../abi/src/wp/ap/xp: ap_EditMethods.o Only in ../abi/src/wp/ap/xp: ap_Frame.o Only in ../abi/src/wp/ap/xp: ap_FrameData.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadAbovedot.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadAcute.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadBreve.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadCaron.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadCedilla.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadCircumflex.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadDiaeresis.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadDoubleacute.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadGrave.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadMacron.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadOgonek.o Only in ../abi/src/wp/ap/xp: ap_LB_DeadTilde.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_LB_Default.cpp ../abi/src/wp/ap/xp/ap_LB_Default.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_LB_Default.cpp 2003-12-15 15:35:32.000000000 +0000 +++ ../abi/src/wp/ap/xp/ap_LB_Default.cpp 2004-09-12 16:10:17.000000000 +0100 @@ -245,7 +245,7 @@ { // {nvk, { none, _S, _C, _S_C, // _A, _A_S, _A_C, _A_C_S }}, - {EV_NVK_BACKSPACE, { "delLeft", "delLeft", "delBOW", "", + {EV_NVK_BACKSPACE, { "delLeft", "delRight", "delBOW", "", "", "", "", "" }}, {EV_NVK_SPACE, { "insertSpace", "insertSpace", "togglePlain", "insertNBSpace", "insertNBZWSpace", "insertZWJoiner", "", "" }}, @@ -275,34 +275,36 @@ "", "", "", "" }}, {EV_NVK_INSERT, { "toggleInsertMode", "paste", "copy", "", "", "", "", "" }}, - {EV_NVK_DELETE, { "delRight", "cut", "delEOW", "", - "", "", "", "" }}, -// {EV_NVK_HELP, { "", "", "", "", +// {EV_NVK_DELETE, { "delRight", "cut", "delEOW", "", // "", "", "", "" }}, - {EV_NVK_F1, { "helpContents", "", "", "", + {EV_NVK_DELETE, { "delRight", "delRight", "", "", + "", "", "", "" }}, + {EV_NVK_HELP, { "helpContents", "", "", "", "", "", "", "" }}, +// {EV_NVK_F1, { "helpContents", "", "", "", +// "", "", "", "" }}, // {EV_NVK_F2, { "", "", "", "", // "", "", "", "" }}, - {EV_NVK_F3, { "findAgain", "rotateCase", "", "", - "", "", "", "" }}, - {EV_NVK_F4, { "", "", "closeWindow", "", - "querySaveAndExit", "", "", "" }}, +// {EV_NVK_F3, { "findAgain", "rotateCase", "", "", +// "", "", "", "" }}, +// {EV_NVK_F4, { "", "", "closeWindow", "", +// "querySaveAndExit", "", "", "" }}, // {EV_NVK_F5, { "", "", "", "", // "", "", "", "" }}, // {EV_NVK_F6, { "", "", "", "", // "", "", "", "" }}, - {EV_NVK_F7, { "dlgSpell", "", "", "", - "", "", "", "" }}, +// {EV_NVK_F7, { "dlgSpell", "", "", "", +// "", "", "", "" }}, // {EV_NVK_F8, { "", "", "", "", // "", "", "", "" }}, // {EV_NVK_F9, { "", "", "", "", // "", "", "", "" }}, - {EV_NVK_F10, { "", "contextMenu", "", "", - "", "", "", "" }}, - {EV_NVK_F11, { "viewFullScreen", "", "", "", - "", "", "", "" }}, - {EV_NVK_F12, { "cycleInputMode", "", FN_TEST_FTR, "", - FN_TEST_DUMP, "", "", "" }}, +// {EV_NVK_F10, { "", "contextMenu", "", "", +// "", "", "", "" }}, +// {EV_NVK_F11, { "viewFullScreen", "", "", "", +// "", "", "", "" }}, +// {EV_NVK_F12, { "cycleInputMode", "", FN_TEST_FTR, "", +// FN_TEST_DUMP, "", "", "" }}, // {EV_NVK_F13, { // {EV_NVK_F14, { // {EV_NVK_F15, { @@ -381,16 +383,16 @@ {0x28, /* ( */ { "insertOpeningParenthesis","", "", "" }}, {0x29, /* ) */ { "insertClosingParenthesis","", "", "" }}, {0x2a, /* * */ { "insertData", "viewPara", "", "" }}, - {0x2b, /* + */ { "insertData", "", "", "" }}, + {0x2b, /* + */ { "insertData", "zoomIn", "", "" }}, {0x2c, /* , */ { "insertData", "", "", "" }}, - {0x2d, /* - */ { "insertData", "toggleSub", "zoomOut", "" }}, + {0x2d, /* - */ { "insertData", "zoomOut", "", "" }}, {0x2e, /* . */ { "insertData", "pasteSpecial", "", "" }}, {0x2f, /* / */ { "insertData", "", "", "" }}, {0x30, /* 0 */ { "insertData", "", DO_NOT_USE, "" }}, {0x31, /* 1 */ { "insertData", "singleSpace", DO_NOT_USE, "setStyleHeading1" }}, {0x32, /* 2 */ { "insertData", "doubleSpace", DO_NOT_USE, "setStyleHeading2" }}, {0x33, /* 3 */ { "insertData", "", DO_NOT_USE, "setStyleHeading3" }}, - {0x34, /* 4 */ { "insertData", "", DO_NOT_USE, "" }}, + {0x34, /* 4 */ { "insertData", "viewFullScreen", DO_NOT_USE, "" }}, {0x35, /* 5 */ { "insertData", "middleSpace", DO_NOT_USE, "" }}, {0x36, /* 6 */ { "insertData", "", DO_NOT_USE, "" }}, {0x37, /* 7 */ { "insertData", "", DO_NOT_USE, "" }}, @@ -399,36 +401,36 @@ {0x3a, /* : */ { "insertData", "", "", "" }}, {0x3b, /* ; */ { "insertData", "", "", "" }}, {0x3c, /* < */ { "insertData", "fontSizeIncrease", "", "insertRLM" }}, - {0x3d, /* = */ { "insertData", "toggleSuper", "zoomIn", "" }}, + {0x3d, /* = */ { "insertData", "toggleSuper", "", "" }}, {0x3e, /* > */ { "insertData", "fontSizeDecrease", "", "insertLRM" }}, {0x3f, /* ? */ { "insertData", "", "", "" }}, {0x40, /* @ */ { "insertData", "", "", "" }}, - {0x41, /* A */ { "insertData", "selectAll", DO_NOT_USE, "" }}, - {0x42, /* B */ { "insertData", "toggleBold", DO_NOT_USE, "" }}, - {0x43, /* C */ { "insertData", "copy", DO_NOT_USE, "" }}, + {0x41, /* A */ { "insertData", "", DO_NOT_USE, "" }}, + {0x42, /* B */ { "insertData", "", DO_NOT_USE, "" }}, + {0x43, /* C */ { "insertData", "", DO_NOT_USE, "" }}, {0x44, /* D */ { "insertData", "dlgFont", DO_NOT_USE, "" }}, - {0x45, /* E */ { "insertData", "alignCenter", DO_NOT_USE, "" }}, - {0x46, /* F */ { "insertData", "find", DO_NOT_USE, "" }}, - {0x47, /* G */ { "insertData", "go", DO_NOT_USE, "" }}, - {0x48, /* H */ { "insertData", "replace", DO_NOT_USE, "" }}, + {0x45, /* E */ { "insertData", "", DO_NOT_USE, "" }}, + {0x46, /* F */ { "insertData", "", DO_NOT_USE, "" }}, + {0x47, /* G */ { "insertData", "", DO_NOT_USE, "" }}, + {0x48, /* H */ { "insertData", "", DO_NOT_USE, "" }}, {0x49, /* I */ { "insertData", "toggleItalic", DO_NOT_USE, "" }}, {0x4a, /* J */ { "insertData", "alignJustify", DO_NOT_USE, "" }}, {0x4b, /* K */ { "insertData", "toggleStrike", DO_NOT_USE, "" }}, {0x4c, /* L */ { "insertData", "alignLeft", DO_NOT_USE, "" }}, - {0x4d, /* M */ { "insertData", "insSymbol", DO_NOT_USE, "" }}, - {0x4e, /* N */ { "insertData", "toolbarNew", DO_NOT_USE, "" }}, - {0x4f, /* O */ { "insertData", "fileOpen", DO_NOT_USE, "" }}, - {0x50, /* P */ { "insertData", "print", DO_NOT_USE, "" }}, - {0x51, /* Q */ { "insertData", "querySaveAndExit", DO_NOT_USE, "" }}, + {0x4d, /* M */ { "insertData", "", DO_NOT_USE, "" }}, + {0x4e, /* N */ { "insertData", "", DO_NOT_USE, "" }}, + {0x4f, /* O */ { "insertData", "", DO_NOT_USE, "" }}, + {0x50, /* P */ { "insertData", "", DO_NOT_USE, "" }}, + {0x51, /* Q */ { "insertData", "", DO_NOT_USE, "" }}, {0x52, /* R */ { "insertData", "alignRight", DO_NOT_USE, "" }}, - {0x53, /* S */ { "insertData", "fileSave", DO_NOT_USE, "" }}, + {0x53, /* S */ { "insertData", "fileSaveAs", DO_NOT_USE, "" }}, {0x54, /* T */ { "insertData", "toggleOline", DO_NOT_USE, "" }}, {0x55, /* U */ { "insertData", "toggleUline", DO_NOT_USE, "" }}, - {0x56, /* V */ { "insertData", "paste", DO_NOT_USE, "" }}, - {0x57, /* W */ { "insertData", "closeWindow", DO_NOT_USE, "" }}, - {0x58, /* X */ { "insertData", "cut", DO_NOT_USE, "" }}, - {0x59, /* Y */ { "insertData", "redo", DO_NOT_USE, "" }}, - {0x5a, /* Z */ { "insertData", "undo", DO_NOT_USE, "" }}, + {0x56, /* V */ { "insertData", "", DO_NOT_USE, "" }}, + {0x57, /* W */ { "insertData", "", DO_NOT_USE, "" }}, + {0x58, /* X */ { "insertData", "", DO_NOT_USE, "" }}, + {0x59, /* Y */ { "insertData", "", DO_NOT_USE, "" }}, + {0x5a, /* Z */ { "insertData", "", DO_NOT_USE, "" }}, {0x5b, /* [ */ { "insertOpeningParenthesis","editHeader", "", "" }}, {0x5c, /* \ */ { "insertData", "removeHeader", "", "" }}, {0x5d, /* ] */ { "insertClosingParenthesis","editFooter", "", "" }}, @@ -439,7 +441,7 @@ {0x62, /* b */ { "insertData", "toggleBold", DO_NOT_USE, "" }}, {0x63, /* c */ { "insertData", "copy", DO_NOT_USE, "" }}, {0x64, /* d */ { "insertData", "dlgFont", DO_NOT_USE, "" }}, - {0x65, /* e */ { "insertData", "alignCenter", DO_NOT_USE, "" }}, + {0x65, /* e */ { "insertData", "closeWindow", DO_NOT_USE, "" }}, {0x66, /* f */ { "insertData", "find", DO_NOT_USE, "" }}, {0x67, /* g */ { "insertData", "go", DO_NOT_USE, "" }}, {0x68, /* h */ { "insertData", "replace", DO_NOT_USE, "" }}, @@ -447,8 +449,8 @@ {0x6a, /* j */ { "insertData", "alignJustify", DO_NOT_USE, "" }}, {0x6b, /* k */ { "insertData", "toggleStrike", DO_NOT_USE, "" }}, {0x6c, /* l */ { "insertData", "alignLeft", DO_NOT_USE, "" }}, - {0x6d, /* m */ { "insertData", "insSymbol", DO_NOT_USE, "" }}, - {0x6e, /* n */ { "insertData", "toolbarNew", DO_NOT_USE, "" }}, + {0x6d, /* m */ { "insertData", "zoomOut", DO_NOT_USE, "" }}, + {0x6e, /* n */ { "insertData", "fileNew", DO_NOT_USE, "" }}, {0x6f, /* o */ { "insertData", "fileOpen", DO_NOT_USE, "" }}, {0x70, /* p */ { "insertData", "print", DO_NOT_USE, "" }}, {0x71, /* q */ { "insertData", "querySaveAndExit", DO_NOT_USE, "" }}, Only in ../abi/src/wp/ap/xp: ap_LB_Default.o Only in ../abi/src/wp/ap/xp: ap_LB_Emacs.o Only in ../abi/src/wp/ap/xp: ap_LB_EmacsCtrlX.o Only in ../abi/src/wp/ap/xp: ap_LB_viEdit.o Only in ../abi/src/wp/ap/xp: ap_LB_viEdit_c.o Only in ../abi/src/wp/ap/xp: ap_LB_viEdit_colon.o Only in ../abi/src/wp/ap/xp: ap_LB_viEdit_d.o Only in ../abi/src/wp/ap/xp: ap_LB_viEdit_r.o Only in ../abi/src/wp/ap/xp: ap_LB_viEdit_y.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_LB_viInput.cpp ../abi/src/wp/ap/xp/ap_LB_viInput.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_LB_viInput.cpp 2001-02-06 22:54:58.000000000 +0000 +++ ../abi/src/wp/ap/xp/ap_LB_viInput.cpp 2004-09-09 18:29:41.000000000 +0100 @@ -51,7 +51,7 @@ { // {nvk, { none, _S, _C, _S_C, // _A, _A_S, _A_C, _A_C_S }}, - {EV_NVK_BACKSPACE, { "delLeft", "delLeft", "delBOW", "", + {EV_NVK_BACKSPACE, { "delLeft", "delRight", "delBOW", "", "", "", "", "" }}, {EV_NVK_SPACE, { "insertSpace", "insertSpace", "togglePlain", "insertNBSpace", "", "", "", "" }}, @@ -81,7 +81,9 @@ "", "", "", "" }}, // {EV_NVK_INSERT, { "", "", "", "", // "", "", "", "" }}, - {EV_NVK_DELETE, { "delRight", "delRight", "delEOW", "", +// {EV_NVK_DELETE, { "delRight", "delRight", "delEOW", "", +// "", "", "", "" }}, + {EV_NVK_DELETE, { "delRight", "delRight", "", "", "", "", "", "" }}, // {EV_NVK_HELP, { "", "", "", "", // "", "", "", "" }}, Only in ../abi/src/wp/ap/xp: ap_LB_viInput.o Only in ../abi/src/wp/ap/xp: ap_LeftRuler.o Only in ../abi/src/wp/ap/xp: ap_LoadBindings.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_ActionSet.cpp ../abi/src/wp/ap/xp/ap_Menu_ActionSet.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_ActionSet.cpp 2004-06-08 15:54:54.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Menu_ActionSet.cpp 2004-09-02 12:27:33.000000000 +0100 @@ -94,6 +94,8 @@ _s(AP_MENU_ID_FILE_REVERT, 0,0,0,0, "fileRevert", ap_GetState_Changes, NULL); _s(AP_MENU_ID_FILE_EXIT, 0,0,0,0, "querySaveAndExit", NULL, NULL); _s(AP_MENU_ID_OPEN_TEMPLATE, 0,1,0,0, "openTemplate", NULL, NULL); + _s(AP_MENU_ID_FILE_MORE, 1,0,0,0, NULL, NULL, NULL); + _s(AP_MENU_ID_EDIT, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_EDIT_UNDO, 0,0,0,0, "undo", ap_GetState_Changes, NULL); @@ -123,19 +125,22 @@ _s(AP_MENU_ID_VIEW_TB_4, 0,0,1,0, "viewTB4", ap_GetState_View, ap_GetLabel_Toolbar); _s(AP_MENU_ID_VIEW_LOCK_TB_LAYOUT, 0,0,1,0, "lockToolbarLayout", ap_GetState_View, NULL); _s(AP_MENU_ID_VIEW_DEFAULT_TB_LAYOUT, 0,0,0,0, "defaultToolbarLayout", ap_GetState_View, NULL); - _s(AP_MENU_ID_VIEW_RULER, 0,0,1,0, "viewRuler", ap_GetState_View, NULL); - _s(AP_MENU_ID_VIEW_STATUSBAR, 0,0,1,0, "viewStatus", ap_GetState_View, NULL); - _s(AP_MENU_ID_VIEW_LOCKSTYLES, 0,0,1,0, "viewLockStyles", ap_GetState_View, NULL); - _s(AP_MENU_ID_VIEW_SHOWPARA, 0,0,1,0, "viewPara", ap_GetState_View, NULL); - _s(AP_MENU_ID_VIEW_FULLSCREEN, 0,0,1,0, "viewFullScreen", ap_GetState_View, NULL); - _s(AP_MENU_ID_VIEW_ZOOM_MENU, 1,0,0,0, NULL, NULL, NULL); - _s(AP_MENU_ID_VIEW_ZOOM, 0,1,0,0, "dlgZoom", NULL, NULL); - _s(AP_MENU_ID_VIEW_ZOOM_200, 0,0,0,1, "zoom200", ap_GetState_Zoom, NULL); - _s(AP_MENU_ID_VIEW_ZOOM_100, 0,0,0,1, "zoom100", ap_GetState_Zoom, NULL); - _s(AP_MENU_ID_VIEW_ZOOM_75, 0,0,0,1, "zoom75", ap_GetState_Zoom, NULL); - _s(AP_MENU_ID_VIEW_ZOOM_50, 0,0,0,1, "zoom50", ap_GetState_Zoom, NULL); - _s(AP_MENU_ID_VIEW_ZOOM_WHOLE, 0,0,0,1, "zoomWhole", ap_GetState_Zoom, NULL); - _s(AP_MENU_ID_VIEW_ZOOM_WIDTH, 0,0,0,1, "zoomWidth", ap_GetState_Zoom, NULL); + _s(AP_MENU_ID_VIEW_RULER, 0,0,1,0, "viewRuler", ap_GetState_View, NULL); + _s(AP_MENU_ID_VIEW_STATUSBAR, 0,0,1,0, "viewStatus", ap_GetState_View, NULL); + _s(AP_MENU_ID_VIEW_LOCKSTYLES, 0,0,1,0, "viewLockStyles", ap_GetState_View, NULL); + _s(AP_MENU_ID_VIEW_SHOWPARA, 0,0,1,0, "viewPara", ap_GetState_View, NULL); + _s(AP_MENU_ID_VIEW_FULLSCREEN, 0,0,1,0, "viewFullScreen", ap_GetState_View, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_MENU, 1,0,0,0, NULL, NULL, NULL); + _s(AP_MENU_ID_VIEW_ZOOM, 0,1,0,0, "dlgZoom", NULL, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_IN, 0,0,0,0, "zoomIn", NULL, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_OUT, 0,0,0,0, "zoomOut", NULL, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_200, 0,0,0,1, "zoom200", ap_GetState_Zoom, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_100, 0,0,0,1, "zoom100", ap_GetState_Zoom, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_75, 0,0,0,1, "zoom75", ap_GetState_Zoom, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_50, 0,0,0,1, "zoom50", ap_GetState_Zoom, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_WHOLE, 0,0,0,1, "zoomWhole", ap_GetState_Zoom, NULL); + _s(AP_MENU_ID_VIEW_ZOOM_WIDTH, 0,0,0,1, "zoomWidth", ap_GetState_Zoom, NULL); + _s(AP_MENU_ID_VIEW_MORE, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_INSERT, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_INSERT_BREAK, 0,1,0,0, "insBreak", ap_GetState_BreakOK, NULL); @@ -163,6 +168,7 @@ _s(AP_MENU_ID_INSERT_DIRECTIONMARKER, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_INSERT_DIRECTIONMARKER_LRM,0,0,0,0, "insertLRM", NULL, NULL); _s(AP_MENU_ID_INSERT_DIRECTIONMARKER_RLM,0,0,0,0, "insertRLM", NULL, NULL); + _s(AP_MENU_ID_INSERT_MORE, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_FORMAT, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_FMT, 1,0,0,0, NULL, NULL, NULL); @@ -177,8 +183,16 @@ _s(AP_MENU_ID_FMT_HDRFTR, 0,1,0,0, "dlgHdrFtr", NULL, NULL); _s(AP_MENU_ID_FMT_FOOTNOTES, 0,1,0,0, "formatFootnotes", NULL, NULL); _s(AP_MENU_ID_FMT_IMAGE, 0,1,0,0, "dlgFmtImage", NULL, NULL); - _s(AP_MENU_ID_FMT_STYLE_DEFINE, 0,1,0,0, "dlgStyle", NULL, NULL); - _s(AP_MENU_ID_FMT_STYLE, 1,0,0,0, NULL, NULL, NULL); + _s(AP_MENU_ID_FMT_STYLE_DEFINE, 0,1,0,0, "dlgStyle", NULL, NULL); + _s(AP_MENU_ID_FMT_STYLE, 1,0,0,0, NULL, NULL, NULL); +// PSION-ABL Aug04 TBCL _s(AP_MENU_ID_FMT_STYLE_MODIFY, 1,0,0,0, NULL, NULL, ap_GetLabel_StyleModify); + _s(AP_MENU_ID_FMT_STYLE_MODIFY, 1,0,0,0, NULL, NULL, NULL); + _s(AP_MENU_ID_FMT_STYLE_PARAGRAPH, 0,1,0,0, "dlgStyleParagraph", NULL, NULL); + _s(AP_MENU_ID_FMT_STYLE_FONT, 0,1,0,0, "dlgStyleFont", NULL, NULL); + _s(AP_MENU_ID_FMT_STYLE_TABS, 0,1,0,0, "dlgStyleTabs", NULL, NULL); + _s(AP_MENU_ID_FMT_STYLE_NUMBERING, 0,1,0,0, "dlgStyleNumbering", NULL, NULL); + _s(AP_MENU_ID_FMT_STYLE_LANGUAGE, 0,1,0,0, "dlgStyleLanguage", NULL, NULL); + _s(AP_MENU_ID_FMT_IMPORTSTYLES, 0,1,0,0, "importStyles", NULL, NULL); _s(AP_MENU_ID_FMT_TABS, 0,1,0,0, "dlgTabs", NULL, NULL); _s(AP_MENU_ID_FMT_BOLD, 0,0,1,0, "toggleBold", ap_GetState_CharFmt, NULL); @@ -196,6 +210,8 @@ _s(AP_MENU_ID_FMT_DIRECTION_DD_RTL,0,0,1,0, "toggleDomDirection", ap_GetState_BlockFmt, NULL); _s(AP_MENU_ID_FMT_DIRECTION_DO_LTR,0,0,1,0, "toggleDirOverrideLTR", ap_GetState_CharFmt, NULL); _s(AP_MENU_ID_FMT_DIRECTION_DO_RTL,0,0,1,0, "toggleDirOverrideRTL", ap_GetState_CharFmt, NULL); + + _s(AP_MENU_ID_FMT_MORE, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_ALIGN, 1,0,0,0, NULL, ap_GetState_StylesLocked, NULL); _s(AP_MENU_ID_ALIGN_LEFT, 0,0,0,1, "alignLeft", ap_GetState_BlockFmt, NULL); @@ -219,6 +235,8 @@ _s(AP_MENU_ID_TOOLS_REVISIONS_ACCEPT_REVISION, 0,0,0,0, "revisionAccept", ap_GetState_RevisionPresent,NULL); _s(AP_MENU_ID_TOOLS_REVISIONS_REJECT_REVISION, 0,0,0,0, "revisionReject", ap_GetState_RevisionPresent,NULL); + _s(AP_MENU_ID_TOOLS_MORE, 1,0,0,0, NULL, NULL, NULL); + _s(AP_MENU_ID_TABLE,1,0,0,0,NULL,NULL,NULL); _s(AP_MENU_ID_TABLE_INSERT,1,0,0,0, NULL, ap_GetState_Changes, NULL); _s(AP_MENU_ID_TABLE_INSERT_TABLE,0,1,0,0, "insertTable",ap_GetState_TableOK, NULL); @@ -283,6 +301,7 @@ _s(AP_MENU_ID_HELP_ABOUT_GNOMEOFFICE, 0,0,0,0, "helpAboutGnomeOffice", NULL, NULL); _s(AP_MENU_ID_HELP_CREDITS, 0,0,0,0, "helpCredits", NULL, NULL); _s(AP_MENU_ID_HELP_REPORT_BUG, 0,0,0,0, "helpReportBug", NULL, NULL); + _s(AP_MENU_ID_HELP_MORE, 1,0,0,0, NULL, NULL, NULL); _s(AP_MENU_ID_SPELL_SUGGEST_1, 0,0,0,0, "spellSuggest_1", ap_GetState_Suggest, ap_GetLabel_Suggest); _s(AP_MENU_ID_SPELL_SUGGEST_2, 0,0,0,0, "spellSuggest_2", ap_GetState_Suggest, ap_GetLabel_Suggest); Only in ../abi/src/wp/ap/xp: ap_Menu_ActionSet.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Functions.cpp ../abi/src/wp/ap/xp/ap_Menu_Functions.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Functions.cpp 2004-06-08 15:54:54.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Menu_Functions.cpp 2004-09-02 12:27:33.000000000 +0100 @@ -561,6 +561,35 @@ return NULL; } +Defun_EV_GetMenuItemComputedLabel_Fn(ap_GetLabel_StyleModify) +{ + // PSION-ABL UI Customisation Aug 2004. + // PSION-ABL Note: AbiWord does not yet update correctly in order to use this code correctly + // PSION-ABL However, this code works correctly. + // Compute the menu label for the 'Format > All '' paragraphs' item. + + XAP_App * pApp = XAP_App::getApp(); + UT_return_val_if_fail (pApp && pLabel, NULL); + XAP_Frame * frame = pApp->getLastFocussedFrame(); + + AV_View * pAV_View = frame->getCurrentView(); + UT_return_val_if_fail(pAV_View, NULL); + ABIWORD_VIEW; + UT_return_val_if_fail(pView, NULL); + UT_ASSERT(id == AP_MENU_ID_FMT_STYLE_MODIFY); + + const char * szFormat = pLabel->getMenuLabel(); + static char buf[128]; + + const XML_Char *pCurStyle; + pView->getStyle(&pCurStyle); + sprintf(buf,szFormat,pCurStyle); + + + return buf; +} + + /****************************************************************/ /****************************************************************/ diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Functions.h ../abi/src/wp/ap/xp/ap_Menu_Functions.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Functions.h 2004-06-08 15:54:54.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Menu_Functions.h 2004-09-02 12:27:33.000000000 +0100 @@ -70,5 +70,6 @@ Defun_EV_GetMenuItemComputedLabel_Fn(ap_GetLabel_Index); Defun_EV_GetMenuItemComputedLabel_Fn(ap_GetLabel_Suggest); Defun_EV_GetMenuItemComputedLabel_Fn(ap_GetLabel_Autotext); +Defun_EV_GetMenuItemComputedLabel_Fn(ap_GetLabel_StyleModify); #endif /* AP_MENU_FUNCTIONS_H */ Only in ../abi/src/wp/ap/xp: ap_Menu_Functions.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Id_List.h ../abi/src/wp/ap/xp/ap_Menu_Id_List.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Id_List.h 2003-12-15 10:01:50.000000000 +0000 +++ ../abi/src/wp/ap/xp/ap_Menu_Id_List.h 2004-09-02 12:27:33.000000000 +0100 @@ -65,6 +65,7 @@ menuitem(FILE_RECENT_9) menuitem(FILE_REVERT) menuitem(FILE_EXIT) +menuitem(FILE_MORE) menuitem(OPEN_TEMPLATE) @@ -98,9 +99,12 @@ menuitem(VIEW_SHOWPARA) menuitem(VIEW_LOCKSTYLES) menuitem(VIEW_HEADFOOT) // This has been removed. +menuitem(VIEW_MORE) menuitem(VIEW_ZOOM_MENU) menuitem(VIEW_ZOOM) +menuitem(VIEW_ZOOM_IN) +menuitem(VIEW_ZOOM_OUT) menuitem(VIEW_ZOOM_200) menuitem(VIEW_ZOOM_100) menuitem(VIEW_ZOOM_75) @@ -133,6 +137,7 @@ menuitem(INSERT_DIRECTIONMARKER) menuitem(INSERT_DIRECTIONMARKER_LRM) menuitem(INSERT_DIRECTIONMARKER_RLM) +menuitem(INSERT_MORE) menuitem(FORMAT) menuitem(FMT_FONT) @@ -149,6 +154,12 @@ menuitem(FMT_LANGUAGE) menuitem(FMT_IMAGE) menuitem(FMT_STYLE) +menuitem(FMT_STYLE_MODIFY) +menuitem(FMT_STYLE_PARAGRAPH) +menuitem(FMT_STYLE_FONT) +menuitem(FMT_STYLE_TABS) +menuitem(FMT_STYLE_NUMBERING) +menuitem(FMT_STYLE_LANGUAGE) menuitem(FMT_STYLE_DEFINE) menuitem(FMT_IMPORTSTYLES) @@ -166,6 +177,7 @@ menuitem(FMT_DIRECTION_DD_RTL) menuitem(FMT_DIRECTION_DO_LTR) menuitem(FMT_DIRECTION_DO_RTL) +menuitem(FMT_MORE) menuitem(TOOLS) menuitem(TOOLS_SPELLING) @@ -183,6 +195,7 @@ menuitem(TOOLS_REVISIONS_SET_VIEW_LEVEL) menuitem(TOOLS_REVISIONS_ACCEPT_REVISION) menuitem(TOOLS_REVISIONS_REJECT_REVISION) +menuitem(TOOLS_MORE) menuitem(CONTEXT_REVISIONS_ACCEPT_REVISION) menuitem(CONTEXT_REVISIONS_REJECT_REVISION) menuitem(ALIGN) @@ -254,6 +267,7 @@ menuitem(HELP_ABOUT_GNU) menuitem(HELP_ABOUT_GNOMEOFFICE) menuitem(HELP_REPORT_BUG) +menuitem(HELP_MORE) menuitem(SPELL_SUGGEST_1) // _suggest_1 thru _suggest_9 must be contiguous menuitem(SPELL_SUGGEST_2) @@ -321,5 +335,3 @@ menuitem(AUTOTEXT_EMAIL_6) /**** Add Menu Items here ****/ - - Only in ../abi/src/wp/ap/xp: ap_Menu_LabelSet.o Only in ../abi/src/wp/ap/xp: ap_Menu_Layouts.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h ../abi/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h 2003-12-15 10:01:51.000000000 +0000 +++ ../abi/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h 2004-09-12 16:23:17.000000000 +0100 @@ -25,18 +25,29 @@ ****************************************************************** *****************************************************************/ +/*#ifndef _ABL_LAYOUT_ +#define _ABL_LAYOUT_ +#endif*/ + + BeginLayout(Main,0) BeginSubMenu(AP_MENU_ID_FILE) - MenuItem(AP_MENU_ID_FILE_NEW) - MenuItem(AP_MENU_ID_FILE_OPEN) - MenuItem(AP_MENU_ID_FILE_SAVE) - MenuItem(AP_MENU_ID_FILE_SAVEAS) -// MenuItem(AP_MENU_ID_FILE_SAVE_TEMPLATE) - Separator() - MenuItem(AP_MENU_ID_FILE_IMPORT) - MenuItem(AP_MENU_ID_FILE_EXPORT) - MenuItem(AP_MENU_ID_FILE_REVERT) +#ifdef _ABL_LAYOUT_ + BeginSubMenu(AP_MENU_ID_WINDOW) + MenuItem(AP_MENU_ID_WINDOW_NEW) + Separator() + MenuItem(AP_MENU_ID_WINDOW_1) + MenuItem(AP_MENU_ID_WINDOW_2) + MenuItem(AP_MENU_ID_WINDOW_3) + MenuItem(AP_MENU_ID_WINDOW_4) + MenuItem(AP_MENU_ID_WINDOW_5) + MenuItem(AP_MENU_ID_WINDOW_6) + MenuItem(AP_MENU_ID_WINDOW_7) + MenuItem(AP_MENU_ID_WINDOW_8) + MenuItem(AP_MENU_ID_WINDOW_9) + MenuItem(AP_MENU_ID_WINDOW_MORE) + EndSubMenu() // WINDOW BeginSubMenu(AP_MENU_ID_FILE_RECENT) MenuItem(AP_MENU_ID_FILE_RECENT_1) @@ -48,17 +59,50 @@ MenuItem(AP_MENU_ID_FILE_RECENT_7) MenuItem(AP_MENU_ID_FILE_RECENT_8) MenuItem(AP_MENU_ID_FILE_RECENT_9) - EndSubMenu() + EndSubMenu() // RECENT +#endif + MenuItem(AP_MENU_ID_FILE_NEW) + MenuItem(AP_MENU_ID_FILE_OPEN) + // MenuItem(AP_MENU_ID_FILE_NEW) // Al: should be new from template + MenuItem(AP_MENU_ID_FILE_CLOSE) + Separator() + MenuItem(AP_MENU_ID_FILE_SAVE) + MenuItem(AP_MENU_ID_FILE_SAVEAS) +// MenuItem(AP_MENU_ID_FILE_SAVE_TEMPLATE) Separator() - MenuItem(AP_MENU_ID_FILE_PROPERTIES) MenuItem(AP_MENU_ID_FILE_PAGESETUP) #if defined(HAVE_GNOME) - MenuItem(AP_MENU_ID_FILE_PRINT_PREVIEW) +// MenuItem(AP_MENU_ID_FILE_PRINT_PREVIEW) #endif MenuItem(AP_MENU_ID_FILE_PRINT) Separator() - MenuItem(AP_MENU_ID_FILE_CLOSE) + BeginSubMenu(AP_MENU_ID_FILE_MORE) + MenuItem(AP_MENU_ID_FILE_IMPORT) + MenuItem(AP_MENU_ID_FILE_EXPORT) + MenuItem(AP_MENU_ID_FILE_REVERT) + MenuItem(AP_MENU_ID_FILE_PROPERTIES) + EndSubMenu() + + Separator() +#ifndef _ABL_LAYOUT_ + MenuItem(AP_MENU_ID_FILE_RECENT_1) + MenuItem(AP_MENU_ID_FILE_RECENT_2) + MenuItem(AP_MENU_ID_FILE_RECENT_3) + MenuItem(AP_MENU_ID_FILE_RECENT_4) + MenuItem(AP_MENU_ID_FILE_RECENT_5) + MenuItem(AP_MENU_ID_FILE_RECENT_6) + MenuItem(AP_MENU_ID_FILE_RECENT_7) + MenuItem(AP_MENU_ID_FILE_RECENT_8) + MenuItem(AP_MENU_ID_FILE_RECENT_9) +#endif + Separator() +// MenuItem(AP_MENU_ID_FILE_PROPERTIES) +// MenuItem(AP_MENU_ID_FILE_PAGESETUP) + +// MenuItem(AP_MENU_ID_FILE_PRINT) +// Separator() + //MenuItem(AP_MENU_ID_FILE_CLOSE) MenuItem(AP_MENU_ID_FILE_EXIT) EndSubMenu() @@ -71,7 +115,7 @@ MenuItem(AP_MENU_ID_EDIT_PASTE) MenuItem(AP_MENU_ID_EDIT_PASTE_SPECIAL) Separator() - MenuItem(AP_MENU_ID_EDIT_CLEAR) + // MenuItem(AP_MENU_ID_EDIT_CLEAR) MenuItem(AP_MENU_ID_EDIT_SELECTALL) Separator() MenuItem(AP_MENU_ID_EDIT_FIND) @@ -81,127 +125,60 @@ BeginSubMenu(AP_MENU_ID_VIEW) MenuItem(AP_MENU_ID_VIEW_NORMAL) - MenuItem(AP_MENU_ID_VIEW_WEB) MenuItem(AP_MENU_ID_VIEW_PRINT) - MenuItem(AP_MENU_ID_WEB_WEBPREVIEW) Separator() - + MenuItem(AP_MENU_ID_VIEW_ZOOM_IN) + MenuItem(AP_MENU_ID_VIEW_ZOOM_OUT) + BeginSubMenu(AP_MENU_ID_VIEW_ZOOM_MENU) + MenuItem(AP_MENU_ID_VIEW_ZOOM_WIDTH) + MenuItem(AP_MENU_ID_VIEW_ZOOM_WHOLE) + MenuItem(AP_MENU_ID_VIEW_ZOOM_200) + MenuItem(AP_MENU_ID_VIEW_ZOOM_100) + MenuItem(AP_MENU_ID_VIEW_ZOOM_75) + MenuItem(AP_MENU_ID_VIEW_ZOOM_50) + MenuItem(AP_MENU_ID_VIEW_ZOOM) + EndSubMenu() + MenuItem(AP_MENU_ID_VIEW_FULLSCREEN) + Separator() BeginSubMenu(AP_MENU_ID_VIEW_TOOLBARS) MenuItem(AP_MENU_ID_VIEW_TB_1) MenuItem(AP_MENU_ID_VIEW_TB_2) MenuItem(AP_MENU_ID_VIEW_TB_3) - MenuItem(AP_MENU_ID_VIEW_TB_4) + MenuItem(AP_MENU_ID_VIEW_TB_4) // Currently we only can change toolbars in UNIX builds #ifdef XP_UNIX_TARGET_GTK - Separator() +// Separator() MenuItem(AP_MENU_ID_VIEW_LOCK_TB_LAYOUT) MenuItem(AP_MENU_ID_VIEW_DEFAULT_TB_LAYOUT) #endif EndSubMenu() - - MenuItem(AP_MENU_ID_VIEW_RULER) - MenuItem(AP_MENU_ID_VIEW_STATUSBAR) - Separator() - MenuItem(AP_MENU_ID_VIEW_LOCKSTYLES) - MenuItem(AP_MENU_ID_VIEW_SHOWPARA) - Separator() - MenuItem(AP_MENU_ID_VIEW_FULLSCREEN) - - BeginSubMenu(AP_MENU_ID_VIEW_ZOOM_MENU) - MenuItem(AP_MENU_ID_VIEW_ZOOM) - MenuItem(AP_MENU_ID_VIEW_ZOOM_WIDTH) - MenuItem(AP_MENU_ID_VIEW_ZOOM_WHOLE) - MenuItem(AP_MENU_ID_VIEW_ZOOM_200) - MenuItem(AP_MENU_ID_VIEW_ZOOM_100) - MenuItem(AP_MENU_ID_VIEW_ZOOM_75) - MenuItem(AP_MENU_ID_VIEW_ZOOM_50) - EndSubMenu() - - EndSubMenu() +// Separator() +// MenuItem(AP_MENU_ID_VIEW_HEADFOOT) +// Separator() + BeginSubMenu(AP_MENU_ID_VIEW_MORE) + MenuItem(AP_MENU_ID_VIEW_WEB) + MenuItem(AP_MENU_ID_WEB_WEBPREVIEW) + Separator() + MenuItem(AP_MENU_ID_VIEW_RULER) + MenuItem(AP_MENU_ID_VIEW_STATUSBAR) + MenuItem(AP_MENU_ID_VIEW_LOCKSTYLES) + Separator() + MenuItem(AP_MENU_ID_VIEW_SHOWPARA) + EndSubMenu() // VIEW-MORE + EndSubMenu() // VIEW BeginSubMenu(AP_MENU_ID_INSERT) MenuItem(AP_MENU_ID_INSERT_BREAK) MenuItem(AP_MENU_ID_INSERT_PAGENO) MenuItem(AP_MENU_ID_INSERT_DATETIME) - MenuItem(AP_MENU_ID_INSERT_FIELD) - MenuItem(AP_MENU_ID_INSERT_MAILMERGE) MenuItem(AP_MENU_ID_INSERT_SYMBOL) - - /* the autotext submenus */ - - BeginSubMenu(AP_MENU_ID_INSERT_AUTOTEXT) - - BeginSubMenu(AP_MENU_ID_AUTOTEXT_ATTN) - MenuItem(AP_MENU_ID_AUTOTEXT_ATTN_1) - MenuItem(AP_MENU_ID_AUTOTEXT_ATTN_2) - EndSubMenu() - - BeginSubMenu(AP_MENU_ID_AUTOTEXT_CLOSING) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_1) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_2) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_3) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_4) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_5) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_6) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_7) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_8) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_9) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_10) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_11) - MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_12) - EndSubMenu() - - BeginSubMenu(AP_MENU_ID_AUTOTEXT_MAIL) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_1) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_2) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_3) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_4) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_5) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_6) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_7) - MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_8) - EndSubMenu() - - BeginSubMenu(AP_MENU_ID_AUTOTEXT_REFERENCE) - MenuItem(AP_MENU_ID_AUTOTEXT_REFERENCE_1) - MenuItem(AP_MENU_ID_AUTOTEXT_REFERENCE_2) - MenuItem(AP_MENU_ID_AUTOTEXT_REFERENCE_3) - EndSubMenu() - - BeginSubMenu(AP_MENU_ID_AUTOTEXT_SALUTATION) - MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_1) - MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_2) - MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_3) - MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_4) - EndSubMenu() - - BeginSubMenu(AP_MENU_ID_AUTOTEXT_EMAIL) - MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_1) - MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_2) - MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_3) - MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_4) - MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_5) - MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_6) - EndSubMenu() - - BeginSubMenu(AP_MENU_ID_AUTOTEXT_SUBJECT) - MenuItem(AP_MENU_ID_AUTOTEXT_SUBJECT_1) - EndSubMenu() - - EndSubMenu() - Separator() MenuItem(AP_MENU_ID_INSERT_INSERTHEADER) MenuItem(AP_MENU_ID_INSERT_INSERTFOOTER) - MenuItem(AP_MENU_ID_INSERT_FILE) - MenuItem(AP_MENU_ID_INSERT_BOOKMARK) - MenuItem(AP_MENU_ID_INSERT_HYPERLINK) MenuItem(AP_MENU_ID_INSERT_FOOTNOTE) - MenuItem(AP_MENU_ID_INSERT_ENDNOTE) - -#ifdef HAVE_GNOME Separator() - + +#ifdef HAVE_GNOME BeginSubMenu(AP_MENU_ID_INSERT_PICTURE) MenuItem(AP_MENU_ID_INSERT_CLIPART) MenuItem(AP_MENU_ID_INSERT_GRAPHIC) @@ -209,37 +186,118 @@ #else MenuItem(AP_MENU_ID_INSERT_PICTURE) #endif - BeginSubMenu(AP_MENU_ID_INSERT_DIRECTIONMARKER) - MenuItem(AP_MENU_ID_INSERT_DIRECTIONMARKER_LRM) - MenuItem(AP_MENU_ID_INSERT_DIRECTIONMARKER_RLM) - EndSubMenu() + MenuItem(AP_MENU_ID_INSERT_FILE) + MenuItem(AP_MENU_ID_INSERT_BOOKMARK) + MenuItem(AP_MENU_ID_INSERT_HYPERLINK) + Separator() + BeginSubMenu(AP_MENU_ID_INSERT_MORE) + /* the autotext submenus */ + BeginSubMenu(AP_MENU_ID_INSERT_AUTOTEXT) + BeginSubMenu(AP_MENU_ID_AUTOTEXT_ATTN) + MenuItem(AP_MENU_ID_AUTOTEXT_ATTN_1) + MenuItem(AP_MENU_ID_AUTOTEXT_ATTN_2) + EndSubMenu() + + BeginSubMenu(AP_MENU_ID_AUTOTEXT_CLOSING) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_1) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_2) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_3) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_4) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_5) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_6) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_7) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_8) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_9) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_10) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_11) + MenuItem(AP_MENU_ID_AUTOTEXT_CLOSING_12) + EndSubMenu() + + BeginSubMenu(AP_MENU_ID_AUTOTEXT_MAIL) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_1) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_2) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_3) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_4) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_5) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_6) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_7) + MenuItem(AP_MENU_ID_AUTOTEXT_MAIL_8) + EndSubMenu() + + BeginSubMenu(AP_MENU_ID_AUTOTEXT_REFERENCE) + MenuItem(AP_MENU_ID_AUTOTEXT_REFERENCE_1) + MenuItem(AP_MENU_ID_AUTOTEXT_REFERENCE_2) + MenuItem(AP_MENU_ID_AUTOTEXT_REFERENCE_3) + EndSubMenu() + + BeginSubMenu(AP_MENU_ID_AUTOTEXT_SALUTATION) + MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_1) + MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_2) + MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_3) + MenuItem(AP_MENU_ID_AUTOTEXT_SALUTATION_4) + EndSubMenu() + + BeginSubMenu(AP_MENU_ID_AUTOTEXT_EMAIL) + MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_1) + MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_2) + MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_3) + MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_4) + MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_5) + MenuItem(AP_MENU_ID_AUTOTEXT_EMAIL_6) + EndSubMenu() + + BeginSubMenu(AP_MENU_ID_AUTOTEXT_SUBJECT) + MenuItem(AP_MENU_ID_AUTOTEXT_SUBJECT_1) + EndSubMenu() + EndSubMenu() // AUTOTEXT + MenuItem(AP_MENU_ID_INSERT_FIELD) + MenuItem(AP_MENU_ID_INSERT_MAILMERGE) + + //Separator() + MenuItem(AP_MENU_ID_INSERT_ENDNOTE) + + + BeginSubMenu(AP_MENU_ID_INSERT_DIRECTIONMARKER) + MenuItem(AP_MENU_ID_INSERT_DIRECTIONMARKER_LRM) + MenuItem(AP_MENU_ID_INSERT_DIRECTIONMARKER_RLM) + EndSubMenu() + EndSubMenu() // MORE EndSubMenu() BeginSubMenu(AP_MENU_ID_FORMAT) - MenuItem(AP_MENU_ID_FMT_FONT) - MenuItem(AP_MENU_ID_FMT_PARAGRAPH) - MenuItem(AP_MENU_ID_FMT_BULLETS) - MenuItem(AP_MENU_ID_FMT_DOCUMENT) + MenuItem(AP_MENU_ID_FMT_FONT) + MenuItem(AP_MENU_ID_FMT_PARAGRAPH) + MenuItem(AP_MENU_ID_FMT_BULLETS) #if 0 // someone code and turn this back on - MenuItem(AP_MENU_ID_FMT_BORDERS) + MenuItem(AP_MENU_ID_FMT_BORDERS) #endif - Separator() - MenuItem(AP_MENU_ID_FMT_COLUMNS) - MenuItem(AP_MENU_ID_FMT_TABS) + MenuItem(AP_MENU_ID_FMT_TABS) + Separator() + + BeginSubMenu(AP_MENU_ID_FMT_STYLE_MODIFY) + MenuItem(AP_MENU_ID_FMT_STYLE_PARAGRAPH) + MenuItem(AP_MENU_ID_FMT_STYLE_FONT) + MenuItem(AP_MENU_ID_FMT_STYLE_TABS) + MenuItem(AP_MENU_ID_FMT_STYLE_NUMBERING) + MenuItem(AP_MENU_ID_FMT_STYLE_LANGUAGE) + EndSubMenu() + + Separator() + MenuItem(AP_MENU_ID_FMT_COLUMNS) + Separator() + MenuItem(AP_MENU_ID_FMT_TOGGLECASE) + BeginSubMenu(AP_MENU_ID_FMT_STYLE) + MenuItem(AP_MENU_ID_FMT_STYLE_DEFINE) + MenuItem(AP_MENU_ID_FMT_IMPORTSTYLES) + EndSubMenu() + MenuItem(AP_MENU_ID_FMT_BACKGROUND) + Separator() + + BeginSubMenu(AP_MENU_ID_FMT_MORE) MenuItem(AP_MENU_ID_FMT_HDRFTR) MenuItem(AP_MENU_ID_FMT_FOOTNOTES) - Separator() - MenuItem(AP_MENU_ID_FMT_TOGGLECASE) - Separator() - - BeginSubMenu(AP_MENU_ID_ALIGN) - MenuItem(AP_MENU_ID_ALIGN_LEFT) - MenuItem(AP_MENU_ID_ALIGN_CENTER) - MenuItem(AP_MENU_ID_ALIGN_RIGHT) - MenuItem(AP_MENU_ID_ALIGN_JUSTIFY) - EndSubMenu() - + /* BeginSubMenu(AP_MENU_ID_FMT) MenuItem(AP_MENU_ID_FMT_BOLD) MenuItem(AP_MENU_ID_FMT_ITALIC) @@ -251,21 +309,35 @@ MenuItem(AP_MENU_ID_FMT_SUPERSCRIPT) MenuItem(AP_MENU_ID_FMT_SUBSCRIPT) EndSubMenu() + MenuItem(AP_MENU_ID_FMT_DOCUMENT) + + + Separator() +// + + Separator() + + Separator() - BeginSubMenu(AP_MENU_ID_FMT_STYLE) - MenuItem(AP_MENU_ID_FMT_STYLE_DEFINE) - MenuItem(AP_MENU_ID_FMT_IMPORTSTYLES) + BeginSubMenu(AP_MENU_ID_ALIGN) + MenuItem(AP_MENU_ID_ALIGN_LEFT) + MenuItem(AP_MENU_ID_ALIGN_CENTER) + MenuItem(AP_MENU_ID_ALIGN_RIGHT) + MenuItem(AP_MENU_ID_ALIGN_JUSTIFY) EndSubMenu() + Separator() MenuItem(AP_MENU_ID_EDIT_REMOVEHEADER) MenuItem(AP_MENU_ID_EDIT_REMOVEFOOTER) - MenuItem(AP_MENU_ID_FMT_BACKGROUND) + BeginSubMenu(AP_MENU_ID_FMT_DIRECTION) MenuItem(AP_MENU_ID_FMT_DIRECTION_DD_RTL) MenuItem(AP_MENU_ID_FMT_DIRECTION_DO_LTR) MenuItem(AP_MENU_ID_FMT_DIRECTION_DO_RTL) EndSubMenu() + */ + EndSubMenu() // More EndSubMenu() BeginSubMenu(AP_MENU_ID_TOOLS) @@ -273,10 +345,10 @@ BeginSubMenu(AP_MENU_ID_TOOLS_SPELLING) MenuItem(AP_MENU_ID_TOOLS_SPELL) MenuItem(AP_MENU_ID_TOOLS_AUTOSPELL) + MenuItem(AP_MENU_ID_FMT_LANGUAGE) MenuItem(AP_MENU_ID_TOOLS_SPELLPREFS) EndSubMenu() - MenuItem(AP_MENU_ID_FMT_LANGUAGE) MenuItem(AP_MENU_ID_TOOLS_WORDCOUNT) BeginSubMenu(AP_MENU_ID_TOOLS_REVISIONS) @@ -285,12 +357,13 @@ MenuItem(AP_MENU_ID_TOOLS_REVISIONS_REJECT_REVISION) MenuItem(AP_MENU_ID_TOOLS_REVISIONS_SET_VIEW_LEVEL) EndSubMenu() - - MenuItem(AP_MENU_ID_TOOLS_PLUGINS) - MenuItem(AP_MENU_ID_TOOLS_SCRIPTS) - MenuItem(AP_MENU_ID_TOOLS_MAILMERGE) - Separator() MenuItem(AP_MENU_ID_TOOLS_OPTIONS) + BeginSubMenu(AP_MENU_ID_TOOLS_MORE) + MenuItem(AP_MENU_ID_TOOLS_PLUGINS) + MenuItem(AP_MENU_ID_TOOLS_SCRIPTS) + MenuItem(AP_MENU_ID_TOOLS_MAILMERGE) + EndSubMenu() + //Separator() EndSubMenu() BeginSubMenu(AP_MENU_ID_TABLE) @@ -343,25 +416,35 @@ #endif EndSubMenu() - BeginSubMenu(AP_MENU_ID_WINDOW) - MenuItem(AP_MENU_ID_WINDOW_NEW) - Separator() - MenuItem(AP_MENU_ID_WINDOW_1) - MenuItem(AP_MENU_ID_WINDOW_2) - MenuItem(AP_MENU_ID_WINDOW_3) - MenuItem(AP_MENU_ID_WINDOW_4) - MenuItem(AP_MENU_ID_WINDOW_5) - MenuItem(AP_MENU_ID_WINDOW_6) - MenuItem(AP_MENU_ID_WINDOW_7) - MenuItem(AP_MENU_ID_WINDOW_8) - MenuItem(AP_MENU_ID_WINDOW_9) - MenuItem(AP_MENU_ID_WINDOW_MORE) - EndSubMenu() +#ifndef _ABL_LAYOUT_ + BeginSubMenu(AP_MENU_ID_WINDOW) + // MenuItem(AP_MENU_ID_WINDOW_NEW) + // Separator() + MenuItem(AP_MENU_ID_WINDOW_1) + MenuItem(AP_MENU_ID_WINDOW_2) + MenuItem(AP_MENU_ID_WINDOW_3) + MenuItem(AP_MENU_ID_WINDOW_4) + MenuItem(AP_MENU_ID_WINDOW_5) + MenuItem(AP_MENU_ID_WINDOW_6) + MenuItem(AP_MENU_ID_WINDOW_7) + MenuItem(AP_MENU_ID_WINDOW_8) + MenuItem(AP_MENU_ID_WINDOW_9) + MenuItem(AP_MENU_ID_WINDOW_MORE) + EndSubMenu() // WINDOW +#endif + BeginSubMenu(AP_MENU_ID_HELP) MenuItem(AP_MENU_ID_HELP_CONTENTS) MenuItem(AP_MENU_ID_HELP_INDEX) - MenuItem(AP_MENU_ID_HELP_SEARCH) + Separator() + MenuItem(AP_MENU_ID_HELP_ABOUT) + Separator() + BeginSubMenu(AP_MENU_ID_HELP_MORE) + MenuItem(AP_MENU_ID_HELP_ABOUTOS) + MenuItem(AP_MENU_ID_HELP_CREDITS) + EndSubMenu() + /*MenuItem(AP_MENU_ID_HELP_SEARCH) MenuItem(AP_MENU_ID_HELP_CHECKVER) MenuItem(AP_MENU_ID_HELP_REPORT_BUG) Separator() @@ -374,8 +457,8 @@ #ifndef HAVE_GNOME MenuItem(AP_MENU_ID_HELP_CREDITS) Separator() -#endif - MenuItem(AP_MENU_ID_HELP_ABOUT) +#endif*/ + EndSubMenu() EndLayout() Only in ../abi/src/wp/ap/xp: ap_Prefs.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h ../abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h 2003-07-24 23:14:48.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h 2004-09-02 12:27:33.000000000 +0100 @@ -68,7 +68,7 @@ #define AP_PREF_DEFAULT_OptionsTabNumber "0" /* options dialog */ #define AP_PREF_KEY_RulerUnits "RulerUnits" /* value in UT_dimensionName() */ -#define AP_PREF_DEFAULT_RulerUnits "in" +#define AP_PREF_DEFAULT_RulerUnits "cm" //"in" #define AP_PREF_KEY_RulerVisible "RulerVisible" /* are the rulers visible? {0,1} */ #define AP_PREF_DEFAULT_RulerVisible "1" @@ -90,7 +90,7 @@ #define AP_PREF_KEY_StringSet "StringSet" /* name of dialog/msgbox strings */ -#define AP_PREF_DEFAULT_StringSet "en-US" +#define AP_PREF_DEFAULT_StringSet "en-GB" //"en-US" #define AP_PREF_KEY_KeyBindings "KeyBindings" #define AP_PREF_DEFAULT_KeyBindings "default" /* value in ap_LoadBindings.cpp */ @@ -118,7 +118,7 @@ #define AP_PREF_DEFAULT_StringSetDirectory "strings" /* if relative, use prefix "getAbiSuiteAppDir()" */ #define AP_PREF_KEY_LayoutMode "layoutMode" -#define AP_PREF_DEFAULT_LayoutMode "1" /* 1=print, 2=normal, 3=web */ +#define AP_PREF_DEFAULT_LayoutMode "2"//"1" /* 1=print, 2=normal, 3=web */ #define AP_PREF_KEY_AlwaysPromptEncoding "AlwaysPromptEncoding" /* if true, always show encoding dialog when importing/exporting text */ #define AP_PREF_DEFAULT_AlwaysPromptEncoding "0" @@ -131,10 +131,10 @@ #endif #define AP_PREF_KEY_ShowSplash "ShowSplash" -#define AP_PREF_DEFAULT_ShowSplash "1" +#define AP_PREF_DEFAULT_ShowSplash "0"//"1" #define AP_PREF_KEY_DefaultSaveFormat "DefaultSaveFormat" -#define AP_PREF_DEFAULT_DefaultSaveFormat ".abw" +#define AP_PREF_DEFAULT_DefaultSaveFormat ".doc"//".abw" #define AP_PREF_KEY_CloseOnLastDoc "CloseOnLastDoc" #define AP_PREF_DEFAULT_CloseOnLastDoc "0" Only in ../abi/src/wp/ap/xp: ap_Preview_Abi.o Only in ../abi/src/wp/ap/xp: ap_Preview_Paragraph.o Only in ../abi/src/wp/ap/xp: ap_Ruler.o Only in ../abi/src/wp/ap/xp: ap_StatusBar.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_String_Id.h ../abi/src/wp/ap/xp/ap_String_Id.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_String_Id.h 2004-04-12 10:51:17.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_String_Id.h 2004-09-12 17:06:37.000000000 +0100 @@ -187,8 +187,8 @@ dcl(DLG_Styles_LBL_InUse, "In Use") dcl(DLG_Styles_LBL_All, "All") dcl(DLG_Styles_LBL_UserDefined, "User-defined styles") -dcl(DLG_Styles_LBL_TxtMsg, "What Hath God Wrought") -dcl(DLG_Styles_ModifyTitle, "Modify Styles") +dcl(DLG_Styles_LBL_TxtMsg, "Lorem ipsum dolor sit amet, consectetaur adipisicing...")//What Hath God Wrought") +dcl(DLG_Styles_ModifyTitle, "Modify Style") dcl(DLG_Styles_ModifyName, "Style Name:") dcl(DLG_Styles_ModifyBasedOn, "Based On:") dcl(DLG_Styles_ModifyFollowing, "Style for following paragraph") @@ -750,14 +750,14 @@ dcl(MENU_LABEL_FILE_SAVEAS,"Save &As") dcl(MENU_LABEL_FILE_SAVE_TEMPLATE, "Save &Template") dcl(MENU_LABEL_FILE_SAVEIMAGE,"&Save Image As") -dcl(MENU_LABEL_FILE_IMPORT,"Op&en Copy") -dcl(MENU_LABEL_FILE_EXPORT,"Sav&e Copy") +dcl(MENU_LABEL_FILE_IMPORT,"&Import") +dcl(MENU_LABEL_FILE_EXPORT,"&Export") dcl(MENU_LABEL_FILE_PROPERTIES, "P&roperties") dcl(MENU_LABEL_FILE_PAGESETUP,"Page Set&up") dcl(MENU_LABEL_FILE_PRINT,"&Print") dcl(MENU_LABEL_FILE_PRINT_DIRECTLY,"Print &directly") dcl(MENU_LABEL_FILE_PRINT_PREVIEW,"Print P&review") -dcl(MENU_LABEL_FILE_RECENT, "Recent &Files") +dcl(MENU_LABEL_FILE_RECENT, "&Recently Opened") dcl(MENU_LABEL_FILE_RECENT_1,"&1 %s") dcl(MENU_LABEL_FILE_RECENT_2,"&2 %s") dcl(MENU_LABEL_FILE_RECENT_3,"&3 %s") @@ -768,7 +768,8 @@ dcl(MENU_LABEL_FILE_RECENT_8,"&8 %s") dcl(MENU_LABEL_FILE_RECENT_9,"&9 %s") dcl(MENU_LABEL_FILE_REVERT,"Re&vert") -dcl(MENU_LABEL_FILE_EXIT,"&Quit") +dcl(MENU_LABEL_FILE_EXIT,"&Exit") +dcl(MENU_LABEL_FILE_MORE,"&More") dcl(MENU_LABEL_EDIT,"&Edit") dcl(MENU_LABEL_EDIT_UNDO,"&Undo") dcl(MENU_LABEL_EDIT_REDO,"&Redo") @@ -781,8 +782,8 @@ dcl(MENU_LABEL_EDIT_FIND,"&Find") dcl(MENU_LABEL_EDIT_REPLACE,"R&eplace") dcl(MENU_LABEL_EDIT_GOTO,"&Go To") -dcl(MENU_LABEL_INSERT_INSERTHEADER,"Insert Header") -dcl(MENU_LABEL_INSERT_INSERTFOOTER,"Insert Footer") +dcl(MENU_LABEL_INSERT_INSERTHEADER,"Header") +dcl(MENU_LABEL_INSERT_INSERTFOOTER,"Footer") dcl(MENU_LABEL_EDIT_EDITHEADER,"Edit Header") dcl(MENU_LABEL_EDIT_EDITFOOTER,"Edit Footer") dcl(MENU_LABEL_EDIT_REMOVEHEADER,"Remove Header") @@ -790,7 +791,7 @@ dcl(MENU_LABEL_VIEW,"&View") dcl(MENU_LABEL_VIEW_NORMAL,"&Normal Layout") dcl(MENU_LABEL_VIEW_WEB,"&Web Layout") -dcl(MENU_LABEL_VIEW_PRINT,"&Print Layout") +dcl(MENU_LABEL_VIEW_PRINT,"&Page Layout") dcl(MENU_LABEL_VIEW_TOOLBARS,"&Toolbars") dcl(MENU_LABEL_VIEW_TB_1,"&1 %s") dcl(MENU_LABEL_VIEW_TB_2,"&2 %s") @@ -805,20 +806,23 @@ dcl(MENU_LABEL_VIEW_HEADFOOT,"&Header and Footer") dcl(MENU_LABEL_VIEW_FULLSCREEN,"F&ull Screen") dcl(MENU_LABEL_VIEW_ZOOM_MENU,"&Zoom") -dcl(MENU_LABEL_VIEW_ZOOM,"&Zoom") +dcl(MENU_LABEL_VIEW_ZOOM,"&Zoom to") +dcl(MENU_LABEL_VIEW_ZOOM_IN,"Zoom &In") +dcl(MENU_LABEL_VIEW_ZOOM_OUT,"Zoom &Out") dcl(MENU_LABEL_VIEW_ZOOM_200,"Zoom to &200%") dcl(MENU_LABEL_VIEW_ZOOM_100,"Zoom to &100%") dcl(MENU_LABEL_VIEW_ZOOM_75,"Zoom to &75%") dcl(MENU_LABEL_VIEW_ZOOM_50,"Zoom to &50%") dcl(MENU_LABEL_VIEW_ZOOM_WIDTH,"&Page Width") dcl(MENU_LABEL_VIEW_ZOOM_WHOLE,"&Whole Page") +dcl(MENU_LABEL_VIEW_MORE,"&More") dcl(MENU_LABEL_INSERT,"&Insert") dcl(MENU_LABEL_INSERT_BREAK,"&Break") dcl(MENU_LABEL_INSERT_PAGENO,"Page N&umbers") dcl(MENU_LABEL_INSERT_DATETIME,"Date and &Time") dcl(MENU_LABEL_INSERT_MAILMERGE, "&Mail Merge Field") dcl(MENU_LABEL_INSERT_FIELD,"&Field") -dcl(MENU_LABEL_INSERT_FILE,"&Insert File") +dcl(MENU_LABEL_INSERT_FILE,"&File") dcl(MENU_LABEL_INSERT_SYMBOL,"Sy&mbol") dcl(MENU_LABEL_INSERT_ENDNOTE,"&Endnote") dcl(MENU_LABEL_INSERT_FOOTNOTE,"Foot¬e") @@ -831,11 +835,12 @@ dcl(MENU_LABEL_INSERT_DIRECTIONMARKER, "&Direction Marker") dcl(MENU_LABEL_INSERT_DIRECTIONMARKER_LRM, "&LRM") dcl(MENU_LABEL_INSERT_DIRECTIONMARKER_RLM, "&RLM") +dcl(MENU_LABEL_INSERT_MORE, "More") dcl(MENU_LABEL_FORMAT,"F&ormat") dcl(MENU_LABEL_FMT, "Te&xt Formatting") dcl(MENU_LABEL_FMT_LANGUAGE,"Set &Language") dcl(MENU_LABEL_FMT_FONT,"&Font") -dcl(MENU_LABEL_FMT_PARAGRAPH,"&Paragraph") +dcl(MENU_LABEL_FMT_PARAGRAPH,"&Indents and Spacing") dcl(MENU_LABEL_FMT_BULLETS,"Bullets and &Numbering") dcl(MENU_LABEL_FMT_DOCUMENT,"&Document") dcl(MENU_LABEL_FMT_BORDERS,"Borders and Shading") @@ -843,8 +848,15 @@ dcl(MENU_LABEL_FMT_FOOTNOTES,"Footnotes and Endnotes") dcl(MENU_LABEL_FMT_COLUMNS,"&Columns") dcl(MENU_LABEL_FMT_TOGGLECASE,"C&hange Case") -dcl(MENU_LABEL_FMT_BACKGROUND,"Page C&olor") +dcl(MENU_LABEL_FMT_BACKGROUND,"&Background") dcl(MENU_LABEL_FMT_STYLE,"St&yle") +//dcl(MENU_LABEL_FMT_STYLE_MODIFY,"&All '%s' paragraphs") +dcl(MENU_LABEL_FMT_STYLE_MODIFY,"&All Paragraphs of Current Style") +dcl(MENU_LABEL_FMT_STYLE_PARAGRAPH,"&Indents and Spacing") +dcl(MENU_LABEL_FMT_STYLE_FONT,"&Font") +dcl(MENU_LABEL_FMT_STYLE_TABS,"&Tabs") +dcl(MENU_LABEL_FMT_STYLE_NUMBERING,"&Numbering") +dcl(MENU_LABEL_FMT_STYLE_LANGUAGE,"&Language") dcl(MENU_LABEL_FMT_STYLE_DEFINE, "&Create and Modify") dcl(MENU_LABEL_FMT_IMPORTSTYLES,"&Import Styles") dcl(MENU_LABEL_FMT_TABS,"&Tabs") @@ -861,6 +873,7 @@ dcl(MENU_LABEL_FMT_DIRECTION_DD_RTL, "RTL &Paragraph") dcl(MENU_LABEL_FMT_DIRECTION_DO_LTR, "&Left-to-right text") dcl(MENU_LABEL_FMT_DIRECTION_DO_RTL, "&Right-to-left text") +dcl(MENU_LABEL_FMT_MORE, "&More") dcl(MENU_LABEL_TOOLS,"&Tools") dcl(MENU_LABEL_TOOLS_SPELLING,"&Spelling") dcl(MENU_LABEL_TOOLS_SPELL,"Check &Spelling") @@ -877,6 +890,7 @@ dcl(MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL,"&Select revision") dcl(MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION,"&Accept revision") dcl(MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION,"&Reject revision") +dcl(MENU_LABEL_TOOLS_MORE, "&More") dcl(MENU_LABEL_TABLE, "T&able") dcl(MENU_LABEL_TABLE_INSERT, "&Insert") dcl(MENU_LABEL_TABLE_INSERT_TABLE, "&Table") @@ -918,9 +932,10 @@ dcl(MENU_LABEL_ALIGN_CENTER,"&Center") dcl(MENU_LABEL_ALIGN_RIGHT,"&Right") dcl(MENU_LABEL_ALIGN_JUSTIFY,"&Justify") -dcl(MENU_LABEL_WEB_WEBPREVIEW,"&As web page") +dcl(MENU_LABEL_WEB_WEBPREVIEW,"&Preview Web page") dcl(MENU_LABEL_WEB_SAVEASWEB,"&Save web page") -dcl(MENU_LABEL_WINDOW,"&Documents") +//dcl(MENU_LABEL_WINDOW,"&Currently Open") +dcl(MENU_LABEL_WINDOW,"&Window") dcl(MENU_LABEL_WINDOW_NEW,"&New Window") dcl(MENU_LABEL_WINDOW_1,"&1 %s") dcl(MENU_LABEL_WINDOW_2,"&2 %s") @@ -931,11 +946,11 @@ dcl(MENU_LABEL_WINDOW_7,"&7 %s") dcl(MENU_LABEL_WINDOW_8,"&8 %s") dcl(MENU_LABEL_WINDOW_9,"&9 %s") -dcl(MENU_LABEL_WINDOW_MORE,"&More Documents") +dcl(MENU_LABEL_WINDOW_MORE,"&More") dcl(MENU_LABEL_HELP,"&Help") dcl(MENU_LABEL_HELP_CREDITS,"C&redits") dcl(MENU_LABEL_HELP_CONTENTS,"Help &Contents") -dcl(MENU_LABEL_HELP_INDEX,"Help &Introduction") +dcl(MENU_LABEL_HELP_INDEX,"Help &Index") dcl(MENU_LABEL_HELP_CHECKVER,"Check &Version") dcl(MENU_LABEL_HELP_SEARCH,"&Search for Help") dcl(MENU_LABEL_HELP_ABOUT,"&About %s") @@ -943,6 +958,7 @@ dcl(MENU_LABEL_HELP_ABOUT_GNU,"About &GNU Free Software") dcl(MENU_LABEL_HELP_ABOUT_GNOMEOFFICE,"About G&NOME Office") dcl(MENU_LABEL_HELP_REPORT_BUG, "Report a &Bug") +dcl(MENU_LABEL_HELP_MORE, "&More") dcl(MENU_LABEL_SPELL_SUGGEST_1,"%s") dcl(MENU_LABEL_SPELL_SUGGEST_2,"%s") dcl(MENU_LABEL_SPELL_SUGGEST_3,"%s") @@ -999,6 +1015,7 @@ dcl(MENU_LABEL_AUTOTEXT_EMAIL_5,"%s") dcl(MENU_LABEL_AUTOTEXT_EMAIL_6,"%s") dcl(MENU_LABEL_FMT_IMAGE, "Resize &Image") +dcl(MENU_LABEL_MORE, "More") dcl(MENU_STATUSLINE__BOGUS1__," ") dcl(MENU_STATUSLINE__BOGUS2__," ") @@ -1030,6 +1047,7 @@ dcl(MENU_STATUSLINE_FILE_RECENT_9,"Open this document") dcl(MENU_STATUSLINE_FILE_REVERT,"Revert the document to the last saved state") dcl(MENU_STATUSLINE_FILE_EXIT,"Close all windows in the application and exit") +dcl(MENU_STATUSLINE_FILE_MORE,"Additional menu items") dcl(MENU_STATUSLINE_EDIT," ") dcl(MENU_STATUSLINE_EDIT_UNDO,"Undo editing") dcl(MENU_STATUSLINE_EDIT_REDO,"Redo previously undone editing") @@ -1065,12 +1083,15 @@ dcl(MENU_STATUSLINE_VIEW_FULLSCREEN,"View the document in full screen mode") dcl(MENU_STATUSLINE_VIEW_ZOOM_MENU,"Reduce or enlarge the document display") dcl(MENU_STATUSLINE_VIEW_ZOOM,"Reduce or enlarge the document display") +dcl(MENU_STATUSLINE_VIEW_ZOOM_IN,"Enlarge the document display") +dcl(MENU_STATUSLINE_VIEW_ZOOM_OUT,"Reduce the document display") dcl(MENU_STATUSLINE_VIEW_ZOOM_200,"Zoom to 200%") dcl(MENU_STATUSLINE_VIEW_ZOOM_100,"Zoom to 100%") dcl(MENU_STATUSLINE_VIEW_ZOOM_75,"Zoom to 75%") dcl(MENU_STATUSLINE_VIEW_ZOOM_50,"Zoom to 50%") dcl(MENU_STATUSLINE_VIEW_ZOOM_WIDTH,"Zoom to page width") dcl(MENU_STATUSLINE_VIEW_ZOOM_WHOLE,"Zoom to whole page") +dcl(MENU_STATUSLINE_VIEW_MORE,"Additional menu items") dcl(MENU_STATUSLINE_INSERT," ") dcl(MENU_STATUSLINE_INSERT_BREAK,"Insert a page, column, or section break") dcl(MENU_STATUSLINE_INSERT_PAGENO,"Insert an automatically-updated page number") @@ -1092,6 +1113,7 @@ dcl(MENU_STATUSLINE_INSERT_DIRECTIONMARKER, "Insert Unicode direction marker into the document") dcl(MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM, "Insert left-to-right direction marker (LRM)") dcl(MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM, "Insert right-to-left direction marker (RLM)") +dcl(MENU_STATUSLINE_INSERT_MORE, "Additional Menu Items") dcl(MENU_STATUSLINE_FORMAT," ") dcl(MENU_STATUSLINE_FMT, " ") @@ -1107,6 +1129,12 @@ dcl(MENU_STATUSLINE_FMT_TOGGLECASE,"Change the case of the selected text") dcl(MENU_STATUSLINE_FMT_BACKGROUND,"Change your document's page color") dcl(MENU_STATUSLINE_FMT_STYLE,"Define or apply style for the selection") +dcl(MENU_STATUSLINE_FMT_STYLE_MODIFY,"Modify style used in current selection") +dcl(MENU_STATUSLINE_FMT_STYLE_PARAGRAPH,"Modify paragraph settings used in current style") +dcl(MENU_STATUSLINE_FMT_STYLE_FONT,"Change font used in current style") +dcl(MENU_STATUSLINE_FMT_STYLE_TABS,"Modify tab settings used in current style") +dcl(MENU_STATUSLINE_FMT_STYLE_NUMBERING,"Modify numbering used in current style") +dcl(MENU_STATUSLINE_FMT_STYLE_LANGUAGE,"Change Language of current style") dcl(MENU_STATUSLINE_FMT_STYLE_DEFINE, "Define or apply style for the selection") dcl(MENU_STATUSLINE_FMT_IMPORTSTYLES,"Import style definitions from a document") dcl(MENU_STATUSLINE_FMT_TABS,"Set tab stops") @@ -1123,6 +1151,7 @@ dcl(MENU_STATUSLINE_FMT_DIRECTION_DD_RTL, "Set dominant direction of paragraph to RTL") dcl(MENU_STATUSLINE_FMT_DIRECTION_DO_LTR, "Force left-to-right direction of text") dcl(MENU_STATUSLINE_FMT_DIRECTION_DO_RTL, "Force right-to-left direction of text") +dcl(MENU_STATUSLINE_FMT_MORE, "More formatting options") dcl(MENU_STATUSLINE_TOOLS," " ) dcl(MENU_STATUSLINE_TOOLS_SPELLING," ") dcl(MENU_STATUSLINE_TOOLS_SPELL,"Check the document for incorrect spelling") @@ -1139,6 +1168,7 @@ dcl(MENU_STATUSLINE_TOOLS_REVISIONS_MARK,"Mark changes as you type") dcl(MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION,"Accept the suggested change") dcl(MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION,"Remove the suggested change") +dcl(MENU_STATUSLINE_TOOLS_MORE,"More tools") dcl(MENU_STATUSLINE_TABLE, "Table") dcl(MENU_STATUSLINE_TABLE_INSERT, "Insert") dcl(MENU_STATUSLINE_TABLE_INSERT_TABLE, "Insert Table") @@ -1203,6 +1233,7 @@ dcl(MENU_STATUSLINE_HELP_ABOUT_GNU,"About the GNU project") dcl(MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE,"About the GNOME Office project") dcl(MENU_STATUSLINE_HELP_REPORT_BUG, "Report a bug and help AbiWord become a better product") +dcl(MENU_STATUSLINE_HELP_MORE, "More options") dcl(MENU_STATUSLINE_SPELL_SUGGEST_1,"Change to this suggested spelling") dcl(MENU_STATUSLINE_SPELL_SUGGEST_2,"Change to this suggested spelling") dcl(MENU_STATUSLINE_SPELL_SUGGEST_3,"Change to this suggested spelling") @@ -1313,6 +1344,8 @@ dcl(TOOLBAR_LABEL_3COLUMN,"3 Columns") dcl(TOOLBAR_LABEL_VIEW_SHOWPARA,"Show All") dcl(TOOLBAR_LABEL_ZOOM,"Zoom") +dcl(TOOLBAR_LABEL_ZOOM_IN,"Zoom In") +dcl(TOOLBAR_LABEL_ZOOM_OUT,"Zoom Out") dcl(TOOLBAR_LABEL_LISTS_BULLETS,"Bullets") dcl(TOOLBAR_LABEL_LISTS_NUMBERS,"Numbering") dcl(TOOLBAR_LABEL_COLOR_FORE,"Font color") @@ -1383,6 +1416,8 @@ dcl(TOOLBAR_STATUSLINE_3COLUMN,"3 Columns") dcl(TOOLBAR_STATUSLINE_VIEW_SHOWPARA,"Show/hide formatting marks") dcl(TOOLBAR_STATUSLINE_ZOOM,"Zoom") +dcl(TOOLBAR_STATUSLINE_ZOOM_IN,"Increase zoom level (Page appears larger)") +dcl(TOOLBAR_STATUSLINE_ZOOM_OUT,"Decrease Zoom level (Page appears smaller)") dcl(TOOLBAR_STATUSLINE_LISTS_BULLETS,"Bullets") dcl(TOOLBAR_STATUSLINE_LISTS_NUMBERS,"Numbering") dcl(TOOLBAR_STATUSLINE_COLOR_FORE,"Font color") @@ -1453,6 +1488,8 @@ dcl(TOOLBAR_TOOLTIP_3COLUMN,"3 Columns") dcl(TOOLBAR_TOOLTIP_VIEW_SHOWPARA,"Show/hide formatting marks") dcl(TOOLBAR_TOOLTIP_ZOOM,"Zoom") +dcl(TOOLBAR_TOOLTIP_ZOOM_IN,"Zoom In") +dcl(TOOLBAR_TOOLTIP_ZOOM_OUT,"Zoom Out") dcl(TOOLBAR_TOOLTIP_LISTS_BULLETS,"Bullets") dcl(TOOLBAR_TOOLTIP_LISTS_NUMBERS,"Numbering") dcl(TOOLBAR_TOOLTIP_COLOR_FORE,"Font color") Only in ../abi/src/wp/ap/xp: ap_Strings.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_TB_Layouts_FileEditOps.h ../abi/src/wp/ap/xp/ap_TB_Layouts_FileEditOps.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_TB_Layouts_FileEditOps.h 2003-12-15 10:01:52.000000000 +0000 +++ ../abi/src/wp/ap/xp/ap_TB_Layouts_FileEditOps.h 2004-09-12 16:58:05.000000000 +0100 @@ -30,7 +30,7 @@ ToolbarItem(AP_TOOLBAR_ID_FILE_NEW) ToolbarItem(AP_TOOLBAR_ID_FILE_OPEN) ToolbarItem(AP_TOOLBAR_ID_FILE_SAVE) - ToolbarItem(AP_TOOLBAR_ID_FILE_SAVEAS) + //ToolbarItem(AP_TOOLBAR_ID_FILE_SAVEAS) Spacer() ToolbarItem(AP_TOOLBAR_ID_FILE_PRINT) @@ -38,25 +38,31 @@ ToolbarItem(AP_TOOLBAR_ID_FILE_PRINT_PREVIEW) #endif ToolbarItem(AP_TOOLBAR_ID_SPELLCHECK) - Spacer() + ToolbarItem(AP_TOOLBAR_ID_EDIT_CUT) ToolbarItem(AP_TOOLBAR_ID_EDIT_COPY) ToolbarItem(AP_TOOLBAR_ID_EDIT_PASTE) - ToolbarItem(AP_TOOLBAR_ID_FMTPAINTER) + + //ToolbarItem(AP_TOOLBAR_ID_FMTPAINTER) Spacer() ToolbarItem(AP_TOOLBAR_ID_EDIT_UNDO) ToolbarItem(AP_TOOLBAR_ID_EDIT_REDO) - Spacer() - ToolbarItem(AP_TOOLBAR_ID_1COLUMN) - ToolbarItem(AP_TOOLBAR_ID_2COLUMN) - ToolbarItem(AP_TOOLBAR_ID_3COLUMN) +// Spacer() +// ToolbarItem(AP_TOOLBAR_ID_1COLUMN) +// ToolbarItem(AP_TOOLBAR_ID_2COLUMN) +// ToolbarItem(AP_TOOLBAR_ID_3COLUMN) Spacer() ToolbarItem(AP_TOOLBAR_ID_IMG) - ToolbarItem(AP_TOOLBAR_ID_VIEW_SHOWPARA) + ToolbarItem(AP_TOOLBAR_ID_INSERT_TABLE) +// ToolbarItem(AP_TOOLBAR_ID_VIEW_SHOWPARA) + Spacer() + ToolbarItem(AP_TOOLBAR_ID_ZOOM_IN) ToolbarItem(AP_TOOLBAR_ID_ZOOM) - ToolbarItem(AP_TOOLBAR_ID_HELP) + ToolbarItem(AP_TOOLBAR_ID_ZOOM_OUT) +// Spacer() +// ToolbarItem(AP_TOOLBAR_ID_HELP) EndLayout() diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp ../abi/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp 2004-06-08 15:54:54.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp 2004-09-12 16:36:47.000000000 +0100 @@ -70,7 +70,7 @@ _s(AP_TOOLBAR_ID__BOGUS1__, EV_TBIT_BOGUS, NULL, 0, NULL); - _s(AP_TOOLBAR_ID_FILE_NEW, EV_TBIT_PushButton, "toolbarNew", AV_CHG_NONE, NULL); + _s(AP_TOOLBAR_ID_FILE_NEW, EV_TBIT_PushButton, "toolbarNew", AV_CHG_NONE, NULL); _s(AP_TOOLBAR_ID_FILE_OPEN, EV_TBIT_PushButton, "fileOpen", AV_CHG_NONE, NULL); _s(AP_TOOLBAR_ID_FILE_SAVE, EV_TBIT_PushButton, "fileSave", AV_CHG_ALL, ap_ToolbarGetState_Changes); _s(AP_TOOLBAR_ID_FILE_SAVEAS, EV_TBIT_PushButton, "fileSaveAs", AV_CHG_NONE, NULL); @@ -133,6 +133,8 @@ // AV_CHG_WINDOWSIZE, below, doesn't seem right. TODO _s(AP_TOOLBAR_ID_ZOOM, EV_TBIT_ComboBox, "zoom", AV_CHG_WINDOWSIZE, ap_ToolbarGetState_Zoom); + _s(AP_TOOLBAR_ID_ZOOM_IN, EV_TBIT_PushButton, "zoomIn", AV_CHG_WINDOWSIZE, NULL); + _s(AP_TOOLBAR_ID_ZOOM_OUT, EV_TBIT_PushButton, "zoomOut", AV_CHG_WINDOWSIZE, NULL); // AV_CHG_ALL, below, doesn't seem right. TODO _s(AP_TOOLBAR_ID_LISTS_BULLETS, EV_TBIT_ToggleButton, "doBullets", AV_CHG_ALL, ap_ToolbarGetState_Bullets ); @@ -165,5 +167,3 @@ return pActionSet; } - - Only in ../abi/src/wp/ap/xp: ap_Toolbar_ActionSet.o Only in ../abi/src/wp/ap/xp: ap_Toolbar_Functions.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_Iconmap.h ../abi/src/wp/ap/xp/ap_Toolbar_Iconmap.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_Iconmap.h 2003-12-29 21:28:19.000000000 +0000 +++ ../abi/src/wp/ap/xp/ap_Toolbar_Iconmap.h 2004-09-12 16:45:36.000000000 +0100 @@ -75,6 +75,8 @@ toolbariconmap(3COLUMN,tb_3column_xpm) toolbariconmap(VIEW_SHOWPARA,tb_view_showpara_xpm) toolbariconmap(ZOOM,NoIcon) +toolbariconmap(ZOOM,NoIcon) +toolbariconmap(ZOOM,NoIcon) toolbariconmap(LISTS_BULLETS,tb_lists_bullets_xpm) toolbariconmap(LISTS_NUMBERS,tb_lists_numbers_xpm) toolbariconmap(COLOR_FORE,tb_text_fgcolor_xpm) @@ -182,4 +184,4 @@ // // SAMPLE: toolbariconmap(LISTS_BULLETS_fi-FI,tb_lists_xpm) -// Add new overloaded icons here +// Add new overloaded icons here Only in ../abi/src/wp/ap/xp: ap_Toolbar_Icons.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_Id_List.h ../abi/src/wp/ap/xp/ap_Toolbar_Id_List.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_Id_List.h 2002-11-22 04:19:38.000000000 +0000 +++ ../abi/src/wp/ap/xp/ap_Toolbar_Id_List.h 2004-09-12 16:45:36.000000000 +0100 @@ -91,6 +91,8 @@ toolbaritem(3COLUMN) toolbaritem(VIEW_SHOWPARA) toolbaritem(ZOOM) +toolbaritem(ZOOM_IN) +toolbaritem(ZOOM_OUT) toolbaritem(LISTS_BULLETS) toolbaritem(LISTS_NUMBERS) toolbaritem(COLOR_FORE) @@ -113,5 +115,3 @@ toolbaritem(MERGERIGHT) toolbaritem(MERGEABOVE) toolbaritem(MERGEBELOW) - - Only in ../abi/src/wp/ap/xp: ap_Toolbar_LabelSet.o Only in ../abi/src/wp/ap/xp: ap_Toolbar_Layouts.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_Layouts_All.h ../abi/src/wp/ap/xp/ap_Toolbar_Layouts_All.h --- ../../abiword-2.0.11.abicvs/abi/src/wp/ap/xp/ap_Toolbar_Layouts_All.h 2002-09-21 03:53:38.000000000 +0100 +++ ../abi/src/wp/ap/xp/ap_Toolbar_Layouts_All.h 2004-09-02 12:27:33.000000000 +0100 @@ -31,7 +31,3 @@ #include "ap_TB_Layouts_FormatOps.h" #include "ap_TB_Layouts_TableOps.h" #include "ap_TB_Layouts_ExtraOps.h" - - - - Only in ../abi/src/wp/ap/xp: ap_TopRuler.o Only in ../abi/src/wp/ap/xp: ap_wp_sidebar.cpp Only in ../abi/src/wp/ap/xp: ap_wp_sidebar.o Only in ../abi/src/wp/ap/xp: ap_wp_splash.cpp Only in ../abi/src/wp/ap/xp: ap_wp_splash.o Only in ../abi/src/wp/ap/xp: libWpAp_xp.a Only in ../abi/src/wp/impexp: GNUmakefile Only in ../abi/src/wp/impexp: GNUmakefile.in Only in ../abi/src/wp/impexp/cocoa: GNUmakefile Only in ../abi/src/wp/impexp/cocoa: GNUmakefile.in Only in ../abi/src/wp/impexp: libImpExp.a Only in ../abi/src/wp/impexp/qnx: GNUmakefile Only in ../abi/src/wp/impexp/qnx: GNUmakefile.in Only in ../abi/src/wp/impexp/unix: .deps Only in ../abi/src/wp/impexp/unix: GNUmakefile Only in ../abi/src/wp/impexp/unix: GNUmakefile.in Only in ../abi/src/wp/impexp/unix: ie_impexp_RegisterUnix.o Only in ../abi/src/wp/impexp/unix: libImpExp_unix.a Only in ../abi/src/wp/impexp/xp: .deps Only in ../abi/src/wp/impexp/xp: GNUmakefile Only in ../abi/src/wp/impexp/xp: GNUmakefile.in Only in ../abi/src/wp/impexp/xp: ie_FileInfo.o Only in ../abi/src/wp/impexp/xp: ie_Table.o Only in ../abi/src/wp/impexp/xp: ie_exp.o Only in ../abi/src/wp/impexp/xp: ie_exp_AWT.o Only in ../abi/src/wp/impexp/xp: ie_exp_AbiWord_1.o Only in ../abi/src/wp/impexp/xp: ie_exp_GZipAbiWord.o Only in ../abi/src/wp/impexp/xp: ie_exp_HTML.o Only in ../abi/src/wp/impexp/xp: ie_exp_RTF.o Only in ../abi/src/wp/impexp/xp: ie_exp_RTF_AttrProp.o Only in ../abi/src/wp/impexp/xp: ie_exp_RTF_listenerGetProps.o Only in ../abi/src/wp/impexp/xp: ie_exp_RTF_listenerWriteDoc.o Only in ../abi/src/wp/impexp/xp: ie_exp_Text.o Only in ../abi/src/wp/impexp/xp: ie_imp.o Only in ../abi/src/wp/impexp/xp: ie_impGraphic.o Only in ../abi/src/wp/impexp/xp: ie_impGraphic_PNG.o Only in ../abi/src/wp/impexp/xp: ie_impGraphic_SVG.o Only in ../abi/src/wp/impexp/xp: ie_imp_AbiWord_1.o Only in ../abi/src/wp/impexp/xp: ie_imp_GZipAbiWord.o Only in ../abi/src/wp/impexp/xp: ie_imp_GraphicAsDocument.o diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp ../abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp --- ../../abiword-2.0.11.abicvs/abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2004-08-07 23:44:01.000000000 +0100 +++ ../abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2004-09-12 15:37:36.000000000 +0100 @@ -4320,6 +4320,7 @@ if (apap->dyaAfter) { UT_String_sprintf(propBuffer, "margin-bottom:%dpt;", (apap->dyaAfter / 20)); + s += propBuffer; } // tab stops Only in ../abi/src/wp/impexp/xp: ie_imp_MsWord_97.o Only in ../abi/src/wp/impexp/xp: ie_imp_RTF.o Only in ../abi/src/wp/impexp/xp: ie_imp_Text.o Only in ../abi/src/wp/impexp/xp: ie_imp_XHTML.o Only in ../abi/src/wp/impexp/xp: ie_imp_XML.o Only in ../abi/src/wp/impexp/xp: ie_impexp_Register.o Only in ../abi/src/wp/impexp/xp: ie_mailmerge.o Only in ../abi/src/wp/impexp/xp: libImpExp_xp.a Only in ../abi/src/wp/main: GNUmakefile Only in ../abi/src/wp/main: GNUmakefile.in Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/Frameworks: GNUmakefile Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/Frameworks: GNUmakefile.in Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents: GNUmakefile Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents: GNUmakefile.in Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/MacOS: GNUmakefile Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/MacOS: GNUmakefile.in Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/Resources/English.lproj: GNUmakefile Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/Resources/English.lproj: GNUmakefile.in Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/Resources: GNUmakefile Only in ../abi/src/wp/main/cocoa/AbiWord.app/Contents/Resources: GNUmakefile.in Only in ../abi/src/wp/main/cocoa/AbiWord.app: GNUmakefile Only in ../abi/src/wp/main/cocoa/AbiWord.app: GNUmakefile.in Only in ../abi/src/wp/main/cocoa: GNUmakefile Only in ../abi/src/wp/main/cocoa: GNUmakefile.in Only in ../abi/src/wp/main/cocoa/bundle: GNUmakefile Only in ../abi/src/wp/main/cocoa/bundle: GNUmakefile.in diff -ru ../../abiword-2.0.11.abicvs/abi/src/wp/main/cocoa/bundle/Info.plist ../abi/src/wp/main/cocoa/bundle/Info.plist --- ../../abiword-2.0.11.abicvs/abi/src/wp/main/cocoa/bundle/Info.plist 2003-07-20 13:22:50.000000000 +0100 +++ ../abi/src/wp/main/cocoa/bundle/Info.plist 2004-09-02 14:05:56.000000000 +0100 @@ -69,6 +69,6 @@ CFBundleSignature AbiW CFBundleVersion - 1.99.2 + 2.0.11 Only in ../abi/src/wp/main/cocoa/bundle: Info.plist.orig Only in ../abi/src/wp/main/cocoa/bundle: Info.plist.rej Only in ../abi/src/wp/main/qnx: GNUmakefile Only in ../abi/src/wp/main/qnx: GNUmakefile.in Only in ../abi/src/wp/main/unix: .deps Only in ../abi/src/wp/main/unix: AbiWord-2.0 Only in ../abi/src/wp/main/unix: GNUmakefile Only in ../abi/src/wp/main/unix: GNUmakefile.in Only in ../abi/src/wp/main/unix: UnixMain.o Only in ../abi/src/wp/main/unix: abi_ver.cpp Only in ../abi/src/wp/main/unix: abi_ver.o Only in ../abi/src/wp/main/xp: GNUmakefile Only in ../abi/src/wp/main/xp: GNUmakefile.in diff -ru ../../abiword-2.0.11.abicvs/abi/user/wp/strings/en-GB.strings ../abi/user/wp/strings/en-GB.strings --- ../../abiword-2.0.11.abicvs/abi/user/wp/strings/en-GB.strings 2003-06-07 04:12:59.000000000 +0100 +++ ../abi/user/wp/strings/en-GB.strings 2004-09-02 12:27:33.000000000 +0100 @@ -80,6 +80,7 @@ MENU_LABEL_FILE_RECENT_8="&8 %s" MENU_LABEL_FILE_RECENT_9="&9 %s" MENU_LABEL_FILE_EXIT="E&xit" +MENU_LABEL_FILE_MORE="&More" MENU_LABEL_EDIT="&Edit" MENU_LABEL_EDIT_UNDO="&Undo" MENU_LABEL_EDIT_REDO="&Redo" @@ -96,7 +97,7 @@ MENU_LABEL_VIEW="&View" MENU_LABEL_VIEW_NORMAL="&Normal" MENU_LABEL_VIEW_WEB="&Web Layout" -MENU_LABEL_VIEW_PRINT="&Print Layout" +MENU_LABEL_VIEW_PRINT="&Page Layout" MENU_LABEL_VIEW_TOOLBARS="&Toolbars" MENU_LABEL_VIEW_TB_STD="&Standard" MENU_LABEL_VIEW_TB_FORMAT="&Formatting" @@ -107,6 +108,7 @@ MENU_LABEL_VIEW_HEADFOOT="&Header and Footer" MENU_LABEL_VIEW_FULLSCREEN="F&ull Screen" MENU_LABEL_VIEW_ZOOM="&Zoom" +MENU_LABEL_VIEW_MORE="&More" MENU_LABEL_INSERT="&Insert" MENU_LABEL_INSERT_BREAK="&Break" MENU_LABEL_INSERT_PAGENO="Page N&umbers" @@ -115,6 +117,7 @@ MENU_LABEL_INSERT_SYMBOL="Sy&mbol" MENU_LABEL_INSERT_PICTURE="&Picture" MENU_LABEL_INSERT_GRAPHIC="&From File" +MENU_LABEL_INSERT_MORE="&More" MENU_LABEL_FORMAT="F&ormat" MENU_LABEL_FMT_LANGUAGE="&Language" MENU_LABEL_FMT_FONT="&Font" @@ -126,6 +129,11 @@ MENU_LABEL_FMT_TOGGLECASE="C&hange Case" MENU_LABEL_FMT_BACKGROUND="Back&ground" MENU_LABEL_FMT_STYLE="St&yle" +MENU_LABEL_FMT_STYLE_PARAGRAPH="Indents and Spacing" +MENU_LABEL_FMT_STYLE_FONT="Font" +MENU_LABEL_FMT_STYLE_TABS="Tabs" +MENU_LABEL_FMT_STYLE_NUMBERING="Numbering" +MENU_LABEL_FMT_STYLE_LANGUAGE="Language" MENU_LABEL_FMT_TABS="&Tabs" MENU_LABEL_FMT_BOLD="&Bold" MENU_LABEL_FMT_ITALIC="&Italic" @@ -136,6 +144,7 @@ MENU_LABEL_FMT_BOTTOMLINE="Bottomline" MENU_LABEL_FMT_SUPERSCRIPT="Supe&rscript" MENU_LABEL_FMT_SUBSCRIPT="&Subscript" +MENU_LABEL_FMT_MORE="&More" MENU_LABEL_TOOLS="&Tools" MENU_LABEL_TOOLS_SPELLING="&Spelling" MENU_LABEL_TOOLS_SPELL="Spe&lling" @@ -213,6 +222,7 @@ MENU_STATUSLINE_FILE_RECENT_8="Open this document" MENU_STATUSLINE_FILE_RECENT_9="Open this document" MENU_STATUSLINE_FILE_EXIT="Close all windows in the application and exit" +MENU_STATUSLINE_FILE_MORE="Additional menu items" MENU_STATUSLINE_EDIT=" " MENU_STATUSLINE_EDIT_UNDO="Undo editing" MENU_STATUSLINE_EDIT_REDO="Redo previously undone editing" @@ -240,6 +250,7 @@ MENU_STATUSLINE_VIEW_HEADFOOT="Edit text at the top or bottom of every page" MENU_STATUSLINE_VIEW_FULLSCREEN="View the document in full screen mode" MENU_STATUSLINE_VIEW_ZOOM="Reduce or enlarge the document display" +MENU_STATUSLINE_VIEW_MORE="Additional menu items" MENU_STATUSLINE_INSERT=" " MENU_STATUSLINE_INSERT_BREAK="Insert a page, column, or section break" MENU_STATUSLINE_INSERT_PAGENO="Insert an automatically-updated page number" @@ -248,6 +259,7 @@ MENU_STATUSLINE_INSERT_SYMBOL="Insert a symbol or other special character" MENU_STATUSLINE_INSERT_PICTURE="Insert a picture" MENU_STATUSLINE_INSERT_GRAPHIC="Insert an existing picture from another file" +MENU_STATUSLINE-INSERT_MORE="Additional Menu items" MENU_STATUSLINE_FORMAT=" " MENU_STATUSLINE_FMT_LANGUAGE="Change the language of the selected text" MENU_STATUSLINE_FMT_FONT="Change the font of the selected text" @@ -259,6 +271,11 @@ MENU_STATUSLINE_FMT_TOGGLECASE="Change the case of the selected text" MENU_STATUSLINE_FMT_BACKGROUND="Change your document's background colour" MENU_STATUSLINE_FMT_STYLE="Define or apply style for the selection" +MENU_STATUSLINE_FMT_STYLE_PARAGRAPH="Adjust indents and spacing for selected style" +MENU_STATUSLINE_FMT_STYLE_FONT="Adjust font used in selected style" +MENU_STATUSLINE_FMT_STYLE_TABS="Adjust Tab settings for selected style" +MENU_STATUSLINE_FMT_STYLE_NUMBERING="Adjust numbering used in selected style" +MENU_STATUSLINE_FMT_STYLE_LANGUAGE="Select the language of the selected style" MENU_STATUSLINE_FMT_TABS="Set tab stops" MENU_STATUSLINE_FMT_BOLD="Make the selection bold (toggle)" MENU_STATUSLINE_FMT_ITALIC="Make the selection italic (toggle)" @@ -269,6 +286,7 @@ MENU_STATUSLINE_FMT_BOTTOMLINE="Line below the selection (toggle)" MENU_STATUSLINE_FMT_SUPERSCRIPT="Make the selection superscript (toggle)" MENU_STATUSLINE_FMT_SUBSCRIPT="Make the selection subscript (toggle)" +MENU_STATUSLINE_FMT_MORE="More formatting options" MENU_STATUSLINE_TOOLS=" " MENU_STATUSLINE_TOOLS_SPELLING=" " MENU_STATUSLINE_TOOLS_SPELL="Check the document for incorrect spelling" @@ -478,4 +496,3 @@ /> - diff -ru ../../abiword-2.0.11.abicvs/abi/user/wp/strings/en-IE.strings ../abi/user/wp/strings/en-IE.strings --- ../../abiword-2.0.11.abicvs/abi/user/wp/strings/en-IE.strings 2003-06-07 04:13:00.000000000 +0100 +++ ../abi/user/wp/strings/en-IE.strings 2004-09-02 12:27:33.000000000 +0100 @@ -71,6 +71,7 @@ MENU_LABEL_FILE_RECENT_8="&8 %s" MENU_LABEL_FILE_RECENT_9="&9 %s" MENU_LABEL_FILE_EXIT="E&xit" +MENU_LABEL_FILE_MORE="&More" MENU_LABEL_EDIT="&Edit" MENU_LABEL_EDIT_UNDO="&Undo" MENU_LABEL_EDIT_REDO="&Redo" @@ -87,7 +88,7 @@ MENU_LABEL_VIEW="&View" MENU_LABEL_VIEW_NORMAL="&Normal" MENU_LABEL_VIEW_WEB="&Web Layout" -MENU_LABEL_VIEW_PRINT="&Print Layout" +MENU_LABEL_VIEW_PRINT="&Page Layout" MENU_LABEL_VIEW_TOOLBARS="&Toolbars" MENU_LABEL_VIEW_TB_STD="&Standard" MENU_LABEL_VIEW_TB_FORMAT="&Formatting" @@ -98,6 +99,7 @@ MENU_LABEL_VIEW_HEADFOOT="&Header and Footer" MENU_LABEL_VIEW_FULLSCREEN="F&ull Screen" MENU_LABEL_VIEW_ZOOM="&Zoom" +MENU_LABEL_VIEW_MORE="&More" MENU_LABEL_INSERT="&Insert" MENU_LABEL_INSERT_BREAK="&Break" MENU_LABEL_INSERT_PAGENO="Page N&umbers" @@ -106,6 +108,7 @@ MENU_LABEL_INSERT_SYMBOL="Sy&mbol" MENU_LABEL_INSERT_PICTURE="&Picture" MENU_LABEL_INSERT_GRAPHIC="&From File" +MENU_LABEL_INSERT_MORE="&More" MENU_LABEL_FORMAT="F&ormat" MENU_LABEL_FMT_LANGUAGE="&Language" MENU_LABEL_FMT_FONT="&Font" @@ -127,6 +130,7 @@ MENU_LABEL_FMT_BOTTOMLINE="Bottomline" MENU_LABEL_FMT_SUPERSCRIPT="Supe&rscript" MENU_LABEL_FMT_SUBSCRIPT="&Subscript" +MENU_LABEL_FMT_MORE="&More" MENU_LABEL_TOOLS="&Tools" MENU_LABEL_TOOLS_SPELLING="&Spelling" MENU_LABEL_TOOLS_SPELL="Spe&lling" @@ -204,6 +208,7 @@ MENU_STATUSLINE_FILE_RECENT_8="Open this document" MENU_STATUSLINE_FILE_RECENT_9="Open this document" MENU_STATUSLINE_FILE_EXIT="Close all windows in the application and exit" +MENU_STATUSLINE_FILE_MORE="Additional menu items" MENU_STATUSLINE_EDIT=" " MENU_STATUSLINE_EDIT_UNDO="Undo editing" MENU_STATUSLINE_EDIT_REDO="Redo previously undone editing" @@ -231,6 +236,7 @@ MENU_STATUSLINE_VIEW_HEADFOOT="Edit text at the top or bottom of every page" MENU_STATUSLINE_VIEW_FULLSCREEN="View the document in full screen mode" MENU_STATUSLINE_VIEW_ZOOM="Reduce or enlarge the document display" +MENU_STATUSLINE_VIEW_MORE="Additional menu items" MENU_STATUSLINE_INSERT=" " MENU_STATUSLINE_INSERT_BREAK="Insert a page, column, or section break" MENU_STATUSLINE_INSERT_PAGENO="Insert an automatically-updated page number" @@ -239,6 +245,7 @@ MENU_STATUSLINE_INSERT_SYMBOL="Insert a symbol or other special character" MENU_STATUSLINE_INSERT_PICTURE="Insert a picture" MENU_STATUSLINE_INSERT_GRAPHIC="Insert an existing picture from another file" +MENU_STATUSLINE_INSERT_MORE="Additional menu items" MENU_STATUSLINE_FORMAT=" " MENU_STATUSLINE_FMT_LANGUAGE="Change the language of the selected text" MENU_STATUSLINE_FMT_FONT="Change the font of the selected text" @@ -260,6 +267,7 @@ MENU_STATUSLINE_FMT_BOTTOMLINE="Line below the selection (toggle)" MENU_STATUSLINE_FMT_SUPERSCRIPT="Make the selection superscript (toggle)" MENU_STATUSLINE_FMT_SUBSCRIPT="Make the selection subscript (toggle)" +MENU_STATUSLINE_FMT_MORE="More Formatting options" MENU_STATUSLINE_TOOLS=" " MENU_STATUSLINE_TOOLS_SPELLING=" " MENU_STATUSLINE_TOOLS_SPELL="Check the document for incorrect spelling" @@ -469,4 +477,3 @@ /> - diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/A4.awt ../abidistfiles/templates/A4.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/A4.awt 2002-12-02 03:16:05.000000000 +0000 +++ ../abidistfiles/templates/A4.awt 2004-09-09 11:22:25.000000000 +0100 @@ -1,15 +1,23 @@ - + - - - - - - - + + + + + + + + +application/x-abiword +AbiWord +Thu Sep 9 11:12:55 2004 + + + + -
-

+

+

Only in ../abidistfiles/templates: A4.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/Business-Report.awt ../abidistfiles/templates/Business-Report.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/Business-Report.awt 2002-12-02 03:16:06.000000000 +0000 +++ ../abidistfiles/templates/Business-Report.awt 2004-09-09 11:22:22.000000000 +0100 @@ -15,16 +15,16 @@
-

-

-

-

-

-

Title

-

Subtitle

-

-

Release 1.0

-

+

+

+

+

+

+

Title

+

Subtitle

+

+

Release 1.0

+

@@ -44,67 +44,67 @@

-

-

Author

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

Copyright (C) 2002 by My Company

-

-

Copyright notes

-

-

-

Table Of Contents

-

-

+

+

Author

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

Copyright (C) 2004 by My Company

+

+

Copyright notes

+

+

+

Table Of Contents

+

+

-

Heading 1

-

text

-

Heading 2

-

text

-

Heading 3

-

+

Heading 1

+

text

+

Heading 2

+

text

+

Heading 3

+

Author Page

Only in ../abidistfiles/templates: Business-Report.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/Employee-Directory.awt ../abidistfiles/templates/Employee-Directory.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/Employee-Directory.awt 2002-12-02 03:16:06.000000000 +0000 +++ ../abidistfiles/templates/Employee-Directory.awt 2004-09-09 11:23:48.000000000 +0100 @@ -8,18 +8,18 @@ - +
-

Company Name

-

Directory of Employees

-

-

-

-

-

-

-

-

+

Company Name

+

Directory of Employees

+

+

+

+

+

+

+

+

@@ -36,59 +36,59 @@

Normal Style (123) 555-1212

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

General Numbers

-

Front Desk (123) 555-1212

-

Security (123) 555-1212

-

Building Management (123) 555-1212

-

Other General Numbers (123) 555-1212

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

General Numbers

+

Front Desk (123) 555-1212

+

Security (123) 555-1212

+

Building Management (123) 555-1212

+

Other General Numbers (123) 555-1212

Only in ../abidistfiles/templates: Employee-Directory.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/Fax-Coversheet.awt ../abidistfiles/templates/Fax-Coversheet.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/Fax-Coversheet.awt 2002-12-02 03:16:07.000000000 +0000 +++ ../abidistfiles/templates/Fax-Coversheet.awt 2004-09-09 11:26:04.000000000 +0100 @@ -8,28 +8,28 @@ - +
-

Company Name

-

Company Address Line 1

-

Company Address Line 2

-

Company Address Line 3

-

-

FAX

-

TO: From:

-

Fax: Pages:

-

Phone: Date:

+

Company Name

+

Company Address Line 1

+

Company Address Line 2

+

Company Address Line 3

+

+

FAX

+

TO: From:

+

Fax: Pages:

+

Phone: Date:

Re: CC:

-

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

-

+

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

+

-

Comments

+

Comments

-

This text should the replaced with your comments about the fax and any additional comment to the receiver.

+

This text should the replaced with your comments about the fax and any additional comment to the receiver.

Only in ../abidistfiles/templates: Fax-Coversheet.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/Memo.awt ../abidistfiles/templates/Memo.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/Memo.awt 2004-03-26 02:52:06.000000000 +0000 +++ ../abidistfiles/templates/Memo.awt 2004-09-09 11:27:26.000000000 +0100 @@ -1,6 +1,6 @@ - + @@ -14,15 +14,15 @@ Fri Mar 12 21:07:56 2004 - - - - + + + + - +

@@ -59,10 +59,10 @@

The box that this text is in uses AbiWord's table support to draw the border. You can either allow the border to fit to the size of the text as it is now, or press <ENTER> repeatedly at the end of your memo to expand the border to fill the rest of the page.

Don't forget to change the header and footer before printing! If you wish to save this memo for later and ensure that the date above is saved as today's (not automatically updating), select it and type the desired date text over it.

The styles used in this document for correct conversion, import, export, and HTML are:

-

Heading 1 for Company Name

-

Heading 2 for Slogan

-

Heading 3 for "Date:", "To:", etc.

-

Normal for body text

+

Heading 1 for Company Name

+

Heading 2 for Slogan

+

Heading 3 for "Date:", "To:", etc.

+

Normal for body text

Only in ../abidistfiles/templates: Memo.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/Press-Release.awt ../abidistfiles/templates/Press-Release.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/Press-Release.awt 2004-03-26 02:51:37.000000000 +0000 +++ ../abidistfiles/templates/Press-Release.awt 2004-09-09 11:28:10.000000000 +0100 @@ -1,6 +1,6 @@ - + @@ -16,19 +16,19 @@ - - - - + + + + - + - + @@ -36,19 +36,19 @@ - - - + + + - - - + + + - + @@ -56,28 +56,28 @@ - +

-

COMPANY NAME HERE

-

Address Line 1

-

Address Line 2

-

Phone

-

Web

+

COMPANY NAME HERE

+

Address Line 1

+

Address Line 2

+

Phone

+

Web

 -

Company Does Something With Another Company

-

-

Type your press release text here.

-

AbiWord Styles will automatically insert a double space between paragraphs. This grid will automatically expand to fit the amount of text in your press release.

-

About Company 1

-

About Company 2

-

+

Company Does Something With Another Company

+

+

Type your press release text here.

+

AbiWord Styles will automatically insert a double space between paragraphs. This grid will automatically expand to fit the amount of text in your press release.

+

About Company 1

+

About Company 2

+

 -

FOR IMMEDIATE RELEASE

+

FOR IMMEDIATE RELEASE

Only in ../abidistfiles/templates: Press-Release.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/Resume.awt ../abidistfiles/templates/Resume.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/Resume.awt 2004-03-26 02:52:07.000000000 +0000 +++ ../abidistfiles/templates/Resume.awt 2004-09-09 11:29:17.000000000 +0100 @@ -14,13 +14,13 @@ Fri Mar 12 22:08:25 2004 - - - - - + + + + + - +

Only in ../abidistfiles/templates: Resume.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/Two-Columns.awt ../abidistfiles/templates/Two-Columns.awt --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/Two-Columns.awt 2002-12-02 03:16:08.000000000 +0000 +++ ../abidistfiles/templates/Two-Columns.awt 2004-09-09 11:30:01.000000000 +0100 @@ -8,7 +8,7 @@ - +

Only in ../abidistfiles/templates: Two-Columns.awt~ diff -ru ../../abiword-2.0.11.abicvs/abidistfiles/templates/normal.awt-en_GB ../abidistfiles/templates/normal.awt-en_GB --- ../../abiword-2.0.11.abicvs/abidistfiles/templates/normal.awt-en_GB 2003-05-26 02:56:06.000000000 +0100 +++ ../abidistfiles/templates/normal.awt-en_GB 2004-09-09 11:09:53.000000000 +0100 @@ -1,18 +1,23 @@ - - - - - - - + + + + + + + + +application/x-abiword +AbiWord +Fri Aug 27 18:43:37 2004 + - + -
+

Only in ../: abiword-plugins Only in ../: patch_for_11.diff Only in ../wv: Makefile Only in ../wv: anld.o Only in ../wv: anlv.o Only in ../wv: asumy.o Only in ../wv: asumyi.o Only in ../wv: atrd.o Only in ../wv: basename.o Only in ../wv: bintree.o Only in ../wv: bkd.o Only in ../wv: bkf.o Only in ../wv: bkl.o Only in ../wv: blip.o Only in ../wv: bmptopng.o Only in ../wv: brc.o Only in ../wv: bte.o Only in ../wv: bx.o Only in ../wv: chp.o Only in ../wv: clx.o Only in ../wv: config.cache Only in ../wv: config.h Only in ../wv: config.log Only in ../wv: config.status Only in ../wv: crc32.o Only in ../wv: dcs.o Only in ../wv: decode_complex.o Only in ../wv: decode_simple.o Only in ../wv: decompresswmf.o Only in ../wv: decrypt95.o Only in ../wv: decrypt97.o Only in ../wv: dogrid.o Only in ../wv: dop.o Only in ../wv: doptypography.o Only in ../wv: dttm.o Only in ../wv: error.o Only in ../wv: escher.o Only in ../wv/expat: Makefile Only in ../wv/expat/xmlparse: Makefile Only in ../wv/expat/xmltok: Makefile Only in ../wv/exporter: Makefile Only in ../wv: fbse.o Only in ../wv: fdoa.o Only in ../wv: ffn.o Only in ../wv: fib.o Only in ../wv: field.o Only in ../wv: filetime.o Only in ../wv: fkp.o Only in ../wv: fld.o Only in ../wv: font.o Only in ../wv: fopt.o Only in ../wv: frd.o Only in ../wv: fspa.o Only in ../wv: ftxbxs.o Only in ../wv: generic.o Only in ../wv/glib-wv: Makefile Only in ../wv/iconv: Makefile Only in ../wv: isbidi.o Only in ../wv: laolareplace.o Only in ../wv: lfo.o Only in ../wv/libole2: Makefile Only in ../wv/libole2: ms-ole-summary.o Only in ../wv/libole2: ms-ole.o Only in ../wv: libwv.a Only in ../wv: list.o Only in ../wv: lspd.o Only in ../wv: lst.o Only in ../wv: lvl.o Only in ../wv/magick: Makefile Only in ../wv/magick: blob.o Only in ../wv/magick: bmp.o Only in ../wv/magick: colors.o Only in ../wv/magick: compress.o Only in ../wv/magick: error.o Only in ../wv/magick: image.o Only in ../wv/magick: magick.o Only in ../wv/magick: memory.o Only in ../wv/magick: png.o Only in ../wv/magick: signature.o Only in ../wv/magick: transform.o Only in ../wv/magick: utility.o Only in ../wv: md5.o Only in ../wv: mtextra.o Only in ../wv: numrm.o Only in ../wv/oledecod: Makefile Only in ../wv/oledecod: oledecod.o Only in ../wv: olst.o Only in ../wv: pap.o Only in ../wv: pcd.o Only in ../wv: pgd.o Only in ../wv: phe.o Only in ../wv: picf.o Only in ../wv: plcf.o Only in ../wv: prm.o Only in ../wv: rc4.o Only in ../wv: reasons.o Only in ../wv: roman.o Only in ../wv: rr.o Only in ../wv: rs.o Only in ../wv: sed.o Only in ../wv: sep.o Only in ../wv: shd.o Only in ../wv: sprm.o Only in ../wv: sttbf.o Only in ../wv: stylesheet.o Only in ../wv: support.o Only in ../wv: symbol.o Only in ../wv: table.o Only in ../wv: tap.o Only in ../wv: tbd.o Only in ../wv: tc.o Only in ../wv: text.o Only in ../wv: tlp.o Only in ../wv: twips.o Only in ../wv: unicode.o Only in ../wv: utf.o Only in ../wv: version.c Only in ../wv: version.o Only in ../wv: winmmap.o Only in ../wv: wkb.o Only in ../wv: wvAbw Only in ../wv: wvCleanLatex Only in ../wv: wvConfig.o Only in ../wv: wvDVI Only in ../wv: wvDocBook Only in ../wv: wvHtml Only in ../wv: wvHtmlEngine.o Only in ../wv: wvLatex Only in ../wv: wvPDF Only in ../wv: wvPS Only in ../wv: wvText Only in ../wv: wvTextEngine.o Only in ../wv: wvWml Only in ../wv: wvparse.o Only in ../wv: xst.o