diff --git a/Gemfile.lock b/Gemfile.lock index 1230141..ec93613 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,25 +2,27 @@ GEM remote: https://rubygems.org/ specs: base64 (0.2.0) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) cyberarm_engine (0.24.4) gosu (~> 1.1) - digest-crc (0.6.5) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) event_emitter (0.2.6) - excon (1.2.3) - ffi (1.17.1-x64-mingw-ucrt) - ffi (1.17.1-x86_64-linux-gnu) + excon (1.2.5) + logger + ffi (1.17.2-x64-mingw-ucrt) + ffi (1.17.2-x86_64-linux-gnu) ffi-win32-extensions (1.0.4) ffi gosu (1.4.6) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) ircparser (1.0.0) libui (0.1.2-x64-mingw) + logger (1.7.0) mutex_m (0.3.0) rake (13.2.1) - rexml (3.4.0) + rexml (3.4.1) rubyzip (2.4.1) sdl2-bindings (0.2.3) ffi (~> 1.15) diff --git a/lib/pages/settings.rb b/lib/pages/settings.rb index e9f20d9..789cabd 100644 --- a/lib/pages/settings.rb +++ b/lib/pages/settings.rb @@ -6,8 +6,8 @@ class W3DHub stack(width: 1.0, height: 1.0, padding: 16, scroll: true) do background 0xaa_252525 - para "Language" - flow(width: 1.0, height: 0.12) do + stack(width: 1.0, fill: true) do + para "Language" para "Launcher Language", width: 0.249, margin_left: 32, margin_top: 12 stack(width: 0.75) do @language_menu = list_box items: I18n.available_locales.map { |l| expand_language_code(l.to_s) }, choose: expand_language_code(Store.settings[:language]), width: 1.0 @@ -15,8 +15,8 @@ class W3DHub end end - para "Folder Paths", margin_top: 8, padding_top: 8, border_thickness_top: 2, border_color_top: 0xee_ffffff, width: 1.0 - stack(width: 1.0, height: 0.3) do + stack(width: 1.0, height: 144) do + para "Folder Paths", margin_top: 8, padding_top: 8, border_thickness_top: 2, border_color_top: 0xee_ffffff, width: 1.0 flow(width: 1.0, height: 0.5) do para "App Install Folder", width: 0.249, margin_left: 32, margin_top: 12 @@ -26,19 +26,25 @@ class W3DHub end end - flow(width: 1.0, margin_top: 16) do + flow(width: 1.0, height: 256, margin_top: 16) do para "Package Cache Folder", width: 0.249, margin_left: 32, margin_top: 12 - stack(width: 0.75) do - @package_cache_dir_input = edit_line Store.settings[:package_cache_dir], width: 1.0 + stack(width: 0.75, height: 200) do + flow(width: 1.0, height: 1.0) do + @package_cache_dir_input = edit_line Store.settings[:package_cache_dir], fill: true + button "Browse...", width: 128, height: 1.0, tip: "Browse for game executable" do + path = W3DHub.ask_file + end + end + para "A folder which will be used to cache downloaded packages used to install games and apps" end end end if true # W3DHub.unix? - para "Wine", margin_top: 8, padding_top: 8, border_thickness_top: 2, border_color_top: 0xee_ffffff, width: 1.0 - flow(width: 1.0, height: 0.12) do + stack(width: 1.0, fill: true) do + para "Wine", margin_top: 8, padding_top: 8, border_thickness_top: 2, border_color_top: 0xee_ffffff, width: 1.0 para "Wine Command", width: 0.249, margin_left: 32, margin_top: 12 stack(width: 0.75) do @wine_command_input = edit_line Store.settings[:wine_command], width: 1.0 @@ -46,7 +52,7 @@ class W3DHub end end - flow(width: 1.0, height: 0.13, margin_top: 16) do + stack(width: 1.0, fill: true, margin_top: 16) do para "Wine Prefix", width: 0.249, margin_left: 32, margin_top: 12 stack(width: 0.75) do @wine_prefix_toggle = toggle_button checked: Store.settings[:wine_prefix] diff --git a/lib/version.rb b/lib/version.rb index d9bada3..87859ea 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -1,4 +1,4 @@ class W3DHub DIR_NAME = "W3DHubAlt" - VERSION = "0.6.1" + VERSION = "0.6.2" end \ No newline at end of file