dialogbind 0.9.4.1 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6ae43bbbb3723872dc171fa5fee54053b579cd4c78a63bc72d1cdf05e9ecae
-  data.tar.gz: 7c2f954dad2452fe21374eca48e07efd7270e2d88793a74ce7c18629b4bb8556
+  metadata.gz: 117589fe831467e5e45659f7338bc5222450aee700e76aeed980682ee6b96695
+  data.tar.gz: 450fa5c663f131d086bd526b331d4a108143c3240c2503860b8f3cf472758027
 SHA512:
-  metadata.gz: c318c17e91699f02fbf2531d25e8fb8c8d2eada0bcd0f0c9f9882ae0995b3f8f30ee4c55ede97f770659668aa78506a360185779c5f95e989a258d8b12195668
-  data.tar.gz: 4795b55a9cd36909f618b5454ff686e58114d982fdcbe3746c4f2eb20abcca65e97e4ae789206b834bae24c2b8fbb7e63aebd2c0e7b5501d5cac248b3429558f
+  metadata.gz: 23f91664fd2d2742fad0e4b682d6b082d06f3e0bbedbb939c2aa414d60a342f39f9f6d19ff581de3b3468bc778f08c08f3f14032b0552c091dfbdfb4c5bb7d86
+  data.tar.gz: 6492ae4777d9d5814860df7dde030f78bf30e24efdc9be6351f380d8e087d202824bad70e910147f537ea05c9e20de56fa43c25b84bdf3e5c47a58ea65cd02cf

data/lib/dialogbind.rb

@@ -8,7 +8,7 @@
 require 'fiddle/import'
 
 $dialogbind_macos_script_cmd = ''
-$dialogbind_version = '0.9.4.1'
+$dialogbind_version = '0.9.5'
 
 # @!visibility private
 def zenity(arg)
@@ -56,13 +56,13 @@ def kdialog(arg, redirect_output=false)
 end
 
 # @!visibility private
-def macdialog(text, buttons=['OK'], type='dialog', error=false, dryrun=false)
+def macdialog(text, buttons=['OK'], type='dialog', error=false, dryrun=false, notificationtitle='')
 	text_fixed = text.gsub("!", "").gsub("'", '').gsub('"', '').gsub('$', '')
 	cmd = "osascript -e 'tell app \"System Events\" to display " + type + ' "' + text_fixed + '"'
 	if type != 'notification' then
 		cmd += ' buttons ' + buttons.to_s.gsub('[', '{').gsub(']', '}')
 	else
-		cmd += ' with title "' + File.basename($0) + '"'
+		cmd += ' with title "' + notificationtitle.gsub("!", "").gsub("'", '').gsub('"', '').gsub('$', '') + '"'
 	end
 	if error then
 		 cmd += ' with icon caution'
@@ -107,7 +107,7 @@ end
 # @!visibility private
 def macselect(items, text)
 	cmd = 'osascript -e \'tell app "System Events" to choose from list ' + items.to_s.gsub('[', '{').gsub(']', '}').gsub("'", '')
-	cmd += ' with prompt "' + text + '"\''
+	cmd += ' with prompt "' + text.to_s + '"\''
 	cmd_output = `#{cmd}`.gsub("\n", "")
 	if cmd_output == 'false' then
 		return nil
@@ -195,23 +195,30 @@ if $dialogbind_dialog_backend == 'win32' then
 	end
 
 	# @!visibility private
-	def win32_activexopen(filters, title)
-		filters_str = ''
-		filters.each do |filter_pattern|
-			to_append = 'Files matching pattern ' + filter_pattern + '|' + filter_pattern
-			if filters_str == '' then
-				filters_str = to_append
-			else
-				filters_str += '|' + to_append
-			end
-		end
-		generated_vbs = "fso=CreateObject(\"UserAccounts.CommonDialog\")\r\nfso.Filter=\"" + filters_str + "\"\r\n"
-		generated_vbs += "fso.FilterIndex=" + filters.length.to_s + "\r\nif fso.showOpen then\r\nWScript.Echo fso.fileName\r\nend if"
+	def win32_activexopen(title)
+		generated_vbs = 'set ob=CreateObject("Shell.Application")'
+		generated_vbs += "\r\nset fldr=ob.BrowseForFolder(0, \"" + title.gsub("\r\n", "\n").gsub("\n", "").gsub('"', "") + '", &H4000, "C:")'
+		generated_vbs += "\r\nif not fldr is Nothing then"
+		generated_vbs += "\r\nWScript.Echo fldr.Self.Path\r\nend if"
+		return win32_generatevbs(generated_vbs)
+	end
+
+	# @!visibility private
+	def win32_vbbrowseforfolder(title)
+		generated_vbs = 'set ob=CreateObject("Shell.Application")'
+		generated_vbs += "\r\nset fldr=ob.BrowseForFolder(0, \"" + title.gsub("\r\n", "\n").gsub("\n", "").gsub('"', "") + '", 0, "C:")'
+		generated_vbs += "\r\nif not fldr is Nothing then"
+		generated_vbs += "\r\nWScript.Echo fldr.Self.Path\r\nend if"
 		return win32_generatevbs(generated_vbs)
 	end
 else
 	# @!visibility private
