? erikpukinskis-2006-07-25-1036.diff ? erikpukinskis-2006-07-25-1057.diff ? erikpukinskis-2006-07-25-1112.diff ? erikpukinskis-2006-07-25-1114.diff ? initialize ? 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/xp/ap_TB_Layouts_OlpcOps.h ? src/wp/test/unix/testwrap.sh ? src/wp/test/win/testwrap.sh Index: src/af/ev/xp/ev_Toolbar_Layouts.cpp =================================================================== RCS file: /cvsroot/abi/src/af/ev/xp/ev_Toolbar_Layouts.cpp,v retrieving revision 1.8 diff -u -p -r1.8 ev_Toolbar_Layouts.cpp --- src/af/ev/xp/ev_Toolbar_Layouts.cpp 4 Feb 2003 06:53:14 -0000 1.8 +++ src/af/ev/xp/ev_Toolbar_Layouts.cpp 25 Jul 2006 15:12:20 -0000 @@ -47,7 +47,6 @@ EV_Toolbar_LayoutFlags EV_Toolbar_Layout } /*****************************************************************/ - EV_Toolbar_Layout::EV_Toolbar_Layout(const char * szName, UT_uint32 nrLayoutItems) { UT_ASSERT(nrLayoutItems > 0); Index: src/af/xap/unix/xap_UnixFrameImpl.cpp =================================================================== RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFrameImpl.cpp,v retrieving revision 1.103 diff -u -p -r1.103 xap_UnixFrameImpl.cpp --- src/af/xap/unix/xap_UnixFrameImpl.cpp 7 Jun 2006 15:21:33 -0000 1.103 +++ src/af/xap/unix/xap_UnixFrameImpl.cpp 25 Jul 2006 15:12:23 -0000 @@ -1235,7 +1235,19 @@ void XAP_UnixFrameImpl::_createTopLevelW if(m_iFrameMode == XAP_NormalFrame) { +#if HAVE_SUGAR + GtkWidget* pPlugWidget = gtk_plug_new(0); + GtkPlug* pPlug = GTK_PLUG(pPlugWidget); + m_wTopLevelWindow = pPlugWidget; + int id = gtk_plug_get_id(pPlug); + + // We need to pass this on to Sugar automatically at some point. Maybe + // use d-Bus? + printf("Plug ID: %d\n", id); +#else m_wTopLevelWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); +#endif + gtk_window_set_title(GTK_WINDOW(m_wTopLevelWindow), XAP_App::getApp()->getApplicationTitleForTitleBar()); gtk_window_set_resizable(GTK_WINDOW(m_wTopLevelWindow), TRUE); @@ -1316,6 +1328,7 @@ void XAP_UnixFrameImpl::_createTopLevelW g_object_set_data(G_OBJECT(m_wVBox),"user_data", this); gtk_container_add(GTK_CONTAINER(m_wTopLevelWindow), m_wVBox); +#if !HAVE_SUGAR if (m_iFrameMode != XAP_NoMenusWindowLess) { // synthesize a menu from the info in our base class. m_pUnixMenu = new EV_UnixMenuBar(static_cast(XAP_App::getApp()), getFrame(), m_szMenuLayoutName, @@ -1324,6 +1337,7 @@ void XAP_UnixFrameImpl::_createTopLevelW bResult = m_pUnixMenu->synthesizeMenuBar(); UT_ASSERT(bResult); } +#endif // create a toolbar instance for each toolbar listed in our base class. // TODO for some reason, the toolbar functions require the TLW to be @@ -1581,6 +1595,7 @@ void XAP_UnixFrameImpl::_setGeometry () */ void XAP_UnixFrameImpl::_rebuildMenus(void) { +#if (!HAVE_SUGAR) // destroy old menu m_pUnixMenu->destroy(); DELETEP(m_pUnixMenu); @@ -1592,6 +1607,7 @@ void XAP_UnixFrameImpl::_rebuildMenus(vo UT_ASSERT(m_pUnixMenu); bool bResult = m_pUnixMenu->rebuildMenuBar(); UT_ASSERT(bResult); +#endif } /*! Index: src/af/xap/xp/xap_Features.h =================================================================== RCS file: /cvsroot/abi/src/af/xap/xp/xap_Features.h,v retrieving revision 1.5 diff -u -p -r1.5 xap_Features.h --- src/af/xap/xp/xap_Features.h 21 Jun 2005 17:32:56 -0000 1.5 +++ src/af/xap/xp/xap_Features.h 25 Jul 2006 15:12:23 -0000 @@ -33,6 +33,8 @@ # include "xap_Win32Features.h" #elif defined(HAVE_HILDON) # include "xap_EmbeddedFeatures.h" +#elif defined(HAVE_SUGAR) +# include "xap_EmbeddedFeatures.h" #endif Index: src/wp/ap/unix/ap_UnixApp.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixApp.cpp,v retrieving revision 1.298 diff -u -p -r1.298 ap_UnixApp.cpp --- src/wp/ap/unix/ap_UnixApp.cpp 30 Apr 2006 14:02:06 -0000 1.298 +++ src/wp/ap/unix/ap_UnixApp.cpp 25 Jul 2006 15:12:28 -0000 @@ -392,8 +392,9 @@ XAP_Frame * AP_UnixApp::newFrame(void) { AP_UnixFrame * pUnixFrame = new AP_UnixFrame(); - if (pUnixFrame) + if (pUnixFrame) { pUnixFrame->initialize(); + } return pUnixFrame; } Index: src/wp/ap/xp/ap_EditMethods.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_EditMethods.cpp,v retrieving revision 1.822 diff -u -p -r1.822 ap_EditMethods.cpp --- src/wp/ap/xp/ap_EditMethods.cpp 31 Jan 2006 12:05:35 -0000 1.822 +++ src/wp/ap/xp/ap_EditMethods.cpp 25 Jul 2006 15:12:38 -0000 @@ -9070,7 +9070,7 @@ Defun1(viewTB4) Defun1(viewStd) { -#if !XP_SIMPLE_TOOLBAR +#if !XP_SIMPLE_TOOLBAR && !HAVE_SUGAR CHECK_FRAME; // TODO: Share this function with viewFormat & viewExtra XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); @@ -9105,7 +9105,7 @@ Defun1(viewStd) Defun1(viewFormat) { -#if !XP_SIMPLE_TOOLBAR +#if !XP_SIMPLE_TOOLBAR && !HAVE_SUGAR CHECK_FRAME; XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); UT_return_val_if_fail(pFrame, false); @@ -9139,7 +9139,7 @@ Defun1(viewFormat) Defun1(viewTable) { -#if !XP_SIMPLE_TOOLBAR +#if !XP_SIMPLE_TOOLBAR && !HAVE_SUGAR CHECK_FRAME; XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); UT_return_val_if_fail(pFrame, false); @@ -9171,7 +9171,7 @@ UT_return_val_if_fail(pFrameData, false) Defun1(viewExtra) { -#if !XP_SIMPLE_TOOLBAR +#if !XP_SIMPLE_TOOLBAR && !HAVE_SUGAR CHECK_FRAME; XAP_Frame * pFrame = static_cast ( pAV_View->getParentData()); UT_return_val_if_fail(pFrame, false); Index: src/wp/ap/xp/ap_FrameData.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_FrameData.cpp,v retrieving revision 1.19 diff -u -p -r1.19 ap_FrameData.cpp --- src/wp/ap/xp/ap_FrameData.cpp 26 Jan 2006 12:48:48 -0000 1.19 +++ src/wp/ap/xp/ap_FrameData.cpp 25 Jul 2006 15:12:38 -0000 @@ -59,7 +59,7 @@ AP_FrameData::AP_FrameData() if (XAP_App::getApp()->getPrefsValueBool(AP_PREF_KEY_RulerVisible, &b)) m_bShowRuler = b; -#if XP_SIMPLE_TOOLBAR +#if XP_SIMPLE_TOOLBAR || HAVE_SUGAR m_bShowBar[0] = true; #else if (XAP_App::getApp()->getPrefsValueBool(AP_PREF_KEY_StandardBarVisible, &b)) Index: src/wp/ap/xp/ap_Prefs_SchemeIds.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h,v retrieving revision 1.49 diff -u -p -r1.49 ap_Prefs_SchemeIds.h --- src/wp/ap/xp/ap_Prefs_SchemeIds.h 25 Jan 2006 22:39:18 -0000 1.49 +++ src/wp/ap/xp/ap_Prefs_SchemeIds.h 25 Jul 2006 15:12:38 -0000 @@ -125,7 +125,9 @@ #define AP_PREF_KEY_ToolbarLayouts "ToolbarLayouts" -#if XP_SIMPLE_TOOLBAR +#if HAVE_SUGAR +# define AP_PREF_DEFAULT_ToolbarLayouts "OlpcOps" +#elif XP_SIMPLE_TOOLBAR # define AP_PREF_DEFAULT_ToolbarLayouts "SimpleOps" /* values in BeginLayout() */ #else # define AP_PREF_DEFAULT_ToolbarLayouts "FileEditOps FormatOps TableOps ExtraOps" /* values in BeginLayout() */ Index: src/wp/ap/xp/ap_Toolbar_Layouts_All.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Toolbar_Layouts_All.h,v retrieving revision 1.7 diff -u -p -r1.7 ap_Toolbar_Layouts_All.h --- src/wp/ap/xp/ap_Toolbar_Layouts_All.h 21 Jun 2005 17:33:00 -0000 1.7 +++ src/wp/ap/xp/ap_Toolbar_Layouts_All.h 25 Jul 2006 15:12:38 -0000 @@ -29,6 +29,8 @@ #if XP_SIMPLE_TOOLBAR #include "ap_TB_Layouts_SimpleOps.h" +#elif HAVE_SUGAR +#include "ap_TB_Layouts_OlpcOps.h" #else #include "ap_TB_Layouts_FileEditOps.h" #include "ap_TB_Layouts_FormatOps.h"