sensible-cinema 0.28.1 → 0.34.0

data/lib/gui/dependencies.rb

@@ -0,0 +1,177 @@
+require 'java'
+
+require 'sane'
+
+module SensibleSwing
+  
+  class MainWindow < javax.swing.JFrame
+    
+	 
+    def force_accept_license_first
+      if !(LocalStorage['main_license_accepted'] == VERSION)
+        require_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html', 'Sensible Cinema license agreement', 
+            "Sensible Cinema is distributed under the gplv3 (http://www.gnu.org/licenses/gpl.html).\nBY CLICKING \"accept\" YOU SIGNIFY THAT YOU HAVE READ, UNDERSTOOD AND AGREED TO ABIDE BY THE TERMS OF THIS AGREEMENT"
+        require_blocking_license_accept_dialog 'Sensible Cinema', 'is_it_legal_to_copy_dvds.txt file', File.expand_path(File.dirname(__FILE__) + "/../../documentation/is_it_legal_to_copy_dvds.txt"), 
+            'is_it_legal_to_copy_dvds.txt file', 'I acknowledge that I have read, understand, accept and agree to abide by the implications noted in the documentation/is_it_legal_to_copy_dvds.txt file'
+        if JOptionPane.show_select_buttons_prompt("Would you like to use this with Zoom Player MAX's scene cuts [3rd party player program, costs $], or just MPlayer [free]", :yes => "ZoomPlayer MAX", :no => "Just MPlayer") == :yes
+          LocalStorage['have_zoom_button'] = true
+        end
+        LocalStorage['main_license_accepted'] = VERSION
+      end
+    end
+   
+    def self.download full_url, to_here
+      require 'open-uri'
+      require 'openssl'
+      eval("OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE") if full_url =~ /https/
+      keep_going_bg_thread = true
+	  print 'working'
+      Thread.new { while keep_going_bg_thread; print '.'; sleep 1; end}
+      writeOut = open(to_here, "wb")
+      writeOut.write(open(full_url).read)
+      writeOut.close
+      keep_going_bg_thread = false
+    end
+    
+    def self.download_to_string full_url
+       require 'tempfile'
+       to = Tempfile.new 'abc'
+       download(full_url, to.path)
+       out = File.binread(to.path)
+       to.delete
+       out
+    end
+
+
+    def download_7zip
+      Dir.mkdir('./vendor/cache') unless File.directory? 'vendor/cache' # development may not have it created yet... [?]
+      unless File.exist? 'vendor/cache/7za.exe'
+        Dir.chdir('vendor/cache') do
+          print 'downloading unzipper (7zip--400K) ...'
+          MainWindow.download("http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip", "7za920.zip")
+          system_blocking("../unzip.exe -o 7za920.zip") # -o means "overwrite" without prompting
+        end
+      end
+    end
+    
+    def download_zip_file_and_extract english_name, url, to_this
+      download_7zip
+      Dir.chdir('vendor/cache') do
+        file_name = url.split('/')[-1]
+        print "downloading #{english_name} ..."
+        MainWindow.download(url, file_name)
+        system_blocking("7za e #{file_name} -y -o#{to_this}")
+        puts 'done ' + english_name
+        # creates vendor/cache/mencoder/mencoder.exe...
+      end
+    end
+    
+    def check_for_exe windows_full_loc, unix_name
+      # in windows, that exe *at that location* must exist...
+      if OS.windows?
+        File.exist?(windows_full_loc)
+      else
+        require 'lib/check_installed_mac.rb'
+        if !CheckInstalledMac.check_for_installed(unix_name)
+          exit 1 # it'll have already displayed a message...
+        else
+          true
+        end
+      end
+    end
+	
+	def check_for_file_manipulation_dependencies
+	
+	   if !check_for_exe('vendor/cache/mencoder/mencoder.exe', 'mencoder') # both use it now, since we have to use our own mplayer.exe for now...
+        require_blocking_license_accept_dialog 'mplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer with mencoder."
+        download_zip_file_and_extract "Mplayer/mencoder (6MB)", "http://sourceforge.net/projects/mplayer-win32/files/MPlayer%20and%20MEncoder/revision%2034118/MPlayer-rtm-svn-34118.7z", "mencoder"
+        old = File.binread 'vendor/cache/mencoder/mplayer.exe'
+        old.gsub! "V:%6.1f", "V:%6.2f" # better precision! :)
+        File.binwrite('vendor/cache/mencoder/mplayer.exe', old)
+      end
+    end
+    
+    def check_for_various_dependencies
+            
+      if OS.doze? && !check_for_exe('vendor/cache/mplayer_edl/mplayer.exe', nil)
+        require_blocking_license_accept_dialog 'Mplayer-EDL', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer EDL "
+        FileUtils.mkdir_p 'vendor/cache/mplayer_edl'
+        puts 'downloading mplayer edl [10 MB]'
+        MainWindow.download('http://sourceforge.net/projects/mplayer-edl/files/mplayer.exe', 'vendor/cache/mplayer_edl/mplayer.exe')
+		config_dir = File.expand_path('~/mplayer')
+		FileUtils.mkdir(config_dir) unless File.directory?(config_dir)
+		FileUtils.cp('vendor/subfont.ttf', config_dir) # TODO mac
+      end
+
+      # runtime dependencies, at least as of today...
+      ffmpeg_exe_loc = File.expand_path('vendor/cache/ffmpeg/ffmpeg.exe') # I think file basd normal needs ffmpeg
+      if !check_for_exe(ffmpeg_exe_loc, 'ffmpeg')
+        require_blocking_license_accept_dialog 'ffmpeg', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: ffmpeg."
+        download_zip_file_and_extract "ffmpeg (5MB)", "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-git-335bbe4-win32-static.7z", "ffmpeg"
+      end
+      if OS.mac?
+        check_for_exe("mplayer", "mplayer") # mencoder and mplayer are separate for mac... [this checks for mac's mplayerx, too]
+      else      
+        path = RubyWhich.new.which('smplayer')
+        if(path.length == 0)
+          # this one has its own installer...
+		      require_blocking_license_accept_dialog 'Smplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: smplayer."
+     		  save_to_dir = SwingHelpers.new_existing_dir_chooser_and_go 'pick dir to save smplayer exe installer to:'
+		      save_to_file =  "#{save_to_dir}/smplayer-0.6.9-win32.exe"
+    		  puts "downloading smplayer.exe [14MB] to #{save_to_file}"
+          MainWindow.download "http://sourceforge.net/projects/smplayer/files/SMPlayer/0.6.9/smplayer-0.6.9-win32.exe", save_to_file
+		      show_blocking_message_dialog "Run this file to install it (ok to reveal): smplayer-0.6.9-win32.exe"
+    		  show_in_explorer save_to_file
+          sleep 2
+		      show_blocking_message_dialog "hit ok after smplayer is installed:"
+        end
+      end
+    end
+    
+    def assert_ownership_dialog 
+      message = "Do you certify you own the DVD this came of and have it in your possession, if it came from a DVD?"
+      title = "Verify ownership"
+      returned = JOptionPane.show_select_buttons_prompt(message, {:yes => "no", :no => "yes"})
+      assert_confirmed_dialog returned, nil
+    end
+  
+    def require_blocking_license_accept_dialog program, license_name, license_url_should_also_be_embedded_by_you_in_message, 
+      title = 'Confirm Acceptance of License Agreement', message = nil
+      puts 'Please confirm license agreement in open window before proceeding.'
+      
+      message ||= "Sensible Cinema requires a separately installed program (#{program}), not yet installed.
+        You can install this program manually to the vendor/cache subdirectory, or Sensible Cinema can download it for you.
+        By clicking accept, below, you are confirming that you have read and agree to be bound by the
+        terms of its license (the #{license_name}), located at #{license_url_should_also_be_embedded_by_you_in_message}.  
+        Click 'View License' to view it.  If you do not agree to these terms, click 'Cancel'.  You also agree that this is a 
+        separate program, with its own distribution, license, ownership and copyright.  
+        You agree that you are responsible for the download and use of this program, within sensible cinema or otherwise."
+      answer = JOptionPane.show_select_buttons_prompt message, :no => "I have read and Accept the terms of the #{license_name} License Agreement.", :yes => "View #{license_name}"
+      assert_confirmed_dialog answer, license_url_should_also_be_embedded_by_you_in_message
+      p 'confirmation of sensible cinema related license duly noted of: ' + license_name # LODO require all licenses together :P
+    end
+    
+    def assert_confirmed_dialog returned, license_url_should_also_be_embedded_by_you_in_message
+      # :yes is "view license", :no is "accept", :cancel
+      if returned == :yes
+        if license_url_should_also_be_embedded_by_you_in_message
+          SwingHelpers.open_url_to_view_it_non_blocking license_url_should_also_be_embedded_by_you_in_message
+          puts "Please restart after reading license agreement, to be able to then accept it."
+        else
+          puts 'dialog assertion failed'
+        end
+        System.exit 0
+      elsif returned == :cancel
+        p 'license not accepted...exiting'
+        System.exit 1
+      elsif returned == :exited
+        p 'license exited early...exiting'
+        System.exit 1
+      elsif returned == :no
+        # ok
+      else
+        raise 'unknown?'
+      end
+    end
+  end
+end

data/lib/gui/normal.rb

@@ -0,0 +1,190 @@
+#!/usr/bin/ruby # so my editor will like the file...
+=begin
+Copyright 2010, Roger Pack 
+This file is part of Sensible Cinema.
+
+    Sensible Cinema 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.
+
+    Sensible Cinema 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 Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module SensibleSwing
+  
+  class MainWindow < JFrame
+
+    attr_accessor :parent, :upconv_line
+   
+    # converts to full path, 8.3 if on doze
+    def normalize_path path
+      path = File.expand_path path
+      path = EightThree.convert_path_to_8_3 path if OS.doze?
+    end
+    def hard_exit; java::lang::System.exit 0; end
+    def setup_normal_buttons
+      add_text_line ""
+  
+      @mplayer_edl = new_jbutton( watch_edited_text="Watch currently mounted DVD edited (realtime)" )
+      @mplayer_edl.tool_tip = "This will watch your DVD in realtime from your computer while skipping/muting questionable scenes."
+      @mplayer_edl.on_clicked {
+        play_smplayer_edl_non_blocking
+		sleep 5
+		puts 'enjoy your movie playing in other window'
+        sleep 1
+		hard_exit # paranoid on usage LOL
+      }
+      
+      add_callback_for_dvd_edl_present { |disk_available, edl_available|
+        b = @mplayer_edl
+	    if disk_available
+			if edl_available
+			  b.enable
+			  b.text=watch_edited_text
+			else
+			  b.enable # leave it enabled in case it's some nonstandard form of a disk that does have one [?]
+			  b.text= watch_edited_text + "  [disk has no Edit List Available!]" 
+			end
+		else
+		  @mplayer_edl.disable
+		  @mplayer_edl.text=watch_edited_text + " [no disk presently inserted]"
+		end
+      }
+      
+      @watch_file_edl = new_jbutton( "Watch movie file edited (realtime)" ) do
+        choose_file_and_edl_and_create_sxs_or_play false
+      end
+      
+      @create = new_jbutton( "Create edited version of a file on Your Hard Drive" )
+      @create.tool_tip = <<-EOL
+        This takes a file and creates a new file on your hard disk like dvd_name_edited.mpg that you can watch when it's done.
+        The file you create will contain the whole movie edited.
+        It takes quite awhile maybe 2 hours.  Sometimes the progress bar will look paused--it typically continues eventually.
+      EOL
+      @create.on_clicked {
+	    check_for_file_manipulation_dependencies
+        do_create_edited_copy_via_file false
+      }
+      
+      if LocalStorage[UpConvertEnglish] # LODO no tight coupling like this
+        add_text_line ''
+        add_open_documentation_button
+        @upconv_line = add_text_line "    #{get_current_upconvert_as_phrase}"
+      else
+        @upconv_line = add_text_line ''
+        add_open_documentation_button
+      end
+      
+      @show_upconvert_options = new_jbutton("Tweak Preferences [timing, upconversion]") do
+        get_set_preference 'mplayer_beginning_buffer', "How much extra \"buffer\" time to add at the beginning of all cuts/mutes in normal mode [for added safety sake]."
+        show_blocking_message_dialog "You will now be able to set some upconversion options, which makes the playback look nicer but uses more cpu [if desired].\nClose the window when finished."
+        upconvert_window = new_child_window
+        upconvert_window.add_change_upconvert_buttons
+      end
+      @show_upconvert_options.tool_tip= "Allows you to set your upconvert options.\nUpconverting attempts to playback your movie with higher quality on high resolution monitors."
+      
+	  new_jbutton("Create new Edit Decision List") do
+	    window = new_child_window
+        window.setup_advanced_buttons
+	  end
+	  
+      @progress_bar = JProgressBar.new(0, 100)
+      @progress_bar.set_bounds(44,@starting_button_y,@button_width,23)
+      @progress_bar.visible = false
+      @panel.add @progress_bar 
+      add_text_line ""# spacing
+    end
+    
+    def get_set_preference name, english_name
+      old_preference = LocalStorage[name]
+      old_class = old_preference.class
+      new_preference = get_user_input("Enter value for #{english_name}", old_preference)
+      display_and_raise 'enter something like 0.0' if new_preference.empty?
+      if old_class == Float
+        new_preference = new_preference.to_f
+      elsif old_class == String
+        # leave same
+      else
+        raise 'unknown type?' + old_class.to_s
+      end
+      LocalStorage[name] = new_preference
+    end
+    
+    def add_open_documentation_button
+      @open_help_file = new_jbutton("View Sensible Cinema Documentation") do
+        show_in_explorer __DIR__ + "/../../documentation"
+      end
+    end
+    
+    # side by side stuff we haven't really factored out yet, also doubles for both normal/create LODO
+    def choose_file_and_edl_and_create_sxs_or_play just_create_dot_edl_file_instead_of_play
+      filename_mpg = new_existing_file_selector_and_select_file( "Pick moviefile (like moviename.mpg or video_ts/anything.ext)")
+      edl_filename = new_existing_file_selector_and_select_file( "Pick an EDL file to use with it", EdlParser::EDL_DIR)
+      assert_ownership_dialog
+      if just_create_dot_edl_file_instead_of_play
+        descriptors = EdlParser.parse_file edl_filename
+        # LODO these timings...DRY up...plus is XBMC the same? what about on a slower computer?
+        # NB these are just for the Side by side EDL's!
+        
+        edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end = MplayerEndBuffer, MplayerBeginingBuffer, splits = []
+        output_file = filename_mpg.gsub(/\.[^\.]+$/, '') + '.edl' # sanitize...
+        File.write(output_file, edl_contents)
+        raise unless File.exist?(output_file) # sanity
+        show_blocking_message_dialog("created #{output_file}")
+      else
+        play_smplayer_edl_non_blocking [filename_mpg, edl_filename]
+      end
+    end
+    
+    def we_are_in_upconvert_mode
+       ARGV.index("--upconvert-mode")
+    end
+    
+    def setup_default_buttons
+      if we_are_in_upconvert_mode
+        add_play_upconvert_buttons
+      else
+        if we_are_in_create_mode
+          setup_advanced_buttons
+          add_text_line 'Contact:'
+        else
+          setup_normal_buttons
+        end
+      
+        @upload = new_jbutton("Feedback/submissions welcome!") # keeps this one last! :)
+        @upload.tool_tip = "We welcome all feedback!\nQuestion, comments, request help.\nAlso if you create a new EDL, please submit it back to us so that others can benefit from it later!"
+        @upload.on_clicked {
+		  show_blocking_message_dialog "ok, will open up the groups page now and optionally an email to it"
+          system_non_blocking("start mailto:sensible-cinema@googlegroups.com")
+          system_non_blocking("start http://groups.google.com/group/sensible-cinema")
+        }
+        increment_button_location
+
+      end # big else
+      
+      @exit = new_jbutton("Exit", "Exits the application and kills any background processes that are running at all--don't exit unless you are done processing all the way!")
+      @exit.on_clicked {
+        Thread.new { self.close } # don't waste the time to close it :P
+        puts 'Thank you for using Sensible Cinema. Come again!'
+        System.exit 0
+      }
+
+      increment_button_location
+      increment_button_location
+      self
+
+    end
+    def get_disk_chooser_window names
+      DropDownSelector.new(self, names, "Click to select DVD drive")
+    end
+    
+  end
+end
+

data/lib/gui/{sensible-cinema-upconvert.rb → upconvert.rb}

@@ -8,18 +8,28 @@ module SensibleSwing
       @watch_file_upconvert = new_jbutton( "Watch a movie file upconverted (unedited)") do
         popup = warn_if_no_upconvert_options_currently_selected
         filename_mpg = new_existing_file_selector_and_select_file( "pick movie file (like moviename.mpg)")
-        thread = play_mplayer_edl_non_blocking [filename_mpg, nil]
+        thread = play_smplayer_edl_non_blocking [filename_mpg, nil]
         when_thread_done(thread) { popup.dispose }
       end
       @watch_file_upconvert.tool_tip= "This plays back a movie file, like moviefile.mpg, or moviename.vob using your current upconverter settings.\nTo playback a file edited upconverted, set upconvert options here first, then run them using sensible cinema main--it will automatically use your new upconverting options.\n" # LODO
       
       @watch_dvd_upconvert = new_jbutton( "Watch a DVD upconverted (unedited)") do
         popup = warn_if_no_upconvert_options_currently_selected
-        thread = play_dvd_smplayer_unedited false, false, false
+        thread = play_dvd_smplayer_unedited false
         when_thread_done(thread) { popup.dispose }
       end
       @watch_dvd_upconvert.tool_tip = "Plays back the currently inserted DVD, using your current upconverter settings.\nIf it fails (dies immediately, blank screen, etc.), try setting upconvert options to a smaller screen resolution multiple.\nOr try playing the DVD with VLC first, then it might work.\nTo playback a DVD edited upconverted, set upconvert options here first, then run them using sensible cinema main--it will automatically use your new upconverting options."
       
+      @watch_online = new_jbutton( "Watch upconverted online player, like netflix instant") do
+        show_blocking_message_dialog("sorry not mac compat. yet") and raise unless OS.doze?
+        answer = JOptionPane.show_select_buttons_prompt("Warning: you must have the screen capture device installed (install MSVC 2010 runtime x86 first), and also configured using its setup utility, and avisynth installed.", :yes => 'take me to its website', :no => 'I already and configured it, let me at it!')
+        if answer == :yes
+           SwingHelpers.open_url_to_view_it_non_blocking "https://github.com/rdp/screen-capture-recorder-to-video-windows-free"
+           raise 'install it'
+        end
+        run_smplayer_non_blocking "upconvert_from_screen/upconvert_from_screen_me2.avs", nil, '', force_mplayer = true, true, false, nil
+      end
+      
       add_text_line ''
       @upconv_line = add_text_line ''
       change_upconvert_line_to_current
@@ -37,10 +47,10 @@ module SensibleSwing
       LocalStorage[UpConvertEnglish].present?
     end
     
-    LocalStorage.set_default('screen_multiples', 2.0)
+    LocalStorage.set_default('screen_multiples', 1.0)
 
     def add_change_upconvert_options_button
-      @show_upconvert_options = new_jbutton("Change/Test Playback Upconversion Quality Options") do
+      @show_upconvert_options = new_jbutton("Tweak Playback Upconversion Quality Settings") do
         upconvert_window = new_child_window
         upconvert_window.add_change_upconvert_buttons
       end
@@ -92,18 +102,26 @@ module SensibleSwing
         display_current_upconvert_setting_and_close_window
         # -Processing method: mplayer with accurate deblocking ???
       }
