? abi/src/wp/ap/unix/tmp
Index: abi/src/wp/ap/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/GNUmakefile.am,v
retrieving revision 1.49
diff -u -r1.49 GNUmakefile.am
--- abi/src/wp/ap/unix/GNUmakefile.am	23 Sep 2004 19:14:10 -0000	1.49
+++ abi/src/wp/ap/unix/GNUmakefile.am	24 Sep 2004 20:04:59 -0000
@@ -54,6 +54,7 @@
 	ap_UnixDialog_PageSetup.glade		\
 	ap_UnixDialog_Replace.glade		\
 	ap_UnixDialog_New.glade		\
+	ap_UnixDialog_Styles.glade	\
 	ap_UnixDialog_Stylist.glade	\
 	ap_UnixDialog_Stylist_modal.glade	\
 	ap_UnixDialog_WordCount.glade
Index: abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp,v
retrieving revision 1.64
diff -u -r1.64 ap_UnixDialog_Styles.cpp
--- abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp	11 Apr 2004 18:02:28 -0000	1.64
+++ abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp	24 Sep 2004 20:05:03 -0000
@@ -52,12 +52,12 @@
 
 AP_UnixDialog_Styles::AP_UnixDialog_Styles(XAP_DialogFactory * pDlgFactory,
 										 XAP_Dialog_Id id)
-  : AP_Dialog_Styles(pDlgFactory,id), m_whichRow(0), m_whichCol(0), m_whichType(AP_UnixDialog_Styles::USED_STYLES)
+  : AP_Dialog_Styles(pDlgFactory,id), m_selectedStyle(NULL), m_whichType(AP_UnixDialog_Styles::USED_STYLES)
 {
 	m_windowMain = NULL;
 
-	m_wbuttonApply = NULL;
-	m_wbuttonClose = NULL;
+	m_btApply = NULL;
+	m_btClose = NULL;
 	m_wGnomeButtons = NULL;
 	m_wParaPreviewArea = NULL;
 	m_pParaPreviewWidget = NULL;
@@ -65,8 +65,8 @@
 	m_pCharPreviewWidget = NULL;
 
 	m_wclistStyles = NULL;
-	m_wlistTypes = NULL;
-	m_wlabelDesc = NULL;
+	m_cbList = NULL;
+	m_lbAttributes = NULL;
 
 	m_wModifyDialog = NULL;
 	m_wStyleNameEntry = NULL;
@@ -108,13 +108,14 @@
 /*****************************************************************/
 
 static void
-s_clist_clicked (GtkWidget *w, gint row, gint col, 
-		 GdkEvent *evt, gpointer d)
+s_tvStyles_selection_changed (GtkTreeSelection *selection,
+		gpointer d)
 {
 	AP_UnixDialog_Styles * dlg = static_cast <AP_UnixDialog_Styles *>(d);
-	dlg->event_ClistClicked (row, col);
+	dlg->event_SelectionChanged(selection);
 }
 
+
 static void
 s_typeslist_changed (GtkWidget *w, gpointer d)
 {
@@ -143,6 +144,20 @@
 	dlg->event_NewClicked ();
 }
 
+static void
+s_applybtn_clicked (GtkWidget *w, gpointer d)
+{
+	AP_UnixDialog_Styles * dlg = static_cast <AP_UnixDialog_Styles *>(d);
+	dlg->event_Apply ();
+}
+
+static void
+s_closebtn_clicked (GtkWidget *w, gpointer d)
+{
+	AP_UnixDialog_Styles * dlg = static_cast <AP_UnixDialog_Styles *>(d);
+	dlg->event_Close ();
+}
+
 static void s_remove_property(GtkWidget * widget, AP_UnixDialog_Styles * me)
 {
 	UT_ASSERT(widget && me);
@@ -258,10 +273,10 @@
 	UT_ASSERT(getDoc());
 
 	// Build the window's widgets and arrange them
-	GtkWidget * mainWindow = _constructWindow();
-	UT_ASSERT(mainWindow);
+	m_windowMain = _constructWindow();
+	UT_ASSERT(m_windowMain);
 
-	abiSetupModalDialog(GTK_DIALOG(mainWindow), pFrame, this, BUTTON_CANCEL);
+	abiSetupModalDialog(GTK_DIALOG(m_windowMain), pFrame, this, GTK_RESPONSE_CLOSE);
 
 	// *** this is how we add the gc for the para and char Preview's ***
 	// attach a new graphics context to the drawing area
@@ -317,24 +332,23 @@
 					   reinterpret_cast<gpointer>(this));
 	
 	// connect the select_row signal to the clist
-	g_signal_connect (G_OBJECT (m_wclistStyles), "select_row",
-			  G_CALLBACK (s_clist_clicked), reinterpret_cast<gpointer>(this));
+	g_signal_connect (G_OBJECT (gtk_tree_view_get_selection(GTK_TREE_VIEW(m_wclistStyles))), "changed",
+			  G_CALLBACK (s_tvStyles_selection_changed), reinterpret_cast<gpointer>(this));
 	
 	// main loop for the dialog
+	gint response;
 	while(true)
     {
-	    if(abiRunModalDialog(GTK_DIALOG(m_windowMain), false) == BUTTON_APPLY)
-		{
+		response = abiRunModalDialog(GTK_DIALOG(m_windowMain), false);
+	    if (response == GTK_RESPONSE_APPLY)
 			event_Apply();
-		}
 	    else
 		{
 			event_Close();
+			break; // exit the loop
 		}
-		break ; // exit the loop
 	}
 
-
 	DELETEP (m_pParaPreviewWidget);
 	DELETEP (m_pCharPreviewWidget);
 	
@@ -379,18 +393,20 @@
 
 void AP_UnixDialog_Styles::event_DeleteClicked(void)
 {
-	if (m_whichRow != -1)
+	if (m_selectedStyle)
     {
         gchar * style = NULL;
-		int rtn = gtk_clist_get_text (GTK_CLIST(m_wclistStyles), 
-									  m_whichRow, m_whichCol, 
-									  &style);
-		if (!rtn || !style)
+		
+		GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(m_wclistStyles));
+		GtkTreeIter iter;
+		gtk_tree_model_get_iter(model, &iter, m_selectedStyle);
+		gtk_tree_model_get(model, &iter, 0, &style, -1);
+
+		if (!style)
 			return; // ok, nothing's selected. that's fine
 
 		UT_DEBUGMSG(("DOM: attempting to delete style %s\n", style));
 
-
 		if (!getDoc()->removeStyle(style)) // actually remove the style
 		{
 			const XAP_StringSet * pSS = m_pApp->getStringSet();
@@ -404,6 +420,8 @@
 			return;
 		}
 
+		g_free(style);
+
 		getFrame()->repopulateCombos();
 		_populateWindowData(); // force a refresh
 		getDoc()->signalListeners(PD_SIGNAL_UPDATE_LAYOUT);
@@ -421,10 +439,14 @@
 	}
 }
 
