screencaster-gtk 0.0.7.alpha1 → 0.0.8.alpha1

data/MPL2.0

@@ -0,0 +1,374 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
+

data/lib/screencaster-gtk.rb

@@ -1,9 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 require 'gtk2'
 require 'logger'
 require 'fileutils'
 require 'getoptlong'
 require "screencaster-gtk/capture"
 require "screencaster-gtk/savefile"
+require "screencaster-gtk/dbus_app.rb"
+require "screencaster-gtk/version"
 
 ##########################
 
@@ -37,8 +44,8 @@ class ScreencasterGtk
   QUIT_IMAGE = Gtk::Image.new(Gtk::Stock::QUIT, Gtk::IconSize::SMALL_TOOLBAR)
 
   public
-    def self.logger
-  @@logger
+  def self.logger
+    @@logger
   end
   
   def self.logger=(log_file)
@@ -47,7 +54,7 @@ class ScreencasterGtk
       
 
   def initialize
-    #### Create Main Window
+    ###### Create Main Window ######
     
     @@logger.info "Started"
     
@@ -72,18 +79,30 @@ class ScreencasterGtk
    
     control_bar = Gtk::HBox.new(false, ScreencasterGtk::DEFAULT_SPACE)
     
-    @select_button = add_button("Select Window", control_bar) { self.select }
-    @record_pause_button = add_button(RECORD_IMAGE, control_bar) { self.record_pause }
-    @stop_button = add_button(STOP_IMAGE, control_bar) { self.stop_recording }
-    @cancel_button = add_button(CANCEL_IMAGE, control_bar) { self.stop_encoding }
+    @select_button = add_button("Select Window", 
+      control_bar, 
+      "Select a window from which to record video") { self.select }
+    @record_pause_button = add_button(RECORD_IMAGE, 
+      control_bar,
+      "Record") { self.record_pause }
+    @stop_button = add_button(STOP_IMAGE, 
+      control_bar,
+      "Stop recording and save video") { self.stop_recording }
+    @cancel_button = add_button(CANCEL_IMAGE, 
+      control_bar,
+      "Cancel saving") { self.stop_encoding }
     if File.executable? SOUND_SETTINGS
       # There appears to be no stock icon for someting like a volume control.
       #@sound_settings_button.image = AUDIO_VOLUME_MEDIUM
