Merge pull request #34 from OpenSourcePFCLibraries/address-visual-expert-findings

bruce-armstrong · web-flow · commit bc7551649419 · 2025-02-16T20:52:44.000-05:00
Update ShowHelp calls to reference Compiled HTML Help version of help files
diff --git a/ws_objects/examples/appexmfe/appexmfe.pbl.src/n_exampleappmanager.sru b/ws_objects/examples/appexmfe/appexmfe.pbl.src/n_exampleappmanager.sru
@@ -57,7 +57,7 @@ of_SetUserKey ( "HKEY_CURRENT_USER\Software\Appeon\PowerBuilder\" + &
 	String ( li_major ) + "." + String ( li_minor ) + "\PFC Examples" )
 	
 // The file name of the application's online help file
-of_SetHelpFile ( "pfcexamp.hlp" )
+of_SetHelpFile ( "pfcexamp.chm" )
 
 // The application version
 of_SetVersion ( "Version " + String ( li_major ) + "." + String ( li_minor ) + ".00" )
diff --git a/ws_objects/pfcapsrv/pfcapsrv.pbl.src/pfc_w_find.srw b/ws_objects/pfcapsrv/pfcapsrv.pbl.src/pfc_w_find.srw
@@ -552,6 +552,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 400)
+showHelp ("pfcdlg.chm", topic!, 400)
 end event
 
diff --git a/ws_objects/pfcapsrv/pfcapsrv.pbl.src/pfc_w_pagesetup.srw b/ws_objects/pfcapsrv/pfcapsrv.pbl.src/pfc_w_pagesetup.srw
@@ -886,7 +886,7 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 500)
+showHelp ("pfcdlg.chm", topic!, 500)
 end event
 
 type gb_margins from u_gb within pfc_w_pagesetup
diff --git a/ws_objects/pfcapsrv/pfcapsrv.pbl.src/pfc_w_replace.srw b/ws_objects/pfcapsrv/pfcapsrv.pbl.src/pfc_w_replace.srw
@@ -860,6 +860,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 600)
+showHelp ("pfcdlg.chm", topic!, 600)
 end event
 
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_n_cst_dwsrv_filter.sru b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_n_cst_dwsrv_filter.sru
@@ -519,7 +519,7 @@ CHOOSE CASE ai_style
 			if isValid (idw_requestor) then
 				if len (idw_requestor.dataobject) > 0 then
 					idw_requestor.object.datawindow.help.command = 1
-					idw_requestor.object.datawindow.help.file = "pfcdlg.hlp"
+					idw_requestor.object.datawindow.help.file = "pfcdlg.chm"
 					idw_requestor.object.datawindow.help.typeid.setfilter = "300"
 				end if
 			end if
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_n_cst_dwsrv_sort.sru b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_n_cst_dwsrv_sort.sru
@@ -1164,7 +1164,7 @@ CHOOSE CASE ai_style
 			if isValid (idw_requestor) then
 				if len (idw_requestor.dataobject) > 0 then
 					idw_requestor.object.datawindow.help.command = 1
-					idw_requestor.object.datawindow.help.file = "pfcdlg.hlp"
+					idw_requestor.object.datawindow.help.file = "pfcdlg.chm"
 					idw_requestor.object.datawindow.help.typeid.setsort = "1200"
 					idw_requestor.object.datawindow.help.typeid.setsortexpr = "800"
 				end if
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_filterextended.srw b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_filterextended.srw
@@ -1594,6 +1594,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 100)
+showHelp ("pfcdlg.chm", topic!, 100)
 end event
 
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_filtersimple.srw b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_filtersimple.srw
@@ -1256,6 +1256,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 200)
+showHelp ("pfcdlg.chm", topic!, 200)
 end event
 
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_restorerow.srw b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_restorerow.srw
@@ -644,6 +644,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 700)
+showHelp ("pfcdlg.chm", topic!, 700)
 end event
 
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_sortdragdrop.srw b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_sortdragdrop.srw
@@ -1132,6 +1132,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 900)
+showHelp ("pfcdlg.chm", topic!, 900)
 end event
 
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_sortmulti.srw b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_sortmulti.srw
@@ -818,6 +818,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 1000)
+showHelp ("pfcdlg.chm", topic!, 1000)
 end event
 
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_sortsingle.srw b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_sortsingle.srw
@@ -443,7 +443,6 @@ type cbx_asc from u_cbx within pfc_w_sortsingle
 integer x = 1038
 integer y = 112
 integer width = 617
