1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-24 15:12:31 +01:00
Commit Graph

370 Commits

Author SHA1 Message Date
Robby Workman
a830598681 Merged latest changes from NaCl's branch. 2009-01-24 11:27:41 -06:00
Andrew Psaltis
1c425b4b78 Merged with r247 of rworkman's branch, which:
Adds ~crux support to setup.py
  Slightly reformats the wicd-client.1 man page, and fixes a spelling error
  Fixes some stuff in the wicd-client script.  I just accepted the other "nitpicks", too.

I do not know why the wicd.glade file was changed.
There were conflicts in merging of the wicd-client script and man page.
2009-01-23 22:18:18 -05:00
Andrew Psaltis
1b17fde015 setup.py:
Added support for keeping track of the revisions of the curses client
    (%CURSES_REVNO%)
curses/wicd-curses.py:
  Added the ad-hoc controls to the Help dialog
  Set wireless scans to be synchronous (True), to adapt to an API change in mainline
  Added support for OptionParser, added and implemented the option that was
    described in the man page (and -h (help) and --version)
in/wicd=wpath.py.in: Added a curses_revision flag
in/man=wicd-curses.8.in:
  Option parsing has been implemented.  Added the %CURSES_REVNO% flag to the man page.
  Fixed an accidental " added to one of the headers
2009-01-23 22:13:27 -05:00
Andrew Psaltis
abf05c782f Ad-hoc network support is added ("O").
This commit is should be the last one containing new interface elements. :-D
This also may not work directly from the install.  I need to change some stuff
first.
curses/curses_misc.py:
  Fixed bug in Dialog2 where mouse clicks would cause the program to crash
  Added DynEdit and DynIntEdit, Simple DynWrapped widgets, nothing special
    about them
curses/wicd-curses.py:
  Added support for Ad-Hoc network controls (I don't know exactly how this
    works)
curses/README,TODO,in/man=wicd-curses.8.in:
  Ad-Hoc network support has been added
2009-01-23 21:13:36 -05:00
Robby Workman
932bd32472 Fix a misspelling in wicd-client.1, and add linewraps at <80 chars
in the raw text.
2009-01-23 16:06:53 -06:00
Robby Workman
784076926a Some nitpick edits to wicd-client's section that checks for X and offers
to launch the curses client.  This is largely personal preference, so
  no offense will be taken by merge refusal, but I'm not convinced that
  "friendliness" belongs in the file comments :-)
2009-01-23 16:04:07 -06:00
Robby Workman
f6e64b321b Merged r250 of mainline. 2009-01-23 15:45:25 -06:00
Andrew Psaltis
fa2a5a3704 Merged with r250 of the mainline experimental branch. 2009-01-23 09:30:39 -05:00
Dan O'Reilly
290006629b Fix broken Scan() call in autoconnect.py 2009-01-23 08:35:28 -05:00
Robby Workman
a945d205ea Merged Dan's latest commit to mainline. 2009-01-22 23:58:32 -06:00
Dan O'Reilly
540b8b8a3e Tweak a comment 2009-01-22 21:51:03 -05:00
Dan O'Reilly
c494387a80 Tweak autoconnect logic be more likely to work if initial scans don't give us good results. 2009-01-22 21:26:05 -05:00
Robby Workman
da576e2ff9 Added crux support to setup.py 2009-01-21 22:35:46 -06:00
Robby Workman
07f827756a Merged latest changes from NaCl's branch. 2009-01-21 22:12:51 -06:00
Andrew Psaltis
f9726f4066 Merged with r247 of mainline experimental (1.6) branch.
-------------- This line and the following will be ignored ---------
added:
  wicd/guiutil.py
modified:
  encryption/templates/ttls
  setup.py
  wicd/configmanager.py
  wicd/dbusmanager.py
  wicd/gui.py
  wicd/misc.py
  wicd/monitor.py
  wicd/netentry.py
  wicd/networking.py
  wicd/prefs.py
  wicd/wicd-client.py
  wicd/wicd-daemon.py
  wicd/wnettools.py
