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

Merged mainline experimental changes.

Browse Source
This commit is contained in:
Robby Workman
2009-01-25 15:25:58 -06:00
parent 850118a231 7a375db453
commit 7599269875
11 changed files with 844 additions and 112 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>

682
images/wired-gui.svg Normal file
View File

@@ -0,0 +1,682 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45"
width="48"
height="48"
version="1.0"
sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/devices"
sodipodi:docname="network-wired.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Lapo Calamandrei</dc:title>
</cc:Agent>
</dc:creator>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs5">
<linearGradient
inkscape:collect="always"
id="linearGradient7822">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop7824" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop7826" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7812">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop7814" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop7816" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7688">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop7690" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop7692" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7660">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop7662" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop7664" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7652">
<stop
style="stop-color:#729fcf;stop-opacity:1;"
offset="0"
id="stop7654" />
<stop
style="stop-color:#729fcf;stop-opacity:0;"
offset="1"
id="stop7656" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7576">
<stop
style="stop-color:#3465a4;stop-opacity:1"
offset="0"
id="stop7578" />
<stop
style="stop-color:#3465a4;stop-opacity:0"
offset="1"
id="stop7580" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7438">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop7440" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop7442" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7430">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop7432" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop7434" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient7422">
<stop
style="stop-color:#edd400;stop-opacity:1;"
offset="0"
id="stop7424" />
<stop
style="stop-color:#edd400;stop-opacity:0;"
offset="1"
id="stop7426" />
</linearGradient>
<linearGradient
id="linearGradient7340">
<stop
style="stop-color:#2e3436;stop-opacity:1;"
offset="0"
id="stop7342" />
<stop
style="stop-color:#555753;stop-opacity:1"
offset="1"
id="stop7344" />
</linearGradient>
<linearGradient
id="linearGradient7277">
<stop
style="stop-color:#555753;stop-opacity:1"
offset="0"
id="stop7279" />
<stop
style="stop-color:#d3d7cf;stop-opacity:1"
offset="1"
id="stop7281" />
</linearGradient>
<linearGradient
id="linearGradient7269">
<stop
id="stop7271"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop7273"
offset="1"
style="stop-color:#d3d7cf;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient7263">
<stop
id="stop7265"
offset="0"
style="stop-color:#adb0a8;stop-opacity:1;" />
<stop
id="stop7267"
offset="1"
style="stop-color:#ffffff;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient7257">
<stop
id="stop7259"
offset="0"
style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop7261"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient7245">
<stop
style="stop-color:#eeeeec;stop-opacity:1;"
offset="0"
id="stop7247" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop7249" />
</linearGradient>
<linearGradient
id="linearGradient7237">
<stop
style="stop-color:#eeeeec;stop-opacity:1"
offset="0"
id="stop7239" />
<stop
style="stop-color:#babdb6;stop-opacity:1;"
offset="1"
id="stop7241" />
</linearGradient>
<linearGradient
id="linearGradient7186">
<stop
style="stop-color:#888a85;stop-opacity:1;"
offset="0"
id="stop7188" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop7190" />
</linearGradient>
<linearGradient
id="linearGradient6991">
<stop
style="stop-color:#d3d7cf;stop-opacity:1"
offset="0"
id="stop6993" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop6995" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient6991"
id="linearGradient6047"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.0000002,0,0,1.9333333,43.500004,0.533333)"
x1="-7.975069"
y1="25.357235"
x2="-11.005972"
y2="-6.5683565" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7340"
id="linearGradient7346"
x1="32.8125"
y1="21"
x2="32.8125"
y2="26.204767"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0874899,0,0,1.086371,-1.5809531,-8.9433469)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7422"
id="linearGradient7428"
x1="30.3125"
y1="27.313059"
x2="30.3125"
y2="24.6875"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7430"
id="linearGradient7436"
x1="28.875"
y1="29"
x2="29"
y2="16"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(1,-7)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7438"
id="linearGradient7444"
x1="-7.8516631"
y1="3.7545938"
x2="-5.5098634"
y2="18.937717"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7422"
id="linearGradient7446"
gradientUnits="userSpaceOnUse"
x1="30.3125"
y1="27.313059"
x2="30.3125"
y2="24.6875" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7422"
id="linearGradient7448"
gradientUnits="userSpaceOnUse"
x1="30.3125"
y1="27.313059"
x2="30.3125"
y2="24.6875" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7422"
id="linearGradient7450"
gradientUnits="userSpaceOnUse"
x1="30.3125"
y1="27.313059"
x2="30.3125"
y2="24.6875" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7422"
id="linearGradient7452"
gradientUnits="userSpaceOnUse"
x1="30.3125"
y1="27.313059"
x2="30.3125"
y2="24.6875" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7263"
id="linearGradient7555"
gradientUnits="userSpaceOnUse"
x1="1.6256078"
y1="55.219357"
x2="0.82206726"
y2="54.415817" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7269"
id="linearGradient7557"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.9642856,0,0,0.9722222,-0.2500008,1.6944444)"
x1="-4.2208939"
y1="59.878922"
x2="-4.2208939"
y2="54.707691" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7257"
id="linearGradient7559"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-4,-24)"
x1="-1.9887378"
y1="51.137787"
x2="-3.3587573"
y2="54" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7237"
id="linearGradient7561"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-4,-24)"
x1="-4.6845822"
y1="52.640388"
x2="0.88388348"
y2="50.563263" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7245"
id="linearGradient7563"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-4,-24)"
x1="-5.0823302"
y1="50.51907"
x2="0.26516503"
y2="49.458408" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7186"
id="linearGradient7565"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-4,-24)"
x1="-5.96875"
y1="52.875"
x2="-5.96875"
y2="51.812416" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7277"
id="linearGradient7567"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.0285717,-4,-25.142872)"
x1="-3.5355339"
y1="55.866562"
x2="-3.5355339"
y2="59.444622" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7269"
id="linearGradient7574"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1249999,0,0,1.1666666,15.874999,-34.135417)"
x1="-4.1097827"
y1="58.807774"
x2="-4.1097827"
y2="55.000004" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7576"
id="linearGradient7582"
x1="38.75"
y1="40.625"
x2="40.125"
y2="46.5625"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7652"
id="linearGradient7658"
x1="37.625"
y1="40.3125"
x2="38.875"
y2="45.0625"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7660"
id="linearGradient7666"
x1="41.1875"
y1="38.3125"
x2="42.123722"
y2="42.9375"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7688"
id="linearGradient7694"
x1="28.625"
y1="41.125"
x2="30.5"
y2="47.8125"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7812"
id="linearGradient7818"
x1="-6.40625"
y1="32.4375"
x2="-7.78125"
y2="34.5625"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient7822"
id="radialGradient7828"
cx="14.363107"
cy="34.785942"
fx="14.363107"
fy="34.785942"
r="8.7946405"
gradientTransform="matrix(1,0,0,0.6884422,0,10.837832)"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter5386">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.26293105"
id="feGaussianBlur5388" />
</filter>
<filter
inkscape:collect="always"
id="filter5406">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.78208031"
id="feGaussianBlur5408" />
</filter>
</defs>
<sodipodi:namedview
inkscape:window-height="792"
inkscape:window-width="770"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1"
bordercolor="#e8e8e8"
pagecolor="#ffffff"
id="base"
showgrid="false"
inkscape:showpageshadow="false"
gridspacingx="0.5px"
gridspacingy="0.5px"
gridempspacing="2"
showborder="true"
inkscape:grid-points="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="1"
inkscape:cx="39.213614"
inkscape:cy="4.7574714"
inkscape:window-x="369"
inkscape:window-y="135"
inkscape:current-layer="svg2"
width="48px"
height="48px"
inkscape:guide-points="false"
inkscape:object-nodes="false"
inkscape:object-points="false"
inkscape:object-paths="true"
inkscape:grid-bbox="true">
<inkscape:grid
type="xygrid"
id="grid4751" />
</sodipodi:namedview>
<path
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
d="M 5,12 L 8,12 L 10,12 L 7,12 L 5,12 z "
id="path7013"
sodipodi:nodetypes="ccccc" />
<path
sodipodi:type="arc"
style="opacity:0.45895523;fill:url(#radialGradient7828);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
id="path7820"
sodipodi:cx="14.363107"
sodipodi:cy="34.785942"
sodipodi:rx="8.7946405"
sodipodi:ry="6.0546017"
d="M 23.157747 34.785942 A 8.7946405 6.0546017 0 1 1 5.5684662,34.785942 A 8.7946405 6.0546017 0 1 1 23.157747 34.785942 z"
transform="matrix(1.1559927,0,0,1.1167882,-1.4892394,-5.8125919)" />
<rect
style="opacity:0.1204819;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642;filter:url(#filter5386)"
id="rect7696"
width="32.000004"
height="29"
x="15.375001"
y="2.875"
rx="3.7225697"
ry="3.7225697"
transform="matrix(1.015625,0,0,1.015625,-0.4902344,-0.2714844)" />
<rect
style="fill:url(#linearGradient6047);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
id="rect5925"
width="32.000004"
height="29"
x="14.500001"
y="1.5"
rx="2.8766227"
ry="2.780735" />
<path
sodipodi:type="inkscape:offset"
inkscape:radius="-0.99866015"
inkscape:original="M -12.5 0.5 C -13.608449 0.5 -14.5 1.3915505 -14.5 2.5 L -14.5 13.5 C -14.5 14.608449 -13.60845 15.5 -12.5 15.5 L -0.5 15.5 C 0.60844948 15.5 1.5 14.60845 1.5 13.5 L 1.5 2.5 C 1.5 1.3915505 0.60844948 0.5 -0.5 0.5 L -12.5 0.5 z "
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7444);stroke-width:0.47289537999999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992000000000;stroke-opacity:0.99236641999999997"
id="path6964"
d="M -12.5,1.5 C -13.072952,1.5 -13.5,1.9270471 -13.5,2.5 L -13.5,13.5 C -13.5,14.072953 -13.072954,14.5 -12.5,14.5 L -0.5,14.5 C 0.072953444,14.5 0.5,14.072954 0.5,13.5 L 0.5,2.5 C 0.5,1.9270468 0.072953144,1.5 -0.5,1.5 L -12.5,1.5 z "
transform="matrix(2.1428572,0,0,2.0867798,44.428572,-0.6301697)" />
<path
sodipodi:type="inkscape:offset"
inkscape:radius="0.50945717"
inkscape:original="M 14.8125 31.5 C 14.8125 31.5 10.498126 34.830189 6.59375 38.0625 C 4.6415622 39.678655 2.8956918 41.28355 1.875 42.84375 C 1.3646541 43.62385 0.8878846 44.466971 1.21875 45.625 C 1.3841827 46.204014 1.8301355 46.746216 2.3125 47.03125 C 2.7948645 47.316284 3.2706533 47.437479 3.8125 47.5 C 5.9363798 47.745063 8.5434834 47.106406 11.65625 46.21875 C 14.769017 45.331094 18.325496 44.136387 21.90625 42.96875 C 25.487004 41.801113 29.102635 40.662687 32.25 39.96875 C 35.397365 39.274813 38.085104 39.083776 39.625 39.46875 C 40.353931 39.650983 40.370552 39.769574 40.375 39.78125 C 40.379448 39.792926 40.439577 40.11668 40.15625 40.71875 C 39.589596 41.92289 37.911115 43.835283 35.96875 45.65625 C 32.08402 49.298184 27.125 52.78125 27.125 52.78125 L 28.875 55.21875 C 28.875 55.21875 33.91598 51.701816 38.03125 47.84375 C 40.088885 45.914717 41.910404 43.95211 42.84375 41.96875 C 43.310423 40.97707 43.620552 39.855512 43.1875 38.71875 C 42.754448 37.581988 41.646069 36.849017 40.375 36.53125 C 37.914896 35.916224 34.93076 36.32675 31.59375 37.0625 C 28.25674 37.79825 24.575496 38.917637 20.96875 40.09375 C 17.362004 41.269863 13.840358 42.489218 10.84375 43.34375 C 7.9314529 44.174239 5.5458184 44.563842 4.375 44.46875 C 4.9949332 43.521138 6.6709378 41.915095 8.53125 40.375 C 12.251874 37.294811 16.5 34 16.5 34 L 14.8125 31.5 z "
style="opacity:0.31927712;fill:url(#linearGradient7694);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter5406)"
id="path7678"
d="M 14.6875,31 C 14.619177,31.017916 14.555326,31.049841 14.5,31.09375 C 14.5,31.09375 10.195229,34.415989 6.28125,37.65625 C 4.316376,39.282908 2.5162731,40.913519 1.4375,42.5625 C 0.91466802,43.361686 0.33442463,44.404861 0.71875,45.75 C 0.9275427,46.480774 1.4549221,47.109726 2.0625,47.46875 C 2.6167319,47.796251 3.1674141,47.932778 3.75,48 C 6.0211642,48.262057 8.6583138,47.609306 11.78125,46.71875 C 14.911534,45.826099 18.484598,44.604207 22.0625,43.4375 C 25.639946,42.270942 29.261929,41.155126 32.375,40.46875 C 35.48201,39.783711 38.133895,39.627224 39.5,39.96875 C 39.718805,40.023451 39.763413,40.030877 39.84375,40.0625 C 39.824168,40.168535 39.78709,40.288372 39.6875,40.5 C 39.197395,41.541473 37.544362,43.481849 35.625,45.28125 C 31.779852,48.886076 26.84375,52.375 26.84375,52.375 C 26.730444,52.452627 26.653276,52.57271 26.629743,52.708026 C 26.60621,52.843342 26.638304,52.982428 26.71875,53.09375 L 28.46875,55.53125 C 28.637946,55.737822 28.937922,55.778728 29.15625,55.625 C 29.15625,55.625 34.220988,52.113137 38.375,48.21875 C 40.448974,46.2744 42.325551,44.284766 43.3125,42.1875 C 43.80516,41.140598 44.157793,39.847802 43.65625,38.53125 C 43.146184,37.192325 41.882294,36.376823 40.5,36.03125 C 37.894103,35.379776 34.829212,35.821579 31.46875,36.5625 C 28.102571,37.304681 24.425802,38.446749 20.8125,39.625 C 17.200009,40.802986 13.693676,41.995401 10.71875,42.84375 C 8.5379899,43.465629 6.8269173,43.771279 5.59375,43.875 C 6.3789191,42.999609 7.4710187,41.917692 8.84375,40.78125 C 12.555108,37.708732 16.8125,34.40625 16.8125,34.40625 C 17.029502,34.246251 17.084294,33.944894 16.9375,33.71875 L 15.25,31.21875 C 15.130504,31.030679 14.902661,30.942074 14.6875,31 z"
transform="translate(0.25,-0.625)" />
<g
id="g7542"
transform="translate(20,0)">
<g
transform="matrix(1.1666667,0,0,1.2,-3.833333,-36.2)"
id="g7162">
<path
style="fill:url(#linearGradient7555);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
d="M -2.34375,51 C -2.5485199,51 -2.7249072,51.101237 -2.84375,51.25 L -6.859375,55.25 C -6.8943841,55.381797 -6.9584881,55.521336 -7,55.65625 L -7,61.177083 C -7,61.540646 -6.7034811,61.833333 -6.34375,61.833333 L 0.34375,61.833333 C 0.52361547,61.833333 0.6951329,61.76445 0.8125,61.645833 L 4.8125,57.645833 C 4.9298671,57.527216 5,57.358864 5,57.177083 L 5,51.65625 C 5,51.474469 4.9298671,51.306117 4.8125,51.1875 C 4.6934039,51.068883 4.5236156,51 4.34375,51 L -2.34375,51 z "
id="rect6100"
sodipodi:nodetypes="cccccccccccscc" />
<path
sodipodi:nodetypes="ccccccccc"
style="fill:url(#linearGradient7557);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
d="M -6.3738568,55.166667 L 0.088142442,55.166667 C 0.43502581,55.166667 0.71428575,55.451224 0.71428575,55.804688 L 0.71428575,61.195312 C 0.71428575,61.548776 0.43502581,61.833333 0.088142442,61.833333 L -6.3738568,61.833333 C -6.7207401,61.833333 -7,61.548776 -7,61.195312 L -7,55.804688 C -7,55.451224 -6.7207401,55.166667 -6.3738568,55.166667 z "
id="path6105" />
</g>
<path
sodipodi:nodetypes="ccccc"
id="path7253"
d="M -5,25 L -10,30 L -6,30 L -1,25 L -5,25"
style="opacity:0.12313433;fill:url(#linearGradient7559);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccccc"
id="path6126"
d="M -1,25 L -10.5,29 L -7,29 L -2,26 L -1,25"
style="fill:#babdb6;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="csssccccccssssccsccsccsccccscc"
id="path7235"
d="M -6.5625,25.5 C -6.586332,25.5 -6.617114,25.506448 -6.71875,25.625 C -6.748761,25.647634 -6.780064,25.668503 -6.8125,25.6875 C -6.832372,25.709273 -6.853227,25.730128 -6.875,25.75 C -6.894872,25.771773 -6.915727,25.792628 -6.9375,25.8125 L -6.96875,25.8125 C -6.988622,25.834273 -7.009477,25.855128 -7.03125,25.875 L -7.21875,26.0625 C -7.325593,26.162845 -7.453812,26.237639 -7.59375,26.28125 L -11.84375,27.5 C -12.244246,27.708356 -12.377785,27.84932 -12.4375,27.96875 C -12.438388,27.970526 -12.403483,28.103321 -12.4375,28.0625 C -12.355653,28.160716 -12.077127,28.314744 -11.59375,28.40625 C -11.253853,28.475121 -10.976692,28.720417 -10.867022,29.049424 C -10.757353,29.378432 -10.831905,29.740965 -11.0625,30 L -11.40625,30.375 C -11.426065,30.462564 -11.460093,30.545084 -11.5,30.6875 C -11.507455,30.714105 -11.491841,30.722726 -11.5,30.75 L -11.5,37.25 C -11.5,37.304188 -11.499624,37.365539 -11.4375,37.4375 C -11.40601,37.473977 -11.334247,37.5 -11.28125,37.5 L -3.4375,37.5 C -3.344928,37.5 -3.269061,37.4898 -3.21875,37.4375 C -3.218918,37.427084 -3.218918,37.416666 -3.21875,37.40625 L 1.4375,32.59375 C 1.489686,32.539502 1.5,32.514607 1.5,32.40625 L 1.5,25.78125 C 1.5,25.6729 1.489688,25.616751 1.4375,25.5625 C 1.400675,25.524775 1.282521,25.5 1.25,25.5 L -6.5625,25.5 z "
style="opacity:0.53358208;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccccccsssccssccsccccccscc"
id="path7229"
d="M -6.5625,24.53125 C -6.950241,24.53125 -7.254192,24.749731 -7.46875,25 L -7.5,24.96875 L -7.53125,25.03125 L -7.875,25.34375 L -12.125,26.5625 C -12.157264,26.569585 -12.188688,26.58006 -12.21875,26.59375 C -12.767664,26.868207 -13.120777,27.147804 -13.3125,27.53125 C -13.504223,27.914696 -13.429021,28.397675 -13.1875,28.6875 C -12.859423,29.081192 -12.329894,29.239888 -11.78125,29.34375 L -12.1875,29.78125 C -12.243792,29.832657 -12.286698,29.897016 -12.3125,29.96875 C -12.343846,30.090131 -12.382395,30.284537 -12.4375,30.46875 C -12.45362,30.50878 -12.464136,30.550844 -12.46875,30.59375 L -12.46875,37.25 C -12.46875,37.54887 -12.355519,37.831675 -12.15625,38.0625 C -11.956981,38.293325 -11.645384,38.46875 -11.28125,38.46875 L -3.4375,38.46875 C -3.113867,38.46875 -2.780607,38.352963 -2.53125,38.09375 L 2.125,33.28125 C 2.35088,33.046445 2.46875,32.741604 2.46875,32.40625 L 2.46875,25.78125 C 2.46875,25.445897 2.350877,25.141055 2.125,24.90625 C 1.901344,24.677132 1.573636,24.53125 1.25,24.53125 L -6.5625,24.53125 z "
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccccc"
id="path7184"
d="M -1,25 L -12,27.5 L -10,29 L -7,29 L -2,26 L -1,25"
style="fill:url(#linearGradient7561);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccccc"
id="path7171"
d="M -5,25 L -12,27 L -8,27 L -1,25 L -5,25"
style="fill:url(#linearGradient7563);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccccc"
id="rect7173"
d="M -12,27 L -8.2868349,27 L -8,27 C -10,28 -8.5,29 -7,29 L -11,29 C -12.5,29 -14,28 -12,27 z "
style="fill:url(#linearGradient7565);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:1" />
<path
style="fill:url(#linearGradient7567);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
d="M -9.5941664,32 L -5.405834,32 C -5.181002,32 -5,32.195125 -5,32.4375 L -5,35.5625 C -5,35.804876 -5.181002,36 -5.405834,36 L -9.5941664,36 C -9.8189979,36 -10,35.804876 -10,35.5625 L -10,32.4375 C -10,32.195125 -9.8189979,32 -9.5941664,32 z "
id="path7275" />
</g>
<path
style="opacity:1;fill:url(#linearGradient7346);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
d="M 29.480478,10.068145 C 28.841463,10.068145 28.32502,10.584057 28.32502,11.222414 L 28.32502,11.510202 C 28.32502,11.803424 28.095708,12.053387 27.781275,12.053387 L 26.218008,12.053387 C 25.578993,12.053387 25.06255,12.756799 25.06255,13.395156 L 25.06255,19.840086 C 25.06255,20.478444 25.578994,20.994355 26.218008,20.994355 L 34.781992,20.994355 C 35.421007,20.994355 35.93745,20.478443 35.93745,19.840086 L 35.93745,13.395156 C 35.93745,12.756798 35.421008,12.053387 34.781992,12.053387 L 33.218725,12.053387 C 32.956948,12.071055 32.67498,11.867091 32.67498,11.527176 L 32.67498,11.222414 C 32.67498,10.584056 32.158536,10.068145 31.519522,10.068145 L 29.480478,10.068145 z"
id="rect7327"
sodipodi:nodetypes="ccccccccccccccccc" />
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7436);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.69999992000000000;stroke-opacity:1"
d="M 29.5625,9.4375 C 28.453144,9.4375 27.577814,10.345513 27.5,11.4375 L 26.5625,11.4375 C 25.40342,11.4375 24.4375,12.403421 24.4375,13.5625 L 24.4375,19.4375 C 24.4375,20.59658 25.403421,21.5625 26.5625,21.5625 L 34.4375,21.5625 C 35.59658,21.5625 36.5625,20.596579 36.5625,19.4375 L 36.5625,13.5625 C 36.5625,12.403423 35.596579,11.4375 34.4375,11.4375 L 33.5,11.4375 C 33.422186,10.345512 32.546855,9.4375 31.4375,9.4375 L 29.5625,9.4375 z "
id="path7350"
sodipodi:nodetypes="ccccccccccccc" />
<g
id="g7393"
style="fill-opacity:1;stroke:url(#linearGradient7428)"
transform="translate(1,-8)">
<path
sodipodi:nodetypes="cc"
id="path7352"
d="M 26.5,26.5 L 26.5,24.5"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7446);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
id="path7362"
d="M 28.5,26.5 L 28.5,24.5"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7448);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
id="path7364"
d="M 30.5,26.5 L 30.5,24.5"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7450);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
id="path7366"
d="M 32.5,26.5 L 32.5,24.5"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7452);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<path
style="fill:url(#linearGradient7658);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient7582);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 14.6875,30.5625 C 14.6875,30.5625 10.498126,33.830189 6.59375,37.0625 C 4.6415622,38.678655 2.8956918,40.28355 1.875,41.84375 C 1.3646541,42.62385 0.8878846,43.466971 1.21875,44.625 C 1.3841827,45.204014 1.8301355,45.746216 2.3125,46.03125 C 2.7948645,46.316284 3.2706533,46.437479 3.8125,46.5 C 5.9363798,46.745063 8.5434834,46.106406 11.65625,45.21875 C 14.769017,44.331094 18.325496,43.136387 21.90625,41.96875 C 25.487004,40.801113 29.102635,39.662687 32.25,38.96875 C 35.397365,38.274813 38.085104,38.083776 39.625,38.46875 C 40.353931,38.650983 40.370552,38.769574 40.375,38.78125 C 40.379448,38.792926 40.439577,39.11668 40.15625,39.71875 C 39.589596,40.92289 37.911115,42.835283 35.96875,44.65625 C 32.08402,48.298184 27.125,51.78125 27.125,51.78125 L 28.875,54.21875 C 28.875,54.21875 33.91598,50.701816 38.03125,46.84375 C 40.088885,44.914717 41.910404,42.95211 42.84375,40.96875 C 43.310423,39.97707 43.620552,38.855512 43.1875,37.71875 C 42.754448,36.581988 41.646069,35.849017 40.375,35.53125 C 37.914896,34.916224 34.93076,35.32675 31.59375,36.0625 C 28.25674,36.79825 24.575496,37.917637 20.96875,39.09375 C 17.362004,40.269863 13.840358,41.489218 10.84375,42.34375 C 7.9314529,43.174239 5.5458184,43.563842 4.375,43.46875 C 4.9949332,42.521138 6.6709378,40.915095 8.53125,39.375 C 12.251874,36.294811 16.5,33 16.5,33 L 14.6875,30.5625 z "
id="path7506"
sodipodi:nodetypes="cssssssssssssccssssssscscc" />
<path
style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient7666);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.19029851;fill-opacity:1.0"
d="M 15.672335,31.269607 C 15.672335,31.269607 -2.765165,43.957107 3.734835,44.707107 C 10.234835,45.457107 31.734835,34.707107 39.734835,36.707107 C 47.734835,38.707107 27.734835,52.707107 27.734835,52.707107"
id="path7502"
sodipodi:nodetypes="cssc" />
<path
style="fill:url(#linearGradient7574);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
d="M 10.088769,30.03125 L 10.40625,32.03125 L 14.59375,32.03125 C 14.818582,32.03125 15,32.226375 15,32.46875 L 15,35.59375 L 17,35.28125 L 17,30.8125 C 17,30.388343 16.685946,30.03125 16.28125,30.03125 L 10.088769,30.03125 z "
id="path7512"
sodipodi:nodetypes="ccccccccc" />
<path
style="fill:url(#linearGradient7818);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642;opacity:0.35447761"
d="M -9.5941664,32 L -5.405834,32 C -5.181002,32 -5,32.195125 -5,32.4375 L -5,35.5625 C -5,35.804876 -5.181002,36 -5.405834,36 L -9.5941664,36 C -9.8189979,36 -10,35.804876 -10,35.5625 L -10,32.4375 C -10,32.195125 -9.8189979,32 -9.5941664,32 z "
id="path7810"
transform="translate(20,0)" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

