png_rmagick_font_r8745.patch

Jun NAITOH, 2012-02-01 16:30

Download (2.01 KB)

View differences:

app/views/settings/_display.html.erb (working copy)
16 16
<p><%= setting_check_box :gravatar_enabled %></p>
17 17

  
18 18
<p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></p>
19

  
20
<p><%= setting_select :rmagick_font, Object.const_defined?(:Magick) ? Magick.fonts.collect {|t| [t.name, CGI.escape(t.name)]} : [], :blank => :label_none %></p>
19 21
</div>
20 22

  
21 23
<%= submit_tag l(:button_save) %>
config/settings.yml (working copy)
200 200
  default: 'only_my_events'
201 201
emails_header:
202 202
  default: ''
203
rmagick_font:
204
  default: ''
config/locales/en.yml (working copy)
380 380
  setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
381 381
  setting_issue_group_assignment: Allow issue assignment to groups
382 382
  setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
383
  setting_rmagick_font: RMagick font
383 384

  
384 385
  permission_add_project: Create project
385 386
  permission_add_subprojects: Create subprojects
lib/redmine/helpers/gantt.rb (working copy)
409 409
        imgl = Magick::ImageList.new
410 410
        imgl.new_image(subject_width+g_width+1, height)
411 411
        gc = Magick::Draw.new
412
        gc.font = CGI.unescape(Setting.rmagick_font) if Setting.rmagick_font != ""
412 413

  
413 414
        # Subjects
414 415
        gc.stroke('transparent')