unknown:
  build/
  install.log
  uninstall.log
  vcsinfo.py
  wpath.py
  curses/bzr_commit
  curses/configscript.py
  curses/current.diff
  init/arch/wicd
  init/debian/wicd
  init/default/wicd
  init/gentoo/wicd
  init/pld/wicd
  init/redhat/wicd
  init/slackware/rc.wicd
  init/suse/wicd
  man/wicd-curses.8
  man/wicd-manager-settings.conf.5
  man/wicd-wired-settings.conf.5
  man/wicd-wireless-settings.conf.5
  man/wicd.8
  other/50-wicd-suspend.sh
  other/55wicd
  other/80-wicd-connect.sh
  other/WHEREAREMYFILES
  other/postinst
  other/wicd.conf
  scripts/wicd
  scripts/wicd-client
  scripts/wicd-curses
  wicd/wpath.py
pending merges:
  Dan O'Reilly 2009-01-20 Add missing guiutil module
    Dan O'Reilly 2009-01-20 Add support for writing config data with whitespace kep...
    Dan O'Reilly 2009-01-19 Fix a few typos in the option gateway code.
    Dan O'Reilly 2009-01-19 Fix bug that was keeping DHCP release from working.
    Dan O'Reilly 2009-01-19 Fix ttls template
2009-01-21 00:09:45 -05:00
Dan O'Reilly
33a08b696e Add missing guiutil module 2009-01-20 23:55:43 -05:00
Andrew Psaltis
a25693d1ab curses/curses_misc.py:
Added support for setting the text in the input dialog
  Changed "body" to "parent" in ComboBox.
  set_focus() unconditionally sets the focus now
  Moved error() to this file.  It fits better here, anyway.
  Reverted TextDialog to its previous state
curses/netentry_curses.py:
  Moved error() to curses_misc.py
curses/wicd-curses.py:
  "Deimplemented" the script configurator, at the suggestion of various folks
    #wicd, and replaced it with a simple instructions dialog.  My original code
    is still there, just commented out.
  Added support for renaming wired network profiles (F2 when over the combo box)
  Fixed various issues caused when deleting wired network profiles.
  Refactored the help/about dialogs to support the old TextDialog
curses/README, in/man=wicd-curses.8.in:
  Script configurator has been "changed"
2009-01-20 23:41:44 -05:00
Dan O'Reilly
f6d7579859 Add support for writing config data with whitespace kept intact.
Propgate debug setting to the ConfigManager instances.
Don't write essid key sections to the config file if we're not actually using them.
2009-01-20 00:32:56 -05:00
Dan O'Reilly
1269bcd048 Fix a few typos in the option gateway code. 2009-01-19 23:45:05 -05:00
Dan O'Reilly
87539f75e7 Fix bug that was keeping DHCP release from working. 2009-01-19 23:37:35 -05:00
Dan O'Reilly
ea4ab09984 Fix ttls template
Add a guiutils module for gui-related functions/classes that are used in multiple modules.
Replace os.access with os.path.exists
Make the static gateway entry optional.
Don't auto-connect/reconnect when the gui is open.
Fix bug that would keep the gui from working if the wired network entry was displayed.
2009-01-19 01:06:57 -05:00
Andrew Psaltis
ce64ce0aa2 curses/configscript_curses.py: ADDED. Script configurator. More or less done.
curses/wicd-curses.py:
  Added suport for the script configurator
curses/README, in/man=wicd-curses.8.in:
  Script configurator now active
setup.py: Install configscript_curses.py with the rest of the stuff
2009-01-17 20:10:10 -05:00
Andrew Psaltis
f01f10d33f Merged with r242 of mainline experimental (1.6) branch. 2009-01-17 15:15:14 -05:00
Andrew Psaltis
be30004f0f Wired network control support is now more-or-less complete
curses/curses_misc.py:
  Made set_focus() actually set the focus
  Added ability for combobox to rebuild itself
