dumon 0.2.1 → 0.2.2

data/lib/dumon/omanager.rb

@@ -31,11 +31,11 @@ module Dumon
     # Mirrored outputs:
     # {:mode=>:mirror, :resolution=>'1600x900'}
     # Sequence of outputs:
-    # {:mode=>:sequence, :outs=>['VGA1', 'LVDS1'], :resolutions=>['1920x1080', '1600x900'], :primary=>:none}
+    # {:mode=>:hsequence, :outs=>['VGA1', 'LVDS1'], :resolutions=>['1920x1080', '1600x900'], :primary=>:none}
     def switch(options)
       # pre-conditions
       verify_options(options, {
-        :mode => [:single, :mirror, :sequence],
+        :mode => [:single, :mirror, :hsequence, :vsequence],
         :out => :optional, :outs => :optional,
         :resolution => :optional, :resolutions => :optional,
         :primary => :optional
@@ -60,14 +60,16 @@ module Dumon
           assert(v[:resolutions].include?(options[:resolution]), "unknown resolution: #{options[:resolution]}, output: #{k}")
         end
         mirror(options[:resolution])
-      when :sequence
-        verify_options(options, {:mode => [:sequence], :outs => :mandatory, :resolutions => :mandatory, :primary => :optional})
+      when :hsequence, :vsequence
+        verify_options(options, {:mode => [:hsequence, :vsequence], :outs => :mandatory, :resolutions => :mandatory, :primary => :optional})
         assert(options[:outs].is_a?(Array), 'parameter :outs has to be Array')
         assert(options[:resolutions].is_a?(Array), 'parameter :resolutions has to be Array')
         assert(options[:outs].size == options[:resolutions].size, 'size of :outs and :resolutions does not match')
         assert(options[:outs].size > 1, 'sequence mode expects at least 2 outputs')
-        assert(outputs.keys.include?(options[:primary]), "unknown primary output: #{options[:primary]}") unless options[:primary].nil?
-        sequence(options[:outs], options[:resolutions], options[:primary])
+        if !options[:primary].nil? and options[:primary].to_sym != :none
+          assert(outputs.keys.include?(options[:primary]), "unknown primary output: #{options[:primary]}")
+        end
+        sequence(options[:outs], options[:resolutions], options[:primary], :hsequence === options[:mode])
       end
 
       Dumon::App.instance.current_profile = options
@@ -130,7 +132,8 @@ module Dumon
     # *param* outs in form ['VGA1', 'LVDS1']
     # *resolutions* in form ['1920x1080', '1600x900']
     # *param* primary name of primary output
-    def sequence(outs, resolutions, primary=:none)
+    # *param* horizontal whether horizontal linie of outputs
+    def sequence(outs, resolutions, primary=:none, horizontal=true)
       raise NotImplementedError, 'this should be overridden by concrete sub-class'
     end
 
@@ -224,7 +227,7 @@ module Dumon
       `#{cmd}`
     end
 
-    def sequence(outs, resolutions, primary=:none) #:nodoc:
+    def sequence(outs, resolutions, primary=:none, horizontal=true) #:nodoc:
       cmd = "#{self.stool}"
       for i in 0..outs.size - 1
         output = outs[i]
@@ -232,7 +235,11 @@ module Dumon
         resolution = self.default_resolution(output) if resolution.nil?
         cmd << " --output #{output} --mode #{resolution}"
         cmd << ' --primary' if primary.to_s == output
-        cmd << " --right-of #{outs[i - 1]}" if i > 0
+        if horizontal
+          cmd << " --right-of #{outs[i - 1]}" if i > 0
+        else
+          cmd << " --below #{outs[i - 1]}" if i > 0
+        end
       end
 
       Dumon::logger.debug "Command: #{cmd}"

data/lib/dumon/ui.rb

@@ -201,15 +201,26 @@ module Dumon
         o1 = outputs.keys[1]
         item = Gtk::MenuItem.new("#{o0} left of #{o1}")
         item.signal_connect('activate') do
-          omanager.switch({:mode=>:sequence, :outs=>[o0, o1], :resolutions=>[@selected_resolution[o0], @selected_resolution[o1]], :primary=>@primary_output})
+          omanager.switch({:mode=>:hsequence, :outs=>[o0, o1], :resolutions=>[@selected_resolution[o0], @selected_resolution[o1]], :primary=>@primary_output})
           # clear preferred resolution, by next rendering will be read from real state
           @selected_resolution.clear
         end
         rslt.append(item)
         item = Gtk::MenuItem.new("#{o1} left of #{o0}")
         item.signal_connect('activate') do
-          omanager.switch({:mode=>:sequence, :outs=>[o1, o0], :resolutions=>[@selected_resolution[o1], @selected_resolution[o0]], :primary=>@primary_output})
-          # clear preferred resolution, by next rendering will be read from real state
+          omanager.switch({:mode=>:hsequence, :outs=>[o1, o0], :resolutions=>[@selected_resolution[o1], @selected_resolution[o0]], :primary=>@primary_output})
+          @selected_resolution.clear
+        end
+        rslt.append(item)
+        item = Gtk::MenuItem.new("#{o0} above #{o1}")
+        item.signal_connect('activate') do
+          omanager.switch({:mode=>:vsequence, :outs=>[o0, o1], :resolutions=>[@selected_resolution[o0], @selected_resolution[o1]], :primary=>@primary_output})
+          @selected_resolution.clear
+        end
+        rslt.append(item)
+        item = Gtk::MenuItem.new("#{o1} above #{o0}")
+        item.signal_connect('activate') do
+          omanager.switch({:mode=>:vsequence, :outs=>[o1, o0], :resolutions=>[@selected_resolution[o1], @selected_resolution[o0]], :primary=>@primary_output})
           @selected_resolution.clear
         end
         rslt.append(item)

data/lib/dumon/version.rb

@@ -2,6 +2,7 @@ module Dumon
 
   # Version history.
   VERSION_HISTORY = [
+    ['0.2.2',   '2013-03-15', 'Enh #6: Vertical location of outputs'],
     ['0.2.1',   '2013-03-13', 'BF #9: Crash Ruby 1.8.7 because of Dir.home'],
     ['0.2.0',   '2013-03-12', 'Enh #5: Profiles; File based configuration'],
     ['0.1.7',   '2013-02-13', 'Enh #4: About dialog'],

data/lib/dumon.rb

@@ -70,7 +70,7 @@ module Dumon
 
       # check and create directory structure
       dirname = File.dirname filename
-      ::FileUtils.mkdir_p(dirname) unless Dir.exist?(dirname)
+      ::FileUtils.mkdir_p(dirname) unless File.exist?(dirname)
 
       # create file if does not exist
       File.open(filename, 'w').close unless File.exist? filename

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumon
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2