1
wicd/autoconnect.py
View File

@@ -49,7 +49,6 @@ def error_handler(*args):
if __name__ == '__main__':
try:
time.sleep(2)
wireless.Scan(True)
daemon.SetSuspend(False)
if not daemon.CheckIfConnecting():
daemon.AutoConnect(True, reply_handler=handler, error_handler=handler)

7
wicd/backends/be-ioctl.py
View File

@@ -376,9 +376,8 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
False otherwise.
"""
def error():
print "Unable to find ctrl_interface for wpa_supplicant. " + \
"Could not validate authentication."
error= "Unable to find ctrl_interface for wpa_supplicant. " + \
"Could not validate authentication."
# Right now there's no way to do this for ralink drivers
if self.wpa_driver == RALINK_DRIVER:
@@ -389,7 +388,7 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
socket = [os.path.join(ctrl_iface, s) \
for s in os.listdir(ctrl_iface) if s == self.iface][0]
except OSError:
error()
print error
return True
wpa = wpactrl.WPACtrl(socket)

6
wicd/configmanager.py
View File

@@ -48,7 +48,7 @@ class ConfigManager(RawConfigParser):
""" Returns the path to the loaded config file. """
return self.config_file
def set_option(self, section, option, value, save=False):
def set_option(self, section, option, value, write=False):
""" Wrapper around ConfigParser.set
Adds the option to write the config file change right away.
@@ -65,7 +65,7 @@ class ConfigManager(RawConfigParser):
value = "%(ws)s%(value)s%(ws)s" % {"value" : value,
"ws" : self.mrk_ws}
RawConfigParser.set(self, section, str(option), value)
if save:
if write:
self.write()
def set(self, *args, **kargs):
@@ -98,7 +98,7 @@ class ConfigManager(RawConfigParser):
else:
if default != "__None__":
print 'did not find %s in configuration, setting default %s' % (option, str(default))
self.set(section, option, str(default), save=True)
self.set(section, option, str(default), write=True)
ret = default
else:
ret = None

