windows_gui 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec23607fe3529f755af6166bb29d24030adca1d
-  data.tar.gz: bfd01485c8c783919aedb5f32d25f1e1197d7a19
+  metadata.gz: dd68025b2fa21a94a85522e2f447ec2e335bbe31
+  data.tar.gz: 6d17c971061189d5336ecaf88125a906f143f44e
 SHA512:
-  metadata.gz: e791e779aa10e363f028acec6d8d2e6344649ed715b2ff5cb3f1045a18850fae0e2a0f26bedf7aef7c75d180bb68fc4bf8df18875c74dcfd30554428c2eda363
-  data.tar.gz: 628ac854859fb18eb80586fb0c788a377d09a8510d05625892aec071672f0ecfa81c6fa243c209bcf1b1243290c132f545962aff63e6ed7f780266cc1bc41fe0
+  metadata.gz: c57f65b54fea603c8a3d02c303f95d834605cafdce9cc0c6e46244ccb5f77fc624a594c63b27ff1dc1947e04a236458a9ac729774d1fee1b04d9581a5f9c6dc7
+  data.tar.gz: d72617c3447e74b1ece4dc38a5aefa77144da6090991dfd5c986a166f0f7c8194f6d42b65728ad161e0cfe34e67f527bdd8bdb301dcf41e476bee9e6af8bca35

data/RELNOTES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 4.2.1
+
+Add ShellExecute bindings and option to open the UIRibbon resources build log on build failure
+
 ## 4.2.0
 
 Add crude mechanism for building UIRibbon resources on the fly (requires devenv)

data/examples/UIRibbon/Command.rb

@@ -12,23 +12,27 @@ CmdTab1Group1_SmallImages_RESID = 60005
 CmdTab1Group1_SmallImages_120__RESID = 60006
 CmdTab1Group1_LargeImages_RESID = 60007
 CmdTab1Group1_LargeImages_120__RESID = 60008
-CmdItem1 = 6
-CmdItem1_LabelTitle_RESID = 60009
-CmdItem1_LabelDescription_RESID = 60010
-CmdItem1_TooltipDescription_RESID = 60011
-CmdItem1_SmallImages_RESID = 60012
-CmdItem1_SmallImages_120__RESID = 60013
-CmdItem1_LargeImages_RESID = 60014
-CmdItem1_LargeImages_120__RESID = 60015
-CmdButton1 = 7
-CmdButton1_LabelTitle_RESID = 60016
-CmdButton1_LabelDescription_RESID = 60017
-CmdButton1_TooltipDescription_RESID = 60018
-CmdButton1_SmallImages_RESID = 60019
-CmdButton1_SmallImages_120__RESID = 60020
-CmdButton1_LargeImages_RESID = 60021
-CmdButton1_LargeImages_120__RESID = 60022
-CmdAOT = 8
-CmdAOT_LabelTitle_RESID = 60023
-CmdAOT_LabelDescription_RESID = 60024
-CmdAOT_TooltipDescription_RESID = 60025
+CmdAOT = 6
+CmdAOT_LabelTitle_RESID = 60009
+CmdAOT_LabelDescription_RESID = 60010
+CmdAOT_TooltipDescription_RESID = 60011
+CmdAOT_SmallImages_RESID = 60012
+CmdAOT_SmallImages_120__RESID = 60013
+CmdAOT_LargeImages_RESID = 60014
+CmdAOT_LargeImages_120__RESID = 60015
+CmdItem1 = 7
+CmdItem1_LabelTitle_RESID = 60016
+CmdItem1_LabelDescription_RESID = 60017
+CmdItem1_TooltipDescription_RESID = 60018
+CmdItem1_SmallImages_RESID = 60019
+CmdItem1_SmallImages_120__RESID = 60020
+CmdItem1_LargeImages_RESID = 60021
+CmdItem1_LargeImages_120__RESID = 60022
+CmdButton1 = 8
+CmdButton1_LabelTitle_RESID = 60023
+CmdButton1_LabelDescription_RESID = 60024
+CmdButton1_TooltipDescription_RESID = 60025
+CmdButton1_SmallImages_RESID = 60026
+CmdButton1_SmallImages_120__RESID = 60027
+CmdButton1_LargeImages_RESID = 60028
+CmdButton1_LargeImages_120__RESID = 60029

data/examples/UIRibbon/Command.rbw

@@ -2,6 +2,7 @@
 #WINDOWS_COM_TRACE_CALL_ARGS = true
 
 require 'windows_gui'
+require 'windows_gui/shell'
 require 'windows_gui/uiribbon'
 
 include WindowsGUI
@@ -11,7 +12,7 @@ class UIF < UIFramework
 	def initialize(hwnd)
 		@hwnd = hwnd
 
-		super()
+		super() # wire COM stuff
 	end
 
 	attr_reader :hwnd
@@ -21,19 +22,19 @@ class UICH < IUICommandHandlerImpl
 	def initialize(uif)
 		@uif = uif
 
-		super()
+		super() # wire COM stuff
 	end
 
 	attr_reader :uif
 
 	def OnAOT(*args)
-		UsingFFIStructs(PROPVARIANT.new) { |v|
-			uif.GetUICommandProperty(CmdAOT, UI_PKEY_BooleanValue, v)
+		aot = PROPVARIANT[VT_BOOL, :boolVal, 0]
 
-			SetWindowPos(uif.hwnd,
-				(v[:boolVal] == -1) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE
-			)
-		}
+		uif.GetUICommandProperty(CmdAOT, UI_PKEY_BooleanValue, aot)
+		SetWindowPos(uif.hwnd,
+			(aot[:boolVal] == -1) ? HWND_TOPMOST : HWND_NOTOPMOST,
+			0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE
+		)
 	end
 
 	def OnItem1(*args)
@@ -58,6 +59,8 @@ class UICH < IUICommandHandlerImpl
 		uif.SetUICommandProperty(CmdButton1, UI_PKEY_Enabled, PROPVARIANT[VT_BOOL, :boolVal, 0])
 	end
 
+	# COM interface method implementations
+
 	def Execute(*args)
 		case args[0]
 		when CmdAOT
@@ -76,11 +79,13 @@ class UIA < IUIApplicationImpl
 	def initialize(uich)
 		@uich = uich
 
-		super()
+		super() # wire COM stuff
 	end
 
 	attr_reader :uich
 
+	# COM interface method implementations
+
 	def OnCreateUICommand(*args)
 		uich.QueryInterface(uich.class::IID, args[-1])
 
@@ -99,7 +104,13 @@ def OnCreate(hwnd,
 )
 	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
-	UIResources.Build(clean: true) if UIResources.BuildNeeded?()
+	# attempt to build UIRibbon resources if the resource dll is missing
+	# or UIRibbon description xml file exists and is newer than the resource dll
+	# (requires installed developement environment (Visual Studio Express will do))
+	UIResources.Build(
+		clean_byproducts: true,
+		open_log_if_failed: true
+	) if UIResources.BuildNeeded?()
 
 	xtra[:uif] = UIF.new(hwnd)
 	xtra[:uich] = UICH.new(xtra[:uif])
