Changeset f7ca2a2bc940eb4ada6c54cc6333162a44a67624

Timestamp:

29/06/10 14:33:31 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

a3d57aae7735bdde7300b1e663df36ade9dc8e8c

Parents:

466127d49214489bb79e36b257c34f9f634f2adb

git-committer:

Matias De la Puente <mfpuente.ar@…> (29/06/10 14:33:31)

Message:

Programmers: Move actions to the menu and toolbar

Fixes Ticket #2

Location:

libi4uc

Files:

• i4ucprogrammerspresenter.vala (modified) (5 diffs)
• i4ucprogrammerssidepage.vala (modified) (4 diffs)
• i4ucprogrammerssidepageiface.vala (modified) (2 diffs)
• i4ucprogrammersview.vala (modified) (4 diffs)
• i4ucprogrammersviewiface.vala (modified) (1 diff)

libi4uc/i4ucprogrammerspresenter.vala

@@ -65 +65 @@
                 _view.side_page.device_changed.connect (on_device_changed);
                 _view.side_page.fuses_changed.connect (on_fuses_changed);
-                _view.side_page.write_flash_clicked.connect (on_write_flash_clicked);
-                _view.side_page.read_flash_clicked.connect (on_read_flash_clicked);
-                _view.side_page.verify_flash_clicked.connect (() => run_command (_current_programmer.verify_flash_command));
-                _view.side_page.erase_flash_clicked.connect (on_erase_flash_clicked);
-                _view.side_page.write_fuses_clicked.connect (on_write_fuses_clicked);
-                _view.side_page.read_fuses_clicked.connect (() => run_command (_current_programmer.read_fuses_command));
-                _view.side_page.get_version_clicked.connect (() => run_command (_current_programmer.get_version_command));
-                _view.side_page.stop_clicked.connect (() => _command.stop ());
+                _view.write_flash_clicked.connect (on_write_flash_clicked);
+                _view.read_flash_clicked.connect (on_read_flash_clicked);
+                _view.verify_flash_clicked.connect (() => run_command (_current_programmer.verify_flash_command));
+                _view.erase_flash_clicked.connect (on_erase_flash_clicked);
+                _view.write_fuses_clicked.connect (on_write_fuses_clicked);
+                _view.read_fuses_clicked.connect (() => run_command (_current_programmer.read_fuses_command));
+                _view.get_version_clicked.connect (() => run_command (_current_programmer.get_version_command));
+                _view.stop_clicked.connect (() => _command.stop ());
                 _command.stopped.connect (on_command_stopped);
                 _command.stdout_message_added.connect ((message) => _view.log_page.add_line (message));
@@ -80 +80 @@
         private void on_page_changed (PageIface? page)
         {
-                _view.side_page.write_flash_sensitive = false;
-                _view.side_page.verify_flash_sensitive = false;
+                _view.write_flash_sensitive = false;
+                _view.verify_flash_sensitive = false;
                 
                 if (page == null || _view.side_page.current_programmer == null)
@@ -89 +89 @@
                 var programmer = I4uc.Settings.instance.programmers[_view.side_page.current_programmer];
                 
-                _view.side_page.write_flash_sensitive = valid_page && programmer.can_write_flash;
-                _view.side_page.verify_flash_sensitive = valid_page && programmer.can_verify_flash;
+                _view.write_flash_sensitive = valid_page && programmer.can_write_flash;
+                _view.verify_flash_sensitive = valid_page && programmer.can_verify_flash;
         }
         
@@ -349 +349 @@
                         set_parameters_sensitive (false);
                         disable_actions ();
-                        _view.side_page.stop_sensitive = true;
+                        _view.stop_sensitive = true;
                 }
                 
@@ -396 +396 @@
                     return;
                 