-void AP_UnixDialog_Styles::event_ClistClicked(gint row, gint col)
-{
-	m_whichRow = row;
-	m_whichCol = col;
+void AP_UnixDialog_Styles::event_SelectionChanged(GtkTreeSelection * selection)
+{	
+	GtkTreeView *tree = gtk_tree_selection_get_tree_view(selection);
+	GtkTreeModel *model = gtk_tree_view_get_model(tree);
+	GList *list = gtk_tree_selection_get_selected_rows(selection, &model);
+
+	gpointer item = g_list_nth_data(list, 0);
+	m_selectedStyle = reinterpret_cast<GtkTreePath *>(item);
 
 	// refresh the previews
 	_populatePreviews(false);
@@ -455,106 +477,33 @@
 
 GtkWidget * AP_UnixDialog_Styles::_constructWindow(void)
 {
-	GtkWidget * windowStyles;
-	GtkWidget * vboxContents;
-
-	GtkWidget * buttonApply;
-	GtkWidget * buttonClose;
-
 	const XAP_StringSet * pSS = m_pApp->getStringSet();
 
-	UT_UTF8String s;
-	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_StylesTitle,s);
-	windowStyles = abiDialogNew("styles dialog", TRUE, s.utf8_str());
-	gtk_container_set_border_width (GTK_CONTAINER (windowStyles), 5);
-	gtk_window_set_default_size(GTK_WINDOW(windowStyles), 600, 400);
-
-	buttonClose = abiAddStockButton(GTK_DIALOG(windowStyles),
-					GTK_STOCK_CLOSE,
-					BUTTON_CANCEL);
-
-	buttonApply = abiAddStockButton(GTK_DIALOG(windowStyles),
-					GTK_STOCK_APPLY,
-					BUTTON_APPLY);
-
-	m_windowMain   = windowStyles;
-	m_wbuttonApply = buttonApply;
-	m_wbuttonClose = buttonClose;
-
-	vboxContents = _constructWindowContents(GTK_DIALOG(windowStyles)->vbox);
-	gtk_widget_show(vboxContents);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(windowStyles)->vbox), 
-			  vboxContents);
-
-	_connectsignals();
-	return windowStyles;
-}
-
-GtkWidget* AP_UnixDialog_Styles::_constructWindowContents(
-									GtkWidget * windowStyles)
-{
-	GtkWidget * vboxContents;
-	GtkWidget * hboxContents;
-	GtkWidget * vboxTopLeft;
-	GtkWidget * vboxTopRight;
-
-
-	GtkWidget * frameStyles;
-	GtkWidget *	listStyles;
-
-	GtkWidget * frameList;
-	GtkWidget * comboList;
-
-	GtkWidget * frameParaPrev;
-	GtkWidget * ParaPreviewArea;
-
-	GtkWidget * frameCharPrev;
-	GtkWidget * CharPreviewArea;
-
-	GtkWidget * frameDescription;
-	GtkWidget * DescriptionArea;
-
-	GtkWidget * hsepBot;
-	GtkWidget * buttonBoxStyleManip;
-
-	GtkWidget * buttonNew;
-	GtkWidget * buttonModify;
-	GtkWidget * buttonDelete;
-
-	const XAP_StringSet * pSS = m_pApp->getStringSet();
+	// get the path where our glade file is located
+	XAP_UnixApp * pApp = static_cast<XAP_UnixApp*>(m_pApp);
+	UT_String glade_path( pApp->getAbiSuiteAppGladeDir() );
+	glade_path += "/ap_UnixDialog_Styles.glade";
+	
+	// load the dialog from the glade file
+	GladeXML *xml = abiDialogNewFromXML( glade_path.c_str() );
+	if (!xml)
+		return NULL;
 
-	vboxContents = gtk_vbox_new(FALSE, 0);
+	GtkWidget *window = glade_xml_get_widget(xml, "ap_UnixDialog_Styles");
+	UT_UTF8String s;
+	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_StylesTitle, s);
+	gtk_window_set_title (GTK_WINDOW (window), s.utf8_str());
 
