dialogbind 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed51e7dcb44cdf7a12cf95ae59c426ca4230375d26a6dc8d5cd59a0981ad43a
-  data.tar.gz: 0eddf7c630417b1ec4196bedc7adf936e1f94e3a010a39bd1a86f76833a62d27
+  metadata.gz: 0cc13b581cce68d335c1cf660187dea9c6a9d3d3429e1d3737bab775787f0834
+  data.tar.gz: 33dfce0084709de26c7b3213bf5a97a8db19c07dc285cf3848d928d604236ef7
 SHA512:
-  metadata.gz: 9d9cbc6cf6112ae17e409587aa5f86ea119f9fa334478d6fa2edeb112c66ddb1d715c3c4400793d00e5faf509084b4f2d84d07bbfb8b87b62f8203324c35e881
-  data.tar.gz: 545bfe457b2abc9cada9f68ddcbce8b57d5702de6eeb2a1ce135f55fa7cbae8e5438d3c699917a31db0411a3f7fc6493d1d1b9e27ac6a867e7b0f61f578dc0a8
+  metadata.gz: 53bf0c4557f64fb2f534c17f753ba8e44bbd7855082e099861bae3711013352eabfb2796838cb36bd608f372aadb81d44cc5456f602044dcad51120593de0e33
+  data.tar.gz: b8d45642cfa13ea453d1ed27b86998df97a5ed8e15bc57fcd0ba97ef3cac03255ac8702c2d928730429c0454251629cd598f0ab91a27bf836f747be512b0d242

data/lib/dialogbind.rb

@@ -8,7 +8,7 @@
 require 'fiddle/import'
 
 $dialogbind_macos_script_cmd = ''
-$dialogbind_version = '0.9.2'
+$dialogbind_version = '0.9.3'
 
 # Function used internally in DialogBind to run Zenity from Ruby code. Please do not use this function directly as its API and behaviour might change in any release.
 def zenity(arg)
@@ -34,22 +34,37 @@ def zenity(arg)
 end
 
 # Internal module binding Win32 API MessageBox to Ruby. While it can be used directly, it is not recommended to do so to maintain your app's portability.
-module Win32NativeMessageBox
+module Win32NativeBindings
 	# based on https://gist.github.com/Youka/3ebbdfd03454afa7d0c4
-	extend Fiddle::Importer
+	if $dialogbind_dialog_backend == 'win32' then
+		extend Fiddle::Importer
 
-	dlload 'user32'
-	typealias 'HANDLE', 'void*'
-	typealias 'HWND', 'HANDLE'
-	typealias 'LPCSTR', 'const char*'
-	typealias 'UINT', 'unsigned int'
+		dlload 'user32'
+		dlload 'winmm'
+		typealias 'HANDLE', 'void*'
+		typealias 'HWND', 'HANDLE'
+		typealias 'LPCSTR', 'const char*'
+		typealias 'UINT', 'unsigned int'
+		typealias 'BOOL', 'int'
+		typealias 'HMODULE', 'void*'
+		typealias 'DWORD', 'unsigned long'
 
-	extern 'int MessageBoxA(HWND, LPCSTR, LPCSTR, UINT)'
+		extern 'int MessageBox(HWND, LPCSTR, LPCSTR, UINT)'
+		extern 'BOOL PlaySound(LPCTSTR, HMODULE, DWORD)'
+	else
+		def MessageBox(arg1, arg2, arg3, arg4)
+			return
+		end
+
+		def PlaySound(arg1, arg2, arg3)
+			return 1
+		end
+	end
 end
 
 # Function used internally in DialogBind to run Win32 MessageBoxA from Ruby code. Please do not use this function directly as its API and behaviour might change in any release.
 def win32_msgbox(text, title='DialogBind', buttons=0)
-	return Win32NativeMessageBox::MessageBoxA(nil, text, title, buttons)	
+	return Win32NativeBindings::MessageBox(nil, text, title, buttons)
 end
 
 # Function used internally in DialogBind to run XMessage from Ruby code. Please do not use this function directly as its API and behaviour might change in any release.
@@ -152,7 +167,7 @@ def guiyesno(text, title='DialogBind')
 			return true
 		end
 	elsif $dialogbind_dialog_backend == 'win32' then
-		retv_msgbox = win32_msgbox(text, title, 4)
+		retv_msgbox = win32_msgbox(text, title, 36)
 		return (retv_msgbox == 6)
 	else
 		raise 'The selected backend does not support question message boxes.'
@@ -173,7 +188,7 @@ def guierror(text, title='DialogBind')
 	elsif $dialogbind_dialog_backend == 'macos' then
 		return macdialog(text, [ 'OK' ], 'dialog', true)
 	elsif $dialogbind_dialog_backend == 'win32' then
-		return win32_msgbox('Error. ' + text, title, 0)
+		return win32_msgbox(text, title, 16)
 	else
 		raise 'The selected backend does not support question message boxes.'
 	end
@@ -219,7 +234,7 @@ def guilicense(file, title='DialogBind')
 		system('open -e "' + file.gsub('"', "\\\"") + '"')
 		return guiyesno('Do you accept the terms of the license agreement?', title)
 	elsif $dialogbind_dialog_backend == 'win32' then
