Only in abi/src: GNUmakefile.in Only in abi/src/af: GNUmakefile.in Only in abi/src/af/ev: GNUmakefile.in Only in abi/src/af/ev/cocoa: GNUmakefile.in Only in abi/src/af/ev/qnx: GNUmakefile.in diff -ur maemo/src/af/ev/unix/GNUmakefile.am abi/src/af/ev/unix/GNUmakefile.am --- maemo/src/af/ev/unix/GNUmakefile.am 2005-04-20 22:34:24.000000000 +0100 +++ abi/src/af/ev/unix/GNUmakefile.am 2003-06-10 13:45:16.000000000 +0100 @@ -19,7 +19,7 @@ include $(top_srcdir)/includes.mk INCLUDES= @GTK_CFLAGS@ @GMODULE_CFLAGS@ \ - $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) $(HILDON_CFLAGS) + $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) noinst_LIBRARIES = libEv_unix.a Only in abi/src/af/ev/unix: GNUmakefile.in diff -ur maemo/src/af/ev/unix/ev_UnixMenu.cpp abi/src/af/ev/unix/ev_UnixMenu.cpp --- maemo/src/af/ev/unix/ev_UnixMenu.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/ev/unix/ev_UnixMenu.cpp 2005-01-12 20:31:26.000000000 +0000 @@ -18,11 +18,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ - - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ #include #include @@ -677,13 +672,13 @@ szLabelName = data[0]; szMnemonicName = data[1]; GtkWidget * w; - + if (szLabelName && *szLabelName) { w = s_createNormalMenuEntry(id, pAction->isCheckable(), pAction->isRadio(), szLabelName, szMnemonicName); // find parent menu item GtkWidget * wParent; - bResult = stack.viewTop(reinterpret_cast(&wParent)); + bResult = stack.viewTop(reinterpret_cast(&wParent)); UT_ASSERT(bResult); // bury in parent @@ -738,12 +733,8 @@ // in the keyboard layer, don't do the underline construction, // but instead make a label with no underlines (and no accelerators). - // get the underlined value from the candidate label + // get the underlined value from the candidate label guint keyCode = _ev_get_underlined_char(buf); - -#ifdef HAVE_HILDON - keyCode = GDK_VoidSymbol; -#endif // GTK triggers the menu accelerators off of MOD1 ***without // regard to what XK_ keysym is bound to it. therefore, if @@ -787,7 +778,6 @@ FREEP(dup); } - /* if ((keyCode != GDK_VoidSymbol)) { // bind to top level if parent is top level @@ -806,7 +796,7 @@ // to this widget wd->m_accelGroup = gtk_accel_group_new(); gtk_menu_set_accel_group(GTK_MENU(wsub), wd->m_accelGroup); - */ + // This stuff happens to every label: // // menu items with sub menus attached (w) get this signal @@ -876,7 +866,6 @@ } } -#ifndef HAVE_HILDON // make sure our last item on the stack is the one we started with GtkWidget * wDbg = NULL; bResult = stack.pop(reinterpret_cast(&wDbg)); @@ -886,10 +875,8 @@ // we also have to bind the top level window to our // accelerator group for this menu... it needs to join in // on the action. - gtk_window_add_accel_group(GTK_WINDOW(static_cast(m_pFrame->getFrameImpl())->getTopLevelWindow()), m_accelGroup); gtk_accel_group_lock(m_accelGroup); -#endif return true; } @@ -1175,22 +1162,13 @@ bool EV_UnixMenuBar::synthesizeMenuBar() { GtkWidget * wVBox = static_cast(m_pFrame->getFrameImpl())->getVBoxWidget(); - GtkWidget * wVFrame = static_cast(m_pFrame->getFrameImpl())->getVBoxWidget(); - GtkWidget * wWidget = static_cast(m_pFrame->getFrameImpl())->getTopLevelWindow(); // Just create, don't show the menu bar yet. It is later added and shown -#ifdef HAVE_HILDON - m_wMenuBar = GTK_WIDGET(hildon_appview_get_menu(HILDON_APPVIEW(wWidget))); -#else m_wMenuBar = gtk_menu_bar_new(); -#endif synthesizeMenu(m_wMenuBar); - gtk_widget_show_all(m_wMenuBar); + gtk_widget_show(m_wMenuBar); -#ifndef HAVE_HILDON gtk_box_pack_start(GTK_BOX(wVBox), m_wMenuBar, FALSE, TRUE, 0); -#endif - return true; } @@ -1292,7 +1270,7 @@ // reset the label to what we want it to be GtkWidget * child = gtk_bin_get_child(GTK_BIN(w)); UT_ASSERT(child); - gtk_label_set_text_with_mnemonic(GTK_LABEL(child), buf); + gtk_label_set_text_with_mnemonic(GTK_LABEL(child), buf); } else { @@ -1309,8 +1287,6 @@ w = gtk_radio_menu_item_new_with_mnemonic (NULL, buf); } - -#ifndef HAVE_HILDON if (szMnemonicName && *szMnemonicName) { guint accelKey = 0; @@ -1318,11 +1294,9 @@ _convertStringToAccel(szMnemonicName, accelKey, acMods); // the accel doesn't actually do anything, because all the keyboard actions // are handled at a lower level (we just get an accel label) - gtk_widget_add_accelerator (w, "activate", m_accelGroup, accelKey, acMods, GTK_ACCEL_VISIBLE); } -#endif /* HAVE_HILDON */ - + gtk_widget_show(w); // set menu data to relate to class diff -ur maemo/src/af/ev/unix/ev_UnixMenuBar.h abi/src/af/ev/unix/ev_UnixMenuBar.h --- maemo/src/af/ev/unix/ev_UnixMenuBar.h 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/ev/unix/ev_UnixMenuBar.h 2003-01-23 20:35:40.000000000 +0000 @@ -16,11 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ - - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ #ifndef EV_UNIXMENUBAR_H #define EV_UNIXMENUBAR_H diff -ur maemo/src/af/ev/unix/ev_UnixToolbar.cpp abi/src/af/ev/unix/ev_UnixToolbar.cpp --- maemo/src/af/ev/unix/ev_UnixToolbar.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/ev/unix/ev_UnixToolbar.cpp 2004-05-20 01:21:56.000000000 +0100 @@ -17,11 +17,6 @@ * 02111-1307, USA. */ - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - //for GtkCombo->GtkList #undef GTK_DISABLE_DEPRECATED @@ -69,14 +64,9 @@ #include "../../../wp/ap/xp/ToolbarIcons/tb_text_bgcolor.xpm" #endif // HAVE_GNOME -#ifdef HAVE_HILDON -#include "xap_UnixHildonApp.h" -#endif - /*****************************************************************/ #define COMBO_BUF_LEN 256 - static const GtkTargetEntry s_AbiTBTargets[] = {{"abi-toolbars",0,0}}; @@ -111,7 +101,6 @@ gtk_widget_show (eventbox); gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), eventbox, tooltip_text, tooltip_private_text); - return eventbox; } @@ -652,8 +641,6 @@ bool EV_UnixToolbar::synthesize(void) { - static int count = 0; - count++; // create a GTK toolbar from the info provided. const EV_Toolbar_ActionSet * pToolbarActionSet = m_pUnixApp->getToolbarActionSet(); @@ -689,19 +676,17 @@ m_wToolbar = gtk_toolbar_new(); UT_ASSERT(m_wToolbar); -// gtk_toolbar_set_tooltips(GTK_TOOLBAR(m_wToolbar), TRUE); -// gtk_toolbar_set_style(GTK_TOOLBAR( m_wToolbar), style ); + gtk_toolbar_set_tooltips(GTK_TOOLBAR(m_wToolbar), TRUE); + gtk_toolbar_set_style(GTK_TOOLBAR( m_wToolbar), style ); // // Make the toolbar a destination for drops // -#ifndef HAVE_HILDON gtk_drag_dest_set(m_wToolbar,static_cast(GTK_DEST_DEFAULT_ALL), s_AbiTBTargets,1, GDK_ACTION_COPY); g_signal_connect(G_OBJECT(m_wToolbar),"drag_drop",G_CALLBACK(_wd::s_drag_drop_toolbar),this); -#endif /* HAVE_HILDON */ - + for (UT_uint32 k=0; (k < nrLabelItemsInLayout); k++) { EV_Toolbar_LayoutItem * pLayoutItem = m_pToolbarLayout->getLayoutItem(k); @@ -712,6 +697,7 @@ UT_ASSERT(pAction); EV_Toolbar_Label * pLabel = m_pToolbarLabelSet->getLabel(id); UT_ASSERT(pLabel); + switch (pLayoutItem->getToolbarLayoutFlags()) { case EV_TLF_Normal: @@ -764,7 +750,6 @@ g_object_set_data(G_OBJECT(wwd), "wd_pointer", wd); -#ifndef HAVE_HILDON gtk_drag_source_set(wwd,GDK_BUTTON3_MASK, s_AbiTBTargets,1, GDK_ACTION_COPY); @@ -772,7 +757,6 @@ gtk_drag_dest_set(wwd, GTK_DEST_DEFAULT_ALL, s_AbiTBTargets,1, GDK_ACTION_COPY); -#endif /* HAVE_HILDON */ g_signal_connect(G_OBJECT(wd->m_widget),"drag_begin",G_CALLBACK(_wd::s_drag_begin), wd); g_signal_connect(G_OBJECT(wd->m_widget),"drag_drop",G_CALLBACK(_wd::s_drag_drop), wd); g_signal_connect(G_OBJECT(wd->m_widget),"drag_end",G_CALLBACK(_wd::s_drag_end), wd); @@ -992,28 +976,15 @@ } } -#ifdef HAVE_HILDON - if (count == 2) - { - GtkWidget *wToolbarR = m_wToolbar; - - hildon_appview_set_toolbar(HILDON_APPVIEW(wTLW), - GTK_TOOLBAR(wToolbarR)); - gtk_widget_show_all(wToolbarR); - gtk_widget_show_all(wTLW); - } - -#else // show the complete thing gtk_widget_show(m_wToolbar); - // pack it in a handle box + // pack it in a handle box gtk_container_add(GTK_CONTAINER(m_wHandleBox), m_wToolbar); - gtk_widget_show_all(m_wHandleBox); + gtk_widget_show(m_wHandleBox); - gtk_widget_show_all(gtk_widget_get_parent(wTLW)); + // put it in the vbox gtk_box_pack_start(GTK_BOX(wVBox), m_wHandleBox, FALSE, FALSE, 0); -#endif /* HAVE_HILDON */ return true; } @@ -1200,22 +1171,14 @@ void EV_UnixToolbar::show(void) { if (m_wToolbar) -#ifdef HAVE_HILDON - gtk_widget_show (m_wToolbar); -#else - gtk_widget_show (m_wToolbar->parent); -#endif + gtk_widget_show (m_wToolbar->parent); EV_Toolbar::show(); } void EV_UnixToolbar::hide(void) { if (m_wToolbar) -#ifdef HAVE_HILDON - gtk_widget_hide (m_wToolbar); -#else gtk_widget_hide (m_wToolbar->parent); -#endif EV_Toolbar::hide(); } Only in abi/src/af/ev/xp: GNUmakefile.in diff -ur maemo/src/af/ev/xp/ev_Toolbar.cpp abi/src/af/ev/xp/ev_Toolbar.cpp --- maemo/src/af/ev/xp/ev_Toolbar.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/ev/xp/ev_Toolbar.cpp 2003-06-23 10:33:14.000000000 +0100 @@ -19,10 +19,6 @@ * 02111-1307, USA. */ - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ #include #include @@ -97,3 +93,6 @@ return true; } + + + Only in abi/src/af/gr: GNUmakefile.in Only in abi/src/af/gr/cocoa: GNUmakefile.in Only in abi/src/af/gr/qnx: GNUmakefile.in Only in abi/src/af/gr/unix: GNUmakefile.in Only in abi/src/af/gr/xp: GNUmakefile.in diff -ur maemo/src/af/gr/xp/gr_Graphics.cpp abi/src/af/gr/xp/gr_Graphics.cpp --- maemo/src/af/gr/xp/gr_Graphics.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/af/gr/xp/gr_Graphics.cpp 2005-01-01 00:16:58.000000000 +0000 @@ -1439,11 +1439,13 @@ if(indx < 0) return NULL; + GR_Allocator alloc = (GR_Allocator)m_vAllocators.getNthItem(indx); + if(!alloc) return NULL; - GR_Graphics *tmp = alloc(param); - return tmp; + + return alloc(param); } const char * GR_GraphicsFactory::getClassDescription(UT_uint32 iClassId) const Only in abi/src/af/util: GNUmakefile.in Only in abi/src/af/util/qnx: GNUmakefile.in Only in abi/src/af/util/unix: GNUmakefile.in Only in abi/src/af/util/xp: GNUmakefile.in diff -ur maemo/src/af/xap/GNUmakefile.am abi/src/af/xap/GNUmakefile.am --- maemo/src/af/xap/GNUmakefile.am 2005-04-28 22:12:08.000000000 +0100 +++ abi/src/af/xap/GNUmakefile.am 2003-01-25 00:14:00.000000000 +0000 @@ -25,12 +25,8 @@ if WITH_GNOME objects = $(ABI_OBJECTS) $(ABI_GNOME_OBJECTS) else -if WITH_HILDON -objects = $(ABI_OBJECTS) $(ABI_HILDON_OBJECTS) -else objects = $(ABI_OBJECTS) endif -endif libXap_a_SOURCES = Only in abi/src/af/xap: GNUmakefile.in Only in abi/src/af/xap/cocoa: GNUmakefile.in Only in abi/src/af/xap/qnx: GNUmakefile.in diff -ur maemo/src/af/xap/unix/GNUmakefile.am abi/src/af/xap/unix/GNUmakefile.am --- maemo/src/af/xap/unix/GNUmakefile.am 2005-04-28 22:12:08.000000000 +0100 +++ abi/src/af/xap/unix/GNUmakefile.am 2004-02-17 00:39:10.000000000 +0000 @@ -18,18 +18,12 @@ include $(top_srcdir)/includes.mk -SUBDIRS = - if WITH_GNOME -SUBDIRS += gnome +SUBDIRS = gnome endif -if WITH_HILDON -SUBDIRS += hildon -endif - INCLUDES= -UVERSION @GTK_CFLAGS@ @GMODULE_CFLAGS@ \ - $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) $(OTHER_INCLUDES) $(HILDON_CFLAGS) + $(AF_INCLUDES) $(WP_INCLUDES) $(TEXT_INCLUDES) $(ICONV_INCLUDES) $(OTHER_INCLUDES) noinst_LIBRARIES = libXap_unix.a Only in abi/src/af/xap/unix: GNUmakefile.in diff -ur maemo/src/af/xap/unix/Makefile abi/src/af/xap/unix/Makefile --- maemo/src/af/xap/unix/Makefile 2005-04-28 22:12:08.000000000 +0100 +++ abi/src/af/xap/unix/Makefile 2004-02-23 19:31:48.000000000 +0000 @@ -26,11 +26,6 @@ DIRS= $(ABI_GNOME_DIR) endif -ifeq ($(ABI_OPT_HILDON),1) -DIRS= $(ABI_HILDON_DIR) -endif - - CPPSRCS= xap_UnixApp.cpp \ xap_UnixAppImpl.cpp \ xap_UnixClipboard.cpp \ @@ -42,6 +37,7 @@ xap_UnixDlg_PluginManager.cpp \ xap_UnixDlg_Encoding.cpp \ xap_UnixDlg_FileOpenSaveAs.cpp \ + xap_UnixDlg_FontChooser.cpp \ xap_UnixDlg_History.cpp \ xap_UnixDlg_HTMLOptions.cpp \ xap_UnixDlg_MessageBox.cpp \ @@ -76,12 +72,6 @@ xap_UnixDlg_PrintPreview.cpp endif -# only build these for non-hildon -ifneq ($(ABI_OPT_HILDON),1) -CPPSRCS += xap_UnixDlg_FontChoose.cpp -endif - - TARGETS= $(OBJS) Only in abi/src/af/xap/unix/gnome: GNUmakefile.in Only in maemo/src/af/xap/unix: hildon diff -ur maemo/src/af/xap/unix/xap_UnixApp.cpp abi/src/af/xap/unix/xap_UnixApp.cpp --- maemo/src/af/xap/unix/xap_UnixApp.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixApp.cpp 2004-03-07 20:43:48.000000000 +0000 @@ -16,12 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ - - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - #include #include @@ -56,10 +50,6 @@ #include "xap_UnixPSGraphics.h" #include "gr_UnixGraphics.h" -#ifdef HAVE_HILDON -#include "xap_UnixHildonApp.h" -#endif - UnixNull_Graphics * abi_unixnullgraphics_instance = 0; /*****************************************************************/ @@ -118,31 +108,18 @@ XAP_UnixNullGraphicsAllocInfo ai(NULL, NULL); abi_unixnullgraphics_instance = (UnixNull_Graphics*) XAP_App::getApp()->newGraphics(GRID_UNIX_NULL, ai); } -#ifdef HAVE_HILDON - m_pUnixHildonApp = new XAP_UnixHildonApp(); -#endif } XAP_UnixApp::~XAP_UnixApp() { DELETEP(m_pUnixToolbarIcons); delete m_fontManager; - -#ifdef HAVE_HILDON - delete m_pUnixHildonApp; -#endif } bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) { if (!g_thread_supported ()) g_thread_init (NULL); - -#ifdef HAVE_HILDON - if (!m_pUnixHildonApp->initialize()) - return false; -#endif - // let our base class do it's thing. XAP_App::initialize(szKeyBindingsKey, szKeyBindingsDefaultValue); @@ -168,9 +145,6 @@ void XAP_UnixApp::reallyExit() { -#ifdef HAVE_HILDON - m_pUnixHildonApp->terminate(); -#endif gtk_main_quit(); } @@ -316,3 +290,4 @@ { m_eventTime = eventTime; } + diff -ur maemo/src/af/xap/unix/xap_UnixApp.h abi/src/af/xap/unix/xap_UnixApp.h --- maemo/src/af/xap/unix/xap_UnixApp.h 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixApp.h 2004-02-10 15:19:48.000000000 +0000 @@ -17,11 +17,6 @@ * 02111-1307, USA. */ -/* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - #ifndef XAP_UNIXAPP_H #define XAP_UNIXAPP_H @@ -114,10 +109,6 @@ UT_uint32 m_eventTime; // e->time field of a recent X event // (we use this to sync clipboard // operations with the server). - -#ifdef HAVE_HILDON - class XAP_UnixHildonApp * m_pUnixHildonApp; -#endif }; diff -ur maemo/src/af/xap/unix/xap_UnixDialogHelper.cpp abi/src/af/xap/unix/xap_UnixDialogHelper.cpp --- maemo/src/af/xap/unix/xap_UnixDialogHelper.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixDialogHelper.cpp 2005-01-30 16:00:14.000000000 +0000 @@ -17,13 +17,6 @@ * 02111-1307, USA. */ - /* - * @NOTATION@ - * Port to HILDON SDK - * Author: Renato Araujo - */ - - // for gtk_label_parse_uline - nothing we can do about this... #undef GTK_DISABLE_DEPRECATED @@ -558,7 +551,6 @@ static void sAddHelpButton (GtkDialog * me, XAP_Dialog * pDlg) { -#ifndef HAVE_HILDON // prevent help button from being added twice gint has_button = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (me), "has-help-button")); @@ -578,7 +570,6 @@ g_object_set_data (G_OBJECT (me), "has-help-button", GINT_TO_POINTER (1)); } -#endif /* HAVE_HILDON */ } /*! @@ -610,7 +601,7 @@ XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(pFrame->getFrameImpl()); // Get the GtkWindow of the parent frame - GtkWidget * parentWindow = gtk_widget_get_parent(pUnixFrameImpl->getTopLevelWindow()); + GtkWidget * parentWindow = pUnixFrameImpl->getTopLevelWindow(); // connect focus to our parent frame connectFocus(GTK_WIDGET(me),pFrame); @@ -624,10 +615,8 @@ // set the default response gtk_dialog_set_default_response ( me, dfl_response ) ; - -#ifndef HAVE_HILDON + sAddHelpButton (me, pDlg); -#endif // and make it modal gtk_window_set_modal ( GTK_WINDOW(me), TRUE ) ; @@ -1079,9 +1068,7 @@ { GtkWidget *area; - area = NULL; area = gtk_drawing_area_new (); - gtk_widget_set_double_buffered(area, FALSE); return area; diff -ur maemo/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp --- maemo/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-05-09 22:12:32.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp 2005-01-30 15:58:42.000000000 +0000 @@ -41,7 +41,7 @@ #include "xap_Prefs.h" #include "ut_debugmsg.h" #include "ut_string_class.h" -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) #include "ut_path.h" #endif @@ -64,12 +64,6 @@ #define PREVIEW_WIDTH 100 #define PREVIEW_HEIGHT 100 - -#ifdef HAVE_HILDON -#include -#include "xap_UnixHildonApp.h" -#endif - /*****************************************************************/ XAP_Dialog * XAP_UnixDialog_FileOpenSaveAs::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id) @@ -80,7 +74,7 @@ XAP_UnixDialog_FileOpenSaveAs::XAP_UnixDialog_FileOpenSaveAs(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id) -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) : XAP_Dialog_FileOpenSaveAs(pDlgFactory,id), m_FC(0), m_preview(0), m_bExport(true) #else : XAP_Dialog_FileOpenSaveAs(pDlgFactory,id), m_FS(0), m_preview(0), m_bExport(true) @@ -104,22 +98,20 @@ { case GTK_RESPONSE_CANCEL: case GTK_RESPONSE_ACCEPT: - case GTK_RESPONSE_OK: + if (answer == GTK_RESPONSE_CANCEL) *ptr = XAP_Dialog_FileOpenSaveAs::a_CANCEL; else *ptr = XAP_Dialog_FileOpenSaveAs::a_OK; gtk_main_quit(); break; - - default: // do nothing break; } } -#if !(GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if !GTK_CHECK_VERSION(2,4,0) static void s_ok_clicked(GtkWidget * /* widget */, XAP_Dialog_FileOpenSaveAs::tAnswer * answer) { @@ -215,7 +207,7 @@ int err; // if bCheckWritePermission is not set, we're looking to OPEN a file. - + if (!bCheckWritePermission) { while (1) @@ -223,6 +215,7 @@ gtk_main(); if (m_answer == a_CANCEL) // The easy way out return false; + // TODO check for symlinks, because even symlinks to dirs won't // TODO show up with S_ISDIR(). @@ -234,7 +227,7 @@ // a file, so we have to catch it, change the dialog, and not return // any filename yet. -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) UT_cloneString(szDialogFilename, gtk_file_chooser_get_filename(m_FC)); #else UT_cloneString(szDialogFilename, gtk_file_selection_get_filename(m_FS)); @@ -253,7 +246,7 @@ { g_string_append_c(s, '/'); } -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) gtk_file_chooser_set_filename(m_FC, s->str); #else gtk_file_selection_set_filename(m_FS, s->str); @@ -278,13 +271,12 @@ while(1) { gtk_main(); - if (m_answer == a_CANCEL) // The easy way out return false; // Give us a filename we can mangle -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) UT_cloneString(szDialogFilename, gtk_file_chooser_get_filename(m_FC)); #else UT_cloneString(szDialogFilename, gtk_file_selection_get_filename(m_FS)); @@ -401,7 +393,7 @@ { g_string_append_c(s, '/'); } -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) gtk_file_chooser_set_filename(m_FC, s->str); #else gtk_file_selection_set_filename(m_FS, s->str); @@ -517,7 +509,7 @@ { return; } -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) UT_String sFileName = gtk_file_chooser_get_filename(m_FC); #else UT_String sFileName = gtk_file_selection_get_filename(m_FS); @@ -561,7 +553,7 @@ sFileName = sFileName.substr(0,i); sFileName += sSuffix; -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) if (!gtk_file_chooser_select_filename(m_FC,sFileName.c_str())) { gtk_file_chooser_set_current_name(m_FC, UT_basename(sFileName.c_str())); @@ -646,19 +638,12 @@ // NOTE: title and the error/confirmation message boxes. we // NOTE: let GTK take care of the localization of the actual // NOTE: buttons and labels on the FileSelection dialog. - -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) + +#if GTK_CHECK_VERSION(2,4,0) // Get the GtkWindow of the parent frame XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(pFrame->getFrameImpl()); GtkWidget * parent = pUnixFrameImpl->getTopLevelWindow(); -#ifdef HAVE_HILDON - m_FC = GTK_FILE_CHOOSER( hildon_file_chooser_dialog_new(GTK_WINDOW(XAP_UnixHildonApp::getApp()), - (m_id == XAP_DIALOG_ID_FILE_OPEN || m_id == XAP_DIALOG_ID_INSERT_PICTURE || m_id == XAP_DIALOG_ID_INSERT_FILE ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE)) - ); - - -#else m_FC = GTK_FILE_CHOOSER( gtk_file_chooser_dialog_new (szTitle.utf8_str(), GTK_WINDOW(parent), (m_id == XAP_DIALOG_ID_FILE_OPEN || m_id == XAP_DIALOG_ID_INSERT_PICTURE || m_id == XAP_DIALOG_ID_INSERT_FILE ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE), @@ -666,7 +651,6 @@ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL) ); -#endif abiSetupModalDialog(GTK_DIALOG(m_FC), pFrame, this, GTK_RESPONSE_ACCEPT); #else @@ -687,18 +671,18 @@ we need to return. */ { -#if !(GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if !GTK_CHECK_VERSION(2,4,0) GtkWidget * main_vbox = pFS->main_vbox; UT_ASSERT(main_vbox); #endif // hbox for our pulldown menu (GTK does its pulldown this way */ GtkWidget * pulldown_hbox = gtk_hbox_new(FALSE, 15); -#if !(GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if !GTK_CHECK_VERSION(2,4,0) gtk_box_pack_start(GTK_BOX(main_vbox), pulldown_hbox, TRUE, TRUE, 0); #endif gtk_widget_show(pulldown_hbox); -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(m_FC), pulldown_hbox); #endif @@ -707,7 +691,7 @@ GtkWidget * preview = createDrawingArea (); gtk_widget_show (preview); m_preview = preview; -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) gtk_widget_set_size_request (preview, PREVIEW_WIDTH, PREVIEW_HEIGHT); // place the preview area inside a container to get a nice border @@ -840,7 +824,7 @@ } // connect the signals for OK and CANCEL and the requisite clean-close signals -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) g_signal_connect(G_OBJECT(m_FC), "delete_event", G_CALLBACK(s_delete_clicked), @@ -852,7 +836,7 @@ &m_answer); #endif -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) g_signal_connect(G_OBJECT(m_FC), "key_press_event", G_CALLBACK(fsel_key_event), &m_answer); @@ -862,7 +846,7 @@ G_CALLBACK(fsel_key_event), &m_answer); #endif -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) g_signal_connect (G_OBJECT (m_FC), "response", G_CALLBACK(s_dialog_response), &m_answer); @@ -873,13 +857,13 @@ G_CALLBACK(s_cancel_clicked), &m_answer); #endif -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) g_signal_connect (G_OBJECT (m_FC), "file-activated", G_CALLBACK(s_file_activated), &m_answer); #endif -#if !(GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if !GTK_CHECK_VERSION(2,4,0) if (m_id == XAP_DIALOG_ID_FILE_OPEN || m_id == XAP_DIALOG_ID_INSERT_PICTURE || m_id == XAP_DIALOG_ID_FILE_EXPORT || m_id == XAP_DIALOG_ID_INSERT_FILE) // only hide the buttons if we're opening a file/picture gtk_file_selection_hide_fileop_buttons(m_FS); #endif @@ -906,7 +890,7 @@ char * pLastSlash = strrchr(szPersistDirectory, '/'); if (pLastSlash) pLastSlash[1] = 0; -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) gtk_file_chooser_set_filename(m_FC,szPersistDirectory); #else gtk_file_selection_set_filename(m_FS,szPersistDirectory); @@ -930,7 +914,7 @@ if (m_bSuggestName) { // use m_szInitialPathname -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) gtk_file_chooser_set_filename(m_FC, m_szInitialPathname); #else gtk_file_selection_set_filename(m_FS, m_szInitialPathname); @@ -944,7 +928,7 @@ char * pLastSlash = strrchr(szPersistDirectory, '/'); if (pLastSlash) pLastSlash[1] = 0; -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) gtk_file_chooser_set_filename(m_FC,szPersistDirectory); #else gtk_file_selection_set_filename(m_FS,szPersistDirectory); @@ -952,14 +936,12 @@ } } -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) // center the dialog - centerDialog(GTK_WIDGET(XAP_UnixHildonApp::getApp()) , GTK_WIDGET(m_FC)); + centerDialog(parent, GTK_WIDGET(m_FC)); -#ifndef HAVE_HILDON gtk_widget_show(GTK_WIDGET(m_FC)); gtk_grab_add(GTK_WIDGET(m_FC)); -#endif #else // get top level window and its GtkWidget * XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(pFrame->getFrameImpl()); @@ -991,9 +973,9 @@ m_nFileType = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(activeItem), "user_data")); } -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) if(m_FC && GTK_IS_WIDGET(m_FC)) - gtk_widget_destroy (GTK_WIDGET(m_FC)); + gtk_widget_destroy (GTK_WIDGET(m_FC)); #else if(m_FS && GTK_IS_WIDGET(m_FS)) gtk_widget_destroy (GTK_WIDGET(m_FS)); @@ -1006,7 +988,7 @@ gint XAP_UnixDialog_FileOpenSaveAs::previewPicture (void) { -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) UT_ASSERT (m_FC && m_preview); #else UT_ASSERT (m_FS && m_preview); @@ -1022,7 +1004,7 @@ GR_UnixAllocInfo ai(m_preview->window, unixapp->getFontManager(), m_pApp); GR_UnixGraphics* pGr = (GR_UnixGraphics*) XAP_App::getApp()->newGraphics(ai); -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) const gchar * file_name = gtk_file_chooser_get_filename (m_FC); #else const gchar * file_name = gtk_file_selection_get_filename (m_FS); diff -ur maemo/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.h abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.h --- maemo/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.h 2005-04-28 22:12:08.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.h 2004-09-17 15:37:54.000000000 +0100 @@ -21,8 +21,6 @@ #ifndef XAP_UNIXDIALOG_FILEOPENSAVEAS_H #define XAP_UNIXDIALOG_FILEOPENSAVEAS_H - - #include #include #include "xap_Dlg_FileOpenSaveAs.h" @@ -58,8 +56,7 @@ bool _askOverwrite_YesNo(XAP_Frame * pFrame, const char * fileName); - -#if (GTK_CHECK_VERSION(2,4,0) || defined(HAVE_HILDON)) +#if GTK_CHECK_VERSION(2,4,0) GtkFileChooser * m_FC; #else GtkFileSelection * m_FS; diff -ur maemo/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp --- maemo/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2005-01-12 20:35:18.000000000 +0000 @@ -388,8 +388,6 @@ static char buf_color[8]; gtk_color_selection_get_color(GTK_COLOR_SELECTION(m_colorSelector), m_currentFGColor); - - // test for funkyColor-has-been-changed-to-sane-color case if (m_currentFGColor[RED] >= 0 && m_currentFGColor[GREEN] >= 0 && @@ -420,8 +418,6 @@ static_cast(m_currentBGColor[GREEN] * static_cast(255.0)), static_cast(m_currentBGColor[BLUE] * static_cast(255.0))); - printf("Color R[%d] G[%d] B[%d]\n", m_currentBGColor[RED], m_currentBGColor[GREEN], m_currentBGColor[BLUE]); - addOrReplaceVecProp("bgcolor",static_cast(buf_color)); } updatePreview(); diff -ur maemo/src/af/xap/unix/xap_UnixDlg_History.cpp abi/src/af/xap/unix/xap_UnixDlg_History.cpp --- maemo/src/af/xap/unix/xap_UnixDlg_History.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixDlg_History.cpp 2004-10-06 09:20:00.000000000 +0100 @@ -220,3 +220,5 @@ setLabelMarkup (glade_xml_get_widget(m_pXML, "lbVersionHistory"), getListTitle()); } + + diff -ur maemo/src/af/xap/unix/xap_UnixDlg_MessageBox.cpp abi/src/af/xap/unix/xap_UnixDlg_MessageBox.cpp --- maemo/src/af/xap/unix/xap_UnixDlg_MessageBox.cpp 2005-04-20 22:34:24.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixDlg_MessageBox.cpp 2004-12-15 22:51:32.000000000 +0000 @@ -59,13 +59,11 @@ XAP_UnixApp * pApp = static_cast(pFrame->getApp()); UT_return_if_fail(pApp); - GtkWidget * message = 0; // initialize to prevent compiler warning - GtkWindow * toplevel; + GtkWidget * message = 0; // initialize to prevent compiler warning + GtkWindow * toplevel = GTK_WINDOW(pUnixFrameImpl->getTopLevelWindow()); GtkWidget * label; GtkWidget * hbox; - toplevel = GTK_WINDOW(gtk_widget_get_parent (pUnixFrameImpl->getTopLevelWindow())); - UT_String labelText, separator; const XAP_StringSet * pSS = pApp->getStringSet (); @@ -152,8 +150,7 @@ } // set the title to '', as per GNOME HIG, Section 3, Alerts - //RENATO - //gtk_window_set_title (GTK_WINDOW(message), ""); + gtk_window_set_title (GTK_WINDOW(message), ""); UT_ASSERT(message); diff -ur maemo/src/af/xap/unix/xap_UnixDlg_PluginManager.cpp abi/src/af/xap/unix/xap_UnixDlg_PluginManager.cpp --- maemo/src/af/xap/unix/xap_UnixDlg_PluginManager.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixDlg_PluginManager.cpp 2004-08-19 00:17:50.000000000 +0100 @@ -345,10 +345,8 @@ // build the dialog GtkWidget * cf = _constructWindow(); UT_return_if_fail(cf); - -#ifndef HAVE_HILDON + gtk_window_set_default_size(GTK_WINDOW(cf), 500, 300); -#endif // load the data setPluginList(); diff -ur maemo/src/af/xap/unix/xap_UnixFrameImpl.cpp abi/src/af/xap/unix/xap_UnixFrameImpl.cpp --- maemo/src/af/xap/unix/xap_UnixFrameImpl.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixFrameImpl.cpp 2005-04-03 14:29:22.000000000 +0100 @@ -19,11 +19,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ - - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ #include #include @@ -56,10 +51,6 @@ #include "fv_View.h" -#ifdef HAVE_HILDON -#include "xap_UnixHildonApp.h" -#endif - #ifdef HAVE_GNOME // sorry about the XAP/AP separation breakage, but this is more important #include "ie_types.h" @@ -74,8 +65,6 @@ #ifdef HAVE_GNOME - - enum { TARGET_IMAGE, TARGET_URI_LIST, @@ -282,6 +271,7 @@ pNewFrame = XAP_App::getApp()->newFrame (); else pNewFrame = pFrame; + UT_Error error = pNewFrame->loadDocument(file.utf8_str(), 0 /* IEFT_Unknown */); if (error) { @@ -441,7 +431,6 @@ &xev); } - /****************************************************************/ XAP_UnixFrameImpl::XAP_UnixFrameImpl(XAP_Frame *pFrame, XAP_UnixApp * pApp) : XAP_FrameImpl(pFrame), @@ -455,9 +444,6 @@ m_pUnixPopup(NULL), m_dialogFactory(pFrame, static_cast(pApp)) { -#ifdef HAVE_HILDON - m_pHildonApp = GTK_WIDGET(XAP_UnixHildonApp::getApp()); -#endif } XAP_UnixFrameImpl::~XAP_UnixFrameImpl() @@ -476,7 +462,7 @@ DELETEP(m_pUnixPopup); // unref the input method context - g_object_unref (G_OBJECT (m_imContext)); + g_object_unref (G_OBJECT (m_imContext)); } @@ -526,7 +512,6 @@ gboolean XAP_UnixFrameImpl::_fe::focus_in_event(GtkWidget *w,GdkEvent */*event*/,gpointer /*user_data*/) { - XAP_UnixFrameImpl * pFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); UT_ASSERT(pFrameImpl); XAP_Frame* pFrame = pFrameImpl->getFrame(); @@ -545,7 +530,7 @@ // // Try it again for gtk2.2 to see if this bug is still present. // - return FALSE; + return TRUE; } gboolean XAP_UnixFrameImpl::_fe::focus_out_event(GtkWidget *w,GdkEvent */*event*/,gpointer /*user_data*/) @@ -674,7 +659,6 @@ // from the m_wTopLevelWindow widget. // -- MES // -#ifndef HAVE_HILDON GtkWindow * pWin = NULL; if(pFrame->getFrameMode() == XAP_NormalFrame) pWin = GTK_WINDOW(pUnixFrameImpl->m_wTopLevelWindow); @@ -684,8 +668,6 @@ gint gwidth,gheight; gtk_window_get_size(pWin,&gwidth,&gheight); pApp->setGeometry(e->x,e->y,gwidth,gheight,flags); -#endif /* HAVE_HILDON */ - // Dynamic Zoom Implementation @@ -1123,7 +1105,7 @@ GtkWidget * XAP_UnixFrameImpl::getTopLevelWindow(void) const { - return ( m_wTopLevelWindow ) ; + return m_wTopLevelWindow; } GtkWidget * XAP_UnixFrameImpl::getVBoxWidget(void) const @@ -1153,62 +1135,35 @@ } bool bResult; -#ifdef HAVE_HILDON - GtkWidget *wintemp = GTK_WIDGET(m_pHildonApp); -#else - GtkWidget *wintemp = m_wTopLevelWindow; -#endif - if(m_iFrameMode == XAP_NormalFrame) { - -#ifdef HAVE_HILDON - m_wTopLevelWindow = hildon_appview_new(m_pUnixApp->getApplicationTitleForTitleBar()); - hildon_app_set_appview(HILDON_APP(m_pHildonApp), HILDON_APPVIEW(m_wTopLevelWindow)); - hildon_app_set_title(HILDON_APP(m_pHildonApp), m_pUnixApp->getApplicationTitleForTitleBar()); - hildon_app_set_two_part_title(HILDON_APP(m_pHildonApp), TRUE); - - gtk_widget_show_all(GTK_WIDGET(m_pHildonApp)); - wintemp = GTK_WIDGET(m_pHildonApp); -#else m_wTopLevelWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); + g_object_set_data(G_OBJECT(m_wTopLevelWindow), "ic_attr", NULL); + g_object_set_data(G_OBJECT(m_wTopLevelWindow), "ic", NULL); gtk_window_set_title(GTK_WINDOW(m_wTopLevelWindow), - m_pUnixApp->getApplicationTitleForTitleBar()); - + m_pUnixApp->getApplicationTitleForTitleBar()); + gtk_window_set_resizable(GTK_WINDOW(m_wTopLevelWindow), TRUE); + gtk_window_set_role(GTK_WINDOW(m_wTopLevelWindow), "topLevelWindow"); if ( wmIcon ) gtk_window_set_icon(GTK_WINDOW(m_wTopLevelWindow), wmIcon); - - wintemp = m_wTopLevelWindow; - - gtk_window_set_resizable(GTK_WINDOW(wintemp), TRUE); - -#endif /* HAVE_HILDON */ - g_object_set_data(G_OBJECT(wintemp), "ic_attr", NULL); - g_object_set_data(G_OBJECT(wintemp), "ic", NULL); - gtk_window_set_role(GTK_WINDOW(wintemp), "topLevelWindow"); - } - g_object_set_data(G_OBJECT(m_wTopLevelWindow), "toplevelWindow", m_wTopLevelWindow); - g_object_set_data(G_OBJECT(m_wTopLevelWindow), "toplevelWindowFocus", GINT_TO_POINTER(FALSE)); - - g_object_set_data(G_OBJECT(wintemp), "user_data", this); + g_object_set_data(G_OBJECT(m_wTopLevelWindow), "user_data", this); _setGeometry (); - g_signal_connect(G_OBJECT(wintemp), "realize", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "realize", G_CALLBACK(_fe::realize), NULL); - g_signal_connect(G_OBJECT(wintemp), "unrealize", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "unrealize", G_CALLBACK(_fe::unrealize), NULL); - g_signal_connect(G_OBJECT(wintemp), "size_allocate", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "size_allocate", G_CALLBACK(_fe::sizeAllocate), NULL); - - g_signal_connect(G_OBJECT(wintemp), "focus_in_event", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "focus_in_event", G_CALLBACK(_fe::focusIn), NULL); - g_signal_connect(G_OBJECT(wintemp), "focus_out_event", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "focus_out_event", G_CALLBACK(_fe::focusOut), NULL); #ifdef HAVE_GNOME @@ -1237,20 +1192,18 @@ static_cast(this)); #endif - g_signal_connect(G_OBJECT(wintemp), "delete_event", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "delete_event", G_CALLBACK(_fe::delete_event), NULL); // here we connect the "destroy" event to a signal handler. // This event occurs when we call gtk_widget_destroy() on the window, // or if we return 'FALSE' in the "delete_event" callback. - g_signal_connect(G_OBJECT(wintemp), "destroy", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "destroy", G_CALLBACK(_fe::destroy), NULL); - g_signal_connect(G_OBJECT(m_wTopLevelWindow), "focus_in_event", G_CALLBACK(_fe::focus_in_event), NULL); g_signal_connect(G_OBJECT(m_wTopLevelWindow), "focus_out_event", G_CALLBACK(_fe::focus_out_event), NULL); - // create a VBox inside it. @@ -1275,14 +1228,12 @@ if(m_iFrameMode == XAP_NormalFrame) gtk_widget_realize(m_wTopLevelWindow); - _createIMContext(wintemp->window); + _createIMContext(m_wTopLevelWindow->window); - - g_signal_connect(G_OBJECT(wintemp), "key_press_event", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "key_press_event", G_CALLBACK(_fe::key_press_event), NULL); - g_signal_connect(G_OBJECT(wintemp), "key_release_event", + g_signal_connect(G_OBJECT(m_wTopLevelWindow), "key_release_event", G_CALLBACK(_fe::key_release_event), NULL); - if(m_iFrameMode == XAP_NormalFrame) _createToolbars(); @@ -1418,7 +1369,6 @@ void XAP_UnixFrameImpl::_setGeometry () { -#ifndef HAVE_HILDON UT_sint32 app_x = 0; UT_sint32 app_y = 0; UT_uint32 app_w = 0; @@ -1503,8 +1453,7 @@ // This is so the user's window manager can find better // places for new windows, instead of having our windows // pile upon each other. - - + if (m_pUnixApp->getFrameCount () <= 1) if (user_f & XAP_UnixApp::GEOMETRY_FLAG_POS) { @@ -1513,8 +1462,6 @@ // Remember geometry settings for next time m_pUnixApp->getPrefs()->setGeometry (user_x, user_y, user_w, user_h, user_f); - -#endif /* HAVE_HILDON */ } /*! @@ -1577,11 +1524,7 @@ { UT_ASSERT(m_wTopLevelWindow); -#ifdef HAVE_HILDON - gtk_window_present(GTK_WINDOW (gtk_widget_get_parent(m_wTopLevelWindow))); -#else - gtk_window_present(GTK_WINDOW (m_wTopLevelWindow)); -#endif + gtk_window_present(GTK_WINDOW (m_wTopLevelWindow)); return true; } @@ -1602,16 +1545,11 @@ // no relevant change, so skip it return false; } - + if(getFrame()->getFrameMode() == XAP_NormalFrame) { const char * szTitle = getFrame()->getTitle(MAX_TITLE_LENGTH); -#ifdef HAVE_HILDON - hildon_appview_set_title(HILDON_APPVIEW(m_wTopLevelWindow), szTitle); -#else gtk_window_set_title(GTK_WINDOW(m_wTopLevelWindow), szTitle); -#endif /* HAVE_HILDON */ - } return true; } diff -ur maemo/src/af/xap/unix/xap_UnixFrameImpl.h abi/src/af/xap/unix/xap_UnixFrameImpl.h --- maemo/src/af/xap/unix/xap_UnixFrameImpl.h 2005-05-09 22:12:32.000000000 +0100 +++ abi/src/af/xap/unix/xap_UnixFrameImpl.h 2004-02-06 11:13:44.000000000 +0000 @@ -31,10 +31,6 @@ #include "xap_UnixDialogFactory.h" #include "xap_UnixApp.h" -#ifdef HAVE_HILDON -#include -#include -#endif class EV_UnixMenuBar; class EV_UnixMenuPopup; @@ -151,11 +147,10 @@ guint m_iZoomUpdateID; guint m_iAbiRepaintID; - GtkWidget * m_wTopLevelWindow; - GtkWidget * m_wVBox; - GtkWidget * m_wSunkenBox; - GtkWidget * m_wStatusBar; - GtkWidget * m_pHildonApp; + GtkWidget * m_wTopLevelWindow; + GtkWidget * m_wVBox; + GtkWidget * m_wSunkenBox; + GtkWidget * m_wStatusBar; XAP_UnixApp * m_pUnixApp; EV_UnixMenuBar * m_pUnixMenu; @@ -163,3 +158,6 @@ AP_UnixDialogFactory m_dialogFactory; }; #endif /* XAP_UNIXFRAME_H */ + + + Only in abi/src/af/xap/xp: GNUmakefile.in diff -ur maemo/src/af/xap/xp/xap_App.cpp abi/src/af/xap/xp/xap_App.cpp --- maemo/src/af/xap/xp/xap_App.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/xap/xp/xap_App.cpp 2004-10-16 09:41:02.000000000 +0100 @@ -17,12 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ - - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - #include #include @@ -668,6 +662,7 @@ } notifyModelessDlgsCloseFrame(pFrame); + // TODO do something here... return true; @@ -690,6 +685,7 @@ XAP_Frame * f = static_cast(vClones.getNthItem(i)); forgetFrame(f); } + return true; } diff -ur maemo/src/af/xap/xp/xap_Dlg_FontChooser.cpp abi/src/af/xap/xp/xap_Dlg_FontChooser.cpp --- maemo/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2003-12-14 01:23:58.000000000 +0000 @@ -195,7 +195,7 @@ if( (pszV != NULL) && (strcmp( pszV,szProp) == 0)) break; } - if( j < i ) + if( j < i ) return (const XML_Char *) m_vecProps.getNthItem(j+1); else return NULL; @@ -364,16 +364,12 @@ bool XAP_Dialog_FontChooser::getChangedFontFamily(const XML_Char ** pszFontFamily) const { - bool bchanged = didPropChange(m_pFontFamily,getVal("font-family")); + bool bchanged = didPropChange(m_pFontFamily,getVal("font-family")); bool useVal = (bchanged && !m_bChangedFontFamily); if (pszFontFamily && useVal) - { *pszFontFamily = getVal("font-family"); - } else if(pszFontFamily) - { *pszFontFamily = m_pFontFamily ; - } return bchanged; } diff -ur maemo/src/af/xap/xp/xap_Frame.cpp abi/src/af/xap/xp/xap_Frame.cpp --- maemo/src/af/xap/xp/xap_Frame.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/xap/xp/xap_Frame.cpp 2004-10-23 12:48:00.000000000 +0100 @@ -17,10 +17,6 @@ * 02111-1307, USA. */ - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ #include #include @@ -1073,3 +1069,4 @@ { m_pFrameImpl->m_iFrameMode = iFrameMode; } + diff -ur maemo/src/af/xap/xp/xap_FrameImpl.cpp abi/src/af/xap/xp/xap_FrameImpl.cpp --- maemo/src/af/xap/xp/xap_FrameImpl.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/af/xap/xp/xap_FrameImpl.cpp 2004-12-13 11:04:42.000000000 +0000 @@ -20,11 +20,6 @@ * 02111-1307, USA. */ - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - #include "xap_Frame.h" #include "xap_FrameImpl.h" #include "xap_App.h" Only in abi/src/bindings: GNUmakefile.in Only in abi/src/bindings/perl: GNUmakefile.in diff -ur maemo/src/config/abi_rules.mk abi/src/config/abi_rules.mk --- maemo/src/config/abi_rules.mk 2005-04-28 22:12:08.000000000 +0100 +++ abi/src/config/abi_rules.mk 2004-09-02 20:59:38.000000000 +0100 @@ -43,9 +43,6 @@ ifneq ($(ABI_OPT_GNOME),1) ABI_OPT_GNOME=0 endif -ifneq ($(ABI_OPT_HILDON),1) -ABI_OPT_HILDON=0 -endif ifneq ($(ABI_OPT_NAUTILUS),1) ABI_OPT_NAUTILUS=0 endif Only in abi/src/other: GNUmakefile.in Only in abi/src/other/spell: GNUmakefile.in Only in abi/src/other/spell/xp: GNUmakefile.in Only in abi/src/other/ttftool: GNUmakefile.in Only in abi/src/other/ttftool/unix: GNUmakefile.in Only in abi/src/text: GNUmakefile.in Only in abi/src/text/fmt: GNUmakefile.in Only in abi/src/text/fmt/xp: GNUmakefile.in diff -ur maemo/src/text/fmt/xp/fp_Line.cpp abi/src/text/fmt/xp/fp_Line.cpp --- maemo/src/text/fmt/xp/fp_Line.cpp 2005-05-09 22:12:32.000000000 +0100 +++ abi/src/text/fmt/xp/fp_Line.cpp 2004-11-15 22:39:38.000000000 +0000 @@ -1072,9 +1072,7 @@ iExtra = pSL->getRightMargin()/2; } } - //TODO: Not work in hildon -// UT_ASSERT(m_iClearToPos + m_iClearLeftOffset < getPage()->getWidth()); - + UT_ASSERT(m_iClearToPos + m_iClearLeftOffset < getPage()->getWidth()); // pRun->Fill(getGraphics(),xoffLine - m_iClearLeftOffset, yoffLine, m_iClearToPos + m_iClearLeftOffset+iExtra, height); pRun->Fill(getGraphics(),xoffLine - m_iClearLeftOffset, yoffLine, getMaxWidth() + m_iClearLeftOffset +iExtra, height); diff -ur maemo/src/text/fmt/xp/fv_View.cpp abi/src/text/fmt/xp/fv_View.cpp --- maemo/src/text/fmt/xp/fv_View.cpp 2005-04-29 22:23:26.000000000 +0100 +++ abi/src/text/fmt/xp/fv_View.cpp 2005-04-03 14:08:36.000000000 +0100 @@ -7048,9 +7048,7 @@ return m_pG->tlu(1); } else - //only hildon - return 0.2 * fl_PAGEVIEW_PAGE_SEP; - + return fl_PAGEVIEW_PAGE_SEP; } @@ -7062,9 +7060,7 @@ if (isPreview() || m_pG->queryProperties(GR_Graphics::DGP_PAPER) || (getViewMode() != VIEW_PRINT)) return 0; else - //only hildon - return 0.2 * fl_PAGEVIEW_MARGIN_X; - + return fl_PAGEVIEW_MARGIN_X; } UT_sint32 FV_View::getPageViewTopMargin(void) const @@ -7075,8 +7071,7 @@ if (isPreview() || m_pG->queryProperties(GR_Graphics::DGP_PAPER) || (getViewMode() != VIEW_PRINT)) return 0; else - //only hildon - return 0.2 * fl_PAGEVIEW_MARGIN_Y; + return fl_PAGEVIEW_MARGIN_Y; } void FV_View::setXScrollOffset(UT_sint32 v) diff -ur maemo/src/text/fmt/xp/fv_View.h abi/src/text/fmt/xp/fv_View.h --- maemo/src/text/fmt/xp/fv_View.h 2005-04-29 22:23:26.000000000 +0100 +++ abi/src/text/fmt/xp/fv_View.h 2005-04-02 11:58:06.000000000 +0000 @@ -129,8 +129,8 @@ enum FV_BIDI_Order { FV_Order_Visual = 0, - FV_Order_Logical_LTR = UT_BIDI_LTR , - FV_Order_Logical_RTL = UT_BIDI_RTL + FV_Order_Logical_LTR = UT_BIDI_LTR, + FV_Order_Logical_RTL = UT_BIDI_RTL }; Only in abi/src/text/ptbl: GNUmakefile.in Only in abi/src/text/ptbl/xp: GNUmakefile.in Only in abi/src/tools: GNUmakefile.in Only in abi/src/tools/cdump: GNUmakefile.in Only in abi/src/tools/cdump/qnx: GNUmakefile.in Only in abi/src/tools/cdump/xp: GNUmakefile.in Only in abi/src/tools/pfa2afm: GNUmakefile.in Only in abi/src/tools/pfa2afm/unix: GNUmakefile.in Only in abi/src/tools/scripts: GNUmakefile.in Only in abi/src/tools/scripts/unix: GNUmakefile.in Only in abi/src/tools/ttftool: GNUmakefile.in Only in abi/src/tools/ttftool/unix: GNUmakefile.in Only in abi/src/wp: GNUmakefile.in Only in abi/src/wp/ap: GNUmakefile.in Only in abi/src/wp/ap/cocoa: GNUmakefile.in Only in abi/src/wp/ap/qnx: GNUmakefile.in diff -ur maemo/src/wp/ap/unix/GNUmakefile.am abi/src/wp/ap/unix/GNUmakefile.am --- maemo/src/wp/ap/unix/GNUmakefile.am 2005-04-20 22:34:24.000000000 +0100 +++ abi/src/wp/ap/unix/GNUmakefile.am 2005-02-20 22:46:06.000000000 +0000 @@ -30,7 +30,7 @@ -DABIWORD_APP_LIBDIR="\"$(ABIWORD_APP_LIBDIR)\"" \ -DABIWORD_PLUGINDIR="\"$(libdir)/AbiWord-2.2/plugins/\"" \ $(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) \ - @GMODULE_CFLAGS@ @GTK_CFLAGS@ $(OTHER_INCLUDES) $(ICONV_INCLUDES) $(HILDON_CFLAGS) + @GMODULE_CFLAGS@ @GTK_CFLAGS@ $(OTHER_INCLUDES) $(ICONV_INCLUDES) noinst_LIBRARIES = libWpAp_unix.a Only in abi/src/wp/ap/unix: GNUmakefile.in diff -ur maemo/src/wp/ap/unix/ap_UnixApp.cpp abi/src/wp/ap/unix/ap_UnixApp.cpp --- maemo/src/wp/ap/unix/ap_UnixApp.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixApp.cpp 2004-12-11 11:55:20.000000000 +0000 @@ -18,18 +18,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ -/* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - - /***************************************************************** ** Only one of these is created by the application. *****************************************************************/ #define ABIWORD_INTERNAL + #include #include #include @@ -1446,18 +1441,15 @@ // do we show the splash? bool bShowSplash = Args.getShowSplash(); - const XAP_Prefs * pPrefs = pMyUnixApp->getPrefs(); UT_ASSERT(pPrefs); bool bSplashPref = true; if (pPrefs && pPrefs->getPrefsValueBool (AP_PREF_KEY_ShowSplash, &bSplashPref)) bShowSplash = bShowSplash && bSplashPref; - -#ifndef HAVE_HILDON + if (bShowSplash) _showSplash(1500); -#endif // Step 3: Create windows as appropriate. // if some args are botched, it returns false and we should @@ -1483,7 +1475,6 @@ XAP_Frame * AP_UnixApp::newFrame(AP_App * app) { - AP_UnixFrame * pFrame = new AP_UnixFrame(app); if (pFrame) pFrame->initialize(); diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_All.h abi/src/wp/ap/unix/ap_UnixDialog_All.h --- maemo/src/wp/ap/unix/ap_UnixDialog_All.h 2005-04-28 22:12:08.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_All.h 2004-02-25 04:17:46.000000000 +0000 @@ -34,12 +34,7 @@ # include "xap_UnixDlg_MessageBox.h" # include "xap_UnixDlg_FileOpenSaveAs.h" # include "xap_UnixDlg_WindowMore.h" -#ifdef HAVE_HILDON -# include "xap_UnixHildonDlg_FontChooser.h" -#else # include "xap_UnixDlg_FontChooser.h" -#endif - # include "xap_UnixDlg_Zoom.h" # include "xap_UnixDlg_Insert_Symbol.h" # include "xap_UnixDlg_Language.h" @@ -120,11 +115,7 @@ DeclareDialog(XAP_DIALOG_ID_FILE_OPEN, XAP_UnixDialog_FileOpenSaveAs) DeclareDialog(XAP_DIALOG_ID_FILE_SAVEAS, XAP_UnixDialog_FileOpenSaveAs) DeclareDialog(XAP_DIALOG_ID_PRINTTOFILE, XAP_UnixDialog_FileOpenSaveAs) -#ifdef HAVE_HILDON - DeclareDialog(XAP_DIALOG_ID_FONT, XAP_UnixHildonDialog_FontChooser) -#else DeclareDialog(XAP_DIALOG_ID_FONT, XAP_UnixDialog_FontChooser) -#endif DeclareDialog(XAP_DIALOG_ID_LANGUAGE, XAP_UnixDialog_Language) DeclareDialog(XAP_DIALOG_ID_WINDOWMORE, XAP_UnixDialog_WindowMore) DeclareDialog(XAP_DIALOG_ID_ZOOM, XAP_UnixDialog_Zoom) diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_Columns.cpp abi/src/wp/ap/unix/ap_UnixDialog_Columns.cpp --- maemo/src/wp/ap/unix/ap_UnixDialog_Columns.cpp 2005-05-11 22:26:50.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_Columns.cpp 2004-04-11 19:02:20.000000000 +0100 @@ -48,10 +48,16 @@ : AP_Dialog_Columns(pDlgFactory,id) { m_windowMain = NULL; + m_wlineBetween = NULL; + m_wtoggleOne = NULL; + m_wtoggleTwo = NULL; + m_wtoggleThree = NULL; m_wSpin = NULL; m_spinHandlerID = 0; m_windowMain = NULL; + m_wpreviewArea = NULL; + m_pPreviewWidget = NULL; m_iSpaceAfter = 0; m_iSpaceAfterID =0; m_wSpaceAfterSpin = NULL; @@ -63,10 +69,24 @@ AP_UnixDialog_Columns::~AP_UnixDialog_Columns(void) { + DELETEP (m_pPreviewWidget); } /*****************************************************************/ +static void s_two_clicked(GtkWidget * widget, AP_UnixDialog_Columns * dlg) +{ + UT_return_if_fail(widget && dlg); + dlg->event_Toggle(2); +} + + +static void s_three_clicked(GtkWidget * widget, AP_UnixDialog_Columns * dlg) +{ + UT_return_if_fail(widget && dlg); + dlg->event_Toggle(3); +} + static void s_spin_changed(GtkWidget * widget, AP_UnixDialog_Columns *dlg) { UT_return_if_fail(widget && dlg); @@ -108,12 +128,27 @@ dlg->checkLineBetween(); } +static gboolean s_preview_exposed(GtkWidget * widget, gpointer /* data */, AP_UnixDialog_Columns * dlg) +{ + UT_return_val_if_fail(widget && dlg, FALSE); + dlg->event_previewExposed(); + return FALSE; +} + + static gboolean s_window_exposed(GtkWidget * widget, gpointer /* data */, AP_UnixDialog_Columns * dlg) { UT_return_val_if_fail(widget && dlg, FALSE); + dlg->event_previewExposed(); return FALSE; } +static void s_one_clicked(GtkWidget * widget, AP_UnixDialog_Columns * dlg) +{ + UT_return_if_fail(widget && dlg); + dlg->event_Toggle(1); +} + /*****************************************************************/ @@ -141,6 +176,30 @@ gtk_entry_set_text( GTK_ENTRY(m_wMaxColumnHeightEntry),getHeightString() ); g_signal_handler_unblock(G_OBJECT(m_wMaxColumnHeightEntry), m_iMaxColumnHeightID); + // *** this is how we add the gc for Column Preview *** + // attach a new graphics context to the drawing area + XAP_UnixApp * unixapp = static_cast (m_pApp); + + UT_return_if_fail(m_wpreviewArea && m_wpreviewArea->window); + + // make a new Unix GC + DELETEP (m_pPreviewWidget); + //m_pPreviewWidget = new GR_UnixGraphics(m_wpreviewArea->window, unixapp->getFontManager(), m_pApp); + GR_UnixAllocInfo ai(m_wpreviewArea->window, unixapp->getFontManager(), m_pApp); + m_pPreviewWidget = (GR_UnixGraphics*) XAP_App::getApp()->newGraphics(ai); + + + // Todo: we need a good widget to query with a probable + // Todo: non-white (i.e. gray, or a similar bgcolor as our parent widget) + // Todo: background. This should be fine + m_pPreviewWidget->init3dColors(m_wpreviewArea->style); + + // let the widget materialize + + _createPreviewFromGC(m_pPreviewWidget, + (UT_uint32) m_wpreviewArea->allocation.width, + (UT_uint32) m_wpreviewArea->allocation.height); + setLineBetween(getLineBetween()); if(getLineBetween()==true) { @@ -164,8 +223,7 @@ GTK_TOGGLE_BUTTON(m_checkOrder))); _storeWindowData(); - - //DELETEP (m_pPreviewWidget); + DELETEP (m_pPreviewWidget); abiDestroyWidget(mainWindow); } @@ -221,24 +279,73 @@ event_Toggle(val); return; } - + g_signal_handler_block(G_OBJECT(m_wtoggleOne), + m_oneHandlerID); + g_signal_handler_block(G_OBJECT(m_wtoggleTwo), + m_twoHandlerID); + g_signal_handler_block(G_OBJECT(m_wtoggleThree), + m_threeHandlerID); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleOne),FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleTwo),FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleThree),FALSE); + g_signal_handler_unblock(G_OBJECT(m_wtoggleOne), + m_oneHandlerID); + g_signal_handler_unblock(G_OBJECT(m_wtoggleTwo), + m_twoHandlerID); + g_signal_handler_unblock(G_OBJECT(m_wtoggleThree), + m_threeHandlerID); setColumns( val ); - //m_pColumnsPreview->draw(); + m_pColumnsPreview->draw(); } void AP_UnixDialog_Columns::event_Toggle( UT_uint32 icolumns) { checkLineBetween(); - - // DOM: TODO: rewrite me + g_signal_handler_block(G_OBJECT(m_wtoggleOne), + m_oneHandlerID); + g_signal_handler_block(G_OBJECT(m_wtoggleTwo), + m_twoHandlerID); + g_signal_handler_block(G_OBJECT(m_wtoggleThree), + m_threeHandlerID); + + // DOM: TODO: rewrite me g_signal_handler_block(G_OBJECT(m_wSpin), m_spinHandlerID); gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_wSpin), (gfloat) icolumns); g_signal_handler_unblock(G_OBJECT(m_wSpin), m_spinHandlerID); + switch (icolumns) + { + case 1: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleOne),TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleTwo),FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleThree),FALSE); + break; + case 2: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleOne),FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleTwo),TRUE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleThree),FALSE); + break; + case 3: + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleOne),FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleTwo),FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_wtoggleThree),TRUE); + break; + default: + break; + // TODO: make these insenstive and update a spin control + + } + g_signal_handler_unblock(G_OBJECT(m_wtoggleOne), + m_oneHandlerID); + g_signal_handler_unblock(G_OBJECT(m_wtoggleTwo), + m_twoHandlerID); + g_signal_handler_unblock(G_OBJECT(m_wtoggleThree), + m_threeHandlerID); setColumns( icolumns ); - //m_pColumnsPreview->draw(); + m_pColumnsPreview->draw(); } @@ -284,6 +391,12 @@ m_answer = AP_Dialog_Columns::a_CANCEL; } +void AP_UnixDialog_Columns::event_previewExposed(void) +{ + if(m_pColumnsPreview) + m_pColumnsPreview->draw(); +} + /*****************************************************************/ GtkWidget * AP_UnixDialog_Columns::_constructWindow(void) @@ -309,15 +422,128 @@ void AP_UnixDialog_Columns::_constructWindowContents(GtkWidget * windowColumns) { + GtkWidget *wColumnFrame; + GtkWidget *tableColumns; + GtkWidget *hboxColumns; + GtkWidget *wToggleOne; + GtkWidget *wLabelOne; + GtkWidget *wToggleTwo; + GtkWidget *wLabelTwo; + GtkWidget *wToggleThree; + GtkWidget *wLabelThree; + GtkWidget *wPreviewFrame; + GtkWidget *wDrawFrame; + GtkWidget *wPreviewArea; GtkWidget *hseparator; GtkAdjustment *SpinAdj; GtkWidget *Spinbutton; GtkWidget *SpinLabel; - GtkWidget *wLineBtween; + GtkWidget *wLineBtween; const XAP_StringSet * pSS = m_pApp->getStringSet(); + GtkWidget * tableTop = gtk_table_new (1, 2, FALSE); + gtk_widget_show (tableTop); + gtk_box_pack_start (GTK_BOX (windowColumns), tableTop, FALSE, FALSE, 6); + UT_UTF8String s; + pSS->getValueUTF8(AP_STRING_ID_DLG_Column_Number,s); + wColumnFrame = gtk_frame_new ( s.utf8_str()); + gtk_frame_set_shadow_type(GTK_FRAME(wColumnFrame), GTK_SHADOW_NONE); + gtk_widget_show(wColumnFrame); + gtk_table_attach (GTK_TABLE (tableTop), wColumnFrame, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 6, 0); + + hboxColumns = gtk_hbox_new (FALSE, 0); + gtk_widget_show(hboxColumns); + gtk_container_set_border_width(GTK_CONTAINER (hboxColumns), 6); + gtk_container_add (GTK_CONTAINER (wColumnFrame), hboxColumns); + + tableColumns = gtk_table_new (3, 2, FALSE); + gtk_widget_show (tableColumns); + gtk_box_pack_start (GTK_BOX (hboxColumns), tableColumns, TRUE, FALSE, 0); + + wToggleOne = gtk_toggle_button_new(); + gtk_widget_show(wToggleOne ); + label_button_with_abi_pixmap(wToggleOne, "tb_1column_xpm"); + GTK_WIDGET_SET_FLAGS (wToggleOne, GTK_CAN_DEFAULT); + gtk_table_attach (GTK_TABLE (tableColumns), wToggleOne, 0, 1, 0, 1, + (GtkAttachOptions) (0), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 6, 0); + pSS->getValueUTF8(AP_STRING_ID_DLG_Column_One,s); + wLabelOne = gtk_label_new ( s.utf8_str()); + gtk_widget_show(wLabelOne ); + gtk_table_attach (GTK_TABLE (tableColumns), wLabelOne, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + gtk_misc_set_alignment (GTK_MISC (wLabelOne), 0, 0.5); + + wToggleTwo = gtk_toggle_button_new (); + gtk_widget_show(wToggleTwo); + label_button_with_abi_pixmap(wToggleTwo, "tb_2column_xpm"); + GTK_WIDGET_SET_FLAGS (wToggleTwo, GTK_CAN_DEFAULT); + gtk_table_attach (GTK_TABLE (tableColumns), wToggleTwo, 0, 1, 1, 2, + (GtkAttachOptions) (0), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 6, 0); + + pSS->getValueUTF8(AP_STRING_ID_DLG_Column_Two,s); + wLabelTwo = gtk_label_new( s.utf8_str()); + gtk_widget_show(wLabelTwo ); + gtk_table_attach (GTK_TABLE (tableColumns), wLabelTwo, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + gtk_misc_set_alignment (GTK_MISC (wLabelTwo), 0, 0.5); + + wToggleThree = gtk_toggle_button_new (); + gtk_widget_show(wToggleThree); + label_button_with_abi_pixmap(wToggleThree, "tb_3column_xpm"); + GTK_WIDGET_SET_FLAGS (wToggleThree, GTK_CAN_DEFAULT); + gtk_table_attach (GTK_TABLE (tableColumns), wToggleThree, 0, 1, 2, 3, + (GtkAttachOptions) (0), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 6, 0); + + pSS->getValueUTF8(AP_STRING_ID_DLG_Column_Three,s); + wLabelThree = gtk_label_new ( s.utf8_str()); + gtk_widget_show(wLabelThree); + gtk_table_attach (GTK_TABLE (tableColumns), wLabelThree, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + gtk_misc_set_alignment (GTK_MISC (wLabelThree), 0, 0.5); + + pSS->getValueUTF8(AP_STRING_ID_DLG_Column_Preview,s); + wPreviewFrame = gtk_frame_new ( s.utf8_str()); + gtk_frame_set_shadow_type(GTK_FRAME(wPreviewFrame), GTK_SHADOW_NONE); + gtk_widget_show(wPreviewFrame); + gtk_table_attach (GTK_TABLE (tableTop), wPreviewFrame, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 6, 0); + + double width = getPageWidth(); + double height = getPageHeight(); + gint rat = 0; + if( height > 0.000001) + { + if(height > width) + { + rat = static_cast( 100.0 *height/width); + gtk_widget_set_size_request (wPreviewFrame, 100, -1); // was -2 + } + else + { + rat = static_cast( 200.* height/width); + gtk_widget_set_size_request (wPreviewFrame, 200, rat); + } + } + else + { + gtk_widget_set_size_request (wPreviewFrame, 100, -1); // was -2 + } + + wDrawFrame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type(GTK_FRAME(wDrawFrame), GTK_SHADOW_NONE); + gtk_widget_show(wDrawFrame ); + gtk_container_add (GTK_CONTAINER (wPreviewFrame), wDrawFrame); + gtk_container_set_border_width (GTK_CONTAINER (wDrawFrame), 4); + + wPreviewArea = createDrawingArea (); + gtk_widget_ref (wPreviewArea); + g_object_set_data_full (G_OBJECT (windowColumns), "wPreviewArea", wPreviewArea, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show(wPreviewArea); + gtk_container_add (GTK_CONTAINER (wDrawFrame), wPreviewArea); ////////////////////////////////////////////////////// // Line Between @@ -411,8 +637,12 @@ // might need to be queried or altered later. m_wlineBetween = wLineBtween; + m_wtoggleOne = wToggleOne; + m_wtoggleTwo = wToggleTwo; + m_wtoggleThree = wToggleThree; m_wSpin = Spinbutton; m_windowMain = windowColumns; + m_wpreviewArea = wPreviewArea; m_wSpaceAfterSpin = SpinAfter_dum; m_wSpaceAfterEntry = SpinAfter; m_oSpaceAfter_adj = SpinAfterAdj; @@ -427,6 +657,22 @@ { // the control buttons + m_oneHandlerID = g_signal_connect(G_OBJECT(m_wtoggleOne), + "clicked", + G_CALLBACK(s_one_clicked), + reinterpret_cast(this)); + + m_twoHandlerID = g_signal_connect(G_OBJECT(m_wtoggleTwo), + "clicked", + G_CALLBACK(s_two_clicked), + reinterpret_cast(this)); + + m_threeHandlerID = g_signal_connect(G_OBJECT(m_wtoggleThree), + "clicked", + G_CALLBACK(s_three_clicked), + reinterpret_cast(this)); + + m_spinHandlerID = g_signal_connect(G_OBJECT(m_wSpin), "changed", G_CALLBACK(s_spin_changed), @@ -461,11 +707,11 @@ reinterpret_cast(this)); // the expose event of the preview -/* g_signal_connect(G_OBJECT(m_wpreviewArea), + g_signal_connect(G_OBJECT(m_wpreviewArea), "expose_event", G_CALLBACK(s_preview_exposed), reinterpret_cast(this)); -*/ + g_signal_connect_after(G_OBJECT(m_windowMain), "expose_event", @@ -486,3 +732,8 @@ void AP_UnixDialog_Columns::enableLineBetweenControl(bool bState) { } + + + + + diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_Columns.h abi/src/wp/ap/unix/ap_UnixDialog_Columns.h --- maemo/src/wp/ap/unix/ap_UnixDialog_Columns.h 2005-05-11 22:26:50.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_Columns.h 2003-06-06 02:57:24.000000000 +0100 @@ -181,6 +181,10 @@ GtkWidget * m_windowMain; GtkWidget * m_wlineBetween; + GtkWidget * m_wtoggleOne; + GtkWidget * m_wtoggleTwo; + GtkWidget * m_wtoggleThree; + GtkWidget * m_wpreviewArea; GtkWidget * m_wSpin; guint m_oneHandlerID; @@ -202,3 +206,9 @@ }; #endif /* AP_UnixDialog_Columns_H */ + + + + + + diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_FormatFootnotes.glade abi/src/wp/ap/unix/ap_UnixDialog_FormatFootnotes.glade --- maemo/src/wp/ap/unix/ap_UnixDialog_FormatFootnotes.glade 2005-05-11 22:26:50.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_FormatFootnotes.glade 2003-09-24 15:52:54.000000000 +0100 @@ -12,12 +12,6 @@ True False False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True False @@ -39,7 +33,6 @@ gtk-cancel True GTK_RELIEF_NORMAL - True -6 @@ -53,7 +46,6 @@ gtk-ok True GTK_RELIEF_NORMAL - True -5 @@ -67,36 +59,107 @@ - + + 5 True - True - True - True - GTK_POS_TOP - False - False + False + 18 - - 12 + True + 2 + 2 False - 13 + 6 + 0 + + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + - + + 18 True - 2 + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + 3 2 False 6 - 0 + 12 + + + + True + Footnote Style: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - 18 + True - + Numbering: False False GTK_JUSTIFY_LEFT @@ -106,10 +169,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -117,257 +176,178 @@ 1 2 fill - fill + - + True - 3 - 2 - False - 6 - 12 + Initial Footnote value: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + True + -1 - - True - Footnote Style: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + - - 0 - 1 - 0 - 1 - fill - - + + + 1 + 2 + 0 + 1 + + + + + + + True + True + -1 - - True - Numbering: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + - - 0 - 1 - 1 - 2 - fill - - + + + 1 + 2 + 1 + 2 + + + + + + + True + False + 2 - + True - Initial Footnote value: + 1 False False - GTK_JUSTIFY_LEFT + GTK_JUSTIFY_RIGHT False False - 0 + 0.5 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - -1 - - - - - - - - 1 - 2 - 0 - 1 - + 0 + True + True - + + 1 True True - -1 - - - - - - - - 1 - 2 - 1 - 2 - - - - - - - True - False - 2 - - - - True - 1 - False - False - GTK_JUSTIFY_RIGHT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - 1 - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 0 255 1 10 10 - - - 0 - False - False - - + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 255 1 10 10 - 1 - 2 - 2 - 3 - fill + 0 + False + False 1 2 - 1 - 2 + 2 + 3 fill - 0 - False - False + 1 + 2 + 1 + 2 + fill - False - True - - - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab + 0 + False + False - 12 True 2 2 False 6 - 6 + 0 + + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + @@ -383,10 +363,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -405,7 +381,7 @@ 2 False 6 - 0 + 12 @@ -420,10 +396,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -448,10 +420,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -476,10 +444,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -498,7 +462,6 @@ Restart on each Section True GTK_RELIEF_NORMAL - True False False True @@ -572,10 +535,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 1 @@ -623,38 +582,16 @@ - False - True - - - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 2 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab + 0 + False + False 0 - True - True + False + False diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_HdrFtr.glade abi/src/wp/ap/unix/ap_UnixDialog_HdrFtr.glade --- maemo/src/wp/ap/unix/ap_UnixDialog_HdrFtr.glade 2005-05-04 21:33:36.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_HdrFtr.glade 2003-12-01 00:45:36.000000000 +0000 @@ -13,12 +13,6 @@ False False False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True False @@ -40,7 +34,6 @@ gtk-cancel True GTK_RELIEF_NORMAL - True -6 @@ -53,7 +46,6 @@ gtk-ok True GTK_RELIEF_NORMAL - True -5 @@ -67,14 +59,11 @@ - + + 5 True - True - True - True - GTK_POS_TOP - False - False + False + 18 @@ -86,6 +75,29 @@ 0 + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + + + + + 18 True @@ -99,10 +111,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -121,7 +129,6 @@ Different header on facing pages True GTK_RELIEF_NORMAL - True False False True @@ -142,7 +149,6 @@ Different header on first page True GTK_RELIEF_NORMAL - True False False True @@ -163,7 +169,6 @@ Different header on last page True GTK_RELIEF_NORMAL - True False False True @@ -176,13 +181,29 @@ + + + 0 + True + True + + + + + + True + 4 + 2 + False + 6 + 0 - + True - + <b>%s</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -190,58 +211,15 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 2 0 1 - fill - - - False - True - - - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - 4 - 2 - False - 6 - 0 @@ -257,10 +235,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -279,7 +253,6 @@ Different footer on facing pages True GTK_RELIEF_NORMAL - True False False True @@ -300,7 +273,6 @@ Different footer on first page True GTK_RELIEF_NORMAL - True False False True @@ -321,7 +293,6 @@ Different footer on last page True GTK_RELIEF_NORMAL - True False False True @@ -334,13 +305,29 @@ + + + 0 + False + False + + + + + + True + 3 + 2 + False + 6 + 0 - + True - + <b>%s</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -348,58 +335,15 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 2 0 1 - fill - - - False - True - - - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - 3 - 2 - False - 6 - 0 @@ -415,10 +359,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -437,7 +377,6 @@ Restart page numbers on new sections True GTK_RELIEF_NORMAL - True False False True @@ -470,10 +409,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -510,61 +445,11 @@ fill - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 0 - 1 - fill - - - - - - False - True - - - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - tab + 0 + True + True diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_Lists.cpp abi/src/wp/ap/unix/ap_UnixDialog_Lists.cpp --- maemo/src/wp/ap/unix/ap_UnixDialog_Lists.cpp 2005-05-09 22:12:32.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_Lists.cpp 2004-04-11 22:42:52.000000000 +0100 @@ -241,8 +241,6 @@ UT_ASSERT(m_wPreviewArea && m_wPreviewArea->window); // make a new Unix GC -//only hildon -/* GR_UnixAllocInfo ai(m_wPreviewArea->window, unixapp->getFontManager(), m_pApp); m_pPreviewWidget = (GR_UnixGraphics*) XAP_App::getApp()->newGraphics(ai); @@ -252,17 +250,14 @@ static_cast(m_wPreviewArea->allocation.width), static_cast(m_wPreviewArea->allocation.height)); - // Next construct a timer for auto-updating the dialog GR_Graphics * pG = NULL; m_pAutoUpdateLists = UT_Timer::static_constructor(autoupdateLists,this,pG); m_bDestroy_says_stopupdating = false; - // OK fire up the auto-updater for 0.5 secs m_pAutoUpdateLists->set(500); -*/ } @@ -312,8 +307,7 @@ { m_bDestroy_says_stopupdating = true; while (m_bAutoUpdate_happening_now == true) ; - if (m_pAutoUpdateLists) - m_pAutoUpdateLists->stop(); + m_pAutoUpdateLists->stop(); setAnswer(AP_Dialog_Lists::a_CLOSE); g_list_free( m_glFonts); @@ -814,17 +808,14 @@ // List Page gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8); -/* hbox2 = gtk_hbox_new (FALSE, 8); + hbox2 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (vbox2), hbox2, TRUE, TRUE, 0); -*/ - vbox4 = gtk_vbox_new (FALSE, 4); gtk_widget_show (vbox4); - gtk_box_pack_start (GTK_BOX (vbox2), vbox4, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox2), vbox4, FALSE, TRUE, 0); - //RENATO: create table table1 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table1); gtk_box_pack_start (GTK_BOX (vbox4), table1, FALSE, TRUE, 0); @@ -897,9 +888,8 @@ pSS->getValueUTF8(AP_STRING_ID_DLG_Lists_SetDefault,s); customized_cb = gtk_button_new_with_label (s.utf8_str()); gtk_widget_show (customized_cb); - //RENATO: customize button - gtk_table_attach (GTK_TABLE (table1), customized_cb,2, 3, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + gtk_table_attach (GTK_TABLE (table1), customized_cb, 0, 2, 2, 3, + (GtkAttachOptions) (GTK_SHRINK), (GtkAttachOptions) (0), 0, 0); frame1 = gtk_frame_new (NULL); @@ -907,7 +897,7 @@ //gtk_widget_show (frame1); gtk_box_pack_start (GTK_BOX (vbox4), frame1, TRUE, TRUE, 0); - table2 = gtk_table_new (6,5, FALSE); + table2 = gtk_table_new (6, 2, FALSE); gtk_widget_show (table2); gtk_container_add (GTK_CONTAINER (frame1), table2); gtk_container_set_border_width (GTK_CONTAINER (table2), 4); @@ -915,13 +905,10 @@ gtk_table_set_row_spacings (GTK_TABLE (table2), 4); gtk_table_set_col_spacings (GTK_TABLE (table2), 4); - //Field : Font font_om = gtk_option_menu_new (); - gtk_widget_set_size_request (font_om, 40, -1); - gtk_widget_show (font_om); - gtk_table_attach (GTK_TABLE (table2), font_om, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + gtk_table_attach (GTK_TABLE (table2), font_om, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); font_om_menu = gtk_menu_new (); @@ -929,112 +916,89 @@ _fillFontMenu(font_om_menu); gtk_option_menu_set_menu (GTK_OPTION_MENU (font_om), font_om_menu); - //Field : Format format_en = gtk_entry_new (); - gtk_entry_set_max_length(GTK_ENTRY(format_en), 5); -// gtk_widget_show (format_en); -// gtk_table_attach (GTK_TABLE (table2), format_en, 1, 2, 0, 1, -// (GtkAttachOptions) (GTK_FILL), -// (GtkAttachOptions) (0), 0, 0); + gtk_entry_set_max_length(GTK_ENTRY(format_en), 20); + gtk_widget_show (format_en); + gtk_table_attach (GTK_TABLE (table2), format_en, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_entry_set_text (GTK_ENTRY (format_en), "%L"); - //Field : Level Delimiter decimal_en = gtk_entry_new (); - gtk_widget_set_sensitive(decimal_en, FALSE); -// gtk_widget_show (decimal_en); -// gtk_table_attach (GTK_TABLE (table2), decimal_en, 1, 2, 1, 2, -// (GtkAttachOptions) (GTK_FILL), -// (GtkAttachOptions) (0), 0, 0); + gtk_widget_show (decimal_en); + gtk_table_attach (GTK_TABLE (table2), decimal_en, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_entry_set_text (GTK_ENTRY (format_en), ""); - //Field : Start At start_sb_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); - g_object_freeze_notify(G_OBJECT(start_sb_adj)); - start_sb = gtk_spin_button_new (GTK_ADJUSTMENT (start_sb_adj), 1, 0); gtk_widget_show (start_sb); - gtk_table_attach (GTK_TABLE (table2), start_sb, 3, 4, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + gtk_table_attach (GTK_TABLE (table2), start_sb, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - - //gtk_widget_set_sensitive(GTK_WIDGET(start_sb_adj), FALSE); - //Field : Text Align text_align_sb_adj = gtk_adjustment_new (0.25, 0, 10, 0.01, 0.2, 1); text_align_sb = gtk_spin_button_new (GTK_ADJUSTMENT (text_align_sb_adj), 0.05, 2); gtk_widget_show (text_align_sb); - gtk_table_attach (GTK_TABLE (table2), text_align_sb, 1, 2, 1, 2, + gtk_table_attach (GTK_TABLE (table2), text_align_sb, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (text_align_sb), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (text_align_sb), TRUE); - //Field : Label Align label_align_sb_adj = gtk_adjustment_new (0, 0, 10, 0.01, 0.2, 1); label_align_sb = gtk_spin_button_new (GTK_ADJUSTMENT (label_align_sb_adj), 0.05, 2); gtk_widget_show (label_align_sb); - gtk_table_attach (GTK_TABLE (table2), label_align_sb, 3, 4, 1, 2, + gtk_table_attach (GTK_TABLE (table2), label_align_sb, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (label_align_sb), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (label_align_sb), TRUE); pSS->getValueUTF8(AP_STRING_ID_DLG_Lists_Format,s); - - //Label : Format format_lb = gtk_label_new (s.utf8_str()); -// gtk_widget_show (format_lb); -// gtk_table_attach (GTK_TABLE (table2), format_lb, 0, 1, 0, 1, -// (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), -// (GtkAttachOptions) (0), 0, 0); + gtk_widget_show (format_lb); + gtk_table_attach (GTK_TABLE (table2), format_lb, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (format_lb), 0.0, 0.5); pSS->getValueUTF8(AP_STRING_ID_DLG_Lists_Font,s); - - //Label : Font font_lb = gtk_label_new (s.utf8_str()); gtk_widget_show (font_lb); - gtk_table_attach (GTK_TABLE (table2), font_lb, 0, 1, 0, 1, + gtk_table_attach (GTK_TABLE (table2), font_lb, 0, 1, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (font_lb), 0.0, 0.5); pSS->getValueUTF8(AP_STRING_ID_DLG_Lists_DelimiterString,s); - - //Label : Level Delimiter delimiter_lb = gtk_label_new (s.utf8_str()); -// gtk_widget_show (delimiter_lb); -// gtk_table_attach (GTK_TABLE (table2), delimiter_lb, 0, 1, 1, 2, -// (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), -// (GtkAttachOptions) (0), 0, 0); + gtk_widget_show (delimiter_lb); + gtk_table_attach (GTK_TABLE (table2), delimiter_lb, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (delimiter_lb), 0.0, 0.5); pSS->getValueUTF8(AP_STRING_ID_DLG_Lists_Start,s); - - //Label : start At start_at_lb = gtk_label_new (s.utf8_str()); gtk_widget_show (start_at_lb); - gtk_table_attach (GTK_TABLE (table2), start_at_lb, 2, 3, 0, 1, + gtk_table_attach (GTK_TABLE (table2), start_at_lb, 0, 1, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (start_at_lb), 0.0, 0.5); pSS->getValueUTF8(AP_STRING_ID_DLG_Lists_Align,s); - - //Label : text align text_align_lb = gtk_label_new (s.utf8_str()); gtk_widget_show (text_align_lb); - gtk_table_attach (GTK_TABLE (table2), text_align_lb, 0, 1, 1, 2, + gtk_table_attach (GTK_TABLE (table2), text_align_lb, 0, 1, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (text_align_lb), 0.0, 0.5); pSS->getValueUTF8(AP_STRING_ID_DLG_Lists_Indent,s); - - //Label : label Align label_align_lb = gtk_label_new (s.utf8_str()); gtk_widget_show (label_align_lb); - gtk_table_attach (GTK_TABLE (table2), label_align_lb, 2, 3, 1, 2, + gtk_table_attach (GTK_TABLE (table2), label_align_lb, 0, 1, 5, 6, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label_align_lb), 0.0, 0.5); -/* vbox3 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox3); gtk_box_pack_start (GTK_BOX (hbox2), vbox3, TRUE, TRUE, 0); @@ -1044,8 +1008,6 @@ gtk_box_pack_start (GTK_BOX (vbox3), preview_lb, FALSE, FALSE, 0); gtk_misc_set_alignment (GTK_MISC (preview_lb), 0.0, 0.5); - //preview frame - preview_frame = gtk_frame_new (NULL); gtk_widget_show (preview_frame); gtk_box_pack_start (GTK_BOX (vbox3), preview_frame, TRUE, TRUE, 0); @@ -1056,7 +1018,6 @@ gtk_widget_set_size_request (preview_area,180,225); gtk_widget_show (preview_area); gtk_container_add (GTK_CONTAINER (preview_frame), preview_area); -*/ hbox1 = gtk_hbox_new (FALSE, 0); if(!isModal()) diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_Options.cpp abi/src/wp/ap/unix/ap_UnixDialog_Options.cpp --- maemo/src/wp/ap/unix/ap_UnixDialog_Options.cpp 2005-05-03 22:59:08.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_Options.cpp 2004-09-01 13:52:42.000000000 +0100 @@ -82,8 +82,6 @@ { // Build the window's widgets and arrange them GtkWidget *mainWindow = _constructWindow(); - //GtkWidget *pTopLevel = (static_cast (pFrame->getFrameImpl()))->getTopLevelWindow(); - UT_ASSERT(mainWindow); // save for use with event diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_Options.glade abi/src/wp/ap/unix/ap_UnixDialog_Options.glade --- maemo/src/wp/ap/unix/ap_UnixDialog_Options.glade 2005-05-03 22:59:08.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_Options.glade 2004-04-17 00:43:16.000000000 +0100 @@ -12,18 +12,10 @@ True False False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True False - 550 - 391 True False 2 @@ -41,7 +33,6 @@ gtk-revert-to-saved True GTK_RELIEF_NORMAL - True 0 @@ -54,7 +45,6 @@ gtk-close True GTK_RELIEF_NORMAL - True -7 @@ -79,165 +69,200 @@ False - + + 12 True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT + False + 18 - + True - GTK_SHADOW_IN + 0.5 + 0.5 + 1 + 1 - - 12 + True + 6 + 2 False - 18 + 6 + 0 - + True - 0.5 + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 0.5 - 1 - 1 - 0 - 0 - 0 - 0 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + + True + True + Cursor _blink + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + Enable smart _quotes + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + True + Allow c_ustom toolbars + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + False + 12 - + True - 6 - 2 - False - 6 - 0 + _Units: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + omUnits + + + 0 + False + False + + - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 0 - 1 - fill - - - + + + True + True + -1 - - True - True - Cursor _blink - True - GTK_RELIEF_NORMAL - True - False - False - True + - - 1 - 2 - 1 - 2 - fill - - + + + 0 + False + False + + + + + 1 + 2 + 4 + 5 + fill + + - - - True - True - Enable smart _quotes - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - + + + True + 0 + 0.5 + 0 + 1 - - - True - True - Allow c_ustom toolbars - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 3 - 4 - fill - - - + + + True + True + GTK_RELIEF_NORMAL - + True False - 12 + 2 - + True - _Units: - True - False - GTK_JUSTIFY_LEFT - False - False + gtk-select-color + 4 0.5 0.5 0 0 - omUnits - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -247,15 +272,18 @@ - + True - True - -1 - - - - - + _Select Screen Color + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -264,250 +292,156 @@ - - 1 - 2 - 4 - 5 - fill - - - - - - True - 0 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - False - 2 - - - - True - gtk-select-color - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Select Screen Color - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 1 - 2 - 5 - 6 - fill - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 6 - fill - fill - - 0 - False - True + 1 + 2 + 5 + 6 + fill - + True - 3 - 2 - False - 6 - 0 - - - - False - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 0 - 1 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 3 - fill - fill - - - - - - False - True - Show splash screen - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - - - - - False - True - _Automatically load all plugins - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 - 0 - False - True + 0 + 1 + 1 + 6 + fill + fill + + 0 + False + True + + + + + + True + 3 + 2 + False + 6 + 0 + + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 3 + fill + fill + + + + + + True + True + Show splash screen + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + _Automatically load all plugins + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + 0 + False + True + @@ -529,10 +463,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 tab @@ -540,359 +470,314 @@ - + + 12 True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT + False + 18 - + True - GTK_SHADOW_IN + 2 + 2 + False + 6 + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + True + <b>%s</b> + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + 2 + 0 + 1 + fill + + + - - 12 + True + 2 + 3 False - 18 + 8 + 12 - + True - 2 - 2 - False - 6 - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - fill - - - - - - True - True - <b>%s</b> - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 2 - 0 - 1 - fill - - - - - - - True - 2 - 3 - False - 8 - 12 - - - - True - _Interval: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - spInterval - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - 75 - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 120 1 1 10 - - - 1 - 2 - 0 - 1 - - - - - - - True - minute(s) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - _File extension: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - enFileExt - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - + _Interval: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + spInterval + + + 0 + 1 + 0 + 1 + fill + + + - - - 75 - True - True - True - True - 0 - .bak~ - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - 1 - 2 - 1 - 2 - fill - fill - - + + + 75 + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 1 120 1 1 10 - 0 - False - True + 1 + 2 + 0 + 1 + - + True - 3 - 2 - False - 6 - 0 + minute(s) + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 0 + 1 + fill + + + - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 0 - 1 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 3 - fill - fill - - - - - - True - True - _Default to right-to-left text direction - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - + + + True + _File extension: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + enFileExt + + + 0 + 1 + 1 + 2 + fill + + + - - - True - True - Use _glyph shaping for Hebrew - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - + + + 75 + True + True + True + True + 0 + .bak~ + True + * + False - 0 - True - True + 1 + 2 + 1 + 2 + + + 1 + 2 + 1 + 2 + fill + fill + + + 0 + False + True + + + + + + True + 3 + 2 + False + 6 + 0 + + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 3 + fill + fill + + + + + + True + True + _Default to right-to-left text direction + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + Use _glyph shaping for Hebrew + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + 0 + True + True + @@ -914,10 +799,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 tab @@ -925,376 +806,328 @@ - + + 12 True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT + False + 18 - + True - GTK_SHADOW_IN + 3 + 2 + False + 6 + 0 - - 12 + True - False - 18 - - - - True - 3 - 2 - False - 6 - 0 - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 0 - 1 - fill - - - + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 3 - fill - fill - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 3 + fill + fill + + - - - True - True - Check spelling as you type - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - + + + True + True + Check spelling as you type + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + - - - True - True - Highlight misspelled words - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - False - True - - + + + True + True + Highlight misspelled words + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + 0 + False + True + + - - - True - 3 - 2 - False - 6 - 0 + + + True + 3 + 2 + False + 6 + 0 - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 0 - 1 - fill - - - + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 3 - fill - fill - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 3 + fill + fill + + - - - True - True - Ignore _UPPERCASE words - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - + + + True + True + Ignore _UPPERCASE words + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + - - - True - True - Ignore words containing _numbers - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - False - True - - + + + True + True + Ignore words containing _numbers + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + 0 + False + True + + - - - True - 3 - 2 - False - 6 - 0 + + + True + 3 + 2 + False + 6 + 0 - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 0 - 1 - fill - - - + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 2 + 0 + 1 + fill + + + - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 3 - fill - fill - - + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 3 + fill + fill + + - - - True - True - _Always suggest corrections - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - + + + True + True + _Always suggest corrections + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + - - - True - True - _Only suggest from main dictionary - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - False - True - - + + + True + True + _Only suggest from main dictionary + True + GTK_RELIEF_NORMAL + False + False + True + + 1 + 2 + 2 + 3 + fill + + + + 0 + False + True + @@ -1316,10 +1149,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 tab diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp --- maemo/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp 2005-05-11 22:26:50.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp 2005-02-20 21:30:44.000000000 +0000 @@ -246,7 +246,6 @@ void AP_UnixDialog_PageSetup::event_LandscapeChanged(void) { -/* UT_UTF8String sHeight = gtk_entry_get_text(GTK_ENTRY(m_entryPageHeight)); UT_UTF8String sWidth = gtk_entry_get_text(GTK_ENTRY(m_entryPageWidth)); @@ -258,9 +257,8 @@ gtk_entry_set_text( GTK_ENTRY(m_entryPageHeight),sWidth.utf8_str() ); g_signal_handler_unblock(G_OBJECT(m_entryPageWidth), m_iEntryPageWidthID); g_signal_handler_unblock(G_OBJECT(m_entryPageHeight), m_iEntryPageHeightID); -*/ + /* switch layout XPM image */ -/* if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_radioPageLandscape))) { gtk_widget_destroy(customPreview); customPreview = create_pixmap (m_PageHbox, orient_horizontal_xpm); @@ -274,7 +272,6 @@ gtk_box_pack_start (GTK_BOX (m_PageHbox), customPreview, FALSE, FALSE, 0); gtk_box_reorder_child (GTK_BOX (m_PageHbox), customPreview, 0); } -*/ } void AP_UnixDialog_PageSetup::doWidthEntry(void) @@ -342,7 +339,7 @@ setPageUnits (fp.getDims()); setPageSize (fp); setPageOrientation (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_radioPagePortrait)) ? PORTRAIT : LANDSCAPE); - //setPageScale (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (m_spinPageScale))); + setPageScale (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (m_spinPageScale))); setMarginTop (gtk_spin_button_get_value (GTK_SPIN_BUTTON (m_spinMarginTop))); setMarginBottom (gtk_spin_button_get_value (GTK_SPIN_BUTTON (m_spinMarginBottom))); @@ -594,7 +591,7 @@ m_optionPageUnits = _getWidget("optionPageUnits"); m_radioPagePortrait = _getWidget("rbPortrait"); m_radioPageLandscape = _getWidget("rbLandscape"); - //m_spinPageScale = _getWidget("wPageScale"); + m_spinPageScale = _getWidget("wPageScale"); m_optionMarginUnits = _getWidget("optionMarginUnits"); m_spinMarginTop = _getWidget("wTopSpin"); @@ -626,7 +623,7 @@ orientation = GTK_LABEL (g_list_nth_data (glist, 0)); gtk_label_set_text (GTK_LABEL (orientation), _(AP, DLG_PageSetup_Landscape)); - //Markup (_getWidget("lbScale"), pSS, _(AP, DLG_PageSetup_Scale)); + Markup (_getWidget("lbScale"), pSS, _(AP, DLG_PageSetup_Scale)); gtk_label_set_text (GTK_LABEL (_getWidget("lbAdjust")), _(AP, DLG_PageSetup_Adjust)); gtk_label_set_text (GTK_LABEL (_getWidget("lbPercentNormalSize")), _(AP, DLG_PageSetup_Percent)); gtk_label_set_text (GTK_LABEL (_getWidget("lbMarginUnits")), _(AP, DLG_PageSetup_Units)); @@ -655,7 +652,7 @@ gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_spinMarginFooter), getMarginFooter ()); /* setup scale number */ - //gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_spinPageScale), static_cast(getPageScale ())); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_spinPageScale), static_cast(getPageScale ())); // create the drop-down menu with all of our supported page sizes GList *popdown_items = NULL; @@ -709,14 +706,11 @@ gtk_option_menu_set_history (GTK_OPTION_MENU (m_optionMarginUnits), fp_2_pos(last_margin_unit)); /* add margin XPM image to the margin window */ - /* customPreview = create_pixmap (m_MarginHbox, margin_xpm); gtk_widget_show (customPreview); gtk_box_pack_start (GTK_BOX (m_MarginHbox), customPreview, FALSE, FALSE, 0); - */ /* add correct page XPM image to the page window */ - /* if (getPageOrientation () == PORTRAIT) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (m_radioPagePortrait), TRUE); @@ -732,7 +726,6 @@ gtk_box_pack_start (GTK_BOX (m_PageHbox), customPreview, FALSE, FALSE, 0); gtk_box_reorder_child (GTK_BOX (m_PageHbox), customPreview, 0); } - */ abiAddStockButton(GTK_DIALOG(m_window), GTK_STOCK_CANCEL, BUTTON_CANCEL); abiAddStockButton(GTK_DIALOG(m_window), GTK_STOCK_OK, BUTTON_OK); diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_PageSetup.glade abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.glade --- maemo/src/wp/ap/unix/ap_UnixDialog_PageSetup.glade 2005-05-11 22:26:50.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.glade 2004-09-23 20:14:10.000000000 +0100 @@ -18,7 +18,6 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST - True False @@ -65,281 +64,258 @@ 6 - + True - False - 0 - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + 0 + 0.5 + GTK_SHADOW_NONE - + + 6 True - 2 - 4 False - 6 - 5 + 6 - + True - Paper Size: + False False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - False - True - False - True - False + 4 + 2 + False + 6 + 6 - - + + True - True - True - True - 0 - - True - * - False + Paper Size: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 0 + 1 + fill + + - - + + True - GTK_SELECTION_BROWSE + False + True + False + True + False + + + + True + True + True + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + 1 + 2 + 0 + 1 + + - - - 1 - 2 - 0 - 1 - - - - - - True - Width: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - + + + True + True + 0.01 + 2 + False + GTK_UPDATE_ALWAYS + False + False + 0 1 5000 0.1 0 10 + + + 1 + 2 + 3 + 4 + + + - - - True - True - 0 - 2 - False - GTK_UPDATE_ALWAYS - False - False - 0 1 5000 0.1 10 10 - - - 3 - 4 - 0 - 1 - - - + + + True + True + 0 + 2 + False + GTK_UPDATE_ALWAYS + False + False + 0 1 5000 0.1 10 10 + + + 1 + 2 + 2 + 3 + + + - - - True - True - 0.00999999977648 - 2 - False - GTK_UPDATE_ALWAYS - False - False - 0 1 5000 0.1 0 10 - - - 3 - 4 - 1 - 2 - - - + + + True + True + -1 - - - True - Height: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - + + + + + + + 1 + 2 + 1 + 2 + fill + + + - - - True - Units: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + + True + Height: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + fill + + + - - - True - True - -1 + + + True + Width: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + - + + True + Units: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + fill + + - 1 - 2 - 1 - 2 - fill - + 0 + True + True - - 0 - True - True - - - - 0 - True - True - - - - - - True - False - 0 - + True <b>%s</b> False @@ -347,21 +323,29 @@ GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - False - False + label_item + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE @@ -371,9 +355,9 @@ 0 - + True - + False False GTK_JUSTIFY_LEFT @@ -383,10 +367,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 @@ -402,10 +382,10 @@ 0 - + True - False - 6 + True + 0 @@ -415,7 +395,7 @@ True GTK_RELIEF_NORMAL True - True + False False True @@ -460,10 +440,161 @@ + + + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + - 0 - True - True + label_item + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + 6 + True + False + 6 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + Adjust to: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 100 1 100 1 10 10 + + + 0 + True + True + + + + + + True + % of normal size + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item @@ -500,10 +631,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 tab @@ -511,361 +638,346 @@ - + 12 True False 0 - + True - 5 - 4 False - 6 - 6 + 20 - + True - Units: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - + 9 + 2 + False + 6 + 6 - - - True - True - -1 + + + True + Units: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + - + + True + True + -1 + + + + + + + 1 + 2 + 0 + 1 + fill + + - - - 1 - 2 - 0 - 1 - fill - - - - - - True - Top: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - + + + True + True + 1 + 1 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 0.1 10 10 + + + 1 + 2 + 2 + 3 + + + - - - True - True - 1 - 1 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 0.1 10 10 - - - 1 - 2 - 2 - 3 - - - + + + True + True + 1 + 1 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 0.1 10 10 + + + 1 + 2 + 3 + 4 + + + - - - True - Right: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - + + + True + True + 1 + 1 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 0.1 10 10 + + + 1 + 2 + 4 + 5 + + + - - - True - True - 1 - 1 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 0.1 10 10 - - - 1 - 2 - 3 - 4 - - - + + + True + True + 1 + 1 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 0.1 10 10 + + + 1 + 2 + 5 + 6 + + + - - - True - Left: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - + + + True + True + 1 + 1 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 0.1 10 10 + + + 1 + 2 + 7 + 8 + + + - - - True - True - 1 - 1 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 0.1 10 10 - - - 1 - 2 - 4 - 5 - - - + + + True + True + 1 + 1 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 0.1 10 10 + + + 1 + 2 + 8 + 9 + + + - - - True - Bottom: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - + + + True + Top: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + - - - True - True - 1 - 1 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 0.1 10 10 - - - 3 - 4 - 2 - 3 - - - + + + True + Right: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + fill + + + - - - True - Header: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 3 - 4 - fill - - - + + + True + Left: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + fill + + + - - - True - True - 1 - 1 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 0.1 10 10 - - - 3 - 4 - 3 - 4 - - - + + + True + Bottom: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 5 + 6 + fill + + + - - - True - Footer: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 4 - 5 - fill - - - + + + True + Header: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 7 + 8 + fill + + + - - - True - True - 1 - 1 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 0.1 10 10 + + + True + Footer: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 8 + 9 + fill + + + - 3 - 4 - 4 - 5 - + 0 + True + True @@ -873,7 +985,6 @@ 0 True True - GTK_PACK_END @@ -896,10 +1007,6 @@ 0.5 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 tab diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp abi/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp --- maemo/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp 2005-05-09 22:12:32.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp 2004-12-12 22:06:22.000000000 +0000 @@ -111,10 +111,8 @@ // FIXME!!! Could get nasty crash if the dlg is destroyed while // a redraw is pending.... // -#ifndef HAVE_HILDON AP_UnixDialog_Paragraph * dlg = (AP_UnixDialog_Paragraph *) p; dlg->event_PreviewAreaExposed(); -#endif return FALSE; } @@ -146,10 +144,7 @@ // Show the top level dialog, gtk_widget_show(mainWindow); -\ - //RENATO - comment preview dialog -#ifndef HAVE_HILDON // *** this is how we add the gc *** { // attach a new graphics context to the drawing area @@ -168,7 +163,6 @@ (UT_uint32) m_drawingareaPreview->allocation.width, (UT_uint32) m_drawingareaPreview->allocation.height); } -#endif // sync all controls once to get started // HACK: the first arg gets ignored @@ -277,10 +271,8 @@ void AP_UnixDialog_Paragraph::event_PreviewAreaExposed(void) { -#ifndef HAVE_HILDON if (m_paragraphPreview) m_paragraphPreview->draw(); -#endif } /*****************************************************************/ @@ -397,7 +389,7 @@ // "Indents and Spacing" page - boxSpacing = gtk_table_new (3, 4, FALSE); + boxSpacing = gtk_table_new (7, 4, FALSE); gtk_widget_show (boxSpacing); gtk_table_set_row_spacings (GTK_TABLE(boxSpacing), 5); gtk_table_set_col_spacings (GTK_TABLE(boxSpacing), 5); @@ -470,7 +462,6 @@ UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); glade_menuitem = gtk_menu_item_new_with_label (unixstr); FREEP(unixstr); - /**/ m_menuitemJustified = glade_menuitem; /**/ g_object_set_data(G_OBJECT(m_menuitemJustified), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_ALIGNMENT); /**/ g_object_set_data(G_OBJECT(m_menuitemJustified), WIDGET_MENU_VALUE_TAG, (gpointer) align_JUSTIFIED); @@ -559,14 +550,14 @@ gtk_table_attach ( GTK_TABLE(boxSpacing), labelSpecial, 2,3, 2,3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelSpecial), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (labelSpecial), 1, 0.5); + gtk_label_set_justify (GTK_LABEL (labelSpecial), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelSpecial), 0, 0.5); listSpecial = gtk_option_menu_new (); /**/ g_object_set_data(G_OBJECT(listSpecial), WIDGET_ID_TAG, (gpointer) id_MENU_SPECIAL_INDENT); gtk_widget_show (listSpecial); - gtk_table_attach ( GTK_TABLE(boxSpacing), listSpecial, 3,4, 2,3, - (GtkAttachOptions) (GTK_SHRINK), + gtk_table_attach ( GTK_TABLE(boxSpacing), listSpecial, 2,3, 3,4, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); listSpecial_menu = gtk_menu_new (); @@ -608,11 +599,11 @@ labelBy = gtk_label_new (unixstr); FREEP(unixstr); gtk_widget_show (labelBy); - gtk_table_attach ( GTK_TABLE(boxSpacing), labelBy, 2,3, 3,4, + gtk_table_attach ( GTK_TABLE(boxSpacing), labelBy, 3,4, 2,3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelBy), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (labelBy), 1, 0.5); + gtk_label_set_justify (GTK_LABEL (labelBy), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelBy), 0, 0.5); // spinbuttonBy_adj = gtk_adjustment_new (0.5, 0, 100, 0.1, 10, 10); // spinbuttonBy = gtk_spin_button_new (NULL, 1, 1); @@ -620,30 +611,24 @@ /**/ g_object_set_data(G_OBJECT(spinbuttonBy), WIDGET_ID_TAG, (gpointer) id_SPIN_SPECIAL_INDENT); gtk_widget_show (spinbuttonBy); gtk_table_attach ( GTK_TABLE(boxSpacing), spinbuttonBy, 3,4, 3,4, - (GtkAttachOptions) (GTK_SHRINK | GTK_EXPAND), + (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (GTK_FILL), 0, 0); hboxSpacing = gtk_hbox_new (FALSE, 5); gtk_widget_show (hboxSpacing); - - - pSS->getValueUTF8(AP_STRING_ID_DLG_Para_LabelSpacing,s); UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); labelSpacing = gtk_label_new (unixstr); FREEP(unixstr); - - - + gtk_widget_show (labelSpacing); gtk_box_pack_start (GTK_BOX (hboxSpacing), labelSpacing, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (labelSpacing), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelSpacing), 0, 0.5); - hseparator1 = gtk_hseparator_new (); - + gtk_widget_show (hseparator1); gtk_box_pack_start (GTK_BOX (hboxSpacing), hseparator1, TRUE, TRUE, 0); gtk_table_attach ( GTK_TABLE(boxSpacing), hboxSpacing, 0,4, 4,5, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), @@ -653,7 +638,7 @@ UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); labelBefore = gtk_label_new (unixstr); FREEP(unixstr); - + gtk_widget_show (labelBefore); gtk_table_attach ( GTK_TABLE(boxSpacing), labelBefore, 0,1, 5,6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); @@ -663,9 +648,8 @@ // spinbuttonBefore_adj = gtk_adjustment_new (0, 0, 1500, 0.1, 10, 10); // spinbuttonBefore = gtk_spin_button_new (NULL, 1, 1); spinbuttonBefore = gtk_entry_new(); - g_object_set_data(G_OBJECT(spinbuttonBefore), WIDGET_ID_TAG, (gpointer) id_SPIN_BEFORE_SPACING); - - + /**/ g_object_set_data(G_OBJECT(spinbuttonBefore), WIDGET_ID_TAG, (gpointer) id_SPIN_BEFORE_SPACING); + gtk_widget_show (spinbuttonBefore); gtk_table_attach ( GTK_TABLE(boxSpacing), spinbuttonBefore, 1,2, 5,6, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (GTK_FILL), 0, 0); @@ -674,7 +658,7 @@ UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); labelAfter = gtk_label_new (unixstr); FREEP(unixstr); - + gtk_widget_show (labelAfter); gtk_table_attach ( GTK_TABLE(boxSpacing), labelAfter, 0,1, 6,7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); @@ -684,8 +668,8 @@ // spinbuttonAfter_adj = gtk_adjustment_new (0, 0, 1500, 0.1, 10, 10); // spinbuttonAfter = gtk_spin_button_new (NULL, 1, 1); spinbuttonAfter = gtk_entry_new(); - g_object_set_data(G_OBJECT(spinbuttonAfter), WIDGET_ID_TAG, (gpointer) id_SPIN_AFTER_SPACING); - + /**/ g_object_set_data(G_OBJECT(spinbuttonAfter), WIDGET_ID_TAG, (gpointer) id_SPIN_AFTER_SPACING); + gtk_widget_show (spinbuttonAfter); gtk_table_attach ( GTK_TABLE(boxSpacing), spinbuttonAfter, 1,2, 6,7, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (GTK_FILL), 0, 0); @@ -694,7 +678,7 @@ UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); labelLineSpacing = gtk_label_new (unixstr); FREEP(unixstr); - + gtk_widget_show (labelLineSpacing); gtk_table_attach ( GTK_TABLE(boxSpacing), labelLineSpacing, 2,3, 5,6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); @@ -702,8 +686,8 @@ gtk_misc_set_alignment (GTK_MISC (labelLineSpacing), 0, 0.5); listLineSpacing = gtk_option_menu_new (); - g_object_set_data(G_OBJECT(listLineSpacing), WIDGET_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); - + /**/ g_object_set_data(G_OBJECT(listLineSpacing), WIDGET_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); + gtk_widget_show (listLineSpacing); gtk_table_attach ( GTK_TABLE(boxSpacing), listLineSpacing, 2,3, 6,7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); @@ -717,54 +701,54 @@ UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); glade_menuitem = gtk_menu_item_new_with_label (unixstr); FREEP(unixstr); - m_menuitemSingle = glade_menuitem; - g_object_set_data(G_OBJECT(m_menuitemSingle), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); - g_object_set_data(G_OBJECT(m_menuitemSingle), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_SINGLE); + /**/ m_menuitemSingle = glade_menuitem; + /**/ g_object_set_data(G_OBJECT(m_menuitemSingle), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); + /**/ g_object_set_data(G_OBJECT(m_menuitemSingle), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_SINGLE); gtk_widget_show (glade_menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (listLineSpacing_menu), glade_menuitem); pSS->getValueUTF8(AP_STRING_ID_DLG_Para_SpacingHalf,s); UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); glade_menuitem = gtk_menu_item_new_with_label (unixstr); FREEP(unixstr); - m_menuitemOneAndHalf = glade_menuitem; - g_object_set_data(G_OBJECT(m_menuitemOneAndHalf), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); - g_object_set_data(G_OBJECT(m_menuitemOneAndHalf), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_ONEANDHALF); + /**/ m_menuitemOneAndHalf = glade_menuitem; + /**/ g_object_set_data(G_OBJECT(m_menuitemOneAndHalf), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); + /**/ g_object_set_data(G_OBJECT(m_menuitemOneAndHalf), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_ONEANDHALF); gtk_widget_show (glade_menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (listLineSpacing_menu), glade_menuitem); pSS->getValueUTF8(AP_STRING_ID_DLG_Para_SpacingDouble,s); UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); glade_menuitem = gtk_menu_item_new_with_label (unixstr); FREEP(unixstr); - m_menuitemDouble = glade_menuitem; - g_object_set_data(G_OBJECT(m_menuitemDouble), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); - g_object_set_data(G_OBJECT(m_menuitemDouble), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_DOUBLE); + /**/ m_menuitemDouble = glade_menuitem; + /**/ g_object_set_data(G_OBJECT(m_menuitemDouble), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); + /**/ g_object_set_data(G_OBJECT(m_menuitemDouble), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_DOUBLE); gtk_widget_show (glade_menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (listLineSpacing_menu), glade_menuitem); pSS->getValueUTF8(AP_STRING_ID_DLG_Para_SpacingAtLeast,s); UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); glade_menuitem = gtk_menu_item_new_with_label (unixstr); FREEP(unixstr); - m_menuitemAtLeast = glade_menuitem; - g_object_set_data(G_OBJECT(m_menuitemAtLeast), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); - g_object_set_data(G_OBJECT(m_menuitemAtLeast), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_ATLEAST); + /**/ m_menuitemAtLeast = glade_menuitem; + /**/ g_object_set_data(G_OBJECT(m_menuitemAtLeast), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); + /**/ g_object_set_data(G_OBJECT(m_menuitemAtLeast), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_ATLEAST); gtk_widget_show (glade_menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (listLineSpacing_menu), glade_menuitem); pSS->getValueUTF8(AP_STRING_ID_DLG_Para_SpacingExactly,s); UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); glade_menuitem = gtk_menu_item_new_with_label (unixstr); FREEP(unixstr); - m_menuitemExactly = glade_menuitem; - g_object_set_data(G_OBJECT(m_menuitemExactly), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); - g_object_set_data(G_OBJECT(m_menuitemExactly), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_EXACTLY); + /**/ m_menuitemExactly = glade_menuitem; + /**/ g_object_set_data(G_OBJECT(m_menuitemExactly), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); + /**/ g_object_set_data(G_OBJECT(m_menuitemExactly), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_EXACTLY); gtk_widget_show (glade_menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (listLineSpacing_menu), glade_menuitem); pSS->getValueUTF8(AP_STRING_ID_DLG_Para_SpacingMultiple,s); UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); glade_menuitem = gtk_menu_item_new_with_label (unixstr); FREEP(unixstr); - m_menuitemMultiple = glade_menuitem; - g_object_set_data(G_OBJECT(m_menuitemMultiple), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); - g_object_set_data(G_OBJECT(m_menuitemMultiple), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_MULTIPLE); + /**/ m_menuitemMultiple = glade_menuitem; + /**/ g_object_set_data(G_OBJECT(m_menuitemMultiple), WIDGET_MENU_PARENT_ID_TAG, (gpointer) id_MENU_SPECIAL_SPACING); + /**/ g_object_set_data(G_OBJECT(m_menuitemMultiple), WIDGET_MENU_VALUE_TAG, (gpointer) spacing_MULTIPLE); gtk_widget_show (glade_menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (listLineSpacing_menu), glade_menuitem); gtk_option_menu_set_menu (GTK_OPTION_MENU (listLineSpacing), listLineSpacing_menu); @@ -773,34 +757,23 @@ UT_XML_cloneNoAmpersands(unixstr, s.utf8_str()); labelAt = gtk_label_new (unixstr); FREEP(unixstr); + gtk_widget_show (labelAt); gtk_table_attach ( GTK_TABLE(boxSpacing), labelAt, 3,4, 5,6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelAt), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelAt), 0, 0.5); // spinbuttonAt_adj = gtk_adjustment_new (0.5, 0, 100, 0.1, 10, 10); // spinbuttonAt = gtk_spin_button_new (NULL, 1, 1); spinbuttonAt = gtk_entry_new(); - g_object_set_data(G_OBJECT(spinbuttonAt), WIDGET_ID_TAG, (gpointer) id_SPIN_SPECIAL_SPACING); + /**/ g_object_set_data(G_OBJECT(spinbuttonAt), WIDGET_ID_TAG, (gpointer) id_SPIN_SPECIAL_SPACING); + gtk_widget_show (spinbuttonAt); gtk_table_attach ( GTK_TABLE(boxSpacing), spinbuttonAt, 3,4, 6,7, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (GTK_FILL), 0, 0); -//TODO: In hildon only hide components for future features -#ifndef HAVE_HILDON - gtk_widget_show (labelSpacing); - gtk_widget_show (hseparator1); - gtk_widget_show (labelBefore); - gtk_widget_show (spinbuttonBefore); - gtk_widget_show (labelAfter); - gtk_widget_show (spinbuttonAfter); - gtk_widget_show (labelLineSpacing); - gtk_widget_show (listLineSpacing); - gtk_widget_show (labelAt); - gtk_widget_show (spinbuttonAt); -#endif /* HAVE_HILDON */ + // The "Line and Page Breaks" page boxBreaks = gtk_table_new (6, 2, FALSE); @@ -906,8 +879,8 @@ (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0 ); + // End of notebook. Next comes the preview area. -#ifndef HAVE_HILDON hboxPreview = gtk_hbox_new (FALSE, 5); gtk_widget_show (hboxPreview); @@ -940,7 +913,7 @@ drawingareaPreview = createDrawingArea (); gtk_widget_show (drawingareaPreview); gtk_container_add (GTK_CONTAINER (framePreview), drawingareaPreview); -#endif + // Update member variables with the important widgets that // might need to be queried or altered later. @@ -967,11 +940,7 @@ // m_spinbuttonAt_adj = spinbuttonAt_adj; m_spinbuttonAt = spinbuttonAt; -#ifdef HAVE_HILDON - m_drawingareaPreview = NULL; -#else m_drawingareaPreview = drawingareaPreview; -#endif /* HAVE_HILDON */ m_checkbuttonWidowOrphan = checkbuttonWidowOrphan; m_checkbuttonKeepLines = checkbuttonKeepLines; @@ -1056,13 +1025,11 @@ g_signal_connect(G_OBJECT(m_checkbuttonDomDirection), "toggled", G_CALLBACK(s_check_toggled), (gpointer) this); -#ifndef HAVE_HILDON // the expose event off the preview g_signal_connect(G_OBJECT(m_drawingareaPreview), "expose_event", G_CALLBACK(s_preview_exposed), (gpointer) this); -#endif } void AP_UnixDialog_Paragraph::_populateWindowData(void) diff -ur maemo/src/wp/ap/unix/ap_UnixDialog_Tab.cpp abi/src/wp/ap/unix/ap_UnixDialog_Tab.cpp --- maemo/src/wp/ap/unix/ap_UnixDialog_Tab.cpp 2005-05-03 22:59:08.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixDialog_Tab.cpp 2004-04-11 19:02:28.000000000 +0100 @@ -79,9 +79,7 @@ void AP_UnixDialog_Tab::runModal(XAP_Frame * pFrame) { // Build the window's widgets and arrange them - - GtkWidget * mainWindow = _constructWindow(); - + GtkWidget * mainWindow = _constructWindow(); UT_return_if_fail(mainWindow); // save for use with event diff -ur maemo/src/wp/ap/unix/ap_UnixFrame.cpp abi/src/wp/ap/unix/ap_UnixFrame.cpp --- maemo/src/wp/ap/unix/ap_UnixFrame.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixFrame.cpp 2004-02-28 22:04:04.000000000 +0000 @@ -17,11 +17,6 @@ * 02111-1307, USA. */ - /* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - #include #include "ut_types.h" @@ -465,9 +460,8 @@ //gtk_widget_show(static_cast(m_pFrameImpl)->m_dArea); AP_UnixFrameImpl * pImpl = static_cast(getFrameImpl()); UT_ASSERT(pImpl); - UT_DEBUGMSG(("Got FrameImpl %x area %x \n",pImpl,pImpl->m_dArea)); + UT_DEBUGMSG(("Got FrameImpl %x area %x \n",pImpl,pImpl->m_dArea)); //pG = new GR_UnixGraphics(pImpl->m_dArea->window, fontManager, getApp()); - gtk_widget_realize (pImpl->m_dArea); GR_UnixAllocInfo ai(pImpl->m_dArea->window, fontManager, getApp()); pG = (GR_UnixGraphics*) XAP_App::getApp()->newGraphics(ai); diff -ur maemo/src/wp/ap/unix/ap_UnixFrameImpl.cpp abi/src/wp/ap/unix/ap_UnixFrameImpl.cpp --- maemo/src/wp/ap/unix/ap_UnixFrameImpl.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/wp/ap/unix/ap_UnixFrameImpl.cpp 2005-02-06 01:00:12.000000000 +0000 @@ -1,9 +1,3 @@ - -/* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - #include #include "ap_UnixFrameImpl.h" #include "ap_UnixApp.h" @@ -23,7 +17,6 @@ #include "abiword_48.xpm" #endif - AP_UnixFrameImpl::AP_UnixFrameImpl(AP_UnixFrame *pUnixFrame, XAP_UnixApp *pUnixApp) : XAP_UnixFrameImpl(static_cast(pUnixFrame), static_cast(pUnixApp)), m_dArea(NULL), @@ -173,8 +166,6 @@ m_vScroll = gtk_vscrollbar_new(m_pVadj); g_object_set_data(G_OBJECT(m_pVadj), "user_data", this); g_object_set_data(G_OBJECT(m_vScroll), "user_data", this); - - g_signal_connect(G_OBJECT(m_pVadj), "value_changed", G_CALLBACK(XAP_UnixFrameImpl::_fe::vScrollChanged), NULL); @@ -183,10 +174,10 @@ GTK_WIDGET_UNSET_FLAGS(m_vScroll, GTK_CAN_FOCUS); // create a drawing area in the for our document window. - m_dArea = NULL; m_dArea = createDrawingArea (); 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 gtk_widget_set_events(GTK_WIDGET(m_dArea), (GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | @@ -195,27 +186,17 @@ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK | - GDK_FOCUS_CHANGE_MASK)); - - GTK_WIDGET_SET_FLAGS (m_dArea, GTK_CAN_FOCUS); // allow it to be focussed + GDK_LEAVE_NOTIFY_MASK)); gtk_widget_set_double_buffered(GTK_WIDGET(m_dArea), FALSE); - -// GValue canfocus; -// g_value_set_boolean(&canfocus, TRUE); - -// g_object_set_property(G_OBJECT(m_dArea), "can-focus", &canfocus); - - - g_signal_connect(G_OBJECT(m_dArea), "button_press_event", - G_CALLBACK(XAP_UnixFrameImpl::_fe::button_press_event), NULL); - - g_signal_connect(G_OBJECT(m_dArea), "button_release_event", - G_CALLBACK(XAP_UnixFrameImpl::_fe::button_release_event), NULL); - g_signal_connect(G_OBJECT(m_dArea), "expose_event", G_CALLBACK(XAP_UnixFrameImpl::_fe::expose), NULL); + g_signal_connect(G_OBJECT(m_dArea), "button_press_event", + G_CALLBACK(XAP_UnixFrameImpl::_fe::button_press_event), NULL); + + g_signal_connect(G_OBJECT(m_dArea), "button_release_event", + G_CALLBACK(XAP_UnixFrameImpl::_fe::button_release_event), NULL); + g_signal_connect(G_OBJECT(m_dArea), "motion_notify_event", G_CALLBACK(XAP_UnixFrameImpl::_fe::motion_notify_event), NULL); @@ -226,10 +207,11 @@ G_CALLBACK(XAP_UnixFrameImpl::_fe::configure_event), NULL); // focus and XIM related - g_signal_connect(G_OBJECT(m_dArea), "enter-notify-event", G_CALLBACK(focus_in_event), this); - g_signal_connect(G_OBJECT(m_dArea), "focus-out-event", G_CALLBACK(focus_out_event), this); + g_signal_connect(G_OBJECT(m_dArea), "enter_notify_event", G_CALLBACK(focus_in_event), this); + g_signal_connect(G_OBJECT(m_dArea), "leave_notify_event", G_CALLBACK(focus_out_event), this); + + // create a table for scroll bars, rulers, and drawing area - // create a table for scroll bars, rulers, and drawing area m_table = gtk_table_new(1, 1, FALSE); //was 1,1 g_object_set_data(G_OBJECT(m_table),"user_data", this); @@ -298,29 +280,23 @@ gtk_widget_show(m_dArea); gtk_widget_show(m_innertable); gtk_widget_show(m_table); + return m_wSunkenBox; } void AP_UnixFrameImpl::_setWindowIcon() { -#ifndef HAVE_HILDON // attach program icon to window GtkWidget * window = getTopLevelWindow(); GdkPixbuf * icon = gdk_pixbuf_new_from_xpm_data (const_cast(abiword_48_xpm)); gtk_window_set_icon (GTK_WINDOW (window), icon); -#endif /* HAVE_HILDON */ } void AP_UnixFrameImpl::_createWindow() { - createTopLevelWindow(); -#ifdef HAVE_HILDON - gtk_widget_show_all(gtk_widget_get_parent(getTopLevelWindow())); -#else + createTopLevelWindow(); gtk_widget_show(getTopLevelWindow()); -#endif - if(getFrame()->getFrameMode() == XAP_NormalFrame) { // needs to be shown so that the following functions work Only in abi/src/wp/ap/unix/gnome: GNUmakefile.in Only in abi/src/wp/ap/xp: GNUmakefile.in Only in maemo/src/wp/ap/xp/ToolbarIcons: tb_stock_font.xpm diff -ur maemo/src/wp/ap/xp/ap_Dialog_Lists.cpp abi/src/wp/ap/xp/ap_Dialog_Lists.cpp --- maemo/src/wp/ap/xp/ap_Dialog_Lists.cpp 2005-05-04 21:33:36.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Dialog_Lists.cpp 2005-04-03 17:39:18.000000000 +0100 @@ -136,7 +136,6 @@ DELETEP(m_pListsPreview); -/* m_pListsPreview = new AP_Lists_preview(gc, this); UT_return_if_fail (m_pListsPreview); @@ -146,7 +145,6 @@ // preview // generateFakeLabels(); -*/ m_isListAtPoint = getBlock()->isListItem(); if(m_isListAtPoint == false) { @@ -159,7 +157,6 @@ */ void AP_Dialog_Lists::event_PreviewAreaExposed(void) { -/* if (m_pListsPreview) { fillFakeLabels(); @@ -169,7 +166,6 @@ { UT_ASSERT_HARMLESS(0); } -*/ } void AP_Dialog_Lists::StartList(void) @@ -645,9 +641,7 @@ m_pFakeAuto->setDelim(m_pszDelim); m_pFakeAuto->setDecimal(m_pszDecimal); m_pFakeAuto->setStartValue(m_iStartValue); - -//only hildon - //m_pListsPreviewm_pListsPreview->setData(m_pszFont,m_fAlign,m_fIndent); + m_pListsPreview->setData(m_pszFont,m_fAlign,m_fIndent); } /*! diff -ur maemo/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp abi/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp --- maemo/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp 2005-05-03 22:59:08.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp 2004-04-03 17:45:32.000000000 +0000 @@ -63,27 +63,21 @@ void AP_Dialog_PageNumbers::_updatePreview(AP_Dialog_PageNumbers::tAlign align, AP_Dialog_PageNumbers::tControl ctrl) { -//Only hildon -/* UT_return_if_fail (m_preview); m_preview->setHdrFtr (ctrl); m_preview->setAlign (align); m_preview->draw (); -*/ } void AP_Dialog_PageNumbers::_createPreviewFromGC(GR_Graphics * gc, UT_uint32 width, UT_uint32 height) { -//Only hildon -/* UT_return_if_fail (gc); m_preview = new AP_Preview_PageNumbers (gc); UT_return_if_fail (m_preview); m_preview->setWindowSize (width, height); -*/ } /**************************************************************************/ @@ -118,8 +112,6 @@ void AP_Preview_PageNumbers::draw (void) { -//Only hildon -/* GR_Painter painter(m_gc); int x = 0, y = 0; @@ -161,5 +153,4 @@ //m_gc->setColor3D(GR_Graphics::CLR3D_Foreground); painter.drawChars (m_str, 0, UT_UCS4_strlen(m_str), x, y); -*/ } diff -ur maemo/src/wp/ap/xp/ap_Dialog_Paragraph.cpp abi/src/wp/ap/xp/ap_Dialog_Paragraph.cpp --- maemo/src/wp/ap/xp/ap_Dialog_Paragraph.cpp 2005-05-03 22:59:08.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Dialog_Paragraph.cpp 2004-12-11 17:23:26.000000000 +0000 @@ -680,14 +680,13 @@ UT_UCS4_cloneString_char(&tmp, pSS->getValue(AP_STRING_ID_DLG_Para_PreviewSampleFallback)); } -#ifndef HAVE_HILDON m_paragraphPreview = new AP_Preview_Paragraph(gc, tmp, this); - UT_return_if_fail (m_paragraphPreview); - m_paragraphPreview->setWindowSize(width, height); -#endif FREEP(tmp); + UT_return_if_fail (m_paragraphPreview); + + m_paragraphPreview->setWindowSize(width, height); // TODO : any setup of the GC for drawing @@ -1183,8 +1182,6 @@ } } -#ifndef HAVE_HILDON - /* // the preview needs to suck in the changed data (to cache it // for subsequent draws) m_paragraphPreview->setFormat(m_pageLeftMargin, @@ -1200,8 +1197,6 @@ (AP_Dialog_Paragraph::tSpacingState) _getMenuItemValue(id_MENU_SPECIAL_SPACING)); m_paragraphPreview->draw(); - */ -#endif /* HAVE_HILDON */ } bool AP_Dialog_Paragraph::_wasChanged(tControl item) diff -ur maemo/src/wp/ap/xp/ap_EditMethods.cpp abi/src/wp/ap/xp/ap_EditMethods.cpp --- maemo/src/wp/ap/xp/ap_EditMethods.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/wp/ap/xp/ap_EditMethods.cpp 2005-04-03 17:13:06.000000000 +0100 @@ -1493,20 +1493,7 @@ XAP_App * pApp = XAP_App::getApp(); UT_return_val_if_fail (pApp, false); - XAP_Frame * pNewFrame; - if (pApp->getFrameCount() == 0) - pNewFrame = pApp->newFrame(); - else - { - //fileSave(NULL, NULL); - pNewFrame = pApp->getFrame(0); - if (pNewFrame->isDirty()) - { - fileSave(pAV_View, NULL); - } - } - - //XAP_Frame * pNewFrame = pApp->getFrame(); //pApp->newFrame(); + XAP_Frame * pNewFrame = pApp->newFrame(); // the IEFileType here doesn't really matter, since the name is NULL UT_Error error = pNewFrame->loadDocument(NULL, IEFT_Unknown); diff -ur maemo/src/wp/ap/xp/ap_Frame.cpp abi/src/wp/ap/xp/ap_Frame.cpp --- maemo/src/wp/ap/xp/ap_Frame.cpp 2005-05-16 18:54:36.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Frame.cpp 2005-04-02 12:06:36.000000000 +0000 @@ -491,6 +491,7 @@ if (!_createViewGraphics(pG, iZoom)) goto Cleanup; + pDocLayout = new FL_DocLayout(static_cast(m_pDoc), pG); ENSUREP_C(pDocLayout); diff -ur maemo/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h abi/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h --- maemo/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h 2005-05-24 23:48:18.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Menu_Layouts_MainMenu.h 2004-12-09 16:49:36.000000000 +0000 @@ -34,12 +34,10 @@ MenuItem(AP_MENU_ID_FILE_SAVE) MenuItem(AP_MENU_ID_FILE_SAVEAS) // MenuItem(AP_MENU_ID_FILE_SAVE_TEMPLATE) -#if 0 Separator() MenuItem(AP_MENU_ID_FILE_IMPORT) MenuItem(AP_MENU_ID_FILE_EXPORT) MenuItem(AP_MENU_ID_FILE_REVERT) -#endif BeginSubMenu(AP_MENU_ID_FILE_RECENT) MenuItem(AP_MENU_ID_FILE_RECENT_1) @@ -54,24 +52,16 @@ EndSubMenu() Separator() -#if 0 - MenuItem(AP_MENU_ID_FILE_PROPERTIES) MenuItem(AP_MENU_ID_FILE_PAGESETUP) #if defined(HAVE_GNOME) MenuItem(AP_MENU_ID_FILE_PRINT_PREVIEW) #endif -#endif MenuItem(AP_MENU_ID_FILE_PRINT) - Separator() -#if 0 MenuItem(AP_MENU_ID_FILE_CLOSE) -#endif - MenuItem(AP_MENU_ID_FILE_EXIT) EndSubMenu() - BeginSubMenu(AP_MENU_ID_EDIT) MenuItem(AP_MENU_ID_EDIT_UNDO) @@ -80,23 +70,67 @@ MenuItem(AP_MENU_ID_EDIT_CUT) MenuItem(AP_MENU_ID_EDIT_COPY) 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_SELECTALL) Separator() MenuItem(AP_MENU_ID_EDIT_FIND) MenuItem(AP_MENU_ID_EDIT_REPLACE) + MenuItem(AP_MENU_ID_EDIT_GOTO) #if !(XAP_PREFSMENU_UNDER_TOOLS) Separator() MenuItem(AP_MENU_ID_TOOLS_OPTIONS) #endif EndSubMenu() + 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() + + 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) +// Currently we only can change toolbars in UNIX builds +#ifdef XP_UNIX_TARGET_GTK + 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() + 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_TEXTBOX) + MenuItem(AP_MENU_ID_INSERT_MAILMERGE) MenuItem(AP_MENU_ID_INSERT_SYMBOL) /* the autotext submenus */ @@ -162,8 +196,6 @@ EndSubMenu() - - Separator() MenuItem(AP_MENU_ID_INSERT_HEADER) MenuItem(AP_MENU_ID_INSERT_FOOTER) @@ -191,16 +223,6 @@ EndSubMenu() - BeginSubMenu(AP_MENU_ID_VIEW) - MenuItem(AP_MENU_ID_VIEW_ZOOM) - 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_WIDTH) - MenuItem(AP_MENU_ID_VIEW_FULLSCREEN) - EndSubMenu() - BeginSubMenu(AP_MENU_ID_FORMAT) MenuItem(AP_MENU_ID_FMT_FONT) MenuItem(AP_MENU_ID_FMT_PARAGRAPH) @@ -213,6 +235,7 @@ #endif Separator() MenuItem(AP_MENU_ID_FMT_COLUMNS) + MenuItem(AP_MENU_ID_FMT_TABS) MenuItem(AP_MENU_ID_FMT_HDRFTR) MenuItem(AP_MENU_ID_FMT_FOOTNOTES) MenuItem(AP_MENU_ID_FMT_TABLEOFCONTENTS) @@ -233,10 +256,17 @@ MenuItem(AP_MENU_ID_FMT_UNDERLINE) MenuItem(AP_MENU_ID_FMT_OVERLINE) MenuItem(AP_MENU_ID_FMT_STRIKE) + //MenuItem(AP_MENU_ID_FMT_TOPLINE) + //MenuItem(AP_MENU_ID_FMT_BOTTOMLINE) MenuItem(AP_MENU_ID_FMT_SUPERSCRIPT) MenuItem(AP_MENU_ID_FMT_SUBSCRIPT) EndSubMenu() + BeginSubMenu(AP_MENU_ID_FMT_STYLE) + MenuItem(AP_MENU_ID_FMT_STYLE_DEFINE) + MenuItem(AP_MENU_ID_FMT_IMPORTSTYLES) + MenuItem(AP_MENU_ID_FMT_STYLIST) + EndSubMenu() Separator() MenuItem(AP_MENU_ID_EDIT_REMOVEHEADER) MenuItem(AP_MENU_ID_EDIT_REMOVEFOOTER) @@ -294,7 +324,6 @@ Separator() -#if 0 MenuItem(AP_MENU_ID_TOOLS_PLUGINS) MenuItem(AP_MENU_ID_TOOLS_SCRIPTS) MenuItem(AP_MENU_ID_TOOLS_MAILMERGE) @@ -305,7 +334,6 @@ Separator() MenuItem(AP_MENU_ID_TOOLS_OPTIONS) #endif -#endif EndSubMenu() BeginSubMenu(AP_MENU_ID_TABLE) @@ -365,7 +393,6 @@ #endif EndSubMenu() -#if 0 BeginSubMenu(AP_MENU_ID_WINDOW) MenuItem(AP_MENU_ID_WINDOW_NEW) Separator() @@ -403,6 +430,5 @@ #endif MenuItem(AP_MENU_ID_HELP_ABOUT) EndSubMenu() -#endif EndLayout() diff -ur maemo/src/wp/ap/xp/ap_Prefs_SchemeIds.h abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h --- maemo/src/wp/ap/xp/ap_Prefs_SchemeIds.h 2005-05-23 20:34:32.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h 2003-10-03 03:53:42.000000000 +0100 @@ -44,7 +44,7 @@ #define AP_PREF_DEFAULT_CursorBlink "1" #define AP_PREF_KEY_AutoSpellCheck "AutoSpellCheck" /* enable automatic spell check {0,1} */ -#define AP_PREF_DEFAULT_AutoSpellCheck "0" +#define AP_PREF_DEFAULT_AutoSpellCheck "1" #define AP_PREF_KEY_SpellCheckCaps "SpellCheckCaps" /* enable checking CAPITALIZED words {0,1} */ #define AP_PREF_DEFAULT_SpellCheckCaps "1" @@ -65,10 +65,10 @@ #define AP_PREF_DEFAULT_RulerUnits "in" #define AP_PREF_KEY_RulerVisible "RulerVisible" /* are the rulers visible? {0,1} */ -#define AP_PREF_DEFAULT_RulerVisible "0" +#define AP_PREF_DEFAULT_RulerVisible "1" #define AP_PREF_KEY_StandardBarVisible "StandardBarVisible" /* is the standard toolbar visible? {0,1} */ -#define AP_PREF_DEFAULT_StandardBarVisible "0" +#define AP_PREF_DEFAULT_StandardBarVisible "1" #define AP_PREF_KEY_FormatBarVisible "FormatBarVisible" /* is the format toolbar visible? {0,1} */ #define AP_PREF_DEFAULT_FormatBarVisible "1" #define AP_PREF_KEY_ExtraBarVisible "ExtraBarVisible" /* is the extra toolbar visible? {0,1} */ @@ -76,9 +76,8 @@ #define AP_PREF_KEY_TableBarVisible "TableBarVisible" /* is the table toolbar visible? {0,1} */ #define AP_PREF_DEFAULT_TableBarVisible "0" - #define AP_PREF_KEY_StatusBarVisible "StatusBarVisible" /* is the status bar visible? {0,1} */ -#define AP_PREF_DEFAULT_StatusBarVisible "0" +#define AP_PREF_DEFAULT_StatusBarVisible "1" #define AP_PREF_KEY_ParaVisible "ParaVisible" /* are the paragraphs/spaces/tats/etc. visible? {0,1} */ #define AP_PREF_DEFAULT_ParaVisible "0" @@ -126,7 +125,7 @@ #endif #define AP_PREF_KEY_ShowSplash "ShowSplash" -#define AP_PREF_DEFAULT_ShowSplash "0" +#define AP_PREF_DEFAULT_ShowSplash "1" #define AP_PREF_KEY_DefaultSaveFormat "DefaultSaveFormat" #define AP_PREF_DEFAULT_DefaultSaveFormat ".abw" diff -ur maemo/src/wp/ap/xp/ap_String_Id.h abi/src/wp/ap/xp/ap_String_Id.h --- maemo/src/wp/ap/xp/ap_String_Id.h 2005-04-29 20:16:24.000000000 +0100 +++ abi/src/wp/ap/xp/ap_String_Id.h 2005-03-22 11:40:48.000000000 +0000 @@ -951,7 +951,6 @@ dcl(MENU_LABEL_FMT, "Te&xt Formatting") dcl(MENU_LABEL_FMT_LANGUAGE,"Set &Language") dcl(MENU_LABEL_FMT_FONT,"&Font") -dcl(MENU_LABEL_FMT_CHOOSE,"&Font Properties") dcl(MENU_LABEL_FMT_PARAGRAPH,"&Paragraph") dcl(MENU_LABEL_FMT_BULLETS,"Bullets and &Numbering") dcl(MENU_LABEL_FMT_DOCUMENT,"&Document") @@ -1248,7 +1247,6 @@ dcl(MENU_STATUSLINE_FMT, " ") dcl(MENU_STATUSLINE_FMT_LANGUAGE,"Change the language of the selected text") dcl(MENU_STATUSLINE_FMT_FONT,"Change the font of the selected text") -dcl(MENU_STATUSLINE_FMT_CHOOSE,"Change the font properties of the selected text") dcl(MENU_STATUSLINE_FMT_PARAGRAPH,"Change the format of the selected paragraph") dcl(MENU_STATUSLINE_FMT_BULLETS,"Add or modify bullets and numbering for selected paragraphs") dcl(MENU_STATUSLINE_FMT_DOCUMENT,"Setup your document's page properties such as page size and margins") @@ -1461,7 +1459,6 @@ dcl(TOOLBAR_LABEL_IMG,"Insert Image") dcl(TOOLBAR_LABEL_FMT_STYLE,"Style") dcl(TOOLBAR_LABEL_FMT_FONT,"Font") -dcl(TOOLBAR_LABEL_FMT_CHOOSE,"Font Properties") dcl(TOOLBAR_LABEL_FMT_HYPERLINK,"Insert Hyperlink") dcl(TOOLBAR_LABEL_FMT_BOOKMARK,"Insert Bookmark") dcl(TOOLBAR_LABEL_FMT_SIZE,"Font Size") @@ -1532,7 +1529,6 @@ dcl(TOOLBAR_STATUSLINE_IMG,"Insert an image into the document") dcl(TOOLBAR_STATUSLINE_FMT_STYLE,"Style") dcl(TOOLBAR_STATUSLINE_FMT_FONT,"Font") -dcl(TOOLBAR_STATUSLINE_FMT_CHOOSE,"Font Properties") dcl(TOOLBAR_STATUSLINE_FMT_HYPERLINK,"Insert a hyperlink into the document") dcl(TOOLBAR_STATUSLINE_FMT_BOOKMARK,"Insert a bookmark into the document") dcl(TOOLBAR_STATUSLINE_FMT_SIZE,"Font Size") @@ -1603,8 +1599,6 @@ dcl(TOOLBAR_TOOLTIP_IMG,"Insert an image into the document") dcl(TOOLBAR_TOOLTIP_FMT_STYLE,"Style") dcl(TOOLBAR_TOOLTIP_FMT_FONT,"Font") -//only hildon -dcl(TOOLBAR_TOOLTIP_FMT_CHOOSE,"Font") dcl(TOOLBAR_TOOLTIP_FMT_HYPERLINK,"Insert a hyperlink into the document") dcl(TOOLBAR_TOOLTIP_FMT_BOOKMARK,"Insert a bookmark into the document") dcl(TOOLBAR_TOOLTIP_FMT_SIZE,"Font Size") diff -ur maemo/src/wp/ap/xp/ap_TB_Layouts_FormatOps.h abi/src/wp/ap/xp/ap_TB_Layouts_FormatOps.h --- maemo/src/wp/ap/xp/ap_TB_Layouts_FormatOps.h 2005-05-24 23:48:18.000000000 +0100 +++ abi/src/wp/ap/xp/ap_TB_Layouts_FormatOps.h 2003-12-09 23:50:14.000000000 +0000 @@ -26,14 +26,10 @@ *****************************************************************/ BeginLayout(FormatOps, AP_STRING_ID_TB_Format, AP_PREF_KEY_FormatBarVisible) -//TODO: Create a standard bar for hildon only - - ToolbarItem(AP_TOOLBAR_ID_FMT_CHOOSE) - //ToolbarItem(AP_TOOLBAR_ID_FMT_STYLE) - -// ToolbarItem(AP_TOOLBAR_ID_FMT_FONT) -// ToolbarItem(AP_TOOLBAR_ID_FMT_SIZE) + ToolbarItem(AP_TOOLBAR_ID_FMT_STYLE) + ToolbarItem(AP_TOOLBAR_ID_FMT_FONT) + ToolbarItem(AP_TOOLBAR_ID_FMT_SIZE) Spacer() ToolbarItem(AP_TOOLBAR_ID_FMT_BOLD) @@ -50,19 +46,12 @@ 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_EDIT_UNDO) - ToolbarItem(AP_TOOLBAR_ID_EDIT_REDO) - - //Spacer() - //ToolbarItem(AP_TOOLBAR_ID_ZOOM) + ToolbarItem(AP_TOOLBAR_ID_UNINDENT) + ToolbarItem(AP_TOOLBAR_ID_INDENT) /* TODO: these should be moved out into the general public */ -// Spacer() -// ToolbarItem(AP_TOOLBAR_ID_COLOR_BACK) -// ToolbarItem(AP_TOOLBAR_ID_COLOR_FORE) + Spacer() + ToolbarItem(AP_TOOLBAR_ID_COLOR_BACK) + ToolbarItem(AP_TOOLBAR_ID_COLOR_FORE) EndLayout() Only in maemo/src/wp/ap/xp: ap_TB_Layouts_HildonOps.h diff -ur maemo/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp abi/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp --- maemo/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp 2005-05-24 23:48:18.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Toolbar_ActionSet.cpp 2004-10-13 00:10:24.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, "fileNew", AV_CHG_NONE, NULL); + _s(AP_TOOLBAR_ID_FILE_NEW, EV_TBIT_PushButton, "fileNew", 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); @@ -97,7 +97,6 @@ _s(AP_TOOLBAR_ID_FMT_STYLE, EV_TBIT_ComboBox, "style", AV_CHG_FMTSTYLE | AV_CHG_MOTION, ap_ToolbarGetState_Style); _s(AP_TOOLBAR_ID_FMT_FONT, EV_TBIT_ComboBox, "fontFamily", AV_CHG_FMTCHAR | AV_CHG_MOTION, ap_ToolbarGetState_CharFmt); - _s(AP_TOOLBAR_ID_FMT_CHOOSE, EV_TBIT_PushButton, "dlgFont", AV_CHG_NONE, NULL); _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); _s(AP_TOOLBAR_ID_FMT_ITALIC, EV_TBIT_ToggleButton, "toggleItalic", AV_CHG_FMTCHAR | AV_CHG_MOTION, ap_ToolbarGetState_CharFmt); @@ -171,3 +170,5 @@ return pActionSet; } + + diff -ur maemo/src/wp/ap/xp/ap_Toolbar_Iconmap.h abi/src/wp/ap/xp/ap_Toolbar_Iconmap.h --- maemo/src/wp/ap/xp/ap_Toolbar_Iconmap.h 2005-04-29 20:16:24.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Toolbar_Iconmap.h 2004-06-22 03:13:40.000000000 +0100 @@ -46,8 +46,6 @@ toolbariconmap(TRANSPARENTLANG,tb_transparent_xpm) toolbariconmap(IMG,tb_insert_graphic_xpm) toolbariconmap(IMG,tb_remove_graphic_xpm) -//hildon only -toolbariconmap(FMT_CHOOSE,tb_stock_font_xpm) toolbariconmap(FMT_STYLE,NoIcon) toolbariconmap(FMT_FONT,NoIcon) toolbariconmap(FMT_HYPERLINK,tb_hyperlink_xpm) @@ -191,4 +189,4 @@ // // SAMPLE: toolbariconmap(LISTS_BULLETS_fi-FI,tb_lists_xpm) -// Add new overloaded icons here +// Add new overloaded icons here diff -ur maemo/src/wp/ap/xp/ap_Toolbar_Icons_All.h abi/src/wp/ap/xp/ap_Toolbar_Icons_All.h --- maemo/src/wp/ap/xp/ap_Toolbar_Icons_All.h 2005-04-29 20:16:24.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Toolbar_Icons_All.h 2004-08-12 08:26:12.000000000 +0100 @@ -59,7 +59,6 @@ # include "tb_text_align_right.xpm" # include "tb_text_bold.xpm" # include "tb_text_font.xpm" -# include "tb_stock_font.xpm" # include "tb_text_italic.xpm" # include "tb_text_strikeout.xpm" # include "tb_text_underline.xpm" @@ -193,7 +192,6 @@ DefineToolbarIcon(tb_text_align_right_xpm) DefineToolbarIcon(tb_text_bold_xpm) DefineToolbarIcon(tb_text_font_xpm) - DefineToolbarIcon(tb_stock_font_xpm) DefineToolbarIcon(tb_text_italic_xpm) DefineToolbarIcon(tb_text_strikeout_xpm) DefineToolbarIcon(tb_text_topline_xpm) diff -ur maemo/src/wp/ap/xp/ap_Toolbar_Id_List.h abi/src/wp/ap/xp/ap_Toolbar_Id_List.h --- maemo/src/wp/ap/xp/ap_Toolbar_Id_List.h 2005-04-29 20:16:24.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Toolbar_Id_List.h 2002-11-22 04:19:38.000000000 +0000 @@ -62,8 +62,6 @@ toolbaritem(SPELLCHECK) toolbaritem(IMG) toolbaritem(FMT_STYLE) -//only hildon -toolbaritem(FMT_CHOOSE) toolbaritem(FMT_FONT) toolbaritem(FMT_HYPERLINK) toolbaritem(FMT_BOOKMARK) @@ -115,3 +113,5 @@ toolbaritem(MERGERIGHT) toolbaritem(MERGEABOVE) toolbaritem(MERGEBELOW) + + diff -ur maemo/src/wp/ap/xp/ap_Toolbar_Layouts_All.h abi/src/wp/ap/xp/ap_Toolbar_Layouts_All.h --- maemo/src/wp/ap/xp/ap_Toolbar_Layouts_All.h 2005-04-27 19:39:58.000000000 +0100 +++ abi/src/wp/ap/xp/ap_Toolbar_Layouts_All.h 2002-09-21 03:53:38.000000000 +0100 @@ -26,7 +26,12 @@ *****************************************************************/ // Include each toolbar layout that we want to build. + #include "ap_TB_Layouts_FileEditOps.h" #include "ap_TB_Layouts_FormatOps.h" #include "ap_TB_Layouts_TableOps.h" #include "ap_TB_Layouts_ExtraOps.h" + + + + Only in abi/src/wp/impexp: GNUmakefile.in Only in abi/src/wp/impexp/cocoa: GNUmakefile.in Only in abi/src/wp/impexp/qnx: GNUmakefile.in Only in abi/src/wp/impexp/unix: GNUmakefile.in Only in abi/src/wp/impexp/xp: GNUmakefile.in Only in abi/src/wp/main: GNUmakefile.in diff -ur maemo/src/wp/main/cocoa/.cvsignore abi/src/wp/main/cocoa/.cvsignore --- maemo/src/wp/main/cocoa/.cvsignore 2005-04-13 16:15:08.000000000 +0100 +++ abi/src/wp/main/cocoa/.cvsignore 2003-11-21 23:12:44.000000000 +0000 @@ -3,4 +3,5 @@ .deps abi_ver.cpp AbiWord +AbiWord.app *~.nib Only in abi/src/wp/main/cocoa/AbiWord.app/Contents/Frameworks: GNUmakefile.in Only in abi/src/wp/main/cocoa/AbiWord.app/Contents: GNUmakefile.in 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.in Only in abi/src/wp/main/cocoa/AbiWord.app/Contents/Resources: GNUmakefile.in Only in abi/src/wp/main/cocoa/AbiWord.app: GNUmakefile.in Only in abi/src/wp/main/cocoa: GNUmakefile.in Only in abi/src/wp/main/cocoa/bundle: GNUmakefile.in Only in abi/src/wp/main/cocoa/bundle: Info.plist Only in abi/src/wp/main/qnx: GNUmakefile.in diff -ur maemo/src/wp/main/unix/GNUmakefile.am abi/src/wp/main/unix/GNUmakefile.am --- maemo/src/wp/main/unix/GNUmakefile.am 2005-04-20 22:34:24.000000000 +0100 +++ abi/src/wp/main/unix/GNUmakefile.am 2003-11-10 12:46:56.000000000 +0000 @@ -30,7 +30,7 @@ REPEAT_LIBS = $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS) $(ABI_LIBS) -AbiWord_2_2_LDADD = @PLUGIN_LIST@ $(REPEAT_LIBS) $(PLATFORM_LIBS) $(OTHER_LIBS) $(HILDON_LIBS) +AbiWord_2_2_LDADD = @PLUGIN_LIST@ $(REPEAT_LIBS) $(PLATFORM_LIBS) $(OTHER_LIBS) AbiWord_2_2_SOURCES = abi_ver.cpp UnixMain.cpp Only in abi/src/wp/main/unix: GNUmakefile.in diff -ur maemo/src/wp/main/unix/UnixMain.cpp abi/src/wp/main/unix/UnixMain.cpp --- maemo/src/wp/main/unix/UnixMain.cpp 2005-05-25 14:51:34.000000000 +0100 +++ abi/src/wp/main/unix/UnixMain.cpp 2003-06-16 20:27:08.000000000 +0100 @@ -16,12 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA * 02111-1307, USA. */ - -/* - * Port to Maemo Development Platform - * Author: INdT - Renato Araujo - */ - #ifndef ABI_OPT_WIDGET @@ -29,7 +23,7 @@ int main(int argc, const char ** argv) { - return AP_UnixApp::main("Word Processor", argc, argv); + return AP_UnixApp::main(ABIWORD_APP_NAME, argc, argv); } #endif Only in abi/src/wp/main/xp: GNUmakefile.in