diff -Naur --exclude CVS ../abi-current/abi/src/wp/ap/Makefile abi/src/wp/ap/Makefile --- ../abi-current/abi/src/wp/ap/Makefile Thu Jul 27 09:34:31 2000 +++ abi/src/wp/ap/Makefile Sun Jul 30 17:56:36 2000 @@ -64,6 +64,7 @@ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Replace.$(OBJ_SUFFIX) \ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_WordCount.$(OBJ_SUFFIX) \ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Paragraph.$(OBJ_SUFFIX) \ + $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Lists.$(OBJ_SUFFIX) \ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Options.$(OBJ_SUFFIX) endif diff -Naur --exclude CVS ../abi-current/abi/src/wp/ap/unix/ap_UnixDialog_All.h abi/src/wp/ap/unix/ap_UnixDialog_All.h --- ../abi-current/abi/src/wp/ap/unix/ap_UnixDialog_All.h Thu Jul 27 09:34:31 2000 +++ abi/src/wp/ap/unix/ap_UnixDialog_All.h Sun Jul 30 17:57:18 2000 @@ -69,6 +69,7 @@ # include "ap_UnixGnomeDialog_Options.h" # include "ap_UnixGnomeDialog_WordCount.h" # include "ap_UnixGnomeDialog_Field.h" +# include "ap_UnixGnomeDialog_Lists.h" #endif @@ -99,7 +100,7 @@ DeclareDialog(AP_DIALOG_ID_INSERT_DATETIME, AP_UnixDialog_Insert_DateTime) DeclareDialog(AP_DIALOG_ID_WORDCOUNT, AP_UnixGnomeDialog_WordCount) DeclareDialog(AP_DIALOG_ID_FIELD, AP_UnixGnomeDialog_Field) - DeclareDialog(AP_DIALOG_ID_LISTS, AP_UnixDialog_Lists) + DeclareDialog(AP_DIALOG_ID_LISTS, AP_UnixGnomeDialog_Lists) DeclareDialog(AP_DIALOG_ID_COLUMNS, AP_UnixDialog_Columns) // ... also add new dialogs here ... diff -Naur --exclude CVS ../abi-current/abi/src/wp/ap/unix/gnome/Makefile abi/src/wp/ap/unix/gnome/Makefile --- ../abi-current/abi/src/wp/ap/unix/gnome/Makefile Fri Jun 9 17:07:10 2000 +++ abi/src/wp/ap/unix/gnome/Makefile Sun Jul 30 17:55:48 2000 @@ -31,6 +31,7 @@ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Replace.$(OBJ_SUFFIX) \ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_WordCount.$(OBJ_SUFFIX) \ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Paragraph.$(OBJ_SUFFIX) \ + $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Lists.$(OBJ_SUFFIX) \ $(OBJDIR)/ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Options.$(OBJ_SUFFIX) CPPSRCS= ap_$(ABI_FE)$(ABI_GNOME_PREFIX)App.cpp \ @@ -40,6 +41,7 @@ ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Replace.cpp \ ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_WordCount.cpp \ ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Paragraph.cpp \ + ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Lists.cpp \ ap_$(ABI_FE)$(ABI_GNOME_PREFIX)Dialog_Options.cpp TARGETS= $(OBJS) diff -Naur --exclude CVS ../abi-current/abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.cpp abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.cpp --- ../abi-current/abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.cpp Wed Dec 31 19:00:00 1969 +++ abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.cpp Sun Jul 30 17:54:54 2000 @@ -0,0 +1,76 @@ +/* AbiWord + * Copyright (C) 1998 AbiSource, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ +#include +#include +#include +#include "ut_string.h" +#include "ut_assert.h" +#include "ut_debugmsg.h" +#include "ut_dialogHelper.h" + +#include "xap_Dialog_Id.h" +#include "xap_UnixApp.h" +#include "xap_UnixFrame.h" + +#include "ap_Strings.h" +#include "ap_Dialog_Id.h" +#include "ap_Dialog_Lists.h" +#include "ap_UnixGnomeDialog_Lists.h" + +/*****************************************************************/ +XAP_Dialog * AP_UnixGnomeDialog_Lists::static_constructor(XAP_DialogFactory * pFactory, + XAP_Dialog_Id id) +{ + AP_UnixGnomeDialog_Lists * p = new AP_UnixGnomeDialog_Lists(pFactory,id); + return p; +} + +AP_UnixGnomeDialog_Lists::AP_UnixGnomeDialog_Lists(XAP_DialogFactory * pDlgFactory, + XAP_Dialog_Id id) + : AP_UnixDialog_Lists(pDlgFactory, id) +{ +} + +AP_UnixGnomeDialog_Lists::~AP_UnixGnomeDialog_Lists(void) +{ +} + +GtkWidget * AP_UnixGnomeDialog_Lists::_constructWindow(void) +{ + ConstructWindowName(); + m_wMainWindow = gnome_dialog_new (m_WindowName, NULL); + + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (m_wMainWindow)->vbox), + _constructWindowContents (), TRUE, TRUE, 0); + + // close button + gnome_dialog_append_button(GNOME_DIALOG(m_wMainWindow), + GNOME_STOCK_BUTTON_CLOSE); + m_wClose = GTK_WIDGET (g_list_last (GNOME_DIALOG (m_wMainWindow)->buttons)->data); + + // apply button + gnome_dialog_append_button(GNOME_DIALOG(m_wMainWindow), + GNOME_STOCK_BUTTON_APPLY); + m_wApply = GTK_WIDGET (g_list_last (GNOME_DIALOG (m_wMainWindow)->buttons)->data); + + gtk_widget_show_all(m_wMainWindow); + _connectSignals(); + + return (m_wMainWindow); +} diff -Naur --exclude CVS ../abi-current/abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.h abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.h --- ../abi-current/abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.h Wed Dec 31 19:00:00 1969 +++ abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Lists.h Sun Jul 30 17:54:54 2000 @@ -0,0 +1,38 @@ +/* AbiWord + * Copyright (C) 1998 AbiSource, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef AP_UNIXGNOMEDIALOG_LISTS_H +#define AP_UNIXGNOEMDIALOG_LISTS_H + +#include "ap_UnixDialog_Lists.h" + +class AP_UnixGnomeDialog_Lists: public AP_UnixDialog_Lists +{ + public: + AP_UnixGnomeDialog_Lists(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id); + + virtual ~AP_UnixGnomeDialog_Lists(void); + + static XAP_Dialog * static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id); + + protected: + virtual GtkWidget * _constructWindow (void); +}; + +#endif /* AP_UNIXGNOMEDIALOG_LISTS_H */