-	def win32_activexopen(filters, title)
+	def win32_activexopen(title)
+		return ''
+	end
+
+	# @!visibility private
+	def win32_vbbrowseforfolder(title)
 		return ''
 	end
 
@@ -420,7 +427,7 @@ def nativesoundplay(sound_path)
 	if $dialogbind_dialog_backend == 'win32' then
 		win32_activexplay(sound_path)
 	elsif $dialogbind_dialog_backend == 'macos' then
-		system('afplay "' + unix_cmd_optimized_path + '" > /dev/null 2>&1')
+		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')
@@ -508,7 +515,7 @@ end
 # Shows system-native file selection dialog. Currently does not work on Windows.
 #
 # @param filter [Array] an array of file patterns. Example: [ '*.rb', 'markdown-doc-toprocess*.md' ]
-# @param title [String] an optional parameter specifying the title of the dialog box. Ignored on macOS.
+# @param title [String] an optional parameter specifying the title of the dialog box.
 # @return [String] either an empty string (if the user cancels the dialog) or the native path to the file.
 def guifileselect(filter=[], title='DialogBind')
 	if $dialogbind_dialog_backend == 'macos' then
@@ -521,6 +528,8 @@ def guifileselect(filter=[], title='DialogBind')
 	elsif $dialogbind_dialog_backend == 'zenity' then
 		zenity({ 'title' => title, 'file-selection' => nil, '%' => zenityfilter(filter), ' > /tmp/zenity.sock 2>/dev/null' => nil })
 		return File.read('/tmp/zenity.sock').gsub("\n", "")
+	elsif $dialogbind_dialog_backend == 'win32' then
+		return win32_activexopen(title)
 	else
 		raise 'The selected backend does not support file selection dialog boxes.'
 		return ''
@@ -528,6 +537,29 @@ def guifileselect(filter=[], title='DialogBind')
 	return ''
 end
 
+# Shows system-native directory selection dialog.
+#
+# @param title [String] an optional parameter specifying the title of the dialog box.
+# @return [String] either an empty string (if the user cancels the dialog) or the native path to the file.
+def guidirectoryselect(title='DialogBind')
+	if $dialogbind_dialog_backend == 'macos' then
+		return macopen(title, [], true)
+	elsif $dialogbind_dialog_backend == 'kdialog' then
+		if kdialog({ 'title' => title, 'getexistingdirectory' => [] }, true) == false then
+			return ''
+		end
+		return File.read('/tmp/kdialog.sock').gsub("\n", "")
+	elsif $dialogbind_dialog_backend == 'zenity' then
+		zenity({ 'title' => title, 'file-selection' => nil, 'directory' => nil, ' > /tmp/zenity.sock 2>/dev/null' => nil })
+		return File.read('/tmp/zenity.sock').gsub("\n", "")
+	elsif $dialogbind_dialog_backend == 'win32' then
+		return win32_vbbrowseforfolder(title).gsub("\\", '/')
+	else
+		raise 'The selected backend does not support directory selection dialog boxes.'
+	end
+	return ''
+end
+
 # Shows an input box with the specified text.
 #
 # @param text [String] the text that should be displayed in an input box
@@ -550,3 +582,24 @@ def guigets(text='Type something:', title='DialogBind')
 	end
 	return ''
 end
+
+# Shows a notification in system tray or a message box, depending on operating system notifications support.
+#
+# @param text [String] the text that should be displayed in a notification.
+# @param title [String] an optional parameter specifying the title of the notification.
+# @return [Boolean] true on success, false on fail.
+def guinotify(text, title='DialogBind', sound=DialogBindSystemSounds::Success)
+	if $dialogbind_dialog_backend != 'win32' && $dialogbind_dialog_backend != 'kdialog' then
+		guisound(sound)
+	end
+	if $dialogbind_dialog_backend == 'macos' then
+		return macdialog(text, [], 'notification', false, false, title)
+	elsif $dialogbind_dialog_backend == 'kdialog' then
+		return kdialog({ 'title' => title, 'passivepopup' => [ text, 10 ] })
+	elsif $dialogbind_dialog_backend == 'zenity' then
+		return zenity({ 'title' => title, 'notification' => nil, 'text' => text })
+	else
+		return guiputs(text, title)
+	end
+	return false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dialogbind
 version: !ruby/object:Gem::Version
-  version: 0.9.4.1
+  version: 0.9.5
 platform: ruby
 authors:
 - Tim K