-                _view.side_page.write_flash_sensitive = valid_page && _current_programmer.can_write_flash;
-                _view.side_page.read_flash_sensitive = _current_programmer.can_read_flash;
-                _view.side_page.verify_flash_sensitive = valid_page && _current_programmer.can_verify_flash;
-                _view.side_page.erase_flash_sensitive = _current_programmer.can_erase_flash;
-                _view.side_page.write_fuses_sensitive = valid_fuses && _current_programmer.can_write_fuses;
-                _view.side_page.read_fuses_sensitive = _current_programmer.can_read_fuses;
-                _view.side_page.get_version_sensitive = _current_programmer.can_get_version;
-                _view.side_page.stop_sensitive = _command.is_running;
+                _view.write_flash_sensitive = valid_page && _current_programmer.can_write_flash;
+                _view.read_flash_sensitive = _current_programmer.can_read_flash;
+                _view.verify_flash_sensitive = valid_page && _current_programmer.can_verify_flash;
+                _view.erase_flash_sensitive = _current_programmer.can_erase_flash;
+                _view.write_fuses_sensitive = valid_fuses && _current_programmer.can_write_fuses;
+                _view.read_fuses_sensitive = _current_programmer.can_read_fuses;
+                _view.get_version_sensitive = _current_programmer.can_get_version;
+                _view.stop_sensitive = _command.is_running;
         }
         
         private void disable_actions ()
         {
-                _view.side_page.write_flash_sensitive = false;
-                _view.side_page.read_flash_sensitive = false;
-                _view.side_page.verify_flash_sensitive = false;
-                _view.side_page.erase_flash_sensitive = false;
-                _view.side_page.write_fuses_sensitive = false;
-                _view.side_page.read_fuses_sensitive = false;
-                _view.side_page.get_version_sensitive = false;
-                _view.side_page.stop_sensitive = false;
+                _view.write_flash_sensitive = false;
+                _view.read_flash_sensitive = false;
+                _view.verify_flash_sensitive = false;
+                _view.erase_flash_sensitive = false;
+                _view.write_fuses_sensitive = false;
+                _view.read_fuses_sensitive = false;
+                _view.get_version_sensitive = false;
+                _view.stop_sensitive = false;
         }
 }

libi4uc/i4ucprogrammerssidepage.vala

@@ -41 +41 @@
         private VBox _fuses_vbox = new VBox (false, 0);
         
-        private Button _write_flash_button = new Button.with_label (_("Write flash"));
-        private Button _read_flash_button = new Button.with_label (_("Read flash"));
-        private Button _verify_flash_button = new Button.with_label (_("Verify flash"));
-        private Button _erase_flash_button = new Button.with_label (_("Erase flash"));
-        private Button _write_fuses_button = new Button.with_label (_("Write fuses"));
-        private Button _read_fuses_button = new Button.with_label (_("Read fuses"));
-        private Button _get_version_button = new Button.with_label (_("Get version"));
-        private Button _stop_button = new Button.with_label (_("Stop"));
-        
         public string current_programmer
         {
@@ -180 +171 @@
                 set { _fuses_vbox.sensitive = value; }
                 get { return _fuses_vbox.sensitive; }
-        }
-        
-        public bool write_flash_sensitive
-        {
-                set { _write_flash_button.sensitive = value; }
-                get { return _write_flash_button.sensitive; }
-        }
-        
-        public bool read_flash_sensitive
-        {
-                set { _read_flash_button.sensitive = value; }
-                get { return _read_flash_button.sensitive; }
-        }
-        
-        public bool verify_flash_sensitive
-        {
-                set { _verify_flash_button.sensitive = value; }
-                get { return _verify_flash_button.sensitive; }
-        }
-        
-        public bool erase_flash_sensitive
-        {
-                set { _erase_flash_button.sensitive = value; }
-                get { return _erase_flash_button.sensitive; }
-        }
-        
-        public bool write_fuses_sensitive
-        {
-                set { _write_fuses_button.sensitive = value; }
-                get { return _write_fuses_button.sensitive; }
-        }
-        
-        public bool read_fuses_sensitive
-        {
-                set { _read_fuses_button.sensitive = value; }
-                get { return _read_fuses_button.sensitive; }
-        }
-        
-        public bool get_version_sensitive
-        {
-                set { _get_version_button.sensitive = value; }
-                get { return _get_version_button.sensitive; }
-        }
-        
-        public bool stop_sensitive
-        {
-                set { _stop_button.sensitive = value; }
-                get { return _stop_button.sensitive; }
         }
         
