Project files and global configuration

Author: ReinUsesLisp

data/ui/main.glade

@@ -2,6 +2,17 @@
 <!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
+  <menu id="appmenu">
+    <item>
+      <attribute name="label" translatable="yes">_Preferences</attribute>
+      <attribute name="action">app.preferences</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">_Quit</attribute>
+      <attribute name="action">app.quit</attribute>
+      <attribute name="accel">&lt;Primary&gt;Q</attribute>
+    </item>
+  </menu>
   <menu id="menubar">
     <submenu>
       <attribute name="label" translatable="yes">_File</attribute>
@@ -26,14 +37,6 @@
           <attribute name="action">app.close</attribute>
         </item>
       </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Quit</attribute>
-          <attribute name="hidden-when">macos-menubar</attribute>
-          <attribute name="action">app.quit</attribute>
-          <attribute name="accel">&lt;Primary&gt;Q</attribute>
-        </item>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
@@ -148,10 +151,6 @@
 	<attribute name="label" translatable="yes">So_und Test</attribute>
 	<attribute name="action">app.audio</attribute>
       </item>
-      <item>
-	<attribute name="label" translatable="yes">R_TP Directory</attribute>
-	<attribute name="action">app.rtp</attribute>
-      </item>
       <item>
 	<attribute name="label" translatable="yes">_Open Game Directory</attribute>
 	<attribute name="action">app.directory</attribute>

src/app.rb

@@ -22,8 +22,8 @@
 require_relative 'tileset_view.rb'
 require_relative 'mapinfo_bind.rb'
 require_relative 'database.rb'
-require_relative 'rtp.rb'
 require_relative 'new_project.rb'
+require_relative 'config.rb'
 
 class ApplicationWindow < Gtk::ApplicationWindow
   def initialize(app, builder)
@@ -69,12 +69,14 @@ def connect_store
       file.set_boolean("WindowState", "Maximized", @maximized)
       # querying while destroying is not safe, but I can't find paned's signal
       file.set_integer("WindowState", "PanedPosition", @paned.position)
-      path = File.expand_path(GLib.application_name, GLib.user_cache_dir)
       begin
-        FileUtils.mkdir_p(path)
-        IO.write(File.expand_path("state.ini", path), file.to_data)
+        dir = File.expand_path(GLib.application_name, GLib.user_cache_dir)
+        FileUtils.mkdir_p(dir)
+        IO.write(File.expand_path("state.ini", dir), file.to_data)
       rescue Errno::EACCES
       end
+      # FIXME move to application close
+      $config.save
     end
   end
 end
@@ -86,12 +88,15 @@ def initialize
     self.signal_connect("activate") { on_activate }
   end
   def on_startup
+    $config = Configuration.new
+
     @builder = ExtraBuilder.new("main")
+    self.set_app_menu(@builder.get_object("appmenu"))
     self.set_menubar(@builder.get_object("menubar"))
 
-    add_simple_actions("open", "save", "close", "run", "quit", "undo",
-                       "redo", "copy", "cut", "paste", "delete", "scripts",
-                       "database", "rtp")
+    add_simple_actions("open", "save", "close", "run", "quit",
+                       #"undo", "redo", "copy", "cut", "paste",
+                       "delete", "scripts", "database")
     add_radio_action("layerview", "all")
     add_radio_action("layeredit", "layer1")
     add_check_action("dim")
@@ -146,8 +151,13 @@ def edit_map(map_id)
     @palette.tileset = $project.tilesets[@map.tileset_id]
   end
   def on_open
+    filter = Gtk::FileFilter.new
+    filter.add_pattern("*.rxproj")
+    filter.add_pattern("*.xproj")
+    filter.name = "XP Project"
+    
     dialog = Gtk::FileChooserDialog.new(title: "Open Project", parent: @window)
-    dialog.action = :select_folder
+    dialog.add_filter(filter)
     dialog.add_button(Gtk::Stock::CANCEL, :cancel)
     open = dialog.add_button(Gtk::Stock::OPEN, :ok)
     open.style_context.add_class("suggested-action")

src/config.rb

@@ -0,0 +1,88 @@
+#
+# This file is part of RPGXP.
+#
+# RPGXP is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# RPGXP is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with RPGXP.  If not, see <http://www.gnu.org/licenses/>.
+#
+require 'gtk3'
+require_relative 'widgets.rb'
+
+class Configuration
+  def initialize
+    path = File.expand_path(GLib.application_name, GLib.user_config_dir)
+    filepath = File.expand_path("config", path)
+    file = ExtraKeyFile.new(filepath)
+    @background_color = file.get_integer_list("UI", "BackgroundColor", [255, 255, 255])
+    @none_color = file.get_integer_list("UI", "NoneColor", [127, 127, 127])
+    @rtps = {}
+    if file.has_group?("RTPs")
+      for key in file.get_keys("RTPs")
+        @rtps[key] = file.get_string("RTPs", key)
+      end
+    end
+    # if there is no config file, then it's the first time opening rpgxp
+    unless File.exists?(filepath)
+      welcome_message
+    end
+  end
+  def save
+    dir = File.expand_path(GLib.application_name, GLib.user_config_dir)
+    file = ExtraKeyFile.new
+    file.set_integer_list("UI", "BackgroundColor", @background_color)
+    file.set_integer_list("UI", "NoneColor", @none_color)
+    for key, path in @rtps
+      file.set_string("RTPs", key, path)
+    end
+    FileUtils.mkdir_p(dir)
+    IO.write(File.expand_path("config", dir), file.to_data)
+  end
+  def background_color
+    map_color(@background_color)
+  end
+  def none_color
+    map_color(@none_color)
+  end
+  def rtp_path(rtp)
+    if @rtps.key?(rtp)
+      @rtps[rtp]
+    else
+      # TODO gui ask to add it
+      raise "RTP of name #{rtp} was not found."
+    end
+  end
+  def welcome_message
+    msg = "Welcome to RPG XP!\nDo you want to import a standard RTP?"
+    ask = Gtk::MessageDialog.new(message: msg, buttons_type: :none)
+    ask.add_button("No", :cancel)
+    ok = ask.add_button("Import RTP", :ok)
+    ok.style_context.add_class("suggested-action")
+    confirmed = (ask.run == :ok)
+    ask.destroy
+    if confirmed
+      dialog = Gtk::FileChooserDialog.new(title: "Import RTP (directory)")
+      dialog.action = :select_folder
+      dialog.add_button("Cancel", :cancel)
+      ok = dialog.add_button("Import", :ok)
+      ok.style_context.add_class("suggested-action")
+      if dialog.run == :ok
+        @rtps["Standard"] = dialog.filename
+      end
+      dialog.destroy
+    end
+  end
+  protected
+  def map_color(color)
+    color.map { |n| n.to_f / 255.0 }
+  end
+end
+

