gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-30 10:22:31 +01:00
Code Issues Projects Releases Wiki Activity

Add UI portion of wired switch feature.

Browse Source
This commit is contained in:
Dan O'Reilly
2009-01-25 15:15:49 -05:00
parent a2e757a64d
commit 7a375db453
2 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
data/wicd.glade
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--Generated with glade3 3.4.5 on Sat Jan 24 14:58:08 2009 -->
<!--Generated with glade3 3.4.5 on Sun Jan 25 15:15:13 2009 -->
<glade-interface>
<widget class="GtkWindow" id="window1">
<property name="width_request">450</property>
@@ -424,7 +424,7 @@
<child>
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">17</property>
<property name="n_rows">18</property>
<property name="n_columns">2</property>
<property name="column_spacing">4</property>
<property name="row_spacing">4</property>
@@ -455,19 +455,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="pref_dns1_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -477,7 +464,7 @@
</packing>
</child>
<child>
<widget class="GtkEntry" id="pref_dns2_entry">
<widget class="GtkEntry" id="pref_dns1_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
@@ -489,6 +476,19 @@
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="pref_dns2_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label7">
<property name="visible">True</property>
@@ -498,8 +498,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
@@ -519,8 +519,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="y_options"></property>
</packing>
</child>
@@ -537,8 +537,8 @@
</child>
</widget>
<packing>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="top_attach">8</property>
<property name="bottom_attach">9</property>
<property name="y_options"></property>
</packing>
</child>
@@ -555,8 +555,8 @@
</child>
</widget>
<packing>
<property name="top_attach">8</property>
<property name="bottom_attach">9</property>
<property name="top_attach">9</property>
<property name="bottom_attach">10</property>
<property name="y_options"></property>
</packing>
</child>
@@ -573,8 +573,8 @@
</child>
</widget>
<packing>
<property name="top_attach">9</property>
<property name="bottom_attach">10</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="y_options"></property>
</packing>
</child>
@@ -586,8 +586,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="top_attach">11</property>
<property name="bottom_attach">12</property>
<property name="y_options"></property>
</packing>
</child>
@@ -604,8 +604,8 @@
</child>
</widget>
<packing>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="top_attach">11</property>
<property name="bottom_attach">12</property>
<property name="y_options"></property>
</packing>
</child>
@@ -692,8 +692,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">11</property>
<property name="bottom_attach">12</property>
<property name="top_attach">12</property>
<property name="bottom_attach">13</property>
<property name="y_options"></property>
</packing>
</child>
@@ -715,8 +715,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">12</property>
<property name="bottom_attach">13</property>
<property name="top_attach">13</property>
<property name="bottom_attach">14</property>
<property name="y_options"></property>
</packing>
</child>
@@ -738,8 +738,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">13</property>
<property name="bottom_attach">14</property>
<property name="top_attach">14</property>
<property name="bottom_attach">15</property>
<property name="y_options"></property>
</packing>
</child>
@@ -760,8 +760,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">14</property>
<property name="bottom_attach">15</property>
<property name="top_attach">15</property>
<property name="bottom_attach">16</property>
<property name="y_options"></property>
</packing>
</child>
@@ -774,8 +774,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">15</property>
<property name="bottom_attach">16</property>
<property name="top_attach">16</property>
<property name="bottom_attach">17</property>
<property name="y_options"></property>
</packing>
</child>
@@ -795,8 +795,8 @@
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">16</property>
<property name="bottom_attach">17</property>
<property name="top_attach">17</property>
<property name="bottom_attach">18</property>
<property name="y_options"></property>
</packing>
</child>
@@ -808,8 +808,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -826,11 +826,35 @@
</child>
</widget>
<packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment24">
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="pref_prefer_wired_check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">If selected, wicd will automatically connect to a wired network
as soon as a cable is plugged in, even if a wireless connection
is already active.</property>
<property name="label" translatable="yes">Always switch to a wired connection when available</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
</child>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_padding">24</property>
</packing>
</child>
</widget>
</child>
</widget>

4
wicd/prefs.py
View File

@@ -58,6 +58,7 @@ class PreferencesDialog(object):
self.reconnectcheckbox.set_active(daemon.GetAutoReconnect())
self.debugmodecheckbox.set_active(daemon.GetDebugMode())
self.displaytypecheckbox.set_active(daemon.GetSignalDisplayType())
self.preferwiredcheckbox.set_active(daemon.GetPreferWiredNetwork())
dhcp_list = [self.dhcpautoradio, self.dhclientradio, self.dhcpcdradio,
self.pumpradio]
@@ -148,6 +149,7 @@ class PreferencesDialog(object):
daemon.SetAutoReconnect(self.reconnectcheckbox.get_active())
daemon.SetDebugMode(self.debugmodecheckbox.get_active())
daemon.SetSignalDisplayType(int(self.displaytypecheckbox.get_active()))
daemon.SetPreferWiredNetwork(bool(self.preferwiredcheckbox.get_active()))
if self.showlistradiobutton.get_active():
daemon.SetWiredAutoConnectMethod(2)
elif self.lastusedradiobutton.get_active():
@@ -253,6 +255,8 @@ class PreferencesDialog(object):
self.wiredcheckbox = setup_label("pref_always_check",
'wired_always_on')
self.preferwiredcheckbox = setup_label("pref_prefer_wired_check",
"prefer_wired")
self.reconnectcheckbox = setup_label("pref_auto_check",
'auto_reconnect')