ifmapper 1.1.1 → 1.1.2

data/HISTORY.txt

@@ -1,3 +1,9 @@
+v1.1.2  Improvements:
+	- Made room box use tabs for comments, descriptions and objects.
+	- Made dark rooms select as orange.
+	- Added support for dark rooms and descriptions in 
+	  TrizbortReader/Writer.
+
 v1.1.1  Improvements:
 	- Added support for Trizbort maps for reading and writing.
 	- Made failed connections turn cyan upon selection.

data/IFMapper.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '1.1.1'
+	spec.version = '1.1.2'
 	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarra13@gmail.com'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'

data/lib/IFMapper/FXMapperSettings.rb

@@ -181,7 +181,7 @@ class FXMapperSettings < Hash
 
       # Location options
       'Location Tasks'           => true,
-      'Location Description'     => false,
+      'Location Description'     => true,
       'Location Numbers'         => true,
 
       # Grid options

data/lib/IFMapper/FXMapperWindow.rb

@@ -46,7 +46,7 @@ require 'IFMapper/FXWarningBox'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '1.1.1'
+  VERSION      = '1.1.2'
   AUTHOR = "Gonzalo Garramuño"
 
   @@copy_buffer = nil

data/lib/IFMapper/FXRoom.rb

@@ -180,6 +180,9 @@ class FXRoom < Room
   def draw_box(dc, zoom, idx, opt)
     if @selected
       dc.foreground = 'yellow'
+      if @darkness
+        dc.foreground = 'orange'
+      end
     else
       if @darkness
 	dc.foreground = opt['Box Darkness Color']

data/lib/IFMapper/FXRoomDialogBox.rb

@@ -108,35 +108,34 @@ class FXRoomDialogBox < FXDialogBox
 				    LAYOUT_SIDE_TOP|LAYOUT_SIDE_LEFT|
 				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
-    frame2 = FXHorizontalFrame.new(leftFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-    FXLabel.new(frame2, BOX_OBJECTS, nil, 0, LAYOUT_FILL_X)
-    @darkness = FXCheckButton.new(frame2, BOX_DARKNESS, nil, 0,
-				  ICON_BEFORE_TEXT|LAYOUT_CENTER_X|
+    @darkness = FXCheckButton.new(leftFrame, BOX_DARKNESS, nil, 0,
+				  ICON_BEFORE_TEXT|LAYOUT_LEFT|
 				  LAYOUT_SIDE_RIGHT)
-
-    @objects = FXText.new(leftFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @tab = FXTabBook.new(leftFrame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|
+                         LAYOUT_LEFT)
+    
+    FXTabItem.new(@tab, BOX_OBJECTS, nil, 0, LAYOUT_FILL_X)
+    boxFrame = FXHorizontalFrame.new(@tab, FRAME_THICK|FRAME_RAISED)
+    @objects = FXText.new(boxFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @objects.visibleRows = 8
     @objects.visibleColumns = 40
 
-    @tasksFrame = FXVerticalFrame.new(leftFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|
-				     LAYOUT_FILL_Y)
-    FXLabel.new(@tasksFrame, BOX_TASKS, nil, 0, LAYOUT_FILL_X)
+    FXTabItem.new(@tab, BOX_TASKS, nil)
+    @tasksFrame = FXHorizontalFrame.new(@tab, FRAME_THICK|FRAME_RAISED)
     @tasks = FXText.new(@tasksFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @tasks.visibleRows = 8
     @tasks.visibleColumns = 40
 
-    @commentFrame = FXVerticalFrame.new(leftFrame, LAYOUT_SIDE_TOP|
-                                        LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    FXLabel.new(@commentFrame, BOX_COMMENTS, nil, 0, LAYOUT_FILL_X)
+    FXTabItem.new(@tab, BOX_COMMENTS, nil)
+    @commentFrame = FXHorizontalFrame.new(@tab, FRAME_THICK|FRAME_RAISED)
     @comment = FXText.new(@commentFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @comment.visibleRows = 8
     @comment.visibleColumns = 40
 
     ######## Add description
-    @descFrame = FXVerticalFrame.new(all, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|
-				LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y)
-    FXLabel.new(@descFrame, BOX_DESCRIPTION, nil, 0, LAYOUT_FILL_X)
-    @desc = FXText.new(@descFrame, nil, 0, 
+    @descFrame = FXTabItem.new(@tab, BOX_DESCRIPTION, nil)
+    frame = FXVerticalFrame.new(@tab, FRAME_THICK|FRAME_RAISED)
+    @desc = FXText.new(frame, nil, 0, 
 		       LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
     @desc.visibleColumns = 70
     @desc.visibleRows = 18

data/lib/IFMapper/TrizbortReader.rb

@@ -81,6 +81,12 @@ class TrizbortReader
       h = e.attributes['h'].to_i
       r = @map.new_room(x, y)
       r.name = name
+      darkness = e.attributes['isDark']
+      if darkness == 'yes'
+        r.darkness = true
+      end
+      desc = e.attributes['description']
+      r.desc = desc
       rooms[id] = r
       e.elements.each('objects') { |o|
         r.objects = o.text.to_s.gsub('|',"\n")

data/lib/IFMapper/TrizbortWriter.rb

@@ -28,7 +28,7 @@ class TrizbortWriter
 
   def write_objects( room )
     if room.objects
-      @f.print "\t\t\ŧ<objects>"
+      @f.print "\t\t\t<objects>"
       room.objects.split("\n").each_with_index { |obj,idx|
         if idx > 0
           @f.print "|"
@@ -49,7 +49,14 @@ class TrizbortWriter
     id = 0
     @map.sections.each { |s|
       s.rooms.each { |r|
-        @f.puts "\t\t<room id=\"#{id}\" name=\"#{r.name}\" x=\"#{x + r.x*(W+32)}\" y=\"#{y + r.y*(H+32)}\" w=\"#{W}\" h=\"#{H}\">"
+        @f.puts "\t\t<room id=\"#{id}\" name=\"#{r.name}\" x=\"#{x + r.x*(W+32)}\" y=\"#{y + r.y*(H+32)}\" w=\"#{W}\" h=\"#{H}\""
+        if r.darkness
+          @f.puts " isDark=\"yes\""
+        end
+        if r.desc
+          @f.puts " description=\"#{r.desc}\""
+        end
+        @f.puts ">"
         write_objects r
         @f.puts "\t\t</room>"
         hash[r] = id

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Gonzalo Garramuno
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -03:00
+date: 2011-06-06 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency