diff --git a/lib/pages/server_browser.rb b/lib/pages/server_browser.rb index 1d31989..92f8e30 100644 --- a/lib/pages/server_browser.rb +++ b/lib/pages/server_browser.rb @@ -208,24 +208,24 @@ class W3DHub if server.status.password prompt_for_password( accept_callback: proc do |password| - join_server(game, server, password) + join_server(server, password) end ) else - join_server(game, server, nil) + join_server(server, nil) end end ) - end - - if server.status.password - prompt_for_password( - accept_callback: proc do |password| - join_server(game, server, password) - end - ) else - join_server(game, server, nil) + if server.status.password + prompt_for_password( + accept_callback: proc do |password| + join_server(server, password) + end + ) + else + join_server(server, nil) + end end end end @@ -342,11 +342,11 @@ class W3DHub ) end - def join_server(game, server, password) + def join_server(server, password) if ( (server.status.password && password.length.positive?) || !server.status.password) && - window.settings[:server_list_username].to_s.length.zero? + window.settings[:server_list_username].to_s.length.positive? window.application_manager.join_server( server.game, diff --git a/lib/theme.rb b/lib/theme.rb index c438ee9..30761c7 100644 --- a/lib/theme.rb +++ b/lib/theme.rb @@ -1,4 +1,7 @@ class W3DHub + REGULAR_FONT = "#{GAME_ROOT_PATH}/media/fonts/NotoSans-Regular.ttf" + BOLD_FONT = "#{GAME_ROOT_PATH}/media/fonts/NotoSans-Bold.ttf" + THEME = { ToolTip: { background: 0xff_dedede, @@ -8,7 +11,7 @@ class W3DHub text_shadow: false }, TextBlock: { - # font: "Inconsolata", + font: BOLD_FONT, text_border: false, text_shadow: true, text_shadow_size: 1, diff --git a/lib/window.rb b/lib/window.rb index 7e9b253..eb7cc15 100644 --- a/lib/window.rb +++ b/lib/window.rb @@ -4,7 +4,7 @@ class W3DHub attr_accessor :account, :service_status, :applications def setup - self.caption = "#{W3DHub::NAME}" + self.caption = I18n.t(:app_name) @settings = Settings.new @application_manager = ApplicationManager.new diff --git a/media/fonts/NotoSans-Bold.ttf b/media/fonts/NotoSans-Bold.ttf new file mode 100644 index 0000000..54ad879 Binary files /dev/null and b/media/fonts/NotoSans-Bold.ttf differ diff --git a/media/fonts/NotoSans-BoldItalic.ttf b/media/fonts/NotoSans-BoldItalic.ttf new file mode 100644 index 0000000..530a828 Binary files /dev/null and b/media/fonts/NotoSans-BoldItalic.ttf differ diff --git a/media/fonts/NotoSans-Italic.ttf b/media/fonts/NotoSans-Italic.ttf new file mode 100644 index 0000000..27ff1ed Binary files /dev/null and b/media/fonts/NotoSans-Italic.ttf differ diff --git a/media/fonts/NotoSans-Regular.ttf b/media/fonts/NotoSans-Regular.ttf new file mode 100644 index 0000000..10589e2 Binary files /dev/null and b/media/fonts/NotoSans-Regular.ttf differ diff --git a/media/fonts/OFL.txt b/media/fonts/OFL.txt new file mode 100644 index 0000000..d4e7958 --- /dev/null +++ b/media/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2012 Google Inc. All Rights Reserved. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.