-      new_jbutton("Set upconvert options to experimental style playback") {
-        LocalStorage[UpConvertKey] = "scale" # hqdn3d=7:7:5,scale=SCREEN_X:-10:0:0:10"
-        LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=100.0 -ssf cs=75.0"
-        LocalStorage[UpConvertEnglish] = "experimental"
+      new_jbutton("Set upconvert options to experimental screen-upconverting playback") {
+        LocalStorage[UpConvertKey] = "scale=SCREEN_X:-10:0:0:3" # no hqdn3d
+        LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=75.0 -ssf cs=25.0"
+        LocalStorage[UpConvertEnglish] = "experimental screenupconversion"
         display_current_upconvert_setting_and_close_window
       }
       
+      new_jbutton("Set upconvert options to whatever you want [like -sws 9 -ssf ls=100.0 -- for advanced users]") {
+        new_settings = get_user_input("you can set -vf settings, and then other settings. What would you like your -vf settings to be?")
+        LocalStorage[UpConvertKey] = new_settings
+        other_settings = get_user_input("other settings you'd like to also have add:")
+        LocalStorage[UpConvertKeyExtra] = other_settings
+        LocalStorage[UpConvertEnglish] = "personalized: -vf #{new_settings}, #{other_settings}"      
+      }
+      
       # TODO tooltip from docu here +- this into tooltip
       # TODO "click here" link for more docu [?]
       add_text_line "Multiple factor screen widths"
-      add_text_line "   (higher is better, but uses more cpu, 2x is good for high-end)." 
-      add_text_line "   If mplayer just dies or displays only a black or white screen then lower this setting."
+      add_text_line "   (higher might be better, uses more cpu)." 
+      add_text_line "   If mplayer just dies or displays only a black or white screen then lower this setting, it is too high."
       slider = JSlider.new
       slider.setBorder(BorderFactory.createTitledBorder("Screen resolution multiple"));
   
@@ -175,7 +193,7 @@ module SensibleSwing
         output_dir = get_same_drive_friendly_clean_temp_dir 'temp_upscaled_video_out'
         output_command = '-ss 2:44 -frames 300 -vo png:outdir="' + File.strip_drive_windows(output_dir) + '"'
         output_command += " -noframedrop" # don't want them to skip frames on cpu's without enough power to keep up
-        thread = play_mplayer_edl_non_blocking [filename_mpg, nil], [output_command], true
+        thread = play_smplayer_edl_non_blocking [filename_mpg, nil], [output_command], true
         when_thread_done(thread) { popup.dispose; show_in_explorer(output_dir) }
       end
       @generate_images.tool_tip = "This creates a folder with images upconverted from some DVD or file, so you can tweak settings and compare." # TODO more tooltips
@@ -184,7 +202,7 @@ module SensibleSwing
         popup = warn_if_no_upconvert_options_currently_selected
         filename_mpg = new_existing_file_selector_and_select_file( "pick movie file (like moviename.mpg)")
         output_dir = get_same_drive_friendly_clean_temp_dir 'temp_screencast_dir'
-        thread1 = play_mplayer_edl_non_blocking [filename_mpg, nil], [" -ss 2:44 -endpos 11"]
+        thread1 = play_smplayer_edl_non_blocking [filename_mpg, nil], [" -ss 2:44 -endpos 11"]
         # screen capture for 10s
         fps_to_grab = 5
         thread2 = Thread.new {  c = %!ffmpeg -f dshow -i video="screen-capture-recorder" -r #{fps_to_grab} -vframes #{fps_to_grab*10} -y #{File.strip_drive_windows(output_dir)}/%d.png!; system_blocking c }
@@ -220,7 +238,7 @@ module SensibleSwing
       out = "Upconvert options are now #{  settings ? "set to #{settings} style" : "NOT SET"}"
       if settings
         multiple = LocalStorage[ScreenMultipleFactor]
-        out += " (screen multiplier #{get_current_max_width_resolution}*#{multiple} = #{(multiple * get_current_max_width_resolution).to_i}px)."
+        out += " (screen multiplier #{multiple}*#{get_current_max_width_resolution} = #{(multiple * get_current_max_width_resolution).to_i}px)."
       end
       out
     end
@@ -236,6 +254,7 @@ module SensibleSwing
         screen_multiple = LocalStorage[ScreenMultipleFactor]
         upc = template.gsub('SCREEN_X', (get_current_max_width_resolution*screen_multiple).to_i.to_s) # has to be an integer...
         upc = 'pullup,softskip,' + upc
+        show_non_blocking_message_dialog 'using upconvert settings ' + upc
         p 'using upconvert settings: ' + upc
         upc
       else
@@ -251,4 +270,4 @@ module SensibleSwing
  
   end
 end
-    
+