Changeset fed76872db57be25180c04c6856972ef1e8ef8ff

Timestamp:

11/05/10 14:26:25 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

e20be4a7bb7f7ce258435a7e11766c564c2abbc0

Parents:

ae52cc5f32e69da5f255e4801ce04d2ad5c5afc9

git-committer:

Matias De la Puente <mfpuente.ar@…> (11/05/10 14:26:25)

Message:

Programmers: Add update serial ports button

Location:

libi4uc

Files:

• i4ucprogrammerspresenter.vala (modified) (4 diffs)
• i4ucprogrammerssidepage.vala (modified) (3 diffs)
• i4ucprogrammerssidepageiface.vala (modified) (2 diffs)

libi4uc/i4ucprogrammerspresenter.vala

@@ -38 +38 @@
                 
                 //Load available serial ports
-                var serial_ports = SerialPortUtils.list_serial_ports ();
-                foreach (var serial_port in serial_ports)
-                        _view.side_page.add_serial_port (serial_port);
-                if (I4uc.Settings.instance.serial_port in serial_ports)
-                        _view.side_page.current_serial_port = I4uc.Settings.instance.serial_port;
+                on_update_serial_port_clicked ();
                 
                 //Load baud rates
@@ -62 +58 @@
                 _view.side_page.programmer_changed.connect (on_programmer_changed);
                 _view.side_page.serial_port_changed.connect (on_serial_port_changed);
+                _view.side_page.update_serial_port_clicked.connect (on_update_serial_port_clicked);
                 _view.side_page.baud_rate_changed.connect (on_baud_rate_changed);
                 _view.side_page.devices_file_changed.connect (on_devices_file_changed);
@@ -156 +153 @@
                 if (_current_programmer == null)
                         return;
-                if (_view.side_page.current_serial_port == null)
-                        return;
-                
-                if (I4uc.Settings.instance.serial_port != _view.side_page.current_serial_port)
-                        I4uc.Settings.instance.serial_port = _view.side_page.current_serial_port;
-                
-                enable_actions ();
+                
+                var current_serial_port = _view.side_page.current_serial_port;
+                
+                if (current_serial_port != null && I4uc.Settings.instance.serial_port != current_serial_port)
+                        I4uc.Settings.instance.serial_port = current_serial_port;
+                
+                enable_actions ();
+        }
+        
+        private void on_update_serial_port_clicked ()
+        {
+                _view.side_page.clear_serial_ports_list ();
+                var serial_ports = SerialPortUtils.list_serial_ports ();
+                foreach (var serial_port in serial_ports)
+                        _view.side_page.add_serial_port (serial_port);
+                if (I4uc.Settings.instance.serial_port in serial_ports)
+                        _view.side_page.current_serial_port = I4uc.Settings.instance.serial_port;
         }
         
@@ -171 +178 @@
                 if (_current_programmer == null)
                         return;
-                if (_view.side_page.current_baud_rate == null)
-                        return;
-                
-                if (I4uc.Settings.instance.baud_rate != _view.side_page.current_baud_rate)
-                        I4uc.Settings.instance.baud_rate = _view.side_page.current_baud_rate;
+                
+                var current_baud_rate = _view.side_page.current_baud_rate;
+                
+                if (current_baud_rate != null && I4uc.Settings.instance.baud_rate != current_baud_rate)
+                        I4uc.Settings.instance.baud_rate = current_baud_rate;
                 
                 enable_actions ();

libi4uc/i4ucprogrammerssidepage.vala

@@ -232 +232 @@
         public ProgrammersSidePage ()
         {
+                var update_serial_port_button = new Button ();
+                update_serial_port_button.add (new Image.from_stock (Gtk.STOCK_REFRESH, IconSize.MENU));
+                
+                var hbox = new HBox (false, 0);
+                hbox.pack_start (_serial_ports_combo, true, true, 0);
+                hbox.pack_start (update_serial_port_button, false, false, 0);
+                
                 add_vbox_label (_programmer_vbox, _("Programmer:"), _programmers_combo);
-                add_vbox_label (_serial_port_vbox, _("Serial port:"), _serial_ports_combo);
+                add_vbox_label (_serial_port_vbox, _("Serial port:"), hbox);
                 add_vbox_label (_baud_rate_vbox, _("Baud rate:"), _baud_rates_combo);
                 add_vbox_label (_devices_file_vbox, _("Devices file:"), _devices_file_chooser);
@@ -273 +280 @@
                 _programmers_combo.item_changed.connect (() => this.programmer_changed ());
                 _serial_ports_combo.item_changed.connect (() => this.serial_port_changed ());
+                update_serial_port_button.clicked.connect (() => this.update_serial_port_clicked ());
                 _baud_rates_combo.item_changed.connect (() => this.baud_rate_changed ());
                 _devices_file_chooser.selection_changed.connect (() => this.devices_file_changed ());
@@ -309 +317 @@
         }
         
+        public void clear_serial_ports_list ()
+        {
+                _serial_ports_combo.clear_list ();
+        }
+        
         public void clear_devices_list ()
         {

libi4uc/i4ucprogrammerssidepageiface.vala

@@ -65 +65 @@
         public signal void fuses_changed ();
         
+        public signal void update_serial_port_clicked ();
         public signal void write_flash_clicked ();
         public signal void read_flash_clicked ();
@@ -78 +79 @@
         public abstract void add_baud_rate (string baud_rate);
         public abstract void add_device (string device);
+        public abstract void clear_serial_ports_list ();
         public abstract void clear_devices_list ();
 }