src/project.rb

@@ -18,6 +18,7 @@
 require 'scanf'
 require_relative 'widget_link.rb'
 require_relative 'convert.rb'
+require_relative 'xproj.rb'
 
 # FIXME move somewhere else
 TILE_SIZE = 32
@@ -30,12 +31,19 @@ class Project
   attr_accessor :actors, :animations, :armors, :classes, :common_events,
                 :enemies, :items, :mapinfos, :scripts, :skills, :states,
                 :system, :tilesets, :troops, :weapons, :maps
-  attr_reader :dir, :rtp
-  def has_conf?
-    File.exists?("#{dir}/mkxp.conf")
-  end
-  def initialize(dir)
-    @dir = dir
+  attr_reader :dir, :config
+  def initialize(file)
+    @dir = File.dirname(file)
+    case File.extname(file)
+    when ".xproj"
+      @config = read_marshal(file)
+    when ".rxproj"
+      @config = XProj.new
+      name = File.basename(file, ".rxproj")
+      @config.load_ini(File.expand_path("#{name}.ini", dir))
+    else
+      raise("Invalid Project extension")
+    end
     data = "#{dir}/Data"
     @actors = read_marshal("#{data}/Actors.rxdata")
     @animations = read_marshal("#{data}/Animations.rxdata")
@@ -57,22 +65,6 @@ def initialize(dir)
       @maps[map_id] = read_marshal(sprintf("#{data}/Map%03d.rxdata", map_id))
     end
     try_export_scripts
-
-    if has_conf?
-      @rtp = slow_read_rtp
-    else
-      for file in %w(mkxp_linux GMGSx.sf2 mkxp.conf)
-        FileUtils.cp("#{$DATA_DIR}/system/#{file}", dir)
-      end
-      FileUtils.chmod(0755, "#{dir}/mkxp_linux")
-
-      dialog = rtp_choose_dialog(nil, "RTP Directory")
-      if dialog.run == :ok
-        @rtp = dialog.filename
-        self.rtp = @rtp
-      end
-      dialog.destroy
-    end
   end
   def save
     # load script files into memory, then save it as .rxdata
@@ -97,6 +89,10 @@ def save
     @mapinfos.each do |map_id, info|
       write_marshal(@maps[map_id], sprintf("#{data}/Map%03d.rxdata", map_id))
     end
+    # save metadata
+    @config.save(dir)
+    @config.export_ini(dir)
+    @config.export_conf(dir)
   end
   def try_export_scripts
     export_scripts unless has_scripts?
@@ -154,46 +150,6 @@ def extract_script_path(path)
   def scripts_dir
     "#{dir}/Scripts"
   end
-  def slow_read_rtp
-    conf_read("RTP")
-  end
-  def rtp=(rtp_dir)
-    conf_write("RTP", rtp_dir)
-  end
-  def title=(title)
-    conf_write("windowTitle", title)
-  end
-  def title
-    conf_read("windowTitle")
-  end
-  protected
-  def conf
-    return IO.read("#{dir}/mkxp.conf").lines.map { |line| line.strip }
-  rescue
-    return []
-  end
-  def conf=(lines)
-    IO.write("#{dir}/mkxp.conf", lines.join("\n"))
-  end
-  def conf_index(id)
-    self.conf.find_index do |line|
-      line[0...id.length] == id
-    end
-  end
-  def conf_read(id)
-    index = conf_index(id)
-    index ? conf[index][(id.length+1)..-1] : ""
-  end
-  def conf_write(id, value)
-    lines = self.conf
-    index = conf_index(id)
-    if index
-      lines[index][id.length+1..-1] = value
-    else
-      lines.push("#{id}=#{value}")
-    end
-    self.conf = lines
-  end
 end
 
 module RPG

src/resource.rb

@@ -55,8 +55,7 @@ def self.list(type)
   end
   def self.path_list(type)
     magic = FileMagic.new(FileMagic::MAGIC_MIME)
-    rtp = $project.rtp
-    dirs = rtp.empty? ? [$project.dir] : [$project.dir, rtp]
+    dirs = [$project.dir] + $project.config.rtps
     resources = []
     for dir in dirs
       for file in Dir["#{dir}/#{dir(type)}/*"]