This will fix the ap_BeOSDialog_Options.cpp problems on BeOS.
I also need the person that commited the dialog resources I submitted
to recommit them to cvs as binary.
Thanks,
Chris
--- /windisk/abiword/abi/src/wp/ap/beos/ap_BeOSDialog_Options.cpp Fri Aug 4
09:50:58 2000
+++ ap_BeOSDialog_Options.cpp Thu Aug 3 09:54:31 2000
@@ -202,12 +202,15 @@
TOGGLE_BASED_ON_MESSAGE('chia' , m_DlgOptions->id_CHECK_SPELL_INTERNET)
TOGGLE_BASED_ON_MESSAGE('chas' , m_DlgOptions->id_CHECK_PREFS_AUTO_SAVE)
TOGGLE_BASED_ON_MESSAGE('cbru' , m_DlgOptions->id_CHECK_VIEW_SHOW_RULER)
- TOGGLE_BASED_ON_MESSAGE('chtb' , m_DlgOptions->id_CHECK_VIEW_SHOW_TOOLBARS)
TOGGLE_BASED_ON_MESSAGE('cbcb' , m_DlgOptions->id_CHECK_VIEW_CURSOR_BLINK)
TOGGLE_BASED_ON_MESSAGE('cbsq' , m_DlgOptions->id_CHECK_SMART_QUOTES_ENABLE)
TOGGLE_BASED_ON_MESSAGE('cbal' , m_DlgOptions->id_CHECK_VIEW_ALL)
TOGGLE_BASED_ON_MESSAGE('cbht' , m_DlgOptions->id_CHECK_VIEW_HIDDEN_TEXT)
TOGGLE_BASED_ON_MESSAGE('cbuc' , m_DlgOptions->id_CHECK_VIEW_UNPRINTABLE)
+ TOGGLE_BASED_ON_MESSAGE('cbet' ,
+m_DlgOptions->id_CHECK_VIEW_SHOW_EXTRA_TOOLBAR)
+ TOGGLE_BASED_ON_MESSAGE('cbft' ,
+m_DlgOptions->id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR)
+ TOGGLE_BASED_ON_MESSAGE('cbst' ,
+m_DlgOptions->id_CHECK_VIEW_SHOW_STANDARD_TOOLBAR)
+ TOGGLE_BASED_ON_MESSAGE('stat' , m_DlgOptions->id_CHECK_VIEW_SHOW_STATUS_BAR)
#if 0
case 'ctog':
@@ -226,7 +229,6 @@
case AP_RID_DIALOG_OPTIONS_CHK_SmartQuotesEnable:
_enableDisableLogic(id_CHECK_SMART_QUOTES_ENABLE);
case AP_RID_DIALOG_OPTIONS_CHK_ViewShowRuler:
_enableDisableLogic(id_CHECK_VIEW_SHOW_RULER);
case AP_RID_DIALOG_OPTIONS_CHK_ViewCursorBlink:
_enableDisableLogic(id_CHECK_VIEW_CURSOR_BLINK);
- case AP_RID_DIALOG_OPTIONS_CHK_ViewShowToolbars:
_enableDisableLogic(id_CHECK_VIEW_SHOW_TOOLBARS);
case AP_RID_DIALOG_OPTIONS_CHK_ViewAll:
_enableDisableLogic(id_CHECK_VIEW_ALL);
case AP_RID_DIALOG_OPTIONS_CHK_ViewHiddenText:
_enableDisableLogic(id_CHECK_VIEW_HIDDEN_TEXT);
case AP_RID_DIALOG_OPTIONS_CHK_ViewUnprintable:
_enableDisableLogic(id_CHECK_VIEW_UNPRINTABLE);
@@ -401,7 +403,26 @@
switch(id)
{
-
+ case id_CHECK_VIEW_SHOW_EXTRA_TOOLBAR:
+ FIND_CONTROL(control,"ExtraBar")
+ control->SetValue(value);
+ break;
+
+ case id_CHECK_VIEW_SHOW_FORMAT_TOOLBAR:
+ FIND_CONTROL(control,"formatBar")
+ control->SetValue(value);
+ break;
+
+ case id_CHECK_VIEW_SHOW_STANDARD_TOOLBAR:
+ FIND_CONTROL(control,"standardBar")
+ control->SetValue(value);
+ break;
+
+ case id_CHECK_VIEW_SHOW_STATUS_BAR:
+ FIND_CONTROL(control,"statusBar")
+ control->SetValue(value);
+ break;
+
case id_CHECK_SPELL_CHECK_AS_TYPE:
FIND_CONTROL(control,"SpellCheckAsType")
control->SetValue(value);
@@ -451,11 +472,7 @@
FIND_CONTROL(control, "chkCursorBlinkEnable")
control->SetValue(value);
break;
-
- case id_CHECK_VIEW_SHOW_TOOLBARS:
- FIND_CONTROL(control,"chkToolbarsEnable")
- control->SetValue(value);
- break;
+
case id_CHECK_VIEW_ALL:
FIND_CONTROL(control,"chkViewAll")
@@ -561,11 +578,16 @@
DEFINE_GET_SET_BOOL(PrefsAutoSave , "AutoSavePrefs");
DEFINE_GET_SET_BOOL (ViewShowRuler , "RulerEnable");
DEFINE_GET_SET_BOOL (ViewCursorBlink , "chkCursorBlinkEnable");
-DEFINE_GET_SET_BOOL (ViewShowToolbars , "chkToolbarsEnable");
DEFINE_GET_SET_BOOL (ViewAll , "chkViewAll");
DEFINE_GET_SET_BOOL (ViewHiddenText , "chkViewHiddenText");
DEFINE_GET_SET_BOOL (ViewUnprintable , "chkViewUnprintable" );
DEFINE_GET_SET_BOOL (SmartQuotesEnable , "SmartQuotes");
+
+DEFINE_GET_SET_BOOL (ViewShowExtraBar, "ExtraBar");
+DEFINE_GET_SET_BOOL (ViewShowFormatBar, "formatBar");
+DEFINE_GET_SET_BOOL (ViewShowStandardBar, "standardBar");
+DEFINE_GET_SET_BOOL (ViewShowStatusBar , "statusBar");
+
#undef DEFINE_GET_SET_BOOL
UT_Dimension AP_BeOSDialog_Options::_gatherViewRulerUnits(void)
--- /windisk/abiword/abi/src/wp/ap/beos/ap_BeOSDialog_Options.h Fri Aug 4 09:50:58
2000
+++ ap_BeOSDialog_Options.h Wed Aug 2 18:43:07 2000
@@ -59,8 +59,11 @@
SET_GATHER (ViewShowRuler, UT_Bool );
SET_GATHER (ViewRulerUnits, UT_Dimension);
SET_GATHER (ViewCursorBlink, UT_Bool);
- SET_GATHER (ViewShowToolbars, UT_Bool );
-
+ SET_GATHER (ViewShowExtraBar, UT_Bool );
+ SET_GATHER (ViewShowFormatBar, UT_Bool );
+ SET_GATHER (ViewShowStandardBar, UT_Bool );
+ SET_GATHER (ViewShowStatusBar, UT_Bool);
SET_GATHER (ViewAll, UT_Bool );
SET_GATHER (ViewHiddenText, UT_Bool );
SET_GATHER (ViewUnprintable, UT_Bool );
BeOS Attributes