@@ -258 +201 @@
                 vbox.pack_start (_device_vbox, false, false, 4);
                 vbox.pack_start (_fuses_vbox, false, false, 4);
-                
-                vbox.pack_start (new HSeparator (), false, false, 7);
-                
-                vbox.pack_start (_write_flash_button, false, false, 2);
-                vbox.pack_start (_read_flash_button, false, false, 2);
-                vbox.pack_start (_verify_flash_button, false, false, 2);
-                vbox.pack_start (_erase_flash_button, false, false, 2);
-                vbox.pack_start (_write_fuses_button, false, false, 2);
-                vbox.pack_start (_read_fuses_button, false, false, 2);
-                vbox.pack_start (_get_version_button, false, false, 2);
-                vbox.pack_start (_stop_button, false, false, 2);
                 
                 var scrolled_window = new ScrolledWindow (null, null);
@@ -287 +219 @@
                 _devices_combo.item_changed.connect (() => this.device_changed ());
                 _fuses_entry.changed.connect (() => this.fuses_changed ());
-                _write_flash_button.clicked.connect (() => this.write_flash_clicked ());
-                _read_flash_button.clicked.connect (() => this.read_flash_clicked ());
-                _verify_flash_button.clicked.connect (() => this.verify_flash_clicked ());
-                _erase_flash_button.clicked.connect (() => this.erase_flash_clicked ());
-                _write_fuses_button.clicked.connect (() => this.write_fuses_clicked ());
-                _read_fuses_button.clicked.connect (() => this.read_fuses_clicked ());
-                _get_version_button.clicked.connect (() => this.get_version_clicked ());
-                _stop_button.clicked.connect (() => this.stop_clicked ());
         }
         

libi4uc/i4ucprogrammerssidepageiface.vala

@@ -47 +47 @@
         public abstract bool fuses_sensitive { set; get; }
         
-        public abstract bool write_flash_sensitive { set; get; }
-        public abstract bool read_flash_sensitive { set; get; }
-        public abstract bool verify_flash_sensitive { set; get; }
-        public abstract bool erase_flash_sensitive { set; get; }
-        public abstract bool write_fuses_sensitive { set; get; }
-        public abstract bool read_fuses_sensitive { set; get; }
-        public abstract bool get_version_sensitive { set; get; }
-        public abstract bool stop_sensitive { set; get; }
-        
         public signal void programmer_changed ();
         public signal void serial_port_changed ();
@@ -66 +57 @@
         
         public signal void update_serial_port_clicked ();
-        public signal void write_flash_clicked ();
-        public signal void read_flash_clicked ();
-        public signal void verify_flash_clicked ();
-        public signal void erase_flash_clicked ();
-        public signal void write_fuses_clicked ();
-        public signal void read_fuses_clicked ();
-        public signal void get_version_clicked ();
-        public signal void stop_clicked ();
         
         public abstract void add_programmer (string programmer);

libi4uc/i4ucprogrammersview.vala

@@ -23 +23 @@
 public class I4uc.ProgrammersView : GLib.Object, ProgrammersViewIface
 {
+        private UIManager _ui_manager;
+        private ActionGroup _action_group;
         private PagesPanel _pages_panel;
         private SidePanel _side_panel;
@@ -28 +30 @@
         private ProgrammersSidePage _side_page = new ProgrammersSidePage ();
         private LogPage _log_page = new LogPage (_("Message"));
+        private Action _write_flash_action;
+        private Action _read_flash_action;
+        private Action _verify_flash_action;
+        private Action _erase_flash_action;
+        private Action _write_fuses_action;
+        private Action _read_fuses_action;
+        private Action _get_version_action;
+        private Action _stop_action;
         
         public PagesPanelIface pages_panel { get { return _pages_panel; } }
@@ -33 +43 @@
         public LogPageIface log_page { get { return _log_page; } }
         
-        public ProgrammersView (PagesPanel pages_panel, SidePanel side_panel, BottomPanel bottom_panel)
-        {
+        public bool write_flash_sensitive
+        {
+                set { _write_flash_action.sensitive = value; }
+                get { return _write_flash_action.sensitive; }
+        }
+        
+        public bool read_flash_sensitive
+        {
+                set { _read_flash_action.sensitive = value; }
+                get { return _read_flash_action.sensitive; }
+        }
+        
+        public bool verify_flash_sensitive
+        {
+                set { _verify_flash_action.sensitive = value; }
+                get { return _verify_flash_action.sensitive; }
+        }
+        
+        public bool erase_flash_sensitive
+        {
+                set { _erase_flash_action.sensitive = value; }
+                get { return _erase_flash_action.sensitive; }
+        }
+        
+        public bool write_fuses_sensitive
+        {
+                set { _write_fuses_action.sensitive = value; }
+                get { return _write_fuses_action.sensitive; }
+        }
+        
+        public bool read_fuses_sensitive
+        {
+                set { _read_fuses_action.sensitive = value; }
+                get { return _read_fuses_action.sensitive; }
+        }
+        
+        public bool get_version_sensitive
+        {
+                set { _get_version_action.sensitive = value; }
+                get { return _get_version_action.sensitive; }
+        }
+        
+        public bool stop_sensitive
+        {
+                set { _stop_action.sensitive = value; }
+                get { return _stop_action.sensitive; }
+        }
+        
+        public ProgrammersView (UIManager ui_manager, PagesPanel pages_panel, SidePanel side_panel, BottomPanel bottom_panel)
+        {
+                _ui_manager = ui_manager;
                 _pages_panel = pages_panel;
                 _side_panel = side_panel;
                 _bottom_panel = bottom_panel;
+                
+                _action_group = new ActionGroup ("I4ucProgrammersActions");
+                _action_group.set_translation_domain (Config.GETTEXT_PACKAGE);
+                _action_group.add_actions (_action_entries, this);
+                
+                _ui_manager.insert_action_group (_action_group, -1);
+                
+                try
+                {
+                        _ui_manager.add_ui_from_string (_UI, -1);
+                }
+                catch (GLib.Error e)
+                {
+                        warning (e.message);
+                }
+                
+                _write_flash_action = _action_group.get_action ("WriteFlashProgrammerAction");
+                _read_flash_action = _action_group.get_action ("ReadFlashProgrammerAction");
+                _verify_flash_action = _action_group.get_action ("VerifyFlashProgrammerAction");
+                _erase_flash_action = _action_group.get_action ("EraseFlashProgrammerAction");
+                _write_fuses_action = _action_group.get_action ("WriteFusesProgrammerAction");
+                _read_fuses_action = _action_group.get_action ("ReadFusesProgrammerAction");
+                _get_version_action = _action_group.get_action ("GetVersionProgrammerAction");
+                _stop_action = _action_group.get_action ("StopProgrammerAction");
+                
+                var toolbar = (Toolbar)_ui_manager.get_widget ("/MainToolbar");
+                Gtk.Callback non_homogeneous = (item) => { ((ToolItem)item).set_homogeneous (false); };
+                toolbar.foreach (non_homogeneous);
                 
                 _side_panel.insert_page (_side_page, 1);
@@ -81 +168 @@
                 dialog.destroy ();
         }
+        
+        public void on_write_flash ()
+        {
+                this.write_flash_clicked ();
+        }
+        
+        public void on_read_flash ()
+        {
+                this.read_flash_clicked ();
+        }
+        
+        public void on_verify_flash ()
+        {
+                this.verify_flash_clicked ();
+        }
+        
+        public void on_erase_flash ()
+        {
+                this.erase_flash_clicked ();
+        }
+        
+        public void on_write_fuses ()
+        {
+                this.write_fuses_clicked ();
+        }
+        
+        public void on_read_fuses ()
+        {
+                this.read_fuses_clicked ();
+        }
+        
+        public void on_get_version ()
+        {
+                this.get_version_clicked ();
+        }
+        
+        public void on_stop ()
+        {
+                this.stop_clicked ();
+        }
+        
+        private const ActionEntry[] _action_entries =
+        {
+                { "ProgrammersMenuAction", null, N_("_Programmers") },
+                { "WriteFlashProgrammerAction", "i4uc-write-flash", N_("Write flash"), null, N_("Write to flash memory"), on_write_flash },
+                { "ReadFlashProgrammerAction", "i4uc-read-flash", N_("Read flash"), null, N_("Read flash memory"), on_read_flash },
+                { "VerifyFlashProgrammerAction", "i4uc-verify-flash", N_("Verify flash"), null, N_("Verify flash memory"), on_verify_flash },
+                { "EraseFlashProgrammerAction", "i4uc-erase-flash", N_("Erase flash"), null, N_("Erase flash memory"), on_erase_flash },
+                { "WriteFusesProgrammerAction", null, N_("Write fuses"), null, N_("Write fuses"), on_write_fuses },
+                { "ReadFusesProgrammerAction", null, N_("Read fuses"), null, N_("Read fuses"), on_read_fuses },
+                { "GetVersionProgrammerAction", null, N_("Get version"), null, N_("Get version of programmer"), on_get_version },
+                { "StopProgrammerAction", STOCK_STOP, N_("Stop"), "", N_("Stop programmer action"), on_stop }
+        };
+        
+        private const string _UI = """
+<ui>
+        <menubar name="MainMenu">
+                <placeholder name="MenuBarOps">
+                        <menu name="ProgrammersMenu" action="ProgrammersMenuAction">
+                                <menuitem action="WriteFlashProgrammerAction"/>
+                                <menuitem action="ReadFlashProgrammerAction"/>
+                                <menuitem action="VerifyFlashProgrammerAction"/>
+                                <menuitem action="EraseFlashProgrammerAction"/>
+                                <menuitem action="WriteFusesProgrammerAction"/>
+                                <menuitem action="ReadFusesProgrammerAction"/>
+                                <menuitem action="GetVersionProgrammerAction"/>
+                                <menuitem action="StopProgrammerAction"/>
+                        </menu>
+                </placeholder>
+        </menubar>
+        <toolbar name="MainToolbar">
+                <placeholder name="ToolbarEndOps">
+                        <separator/>
+                                <toolitem action="WriteFlashProgrammerAction"/>
+                                <toolitem action="ReadFlashProgrammerAction"/>
+                                <toolitem action="VerifyFlashProgrammerAction"/>
+                                <toolitem action="EraseFlashProgrammerAction"/>
+                                <toolitem action="StopProgrammerAction"/>
+                        <separator/>
+                </placeholder>
+        </toolbar>
+</ui>""";
 }

libi4uc/i4ucprogrammersviewiface.vala

@@ -27 +27 @@
         public abstract LogPageIface log_page { get; }
         
+        public abstract bool write_flash_sensitive { set; get; }
+        public abstract bool read_flash_sensitive { set; get; }
+        public abstract bool verify_flash_sensitive { set; get; }
+        public abstract bool erase_flash_sensitive { set; get; }
+        public abstract bool write_fuses_sensitive { set; get; }
+        public abstract bool read_fuses_sensitive { set; get; }
+        public abstract bool get_version_sensitive { set; get; }
+        public abstract bool stop_sensitive { set; get; }
+        
+        public signal void write_flash_clicked ();
+        public signal void read_flash_clicked ();
+        public signal void verify_flash_clicked ();
+        public signal void erase_flash_clicked ();
+        public signal void write_fuses_clicked ();
+        public signal void read_fuses_clicked ();
+        public signal void get_version_clicked ();
+        public signal void stop_clicked ();
+        
         public abstract int show_yes_no_message (string message, bool cancel = false);
         public abstract void show_log_page ();