curses/netentry_curses:
    Added WiredSettingsDialog.  Sometimes, the "Defaultness" of the network
      takes a little while to show up in the dialog.  Don't know why yet.
    Reorganized some of the AdvancedSettingsDialog code
curses/wicd-curses.py:
    Reactivated WiredComboBox
    Added support for WiredSettingsDialog
    Added ability to create and delete wired network profiles
    Fixed bug where the program could crash on the end of scanning networks if
      timing is slightly off
    Display the screen locker immediately after initiating a scan
curses/README,TODO: Wired network support is complete
in/man=wicd-curses.8.in:
  Wired network support is now complete
  Added revision information to the bottom of the man page
2009-01-17 15:13:53 -05:00
Dan O'Reilly
75219d78c4 Fix bug where encryption keys with non-ascii characters caused crashes.
Only write settings being saved if debug mode is on.
Clear keys entered through the GUI when the encryption checkbox is disabled.
2009-01-17 12:58:02 -05:00
Andrew Psaltis
bb0d43c222 Merged with mainline 1.6 branch, r241, adding in the noexpander stuff 2009-01-16 12:09:20 -05:00
Andrew Psaltis
6e9eb1cd65 curses/wicd-curses.py: ListBox focus-maintaining code completely debugged 2009-01-15 21:46:35 -05:00
Dan O'Reilly
4f22df62b0 Merging in noexpander branch. 2009-01-15 01:25:24 -05:00
Dan O'Reilly
fcf01b12b3 Use dbusmanager in autoconnect.py 2009-01-15 01:22:40 -05:00
Dan O'Reilly
514facb4aa Tweak default window sizes 2009-01-15 01:21:54 -05:00
Robby Workman
b7f66c4f0d Merged latest from NaCl's branch. 2009-01-15 00:14:24 -06:00
Dan O'Reilly
a214a15d24 merge in experimental branch 2009-01-15 00:59:52 -05:00
Dan O'Reilly
2358357f1d Fix bug where be-ioctl scans always reported channels as 1.
Tweak the UI a little bit.
Add debugging output when forced_disconnect gets enabled.
2009-01-15 00:56:02 -05:00
Andrew Psaltis
2685a49779 curses/curses_misc.py:
Modified TextDialog to use a listbox as opposed to one long text box
  Aligned the header on the right in Dialog2 by default
curses/wicd-curses.py:
  Removed the traceback if the user presses ctrl+c
  Refactored about_dialog to support the modified TextDialog
  Added a help dialog.  Raise it with "H"
  Refactored some code in the appGUI constructor so that I can recycle update_netlist()
curses/TODO, curses/README, in/man=wicd-curses.8.in:
  Help dialog now active
in/man=wicd-curses.8.in: Removed redundant scipt selector command
2009-01-13 18:13:24 -05:00
Andrew Psaltis
d842c163b2 Merged with r239 of mainline experimental. 2009-01-13 15:53:10 -05:00
Robby Workman
65becd5afe Merged networking.py patch from experimental to address bug 315238. 2009-01-12 13:49:47 -06:00
Adam Blackburn
d84912aaad Applied patch from https://bugs.launchpad.net/wicd/+bug/315238 to add expandable values to the script parameters 2009-01-12 20:09:11 +08:00
Robby Workman
c526c47c84 Merged NaCl's latest revision (used bzr merge --weave as it handled the
conflicts much better) (and no, I'm not even sure *why* there were
conflicts).
2009-01-12 00:21:09 -06:00
Robby Workman
04f4a31cd5 Merged Adam's latest 1.6-noexpander branch. There was a conflict in
data/wicd.glade around line 450-something -- the y_options flag was
removed in the noexpander branch.  I wasn't sure whether that was
intentional or not, so I left it in to resolve the conflict.  If that
was the wrong decision, it can be fixed later :)
2009-01-12 00:17:20 -06:00
Robby Workman
f5993ea659 Merged upstream experimental branch. 2009-01-12 00:16:34 -06:00
Dan O'Reilly
2978102ba4 merge 2009-01-11 20:15:01 -05:00
Andrew Psaltis
0385fd088e Progress is being made, apparently
curses/curses_misc.py:
  Made Dialog a bit more generic with the new Dialog2, also supports mouse events.
  Included TextDialog and InputDialog as subclasses of Dialog2
curses/netentry_curses.py:
  Changed error() to support Dialog2
  Added support for mouse events
curses/prefs_curses.py:
  Added support for mouse events
curses/wicd-curses.py:
  Added support for wicd's hidden wireless-network functionality
  (Really) finished refactoring for the changes in ComboBox
  Made some transitions a bit more immediate by calling update_ui() manually
  Refactored to about_dialog to support Dialog2
  Added support for mouse events (clicking to select, mostly)
  Added support for retaining current list netlist focus throughout screen updates
  (Hopefully) Added support for handling an instance of 0 available wireless
    networks
in/man=wicd-curses.8.in: Hidden network support is fully functional
man/wicd-client.1: Added a word. (You'll live.)
setup.py: From last commit: Added the python "shebang" to the top of the file
2009-01-11 19:40:29 -05:00
Andrew Psaltis
84cb49a6fc curses/prefs_curses.py:
Finished refactoring to accommodate the ComboBox changes
curses/wicd-curses.py:
  Moved some of the keybinding code around
in/other=WHEREAREMYFILES.in: ADDED.
  File telling the user where the wicd config files are.  Usually symlinked to
    ~/.wicd/WHEREAREMYFILES and installed to the documentation directory
in/scripts=wicd-client.in:
  Make ~/.wicd and link WHEREAREMYFILES if it has not been done so already.
  Start wicd-curses if there is no X server on this console
    (determined by the presence of $DISPLAY), and add a file detailing this
man/wicd-client.1: Added note about wicd-client starting wicd-curses
setup.py: Install WHEREAREMYFILES along with the rest of the documentation
2009-01-11 13:05:01 -05:00
Dan O'Reilly
32bb203849 Initial crack at reworking GUI some more. 2009-01-09 23:58:14 -05:00
Adam Blackburn
ac6df8d370 A few minor cosmetic changes
Changed main GUI name from Wicd Manager to Wicd Network Manager
2009-01-10 11:03:41 +08:00
Andrew Psaltis
099ca813fb Forgot to mention something in the last commit:
in/wicd-curses.8.in: added more unimplemented keystrokes
Merged with r238 of the main experimental (1.6) branch.
2009-01-09 20:43:18 -05:00
Andrew Psaltis
d1846cb627 curses/curses_misc.py:
Refactored some ComboBox internals
  Renamed show_first to focus in ComboBox
  Added callback support
curses/netentry_curses.py:
  Renamed NetEntryBase to AdvancedSettingsDialog, and WirelessNetEntry to
    WirelessSettingsDialog
  The "WirelessSettingsDialog" is complete. :-)  Raise it by pressing "C" on a wireless
    network.  Much of the code was taken from netentry.py.  The buttons aren't pretty
    like they are in the Preferences Dialog, but they are fully functional.
curses/prefs_curses.py:
  Refactored to accommodate the ComboBox changes
  Added a warning about changing backends
curses/wicd-curses.py:
  Refactored to accommodate changes to the rest of the program
  Added a constantly displayed message saying how to exit the program, other than
    ctrl+c
curses/TODO: Removed a bunch of stuff that is already implemented, added some stuff that
    needs to be implemented
curses/README: Added/clearified some things
2009-01-09 20:42:12 -05:00
Adam Blackburn
add92a099b Don't expand the DNS domain 2009-01-10 08:53:55 +08:00
Adam Blackburn
9841fa7788 Made the information dialog look nicer -- added description labels and left aligned everything 2009-01-10 08:36:19 +08:00
Adam Blackburn
adcea1f44a Information dialog now uses real labels instead of grey labels 2009-01-09 22:54:24 +08:00