-	hboxContents = gtk_hbox_new(FALSE, 0);
+	// list of styles goes in the top left
+	localizeLabelMarkup(glade_xml_get_widget(xml, "lbStyles"), pSS, AP_STRING_ID_DLG_Styles_Available);
+	
+	// treeview
+	m_wclistStyles = glade_xml_get_widget(xml, "tvStyles");
+	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (m_wclistStyles)), GTK_SELECTION_SINGLE);	
 
-	vboxTopLeft = gtk_vbox_new(FALSE, 0);
+	localizeLabelMarkup(glade_xml_get_widget(xml, "lbList"), pSS, AP_STRING_ID_DLG_Styles_List);
 
-	// list of styles goes in the top left
-	UT_UTF8String s;
-	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_Available,s);
-	frameStyles = gtk_frame_new(
-		s.utf8_str());
-	gtk_frame_set_shadow_type(GTK_FRAME(frameStyles), GTK_SHADOW_NONE);
-
-	GtkWidget * scrollWindow = gtk_scrolled_window_new(NULL, NULL);
-	gtk_widget_show(scrollWindow);
-	gtk_widget_set_size_request(scrollWindow, 120, 120);
-	gtk_container_set_border_width(GTK_CONTAINER(scrollWindow), 10);
-	gtk_container_add (GTK_CONTAINER(frameStyles), scrollWindow);
-
-	listStyles = gtk_clist_new(1);
-	gtk_clist_set_column_width (GTK_CLIST (listStyles), 0, 100);
-	gtk_clist_column_titles_hide (GTK_CLIST (listStyles));
-	gtk_widget_show(listStyles);
-	gtk_container_add(GTK_CONTAINER(scrollWindow), listStyles);
-
-	gtk_box_pack_start(GTK_BOX(vboxTopLeft), frameStyles, TRUE, TRUE, 2);
-	gtk_widget_show(frameStyles);
-
-	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_List,s);
-	frameList = gtk_frame_new(s.utf8_str());
-	gtk_frame_set_shadow_type(GTK_FRAME(frameList), GTK_SHADOW_NONE);
-	comboList = gtk_combo_new();
+	m_cbList = glade_xml_get_widget(xml, "cbList");
 
 	// TODO: translate me
 	GList * styleTypes = NULL;
@@ -563,164 +512,122 @@
 	styleTypes = g_list_append (styleTypes, const_cast<void *>(reinterpret_cast<const void *>(pSS->getValue (AP_STRING_ID_DLG_Styles_LBL_All))));
 	styleTypes = g_list_append (styleTypes, const_cast<void *>(reinterpret_cast<const void *>(pSS->getValue (AP_STRING_ID_DLG_Styles_LBL_UserDefined))));
 
-	gtk_combo_set_popdown_strings (GTK_COMBO(comboList), styleTypes);
-	gtk_combo_set_value_in_list (GTK_COMBO(comboList), static_cast<int>(m_whichType), false);
-	gtk_container_add(GTK_CONTAINER(frameList), comboList);
-
-	gtk_box_pack_start(GTK_BOX(vboxTopLeft), frameList, FALSE, FALSE, 2);
-	gtk_widget_show(frameList);
-	gtk_widget_show(comboList);
+	gtk_combo_set_popdown_strings (GTK_COMBO(m_cbList), styleTypes);
+	gtk_combo_set_value_in_list (GTK_COMBO(m_cbList), static_cast<int>(m_whichType), false);
 
-	gtk_widget_show(vboxTopLeft);
-	gtk_box_pack_start(GTK_BOX(hboxContents), vboxTopLeft, TRUE, TRUE, 2);
+	// previewing and description goes in the top right
 
-	vboxTopRight = gtk_vbox_new(FALSE, 0);
+	localizeLabelMarkup(glade_xml_get_widget(xml, "lbParagraph"), pSS, AP_STRING_ID_DLG_Styles_ParaPrev);
+	GtkWidget *frameParaPrev = glade_xml_get_widget(xml, "frameParagraph");
+	m_wParaPreviewArea = createDrawingArea();
+	gtk_drawing_area_size(GTK_DRAWING_AREA(m_wParaPreviewArea), 300, 70);
+	gtk_container_add(GTK_CONTAINER(frameParaPrev), m_wParaPreviewArea);
+	gtk_widget_show(m_wParaPreviewArea);
+
+	localizeLabelMarkup(glade_xml_get_widget(xml, "lbCharacter"), pSS, AP_STRING_ID_DLG_Styles_CharPrev);
+	GtkWidget *frameCharPrev = glade_xml_get_widget(xml, "frameCharacter");
+	m_wCharPreviewArea = createDrawingArea();
+	gtk_drawing_area_size(GTK_DRAWING_AREA(m_wCharPreviewArea), 300, 50);
+	gtk_container_add(GTK_CONTAINER(frameCharPrev), m_wCharPreviewArea);
+	gtk_widget_show(m_wCharPreviewArea);
 
