Index: abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.cpp,v retrieving revision 1.11 diff -u -r1.11 ap_UnixDialog_FormatFrame.cpp --- abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.cpp 20 Sep 2004 04:24:41 -0000 1.11 +++ abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.cpp 20 Sep 2004 13:28:19 -0000 @@ -452,14 +452,14 @@ // add the custom color picker buttons to the dialog m_wBorderColorButton = gtk_color_picker_new(); gtk_widget_show(m_wBorderColorButton); - gtk_table_attach(GTK_TABLE (glade_xml_get_widget(xml, "tbBorderContent")), m_wBorderColorButton, 1, 2, 0, 1, + gtk_table_attach(GTK_TABLE (glade_xml_get_widget(xml, "tbBorder")), m_wBorderColorButton, 3, 4, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); // add the custom color picker buttons to the dialog m_wBackgroundColorButton = gtk_color_picker_new(); gtk_widget_show(m_wBackgroundColorButton); - gtk_box_pack_start(GTK_BOX (glade_xml_get_widget(xml, "hbBackgroundColor")), m_wBackgroundColorButton, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX (glade_xml_get_widget(xml, "hbBackgroundColor")), m_wBackgroundColorButton, TRUE, TRUE, 0); // // Now the Border Thickness Option menu // Index: abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.glade =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.glade,v retrieving revision 1.4 diff -u -r1.4 ap_UnixDialog_FormatFrame.glade --- abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.glade 20 Sep 2004 04:24:41 -0000 1.4 +++ abi/src/wp/ap/unix/ap_UnixDialog_FormatFrame.glade 20 Sep 2004 13:28:22 -0000 @@ -75,18 +75,18 @@ True - 2 - 2 + 3 + 4 False 6 0 - + True - <b>%s</b> + Color: False - True + False GTK_JUSTIFY_LEFT False False @@ -96,10 +96,34 @@ 0 - 0 + 1 2 - 0 - 1 + 1 + 2 + fill + + + + + + + True + Thickness: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 2 + 3 fill @@ -117,7 +141,7 @@ False 0 0.5 - 0 + 6 0 @@ -131,162 +155,168 @@ - + True - 2 - 2 - False - 6 - 12 + True + 0 - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + - - - True - Thickness: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + + True + 1/4 pt + True + + - - - True - True - 0 - - - - - - - True - 1/4 pt - True - - - - - - True - 1/2 pt - True - - - - - - True - 3/4 pt - True - - - - - - True - 1 pt - True - - - - - - True - 1 1/2 pt - True - - - - - - True - 2 1/4 pt - True - - - - - - True - 3 pt - True - - - - - - True - 4 1/2 pt - True - - - - - - True - 6 pt - True - - + + + True + 1/2 pt + True + + + + + + True + 3/4 pt + True + + + + + + True + 1 pt + True + + + + + + True + 1 1/2 pt + True + + + + + + True + 2 1/4 pt + True + + + + + + True + 3 pt + True + + + + + + True + 4 1/2 pt + True + + + + + + True + 6 pt + True - - 1 - 2 - 1 - 2 - fill - - - 1 - 2 + 3 + 4 + 2 + 3 + + + + + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 0 + 1 + fill + + + + + + + 18 + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 0 + + + 2 + 3 1 2 fill - fill + + + + + + + 18 + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 0 + + + 2 + 3 + 2 + 3 + fill + Index: abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.cpp,v retrieving revision 1.24 diff -u -r1.24 ap_UnixDialog_FormatTable.cpp --- abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.cpp 11 Apr 2004 18:02:22 -0000 1.24 +++ abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.cpp 20 Sep 2004 13:28:24 -0000 @@ -416,17 +416,8 @@ // add the buttons for background image to the dialog. - m_wSelectImageButton = glade_xml_get_widget(xml, "btnSelectImage"); - m_wNoImageButton = glade_xml_get_widget(xml, "btnNoImageBackground"); - - - // the toggle buttons created by glade already contain a label, remove that, so we can add a pixmap as a child - gtk_container_remove(GTK_CONTAINER(m_wSelectImageButton), gtk_bin_get_child(GTK_BIN(m_wSelectImageButton))); - gtk_container_remove(GTK_CONTAINER(m_wNoImageButton), gtk_bin_get_child(GTK_BIN(m_wNoImageButton))); - - - label_button_with_abi_pixmap(m_wSelectImageButton, "tb_insert_graphic_xpm"); - label_button_with_abi_pixmap(m_wNoImageButton, "tb_remove_graphic_xpm"); + m_wSelectImageButton = glade_xml_get_widget(xml, "btSelectImage"); + m_wNoImageButton = glade_xml_get_widget(xml, "btNoImageBackground"); localizeLabel(glade_xml_get_widget(xml, "lbSelectImage"), pSS, AP_STRING_ID_DLG_FormatTable_SelectImage); @@ -439,14 +430,14 @@ // add the custom color picker buttons to the dialog m_wBorderColorButton = gtk_color_picker_new(); gtk_widget_show(m_wBorderColorButton); - gtk_table_attach(GTK_TABLE (glade_xml_get_widget(xml, "tbBorderContent")), m_wBorderColorButton, 1, 2, 0, 1, + gtk_table_attach(GTK_TABLE (glade_xml_get_widget(xml, "tbBorder")), m_wBorderColorButton, 3, 4, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); // add the custom color picker buttons to the dialog m_wBackgroundColorButton = gtk_color_picker_new(); gtk_widget_show(m_wBackgroundColorButton); - gtk_box_pack_start(GTK_BOX (glade_xml_get_widget(xml, "hbBackgroundColor")), m_wBackgroundColorButton, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX (glade_xml_get_widget(xml, "hbBackgroundColor")), m_wBackgroundColorButton, TRUE, TRUE, 0); // // Now the Border Thickness Option menu Index: abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.glade =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.glade,v retrieving revision 1.6 diff -u -r1.6 ap_UnixDialog_FormatTable.glade --- abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.glade 22 Nov 2003 15:32:40 -0000 1.6 +++ abi/src/wp/ap/unix/ap_UnixDialog_FormatTable.glade 20 Sep 2004 13:28:26 -0000 @@ -11,7 +11,7 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - False + True False False @@ -75,38 +75,87 @@ True - 2 - 2 + 3 + 4 False 6 0 - + + 18 True - <b>%s</b> + False - True + False GTK_JUSTIFY_LEFT False False 0 0.5 - 0 + 6 0 0 + 1 + 1 + 2 + fill + fill + + + + + + True + Color: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 2 - 0 - 1 + 1 + 2 fill - + + True + Thickness: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 2 + 3 + fill + + + + + + 18 True @@ -117,183 +166,164 @@ False 0 0.5 - 0 + 6 0 - 0 - 1 + 2 + 3 1 2 fill - fill + - + + 18 True - 2 - 2 - False - 6 - 12 + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 0 + + + 2 + 3 + 2 + 3 + fill + + + - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + + + True + <b>%s</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 0 + 1 + fill + + + - - - True - Thickness: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + + True + True + 0 - - True - True - 0 + - - - - - True - 1/4 pt - True - - + + True + 1/4 pt + True + + - - - True - 1/2 pt - True - - + + + True + 1/2 pt + True + + - - - True - 3/4 pt - True - - + + + True + 3/4 pt + True + + - - - True - 1 pt - True - - + + + True + 1 pt + True + + - - - True - 1 1/2 pt - True - - + + + True + 1 1/2 pt + True + + - - - True - 2 1/4 pt - True - - + + + True + 2 1/4 pt + True + + - - - True - 3 pt - True - - + + + True + 3 pt + True + + - - - True - 4 1/2 pt - True - - + + + True + 4 1/2 pt + True + + - - - True - 6 pt - True - - + + + True + 6 pt + True - - 1 - 2 - 1 - 2 - fill - - - 1 - 2 - 1 - 2 - fill - fill + 3 + 4 + 2 + 3 + 0 - False - False + True + True @@ -341,7 +371,7 @@ False 0 0.5 - 0 + 6 0 @@ -396,18 +426,18 @@ 0 - False - False + True + True True - 2 + 3 2 False - 0 + 6 0 @@ -435,100 +465,90 @@ - + + 18 True - 2 - 2 - False - 6 - 12 + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL - + True - Select Image from file - False - False - GTK_JUSTIFY_LEFT - False - False - 0 + 0.5 0.5 - 3 - 0 - - - 1 - 2 - 0 - 1 - fill - - - + 0 + 0 - - - 26 - 26 - True - True - - True - GTK_RELIEF_NORMAL - - - 0 - 1 - 1 - 2 - fill - - - + + + True + False + 2 - - - True - Set No Image - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 3 - 0 - - - 1 - 2 - 1 - 2 - fill - - - + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - 26 - 26 - True - True - - True - GTK_RELIEF_NORMAL + + + True + Select Image from file + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + - - 0 - 1 - 0 - 1 - - - @@ -536,39 +556,85 @@ 2 1 2 - fill + - - 18 + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-clear + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Set No Image + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + - 0 - 1 - 1 - 2 - fill + 1 + 2 + 2 + 3 0 - False - False + True + True