-integer height = 68
 integer taborder = 20
 string text = "Ascending"
 boolean checked = true
@@ -613,6 +612,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 1100)
+showHelp ("pfcdlg.chm", topic!, 1100)
 end event
 
diff --git a/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_zoom.srw b/ws_objects/pfcdwsrv/pfcdwsrv.pbl.src/pfc_w_zoom.srw
@@ -781,6 +781,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
  * Libraries see https://github.com/OpenSourcePFCLibraries
 */
 /////////////////////////////////////////////////////////////////////////////
-ShowHelp ("pfcdlg.hlp", topic!, 1400)
+ShowHelp ("pfcdlg.chm", topic!, 1400)
 end event
 
diff --git a/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_debugjson.srw b/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_debugjson.srw
@@ -584,6 +584,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 10000)
+showHelp ("pfcdlg.chm", topic!, 10000)
 end event
 
diff --git a/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_debuglog.srw b/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_debuglog.srw
@@ -16,13 +16,12 @@ end type
 end forward
 
 global type pfc_w_debuglog from w_main
-int X=23
-int Y=400
-int Width=2894
-int Height=728
-boolean TitleBar=true
-string Title="Debugging Log"
-long BackColor=80263328
+integer x = 23
+integer y = 400
+integer width = 2894
+integer height = 728
+string title = "Debugging Log"
+long backcolor = 80263328
 dw_debuglog dw_debuglog
 cb_print cb_print
 cb_clear cb_clear
@@ -376,23 +375,23 @@ End If
 end event
 
 type dw_debuglog from u_dw within pfc_w_debuglog
-int X=18
-int Y=20
-int Width=2400
-int Height=564
-int TabOrder=10
-string DataObject="d_debuglog"
+integer x = 18
+integer y = 20
+integer width = 2400
+integer height = 564
+integer taborder = 10
+string dataobject = "d_debuglog"
 end type
 
 event constructor;call super::constructor;
 ib_rmbmenu = false
 end event
 
 type cb_print from u_cb within pfc_w_debuglog
-int X=2464
-int Y=24
-int TabOrder=20
-string Text="&Print"
+integer x = 2464
+integer y = 24
+integer taborder = 20
+string text = "&Print"
 end type
 
 event clicked;call u_cb::clicked;//////////////////////////////////////////////////////////////////////////////
@@ -441,10 +440,10 @@ gnv_app.inv_debug.of_PrintLog()
 end event
 
 type cb_clear from u_cb within pfc_w_debuglog
-int X=2464
-int Y=136
-int TabOrder=30
-string Text="&Clear"
+integer x = 2464
+integer y = 136
+integer taborder = 30
+string text = "&Clear"
 end type
 
 event clicked;call u_cb::clicked;//////////////////////////////////////////////////////////////////////////////
@@ -493,11 +492,11 @@ gnv_app.inv_debug.of_ClearLog()
 end event
 
 type cb_close from u_cb within pfc_w_debuglog
-int X=2464
-int Y=248
-int TabOrder=40
-string Text="Close"
-boolean Cancel=true
+integer x = 2464
+integer y = 248
+integer taborder = 40
+string text = "Close"
+boolean cancel = true
 end type
 
 event clicked;call u_cb::clicked;//////////////////////////////////////////////////////////////////////////////
@@ -545,10 +544,10 @@ close(parent)
 end event
 
 type cb_dlghelp from u_cb within pfc_w_debuglog
-int X=2464
-int Y=360
-int TabOrder=50
-string Text="&Help"
+integer x = 2464
+integer y = 360
+integer taborder = 50
+string text = "&Help"
 end type
 
 event clicked;call super::clicked;//////////////////////////////////////////////////////////////////////////////
