fzeet 0.6.0 → 0.6.1

data/lib/fzeet/windows/comdlg.rb

@@ -1 +1,5 @@
 require_relative 'comdlg/FileDialog'
+require_relative 'comdlg/FontDialog'
+require_relative 'comdlg/ColorDialog'
+require_relative 'comdlg/FindReplaceDialog'
+require_relative 'comdlg/PrintDialog'

data/lib/fzeet/windows/gdi.rb

@@ -43,6 +43,9 @@ module Fzeet
 
 		attach_function :SelectObject, [:pointer, :pointer], :pointer
 
+		attach_function :GetTextColor, [:pointer], :ulong
+		attach_function :SetTextColor, [:pointer, :ulong], :ulong
+
 		attach_function :MoveToEx, [:pointer, :int, :int, :pointer], :int
 		attach_function :LineTo, [:pointer, :int, :int], :int
 	end

data/lib/fzeet/windows/shell/{FolderDialog.rb → BrowseForFolder.rb}

@@ -35,5 +35,16 @@ module Fzeet
 		end
 
 		attach_function :SHBrowseForFolder, :SHBrowseForFolderA, [:pointer], :pointer
+
+		BFFM_INITIALIZED = 1
+		BFFM_SELCHANGED = 2
+		BFFM_VALIDATEFAILED = 3
+		BFFM_IUNKNOWN = 5
+
+		BFFM_SETSTATUSTEXT = WM_USER + 100
+		BFFM_ENABLEOK = WM_USER + 101
+		BFFM_SETSELECTION = WM_USER + 102
+		BFFM_SETOKTEXT = WM_USER + 105
+		BFFM_SETEXPANDED = WM_USER + 106
 	end
 end

data/lib/fzeet/windows/shell/Common.rb

@@ -1,3 +1,4 @@
+require_relative '../user'
 require_relative '../com'
 
 module Fzeet
@@ -8,5 +9,60 @@ module Fzeet
 		attach_function :ShellExecute, :ShellExecuteA, [:pointer, :string, :string, :string, :string, :int], :pointer
 
 		attach_function :SHGetPathFromIDList, :SHGetPathFromIDListA, [:pointer, :pointer], :int
+
+		SIGDN_NORMALDISPLAY = 0x00000000
+		SIGDN_PARENTRELATIVEPARSING = 0x80018001
+		SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000
+		SIGDN_PARENTRELATIVEEDITING = 0x80031001
+		SIGDN_DESKTOPABSOLUTEEDITING = 0x8004c000
+		SIGDN_FILESYSPATH = 0x80058000
+		SIGDN_URL = 0x80068000
+		SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007c001
+		SIGDN_PARENTRELATIVE = 0x80080001
+
+		SICHINT_DISPLAY = 0x00000000
+		SICHINT_ALLFIELDS = 0x80000000
+		SICHINT_CANONICAL = 0x10000000
+		SICHINT_TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000
+
+		IShellItem = COM::Interface[IUnknown,
+			GUID['43826d1e-e718-42ee-bc55-a1e261c37bfe'],
+
+			BindToHandler: [[:pointer, :pointer, :pointer, :pointer], :long],
+			GetParent: [[:pointer], :long],
+			GetDisplayName: [[:ulong, :pointer], :long],
+			GetAttributes: [[:ulong, :pointer], :long],
+			Compare: [[:pointer, :ulong, :pointer], :long]
+		]
+
+		ShellItem = COM::Instance[IShellItem]
+
+		SIATTRIBFLAGS_AND = 0x00000001
+		SIATTRIBFLAGS_OR = 0x00000002
+		SIATTRIBFLAGS_APPCOMPAT = 0x00000003
+		SIATTRIBFLAGS_MASK = 0x00000003
+		SIATTRIBFLAGS_ALLITEMS = 0x00004000
+
+		IShellItemArray = COM::Interface[IUnknown,
+			GUID['b63ea76d-1f85-456f-a19c-48159efa858b'],
+
+			BindToHandler: [[:pointer, :pointer, :pointer, :pointer], :long],
+			GetPropertyStore: [[:ulong, :pointer, :pointer], :long],
+			GetPropertyDescriptionList: [[:pointer, :pointer, :pointer], :long],
+			GetAttributes: [[:ulong, :ulong, :pointer], :long],
+			GetCount: [[:pointer], :long],
+			GetItemAt: [[:ulong, :pointer], :long],
+			EnumItems: [[:pointer], :long]
+		]
+
+		ShellItemArray = COM::Instance[IShellItemArray]
+
+		IModalWindow = COM::Interface[IUnknown,
+			GUID['b4db1657-70d7-485e-8e3e-6fcb5a5c1802'],
+
+			Show: [[:pointer], :long]
+		]
+
+		ModalWindow = COM::Instance[IModalWindow]
 	end
 end

data/lib/fzeet/windows/shell/FileDialog.rb

