ifmapper 1.0.0 → 1.0.6

data/lib/IFMapper/FXRoomDialogBox.rb

@@ -1,159 +1,159 @@
-
-
-#
-# Class used to display a room dialog box
-#
-class FXRoomDialogBox < FXDialogBox
-
-  attr_writer :map
-
-  def copy_to()
-
-    @room.name    = @name.text
-    @room.objects = @objects.text
-    @room.objects.gsub!(/[,\t]+/, "\n")
-    @room.tasks = @tasks.text
-    @room.darkness = (@darkness.checkState == 1)
-    @room.desc = @desc.text
-
-    @map.draw_room(@room)
-    @map.update_roomlist
-  end
-
-
-  def copy_from(room)
-    @room                = room
-    @name.text           = room.name
-    @darkness.checkState = room.darkness
-    @objects.text        = room.objects
-    @tasks.text          = room.tasks
-    @desc.text           = room.desc
-
-    # Select text for quick editing if it uses default location name
-    @name.setCursorPos room.name.size 
-    if room.name == MSG_NEW_LOCATION
-      self.setFocus
-      @name.selectAll
-      @name.setFocus
-    end
-    if @map.navigation
-      @name.disable
-      @darkness.disable
-      @objects.disable
-      @tasks.disable
-      @desc.disable
-    else
-      @name.enable
-      @darkness.enable
-      @objects.enable
-      @tasks.enable
-      @desc.enable
-    end
-
-    if @map.options['Location Tasks']
-      @tasksFrame.show
-    else
-      @tasksFrame.hide
-    end
-    if @map.options['Location Description']
-      @descFrame.show
-    else
-      @descFrame.hide
-    end
-
-    @desc.connect(SEL_CHANGED) { @room.desc = @desc.text }
-
-    # Yuck!  Fox's packer is absolutely oblivious to hiding/showing of
-    # elements, so we need to force a dummy resize so the layout is
-    # recalculated.  But FUCK!  This completely fucks up the focus.
-    # Fox is a piece of ****.  I **REALLY** need to go back to FLTK.
-    ##  self.resize(self.defaultWidth, self.defaultHeight)
-  end
-
-  def initialize(map, room, event = nil, modal = nil)
-    pos = [40, 40]
-    if event
-      pos  = [ event.last_x, event.last_y ]
-    end
-    maxW = map.window.width  - 390
-    maxH = map.window.height - 300
-    pos[0] = maxW if pos[0] > maxW
-    pos[1] = maxH if pos[1] > maxH
-    
-    if modal
-      decor = DECOR_TITLE|DECOR_BORDER
-    else
-      decor = DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE
-    end
-
-    super( map.window, BOX_ROOM_INFORMATION, decor, pos[0], pos[1], 0, 0 )
-    mainFrame = FXVerticalFrame.new(self,
-				    FRAME_SUNKEN|FRAME_THICK|
-				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
-
-    frame = FXHorizontalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-
-    FXLabel.new(frame, BOX_LOCATION, nil, 0, LAYOUT_FILL_X)
-    @name = FXTextField.new(frame, 40, nil, 0, LAYOUT_FILL_ROW)
-
-
-    all = FXHorizontalFrame.new(mainFrame,
-				LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-
-    leftFrame = FXVerticalFrame.new(all, 
-				    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|
-				  LAYOUT_SIDE_RIGHT)
-
-    @objects = FXText.new(leftFrame, 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)
-    @tasks = FXText.new(@tasksFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    @tasks.visibleRows = 8
-    @tasks.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, 
-		       LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
-    @desc.visibleColumns = 70
-    @desc.visibleRows = 18
-
-    if modal
-      buttons = FXHorizontalFrame.new(mainFrame, 
-				      LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|
-				      PACK_UNIFORM_WIDTH)
-      # Accept
-      @ok = FXButton.new(buttons, BUTTON_ACCEPT, nil, self, 
-			 FXDialogBox::ID_ACCEPT,
-			 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-      
-      # Cancel
-      cmd = FXButton.new(buttons, BUTTON_CANCEL, nil, self, 
-			 FXDialogBox::ID_CANCEL,
-			 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-    else
-      @name.connect(SEL_CHANGED) { copy_to() }
-      @objects.connect(SEL_CHANGED) { copy_to()}
-      @tasks.connect(SEL_CHANGED) { @room.tasks = @tasks.text }
-      @darkness.connect(SEL_COMMAND) { copy_to() }
-      @desc.connect(SEL_CHANGED) { @room.desc = @desc.text }
-    end
-    
-    @map = map
-
-    # We need to create the dialog box first, so we can use select text.
-    create
-  end
-end
+
+
+#
+# Class used to display a room dialog box
+#
+class FXRoomDialogBox < FXDialogBox
+
+  attr_writer :map
+
+  def copy_to()
+
+    @room.name    = @name.text
+    @room.objects = @objects.text
+    @room.objects.gsub!(/[,\t]+/, "\n")
+    @room.tasks = @tasks.text
+    @room.darkness = (@darkness.checkState == 1)
+    @room.desc = @desc.text
+
+    @map.draw_room(@room)
+    @map.update_roomlist
+  end
+
+
+  def copy_from(room)
+    @room                = room
+    @name.text           = room.name
+    @darkness.checkState = room.darkness
+    @objects.text        = room.objects
+    @tasks.text          = room.tasks
+    @desc.text           = room.desc
+
+    # Select text for quick editing if it uses default location name
+    @name.setCursorPos room.name.size 
+    if room.name == MSG_NEW_LOCATION
+      self.setFocus
+      @name.selectAll
+      @name.setFocus
+    end
+    if @map.navigation
+      @name.disable
+      @darkness.disable
+      @objects.disable
+      @tasks.disable
+      @desc.disable
+    else
+      @name.enable
+      @darkness.enable
+      @objects.enable
+      @tasks.enable
+      @desc.enable
+    end
+
+    if @map.options['Location Tasks']
+      @tasksFrame.show
+    else
+      @tasksFrame.hide
+    end
+    if @map.options['Location Description']
+      @descFrame.show
+    else
+      @descFrame.hide
+    end
+
+    @desc.connect(SEL_CHANGED) { @room.desc = @desc.text }
+
+    # Yuck!  Fox's packer is absolutely oblivious to hiding/showing of
+    # elements, so we need to force a dummy resize so the layout is
+    # recalculated.  But FUCK!  This completely fucks up the focus.
+    # Fox is a piece of ****.  I **REALLY** need to go back to FLTK.
+    ##  self.resize(self.defaultWidth, self.defaultHeight)
+  end
+
+  def initialize(map, room, event = nil, modal = nil)
+    pos = [40, 40]
+    if event
+      pos  = [ event.last_x, event.last_y ]
+    end
+    maxW = map.window.width  - 390
+    maxH = map.window.height - 300
+    pos[0] = maxW if pos[0] > maxW
+    pos[1] = maxH if pos[1] > maxH
+    
+    if modal
+      decor = DECOR_TITLE|DECOR_BORDER
+    else
+      decor = DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE
+    end
+
+    super( map.window, BOX_ROOM_INFORMATION, decor, pos[0], pos[1], 0, 0 )
+    mainFrame = FXVerticalFrame.new(self,
+				    FRAME_SUNKEN|FRAME_THICK|
+				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+    frame = FXHorizontalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+
+    FXLabel.new(frame, BOX_LOCATION, nil, 0, LAYOUT_FILL_X)
+    @name = FXTextField.new(frame, 40, nil, 0, LAYOUT_FILL_ROW)
+
+
+    all = FXHorizontalFrame.new(mainFrame,
+				LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+    leftFrame = FXVerticalFrame.new(all, 
+				    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|
+				  LAYOUT_SIDE_RIGHT)
+
+    @objects = FXText.new(leftFrame, 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)
+    @tasks = FXText.new(@tasksFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @tasks.visibleRows = 8
+    @tasks.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, 
+		       LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+    @desc.visibleColumns = 70
+    @desc.visibleRows = 18
+
+    if modal
+      buttons = FXHorizontalFrame.new(mainFrame, 
+				      LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|
+				      PACK_UNIFORM_WIDTH)
+      # Accept
+      @ok = FXButton.new(buttons, BUTTON_ACCEPT, nil, self, 
+			 FXDialogBox::ID_ACCEPT,
+			 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
+      
+      # Cancel
+      cmd = FXButton.new(buttons, BUTTON_CANCEL, nil, self, 
+			 FXDialogBox::ID_CANCEL,
+			 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
+    else
+      @name.connect(SEL_CHANGED) { copy_to() }
+      @objects.connect(SEL_CHANGED) { copy_to()}
+      @tasks.connect(SEL_CHANGED) { @room.tasks = @tasks.text }
+      @darkness.connect(SEL_COMMAND) { copy_to() }
+      @desc.connect(SEL_CHANGED) { @room.desc = @desc.text }
+    end
+    
+    @map = map
+
+    # We need to create the dialog box first, so we can use select text.
+    create
+  end
+end

data/lib/IFMapper/FXRoomList.rb

@@ -1,95 +1,95 @@
-
-#
-# Class that lists all rooms in a map and allows you to jump to them
-#
-class FXRoomList < FXDialogBox
-
-  def pick(sender, sel, ptr)
-    item = @box.currentItem
-    idx, r = @box.getItemData(item)
-
-    @map.section = idx
-    @map.clear_selection
-    r.selected = true
-    @map.center_view_on_room(r)
-    @map.draw
-  end
-
-  def copy_from(map)
-    @map = map
-    sort
-  end
-
-  def sort
-    item = @box.currentItem
-    room = nil
-    if item >= 0
-      idx, room = @box.getItemData(item)
-    end
-
-    @box.clearItems
-
-    rooms = []
-    @map.sections.each_with_index { |s, idx| 
-      s.rooms.each { |r|
-	rooms << [idx, r]
-      }
-    }
-
-    dir = @box.header.getArrowDir(0)
-    if dir != MAYBE
-      rooms = rooms.sort_by { |r| r[0] }
-    else
-      dir = @box.header.getArrowDir(1)
-      if dir != MAYBE
-	rooms = rooms.sort_by { |r| r[1].name }
-      end
-    end
-
-    if dir == Fox::TRUE
-      rooms.reverse! 
-    end
-
-    rooms.each { |r|
-      item = "#{r[0] + 1}\t#{r[1].name}"
-      @box.appendItem(item, nil, nil, r)
-    }
-
-    if room
-      rooms.each_with_index { |r, idx|
-	if r[1] == room
-	  @box.currentItem = idx
-	  break
-	end
-      }
-    end
-  end
-
-  def initialize(map)
-    super(map.window.parent, BOX_LOCATIONS, DECOR_ALL, 40, 40, 300, 400)
-  
-    @box = FXIconList.new(self, nil, 0, 
-			   ICONLIST_BROWSESELECT|
-			   LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    @box.appendHeader(BOX_SECTION, nil, 60)
-    @box.appendHeader(BOX_NAME, nil, 200)
-    @box.header.connect(SEL_COMMAND) { |sender, sel, which|
-      if @box.header.arrowUp?(which)
-	dir = MAYBE
-      elsif @box.header.arrowDown?(which)
-	dir = TRUE
-      else
-	dir = FALSE
-      end
-      @box.header.setArrowDir(which, dir)
-      @box.header.setArrowDir(which ^ 1, MAYBE)
-      sort
-    }
-
-    @box.connect(SEL_COMMAND, method(:pick))
-
-    create
-    copy_from(map)
-  end
-
-end
+
+#
+# Class that lists all rooms in a map and allows you to jump to them
+#
+class FXRoomList < FXDialogBox
+
+  def pick(sender, sel, ptr)
+    item = @box.currentItem
+    idx, r = @box.getItemData(item)
+
+    @map.section = idx
+    @map.clear_selection
+    r.selected = true
+    @map.center_view_on_room(r)
+    @map.draw
+  end
+
+  def copy_from(map)
+    @map = map
+    sort
+  end
+
+  def sort
+    item = @box.currentItem
+    room = nil
+    if item >= 0
+      idx, room = @box.getItemData(item)
+    end
+
+    @box.clearItems
+
+    rooms = []
+    @map.sections.each_with_index { |s, idx| 
+      s.rooms.each { |r|
+	rooms << [idx, r]
+      }
+    }
+
+    dir = @box.header.getArrowDir(0)
+    if dir != MAYBE
+      rooms = rooms.sort_by { |r| r[0] }
+    else
+      dir = @box.header.getArrowDir(1)
+      if dir != MAYBE
+	rooms = rooms.sort_by { |r| r[1].name }
+      end
+    end
+
+    if dir == Fox::TRUE
+      rooms.reverse! 
+    end
+
+    rooms.each { |r|
+      item = "#{r[0] + 1}\t#{r[1].name}"
+      @box.appendItem(item, nil, nil, r)
+    }
+
+    if room
+      rooms.each_with_index { |r, idx|
+	if r[1] == room
+	  @box.currentItem = idx
+	  break
+	end
+      }
+    end
+  end
+
+  def initialize(map)
+    super(map.window.parent, BOX_LOCATIONS, DECOR_ALL, 40, 40, 300, 400)
+  
+    @box = FXIconList.new(self, nil, 0, 
+			   ICONLIST_BROWSESELECT|
+			   LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @box.appendHeader(BOX_SECTION, nil, 60)
+    @box.appendHeader(BOX_NAME, nil, 200)
+    @box.header.connect(SEL_COMMAND) { |sender, sel, which|
+      if @box.header.arrowUp?(which)
+	dir = MAYBE
+      elsif @box.header.arrowDown?(which)
+	dir = TRUE
+      else
+	dir = FALSE
+      end
+      @box.header.setArrowDir(which, dir)
+      @box.header.setArrowDir(which ^ 1, MAYBE)
+      sort
+    }
+
+    @box.connect(SEL_COMMAND, method(:pick))
+
+    create
+    copy_from(map)
+  end
+
+end