RUIC 0.4.6 → 0.5.0

data/bin/ruic

@@ -17,8 +17,8 @@ HELP = <<ENDHELP
    -v, --version      Show the version number (#{RUIC::VERSION}).
    -i, --interactive  Enter an interactive REPL after running the script (if any).
    -m, --metadata     The path to use for MetaData.xml
-                      Default: #{RUIC::DEFAULTMETADATA}
                       Will be overridden by any `metadata` call in your script.
+                      Default: #{RUIC::DEFAULTMETADATA}
    -u, --uia          A UIC application file (.uia) to load.
 ENDHELP
 
@@ -27,10 +27,10 @@ UNFLAGGED_ARGS = [ :script ]
 next_arg = UNFLAGGED_ARGS.first
 ARGV.each do |arg|
 	case arg
-		when '-h','--help'        then ARGS[:help]        = true
-		when '-v','--version'     then ARGS[:version]     = true
-		when '-i','--interactive' then ARGS[:interactive] = true
-		when '-m','--metadata'    then next_arg = :meta
+		when '-h','--help'        then ARGS[:help]    = true
+		when '-v','--version'     then ARGS[:version] = true
+		when '-i','--interactive' then ARGS[:repl]    = true
+		when '-m','--metadata'    then next_arg = :metadata
 		when '-u','--uia'         then next_arg = :uia
 		else
 			if next_arg
@@ -41,20 +41,21 @@ ARGV.each do |arg|
 	end
 end
 
-puts "RUIC v#{RUIC::VERSION}" if ARGS[:version]
+if ARGS.delete(:version)
+	puts "RUIC v#{RUIC::VERSION}"
+	exit 0 if ARGS.empty?
+end
 
 if ARGS[:help]
 	puts USAGE, HELP
 	exit 0
 end
 
-if ARGS[:meta]
-	RUIC::DEFAULTMETADATA.replace File.expand_path(ARGS[:meta])
-end
-
 if ARGS[:script] && File.extname(ARGS[:script])==".uia"
 	ARGS[:uia] = ARGS[:script]
 	ARGS[:script] = nil
 end
 
-RUIC script:ARGS[:script], uia:ARGS[:uia], repl:ARGS[:interactive] || !ARGS[:script]
+%w[uia script metadata].each{ |arg| ARGS[arg]=File.expand_path(ARGS[arg]) if ARGS[arg=arg.to_sym] }
+ARGS[:repl] ||= !ARGS[:script]
+RUIC(ARGS)

data/gui/TODO

@@ -1,2 +1,2 @@
-* Preferences file for last opened file directory - yml?
-* Revert!
+* Preferences file for last opened file directory - yml?
+* Revert!

data/gui/appattributesmodel.rb

@@ -1,51 +1,51 @@
-module UIC; end
-class UIC::GUI::AppAttributesModel < Qt::AbstractItemModel
-	INVALIDINDEX = Qt::ModelIndex.new
-	NODATA       = Qt::Variant.new
-	def initialize(qtparent,el)
-		super(qtparent)
-		@indexes = {} # indexed by [row,col]
-		@root    = Qt::ModelIndex.new
-		@el      = el
-		el.properties.values.sort_by{ |p| p.formal.downcase }.each.with_index do |prop,i|
-			@indexes[[i,0]] = createIndex( i, 0, Qt::Variant.new(prop.formal) )
-			@indexes[[i,1]] = createIndex( i, 1, Qt::Variant.new(el[prop.name,0].to_s) )
-		end
-	end
-
-	def columnCount( *any )
-		2
-	end
-
-	def index( row, col, parent=INVALIDINDEX )
-		@indexes[[row,col]]
-	end
-
-	def headerData(section, orientation, role=Qt::DisplayRole)
-		if orientation==Qt::Horizontal && role==Qt::DisplayRole
-			case section
-				when 0; Qt::Variant.new(tr("Attribute"))
-				when 1; Qt::Variant.new(tr("Value"))
-				else  ; NODATA
-			end
-		else
-			NODATA
-		end
-	end
-
-	def parent(child)
-		child.valid? ? @root : @INVALIDINDEX
-	end
-
-	def rowCount( parent=INVALIDINDEX )
-		@rowcount ||= @el.properties.length
-	end
-
-	def data(index, role)
-		if index.valid? && role == Qt::DisplayRole
-			index.internal_pointer
-		else
-			NODATA
-		end
-	end
-end
+module UIC; end
+class UIC::GUI::AppAttributesModel < Qt::AbstractItemModel
+	INVALIDINDEX = Qt::ModelIndex.new
+	NODATA       = Qt::Variant.new
+	def initialize(qtparent,el)
+		super(qtparent)
+		@indexes = {} # indexed by [row,col]
+		@root    = Qt::ModelIndex.new
+		@el      = el
+		el.properties.values.sort_by{ |p| p.formal.downcase }.each.with_index do |prop,i|
+			@indexes[[i,0]] = createIndex( i, 0, Qt::Variant.new(prop.formal) )
+			@indexes[[i,1]] = createIndex( i, 1, Qt::Variant.new(el[prop.name,0].to_s) )
+		end
+	end
+
+	def columnCount( *any )
+		2
+	end
+
+	def index( row, col, parent=INVALIDINDEX )
+		@indexes[[row,col]]
+	end
+
+	def headerData(section, orientation, role=Qt::DisplayRole)
+		if orientation==Qt::Horizontal && role==Qt::DisplayRole
+			case section
+				when 0; Qt::Variant.new(tr("Attribute"))
+				when 1; Qt::Variant.new(tr("Value"))
+				else  ; NODATA
+			end
+		else
+			NODATA
+		end
+	end
+
+	def parent(child)
+		child.valid? ? @root : @INVALIDINDEX
+	end
+
+	def rowCount( parent=INVALIDINDEX )
+		@rowcount ||= @el.properties.length
+	end
+
+	def data(index, role)
+		if index.valid? && role == Qt::DisplayRole
+			index.internal_pointer
+		else
+			NODATA
+		end
+	end
+end

data/gui/appelementsmodel.rb

@@ -1,126 +1,126 @@
-module UIC; end
-class UIC::GUI::AppElementsModel < Qt::AbstractItemModel
-	INVALIDINDEX = Qt::ModelIndex.new
-	NODATA       = Qt::Variant.new
-	def initialize(qtparent,app)
-		super(qtparent)
-		@root = El.new(app,0)
-	end
-
-	def columnCount( *any )
-		2
-	end
-
-	def index( row, col, parent=INVALIDINDEX )
-		parentEl = parent.valid? ? parent.internal_pointer : @root
-		if childEl=parentEl.child(row)
-			createIndex(row,col,childEl)
-		else
-			INVALIDINDEX
-		end
-	end
-
-	def headerData(section, orientation, role=Qt::DisplayRole)
-		if orientation==Qt::Horizontal && role==Qt::DisplayRole
-			case section
-				when 0; Qt::Variant.new(tr("Name"))
-				when 1; Qt::Variant.new(tr("Type"))
-				else  ; NODATA
-			end
-		else
-			NODATA
-		end
-	end
-
-	def parent(child)
-		if child.valid?
-			parentEl = child.internal_pointer.parent
-			if parentEl.nil? || parentEl==@root
-				INVALIDINDEX
-			else
-				createIndex(parentEl.row, 0, parentEl)
-			end
-		else
-			INVALIDINDEX
-		end
-	end
-
-	def rowCount( parent=INVALIDINDEX )
-		parentEl = parent.valid? ? parent.internal_pointer : @root
-		parentEl.child_count
-	end
-
-	def data(index, role)
-		if index.valid?
-			element = index.internal_pointer
-			case role
-				when Qt::DisplayRole
-					case index.column
-						when 0; Qt::Variant.new(element.displayName)
-						when 1; Qt::Variant.new(element.displayType)
-						else  ; NODATA
-					end
-				when Qt::DecorationRole
-					index.column==0 ? element.icon : NODATA
-				else
-					NODATA
-			end
-		else
-			NODATA
-		end
-	end
-end
-
-class UIC::GUI::AppElementsModel::El
-	@by_el = {}
-	class << self
-		def [](el,row)
-			@by_el[el] ||= self.new(el,row)
-		end
-	end
-
-	attr_reader :row
-	attr_reader :el
-	def initialize(el,row)
-		@el    = el
-		@isapp = el.is_a?( UIC::Application )
-		@row   = row
-	end
-	def child_count
-		(@isapp ? @el.presentations : @el.children).length
-	end
-
-	def child(offset)
-		kids = @isapp ? @el.presentations : @el.children
-		self.class[ @isapp ? kids[offset].scene : kids[offset], offset ] if kids[offset]
-	end
-
-	def parent
-		unless @el.is_a?( UIC::Application )
-			self.class[@el.parent || @el.presentation.app, @row]
-		end
-	end
-
-	def icon
-		@icon ||= UIC::GUI::IconVariant[@el.type]
-	end
-
-	def displayName
-		@el.type=='Scene' ? @el.path : @el.name
-	end
-	def displayType
-		@el.type
-	end
-end
-
-module UIC::GUI::IconVariant
-	@by_path = {}
-	def self.[]( alias_or_path )
-		@by_path[alias_or_path] ||= begin
-			icon = Qt::Pixmap.new(alias_or_path)
-			icon = Qt::Pixmap.new(":/#{alias_or_path}") if icon.isNull
-			icon = Qt::Pixmap.new(":/Unknown") if icon.isNull
-			Qt::Variant.fromValue(icon)
-		end
-	end
-end
+module UIC; end
+class UIC::GUI::AppElementsModel < Qt::AbstractItemModel
+	INVALIDINDEX = Qt::ModelIndex.new
+	NODATA       = Qt::Variant.new
+	def initialize(qtparent,app)
+		super(qtparent)
+		@root = El.new(app,0)
+	end
+
+	def columnCount( *any )
+		2
+	end
+
+	def index( row, col, parent=INVALIDINDEX )
+		parentEl = parent.valid? ? parent.internal_pointer : @root
+		if childEl=parentEl.child(row)
+			createIndex(row,col,childEl)
+		else
+			INVALIDINDEX
+		end
+	end
+
+	def headerData(section, orientation, role=Qt::DisplayRole)
+		if orientation==Qt::Horizontal && role==Qt::DisplayRole
+			case section
+				when 0; Qt::Variant.new(tr("Name"))
+				when 1; Qt::Variant.new(tr("Type"))
+				else  ; NODATA
+			end
+		else
+			NODATA
+		end
+	end
+
+	def parent(child)
+		if child.valid?
+			parentEl = child.internal_pointer.parent
+			if parentEl.nil? || parentEl==@root
+				INVALIDINDEX
+			else
+				createIndex(parentEl.row, 0, parentEl)
+			end
+		else
+			INVALIDINDEX
+		end
+	end
+
+	def rowCount( parent=INVALIDINDEX )
+		parentEl = parent.valid? ? parent.internal_pointer : @root
+		parentEl.child_count
+	end
+
+	def data(index, role)
+		if index.valid?
+			element = index.internal_pointer
+			case role
+				when Qt::DisplayRole
+					case index.column
+						when 0; Qt::Variant.new(element.displayName)
+						when 1; Qt::Variant.new(element.displayType)
+						else  ; NODATA
+					end
+				when Qt::DecorationRole
+					index.column==0 ? element.icon : NODATA
+				else
+					NODATA
+			end
+		else
+			NODATA
+		end
+	end
+end
+
+class UIC::GUI::AppElementsModel::El
+	@by_el = {}
+	class << self
+		def [](el,row)
+			@by_el[el] ||= self.new(el,row)
+		end
+	end
+
+	attr_reader :row
+	attr_reader :el
+	def initialize(el,row)
+		@el    = el
+		@isapp = el.is_a?( UIC::Application )
+		@row   = row
+	end
+	def child_count
+		(@isapp ? @el.presentations : @el.children).length
+	end
+
+	def child(offset)
+		kids = @isapp ? @el.presentations : @el.children
+		self.class[ @isapp ? kids[offset].scene : kids[offset], offset ] if kids[offset]
+	end
+
+	def parent
+		unless @el.is_a?( UIC::Application )
+			self.class[@el.parent || @el.presentation.app, @row]
+		end
+	end
+
+	def icon
+		@icon ||= UIC::GUI::IconVariant[@el.type]
+	end
+
+	def displayName
+		@el.type=='Scene' ? @el.path : @el.name
+	end
+	def displayType
+		@el.type
+	end
+end
+
+module UIC::GUI::IconVariant
+	@by_path = {}
+	def self.[]( alias_or_path )
+		@by_path[alias_or_path] ||= begin
+			icon = Qt::Pixmap.new(alias_or_path)
+			icon = Qt::Pixmap.new(":/#{alias_or_path}") if icon.isNull
+			icon = Qt::Pixmap.new(":/Unknown") if icon.isNull
+			Qt::Variant.fromValue(icon)
+		end
+	end
+end

data/gui/launch.rb

@@ -1,20 +1,20 @@
-#encoding: utf-8
-require 'Qt'
-require_relative 'window'
-
-class Qt::Application
-	def self.translate(*a,&b)
-		method_missing(:translate,*a,&b).force_encoding('utf-8')
-	end
-end
-
-Qt::CoreApplication.organization_name   = "PhrogzSoft"
-Qt::CoreApplication.organization_domain = "phrogz.net"
-Qt::CoreApplication.application_name    = "RUIC"
-$prefs = Qt::Settings.new
-
-$app = Qt::Application.new(ARGV)
-gui = UIC::GUI.new
-gui.show
-gui.open
+#encoding: utf-8
+require 'Qt'
+require_relative 'window'
+
+class Qt::Application
+	def self.translate(*a,&b)
+		method_missing(:translate,*a,&b).force_encoding('utf-8')
+	end
+end
+
+Qt::CoreApplication.organization_name   = "PhrogzSoft"
+Qt::CoreApplication.organization_domain = "phrogz.net"
+Qt::CoreApplication.application_name    = "RUIC"
+$prefs = Qt::Settings.new
+
+$app = Qt::Application.new(ARGV)
+gui = UIC::GUI.new
+gui.show
+gui.open
 $app.exec