@@ -0,0 +1,78 @@
+require_relative 'Common'
+
+module Fzeet
+	module Windows
+		FOS_OVERWRITEPROMPT = 0x00000002
+		FOS_STRICTFILETYPES = 0x00000004
+		FOS_NOCHANGEDIR = 0x00000008
+		FOS_PICKFOLDERS = 0x00000020
+		FOS_FORCEFILESYSTEM = 0x00000040
+		FOS_ALLNONSTORAGEITEMS = 0x00000080
+		FOS_NOVALIDATE = 0x00000100
+		FOS_ALLOWMULTISELECT = 0x00000200
+		FOS_PATHMUSTEXIST = 0x00000800
+		FOS_FILEMUSTEXIST = 0x00001000
+		FOS_CREATEPROMPT = 0x00002000
+		FOS_SHAREAWARE = 0x00004000
+		FOS_NOREADONLYRETURN = 0x00008000
+		FOS_NOTESTFILECREATE = 0x00010000
+		FOS_HIDEMRUPLACES = 0x00020000
+		FOS_HIDEPINNEDPLACES = 0x00040000
+		FOS_NODEREFERENCELINKS = 0x00100000
+		FOS_DONTADDTORECENT = 0x02000000
+		FOS_FORCESHOWHIDDEN = 0x10000000
+		FOS_DEFAULTNOMINIMODE = 0x20000000
+		FOS_FORCEPREVIEWPANEON = 0x40000000
+
+		IFileDialog = COM::Interface[IModalWindow,
+			GUID['42f85136-db7e-439c-85f1-e4075d135fc8'],
+
+			SetFileTypes: [[:uint, :pointer], :long],
+			SetFileTypeIndex: [[:uint], :long],
+			GetFileTypeIndex: [[:pointer], :long],
+			Advise: [[:pointer, :pointer], :long],
+			Unadvise: [[:ulong], :long],
+			SetOptions: [[:uint], :long],
+			GetOptions: [[:pointer], :long],
+			SetDefaultFolder: [[:pointer], :long],
+			SetFolder: [[:pointer], :long],
+			GetFolder: [[:pointer], :long],
+			GetCurrentSelection: [[:pointer], :long],
+			SetFileName: [[:pointer], :long],
+			GetFileName: [[:pointer], :long],
+			SetTitle: [[:pointer], :long],
+			SetOkButtonLabel: [[:pointer], :long],
+			SetFileNameLabel: [[:pointer], :long],
+			GetResult: [[:pointer], :long],
+			AddPlace: [[:pointer, :uint], :long],
+			SetDefaultExtension: [[:pointer], :long],
+			Close: [[:long], :long],
+			SetClientGuid: [[:pointer], :long],
+			ClearClientData: [[], :long],
+			SetFilter: [[:pointer], :long]
+		]
+
+		FileDialog = COM::Instance[IFileDialog]
+
+		IFileOpenDialog = COM::Interface[IFileDialog,
+			GUID['d57c7288-d4ad-4768-be02-9d969532d960'],
+
+			GetResults: [[:pointer], :long],
+			GetSelectedItems: [[:pointer], :long]
+		]
+
+		FileOpenDialog = COM::Factory[IFileOpenDialog, GUID['DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7']]
+
+		IFileSaveDialog = COM::Interface[IFileDialog,
+			GUID['84bccd23-5fde-4cdb-aea4-af64b83d78ab'],
+
+			SetSaveAsItem: [[:pointer], :long],
+			SetProperties: [[:pointer], :long],
+			SetCollectedProperties: [[:pointer, :int], :long],
+			GetProperties: [[:pointer], :long],
+			ApplyProperties: [[:pointer, :pointer, :pointer, :pointer], :long],
+		]
+
+		FileSaveDialog = COM::Factory[IFileSaveDialog, GUID['C0B4E2F3-BA21-4773-8DBA-335EC946EB8B']]
+	end
+end

data/lib/fzeet/windows/shell.rb

@@ -1 +1,2 @@
-require_relative 'shell/FolderDialog'
+require_relative 'shell/BrowseForFolder'
+require_relative 'shell/FileDialog' if Fzeet::Windows::WINVER.AtLeastWindowsVista?

data/lib/fzeet/windows/user/Message.rb

@@ -246,6 +246,7 @@ module Fzeet
 				:pt, POINT
 		end
 
+		attach_function :RegisterWindowMessage, :RegisterWindowMessageA, [:string], :uint
 		attach_function :GetMessage, :GetMessageA, [:pointer, :pointer, :uint, :uint], :int
 		attach_function :IsDialogMessage, [:pointer, :pointer], :int
 		attach_function :TranslateAccelerator, :TranslateAcceleratorA, [:pointer, :pointer, :pointer], :int

data/lib/fzeet/windows.rb

@@ -13,4 +13,5 @@ require_relative 'windows/ole'
 require_relative 'windows/shell'
 
 require_relative 'windows/propsys' if Fzeet::Windows::WINVER.AtLeastWindowsVista?
+
 require_relative 'windows/uiribbon' if Fzeet::Windows::WINVER.AtLeastWindowsVista?

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fzeet
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Radoslav Peev
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +03:00
+date: 2010-09-10 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
         - 6
