? UnixSplashPref.txt ? src/Linux_2.2.19_i386_DBG Index: src/wp/ap/unix/ap_UnixDialog_Options.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Options.cpp,v retrieving revision 1.29 diff -u -u -r1.29 ap_UnixDialog_Options.cpp --- src/wp/ap/unix/ap_UnixDialog_Options.cpp 2001/04/12 19:13:09 1.29 +++ src/wp/ap/unix/ap_UnixDialog_Options.cpp 2001/06/24 13:34:11 @@ -416,6 +416,9 @@ GtkWidget *autosave_cb; GtkObject *autosave_time_adj; GtkWidget *autosave_time; + GtkWidget *frame44; + GtkWidget *check_splash; + GtkWidget *hbox29; GtkWidget *label23; GtkWidget *hbox28; GtkWidget *label24; @@ -571,6 +574,7 @@ gtk_container_add (GTK_CONTAINER (frame21), vbox31); check_spell = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_SpellCheckAsType)); + gtk_widget_show (check_spell); gtk_box_pack_start (GTK_BOX (vbox31), check_spell, FALSE, FALSE, 0); @@ -928,6 +932,21 @@ gtk_box_pack_start (GTK_BOX (hbox28), autosave_ext, TRUE, TRUE, 0); gtk_widget_set_usize (autosave_ext, 50, -2); + frame44 = gtk_frame_new ("Misc"); + gtk_widget_show (frame44); + gtk_box_pack_start (GTK_BOX (vbox36), frame44, FALSE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (frame44), 4); + + hbox29 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox29); + //gtk_box_pack_start (GTK_BOX (vbox36), hbox29, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (frame44), hbox29); + + check_splash = gtk_check_button_new_with_label (pSS->getValue(AP_STRING_ID_DLG_Options_Label_ShowSplash)); + gtk_widget_show (check_splash); + gtk_box_pack_start (GTK_BOX (hbox29), check_splash, FALSE, FALSE, 0); + + label10 = gtk_label_new (pSS->getValue(AP_STRING_ID_DLG_Options_TabLabel_Preferences)); gtk_widget_show (label10); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label10); @@ -963,7 +982,9 @@ m_checkbuttonPrefsAutoSave = save_scheme; m_comboPrefsScheme = current_scheme; - + + m_checkbuttonShowSplash = check_splash; + m_checkbuttonViewShowRuler = show_ruler; m_listViewRulerUnits = ruler_units; m_checkbuttonViewCursorBlink = blink_cursor; @@ -1179,7 +1200,9 @@ case id_LIST_DEFAULT_PAGE_SIZE: return m_listDefaultPageSize; - + + case id_SHOWSPLASH: + return m_checkbuttonShowSplash; #ifdef BIDI_ENABLED case id_CHECK_OTHER_DEFAULT_DIRECTION_RTL: return m_checkbuttonOtherDirectionRtl; @@ -1326,7 +1349,7 @@ #endif DEFINE_GET_SET_BOOL(AutoSaveFile); - +DEFINE_GET_SET_BOOL(ShowSplash); DEFINE_GET_SET_BOOL(PrefsAutoSave); DEFINE_GET_SET_BOOL(ViewShowRuler); DEFINE_GET_SET_BOOL(ViewShowStatusBar); Index: src/wp/ap/unix/ap_UnixDialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Options.h,v retrieving revision 1.20 diff -u -u -r1.20 ap_UnixDialog_Options.h --- src/wp/ap/unix/ap_UnixDialog_Options.h 2001/03/26 11:09:41 1.20 +++ src/wp/ap/unix/ap_UnixDialog_Options.h 2001/06/24 13:34:11 @@ -57,7 +57,9 @@ SET_GATHER (SpellNumbers, bool ); SET_GATHER (SpellInternet, bool ); - SET_GATHER (SmartQuotesEnable, bool ); + SET_GATHER (ShowSplash, bool); + + SET_GATHER (SmartQuotesEnable, bool ); SET_GATHER (DefaultPageSize, fp_PageSize::Predefined); SET_GATHER (PrefsAutoSave, bool ); @@ -145,7 +147,7 @@ GtkWidget * m_checkbuttonAutoSaveFile; GtkWidget * m_textAutoSaveFilePeriod; GtkWidget * m_textAutoSaveFileExt; - + GtkWidget * m_checkbuttonShowSplash; GtkWidget * m_buttonDefaults; GtkWidget * m_buttonApply; GtkWidget * m_buttonOK; Index: src/wp/ap/xp/ap_Dialog_Options.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Options.cpp,v retrieving revision 1.30 diff -u -u -r1.30 ap_Dialog_Options.cpp --- src/wp/ap/xp/ap_Dialog_Options.cpp 2001/04/14 18:32:52 1.30 +++ src/wp/ap/xp/ap_Dialog_Options.cpp 2001/06/24 13:34:14 @@ -102,7 +102,7 @@ Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_SpellCheckCaps, _gatherSpellUppercase() ); Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_SpellCheckNumbers, _gatherSpellNumbers() ); Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_SpellCheckInternet, _gatherSpellInternet() ); - + Save_Pref_Bool(pPrefsScheme, AP_PREF_KEY_ShowSplash,_gatherShowSplash()); Save_Pref_Bool( pPrefsScheme, XAP_PREF_KEY_SmartQuotesEnable, _gatherSmartQuotesEnable() ); Save_Pref_Bool( pPrefsScheme, AP_PREF_KEY_CursorBlink, _gatherViewCursorBlink() ); @@ -265,6 +265,10 @@ // ------------ Prefs _setPrefsAutoSave( pPrefs->getAutoSavePrefs() ); + + //-------------ShowSplash + if (pPrefs->getPrefsValueBool((XML_Char*)AP_PREF_KEY_ShowSplash,&b)) + _setShowSplash (b); // ------------ View if (pPrefs->getPrefsValue((XML_Char*)AP_PREF_KEY_RulerUnits,&pszBuffer)) Index: src/wp/ap/xp/ap_Dialog_Options.h =================================================================== RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Options.h,v retrieving revision 1.18 diff -u -u -r1.18 ap_Dialog_Options.h --- src/wp/ap/xp/ap_Dialog_Options.h 2001/04/19 17:03:24 1.18 +++ src/wp/ap/xp/ap_Dialog_Options.h 2001/06/24 13:34:14 @@ -72,7 +72,7 @@ id_PUSH_CHOOSE_COLOR_FOR_TRANSPARENT, id_BUTTON_SAVE, id_BUTTON_DEFAULTS, id_BUTTON_OK, id_BUTTON_CANCEL, id_BUTTON_APPLY, - + id_SHOWSPLASH, id_last } tControl; // typedef enum { check_FALSE = 0, check_TRUE, check_INDETERMINATE } tCheckState; @@ -110,7 +110,8 @@ #if 0 SET_GATHER (SpellAutoReplace, bool); #endif - + + SET_GATHER (ShowSplash,bool); SET_GATHER (SmartQuotesEnable, bool); SET_GATHER (DefaultPageSize, fp_PageSize::Predefined); 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.93 diff -u -u -r1.93 ap_String_Id.h --- src/wp/ap/xp/ap_String_Id.h 2001/06/22 18:19:55 1.93 +++ src/wp/ap/xp/ap_String_Id.h 2001/06/24 13:34:17 @@ -275,6 +275,8 @@ dcl(DLG_Options_Label_PrefsAutoSave, "&Automatically save this Scheme") dcl(DLG_Options_Label_PrefsCurrentScheme, "&Current Preferences Scheme") +dcl(DLG_Options_Label_ShowSplash, "Show the AbiWord splash screen on application startup") + dcl(DLG_Options_Label_ViewShowHide, "Show/Hide...") dcl(DLG_Options_Label_ViewRuler, "&Ruler") dcl(DLG_Options_Label_ViewUnits, "&Units:")