Menu
▾
▴
[Emc-commit] TRUNK emc2/src/emc/usr_intf/pncconf pncconf.py, 1.3, 1.4 pncconf.glade, 1.2, 1.3
|
From: Chris M. <cv...@cv...> - 2009-03-30 05:11:14
|
Modified file emc2/src/emc/usr_intf/pncconf/pncconf.py Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/pncconf/pncconf.py?rev=1.4> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/pncconf/pncconf.py.diff?r1=1.3;r2=1.4> Branch: TRUNK Log: revision 1.4 date: 2009/03/30 05:09:31; author: cmorley; state: Exp; lines: +0 -3 some work towards converting to hostmot2 driver --- pncconf.py 2009/03/29 20:04:20 1.3 +++ pncconf.py 2009/03/30 05:09:31 1.4 @@ -206,7 +206,6 @@ self.period = 25000 self.mesa5i20 = 1 - self.mesa5i20_driver = 0 self.firstpp_direction = 1 # output self.ioaddr = "0x378" self.ioaddr2 = _("Enter Address") @@ -1766,7 +1765,6 @@ self.widgets.latency.set_value(self.data.latency) self.widgets.machinename.grab_focus() self.widgets.mesa5i20_checkbutton.set_active(self.data.mesa5i20) - self.widgets.mesa5i20_driver.set_active(self.data.mesa5i20_driver) self.widgets.ioaddr.set_text(self.data.ioaddr) self.widgets.ioaddr2.set_text(self.data.ioaddr2) self.widgets.ioaddr3.set_text(self.data.ioaddr3) @@ -1798,7 +1796,6 @@ def on_mesa5i20_checkbutton_toggled(self, *args): i = self.widgets.mesa5i20_checkbutton.get_active() - self.widgets.mesa5i20_driver.set_sensitive(i) self.widgets.nbr5i20.set_sensitive(i) def on_pp1_checkbutton_toggled(self, *args): Modified file emc2/src/emc/usr_intf/pncconf/pncconf.glade Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/pncconf/pncconf.glade?rev=1.3> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/pncconf/pncconf.glade.diff?r1=1.2;r2=1.3> Branch: TRUNK Log: revision 1.3 date: 2009/03/30 05:09:31; author: cmorley; state: Exp; lines: +6919 -6239 some work towards converting to hostmot2 driver --- pncconf.glade 2009/03/29 20:04:20 1.2 +++ pncconf.glade 2009/03/30 05:09:31 1.3 @@ -42,49 +42,49 @@ <property name="n_rows">6</property> <property name="n_columns">2</property> <child> - <widget class="GtkRadioButton" id="createconfig"> + <widget class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Create a new configuration</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="xpad">12</property> + <property name="ypad">12</property> + <property name="stock">gtk-info</property> </widget> <packing> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="modifyconfig"> + <widget class="GtkCheckButton" id="createshortcut"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Modify a configuration already created with this program</property> + <property name="label" translatable="yes">Create a desktop launcher to start EMC with this configuration.</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <property name="group">createconfig</property> </widget> <packing> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label171"> + <widget class="GtkCheckButton" id="createsymlink"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Do you wish to:</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Create a desktop shortcut (symlink) to configuration files.</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> </widget> <packing> <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -107,51 +107,51 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="createsymlink"> + <widget class="GtkLabel" id="label171"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Create a desktop shortcut (symlink) to configuration files.</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Do you wish to:</property> </widget> <packing> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="createshortcut"> + <widget class="GtkRadioButton" id="modifyconfig"> |