@@ -590,6 +589,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 10000)
+showHelp ("pfcdlg.chm", topic!, 10000)
 end event
 
diff --git a/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_dwproperty.srw b/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_dwproperty.srw
@@ -301,6 +301,6 @@ int	li_helpindex
 // Determine help index based on selected tab
 li_helpindex = (tab_property.selectedTab * 100) + 10000
 
-showHelp ("pfcdlg.hlp", topic!, li_helpindex)
+showHelp ("pfcdlg.chm", topic!, li_helpindex)
 end event
 
diff --git a/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_dwpropertyservices.srw b/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_dwpropertyservices.srw
@@ -372,7 +372,7 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 10400)
+showHelp ("pfcdlg.chm", topic!, 10400)
 end event
 
 type cb_cancel from u_cb within pfc_w_dwpropertyservices
diff --git a/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_sqlspy.srw b/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_sqlspy.srw
@@ -486,7 +486,6 @@ type cbx_batchmode from u_cbx within pfc_w_sqlspy
 integer x = 73
 integer y = 36
 integer width = 1856
-integer height = 68
 integer taborder = 10
 string text = "&Inspect each SQL statement before it is executed"
 end type
@@ -651,7 +650,7 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 10500)
+showHelp ("pfcdlg.chm", topic!, 10500)
 end event
 
 type cb_close from u_cb within pfc_w_sqlspy
@@ -718,7 +717,6 @@ type st_history from u_st within pfc_w_sqlspy
 boolean visible = false
 integer x = 23
 integer y = 136
-integer width = 343
 string text = "st_history"
 end type
 
diff --git a/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_sqlspyinspect.srw b/ws_objects/pfcutil/pfcutil.pbl.src/pfc_w_sqlspyinspect.srw
@@ -505,6 +505,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 10600)
+showHelp ("pfcdlg.chm", topic!, 10600)
 end event
 
diff --git a/ws_objects/pfcwnsrv/pfcwnsrv.pbl.src/pfc_w_toolbars.srw b/ws_objects/pfcwnsrv/pfcwnsrv.pbl.src/pfc_w_toolbars.srw
@@ -989,14 +989,13 @@ if IsNull (dwo) then
 	return
 end if
 
-if dwo.name = "toolbarvisible" then
-	if ii_toolbarindex > 0 then
-		lb_checked = lnv_conversion.of_Boolean (data)
-		if not IsNull (lb_checked) then
-			inv_toolbar[ii_toolbarindex].b_visible = lb_checked
-			cb_apply.Enabled = True
-		end if
-	end if
+lb_checked = lnv_conversion.of_Boolean (data)
+
+if dwo.name = "toolbarvisible" and &
+	ii_toolbarindex > 0 and &
+	not IsNull (lb_checked) then
+		inv_toolbar[ii_toolbarindex].b_visible = lb_checked
+		cb_apply.Enabled = True
 end if
 end event
 
@@ -1068,6 +1067,6 @@ event clicked;call super::clicked;//////////////////////////////////////////////
 //
 //////////////////////////////////////////////////////////////////////////////
 
-showHelp ("pfcdlg.hlp", topic!, 1300)
+showHelp ("pfcdlg.chm", topic!, 1300)
 end event
 
diff --git a/ws_objects/security/pfcsecad/pfcsecad.pbl.src/n_pfcsecurity_appmanager.sru b/ws_objects/security/pfcsecad/pfcsecad.pbl.src/n_pfcsecurity_appmanager.sru
@@ -36,7 +36,7 @@ of_SetVersion ("Version " + String ( li_major ) + "." + String ( li_minor ) + ".
 of_SetLogo ("key.bmp")
 
 // The application bitmap name
-of_SetHelpFile ( "pbpfc" + String ( li_major ) + String ( li_minor ) + ".hlp")
+of_SetHelpFile ( "pbpfc110.chm")
 
 
 // The application's copyright message
