Index: src/wp/ap/unix/ap_UnixDialog_InsertTable.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_InsertTable.cpp,v retrieving revision 1.23 diff -u -r1.23 ap_UnixDialog_InsertTable.cpp --- src/wp/ap/unix/ap_UnixDialog_InsertTable.cpp 29 Mar 2003 21:19:08 -0000 1.23 +++ src/wp/ap/unix/ap_UnixDialog_InsertTable.cpp 30 May 2003 13:11:47 -0000 @@ -75,7 +75,7 @@ _populateWindowData(); switch ( abiRunModalDialog ( GTK_DIALOG(m_windowMain), - pFrame, this, GTK_RESPONSE_CANCEL, false ) ) + pFrame, this, GTK_RESPONSE_OK, false ) ) { case GTK_RESPONSE_OK: m_answer = AP_Dialog_InsertTable::a_OK; @@ -118,11 +118,11 @@ // localize the strings in our dialog, and set tags for some widgets - localizeLabelMarkup(glade_xml_get_widget(xml, "lbTableSize"), pSS, AP_STRING_ID_DLG_InsertTable_TableSize); + localizeLabelMarkup(glade_xml_get_widget(xml, "lbTableSize"), pSS, AP_STRING_ID_DLG_InsertTable_TableSize_Capital); localizeLabel(glade_xml_get_widget(xml, "lbNumCols"), pSS, AP_STRING_ID_DLG_InsertTable_NumCols); localizeLabel(glade_xml_get_widget(xml, "lbNumRows"), pSS, AP_STRING_ID_DLG_InsertTable_NumRows); - localizeLabelMarkup(glade_xml_get_widget(xml, "lbAutoFit"), pSS, AP_STRING_ID_DLG_InsertTable_AutoFit); + localizeLabelMarkup(glade_xml_get_widget(xml, "lbAutoFit"), pSS, AP_STRING_ID_DLG_InsertTable_AutoFit_Capital); localizeButton(glade_xml_get_widget(xml, "rbAutoColSize"), pSS, AP_STRING_ID_DLG_InsertTable_AutoColSize); g_object_set_data (G_OBJECT (glade_xml_get_widget(xml, "rbAutoColSize")), WIDGET_ID_TAG_KEY, GINT_TO_POINTER(b_AUTOSIZE)); Index: src/wp/ap/unix/ap_UnixDialog_InsertTable.glade =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_InsertTable.glade,v retrieving revision 1.3 diff -u -r1.3 ap_UnixDialog_InsertTable.glade --- src/wp/ap/unix/ap_UnixDialog_InsertTable.glade 29 Mar 2003 21:08:00 -0000 1.3 +++ src/wp/ap/unix/ap_UnixDialog_InsertTable.glade 30 May 2003 13:11:47 -0000 @@ -2,25 +2,27 @@ + + 5 True Insert Table GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True - True + False False - True + False - + True False - 0 + 2 - + True GTK_BUTTONBOX_END @@ -40,6 +42,7 @@ True True + True True gtk-ok True @@ -57,50 +60,22 @@ - - 12 + + 5 True - 1 - 1 False - 0 - 0 + 18 - + True - 7 - 3 + 2 + 2 False - 0 + 6 0 - - 18 - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 3 - 3 - 4 - fill - - - - - True <b>%s</b> @@ -116,63 +91,18 @@ 0 - 3 + 2 0 1 - fill - - - - - - - True - <b>%s</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 3 - 4 - 5 - fill - + + 18 True - True - 1 - 1 - True - GTK_UPDATE_ALWAYS - False - False - 0.7 0.1 500 0.1 1 1 - - - 1 - 2 - 6 - 7 - - - - - - - True - inch + False False GTK_JUSTIFY_LEFT @@ -184,65 +114,148 @@ 0 - 2 - 3 - 6 - 7 - 6 + 0 + 1 + 1 + 2 fill - + fill - + True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 2 1 500 1 5 5 - - - 1 - 2 - 2 - 3 - - - - - - - 64 - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 5 1 64 1 5 5 + 2 + 2 + False + 6 + 12 + + + + True + Number of columns: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + 64 + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 5 1 64 1 5 5 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + Number of rows: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 2 1 500 1 5 5 + + + 1 + 2 + 1 + 2 + fill + + + 1 2 1 2 - + fill + + + 0 + False + False + + + + + + True + 2 + 2 + False + 6 + 0 - + True - Number of columns: + <b>%s</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -253,43 +266,19 @@ 0 - 1 - 1 - 2 - 12 - 6 - fill - - - - - - - True - True - Automatic column size - True - GTK_RELIEF_NORMAL - True - False - True - - - 0 - 1 - 5 - 6 - 12 - 6 + 2 + 0 + 1 fill - + + 18 True - Number of rows: + False False GTK_JUSTIFY_LEFT @@ -303,50 +292,131 @@ 0 1 - 2 - 3 - 12 + 1 + 2 fill - + fill - + True - True - Fixed column size: - True - GTK_RELIEF_NORMAL - False - False - True - rbAutoColSize + 2 + 3 + False + 6 + 12 + + + + True + inch + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + True + Automatic column size + True + GTK_RELIEF_NORMAL + True + False + True + + + 0 + 3 + 0 + 1 + + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 0.7 0.1 500 0.1 1 1 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + Fixed column size: + True + GTK_RELIEF_NORMAL + False + False + True + rbAutoColSize + + + 0 + 1 + 1 + 2 + fill + + + - 0 - 1 - 6 - 7 - 12 + 1 + 2 + 1 + 2 fill - + fill - 0 - 1 - 0 - 1 - fill + 0 + False + False 0 - True - True + False + False Index: src/wp/ap/xp/ap_String_Id.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_String_Id.h,v retrieving revision 1.222 diff -u -r1.222 ap_String_Id.h --- src/wp/ap/xp/ap_String_Id.h 30 May 2003 10:47:57 -0000 1.222 +++ src/wp/ap/xp/ap_String_Id.h 30 May 2003 13:11:47 -0000 @@ -119,9 +119,11 @@ /* Insert Table dialog */ dcl(DLG_InsertTable_TableTitle, "Insert Table") dcl(DLG_InsertTable_TableSize, "Table size") +dcl(DLG_InsertTable_TableSize_Capital, "Table Size") dcl(DLG_InsertTable_NumCols, "Number of columns:") dcl(DLG_InsertTable_NumRows, "Number of rows:") dcl(DLG_InsertTable_AutoFit, "AutoFit behavior") +dcl(DLG_InsertTable_AutoFit_Capital, "AutoFit Behavior") dcl(DLG_InsertTable_AutoColSize, "Automatic column size") dcl(DLG_InsertTable_FixedColSize, "Fixed column size:")