? Makefile ? Makefile.in ? ac-helpers/py-compile ? src/pkg/linux/apkg/abiword-gnome.apspec ? src/pkg/linux/apkg/abiword-gtk.apspec ? src/pkg/maemo/debian/misc/abiword.desktop ? src/pkg/maemo/debian/misc/com.nokia.abiword.service ? src/wp/ap/unix/ap_UnixClipartPane.cpp ? src/wp/ap/unix/ap_UnixClipartPane.h ? src/wp/ap/xp/ap_ClipartPane.cpp ? src/wp/ap/xp/ap_ClipartPane.h ? src/wp/main/unix/sugar/GNUmakefile ? src/wp/main/unix/sugar/GNUmakefile.in ? src/wp/test/unix/testwrap.sh ? src/wp/test/win/testwrap.sh Index: src/af/ev/unix/ev_UnixToolbar.cpp =================================================================== RCS file: /cvsroot/abi/src/af/ev/unix/ev_UnixToolbar.cpp,v retrieving revision 1.142 diff -u -p -r1.142 ev_UnixToolbar.cpp --- src/af/ev/unix/ev_UnixToolbar.cpp 1 Jul 2006 18:11:32 -0000 1.142 +++ src/af/ev/unix/ev_UnixToolbar.cpp 9 Aug 2006 06:08:25 -0000 @@ -496,6 +496,8 @@ bool EV_UnixToolbar::toolbarEvent(_wd * const EV_EditMethodContainer * pEMC = m_pUnixApp->getEditMethodContainer(); UT_ASSERT(pEMC); + UT_DEBUGMSG(("method: %s", szMethodName)); + EV_EditMethod * pEM = pEMC->findEditMethodByName(szMethodName); UT_ASSERT(pEM); // make sure it's bound to something @@ -581,6 +583,7 @@ bool EV_UnixToolbar::getPixmapForIcon(XA case AP_TOOLBAR_ID_FILE_SAVEAS: stock_id = GTK_STOCK_SAVE_AS ; break ; case AP_TOOLBAR_ID_FILE_PRINT: stock_id = GTK_STOCK_PRINT ; break ; case AP_TOOLBAR_ID_FILE_PRINT_PREVIEW: stock_id = GTK_STOCK_PRINT_PREVIEW ; break ; + case AP_TOOLBAR_ID_SHOW_HIDE_CLIPART: stock_id = GTK_STOCK_EXECUTE ; break ; case AP_TOOLBAR_ID_EDIT_UNDO: stock_id = GTK_STOCK_UNDO ; break ; case AP_TOOLBAR_ID_EDIT_REDO: stock_id = GTK_STOCK_REDO ; break ; Index: src/af/xap/unix/xap_UnixFrameImpl.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFrameImpl.cpp,v retrieving revision 1.103.4.3 diff -u -p -r1.103.4.3 xap_UnixFrameImpl.cpp --- src/af/xap/unix/xap_UnixFrameImpl.cpp 8 Aug 2006 08:35:56 -0000 1.103.4.3 +++ src/af/xap/unix/xap_UnixFrameImpl.cpp 9 Aug 2006 06:08:29 -0000 @@ -878,6 +878,65 @@ gint XAP_UnixFrameImpl::_fe::key_press_e return 1; } +gint XAP_UnixFrameImpl::_fe::drag_drop_event(GtkWidget* w, GdkDragContext* drag_context, gint x, gint y, GtkSelectionData* selection_data, guint target_type, guint time, gpointer user_data) +{ + gtk_drag_get_data(w, drag_context, gdk_atom_intern("STRING", FALSE), time); + + // FIXME: What should be returned here? + return 1; +} + + +gint XAP_UnixFrameImpl::_fe::drag_data_received_event(GtkWidget* w, GdkDragContext* drag_context, gint x, gint y, GtkSelectionData* selection_data, guint target_type, guint time, gpointer user_data) +{ + const char * mthdName = "fileInsertGraphicAtXY"; + + const char * filename; + + // We should check here to make sure this is a string. But how? + filename = (gchar*)selection_data->data; + + + UT_DEBUGMSG(("Drag Data Received: x: %d, y: %d, file: %s\n", x, y, filename)); + + EV_EditMethodContainer * container; + EV_EditMethod * method; + AV_View * view; + + XAP_App * pApp = XAP_App::getApp(); + XAP_Frame * pFrame = pApp->getLastFocussedFrame(); + + // lots of assertions + UT_ASSERT(mthdName != 0); + UT_ASSERT(pApp != 0); + + // get the method container + container = pApp->getEditMethodContainer(); + UT_ASSERT(container != 0); + + // get a handle to the actual EditMethod + method = container->findEditMethodByName (mthdName); + UT_ASSERT(method != 0); + + // get a valid frame + UT_ASSERT(pFrame != 0); + + // obtain a valid view + view = pFrame->getCurrentView(); + UT_ASSERT(view != 0); + + // construct the call data + EV_EditMethodCallData calldata(filename, (filename ? strlen (filename) : 0)); + calldata.m_xPos = x; + calldata.m_yPos = y; + + // actually invoke + method->Fn(view, &calldata); + + // FIXME: What should be returned here? + return 1; +} + gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/) { XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); @@ -1352,8 +1411,12 @@ void XAP_UnixFrameImpl::_createTopLevelW g_signal_connect(G_OBJECT(m_wTopLevelWindow), "key_release_event", G_CALLBACK(_fe::key_release_event), NULL); +#define BOTTOM_TOOLBAR 1; + +#ifndef BOTTOM_TOOLBAR if(m_iFrameMode == XAP_NormalFrame) _createToolbars(); +#endif // Let the app-specific frame code create the contents of // the child area of the window (between the toolbars and @@ -1362,6 +1425,14 @@ void XAP_UnixFrameImpl::_createTopLevelW gtk_container_add(GTK_CONTAINER(m_wVBox), m_wSunkenBox); gtk_widget_show(m_wSunkenBox); + GtkWidget * clipArtPane = _createClipartWindow(); + gtk_container_add(GTK_CONTAINER(m_wVBox), clipArtPane); + +#ifdef BOTTOM_TOOLBAR + if(m_iFrameMode == XAP_NormalFrame) + _createToolbars(); +#endif + // Create statusLet the app-specific frame code create the status bar // if it wants to. we will put it below the document // window (a peer with toolbars and the overall sunkenbox) Index: src/af/xap/unix/xap_UnixFrameImpl.h =================================================================== RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFrameImpl.h,v retrieving revision 1.16.4.1 diff -u -p -r1.16.4.1 xap_UnixFrameImpl.h --- src/af/xap/unix/xap_UnixFrameImpl.h 6 Aug 2006 16:44:18 -0000 1.16.4.1 +++ src/af/xap/unix/xap_UnixFrameImpl.h 9 Aug 2006 06:08:29 -0000 @@ -92,6 +92,7 @@ protected: virtual GtkWidget * _createDocumentWindow() = 0; virtual GtkWidget * _createStatusBarWindow() = 0; + virtual GtkWidget * _createClipartWindow() = 0; bool _updateTitle(); void _createIMContext(GdkWindow* w); @@ -153,6 +154,13 @@ protected: static void sizeAllocate(GtkWidget * widget, GdkEvent */* e */,gpointer /* data */); static gint focusIn(GtkWidget * widget, GdkEvent */* e */,gpointer /* data */); static gint focusOut(GtkWidget * /*widget*/, GdkEvent */* e */,gpointer /* data */); + + static gint drag_data_received_event(GtkWidget* w, GdkDragContext* drag_context, + gint x, gint y, GtkSelectionData* data, guint info, + guint time, gpointer user_data); + static gint drag_drop_event(GtkWidget* w, GdkDragContext* drag_context, gint x, + gint y, GtkSelectionData* data, guint info, guint time, + gpointer user_data); }; friend class _fe; Index: src/af/xap/xp/xap_Frame.h =================================================================== RCS file: /cvsroot/abi/src/af/xap/xp/xap_Frame.h,v retrieving revision 1.103 diff -u -p -r1.103 xap_Frame.h --- src/af/xap/xp/xap_Frame.h 26 Jan 2006 12:48:46 -0000 1.103 +++ src/af/xap/xp/xap_Frame.h 9 Aug 2006 06:08:30 -0000 @@ -155,6 +155,7 @@ public: virtual void toggleLeftRuler(bool /*bRulerOn*/) = 0; virtual void toggleBar(UT_uint32 /* iBarNb */, bool /* bBarOn */) { } virtual void toggleStatusBar(bool /* bStatusBarOn */) { } + virtual void toggleClipartPane(bool /* bClipartPaneOn */) { } virtual bool getBarVisibility(UT_uint32 iBarNb) { return true; } EV_Mouse * getMouse() { return m_pFrameImpl->m_pMouse; } @@ -264,6 +265,7 @@ private: bool m_bFirstDraw; // WL_REFACTOR: should this go into the helper? bool m_bShowStatusbar; + bool m_bShowClipartPane; bool m_bShowMenubar; bool m_bIsFrameLocked; Index: src/wp/ap/unix/GNUmakefile.am =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/GNUmakefile.am,v retrieving revision 1.61 diff -u -p -r1.61 GNUmakefile.am --- src/wp/ap/unix/GNUmakefile.am 5 Jul 2005 20:49:59 -0000 1.61 +++ src/wp/ap/unix/GNUmakefile.am 9 Aug 2006 06:08:32 -0000 @@ -107,6 +107,7 @@ libWpAp_unix_a_SOURCES=\ ap_@ABI_FE@Dialog_MailMerge.cpp \ ap_@ABI_FE@Prefs.cpp \ ap_@ABI_FE@StatusBar.cpp \ + ap_@ABI_FE@ClipartPane.cpp \ ap_@ABI_FE@Toolbar_FontCombo.cpp \ ap_@ABI_FE@Toolbar_SizeCombo.cpp \ ap_@ABI_FE@Toolbar_StyleCombo.cpp \ Index: src/wp/ap/unix/ap_UnixFrame.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixFrame.cpp,v retrieving revision 1.137.4.1 diff -u -p -r1.137.4.1 ap_UnixFrame.cpp --- src/wp/ap/unix/ap_UnixFrame.cpp 6 Aug 2006 16:44:18 -0000 1.137.4.1 +++ src/wp/ap/unix/ap_UnixFrame.cpp 9 Aug 2006 06:08:33 -0000 @@ -42,6 +42,7 @@ #include "ap_UnixLeftRuler.h" #include "xap_UnixFontManager.h" #include "ap_UnixStatusBar.h" +#include "ap_UnixClipartPane.h" #include "ap_UnixViewListener.h" #include "xap_UnixDialogHelper.h" #if 1 @@ -463,6 +464,19 @@ void AP_UnixFrame::toggleStatusBar(bool pFrameData->m_pStatusBar->hide(); } +void AP_UnixFrame::toggleClipartPane(bool bClipartPaneOn) +{ + UT_DEBUGMSG(("AP_UnixFrame::toggleClipartPane %d\n", bClipartPaneOn)); + + AP_FrameData *pFrameData = static_cast (getFrameData()); + UT_ASSERT(pFrameData); + + if (bClipartPaneOn) + pFrameData->m_pClipartPane->show(); + else // turning clipart pane off + pFrameData->m_pClipartPane->hide(); +} + bool AP_UnixFrame::_createViewGraphics(GR_Graphics *& pG, UT_uint32 iZoom) { XAP_UnixFontManager * fontManager = (static_cast(XAP_App::getApp())->getFontManager()); Index: src/wp/ap/unix/ap_UnixFrame.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixFrame.h,v retrieving revision 1.32.4.1 diff -u -p -r1.32.4.1 ap_UnixFrame.h --- src/wp/ap/unix/ap_UnixFrame.h 6 Aug 2006 16:44:18 -0000 1.32.4.1 +++ src/wp/ap/unix/ap_UnixFrame.h 9 Aug 2006 06:08:33 -0000 @@ -52,6 +52,7 @@ public: virtual void toggleLeftRuler(bool bRulerOn); virtual void toggleBar(UT_uint32 iBarNb, bool bBarOn); virtual void toggleStatusBar(bool bStatusBarOn); + virtual void toggleClipartPane(bool bStatusPaneOn); protected: friend class AP_UnixFrameImpl; Index: src/wp/ap/unix/ap_UnixFrameImpl.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixFrameImpl.cpp,v retrieving revision 1.26.4.1 diff -u -p -r1.26.4.1 ap_UnixFrameImpl.cpp --- src/wp/ap/unix/ap_UnixFrameImpl.cpp 6 Aug 2006 16:44:18 -0000 1.26.4.1 +++ src/wp/ap/unix/ap_UnixFrameImpl.cpp 9 Aug 2006 06:08:33 -0000 @@ -8,6 +8,7 @@ #include "xap_UnixApp.h" #include "xap_UnixDialogHelper.h" #include "ap_UnixStatusBar.h" +#include "ap_UnixClipartPane.h" #include "gr_UnixGraphics.h" #include "ut_debugmsg.h" @@ -173,6 +174,14 @@ GtkWidget * AP_UnixFrameImpl::_createDoc // create a drawing area in the for our document window. m_dArea = createDrawingArea (); + + // should this go in createDrawingArea???? + static GtkTargetEntry target_list[] = { + { "STRING", 0, 0 } + }; + static guint n_targets = G_N_ELEMENTS (target_list); + gtk_drag_dest_set(m_dArea, GTK_DEST_DEFAULT_MOTION, target_list, n_targets, GDK_ACTION_COPY); + g_object_set_data(G_OBJECT(m_dArea), "user_data", this); UT_DEBUGMSG(("!!! drawing area m_dArea created! %x for %x \n",m_dArea,this)); GTK_WIDGET_SET_FLAGS (m_dArea, GTK_CAN_FOCUS); // allow it to be focussed @@ -204,6 +213,12 @@ GtkWidget * AP_UnixFrameImpl::_createDoc g_signal_connect(G_OBJECT(m_dArea), "configure_event", G_CALLBACK(XAP_UnixFrameImpl::_fe::configure_event), NULL); + g_signal_connect(G_OBJECT(m_dArea), "drag-drop", + G_CALLBACK(XAP_UnixFrameImpl::_fe::drag_drop_event), NULL); + + g_signal_connect(G_OBJECT(m_dArea), "drag-data-received", + G_CALLBACK(XAP_UnixFrameImpl::_fe::drag_data_received_event), NULL); + // focus and XIM related #ifdef HAVE_HILDON const char focus_out_event_name[] = "focus-out-event"; @@ -320,6 +335,18 @@ void AP_UnixFrameImpl::_createWindow() } } +GtkWidget * AP_UnixFrameImpl::_createClipartWindow() +{ + XAP_Frame* pFrame = getFrame(); + AP_UnixClipartPane * pUnixClipartPane = new AP_UnixClipartPane(pFrame); + UT_ASSERT(pUnixClipartPane); + + static_cast(pFrame->getFrameData())->m_pClipartPane = pUnixClipartPane; + + return pUnixClipartPane->createWidget(); +} + + GtkWidget * AP_UnixFrameImpl::_createStatusBarWindow() { XAP_Frame* pFrame = getFrame(); @@ -328,6 +355,8 @@ GtkWidget * AP_UnixFrameImpl::_createSta static_cast(pFrame->getFrameData())->m_pStatusBar = pUnixStatusBar; + static_cast(pFrame->getFrameData())->m_pStatusBar->hide(); + return pUnixStatusBar->createWidget(); } Index: src/wp/ap/unix/ap_UnixFrameImpl.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixFrameImpl.h,v retrieving revision 1.9.4.1 diff -u -p -r1.9.4.1 ap_UnixFrameImpl.h --- src/wp/ap/unix/ap_UnixFrameImpl.h 6 Aug 2006 16:44:18 -0000 1.9.4.1 +++ src/wp/ap/unix/ap_UnixFrameImpl.h 9 Aug 2006 06:08:33 -0000 @@ -54,6 +54,7 @@ class AP_UnixFrameImpl : public XAP_Unix virtual GtkWidget * _createDocumentWindow(); virtual GtkWidget * _createStatusBarWindow(); + virtual GtkWidget * _createClipartWindow(); virtual void _setWindowIcon(); void _setScrollRange(apufi_ScrollType scrollType, int iValue, gfloat fUpperLimit, gfloat fSize); Index: src/wp/ap/xp/GNUmakefile.am =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/GNUmakefile.am,v retrieving revision 1.32.4.1 diff -u -p -r1.32.4.1 GNUmakefile.am --- src/wp/ap/xp/GNUmakefile.am 8 Aug 2006 08:35:57 -0000 1.32.4.1 +++ src/wp/ap/xp/GNUmakefile.am 9 Aug 2006 06:08:33 -0000 @@ -102,6 +102,7 @@ libWpAp_xp_a_SOURCES= \ ap_Preview_Abi.cpp \ ap_Ruler.cpp \ ap_StatusBar.cpp \ + ap_ClipartPane.cpp \ ap_Strings.cpp \ ap_Toolbar_ActionSet.cpp \ ap_Toolbar_Functions.cpp \ Index: src/wp/ap/xp/ap_EditMethods.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_EditMethods.cpp,v retrieving revision 1.822.4.2 diff -u -p -r1.822.4.2 ap_EditMethods.cpp --- src/wp/ap/xp/ap_EditMethods.cpp 8 Aug 2006 08:35:57 -0000 1.822.4.2 +++ src/wp/ap/xp/ap_EditMethods.cpp 9 Aug 2006 06:08:43 -0000 @@ -393,6 +393,8 @@ public: static EV_EditMethod_Fn printTB; static EV_EditMethod_Fn printPreview; static EV_EditMethod_Fn printDirectly; + static EV_EditMethod_Fn showHideClipart; + static EV_EditMethod_Fn fileInsertGraphicAtXY; static EV_EditMethod_Fn fileInsertGraphic; static EV_EditMethod_Fn fileInsertPageBackgroundGraphic; static EV_EditMethod_Fn insertClipart; @@ -854,6 +856,7 @@ static EV_EditMethod s_arrayEditMethods[ EV_EditMethod(NF(fileExport), 0, ""), EV_EditMethod(NF(fileImport), 0, ""), EV_EditMethod(NF(fileInsertGraphic), 0, ""), + EV_EditMethod(NF(fileInsertGraphicAtXY), 0, ""), EV_EditMethod(NF(fileInsertPageBackgroundGraphic), 0, ""), EV_EditMethod(NF(fileNew), _A_, ""), EV_EditMethod(NF(fileNewUsingTemplate), _A_, ""), @@ -1050,6 +1053,7 @@ static EV_EditMethod s_arrayEditMethods[ EV_EditMethod(NF(setStyleHeading1), 0, ""), EV_EditMethod(NF(setStyleHeading2), 0, ""), EV_EditMethod(NF(setStyleHeading3), 0, ""), + EV_EditMethod(NF(showHideClipart), 0, ""), EV_EditMethod(NF(singleSpace), 0, ""), EV_EditMethod(NF(sortColsAscend), 0, ""), EV_EditMethod(NF(sortColsDescend), 0, ""), @@ -3577,6 +3581,89 @@ UT_return_val_if_fail(pDialog, false); return ret; } +Defun(showHideClipart) +{ + UT_DEBUGMSG(("show/hide clipart pane\n")); + + CHECK_FRAME; + XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); + UT_return_val_if_fail(pFrame, false); + + AP_FrameData *pFrameData = static_cast (pFrame->getFrameData()); + + // FIXME: Do we really need this? + UT_return_val_if_fail(pFrameData, false); // don't do anything if fullscreen + if (pFrameData->m_bIsFullScreen) + return false; + + + // toggle the view status bit + pFrameData->m_bShowClipartPane = ! pFrameData->m_bShowClipartPane; + + // actually do the dirty work + pFrame->toggleClipartPane(pFrameData->m_bShowClipartPane); + + return true; +} + +Defun(fileInsertGraphicAtXY) +{ + CHECK_FRAME; + ABIWORD_VIEW; + XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); + + UT_sint32 x = pCallData->m_xPos; + UT_sint32 y = pCallData->m_yPos; + UT_UTF8String utf8(pCallData->m_pData, pCallData->m_dataLength); + const char * pNewFile = reinterpret_cast(utf8.utf8_str()); + + UT_DEBUGMSG(("Inserting file: %s at %d,%d\n", pNewFile, x,y)); + + PT_DocPosition pos = pView->getDocPositionFromXY(x, y); + PT_DocPosition oldPos = pView->getPoint(); + pView->setPoint(pos); + + UT_DEBUGMSG(("point %d.%d translates to position %d\n", x,y, pos)); + + IE_ImpGraphic *pIEG; + FG_Graphic* pFG; + IEGraphicFileType iegft = IEGFT_Unknown; + + UT_Error errorCode; + + errorCode = IE_ImpGraphic::constructImporter(pNewFile, iegft, &pIEG); + if(errorCode != UT_OK) + { + s_CouldNotLoadFileMessage(pFrame, pNewFile, errorCode); + return false; + } + + errorCode = pIEG->importGraphic(pNewFile, &pFG); + if(errorCode != UT_OK || !pFG) + { + s_CouldNotLoadFileMessage(pFrame, pNewFile, errorCode); + DELETEP(pIEG); + return false; + } + + DELETEP(pIEG); + + errorCode = pView->cmdInsertGraphic(pFG); + if (errorCode != UT_OK) + { + s_CouldNotLoadFileMessage(pFrame, pNewFile, errorCode); + + DELETEP(pFG); + return false; + } + + pView->setPoint(oldPos); + DELETEP(pFG); + + return true; +} + + Defun1(fileInsertGraphic) { CHECK_FRAME; Index: src/wp/ap/xp/ap_FrameData.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_FrameData.cpp,v retrieving revision 1.19.4.2 diff -u -p -r1.19.4.2 ap_FrameData.cpp --- src/wp/ap/xp/ap_FrameData.cpp 8 Aug 2006 08:35:58 -0000 1.19.4.2 +++ src/wp/ap/xp/ap_FrameData.cpp 9 Aug 2006 06:08:43 -0000 @@ -25,6 +25,7 @@ #include "ap_TopRuler.h" #include "ap_LeftRuler.h" #include "ap_StatusBar.h" +#include "ap_ClipartPane.h" #include "xap_App.h" /*****************************************************************/ @@ -37,6 +38,7 @@ AP_FrameData::AP_FrameData() m_pTopRuler = NULL; m_pLeftRuler = NULL; m_pStatusBar = NULL; + m_pClipartPane = NULL; m_pViewMode = VIEW_PRINT; @@ -48,6 +50,7 @@ AP_FrameData::AP_FrameData() m_bShowPara = true; m_bInsertMode = true; m_bShowStatusBar = true; + m_bShowClipartPane = false; m_bIsFullScreen = false; bool b; Index: src/wp/ap/xp/ap_FrameData.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_FrameData.h,v retrieving revision 1.17 diff -u -p -r1.17 ap_FrameData.h --- src/wp/ap/xp/ap_FrameData.h 26 Jan 2006 12:48:48 -0000 1.17 +++ src/wp/ap/xp/ap_FrameData.h 9 Aug 2006 06:08:43 -0000 @@ -29,6 +29,7 @@ class FL_DocLayout; class AP_TopRuler; class AP_LeftRuler; class AP_StatusBar; +class AP_ClipartPane; class XAP_App; class EV_Toolbar; @@ -53,12 +54,14 @@ public: bool m_bShowRuler; bool m_bShowBar[4]; // TODO: 4 = NB_OF_TOOLBARS... bool m_bShowStatusBar; + bool m_bShowClipartPane; bool m_bShowPara; bool m_bIsFullScreen; AP_TopRuler * m_pTopRuler; AP_LeftRuler * m_pLeftRuler; EV_Toolbar * m_pToolbar[4]; // TODO: 4 = NB_OF_TOOLBARS... AP_StatusBar * m_pStatusBar; + AP_ClipartPane * m_pClipartPane; ViewMode m_pViewMode; }; Index: src/wp/ap/xp/ap_StatusBar.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_StatusBar.h,v retrieving revision 1.20 diff -u -p -r1.20 ap_StatusBar.h --- src/wp/ap/xp/ap_StatusBar.h 23 Mar 2004 00:13:26 -0000 1.20 +++ src/wp/ap/xp/ap_StatusBar.h 9 Aug 2006 06:08:43 -0000 @@ -21,7 +21,7 @@ #define AP_STATUSBAR_H #include -// Class for dealing with the status bar at the bottom of +// Class for dealing with the clipart pane at the bottom of // the frame. #include "ut_types.h" Index: src/wp/ap/xp/ap_String_Id.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_String_Id.h,v retrieving revision 1.324 diff -u -p -r1.324 ap_String_Id.h --- src/wp/ap/xp/ap_String_Id.h 10 Dec 2005 17:22:07 -0000 1.324 +++ src/wp/ap/xp/ap_String_Id.h 9 Aug 2006 06:08:45 -0000 @@ -1425,6 +1425,7 @@ dcl(TOOLBAR_LABEL_3COLUMN,"3 Columns") dcl(TOOLBAR_LABEL_VIEW_SHOWPARA,"Show All") dcl(TOOLBAR_LABEL_ZOOM,"Zoom") dcl(TOOLBAR_LABEL_VIEW_FULL_SCREEN,"Full Screen") +dcl(TOOLBAR_LABEL_SHOW_HIDE_CLIPART,"Show/Hide Clipart") dcl(TOOLBAR_LABEL_LISTS_BULLETS,"Bullets") dcl(TOOLBAR_LABEL_LISTS_NUMBERS,"Numbering") dcl(TOOLBAR_LABEL_COLOR_FORE,"Font color") @@ -1497,6 +1498,7 @@ dcl(TOOLBAR_STATUSLINE_3COLUMN,"3 Column dcl(TOOLBAR_STATUSLINE_VIEW_SHOWPARA,"Show/hide formatting marks") dcl(TOOLBAR_STATUSLINE_ZOOM,"Zoom") dcl(TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN,"Full Screen") +dcl(TOOLBAR_STATUSLINE_SHOW_HIDE_CLIPART,"Show/Hide Clipart") dcl(TOOLBAR_STATUSLINE_LISTS_BULLETS,"Bullets") dcl(TOOLBAR_STATUSLINE_LISTS_NUMBERS,"Numbering") dcl(TOOLBAR_STATUSLINE_COLOR_FORE,"Font color") @@ -1569,6 +1571,7 @@ dcl(TOOLBAR_TOOLTIP_3COLUMN,"3 Columns") dcl(TOOLBAR_TOOLTIP_VIEW_SHOWPARA,"Show/hide formatting marks") dcl(TOOLBAR_TOOLTIP_ZOOM,"Zoom") dcl(TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN,"Full Screen") +dcl(TOOLBAR_TOOLTIP_SHOW_HIDE_CLIPART,"Show/Hide Clipart") dcl(TOOLBAR_TOOLTIP_LISTS_BULLETS,"Bullets") dcl(TOOLBAR_TOOLTIP_LISTS_NUMBERS,"Numbering") dcl(TOOLBAR_TOOLTIP_COLOR_FORE,"Font color") Index: src/wp/ap/xp/ap_TB_Layouts_SugarOps.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/Attic/ap_TB_Layouts_SugarOps.h,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 ap_TB_Layouts_SugarOps.h --- src/wp/ap/xp/ap_TB_Layouts_SugarOps.h 8 Aug 2006 08:35:58 -0000 1.1.2.1 +++ src/wp/ap/xp/ap_TB_Layouts_SugarOps.h 9 Aug 2006 06:08:45 -0000 @@ -30,18 +30,23 @@ */ BeginLayout(OlpcOps, AP_STRING_ID_TB_Simple, AP_PREF_KEY_StandardBarVisible) - ToolbarItem(AP_TOOLBAR_ID_FMT_BOLD) - ToolbarItem(AP_TOOLBAR_ID_FMT_ITALIC) - ToolbarItem(AP_TOOLBAR_ID_FMT_UNDERLINE) + ToolbarItem(AP_TOOLBAR_ID_FMT_CHOOSE) Spacer() - ToolbarItem(AP_TOOLBAR_ID_ALIGN_LEFT) - ToolbarItem(AP_TOOLBAR_ID_ALIGN_CENTER) - ToolbarItem(AP_TOOLBAR_ID_ALIGN_RIGHT) - ToolbarItem(AP_TOOLBAR_ID_ALIGN_JUSTIFY) + ToolbarItem(AP_TOOLBAR_ID_LISTS_NUMBERS) + ToolbarItem(AP_TOOLBAR_ID_LISTS_BULLETS) + + ToolbarItem(AP_TOOLBAR_ID_UNINDENT) + ToolbarItem(AP_TOOLBAR_ID_INDENT) + + Spacer() + ToolbarItem(AP_TOOLBAR_ID_IMG) Spacer() ToolbarItem(AP_TOOLBAR_ID_EDIT_UNDO) ToolbarItem(AP_TOOLBAR_ID_EDIT_REDO) + Spacer() + ToolbarItem(AP_TOOLBAR_ID_SHOW_HIDE_CLIPART) + EndLayout() Index: src/wp/ap/xp/ap_Toolbar_ActionSet.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp,v retrieving revision 1.65 diff -u -p -r1.65 ap_Toolbar_ActionSet.cpp --- src/wp/ap/xp/ap_Toolbar_ActionSet.cpp 3 Nov 2005 17:17:01 -0000 1.65 +++ src/wp/ap/xp/ap_Toolbar_ActionSet.cpp 9 Aug 2006 06:08:45 -0000 @@ -77,6 +77,7 @@ EV_Toolbar_ActionSet * AP_CreateToolbarA _s(AP_TOOLBAR_ID_FILE_SAVEAS, EV_TBIT_PushButton, "fileSaveAs", AV_CHG_NONE, NULL); _s(AP_TOOLBAR_ID_FILE_PRINT, EV_TBIT_PushButton, "printTB", AV_CHG_NONE, NULL); _s(AP_TOOLBAR_ID_FILE_PRINT_PREVIEW, EV_TBIT_PushButton, "printPreview", AV_CHG_NONE, NULL); + _s(AP_TOOLBAR_ID_SHOW_HIDE_CLIPART, EV_TBIT_PushButton, "showHideClipart", AV_CHG_NONE, NULL); // AV_CHG_ALL doesn't seem right here. TODO! _s(AP_TOOLBAR_ID_SPELLCHECK, EV_TBIT_PushButton, "dlgSpell", AV_CHG_ALL, ap_ToolbarGetState_Spelling); @@ -103,6 +104,8 @@ EV_Toolbar_ActionSet * AP_CreateToolbarA _s(AP_TOOLBAR_ID_FMT_CHOOSE, EV_TBIT_PushButton, "dlgFont", AV_CHG_NONE, NULL); _s(AP_TOOLBAR_ID_VIEW_FULL_SCREEN, EV_TBIT_PushButton, "viewFullScreen", AV_CHG_NONE, NULL); #endif + + _s(AP_TOOLBAR_ID_FMT_SIZE, EV_TBIT_ComboBox, "fontSize", AV_CHG_FMTCHAR | AV_CHG_MOTION, ap_ToolbarGetState_CharFmt); _s(AP_TOOLBAR_ID_FMT_BOLD, EV_TBIT_ToggleButton, "toggleBold", AV_CHG_FMTCHAR | AV_CHG_MOTION, ap_ToolbarGetState_CharFmt); Index: src/wp/ap/xp/ap_Toolbar_Iconmap.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Toolbar_Iconmap.h,v retrieving revision 1.17 diff -u -p -r1.17 ap_Toolbar_Iconmap.h --- src/wp/ap/xp/ap_Toolbar_Iconmap.h 5 Jul 2005 14:08:22 -0000 1.17 +++ src/wp/ap/xp/ap_Toolbar_Iconmap.h 9 Aug 2006 06:08:46 -0000 @@ -194,4 +194,3 @@ toolbariconmap(_BOGUS2__,NoIcon) toolbariconmap(FMT_CHOOSE,tb_stock_font_xpm) toolbariconmap(VIEW_FULL_SCREEN,tb_view_full_screen_xpm) #endif - Index: src/wp/ap/xp/ap_Toolbar_Id_List.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Toolbar_Id_List.h,v retrieving revision 1.5 diff -u -p -r1.5 ap_Toolbar_Id_List.h --- src/wp/ap/xp/ap_Toolbar_Id_List.h 5 Jul 2005 14:08:22 -0000 1.5 +++ src/wp/ap/xp/ap_Toolbar_Id_List.h 9 Aug 2006 06:08:46 -0000 @@ -50,6 +50,7 @@ toolbaritem(FILE_SAVE) toolbaritem(FILE_SAVEAS) toolbaritem(FILE_PRINT) toolbaritem(FILE_PRINT_PREVIEW) +toolbaritem(SHOW_HIDE_CLIPART) toolbaritem(EDIT_UNDO) toolbaritem(EDIT_REDO) toolbaritem(EDIT_CUT) @@ -118,5 +119,3 @@ toolbaritem(MERGELEFT) toolbaritem(MERGERIGHT) toolbaritem(MERGEABOVE) toolbaritem(MERGEBELOW) - -