andrew/tailor
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reintegrated main window

Browse Source
This commit is contained in:
Andrew Kesterson
2014-05-24 10:39:22 -07:00
parent 905da9d681
commit a4a4092008
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tailor/GUI.rb
View File

@@ -1,13 +1,11 @@
require 'wx' require 'wx'
require 'tailor/GUI/MainWindow' require 'tailor/GUI/MainWindow'
require 'tailor/GUI/TilesetEditor'
module Tailor module Tailor
module GUI module GUI
class Application < Wx::App class Application < Wx::App
def on_init def on_init
#Tailor::GUI::MainWindow.new Tailor::GUI::MainWindow.new
Tailor::GUI::TilesetEditor.new(nil, -1, 'Tailor')
end end
end end
end end

18
lib/tailor/GUI/MainWindow.rb
View File

@@ -1,6 +1,7 @@
require 'wx' require 'wx'
require 'Tailor/version' require 'Tailor/version'
require 'Tailor/GUI/TilesetProperties' require 'Tailor/GUI/TilesetProperties'
require 'tailor/GUI/TilesetEditor'
module Tailor module Tailor
module GUI module GUI
@@ -23,12 +24,16 @@ module Tailor
menuFile.append_separator menuFile.append_separator
menuFileExit = menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Exit Tailor") menuFileExit = menuFile.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Exit Tailor")
@menuBar.append(menuFile, "&File") @menuBar.append(menuFile, "&File")
menuEdit = Wx::Menu.new
menuEditTileset = menuEdit.append(Wx::ID_ANY, "&Tileset\tAlt-T", "Edit Tileset")
@menuBar.append(menuEdit, "&Edit")
menuHelp = Wx::Menu.new menuHelp = Wx::Menu.new
menuHelpAbout = menuHelp.append(Wx::ID_ABOUT, "&About...\tF1", "About Tailor") menuHelpAbout = menuHelp.append(Wx::ID_ABOUT, "&About...\tF1", "About Tailor")
@menuBar.append(menuHelp, "&Help") @menuBar.append(menuHelp, "&Help")
self.menu_bar = @menuBar self.menu_bar = @menuBar
evt_menu(menuFileNew, :on_file_new) evt_menu(menuFileNew, :on_file_new)
evt_menu(menuEditTileset, :on_edit_tileset)
evt_menu(menuFileOpen, :on_file_open) evt_menu(menuFileOpen, :on_file_open)
evt_menu(menuFileSave, :on_file_save) evt_menu(menuFileSave, :on_file_save)
evt_menu(menuFileExport, :on_file_export) evt_menu(menuFileExport, :on_file_export)
@@ -43,7 +48,7 @@ module Tailor
@mainPanel.set_sizer(@mainPanelSizer) @mainPanel.set_sizer(@mainPanelSizer)
@tilesetProperties = Tailor::GUI::TilesetProperties.new(@mainPanel, Wx::ID_ANY) @tilesetProperties = Tailor::GUI::TilesetProperties.new(@mainPanel, Wx::ID_ANY)
@mainPanelSizer.add(@tilesetProperties) @mainPanelSizer.add(@tilesetProperties)
button = Wx::Button.new(@mainPanel, Wx::ID_ANY, "Click me") button = Wx::Button.new(@mainPanel, Wx::ID_ANY, "Open Tileset Editor")
evt_button(button.get_id()) { |event| on_clickme(event) } evt_button(button.get_id()) { |event| on_clickme(event) }
@mainPanelSizer.add(button, 0, Wx::EXPAND|Wx::ALL, 2) @mainPanelSizer.add(button, 0, Wx::EXPAND|Wx::ALL, 2)
@mainPanelSizer.set_size_hints(@mainPanel) @mainPanelSizer.set_size_hints(@mainPanel)
@@ -51,12 +56,11 @@ module Tailor
end end
def on_clickme(event) def on_clickme(event)
puts "Tile X: #{@tilesetProperties.TileX}" puts "I don't do anything"
puts "Tile Y: #{@tilesetProperties.TileY}" end
puts "Pad X: #{@tilesetProperties.PadX}"
puts "Pad Y: #{@tilesetProperties.PadY}" def on_edit_tileset
puts "Space X: #{@tilesetProperties.SpaceX}" Tailor::GUI::TilesetEditor.new(self, Wx::ID_ANY, 'Tailor')
puts "Space Y: #{@tilesetProperties.SpaceY}"
end end
def on_file_open def on_file_open