@@ -108,9 +119,7 @@ def OnCreate(hwnd,
 	xtra[:uif].Initialize(hwnd, xtra[:uia])
 	xtra[:uif].LoadUI(UIResources.Load(), L('APPLICATION_RIBBON'))
 
-	UsingFFIStructs(PROPVARIANT[VT_BOOL, :boolVal, -1]) { |v|
-		xtra[:uif].SetUICommandProperty(CmdAOT, UI_PKEY_BooleanValue, v)
-	}
+	xtra[:uif].SetUICommandProperty(CmdAOT, UI_PKEY_BooleanValue, PROPVARIANT[VT_BOOL, :boolVal, -1])
 
 	0
 end

data/examples/UIRibbon/Command.xml

@@ -17,6 +17,17 @@
 		</Command.LargeImages>
 	</Command>
 
+<Command Name='cmdAOT' LabelTitle='&amp;Always On Top' LabelDescription='Toggle Always On Top state' TooltipDescription='Toggle Always On Top state'>
+	<Command.SmallImages>
+		<Image>../res/go-top-small.bmp</Image>
+		<Image MinDPI='120'>../res/go-top.bmp</Image>
+	</Command.SmallImages>
+	<Command.LargeImages>
+		<Image>../res/go-top.bmp</Image>
+		<Image MinDPI='120'>../res/go-top-big.bmp</Image>
+	</Command.LargeImages>
+</Command>
+
 <Command Name='cmdItem1' LabelTitle='&amp;Item1' LabelDescription='LabelDescription...' TooltipDescription='TooltipDescription...'>
 	<Command.SmallImages>
 		<Image>../res/go-previous-small.bmp</Image>
@@ -37,9 +48,6 @@
 		<Image>../res/go-next.bmp</Image>
 		<Image MinDPI='120'>../res/go-next-big.bmp</Image>
 	</Command.LargeImages>
-</Command>
-
-<Command Name='cmdAOT' LabelTitle='&amp;Always On Top' LabelDescription='LabelDescription...' TooltipDescription='TooltipDescription...'>
 </Command>
 	</Application.Commands>
 
@@ -56,7 +64,7 @@
 			<Ribbon.QuickAccessToolbar>
 <QuickAccessToolbar CommandName='cmdQAT'>
 	<QuickAccessToolbar.ApplicationDefaults>
-		<CheckBox CommandName='cmdAOT' />
+		<ToggleButton CommandName='cmdAOT' />
 		<Button CommandName='cmdItem1' />
 		<Button CommandName='cmdButton1' />
 	</QuickAccessToolbar.ApplicationDefaults>

data/lib/windows_gui/common.rb

@@ -1,7 +1,7 @@
 require 'weakref'
 require 'ffi'
 
-WINDOWS_GUI_VERSION = '4.2.0'
+WINDOWS_GUI_VERSION = '4.2.1'
 
 WINDOWS_GUI_VISUAL_STYLES = true unless defined?(WINDOWS_GUI_VISUAL_STYLES)
 WINDOWS_GUI_DPI_AWARE = true unless defined?(WINDOWS_GUI_DPI_AWARE)

data/lib/windows_gui/shell.rb

@@ -0,0 +1,30 @@
+if __FILE__ == $0
+	require_relative 'common'
+	require_relative 'libc'
+end
+
+module WindowsGUI
+	ffi_lib 'shell32'
+	ffi_convention :stdcall
+
+	SE_ERR_FNF = 2
+	SE_ERR_PNF = 3
+	SE_ERR_ACCESSDENIED = 5
+	SE_ERR_OOM = 8
+	SE_ERR_DLLNOTFOUND = 32
+	SE_ERR_SHARE = 26
+	SE_ERR_ASSOCINCOMPLETE = 27
+	SE_ERR_DDETIMEOUT = 28
+	SE_ERR_DDEFAIL = 29
+	SE_ERR_DDEBUSY = 30
+	SE_ERR_NOASSOC = 31
+
+	attach_function :ShellExecute, :ShellExecuteW, [
+		:pointer,
+		:buffer_in,
+		:buffer_in,
+		:buffer_in,
+    :buffer_in,
+		:int
+	], :int
+end

data/lib/windows_gui/uiribbon.rb

@@ -64,8 +64,12 @@ call "#{opts[:vcvars]}" >> "#{opts[:name]}.log" && \
 "#{opts[:link]}" /nologo /machine:x86 /dll /noentry /out:"#{opts[:name]}.dll" "#{ENV['TEMP']}/#{opts[:name]}.res" >> "#{opts[:name]}.log"
 				CMD
 
-				raise "UIRibbon resources build FAILED - see #{log_path} for details" if
-					File.read(log_path) =~ /error/im
+				if File.read(log_path) =~ /error/im
+					ShellExecute(nil, L('open'), L(log_path.dup), nil, nil, SW_SHOWNORMAL) if
+						opts[:open_log_if_failed]
+
+					raise "UIRibbon resources build FAILED - see #{log_path} for details"
+				end
 
 				File.open(rb_path, 'w') { |rb|
 					rb.puts "# Generated by the UIRibbon build, do NOT modify\n\n"
@@ -77,7 +81,7 @@ call "#{opts[:vcvars]}" >> "#{opts[:name]}.log" && \
 
 				%w{bml h rc}.each { |ext|
 					File.delete("#{path}/#{opts[:name]}.#{ext}") if File.exist?("#{path}/#{opts[:name]}.#{ext}")
-				} if opts[:clean]
+				} if opts[:clean_byproducts]
 
 				STDERR.puts "UIRibbon resources build succeeded"
 			end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: windows_gui
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Radoslav Peev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -63,11 +63,15 @@ files:
 - examples/res/go-previous-big.bmp
 - examples/res/go-previous-small.bmp
 - examples/res/go-previous.bmp
+- examples/res/go-top-big.bmp
+- examples/res/go-top-small.bmp
+- examples/res/go-top.bmp
 - lib/windows_gui.rb
 - lib/windows_gui/common.rb
 - lib/windows_gui/gdi.rb
 - lib/windows_gui/kernel.rb
 - lib/windows_gui/libc.rb
+- lib/windows_gui/shell.rb
 - lib/windows_gui/uiribbon.rb
 - lib/windows_gui/user.rb
 - screenshot.png