5
wicd/gui.py
View File

@@ -706,15 +706,14 @@ class appGui(object):
[width, height] = self.window.get_size()
try:
daemon.WriteWindowSize(width, height, "main")
except:
daemon.SetGUIOpen(False)
except dbusmanager.DBusException:
pass
if self.standalone:
sys.exit(0)
self.is_visible = False
daemon.SetGUIOpen(False)
self.wait_for_events()
return True
def show_win(self):

37
wicd/monitor.py
View File

@@ -63,20 +63,29 @@ class ConnectionStatus(object):
self.last_reconnect_time = time.time()
self.signal_changed = False
self.iwconfig = ""
self.trigger_reconnect = False
bus = dbusmanager.get_bus()
bus.add_signal_receiver(self._force_update_connection_status,
"UpdateState", "org.wicd.daemon")
def check_for_wired_connection(self, wired_ip):
""" Checks for an active wired connection.
""" Checks for a wired connection.
Checks for and updates the tray icon for an active wired connection
Returns True if wired connection is active, false if inactive.
Checks for two states:
1) A wired connection is not in use, but a cable is plugged
in, and the user has chosen to switch to a wired connection
whenever its available, even if already connected to a
wireless network
2) A wired connection is currently active.
"""
if not wired_ip and daemon.GetPreferWiredNetwork():
if not daemon.GetForcedDisconnect() and wired.CheckPluggedIn():
self.trigger_reconnect = True
if wired_ip and wired.CheckPluggedIn():
elif wired_ip and wired.CheckPluggedIn():
# Only change the interface if it's not already set for wired
if not self.still_wired:
daemon.SetCurrentInterface(daemon.GetWiredInterface())
@@ -89,14 +98,17 @@ class ConnectionStatus(object):
def check_for_wireless_connection(self, wireless_ip):
""" Checks for an active wireless connection.
Checks for and updates the tray icon for an active
wireless connection. Returns True if wireless connection
is active, and False otherwise.
Checks for an active wireless connection. Also notes
if the signal strength is 0, and if it remains there
for too long, triggers a wireless disconnect.
Returns True if wireless connection is active, and
False otherwise.
"""
# Make sure we have an IP before we do anything else.
if wireless_ip is None:
if not wireless_ip:
return False
if daemon.NeedsExternalCalls():
@@ -158,6 +170,15 @@ class ConnectionStatus(object):
# Check for wired.
wired_ip = wired.GetWiredIP("")
wired_found = self.check_for_wired_connection(wired_ip)
# Trigger an AutoConnect if we're plugged in, not connected
# to a wired network, and the "autoswitch to wired" option
# is on.
if self.trigger_reconnect:
self.trigger_reconnect = False
wireless.DisconnectWireless()
daemon.AutoConnect(False, reply_handler=lambda:None,
error_handler=lambda:None)
return True
if wired_found:
self.update_state(misc.WIRED, wired_ip=wired_ip)
return True

46
wicd/netentry.py
View File

@@ -234,7 +234,7 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
def edit_scripts(self, widget=None, event=None):
""" Launch the script editting dialog. """
profile = self.combo_profile_names.get_active_text()
profile = self.prof_name
cmdend = [os.path.join(wpath.lib, "configscript.py"), profile, "wired"]
if os.getuid() != 0:
cmdbase = misc.get_sudo_cmd(language['scripts_need_pass'])
@@ -535,10 +535,10 @@ class WiredNetworkEntry(NetworkEntry):
""" Load the wired network entry. """
NetworkEntry.__init__(self, dbus_ifaces)
# Center the picture and pad it a bit
self.image.set_alignment(.5, 0)
self.image.set_padding(0, 0)
self.image.set_alignment(.5, .5)
self.image.set_size_request(60, -1)
#self.image.set_from_icon_name("network-wired", 6)
self.image.set_from_file(wpath.images + "wired.png")
self.image.set_from_file(wpath.images + "wired-gui.svg")
self.image.show()
self.connect_button.show()
@@ -555,9 +555,17 @@ class WiredNetworkEntry(NetworkEntry):
# Build the profile list.
self.combo_profile_names = gtk.combo_box_new_text()
self.profile_list = wired.GetWiredProfileList()
default_prof = wired.GetDefaultWiredNetwork()
if self.profile_list:
for x in self.profile_list:
self.combo_profile_names.append_text(x)
starting_index = 0
for x, prof in enumerate(self.profile_list):
self.combo_profile_names.append_text(prof)
if default_prof == prof:
starting_index = x
self.combo_profile_names.set_active(starting_index)
else:
print "no wired profiles found"
self.profile_help.show()
# Format the profile help label.
self.profile_help.set_justify(gtk.JUSTIFY_LEFT)
@@ -580,6 +588,11 @@ class WiredNetworkEntry(NetworkEntry):
self.chkbox_default_profile.connect("toggled",
self.toggle_default_profile)
self.combo_profile_names.connect("changed", self.change_profile)
# Show everything, but hide the profile help label.
self.show_all()
self.profile_help.hide()
self.advanced_dialog = WiredSettingsDialog(self.combo_profile_names.get_active_text())
# Toggle the default profile checkbox to the correct state.
if to_bool(wired.GetWiredProperty("default")):
@@ -587,25 +600,6 @@ class WiredNetworkEntry(NetworkEntry):
else:
self.chkbox_default_profile.set_active(False)
# Show everything, but hide the profile help label.
self.show_all()
self.profile_help.hide()
self.advanced_dialog = WiredSettingsDialog(self.combo_profile_names.get_active_text())
# Display the default profile if it exists.
if self.profile_list is not None:
prof = wired.GetDefaultWiredNetwork()
if prof != None: # Make sure the default profile gets displayed.
i = 0
while self.combo_profile_names.get_active_text() != prof:
self.combo_profile_names.set_active(i)
i += 1
else:
self.combo_profile_names.set_active(0)
print "wired profiles found"
else:
print "no wired profiles found"
self.profile_help.show()
self.check_enable()
self.wireddis = self.connect("destroy", self.destroy_called)
@@ -706,6 +700,7 @@ class WiredNetworkEntry(NetworkEntry):
return
profile_name = self.combo_profile_names.get_active_text()
self.advanced_dialog.prof_name = profile_name
wired.ReadWiredNetworkProfile(profile_name)
self.advanced_dialog.txt_ip.set_text(self.format_entry("ip"))
@@ -734,7 +729,6 @@ class WirelessNetworkEntry(NetworkEntry):
self.image.set_alignment(.5, .5)
self.image.set_size_request(60, -1)
self.image.show()
#self.image.set_from_icon_name("network-wired", 6)
self.essid = noneToBlankString(wireless.GetWirelessProperty(networkID,
"essid"))
self.lbl_strength = GreyLabel()

12
wicd/networking.py
View File

@@ -741,7 +741,8 @@ class WirelessConnectThread(ConnectThread):
self.is_connecting = True
# Run pre-connection script.
self.run_script_if_needed(self.before_script, 'pre-connection', self.network['bssid'], self.network['essid'])
self.run_script_if_needed(self.before_script, 'pre-connection',
self.network['bssid'], self.network['essid'])
# Take down interface and clean up previous connections.
@@ -783,7 +784,8 @@ class WirelessConnectThread(ConnectThread):
self.set_dns_addresses()
# Run post-connection script.
self.run_script_if_needed(self.after_script, 'post-connection', self.network['bssid'], self.network['essid'])
self.run_script_if_needed(self.after_script, 'post-connection',
self.network['bssid'], self.network['essid'])
self.SetStatus('done')
print 'Connecting thread exiting.'
@@ -947,7 +949,8 @@ class WiredConnectThread(ConnectThread):
self.is_connecting = True
# Run pre-connection script.
self.run_script_if_needed(self.before_script, 'pre-connection', 'wired', 'wired')
self.run_script_if_needed(self.before_script, 'pre-connection', 'wired',
'wired')
# Take down interface and clean up previous connections.
self.put_iface_down(liface)
@@ -965,7 +968,8 @@ class WiredConnectThread(ConnectThread):
self.set_dns_addresses()
# Run post-connection script.
self.run_script_if_needed(self.after_script, 'post-connection', 'wired', 'wired')
self.run_script_if_needed(self.after_script, 'post-connection', 'wired',
'wired')
self.SetStatus('done')
print 'Connecting thread exiting.'

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')

40
wicd/wicd-daemon.py
View File

@@ -141,28 +141,28 @@ class WicdDaemon(dbus.service.Object):
""" Sets the wired interface for the daemon to use. """
print "setting wired interface %s" % (str(interface))
self.wired.wired_interface = noneToBlankString(interface)
self.config.set("Settings", "wired_interface", interface, True)
self.config.set("Settings", "wired_interface", interface, write=True)
@dbus.service.method('org.wicd.daemon')
def SetWirelessInterface(self, interface):
""" Sets the wireless interface the daemon will use. """
print "setting wireless interface %s" % (str(interface))
self.wifi.wireless_interface = noneToBlankString(interface)
self.config.set("Settings", "wireless_interface", interface, True)
self.config.set("Settings", "wireless_interface", interface, write=True)
@dbus.service.method('org.wicd.daemon')
def SetWPADriver(self, driver):
""" Sets the wpa driver the wpa_supplicant will use. """
print "setting wpa driver", str(driver)
self.wifi.wpa_driver = driver
self.config.set("Settings", "wpa_driver", driver, True)
self.config.set("Settings", "wpa_driver", driver, write=True)
@dbus.service.method('org.wicd.daemon')
def SetUseGlobalDNS(self, use):
""" Sets a boolean which determines if global DNS is enabled. """
print 'setting use global dns to', use
use = misc.to_bool(use)
self.config.set("Settings", "use_global_dns", use, True)
self.config.set("Settings", "use_global_dns", use, write=True)
self.use_global_dns = use
self.wifi.use_global_dns = use
self.wired.use_global_dns = use
@@ -197,12 +197,11 @@ class WicdDaemon(dbus.service.Object):
print 'search domain is %s' % search_dom
self.config.write()
@dbus.service.method('org.wicd.daemon')
def SetBackend(self, backend):
""" Sets a new backend. """
print "setting backend to %s" % backend
self.config.set("Settings", "backend", backend, True)
self.config.set("Settings", "backend", backend, write=True)
if backend != self.GetCurrentBackend():
self.suspended = True
self.wifi.LoadBackend(backend)
@@ -272,7 +271,7 @@ class WicdDaemon(dbus.service.Object):
@dbus.service.method('org.wicd.daemon')
def SetDebugMode(self, debug):
""" Sets if debugging mode is on or off. """
self.config.set("Settings", "debug_mode", debug, True)
self.config.set("Settings", "debug_mode", debug, write=True)
self.debug_mode = misc.to_bool(debug)
self.wifi.debug = self.debug_mode
self.wired.debug = self.debug_mode
@@ -352,7 +351,8 @@ class WicdDaemon(dbus.service.Object):
"""
print 'setting automatically reconnect when connection drops %s' % value
self.config.set("Settings", "auto_reconnect", misc.to_bool(value), True)
self.config.set("Settings", "auto_reconnect", misc.to_bool(value),
write=True)
self.auto_reconnect = misc.to_bool(value)
@dbus.service.method('org.wicd.daemon')
@@ -453,7 +453,7 @@ class WicdDaemon(dbus.service.Object):
@dbus.service.method('org.wicd.daemon')
def SetSignalDisplayType(self, value):
""" Sets the signal display type and writes it the wicd config file. """
self.config.set("Settings", "signal_display_type", value, True)
self.config.set("Settings", "signal_display_type", value, write=True)
self.signal_display_type = int(value)
@dbus.service.method('org.wicd.daemon')
@@ -483,7 +483,7 @@ class WicdDaemon(dbus.service.Object):
def SetAlwaysShowWiredInterface(self, value):
""" Sets always_show_wired_interface to the given value. """
self.config.set("Settings", "always_show_wired_interface",
misc.to_bool(value), True)
misc.to_bool(value), write=True)
self.always_show_wired_interface = misc.to_bool(value)
@dbus.service.method('org.wicd.daemon')
@@ -497,7 +497,8 @@ class WicdDaemon(dbus.service.Object):
# 1 = default profile
# 2 = show list
# 3 = last used profile
self.config.set("Settings","wired_connect_mode", int(method), True)
self.config.set("Settings","wired_connect_mode", int(method),
write=True)
self.wired_connect_mode = int(method)
self.wired_bus.connect_mode = int(method)
@@ -505,9 +506,8 @@ class WicdDaemon(dbus.service.Object):
def GetWiredAutoConnectMethod(self):
""" Returns the wired autoconnect method. """
return int(self.wired_connect_mode)
@dbus.service.method('org.wicd.dameon')
@dbus.service.method('org.wicd.daemon')
def GetPreferWiredNetwork(self):
""" Returns True if wired network preference is set.
@@ -520,6 +520,7 @@ class WicdDaemon(dbus.service.Object):
@dbus.service.method('org.wicd.daemon')
def SetPreferWiredNetwork(self, value):
""" Sets the prefer_wired state. """
self.config.set("Settings", "prefer_wired", bool(value), write=True)
self.prefer_wired = bool(value)
@dbus.service.method('org.wicd.daemon')
@@ -589,7 +590,7 @@ class WicdDaemon(dbus.service.Object):
self.dhcp_client = int(client)
self.wifi.dhcp_client = int(client)
self.wired.dhcp_client = int(client)
self.config.set("Settings", "dhcp_client", client, True)
self.config.set("Settings", "dhcp_client", client, write=True)
@dbus.service.method('org.wicd.daemon')
def GetLinkDetectionTool(self):
@@ -609,7 +610,7 @@ class WicdDaemon(dbus.service.Object):
"""
self.link_detect_tool = int(link_tool)
self.wired.link_tool = int(link_tool)
self.config.set("Settings", "link_detect_tool", link_tool, True)
self.config.set("Settings", "link_detect_tool", link_tool, write=True)
@dbus.service.method('org.wicd.daemon')
def GetFlushTool(self):
@@ -628,7 +629,7 @@ class WicdDaemon(dbus.service.Object):
self.flush_tool = int(flush_tool)
self.wired.flush_tool = int(flush_tool)
self.wifi.flush_tool = int(flush_tool)
self.config.set("Settings", "flush_tool", flush_tool, True)
self.config.set("Settings", "flush_tool", flush_tool, write=True)
@dbus.service.method('org.wicd.daemon')
def WriteWindowSize(self, width, height, win_name):
@@ -1018,6 +1019,7 @@ class WirelessDaemon(dbus.service.Object):
""" Disconnects the wireless network. """
self.SetForcedDisconnect(True)
self.wifi.Disconnect()
self.daemon.UpdateState()
@dbus.service.method('org.wicd.daemon.wireless')
def GetForcedDisconnect(self):
@@ -1100,6 +1102,7 @@ class WirelessDaemon(dbus.service.Object):
'disconnectscript')
print 'Connecting to wireless network ' + self.LastScan[id]['essid']
conthread = self.wifi.Connect(self.LastScan[id], debug=self.debug_mode)
self.daemon.UpdateState()
@dbus.service.method('org.wicd.daemon.wireless')
def CheckIfWirelessConnecting(self):
@@ -1354,6 +1357,7 @@ class WiredDaemon(dbus.service.Object):
""" Disconnects the wired network. """
self.SetForcedDisconnect(True)
self.wired.Disconnect()
self.daemon.UpdateState()
@dbus.service.method('org.wicd.daemon.wired')
def CheckPluggedIn(self):
@@ -1402,6 +1406,7 @@ class WiredDaemon(dbus.service.Object):
self.wired.after_script = self.GetWiredProperty("afterscript")
self.wired.disconnect_script = self.GetWiredProperty("disconnectscript")
self.wired.Connect(self.WiredNetwork, debug=self.debug_mode)
self.daemon.UpdateState()
@dbus.service.method('org.wicd.daemon.wired')
def CreateWiredNetworkProfile(self, profilename, default=False):
@@ -1474,6 +1479,7 @@ class WiredDaemon(dbus.service.Object):
self.config.set(prof, script, None)
if profilename == "":
self.config.write()
return "500: Bad Profile name"
profilename = misc.to_unicode(profilename)
self.config.remove_section(profilename)