@@ -81,10 +83,15 @@ files:
 - lib/fzeet/windows/comctl/SysLink.rb
 - lib/fzeet/windows/comctl/TreeView.rb
 - lib/fzeet/windows/comctl/UpDown.rb
+- lib/fzeet/windows/comdlg/ColorDialog.rb
 - lib/fzeet/windows/comdlg/Common.rb
 - lib/fzeet/windows/comdlg/FileDialog.rb
+- lib/fzeet/windows/comdlg/FindReplaceDialog.rb
+- lib/fzeet/windows/comdlg/FontDialog.rb
+- lib/fzeet/windows/comdlg/PrintDialog.rb
+- lib/fzeet/windows/shell/BrowseForFolder.rb
 - lib/fzeet/windows/shell/Common.rb
-- lib/fzeet/windows/shell/FolderDialog.rb
+- lib/fzeet/windows/shell/FileDialog.rb
 - lib/fzeet/Accelerator.rb
 - lib/fzeet/Application.rb
 - lib/fzeet/Common.rb
@@ -114,9 +121,13 @@ files:
 - lib/fzeet/Control/SysLink.rb
 - lib/fzeet/Control/TreeView.rb
 - lib/fzeet/Control/UpDown.rb
+- lib/fzeet/Dialog/ColorDialog.rb
 - lib/fzeet/Dialog/Common.rb
 - lib/fzeet/Dialog/FileDialog.rb
-- lib/fzeet/Dialog/FolderDialog.rb
+- lib/fzeet/Dialog/FindReplaceDialog.rb
+- lib/fzeet/Dialog/FontDialog.rb
+- lib/fzeet/Dialog/PrintDialog.rb
+- lib/fzeet/Dialog/ShellFileDialog.rb
 - lib/fzeet.rb
 - examples/res/audio-volume-muted-big.bmp
 - examples/res/audio-volume-muted-small.bmp
@@ -184,9 +195,14 @@ files:
 - examples/Control/SysLink.rbw
 - examples/Control/TreeView.rbw
 - examples/Control/UpDown.rbw
+- examples/Dialog/ColorDialog.rbw
 - examples/Dialog/Dialog.rbw
 - examples/Dialog/DialogApplication.rbw
-- examples/Dialog/FileAndFolderDialog.rbw
+- examples/Dialog/FileDialog.rbw
+- examples/Dialog/FindReplaceDialog.rbw
+- examples/Dialog/FontDialog.rbw
+- examples/Dialog/PrintDialog.rbw
+- examples/Dialog/ShellFileDialog.rbw
 - examples/UIRibbon/Color.rbw
 - examples/UIRibbon/Command.rbw
 - examples/UIRibbon/ContextPopup.rbw
@@ -221,6 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -229,6 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"

data/examples/Dialog/FileAndFolderDialog.rbw

@@ -1,34 +0,0 @@
-require 'fzeet'
-
-include Fzeet
-
-Application.run { |window|
-	window.menu = Menu.new.
-		append(:popup, '&File', PopupMenu.new.
-			append(:string, '&Open...', :open).
-			append(:string, 'Save &As...', :saveAs).
-
-			append(:separator).
-
-			append(:string, 'Browse for &Folder...', :browseForFolder)
-		)
-
-	window.
-		on(:command, :open) {
-			dialog = OpenFileDialog.new
-
-			message dialog.path if dialog.show.ok?
-		}.
-
-		on(:command, :saveAs) {
-			dialog = SaveFileDialog.new
-
-			message dialog.path if dialog.show.ok?
-		}.
-
-		on(:command, :browseForFolder) {
-			dialog = FolderDialog.new
-
-			message dialog.path if dialog.show.ok?
-		}
-}

data/lib/fzeet/Dialog/FolderDialog.rb

@@ -1,45 +0,0 @@
-require_relative 'Common'
-
-module Fzeet
-	class FolderDialog
-		def initialize(opts = {})
-			_opts = {
-				root: nil,
-				displayName: nil,
-				title: nil,
-				flags: 0,
-				hook: nil,
-				param: 0,
-				image: 0
-			}
-			badopts = opts.keys - _opts.keys; raise "Bad option(s): #{badopts.join(', ')}." unless badopts.empty?
-			_opts.merge!(opts)
-
-			@bi = Windows::BROWSEINFO.new
-
-			@bi[:ulFlags] = Fzeet.flags([:returnonlyfsdirs, :usenewui], :bif_)
-		end
-
-		attr_reader :bi
-
-		def path; @path && @path.dup end
-
-		def show(window = Application.window)
-			bi[:hwndOwner] = window.handle
-
-			@path = nil
-
-			DialogResult.new(((pidl = Windows.SHBrowseForFolder(bi)).null?) ? Windows::IDCANCEL : Windows::IDOK).tap { |result|
-				next unless result.ok?
-
-				FFI::MemoryPointer.new(:char, 4096) { |p|
-					Windows.SHGetPathFromIDList(pidl, p)
-
-					@path = p.read_string
-				}
-			}
-		ensure
-			Windows.CoTaskMemFree(pidl)
-		end
-	end
-end