-		retv_msgbox = win32_msgbox("Do you accept the terms of the license agreement below?\n\n" + File.read(file), title, 4)
+		retv_msgbox = win32_msgbox("Do you accept the terms of the license agreement below?\n\n" + File.read(file), title, 36)
 		return (retv_msgbox == 6)
 	else
 		raise 'The selected backend does not support license message boxes.'
@@ -278,3 +293,91 @@ def guiselect(entries, text='Choose one of the items below:', title='DialogBind'
 	end
 	return nil
 end
+
+# DialogBindSystemSounds is a module providing default DialogBind sound IDs to functions like guisound.
+module DialogBindSystemSounds
+	None = 0
+	Success = 1
+	Error = 2
+	Attention = 3
+end
+
+def nativesoundplay(sound_path)
+	unix_cmd_optimized_path = sound_path.gsub('"', "\\\"")
+	if $dialogbind_dialog_backend == 'win32' then
+		Win32NativeBindings::PlaySound(sound_path, nil, SND_SYNC)
+	elsif $dialogbind_dialog_backend == 'macos' then
+		system('afplay "' + unix_cmd_optimized_path + '" > /dev/null 2>&1')
+	else
+		if system('command -v play > /dev/null 2>&1') then
+			system('play "' + unix_cmd_optimized_path + '" > /dev/null 2>&1')
+		elsif system('command -v paplay > /dev/null 2>&1') then
+			system('paplay "' + unix_cmd_optimized_path + '" > /dev/null 2>&1')
+		elsif system('command -v canberra-gtk-play > /dev/null 2>&1') then
+			system('canberra-gtk-play -f "' + unix_cmd_optimized_path + '" > /dev/null 2>&1')
+		elsif system('command -v mpv > /dev/null 2>&1') then
+			system('mpv "' + unix_cmd_optimized_path + '" > /dev/null 2>&1')
+		elsif system('command -v mplayer > /dev/null 2>&1') then
+			system('mplayer "' + unix_cmd_optimized_path + '" > /dev/null 2>&1')
+		else
+			system('xdg-open "' + unix_cmd_optimized_path + '"')
+		end
+	end
+end
+
+def linuxsound(sound_v)
+	sound_theme = '/usr/share/sounds/freedesktop/stereo'
+	sound_theme_success = sound_theme + '/complete.oga'
+	sound_theme_error = sound_theme + '/dialog-error.oga'
+	sound_theme_attention = sound_theme + '/window-attention.oga'
+	if File.directory?(sound_theme) == false then
+		return
+	end
+	if sound_v == DialogBindSystemSounds::Success then
+		nativesoundplay(sound_theme_success)
+	elsif sound_v == DialogBindSystemSounds::Error then
+		nativesoundplay(sound_theme_error)
+	else
+		nativesoundplay(sound_theme_attention)
+	end
+end
+
+# Plays the default system sounds.
+#
+# @param sound_v [DialogBindSystemSounds] the sound to play. Available values are DialogBindSystemSounds::Success,
+# DialogBindSystemSounds::Error and DialogBindSystemSounds::Attention. Specifying DialogBindSystemSounds::None will
+# do nothing.
+# @return [Object] nothing
+def guisound(sound_v)
+	if sound_v == DialogBindSystemSounds::None then
+		return
+	end
+	if $dialogbind_dialog_backend != 'macos' && $dialogbind_dialog_backend != 'win32' then
+		linuxsound(sound_v)
+		return
+	end
+	constant_sound_success = '/System/Library/Components/CoreAudio.component/Contents/SharedSupport/SystemSounds/system/burn complete.aif'
+	constant_sound_error = '/System/Library/Sounds/Funk.aiff'
+	constant_sound_attention = '/System/Library/PrivateFrameworks/FindMyDevic.framework/Versions/A/Resources/fmd_sound.aiff'
+	if File.exists?(constant_sound_attention) == false then
+		constant_sound_attention = constant_sound_success
+	end
+	if File.exists?(constant_sound_success) == false then
+		constant_sound_success = constant_sound_error
+	end
+	if $dialogbind_dialog_backend == 'win32' then
+		constant_sound_success = 'c:/Windows/Media/tada.wav'
+		constant_sound_error = 'c:/Windows/Media/Windows Error.wav'
+		if File.exists?(constant_sound_error) == false then
+			constant_sound_error = 'c:/Windows/Media/chord.wav'
+		end
+		constant_sound_attention = 'c:/Windows/Media/chimes.wav'
+	end
+	if sound_v == DialogBindSystemSounds::Success then
+		nativesoundplay(constant_sound_success)
+	elsif sound_v == DialogBindSystemSounds::Error then
+		nativesoundplay(constant_sound_error)
+	else
+		nativesoundplay(constant_sound_attention)
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dialogbind
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Tim K
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-21 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -42,5 +42,5 @@ signing_key:
 specification_version: 4
 summary: DialogBind provides a Ruby API that wraps around Linux and macOS message
   box-generating tools. As of version 0.9.2, Windows is also supported. See https://gitlab.com/timkoi/dialogbind/blob/master/README.md
-  for documentation.
+  for documentation. Updates for this library are released frequently.
 test_files: []