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 07:43:58 -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);
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 07:44:01 -0000
@@ -11,7 +11,7 @@
GTK_WINDOW_TOPLEVEL
GTK_WIN_POS_NONE
False
- False
+ True
False
False
@@ -292,8 +292,8 @@
0
- False
- False
+ True
+ True
@@ -396,18 +396,18 @@
0
- False
- False
+ True
+ True
True
- 2
+ 3
2
False
- 0
+ 6
0
@@ -435,100 +435,90 @@
-
+
+ 18
True
- 2
- 2
- False
- 6
- 12
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 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
-
-
-
@@ -537,29 +527,77 @@
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
+ 1
+ 2
+ 2
+ 3
fill
@@ -567,8 +605,8 @@
0
- False
- False
+ True
+ True