gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 04:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Merged changes from r333 of experimental-nacl, syncing with mainline.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-05-15 01:09:00 -04:00
parent 92c43027c9 0be61f47bf
commit d29cbc843f
5 changed files with 176 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
CHANGES
View File

@@ -1,4 +1,159 @@
------------------------------------------------------------
revno: 394
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: 1.6
timestamp: Thu 2009-05-14 09:44:28 -0400
message:
Merged typo fix from r331 of experimental-nacl.
------------------------------------------------------------
revno: 202.2.40
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Wed 2009-05-13 19:03:29 -0400
message:
Fixed typo in wicd-curses.py.
------------------------------------------------------------
revno: 393
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Thu 2009-05-14 19:37:20 +0800
message:
Fix <b>/</b> tags
------------------------------------------------------------
revno: 392
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: 1.6
timestamp: Tue 2009-05-12 00:06:38 -0400
message:
Merged r330 of experimental-nacl.
------------------------------------------------------------
revno: 202.2.39
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Tue 2009-05-12 00:04:43 -0400
message:
If the screen in wicd-curses is not up and an ui update is requested, abort the
program.
------------------------------------------------------------
revno: 202.2.38
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Mon 2009-05-11 23:52:43 -0400
message:
Merged with r391 of mainline 1.6.
------------------------------------------------------------
revno: 391
committer: Dan O'Reilly <oreilldf@gmail.com>
branch nick: experimental
timestamp: Sun 2009-05-10 13:53:54 -0400
message:
Don't use dbusmanager.DBusException--it doesn't exist.
------------------------------------------------------------
revno: 390
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Sun 2009-05-10 22:51:49 +0800
message:
Made the GUI look better with dark themes
------------------------------------------------------------
revno: 389
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Sun 2009-05-10 22:03:52 +0800
message:
Removed italicized text from the GTK GUI
------------------------------------------------------------
revno: 388
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: 1.6
timestamp: Sun 2009-05-10 09:51:01 -0400
message:
Merged with r328 of experimental-nacl.
------------------------------------------------------------
revno: 202.2.37
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Sun 2009-05-10 09:40:38 -0400
message:
Hopefully fixed bug 355693, related to focus positioning.
------------------------------------------------------------
revno: 202.2.36
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Thu 2009-05-07 00:38:18 -0400
message:
Redid the decorator to look like the other exception-catching decorators in wicd.
------------------------------------------------------------
revno: 202.2.35
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Thu 2009-05-07 00:37:28 -0400
message:
Remerge with mainline, doing nothing.
------------------------------------------------------------
revno: 202.2.34
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Thu 2009-05-07 00:30:25 -0400
message:
Added support for manual distro detection in setup.py.
------------------------------------------------------------
revno: 202.2.33
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Wed 2009-05-06 15:33:12 -0400
message:
Made scans asynchronous so that users can actually access preferences while the daemon is scanning.
------------------------------------------------------------
revno: 202.2.32
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Wed 2009-05-06 15:19:46 -0400
message:
Merged r385 of mainline 1.6.
------------------------------------------------------------
revno: 202.2.31
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Sat 2009-05-02 18:45:36 -0400
message:
Merged r379 of mainline 1.6.
------------------------------------------------------------
revno: 387
committer: Dan O'Reilly <oreilldf@gmail.com>
branch nick: experimental
timestamp: Sat 2009-05-09 20:53:49 -0400
message:
Make bitrates regex work when it's the last entry in a cell.
------------------------------------------------------------
revno: 386
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: 1.6
timestamp: Wed 2009-05-06 18:13:29 -0400
message:
Fixed missing endquote in wicd-client.py.
------------------------------------------------------------
revno: 385
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Tue 2009-05-05 12:56:09 +0800
message:
Updated translations.py
------------------------------------------------------------
revno: 384
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Tue 2009-05-05 12:55:35 +0800
message:
Added code to debug why pynotify fails
------------------------------------------------------------
revno: 383
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Tue 2009-05-05 12:00:22 +0800
message:
updated CHANGES/NEWS
------------------------------------------------------------
revno: 382
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6

12
NEWS
View File

@@ -1,19 +1,19 @@
Wicd 1.6.x Branch
Major Changes:
- Improved tray icon and gui images (thanks to Martin Sagastume)
- Reorganized network list in the gui for easier navigation
- Improved tray icon and GUI images (thanks to Martin Sagastume)
- Reorganized network list in the GUI for easier navigation
- New experimental ioctl backend, which is more cpu-friendly than the
previous one
- Added a curses client (thanks to Andrew Psaltis)
- Added a right-click connection menu to the tray icon
- Added options to specify a dns domain and search domain for static networks
- Added options to specify a DNS domain and search domain for static networks
- Reworked the Preferences menu to be more in line with GNOME standards
- Added support for global scripts
- Made it possible to have optional entries in encryption templates
- Added ability to show libnotify notifications on status change
Minor Changes and Other Enchancements:
Minor Changes and Other Enhancements:
- Better autoconnection behavior
- Tray/GUI will survive the daemon being killed
- Reasons for connection failures will now bubble back to the GUI
@@ -25,11 +25,11 @@ Minor Changes and Other Enchancements:
- Moved scanning to its own thread, which makes GUI and daemon more responsive
during scans
- Made it possible to specify macros in script entries
- The gui will now display the encryption entry dialog if you attempt to
- The GUI will now display the encryption entry dialog if you attempt to
connect to an encrypted network without entering a password
- Static gateway entry is now optional
- Passwords with leading or trailing whitespace are now stored properly
- Many init/config script, man page, and setup.py fixes/updates, including
better autodetection of file placement with regard to sleep hooks and
kde autostart files (thanks to Robby Workman)
KDE autostart files (thanks to Robby Workman)

16
curses/wicd-curses.py
View File

@@ -69,6 +69,9 @@ from optparse import OptionParser
#from grp import getgrgid
#from os import getgroups,system
import logging
import logging.handler
CURSES_REVNO=wpath.curses_revision
# Fix strings in wicd-curses
@@ -684,7 +687,7 @@ class appGUI():
else:
self.wlessLB.body = urwid.SimpleListWalker(wlessL)
else:
self.wlesslb = self.no_wlan
self.wlessLB = self.no_wlan
if daemon.GetAlwaysShowWiredInterface() or wired.CheckPluggedIn():
#if daemon.GetAlwaysShowWiredInterface():
#if firstrun:
@@ -1018,7 +1021,7 @@ class appGUI():
########################################
def main():
global ui
global ui, dlogger
# We are _not_ python.
misc.RenameProcess('wicd-curses')
@@ -1032,6 +1035,11 @@ def main():
import urwid.curses_display
ui = urwid.curses_display.Screen()
#if options.debug:
# dlogger = logging.getLogger("Debug")
# dlogger.setLevel(logging.DEBUG)
# dlogger.debug("wicd-curses debug logging started")
# Default Color scheme.
# Other potential color schemes can be found at:
# http://excess.org/urwid/wiki/RecommendedPalette
@@ -1123,10 +1131,12 @@ setup_dbus()
########################################
if __name__ == '__main__':
parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REVNO,daemon.Hello()))
parser.set_defaults(screen='raw')
parser.set_defaults(screen='raw',debug=False)
parser.add_option("-r", "--raw-screen",action="store_const",const='raw'
,dest='screen',help="use urwid's raw screen controller (default)")
parser.add_option("-c", "--curses-screen",action="store_const",const='curses',dest='screen',help="use urwid's curses screen controller")
parser.add_option("-d", "--debug",action="store_true",
,dest='debug',help="enable logging of wicd-curses (currently does nothing)")
(options,args) = parser.parse_args()
main()
# Make sure that the terminal does not try to overwrite the last line of

2
setup.py
View File

@@ -25,7 +25,7 @@ import subprocess
# Be sure to keep this updated!
# VERSIONNUMBER
VERSION_NUM = '1.6.0a3'
VERSION_NUM = '1.6.0b1'
# REVISION_NUM is automatically updated
REVISION_NUM = 'unknown'
CURSES_REVNO = 'uimod'

1
wicd/netentry.py
View File

@@ -555,6 +555,7 @@ class WiredNetworkEntry(NetworkEntry):
self.image.show()
self.connect_button.show()
self.name_label.set_use_markup(True)
self.name_label.set_label("<b>" + language['wired_network'] + "</b>")
self.is_full_gui = True