-	// previewing and description goes in the top right
-	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_ParaPrev,s);
-	frameParaPrev = gtk_frame_new(s.utf8_str());
-	gtk_frame_set_shadow_type(GTK_FRAME(frameParaPrev), GTK_SHADOW_NONE);
-
-	ParaPreviewArea = createDrawingArea();
-	gtk_drawing_area_size(GTK_DRAWING_AREA(ParaPreviewArea), 300, 70);
-	gtk_container_add(GTK_CONTAINER(frameParaPrev), ParaPreviewArea);
-
-	gtk_box_pack_start(GTK_BOX(vboxTopRight), frameParaPrev, TRUE, TRUE, 2);
-	gtk_widget_show(ParaPreviewArea);
-	gtk_widget_show(frameParaPrev);
-
-	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_CharPrev,s);
-	frameCharPrev = gtk_frame_new(s.utf8_str());
-	gtk_frame_set_shadow_type(GTK_FRAME(frameCharPrev), GTK_SHADOW_NONE);
-	CharPreviewArea = createDrawingArea();
-	gtk_drawing_area_size(GTK_DRAWING_AREA(CharPreviewArea), 300, 50);
-	gtk_container_add(GTK_CONTAINER(frameCharPrev), CharPreviewArea);
-
-	gtk_box_pack_start(GTK_BOX(vboxTopRight), frameCharPrev, TRUE, TRUE, 2);
-	gtk_widget_show(CharPreviewArea);
-	gtk_widget_show(frameCharPrev);
-
-	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_Description,s);
-	frameDescription = gtk_frame_new(s.utf8_str());
-	gtk_frame_set_shadow_type(GTK_FRAME(frameDescription), GTK_SHADOW_NONE);
-	DescriptionArea = gtk_label_new(NULL);
-	gtk_label_set_line_wrap (GTK_LABEL(DescriptionArea), TRUE);
-	gtk_label_set_justify (GTK_LABEL(DescriptionArea), GTK_JUSTIFY_LEFT);
-	gtk_widget_set_size_request(DescriptionArea, 300, 60);
-	gtk_container_add(GTK_CONTAINER(frameDescription), DescriptionArea);
-	gtk_misc_set_alignment(GTK_MISC(DescriptionArea), 0, 0);
-	gtk_misc_set_padding(GTK_MISC(DescriptionArea), 8, 6);
-
-	gtk_box_pack_start(GTK_BOX(vboxTopRight), frameDescription, TRUE, TRUE, 2);
-	gtk_widget_show(DescriptionArea);
-	gtk_widget_show(frameDescription);
-
-	gtk_widget_show(vboxTopRight);
-	gtk_box_pack_start(GTK_BOX(hboxContents), vboxTopRight, TRUE, TRUE, 2);
-
-
-	gtk_widget_show(hboxContents);
-	gtk_box_pack_start(GTK_BOX(vboxContents), hboxContents, TRUE, TRUE, 2);
-
-	hsepBot = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(vboxContents), hsepBot, FALSE, FALSE, 0);
-	gtk_widget_show(hsepBot);
+	localizeLabelMarkup(glade_xml_get_widget(xml, "lbDescription"), pSS, AP_STRING_ID_DLG_Styles_Description);
+	m_lbAttributes = glade_xml_get_widget(xml, "lbAttributes");
 
 	// Pack buttons at the bottom of the dialog
-	buttonBoxStyleManip = gtk_hbutton_box_new();
-	gtk_hbutton_box_set_spacing_default(0);
-	gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_END);
-	gtk_widget_show(buttonBoxStyleManip);
-
-	buttonNew = gtk_button_new_from_stock(GTK_STOCK_NEW);
-	gtk_widget_show(buttonNew);
-	gtk_container_add(GTK_CONTAINER(buttonBoxStyleManip), buttonNew);
-	GTK_WIDGET_SET_FLAGS (buttonNew, GTK_CAN_DEFAULT);
-
-	pSS->getValueUTF8(AP_STRING_ID_DLG_Styles_Modify,s);
-	buttonModify = gtk_button_new_with_label(s.utf8_str());
-	gtk_widget_show(buttonModify);
-	gtk_container_add(GTK_CONTAINER(buttonBoxStyleManip), buttonModify);
-	GTK_WIDGET_SET_FLAGS (buttonModify, GTK_CAN_DEFAULT);
-
-	buttonDelete = gtk_button_new_from_stock(GTK_STOCK_DELETE);
-	gtk_widget_show(buttonDelete);
-	gtk_container_add(GTK_CONTAINER(buttonBoxStyleManip), buttonDelete);
-	GTK_WIDGET_SET_FLAGS (buttonDelete, GTK_CAN_DEFAULT);
+	m_btNew = glade_xml_get_widget(xml, "btNew");
+	m_btDelete = glade_xml_get_widget(xml, "btDelete");
+	m_btModify = glade_xml_get_widget(xml, "btModify");
+	localizeButton(m_btModify, pSS, AP_STRING_ID_DLG_Styles_Modify);
 
