@@ -49,5 +49,8 @@ background_color: "\"#bec0c2\"...\"#86888b\"" window_height: window_width: +# Sets the ammount of the screen that is usable +# (IE the lowest buttons can be placed to be usable) + # The language you want to use, e.g. 'it' for Italian, 'es' for Spanish. locale: 'en' conf-sample.yml @@ -11,7 +11,8 @@ class ConfigController < Shoes::Main url '/configuration/bikes', :bikes url '/configuration/upgrade', :upgrade - def config_nav + def config_setup + layout(:menu) @left.clear { left_button("Appearance") { visit '/configuration/appearance' } left_button("Skin") { visit '/configuration/skin' } @@ -23,19 +24,23 @@ class ConfigController < Shoes::Main left_button("Upgrade") { visit '/configuration/upgrade' } end } + if File.exists?(File.join(LIB_DIR,'opensprints_conf.yml')) + @prefs = YAML::load_file(File.join(LIB_DIR,'opensprints_conf.yml')) + else + @prefs = YAML::load_file('conf-sample.yml') + end end - + def appearance - layout(:menu) - config_nav + config_setup + if RUBY_PLATFORM =~ /linux/ + width,height = `xrandr | grep '*'`.split[0].split('x') + else + width,height = 1024,768 + end @header.clear { title "Appearance" } @center.clear do - if File.exists?(File.join(LIB_DIR,'opensprints_conf.yml')) - @prefs = YAML::load_file(File.join(LIB_DIR,'opensprints_conf.yml')) - else - @prefs = YAML::load_file('conf-sample.yml') - end flow(:height => @center.height-50, :width => 1.0) do container flow(:height => @center.height-150, :scroll => true) do @@ -48,33 +53,16 @@ class ConfigController < Shoes::Main end stack(:margin => 10, :padding => 0) do - stack(:margin => 0) do - inscription "Display speed in:", :margin => 0 - metric = nil; standard = nil; - flow(:margin => 0) do - standard = radio(:units){ @prefs['units'] = 'standard'} - inscription 'standard', :margin => 2 - end - flow(:margin => 0) do - metric = radio(:units){ @prefs['units'] = 'metric'} - inscription 'metric', :margin => 2 - end - if @prefs['units'] == 'metric' - metric.checked = true - else - standard.checked = true - end + inscription "usable window height (e.g. #{height.to_i - 100}):" + edit_line(@prefs['usable_window_height']) do |edit| + @prefs['usable_window_height'] = edit.text end + inscription(link("(what's this?)",:click => "http://wiki.opensprints.org/index.php?title=Usable_Screen_Height")) end end stack(:width => 0.6) do stack(:margin => 10) do - if RUBY_PLATFORM =~ /linux/ - width,height = `xrandr | grep '*'`.split[0].split('x') - else - width,height = 1024,768 - end inscription "window height (e.g. #{height.to_i - 100}):" edit_line(@prefs['window_height']) do |edit| @@ -94,16 +82,10 @@ class ConfigController < Shoes::Main end end def skin - layout(:menu) - config_nav + config_setup @header.clear { title "Skin" } @center.clear do - if File.exists?(File.join(LIB_DIR,'opensprints_conf.yml')) - @prefs = YAML::load_file(File.join(LIB_DIR,'opensprints_conf.yml')) - else - @prefs = YAML::load_file('conf-sample.yml') - end flow(:height => @center.height-50, :width => 1.0) do container flow(:height => @center.height-150, :scroll => true) do @@ -156,8 +138,7 @@ class ConfigController < Shoes::Main end def data_file - layout(:menu) - config_nav + config_setup @header.clear { title "Data" } @center.clear do container @@ -180,21 +161,14 @@ class ConfigController < Shoes::Main end def index - layout(:menu) - config_nav + config_setup @header.clear { title "Configuration" } end def bikes - layout(:menu) - config_nav + config_setup @header.clear { title "Bike Setup" } @center.clear do - if File.exists?(File.join(LIB_DIR,'opensprints_conf.yml')) - @prefs = YAML::load_file(File.join(LIB_DIR,'opensprints_conf.yml')) - else - @prefs = YAML::load_file('conf-sample.yml') - end stack(:height => @center.height-50, :width => 0.8) do container stack(:height => @center.height-150, :scroll => true) do @@ -239,16 +213,10 @@ class ConfigController < Shoes::Main end def hardware - layout(:menu) - config_nav + config_setup @header.clear { title "Hardware & Rollers" } @center.clear do - if File.exists?(File.join(LIB_DIR,'opensprints_conf.yml')) - @prefs = YAML::load_file(File.join(LIB_DIR,'opensprints_conf.yml')) - else - @prefs = YAML::load_file('conf-sample.yml') - end stack(:height => @center.height-50, :width => 0.8) do container flow(:height => @center.height-150, :scroll => true) do @@ -339,8 +307,7 @@ class ConfigController < Shoes::Main end def upgrade - layout(:menu) - config_nav + config_setup @header.clear { title "Upgrade" } @center.clear do container @@ -356,16 +323,10 @@ class ConfigController < Shoes::Main end def locale - layout(:menu) - config_nav + config_setup @header.clear { title "Appearance" } @center.clear do - if File.exists?(File.join(LIB_DIR,'opensprints_conf.yml')) - @prefs = YAML::load_file(File.join(LIB_DIR,'opensprints_conf.yml')) - else - @prefs = YAML::load_file('conf-sample.yml') - end flow(:height => @center.height-50, :width => 1.0) do container flow(:height => @center.height-150, :scroll => true) do lib/controllers/config_controller.rb @@ -57,6 +57,7 @@ else width,height = 800,600 end +USABLE_HEIGHT = options['usable_window_height'].to_i.nonzero?||nil HEIGHT = options['window_height'].to_i.nonzero?||(height.to_i-100) WIDTH = options['window_width'].to_i.nonzero?||(width.to_i-50) lib/setup.rb @@ -179,8 +179,8 @@ class Main < Shoes @nav.clear @center.clear { stack { - flow(:attach => Window, :top => (HEIGHT * 0.2).to_i, :left => (WIDTH / 2)-350) { image(logoimage) } - flow(:attach => Window, :top => (HEIGHT * 0.6).to_i, :left => (WIDTH / 2)-350) { + flow(:attach => Window, :top => (@center.height * 0.2).to_i, :left => (WIDTH / 2)-350) { image(logoimage) } + flow(:attach => Window, :top => (@center.height * 0.6).to_i, :left => (WIDTH / 2)-350) { caption(link($i18n.categories, :click => "/categories")) caption(" / ", :stroke => link_color) caption(link($i18n.events, :click => "/tournaments")) @@ -216,7 +216,7 @@ class Main < Shoes end @left = stack(:width => 150) do end - @center = flow(:width => width - (175+125), :height => HEIGHT-@header.height-150) do + @center = flow(:width => width - (175+125), :height => (USABLE_HEIGHT-@header.height-150)||(HEIGHT-@header.height-150)) do end @right = flow(:width => 150) do end opensprints.rb 74a4199078970ceae875b07ef626eac8aaaafd76 Evan Farrar evanfarrar@gmail.com http://github.com/evanfarrar/opensprints/commit/a8d1eff87626516cc7c4968ba53c6b69762211d9 a8d1eff87626516cc7c4968ba53c6b69762211d9 2009-10-10T08:47:03-07:00 2009-10-10T08:47:03-07:00 Now the interface has a "usable height" setting for your screen size that you can actually see buttons. Also, began a practice of linking contextual help to the wiki. 3762c0ed707cd7aa1fd9e148d788e2b5fa75bc86 Evan Farrar evanfarrar@gmail.com