-      @sound_settings_button = add_button("Sound", control_bar, true) {
+      @sound_settings_button = add_button("Sound", 
+        control_bar, 
+        "Show the sound input/output controls", 
+        true) {
         Thread.new { `#{SOUND_SETTINGS} sound` }
       }
     end
-    add_button(QUIT_IMAGE, control_bar, true) { self.quit }
+    add_button("About", control_bar, "", true) { about }
+    add_button(QUIT_IMAGE, control_bar, "Quit the program", true) { self.quit }
     
     columns = Gtk::HBox.new(false, ScreencasterGtk::DEFAULT_SPACE)
     @progress_bar = Gtk::ProgressBar.new
@@ -99,9 +118,9 @@ class ScreencasterGtk
     
     @window.add(the_box)
 
-    ##### Done Creating Main Window
+    ###### Done Creating Main Window ######
     
-    #### Pop up menu on right click
+    ###### Pop up menu on right click ######
     group = Gtk::AccelGroup.new
     
     @select = Gtk::ImageMenuItem.new("Select Window")
@@ -147,14 +166,14 @@ class ScreencasterGtk
     
     @menu.show_all
 
-    #### Done Menus
+    ###### Done Menus ######
     
-    #### Attach accelerators to window
+    ###### Attach accelerators to window ######
     #root = Gdk::Window.default_root_window
     @window.add_accel_group(group)
   end
   
-  #### Status Icon
+  ###### Status Icon ######
   def status_icon
     return @status_icon unless @status_icon.nil?
     
@@ -171,7 +190,7 @@ class ScreencasterGtk
     @status_icon
   end
   
-  #### Done Status Icon
+  ###### Done Status Icon ######
   
   def quit
     if @capture_window.nil? ||
@@ -193,7 +212,7 @@ class ScreencasterGtk
     @@logger.debug "Selecting Window"
     @capture_window = Capture.new
     @capture_window.get_window_to_capture
-    @record_pause_button.sensitive = true
+    record_pause_button_set_record(true)
   end
   
   protected
@@ -276,7 +295,6 @@ ensure that the user doesn't get another
 message about the same condition.
 =end
   def check_background
-    # TODO: Partially implemented so far
     return true if @background.nil? 
     return true if @background.status
     if ! background_exitstatus
@@ -316,63 +334,56 @@ message about the same condition.
     end
   end
   
+  public
   def toggle_recording
     @@logger.debug "Toggle recording"
     return if @capture_window.nil?
     case @capture_window.state
     when :recording
       pause
-    when :paused
+    when :paused, :stopped
       record
     when :encoding
       stop_encoding
-    when :stopped
-      # Do nothing
     else
       @@logger.error "#{__FILE__} #{__LINE__}: Can't happen (state #{@capture_window.state})."
     end
   end
   
-  ##### Methods to set sensitivity of controls
-  
+  ###### Methods to set sensitivity of controls ######
+  protected
   def recording
     self.status_icon.stock = Gtk::Stock::MEDIA_PAUSE
-    @record_pause_button.image = PAUSE_IMAGE
+    record_pause_button_set_pause
     @select.sensitive = @select_button.sensitive = false
-    @record_pause_button.sensitive = true
 #    @pause.sensitive = @pause_button.sensitive = true
     @stop.sensitive = @stop_button.sensitive = true
-    @record.sensitive = false
     @cancel_button.sensitive = false
   end
   
   def not_recording
     self.status_icon.stock = Gtk::Stock::MEDIA_RECORD
-    @record_pause_button.image = RECORD_IMAGE
+    record_pause_button_set_record
     @select.sensitive = @select_button.sensitive = true
 #    @pause.sensitive = @pause_button.sensitive = false
     @stop.sensitive = @stop_button.sensitive = false
-    @record.sensitive = @record_pause_button.sensitive = ! @capture_window.nil?
     @cancel_button.sensitive = false
   end
   
   def paused
     self.status_icon.stock = Gtk::Stock::MEDIA_RECORD
-    @record_pause_button.image = RECORD_IMAGE
-    @record_pause_button.sensitive = true
+    record_pause_button_set_record
     @select.sensitive = @select_button.sensitive = false
 #    @pause.sensitive = @pause_button.sensitive = false
     @stop.sensitive = @stop_button.sensitive = true
-    @record.sensitive = ! @capture_window.nil?
     @cancel_button.sensitive = true
   end
   
   def encoding
     self.status_icon.stock = Gtk::Stock::MEDIA_STOP
-    @record_pause_button.image = RECORD_IMAGE
+    record_pause_button_set_record(false)
 #    @pause.sensitive = @pause_button.sensitive = false
     @stop.sensitive = @stop_button.sensitive = false
-    @record.sensitive = @record_pause_button.sensitive = false
     @cancel_button.sensitive = true
   end
   
@@ -380,6 +391,21 @@ message about the same condition.
     not_recording
   end
   
+  def record_pause_button_set_pause
+    @record_pause_button.image = PAUSE_IMAGE
+    @record_pause_button.tooltip_text = "Pause"
+    @record_pause_button.sensitive = true
+    @record.sensitive = false
+    @pause.sensitive = true
+  end
+  
+  def record_pause_button_set_record(sensitivity = ! @capture_window.nil?)
+    @record_pause_button.image = RECORD_IMAGE
+    @record_pause_button.tooltip_text = "Record"
+    @record.sensitive = @record_pause_button.sensitive = sensitivity
+    @pause.sensitive = @capture_window.nil? ? false: ! sensitivity
+  end
+  
   def show_all
     @show_hide.label = "Hide"
     @show_hide_state = :show
@@ -429,77 +455,43 @@ message about the same condition.
   end
   
   # Process command line arguments, set up the log file, and set up hot keys.
-  #
-  # * If there's another instance running for the user and the --pause or --start 
-  #   flags are present, send the USR1 signal to the running instance and exit.
-  # * Don't run the program if there's another instance running for the user.
-  # * If there's no other instance running for the user, and the --pause or --start 
-  #   flags are not present, start normally.
   # *   The default hot key is Ctrl+Alt+S.
   def set_up
-    
-    output_file = "/home/reid/test-key.log"
-    
-    @@logger.debug("pid_file is #{PIDFILE}")
-    
-    if File.exists? PIDFILE
-      begin
-        f = File.new(PIDFILE)
-        @@logger.debug("Opened PIDFILE")
-        existing_pid = f.gets
-        existing_pid = existing_pid.to_i
-        f.close
-        @@logger.debug("existing_pid = #{existing_pid.to_s}")
-      rescue StandardError
-        @@logger.error("File to read #{PIDFILE}")
-        exit 1
-      end
-    else
-      existing_pid = nil
-    end
-    
     opts = GetoptLong.new(
-      [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
-      [ '--pause', GetoptLong::NO_ARGUMENT ],
-      [ '--start', GetoptLong::NO_ARGUMENT ]
+      [ '--help', '-h', GetoptLong::NO_ARGUMENT ]
     )
     
     opts.each do |opt, arg|
       case opt
-        when '--help'
+      when '--help'
           puts <<-EOF
 screencaster [OPTION] ... 
 
 -h, --help:
    show help
-
--s, -p, --start, --pause:
-  Pause a running capture, or restart a paused capture
           EOF
           exit 0
-        when '--pause', '--start'
-          if existing_pid then
-            @@logger.debug("Got a pause for PID #{existing_pid}")
-            begin
-              Process.kill "USR1", existing_pid
-              exit 0
-            rescue SystemCallError
-              @@logger.info("Got a pause but PID #{existing_pid} didn't exist")
-              exit 1
-            end
-          else
-            @@logger.info("Got a pause but no PID")
-            exit 1
-          end 
       end
     end
     
-    # TODO: Check for running process and if not, ignore PIDFILE.
-    unless existing_pid.nil?
-      error_dialog_tell_about_log("Can't run two instances at once.")
-      exit 1 
+    ###### If already running, bring to front ######
+    
+    @dbus_app = DBusApp.new("ca.jadesystems.screencaster", 
+      "/ca/jadesystems/screencaster", 
+      "ca.jadesystems.screencaster",
+      self,
+      @window)
+    
+    if @dbus_app.application_exists?
+      @@logger.debug("Already running. Bringing window to front")
+      @dbus_app.bring_to_front
+      exit 0
+    else # get ready to receive DBus messages
+      @@logger.debug("Own the DBus service. Prep it")
+      @dbus_app.glibize
+      @dbus_app.object
     end
-    
+
     # Add application properties for PulseAudio
     # See: http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/Developer/Clients/ApplicationProperties/
     # Unfortunately, this doesn't seem to help
@@ -508,46 +500,18 @@ screencaster [OPTION] ...
     Gtk::Window.default_icon_name = "screencaster"
     GLib::setenv("PULSE_PROP_media.role", "video")
 
-    @chain = Signal.trap("EXIT") { 
-      @@logger.debug "In ScreencasterGtk exit handler @chain: #{@chain}"
-      @@logger.debug("Exiting")
-      @@logger.debug("unlinking") if File.file?(PIDFILE)
-      File.unlink(PIDFILE) if File.file?(PIDFILE)
-      `gconftool-2 --unset /apps/metacity/keybinding_commands/screencaster_pause`
-      `gconftool-2 --unset /apps/metacity/global_keybindings/run_screencaster_pause`
-      @@logger.debug "About to call next trap with @chain: #{@chain}"
-      @chain.call unless @chain.nil?
-    }
-    @@logger.debug "ScreencasterGtk.whatever @chain: #{@chain}"
-
-    `gconftool-2 --set /apps/metacity/keybinding_commands/screencaster_pause --type string "screencaster --pause"`
-    `gconftool-2 --set /apps/metacity/global_keybindings/run_screencaster_pause --type string "<Control><Alt>S"`
+    set_up_keybindings
 
-    begin
-      FileUtils.mkpath(File.dirname(PIDFILE))
-      f = File.new(PIDFILE, "w")
-      f.puts(Process.pid.to_s)
-      f.close
-      @@logger.debug("Wrote PID #{Process.pid}")
-    rescue StandardError
-      @@logger.error("Failed to write #{PIDFILE}")
-      exit 1
-    end
-    
-    Signal.trap("USR1") { 
-      @@logger.debug("Pause/Resume") 
-      self.toggle_recording
-    }
-    
     $logger = @@logger # TODO: Fix logging
   end
   
   # Helper functions
   private
-  def add_button(label, box, sensitive = false, &callback)
+  def add_button(label, box, tooltip, sensitive = false, &callback)
     b = Gtk::Button.new
     b.image = label if label.is_a? Gtk::Image
     b.label = label if label.is_a? String
+    b.tooltip_text = tooltip
     b.sensitive = sensitive
     b.signal_connect("clicked") { callback.call }
     box.pack_start(b, true, false)
@@ -575,6 +539,54 @@ screencaster [OPTION] ...
     d.run
     d.destroy
   end
+  
+  def about
+    about = Gtk::AboutDialog.new
+    about.version = VERSION
+    about.website = HOMEPAGE
+    about.authors = AUTHORS
+    about.copyright = COPYRIGHT
+    
+    begin
+      about.license = IO.read(File.join(File.dirname(__FILE__), "../MPL2.0"))
+    rescue SystemCallError
+      @@logger.warn("Try 'gem uninstall screencaster-gtk; gem install screencaster-gtk' (#{$!})")
+      about.license = LICENSE
+    end
+
+    #about.show
+    about.run
+    about.destroy
+  end
+  
+  ###### Set up keybindings ######
+  #require 'gconf2'
+  
+  def set_up_keybindings
+    command = "command_1"
+    wm = "/apps/metacity"
+    keybinding_commands = "#{wm}/keybinding_commands/#{command}"
+    global_keybindings = "#{wm}/global_keybindings/run_#{command}"
+    
+    #client = GConf::Client.new
+      
+    @chain = Signal.trap("EXIT") { 
+      @@logger.debug "In ScreencasterGtk exit handler @chain: #{@chain}"
+      `gconftool-2 --unset #{keybinding_commands}`
+      `gconftool-2 --unset #{global_keybindings}`
+      # client[keybinding_commands] = nil
+      # client[global_keybindings] = nil
+      @@logger.debug "About to call next trap with @chain: #{@chain}"
+      @chain.call unless @chain.nil?
+    }
+    @@logger.debug "ScreencasterGtk after setting @chain: #{@chain}"
+
+    pause_command = "dbus-send --dest=#{@dbus_app.service_name} --type=method_call #{@dbus_app.object_name} #{@dbus_app.interface_name}.pause_record"
+    `gconftool-2 --set #{keybinding_commands} --type string "#{pause_command}"`
+    `gconftool-2 --set #{global_keybindings} --type string "<Control><Alt>S"`
+    # client.unset(keybinding_commands) = pause_command
+    # client.unset(global_keybindings) = "<Control><Alt>S"
+  end
 end
 
 #puts "Loaded #{__FILE__}"

data/lib/screencaster-gtk/capture.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 require 'open3'
 require 'logger'
 require "screencaster-gtk/progresstracker"

data/lib/screencaster-gtk/dbus_app.rb

@@ -0,0 +1,61 @@
+require 'dbus'
+require 'screencaster-gtk/screencaster_dbus_object'
+
+class DBusApp
+  # Make the attribute accessible so we can observe how it works.
+  attr_reader :service_name, :object_name, :interface_name
+  
+  def initialize(service, object, interface, app, window)
+    @service_name = service
+    @object_name = object
+    @interface_name = interface
+    @app = app
+    @window = window
+  end
+  
+  def bus
+    return @bus if @bus
+    @bus = DBus::SessionBus.instance
+  end
+  
+  def service
+    return @service if @service
+    if application_exists? 
+      #puts "Service already defined"
+      @service = bus.service(@service_name) 
+    else 
+      @service = bus.request_service(@service_name) 
+    end
+    @service
+  end
+
+  def object
+    return @exported if @exported
+    @exported = ScreencasterDBusObject.new(@object_name, @app, @window)
+    service.export(@exported)
+    @exported
+  end
+  
+  def interface
+    object[@interface_name]
+  end
+  
+  # Check if the service exists
+  def application_exists?
+    bus.service(@service_name).exists?
+  end
+  
+  # Bring the existing window to the front by sending the 'present' message
+  # to the running application
+  def bring_to_front
+    o = service.object(@object_name)
+    o.introspect
+    o[@interface_name].present
+  end
+  
+  def glibize
+    bus.glibize unless @glibized
+    @glibized = true
+  end
+end
+

data/lib/screencaster-gtk/progresstracker.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 module ProgressTracker
   attr_writer :start_time, :total_amount
   

data/lib/screencaster-gtk/savefile.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 require 'gtk2'
 
 =begin rdoc

data/lib/screencaster-gtk/screencaster_dbus_object.rb

@@ -0,0 +1,22 @@
+require 'dbus'
+
+class ScreencasterDBusObject < DBus::Object
+  def initialize(object_name, app, window)
+    super(object_name)
+    @app = app
+    @window = window
+  end
+
+  dbus_interface "ca.jadesystems.screencaster" do
+    dbus_method :pause_record do 
+      #puts "Pause/Record."
+      #puts @app.inspect
+      @app.toggle_recording
+    end
+    dbus_method :present do
+      #puts "Present."
+      @window.present
+    end
+    dbus_signal :paused do end
+  end
+end

data/lib/screencaster-gtk/version.rb

@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
+class ScreencasterGtk
+  VERSION = '0.0.8.alpha1'
+  AUTHORS = ["Larry Reid"]
+  EMAIL = 'screencaster@jadesystems.ca'
+  HOMEPAGE = 'http://github.org/lcreid/screencaster'
+  LICENSE = 'http://www.mozilla.org/MPL/2.0/index.txt'
+  COPYRIGHT = 'Copyright (c) Jade Systems Inc. 2013, 2014'
+end

data/test/capture.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 # Redefine some methods in Capture for testing purposes.
 
 class Capture

data/test/screencaster-gtk.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 class ScreencasterGtk  
   def stop_recording
     @@logger.debug "Stopped in test stub"

data/test/test_capture.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 require 'test/unit'
 require 'screencaster-gtk/capture'
 require 'logger'
@@ -14,8 +19,7 @@ class TestCapture < Test::Unit::TestCase
   def test_merge_two_files
     output = file_name("c-from-two.mkv")
     File.delete(output) if File.exists?(output)
-    input = [ file_name("a.mkv"), file_name("b.mkv") ]
-    
+    input = [ "a.mkv", "b.mkv" ].collect { |f| copy_baseline_file_to_test_directory(f) }
     c = Capture.new
     $logger.debug "test_merge_two_files: before merge"
     assert_equal 0, c.merge(output, input)
@@ -26,7 +30,7 @@ class TestCapture < Test::Unit::TestCase
   def test_merge_one_file
     output = file_name("c-from-one.mkv")
     File.delete(output) if File.exists?(output)
-    input = [ file_name("a.mkv") ]
+    input = [ copy_baseline_file_to_test_directory("a.mkv") ]
     
     c = Capture.new
     assert_equal 0, c.merge(output, input)
@@ -40,7 +44,7 @@ class TestCapture < Test::Unit::TestCase
   def test_block_merge
     output = file_name("c-from-one.mkv")
     File.delete(output) if File.exists?(output)
-    input = [ file_name("a.mkv") ]
+    input = [ copy_baseline_file_to_test_directory("a.mkv") ]
     
     amount_done = 0.0
     c = Capture.new
@@ -59,8 +63,7 @@ class TestCapture < Test::Unit::TestCase
     baseline = file_name(File.join("baseline", o))
     output = file_name(o)
     File.delete(output) if File.exists?(output)
-    input = file_name(i)
-    FileUtils.cp(file_name(File.join("baseline", i)), input)
+    input = copy_baseline_file_to_test_directory(i)
     
     c = Capture.new
     c.total_amount = 1.0

data/test/test_screencaster_gtk.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 require 'test/unit'
 require 'screencaster-gtk'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')

data/test/test_utils.rb

@@ -1,3 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Copyright (c) Jade Systems Inc. 2013, 2014
+
 module TestUtils
   Thread.abort_on_exception = true
   TEST_FILE_PATH = File.dirname(__FILE__)
@@ -14,4 +19,10 @@ module TestUtils
   def baseline_file_name(f)
     file_name(File.join('baseline', f))
   end
+  
+  def copy_baseline_file_to_test_directory(f)
+    target = file_name(f)
+    FileUtils.cp(file_name(File.join("baseline", f)), target)
+    target
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screencaster-gtk
 version: !ruby/object:Gem::Version
-  version: 0.0.7.alpha1
+  version: 0.0.8.alpha1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
@@ -99,17 +99,44 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
-description: A gem for capturing screencasts
-email: larry.reid@jadesystems.ca
+- !ruby/object:Gem::Dependency
+  name: ruby-dbus
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+description: A program for capturing screencasts
+email: screencaster@jadesystems.ca
 executables:
 - screencaster
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/screencaster-gtk.rb
-- lib/screencaster-gtk/savefile.rb
 - lib/screencaster-gtk/capture.rb
+- lib/screencaster-gtk/dbus_app.rb
 - lib/screencaster-gtk/progresstracker.rb
+- lib/screencaster-gtk.rb
+- lib/screencaster-gtk/savefile.rb
+- lib/screencaster-gtk/screencaster_dbus_object.rb
+- lib/screencaster-gtk/version.rb
+- MPL2.0
+- README.md
 - test/test_screencaster_gtk.rb
 - test/capture.rb
 - test/screencaster-gtk.rb
@@ -118,7 +145,7 @@ files:
 - bin/screencaster
 homepage: http://github.org/lcreid/screencaster
 licenses:
-- GPL2
+- http://www.mozilla.org/MPL/2.0/index.txt
 post_install_message: 
 rdoc_options: []
 require_paths: