dumon 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7a865d6495ecde56f343c847129901818c241c
-  data.tar.gz: d5d81ad2bc4c91586cc976b431d2c8f380b3bacb
+  metadata.gz: 7adb0f9fe734dfbced3303b8c31eb026f4d2e5f9
+  data.tar.gz: 8396241a5b12fcbaa66a392f9d5ff9b56c4f7573
 SHA512:
-  metadata.gz: a891d232b68a9b9be661204c0372b9daf0a7aa3a63f5a8f711dca8702da715ae54995f4e584ba27604a7a695d8ef474a25ada4912625663bbd574fec2a4a8e64
-  data.tar.gz: da38eb17ddce231a535206c7224e5d0d9c154c1dc984c51192fc19d684ee1f79250e18102220278f803c578cef0f12e0550a0ec4a1d74e71697726c81719e521
+  metadata.gz: bf2206d041576a2c044f24f1fcefdc7a468d41969200818c53dba4df1397f3bc41212998a59cf2324ec8973e91b6ced72f3eef6d89a140e1efb043bb11ef811b
+  data.tar.gz: ad44ec873b5f08ec9372d9ef53020715584cd07a578e8401fb920506a3a33c1c58515565c13fc8efa148725b725fc6c37031285d413d2f5627d6c6f69f5eb178

data/lib/dumon/omanager.rb

@@ -124,7 +124,7 @@ module Dumon
 
     ###
     # Switch to given single output device with given resolution.
-    # *param* output
+    # *output* output
     # *resolution* nil for default resolution
     def single(output, resolution=nil)
       raise NotImplementedError, 'this should be overridden by concrete sub-class'

data/lib/dumon/profile.rb

@@ -0,0 +1,156 @@
+module Dumon
+
+  ###
+  # This class represents a base class defining user interface
+  # (dialog window) for profile management.
+  class ProfileDlg
+
+    ###
+    # Constructor.
+    def initialize
+      @dumon_conf = Dumon::App.instance.read_config
+    end
+
+    ###
+    # Shows the dialog.
+    # Abstract method to be overridden by concrete sub-class.
+    def show
+      raise NotImplementedError, 'this should be overridden by concrete sub-class'
+    end
+
+    ###
+    # Reacts to an problem by profile use with a warning.
+    # *msg* message describing the problem
+    def on_warn(msg)
+      Dumon::logger.warn msg.join(', ')
+    end
+
+    ###
+    # Applies a profile from configuration according selection in tree view.
+    # *prof_name* profile name
+    def apply_profile(prof_name)
+      profile = @dumon_conf[:profiles][prof_name.to_sym]
+      profile[:mode] = profile[:mode].to_sym
+      begin
+        Dumon::App.instance.ui.omanager.switch profile
+        Dumon::logger.debug "Profile applied, name=#{prof_name}"
+      rescue ArgumentError => ae # BF #14
+        on_warn ['Profile use failed! (unconnected output?)', "profile name=#{prof_name}", "message=#{ae.message}"]
+      end
+    end
+
+  end
+
+
+  ###
+  # This class represents an user interface for profile management based on Gtk library.
+  class GtkProfileDlg < ProfileDlg
+
+    ###
+    # Constructor.
+    def initialize
+      super
+
+      # create the dialog
+      @dialog = Gtk::Dialog.new('Profile management', nil, Gtk::Dialog::MODAL, [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_REJECT])
+      t = Gtk::Table.new(2, 2)
+      t.row_spacings = 5
+      t.column_spacings = 5
+
+      # disable entry/button if no mode set (probably after start of Dumon)
+      entry_store = Gtk::Entry.new
+      btn_save = Gtk::Button.new(Gtk::Stock::SAVE)
+      if Dumon::App.instance.current_profile.nil?
+        entry_store.text = '<make a choice first>'
+        entry_store.set_sensitive false
+        btn_save.set_sensitive false
+      end
+
+      # save new profile
+      btn_save.signal_connect('clicked') do
+        if entry_store.text.size > 0
+          @dumon_conf[:profiles][entry_store.text] = Dumon::App.instance.current_profile
+          Dumon::App.instance.write_config(@dumon_conf)
+          Dumon::logger.debug "Stored profile, name=#{entry_store.text}"
+          @dialog.destroy
+        end
+      end
+
+      t.attach(Gtk::HBox.new(false, 5).pack_start(Gtk::Label.new('Profile name:'), false, false).add(entry_store), 0, 1, 0, 1)
+      t.attach(btn_save, 1, 2, 0, 1)
+
+      # select/delete existing profile
+      model = Gtk::ListStore.new(String)
+      treeview = Gtk::TreeView.new(model)
+      treeview.headers_visible = false
+      renderer = Gtk::CellRendererText.new
+      column = Gtk::TreeViewColumn.new('', renderer, :text => 0)
+      treeview.append_column(column)
+
+      @dumon_conf[:profiles].keys.each do |k|
+        iter = model.append
+        iter.set_value 0, k.to_s
+      end
+
+      # apply
+      btn_apply = Gtk::Button.new(Gtk::Stock::APPLY)
+      btn_apply.signal_connect('clicked') do
+        selection = treeview.selection
+        if iter = selection.selected
+          apply_profile(iter[0])
+          @dialog.destroy
+        end
+      end
+      # double-click on treeview
+      treeview.signal_connect("row-activated") do |view, path|
+        if iter = view.model.get_iter(path)
+          apply_profile(iter[0])
+          @dialog.destroy
+        end
+      end
+      # delete
+      btn_delete = Gtk::Button.new(Gtk::Stock::DELETE)
+      btn_delete.signal_connect('clicked') do
+        selection = treeview.selection
+        if iter = selection.selected
+          prof_name = iter[0]
+          @dumon_conf[:profiles].delete prof_name.to_sym
+          Dumon::App.instance.write_config(@dumon_conf)
+          Dumon::logger.debug "Deleted profile, name=#{prof_name}"
+          @dialog.destroy
+        end
+      end
+
+      t.attach(treeview, 0, 1, 1, 2)
+      t.attach(Gtk::VBox.new(false, 5).pack_start(btn_apply, false, false).pack_start(btn_delete, false, false), 1, 2, 1, 2)
+
+      @dialog.vbox.add t
+
+      # ensure that the dialog box is destroyed when the user responds
+      @dialog.signal_connect('response') do |w, code|
+        if Gtk::Dialog::RESPONSE_OK.eql?(code) and entry.text.size > 0
+          Dumon::App.instance.write(entry.text => Dumon::App.instance.current_profile)
+        end
+
+        @dialog.destroy
+      end
+    end
+
+    def show #:nodoc:
+      @dialog.show_all
+    end
+
+    def on_warn(msg) #:nodoc:
+      super(msg)
+      md = Gtk::MessageDialog.new(
+          @dialog,
+          Gtk::Dialog::DESTROY_WITH_PARENT, Gtk::MessageDialog::WARNING,
+          Gtk::MessageDialog::BUTTONS_CLOSE,
+          msg.join("\n"))
+      md.run
+      md.destroy
+    end
+
+  end
+
+end

data/lib/dumon/ui.rb

@@ -1,3 +1,6 @@
+require 'dumon/profile'
+
+
 module Dumon
 
   ###
@@ -246,103 +249,11 @@ module Dumon
       rslt
     end
 
-    ###
-    # Applies a profile from configuration according selection in tree view.
-    def apply_profile(conf, prof_name)
-      profile = conf[:profiles][prof_name.to_sym]
-      profile[:mode] = profile[:mode].to_sym
-      omanager.switch profile
-      Dumon::logger.debug "Profile applied, name=#{prof_name}"
-    end
-
     ###
     # Function to open a dialog box for profile management.
     def profile_management_dialog
-      conf = Dumon::App.instance.read_config
-
-      # create the dialog
-      dialog = Gtk::Dialog.new('Profile management', nil, Gtk::Dialog::MODAL, [Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_REJECT])
-      t = Gtk::Table.new(2, 2)
-      t.row_spacings = 5
-      t.column_spacings = 5
-
-      # save new profile
-      entry_store = Gtk::Entry.new
-      btn_save = Gtk::Button.new(Gtk::Stock::SAVE)
-      btn_save.signal_connect('clicked') do
-        if entry_store.text.size > 0
-          conf[:profiles][entry_store.text] = Dumon::App.instance.current_profile
-          Dumon::App.instance.write_config(conf)
-          Dumon::logger.debug "Stored profile, name=#{entry_store.text}"
-          dialog.destroy
-        end
-      end
-      # disable entry/button if no mode set (probably after start of Dumon)
-      if Dumon::App.instance.current_profile.nil?
-        entry_store.text = '<make a choice first>'
-        entry_store.set_sensitive false
-        btn_save.set_sensitive false
-      end
-
-      t.attach(Gtk::HBox.new(false, 5).pack_start(Gtk::Label.new('Profile name:'), false, false).add(entry_store), 0, 1, 0, 1)
-      t.attach(btn_save, 1, 2, 0, 1)
-
-      # select/delete existing profile
-      model = Gtk::ListStore.new(String)
-      treeview = Gtk::TreeView.new(model)
-      treeview.headers_visible = false
-      renderer = Gtk::CellRendererText.new
-      column = Gtk::TreeViewColumn.new('', renderer, :text => 0)
-      treeview.append_column(column)
-
-      conf[:profiles].keys.each do |k|
-        iter = model.append
-        iter.set_value 0, k.to_s
-      end
-
-      # apply
-      btn_apply = Gtk::Button.new(Gtk::Stock::APPLY)
-      btn_apply.signal_connect('clicked') do
-        selection = treeview.selection
-        if iter = selection.selected
-          apply_profile(conf, iter[0])
-          dialog.destroy
-        end
-      end
-      # double-click on treeview
-      treeview.signal_connect("row-activated") do |view, path|
-        if iter = view.model.get_iter(path)
-          apply_profile(conf, iter[0])
-          dialog.destroy
-        end
-      end
-      # delete
-      btn_delete = Gtk::Button.new(Gtk::Stock::DELETE)
-      btn_delete.signal_connect('clicked') do
-        selection = treeview.selection
-        if iter = selection.selected
-          prof_name = iter[0]
-          conf[:profiles].delete prof_name.to_sym
-          Dumon::App.instance.write_config(conf)
-          Dumon::logger.debug "Deleted profile, name=#{prof_name}"
-          dialog.destroy
-        end
-      end
-
-      t.attach(treeview, 0, 1, 1, 2)
-      t.attach(Gtk::VBox.new(false, 5).pack_start(btn_apply, false, false).pack_start(btn_delete, false, false), 1, 2, 1, 2)
-
-      dialog.vbox.add t
-
-      # ensure that the dialog box is destroyed when the user responds
-      dialog.signal_connect('response') do |w, code|
-        if Gtk::Dialog::RESPONSE_OK.eql?(code) and entry.text.size > 0
-          Dumon::App.instance.write(entry.text => Dumon::App.instance.current_profile)
-        end
-
-        dialog.destroy
-      end
-      dialog.show_all
+      dialog = Dumon::GtkProfileDlg.new
+      dialog.show
     end
 
   end

data/lib/dumon/version.rb

@@ -2,15 +2,16 @@ module Dumon
 
   # Version history.
   VERSION_HISTORY = [
-    ['0.2.6',   '2013-04-23', 'BF #13, Failure if no default resolution provided by output'],
-    ['0.2.5',   '2013-04-02', 'BF #12, Profile dialog fails if configuration is empty'],
+    ['0.2.7',   '2013-05-08', 'BF #14: Failure if applied profile with unconnected output; Enh #7'],
+    ['0.2.6',   '2013-04-23', 'BF #13: Failure if no default resolution provided by output'],
+    ['0.2.5',   '2013-04-02', 'BF #12: Profile dialog fails if configuration is empty'],
     ['0.2.4',   '2013-03-29', 'New CLI argument: --reset, tested with MRI Ruby 2.0.0'],
     ['0.2.3',   '2013-03-17', 'BF #10: Profile dialog fails unless configuration exists'],
     ['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.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'],
-    ['0.1.6',   '2013-02-11', 'BF #3: Crash by rendering popup menu if only one output is there'],
+    ['0.1.6',   '2013-02-11', 'BF #3:  Crash by rendering popup menu if only one output is there'],
     ['0.1.5',   '2013-02-08', 'Enh #2: Support for primary output'],
     ['0.1.4',   '2013-02-07', 'Enh #1: Starting as daemon'],
     ['0.1.3',   '2013-02-03', 'Changed starting mechanism'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dumon
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Vaclav Sykora
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -42,6 +42,7 @@ files:
 - dumon.gemspec
 - lib/dumon.rb
 - lib/dumon/omanager.rb
+- lib/dumon/profile.rb
 - lib/dumon/ui.rb
 - lib/dumon/version.rb
 - lib/monitor24.png