-	gtk_box_pack_start(GTK_BOX(vboxContents), buttonBoxStyleManip, FALSE, FALSE, 0);
+	m_btApply = glade_xml_get_widget(xml, "btApply");
+	m_btClose = glade_xml_get_widget(xml, "btClose");
+
+	_connectSignals();
+	return window;
+}
 
+void AP_UnixDialog_Styles::_connectSignals(void) const
+{
 	// connect signal for this list
-	g_signal_connect (G_OBJECT(GTK_COMBO(comboList)->entry), 
+	g_signal_connect (G_OBJECT(GTK_COMBO(m_cbList)->entry), 
 			  "changed",
 			  G_CALLBACK(s_typeslist_changed),
-			  reinterpret_cast<gpointer>(this));
+			  (void*)reinterpret_cast<gconstpointer>(this));
 
 	// connect signals for these 3 buttons
-	g_signal_connect (G_OBJECT(buttonNew),
+	g_signal_connect (G_OBJECT(m_btNew),
 			  "clicked",
 			  G_CALLBACK(s_newbtn_clicked),
-			  reinterpret_cast<gpointer>(this));
+			  (void*)reinterpret_cast<gconstpointer>(this));
 	
-	g_signal_connect (G_OBJECT(buttonModify),
+	g_signal_connect (G_OBJECT(m_btModify),
 			  "clicked",
 			  G_CALLBACK(s_modifybtn_clicked),
-			  reinterpret_cast<gpointer>(this));
+			  (void*)reinterpret_cast<gconstpointer>(this));
 	
-	g_signal_connect (G_OBJECT(buttonDelete),
+	g_signal_connect (G_OBJECT(m_btDelete),
 			  "clicked",
 			  G_CALLBACK(s_deletebtn_clicked),
-			  reinterpret_cast<gpointer>(this));
+			  (void*)reinterpret_cast<gconstpointer>(this));
 	
-	m_wclistStyles = listStyles;
-	m_wlistTypes = comboList;
-	m_wbuttonNew = buttonNew;
-	m_wbuttonModify = buttonModify;
-	m_wbuttonDelete = buttonDelete;
-	m_wParaPreviewArea = ParaPreviewArea;
-	m_wCharPreviewArea = CharPreviewArea;
-	m_wlabelDesc = DescriptionArea;
-	return vboxContents;
-}
+	// dialog buttons
+	g_signal_connect (G_OBJECT(m_btApply),
+			  "clicked",
+			  G_CALLBACK(s_applybtn_clicked),
+			  (void*)reinterpret_cast<gconstpointer>(this));
 
-void AP_UnixDialog_Styles::_connectsignals(void) const
-{
+	g_signal_connect (G_OBJECT(m_btClose),
+			  "clicked",
+			  G_CALLBACK(s_closebtn_clicked),
+			  (void*)reinterpret_cast<gconstpointer>(this));
 }
 
 void AP_UnixDialog_Styles::_populateCList(void) const
 {
 	const PD_Style * pStyle;
-	const char * name = NULL;
+	const gchar * name = NULL;
 
 	size_t nStyles = getDoc()->getStyleCount();
 	xxx_UT_DEBUGMSG(("DOM: we have %d styles\n", nStyles));
+	
+	GtkListStore * model = gtk_list_store_new (1, G_TYPE_STRING);
+	GtkTreeIter iter;
 
-	gtk_clist_freeze (GTK_CLIST (m_wclistStyles));
-	gtk_clist_clear (GTK_CLIST (m_wclistStyles));
+	GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW(m_wclistStyles), 0);
+	if (!column) 
+	{
+		column = gtk_tree_view_column_new_with_attributes ("Style", gtk_cell_renderer_text_new (), "text", 0, NULL);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(m_wclistStyles), column);
+	}
 
 	for (UT_uint32 i = 0; i < nStyles; i++)
 	{
-	    const char * data[1];
-
-	    getDoc()->enumStyles(static_cast<UT_uint32>(i), &name, &pStyle);
+		getDoc()->enumStyles(static_cast<UT_uint32>(i), &name, &pStyle);
 
 		// style has been deleted probably
 		if (!pStyle)
 			continue;
 
-	    // all of this is safe to do... append should take a const char **
-	    data[0] = name;
-
-	    if ((m_whichType == ALL_STYLES) || 
+		if ((m_whichType == ALL_STYLES) || 
 			(m_whichType == USED_STYLES && pStyle->isUsed()) ||
 			(m_whichType == USER_STYLES && pStyle->isUserDefined()))
 		{
-			gtk_clist_append (GTK_CLIST(m_wclistStyles), const_cast<gchar **>(reinterpret_cast<const gchar **>(&data[0])));
+			gtk_list_store_append(model, &iter);
+			gtk_list_store_set(model, &iter, 0, name, -1);
 		}
 	}
 
-	gtk_clist_thaw (GTK_CLIST (m_wclistStyles));
-	gtk_clist_select_row (GTK_CLIST (m_wclistStyles), 0, 0);
+	gtk_tree_view_set_model(GTK_TREE_VIEW(m_wclistStyles), reinterpret_cast<GtkTreeModel *>(model));	
+	g_object_unref(model);
+
+	// select first
+	GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_wclistStyles));
+	GtkTreePath *path = gtk_tree_path_new_from_string("0");
+	gtk_tree_selection_select_path(selection, path);
+	
+	// selection "changed" doesn't fire here, so hack manually
+	s_tvStyles_selection_changed (selection, (gpointer)(this));
 }
 
 void AP_UnixDialog_Styles::_populateWindowData(void)
@@ -731,29 +638,32 @@
 
 void AP_UnixDialog_Styles::setDescription(const char * desc) const
 {
-	UT_ASSERT(m_wlabelDesc);
-	gtk_label_set_text (GTK_LABEL(m_wlabelDesc), desc);
+	UT_ASSERT(m_lbAttributes);
+	gtk_label_set_text (GTK_LABEL(m_lbAttributes), desc);
 }
 
 const char * AP_UnixDialog_Styles::getCurrentStyle (void) const
 {
-	static UT_String szStyleBuf;
+	static UT_UTF8String sStyleBuf;
 
 	UT_ASSERT(m_wclistStyles);
 
-	if (m_whichRow < 0 || m_whichCol < 0)
+	if (!m_selectedStyle)
 		return NULL;
 
-	char * szStyle = NULL;
-
-	int ret = gtk_clist_get_text (GTK_CLIST(m_wclistStyles), 
-								  m_whichRow, m_whichCol, &szStyle);
-
-	if (!ret)
+	gchar * style = NULL;
+	
+	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(m_wclistStyles));
+	GtkTreeIter iter;
+	gtk_tree_model_get_iter(model, &iter, m_selectedStyle);
+	gtk_tree_model_get(model, &iter, 0, &style, -1);
+	
+	if (!style)
 		return NULL;
 
-	szStyleBuf = szStyle;
-	return szStyleBuf.c_str();
+	sStyleBuf = style;
+	g_free(style);
+	return sStyleBuf.utf8_str();
 }
 
 GtkWidget *  AP_UnixDialog_Styles::_constructModifyDialog(void)
@@ -1441,7 +1351,7 @@
 
 void  AP_UnixDialog_Styles::setModifyDescription( const char * desc)
 {
-	UT_ASSERT(m_wlabelDesc);
+	UT_ASSERT(m_lbAttributes);
 	gtk_label_set_text (GTK_LABEL(m_wLabDescription), desc);
 }
 
Index: abi/src/wp/ap/unix/ap_UnixDialog_Styles.glade
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Styles.glade,v
retrieving revision 1.1
diff -u -r1.1 ap_UnixDialog_Styles.glade
--- abi/src/wp/ap/unix/ap_UnixDialog_Styles.glade	30 May 2003 14:30:21 -0000	1.1
+++ abi/src/wp/ap/unix/ap_UnixDialog_Styles.glade	24 Sep 2004 20:05:04 -0000
@@ -2,10 +2,10 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
-<widget class="GtkWindow" id="ap_UnixDialog_Styles">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Styles</property>
+<widget class="GtkWindow" id="ap_UnixDialog_Styles_Modify">
+  <property name="title" translatable="yes">window2</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -13,58 +13,80 @@
   <property name="destroy_with_parent">False</property>
 
   <child>
-    <widget class="GtkTable" id="table1">
-      <property name="border_width">12</property>
+    <placeholder/>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="ap_UnixDialog_Styles">
+  <property name="border_width">6</property>
+  <property name="title" translatable="yes">dialog1</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="has_separator">False</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
-      <property name="n_rows">1</property>
-      <property name="n_columns">1</property>
       <property name="homogeneous">False</property>
-      <property name="row_spacing">0</property>
-      <property name="column_spacing">0</property>
+      <property name="spacing">6</property>
 
-      <child>
-	<widget class="GtkTable" id="table2">
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
 	  <property name="visible">True</property>
-	  <property name="n_rows">9</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">0</property>
-	  <property name="column_spacing">0</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="lbAvailableStyles">
+	    <widget class="GtkButton" id="btClose">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">-7</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="btApply">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-apply</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">-10</property>
 	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
 	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHBox" id="hbox1">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">6</property>
 
 	  <child>
-	    <widget class="GtkTable" id="table3">
+	    <widget class="GtkTable" id="table5">
 	      <property name="visible">True</property>
 	      <property name="n_rows">8</property>
-	      <property name="n_columns">1</property>
+	      <property name="n_columns">2</property>
 	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">0</property>
+	      <property name="row_spacing">6</property>
 	      <property name="column_spacing">0</property>
 
 	      <child>
-		<widget class="GtkLabel" id="lbParagraphPreview">
+		<widget class="GtkLabel" id="lbStyles">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
@@ -79,18 +101,17 @@
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
+		  <property name="right_attach">2</property>
 		  <property name="top_attach">0</property>
 		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="lbCharacterPreview">
+		<widget class="GtkLabel" id="label3">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt;</property>
+		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -104,23 +125,52 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_padding">6</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="lbSpacer2">
-		  <property name="height_request">18</property>
+		<widget class="GtkScrolledWindow" id="scrolledwindow2">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
+		  <property name="can_focus">True</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		  <child>
+		    <widget class="GtkTreeView" id="tvStyles">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="headers_visible">False</property>
+		      <property name="rules_hint">True</property>
+		      <property name="reorderable">False</property>
+		      <property name="enable_search">True</property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="lbList">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;List&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
+		  <property name="selectable">True</property>
 		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
@@ -128,7 +178,7 @@
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
+		  <property name="right_attach">2</property>
 		  <property name="top_attach">2</property>
 		  <property name="bottom_attach">3</property>
 		  <property name="x_options">fill</property>
@@ -137,59 +187,218 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkFrame" id="frCharacterPreview">
+		<widget class="GtkCombo" id="cbList">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0</property>
-		  <property name="shadow_type">GTK_SHADOW_OUT</property>
+		  <property name="value_in_list">False</property>
+		  <property name="allow_empty">True</property>
+		  <property name="case_sensitive">False</property>
+		  <property name="enable_arrow_keys">True</property>
+		  <property name="enable_arrows_always">False</property>
 
-		  <child>
-		    <widget class="GtkDrawingArea" id="drawingarea2">
-		      <property name="width_request">300</property>
-		      <property name="height_request">50</property>
+		  <child internal-child="entry">
+		    <widget class="GtkEntry" id="entry1">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="editable">True</property>
+		      <property name="visibility">True</property>
+		      <property name="max_length">0</property>
+		      <property name="text" translatable="yes"></property>
+		      <property name="has_frame">True</property>
+		      <property name="invisible_char" translatable="yes">*</property>
+		      <property name="activates_default">False</property>
+		    </widget>
+		  </child>
+
+		  <child internal-child="list">
+		    <widget class="GtkList" id="list1">
 		      <property name="visible">True</property>
+		      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
 		    </widget>
 		  </child>
 		</widget>
 		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label6">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
 		  <property name="top_attach">4</property>
 		  <property name="bottom_attach">5</property>
-		  <property name="x_padding">12</property>
-		  <property name="y_padding">6</property>
 		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkFrame" id="frParagraphPreview">
+		<widget class="GtkLabel" id="label7">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0</property>
-		  <property name="shadow_type">GTK_SHADOW_OUT</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">6</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="btNew">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-new</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">5</property>
+		  <property name="bottom_attach">6</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="btModify">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
 
 		  <child>
-		    <widget class="GtkDrawingArea" id="drawingarea1">
-		      <property name="width_request">300</property>
-		      <property name="height_request">70</property>
+		    <widget class="GtkAlignment" id="alignment1">
 		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">0</property>
+		      <property name="yscale">0</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox2">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">2</property>
+
+			  <child>
+			    <widget class="GtkImage" id="image1">
+			      <property name="visible">True</property>
+			      <property name="stock">gtk-properties</property>
+			      <property name="icon_size">4</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label5">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Modify ...</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_padding">12</property>
-		  <property name="y_padding">6</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">6</property>
+		  <property name="bottom_attach">7</property>
 		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="lbDescription">
+		<widget class="GtkButton" id="btDelete">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-delete</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">7</property>
+		  <property name="bottom_attach">8</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">6</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkTable" id="table6">
+	      <property name="visible">True</property>
+	      <property name="n_rows">6</property>
+	      <property name="n_columns">2</property>
+	      <property name="homogeneous">False</property>
+	      <property name="row_spacing">6</property>
+	      <property name="column_spacing">0</property>
+
+	      <child>
+		<widget class="GtkLabel" id="lbParagraph">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
@@ -204,21 +413,19 @@
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">6</property>
-		  <property name="bottom_attach">7</property>
-		  <property name="x_options">fill</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="lbSpacer3">
-		  <property name="height_request">18</property>
+		<widget class="GtkLabel" id="lbCharacter">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
+		  <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -229,9 +436,9 @@
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">2</property>
+		  <property name="bottom_attach">3</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
@@ -239,235 +446,266 @@
 
 	      <child>
 		<widget class="GtkLabel" id="lbDescription">
-		  <property name="width_request">300</property>
-		  <property name="height_request">60</property>
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
+		  <property name="label" translatable="yes">&lt;b&gt;%s&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">True</property>
+		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">0</property>
-		  <property name="yalign">0</property>
+		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">7</property>
-		  <property name="bottom_attach">8</property>
-		  <property name="x_padding">12</property>
-		  <property name="y_padding">6</property>
-		  <property name="x_options">fill</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">4</property>
+		  <property name="bottom_attach">5</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">8</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="lbList">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">List</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">6</property>
-	      <property name="bottom_attach">7</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="lbSpacer1">
-	      <property name="height_request">18</property>
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-	      <property name="height_request">212</property>
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
-		<widget class="GtkTreeView" id="tvStyles">
+		<widget class="GtkVBox" id="vbox2">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">False</property>
-		  <property name="rules_hint">True</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_padding">12</property>
-	      <property name="y_padding">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
 
-	  <child>
-	    <widget class="GtkCombo" id="combo1">
-	      <property name="visible">True</property>
-	      <property name="value_in_list">False</property>
-	      <property name="allow_empty">True</property>
-	      <property name="case_sensitive">False</property>
-	      <property name="enable_arrow_keys">True</property>
-	      <property name="enable_arrows_always">False</property>
+		  <child>
+		    <widget class="GtkHBox" id="hbox3">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
 
-	      <child internal-child="entry">
-		<widget class="GtkEntry" id="combo-entry1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-	      </child>
+		      <child>
+			<widget class="GtkFrame" id="frameParagraph">
+			  <property name="visible">True</property>
+			  <property name="label_xalign">0</property>
+			  <property name="label_yalign">0</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+			  <child>
+			    <placeholder/>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label10">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"> </property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">6</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
-	      <child internal-child="list">
-		<widget class="GtkList" id="combo-list1">
-		  <property name="visible">True</property>
-		  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+		  <child>
+		    <placeholder/>
+		  </child>
 		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">7</property>
-	      <property name="bottom_attach">8</property>
-	      <property name="x_padding">12</property>
-	      <property name="y_padding">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox1">
-	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_END</property>
-	      <property name="spacing">12</property>
 
 	      <child>
-		<widget class="GtkButton" id="btAdd">
+		<widget class="GtkVBox" id="vbox3">
 		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-add</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox4">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkFrame" id="frameCharacter">
+			  <property name="visible">True</property>
+			  <property name="label_xalign">0</property>
+			  <property name="label_yalign">0</property>
+			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+			  <child>
+			    <placeholder/>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label11">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"> </property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">6</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <placeholder/>
+		  </child>
 		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
+		  <property name="x_options">fill</property>
+		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkButton" id="btModify">
+		<widget class="GtkLabel" id="label9">
 		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Modify</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">6</property>
+		  <property name="ypad">0</property>
 		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options"></property>
+		  <property name="y_options"></property>
+		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkButton" id="btRemove">
+		<widget class="GtkScrolledWindow" id="scrolledwindow5">
 		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label">gtk-remove</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		  <child>
+		    <widget class="GtkViewport" id="viewport4">
+		      <property name="visible">True</property>
+		      <property name="shadow_type">GTK_SHADOW_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox4">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="lbAttributes">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes"></property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">True</property>
+			      <property name="selectable">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <placeholder/>
+			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
 		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">5</property>
+		  <property name="bottom_attach">6</property>
+		  <property name="x_options">shrink|fill</property>
+		</packing>
 	      </child>
 	    </widget>
 	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">8</property>
-	      <property name="bottom_attach">9</property>
-	      <property name="x_options">fill</property>
+	      <property name="padding">6</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 	</widget>
 	<packing>
-	  <property name="left_attach">0</property>
-	  <property name="right_attach">1</property>
-	  <property name="top_attach">0</property>
-	  <property name="bottom_attach">1</property>
-	  <property name="y_options">fill</property>
+	  <property name="padding">6</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
     </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="ap_UnixDialog_Styles_Modify">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">window2</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <placeholder/>
   </child>
 </widget>
 
Index: abi/src/wp/ap/unix/ap_UnixDialog_Styles.h
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Styles.h,v
retrieving revision 1.18
diff -u -r1.18 ap_UnixDialog_Styles.h
--- abi/src/wp/ap/unix/ap_UnixDialog_Styles.h	1 Aug 2002 20:19:06 -0000	1.18
+++ abi/src/wp/ap/unix/ap_UnixDialog_Styles.h	24 Sep 2004 20:05:05 -0000
@@ -57,7 +57,7 @@
 	virtual void event_DeleteClicked(void);
 	virtual void event_NewClicked(void);
 	virtual void event_ModifyClicked(void);
-	virtual void event_ClistClicked(int row, int col);
+	virtual void event_SelectionChanged(GtkTreeSelection * selection);
 	virtual void event_ListClicked(const char * which);
 	virtual void			event_WindowDelete(void);
 	void new_styleName(void);
@@ -94,7 +94,7 @@
 	enum
 	  {
 	    BUTTON_APPLY,
-	    BUTTON_CANCEL,
+	    BUTTON_CLOSE,
 	    BUTTON_MODIFY_OK,
 	    BUTTON_MODIFY_CANCEL
 	  } ResponseId;
@@ -105,7 +105,7 @@
 	void				_populateWindowData(void);
 	void                            _populateCList(void) const;
 	void 				_storeWindowData(void) const;
-	void				_connectsignals(void) const;
+	void				_connectSignals(void) const;
 	virtual const char * getCurrentStyle (void) const;
 	virtual void setDescription (const char * desc) const;
 
@@ -115,20 +115,20 @@
 	// pointers to widgets we need to query/set
 	GtkWidget * m_windowMain;
 
-	GtkWidget * m_wbuttonApply;
-	GtkWidget * m_wbuttonClose;
-	GtkWidget * m_wbuttonNew;
-	GtkWidget * m_wbuttonModify;
-	GtkWidget * m_wbuttonDelete;
+	GtkWidget * m_btApply;
+	GtkWidget * m_btClose;
+	GtkWidget * m_btNew;
+	GtkWidget * m_btModify;
+	GtkWidget * m_btDelete;
 	GtkWidget * m_wParaPreviewArea;
 	GtkWidget * m_wCharPreviewArea;
 	GtkWidget * m_wGnomeButtons;
 
 	GtkWidget * m_wclistStyles;
-	GtkWidget * m_wlistTypes;
-	GtkWidget * m_wlabelDesc;
+	GtkWidget * m_cbList;
+	GtkWidget * m_lbAttributes;
 
-	gint m_whichRow, m_whichCol;
+	GtkTreePath * m_selectedStyle;
 	StyleType m_whichType;
 
 //////////////////////////////////////////////////////////////////////////