Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Psaltis 42bb9aa487 Merged in curses-uimod changes from experimental-nacl. 2009-03-24 12:30:25 -04:00
Andrew Psaltis a5e3810c9a Merge 336 of mainline 1.6. 2009-03-24 09:01:02 -04:00
Andrew Psaltis 8679831f0b Made the help in wicd-curses.py all read out on one line. per entry 2009-03-24 08:12:07 -04:00
Andrew Psaltis dcee372acd Merged r335 of mainline 1.6. 2009-03-23 12:32:03 -04:00
Andrew Psaltis 066f401775 Improved the timing in general.
Decreased the clock update time to 500 ms.
Ensured that the wheel when connecting doesn't alternate weirdly.
  Fixing this may also improve performance.
2009-03-22 21:00:40 -04:00
Andrew Psaltis 8f263c16dc Changed the clock in wicd-curses.py to update every 0.9 seconds. 2009-03-22 19:25:19 -04:00
Andrew Psaltis fe73ee6421 Merged in r331 of mainline 1.6. 2009-03-22 00:22:07 -04:00
Andrew Psaltis ca6dc60647 Merged curses-uimod. It works well enough for me at the moment. 2009-03-21 23:21:31 -04:00
Andrew Psaltis 064fa05d61 Updated docs to note that enter results in connecting. 2009-03-21 23:18:03 -04:00
Andrew Psaltis b5617181d2 Merged r329 of mainline 1.6. 2009-03-21 22:28:05 -04:00
Andrew Psaltis cb40bfa3cb Merged in enctemplates error handling fixes. 2009-03-21 17:33:41 -04:00
Andrew Psaltis 547a3f1b88 Re-enabled "enter" in wicd-curses.py. 2009-03-19 12:48:28 -04:00
Andrew Psaltis 3c740d0cf1 Merged in Dan's enctemplates branch, and repaired two code merge conflicts. 2009-03-18 23:37:28 -04:00
Andrew Psaltis 3152c5db1e Merged r295 of experimental-nacl 2009-03-18 23:00:32 -04:00
Andrew Psaltis 4a8c98e6d2 Dump descriptions of error messages to stderr instead of stdout. 2009-03-16 21:12:36 -04:00
Andrew Psaltis 27000c1e8a Merged in resolvconf support from mainline 1.6, r325. 2009-03-16 20:59:06 -04:00
Andrew Psaltis f2f7299c98 Fixed some keypress shenanigans
curses/wicd-curses.py: Fixed mouse events being passed to keypress functions (again)
curses/prefs_curses.py: Fixed some translations
curses/curses_misc.py:
  Fixed mouse handling in TabColumns
  Fixed callbacks to non-global keypresses in OptCols
2009-03-14 20:54:45 -04:00
Andrew Psaltis 857d19b0ec Merged setup.py changes from experimental-nacl, r293. 2009-03-14 16:56:06 -04:00
Andrew Psaltis 9104540247 Merged r324 of mainline 1.6. 2009-03-12 14:40:58 -04:00
Andrew Psaltis ee2a1020c0 Merged with experimental-nacl, r292 2009-03-11 20:34:52 -04:00
Andrew Psaltis fa2145099f Merge with mainline 1,6, r323. 2009-03-11 20:32:36 -04:00
Andrew Psaltis 2d3745f39b Fixed some bugs/usability issues
Enter is no longer mapped to anything
Arrow left is no longer mapped to anything
Edit text when it is unfocusable is now brown.
Fixed problem where scrolling up on the Preferences Dialog would somehow shift the dab over one.
2009-03-11 10:21:20 -04:00
Andrew Psaltis d336a0f42d Fixed the fix. 2009-03-08 18:31:36 -04:00
Andrew Psaltis 98277aafb2 Fixed the Lunar init script. 2009-03-08 18:02:44 -04:00
Andrew Psaltis e699bd5bcb Fixed wicd-curses to support the new template backend.
Made the cacert and clcert fields optional in the eap-tls template.
2009-03-08 17:45:38 -04:00
Andrew Psaltis 1327bfcc32 Added an init script for Lunar Linux. 2009-03-08 17:38:47 -04:00
Andrew Psaltis df6955b963 Fixed most keypresses not working. 2009-03-07 19:53:10 -05:00
Andrew Psaltis 7d5fac6f0a Added mouse support to OptCols. Everything works :-).
This branch will be merged into experimental-nacl once I'm sure that everything works, and I update the documentation.
2009-03-07 16:26:41 -05:00
Andrew Psaltis 9dd7e06b99 Merged r294 of experimental-nacl 2009-03-07 14:49:51 -05:00
Andrew Psaltis f30122dd2f Merged wicd-curses changes from experimental-nacl, r294 2009-03-07 11:38:37 -05:00
Andrew Psaltis 46ddb41966 Fixed translations.py support in wicd-curses. 2009-03-07 11:34:22 -05:00
Andrew Psaltis 852de07893 Merged r317 of mainline 1.6 2009-03-06 19:40:10 -05:00
Andrew Psaltis 45eae059e5 Made the wicd-curses script add WHEREAREMYFILES
Moved WHEREAREMYFILES to /var/lib/wicd, and adapted setup.py, wpath.py, and
  the wicd-client script to support it
Fixed a typo in setup.py
2009-03-06 19:28:09 -05:00
Andrew Psaltis a217f0fdc2 Fixed the "left does not quit the preferences dialog" problem in wicd-curses. 2009-03-06 15:41:19 -05:00
Andrew Psaltis 421c108f04 curses/prefs_curses.py: Adapted widgets for integration into the main UI
curses/curses_misc.py:
  Removed the "bottom_part" from the TabColumns
curses/wicd-curses.py:
  Added support for editing preferences directly in the main UI w/o a dialog
  'left' now only quits with saving for the NetworkSettingsDialogs
    (suggestions as for what to do here would be appreciated)
2009-03-06 12:49:27 -05:00
Andrew Psaltis 32d0d57b6d Made the keymappings displayed in the OptCols actually do what they say they're suppoed to do.
Updated the README
2009-03-05 23:13:29 -05:00
Andrew Psaltis dc49a2fc4f More htoppish ui changes
curses/prefs_curses.py: changed save_results to save_settings
curses/curses_misc.py:
  M^[ and M^] shift the tabs left and right respectively.  The curses module
    has trouble picking up M^left and M^right
curses/netentry_curses.py:
  Removed the buttons and button-related code from the interface.
  Removed the overlay code.
  Adapted the code for direct insertion into the wicd-curses interface
curses/wicd-curses.py:
  Teaked the wireless header.
  Added support for sticking the network config dialog into the interface, and
    changing the current OptCols when it is activated.
  Added new OptCols for other large dialogs
2009-03-05 23:09:17 -05:00
Andrew Psaltis 6690d9bb32 Actually made window resizing not drop the help screen. 2009-03-05 11:20:43 -05:00
Andrew Psaltis ea7f8ac627 Modified the help dialog in wicd-curses so that it fills up the entire screen.
There may still a formatting issue, will wait on user opinion before changing.
2009-03-05 10:09:23 -05:00
Andrew Psaltis b4516acead Fixed the wireless network header when we are only seeing wireless networks. 2009-03-04 17:01:00 -05:00
Andrew Psaltis 48724d9065 curses/curses_misc.py:
Added a non-selectable listbox for the wireless network header
curses/wicd-curses.py:
  Updated the wireless list-header generating function and activated it.
  Removed/deactivated some unused code.
2009-03-04 16:54:26 -05:00
Andrew Psaltis 0dfe5432bd curses/curses_misc.py:
added support for Meta and Ctrl being applied to keys in OptCols
curses/wicd-curses.py
  Changed the colors slightly, colorized the clock.
2009-03-04 00:56:17 -05:00
Andrew Psaltis e2c50e1090 Merged in translations.py changes (r315) from mainline 1.6. 2009-03-04 00:41:28 -05:00
Andrew Psaltis a1169cb1df Added translations.py, and adapted all gtk and curses ui files to use it.
Moved the language dict functions and get_gettext to translations.py.  Also
  killed the functions and laid the dict bare in the file
Removed all instances of language[number] from wicd.
2009-03-04 00:02:14 -05:00
Andrew Psaltis a290b12e68 curses/wicd-curses.py:
Replaced idle_incr with a clock that counts seconds.
  Streamlined some of the footer functions
  The connecting progress-wheel now updates independently of any other counter.
  Increased status updating time to 2 seconds (from 1.5)
2009-03-02 14:05:25 -05:00
Andrew Psaltis ab878c231f curses/curses_misc.py: Added a colon to each entry in OptCols
curses/wicd-curses.py: 
  Removed the 'print ""' from the end of the main entry point
  Changed the infobar colors to grey on dark blue
2009-03-01 23:53:59 -05:00
Andrew Psaltis 1bf166afe0 Things are coming along...
curses/netentry_curses.py: Realigned some text
curses/curses_misc.py:
  Added support for clicking stuff (doesn't do anything except change a label
    for now)
  The keys 'left' and 'right' now accepted, and translated into fake arrows
  Added a debug mode for the OptCols
curses/wicd-curses.py:
  Removed if loop in locals() from the exception wrapper, this was causing bugs
    in OptCols to spam my console
  Debug mode on the optcols is set to default (for now)
  Cleaned up idle_incr
  Removed some of the exception wrappers
2009-03-01 20:47:08 -05:00
Andrew Psaltis 940f563ec5 curses/curses_misc.py: Added a htop-like OptCols
curses/wicd-curses.py:
  Added support for OptCols.  Some of the keys in there are not valid as of yet.
2009-02-28 18:58:12 -05:00
Andrew Psaltis 780685c842 Merged with r291 of experimental-nacl 2009-02-28 11:32:29 -05:00
Andrew Psaltis 809604f101 Merge r311 of mainline 1.6 2009-02-28 08:48:21 -05:00
Andrew Psaltis 432f1c96ca curses/netentry_curses.py:
Made the password field actually keep its "passwordiness" when we go to the
    buttons.
in/scripts=wicd-client.in:
  Added support for X being off and wicd-curses not being there
2009-02-28 08:40:02 -05:00
Andrew Psaltis af62a5d76a Made the Slackware init script look more like the rest of the Slackware init scripts. 2009-02-24 10:28:03 -05:00
Andrew Psaltis fe7062371c curses/wicd-curses.py:
Console display defaults to raw_display now, added -c argument to select curses_display
curses/README,in/man=wicd-curses.8.in:
  Updated stuff done in wicd-curses.py
2009-02-21 19:36:57 -05:00
Andrew Psaltis 9ea38a8ebc Merged experimental-nacl r288, and updated wicd-curses revno. 2009-02-21 01:37:38 -05:00
Andrew Psaltis 117240c7cd Added the translations to .bzrignore (hopefully that is all of it). 2009-02-21 01:23:29 -05:00
Andrew Psaltis bf0f9daf3c Force utf8 encoding in wicd-curses.py. Hopefully this won't break compat on non-utf8 consoles. 2009-02-21 01:17:59 -05:00
Andrew Psaltis 9fef4a64a8 Merged r306 of mainline 1.6 2009-02-21 01:17:22 -05:00
Andrew Psaltis 3c76bed01b Merged misc.py and .bzrignore changes from experimental-nacl r285. 2009-02-20 22:06:59 -05:00
Andrew Psaltis f1920f7c7a .bzrignore: Added some stuff that I missed. 2009-02-20 21:54:30 -05:00
Andrew Psaltis 8366c74c08 .bzrignore: Added files generated from the build to .bzrignore
wicd/misc.py:
  Decode all unicode fonts before a client handles them.  Prevents wicd-curses
  from dying due to having to display non-latin characters.
2009-02-20 21:44:16 -05:00
Andrew Psaltis 88b179c154 Merged with r304 of mainline 1.6. 2009-02-20 00:36:51 -05:00
Andrew Psaltis d385e61b6f Fixed regex problem in wicd/misc.py. 2009-02-19 18:14:40 -05:00
Andrew Psaltis 562b8605cd Merged with experimental-nacl, r282. 2009-02-18 07:42:48 -05:00
Andrew Psaltis 1ab13ae618 curses/curses_misc.py:
Fixed some of the arguments in MaskingEdit
curses/netentry_curses.py:
  Added an autoconnect switch to the WirelessSettingsDialog
  Reformatted some code
  Ensured that the buttons are glued to the bottom of the dialog
AUTHORS:
  Changed Adam's e-mail to match the ones in the man page.
AUTHORS, in/man=wicd.8.in:
  Added/updated my e-mail
in/man=wicd-curses.8.in:
  Removed mention of the keymap modification (too difficult/potentially
    problematic)
  Removed mention of my branch, bugs can be tagged with "wicd-curses" or something
    like that
2009-02-17 20:04:50 -05:00
Andrew Psaltis 0b5a55ae5d Merged with experimental-nacl, r281. 2009-02-16 10:46:54 -05:00
Andrew Psaltis 080f7216b2 curses/wicd-curses.py: Removed the redraw_tag, since I discovered that I don't need it. 2009-02-16 10:43:57 -05:00
Andrew Psaltis d8881f2606 Merged r298 of mainline 1.6. 2009-02-16 10:39:19 -05:00
Andrew Psaltis fbde90e744 Merged mainline r297 of 1.6. 2009-02-13 13:27:38 -05:00
Andrew Psaltis 533eb46eed Merged with r294 of mainline 1.6. 2009-02-12 00:38:24 -05:00
Andrew Psaltis f4321d4411 Some minor code cleanup and fixes
curses/wicd-curses.py: Fixed lag upon completing connections
curses/wicd-curses.py,curses/prefs_curses.py,curses/curses_misc.py:
  Cleaned up some code, removed/reformatted some comments
2009-02-11 10:44:57 -05:00
Andrew Psaltis a3f3140ac5 Merged with r291 of mainline 1.6. 2009-02-10 20:55:11 -05:00
Andrew Psaltis e5dbf2755f curses/wicd-curses.py:
Added a mention of the About dialog in the help
curses/prefs_curses.py:
  Fixed mouse support
in/man=wicd-curses.8.in
  Added a mention of the about dialog
2009-02-08 12:26:50 -05:00
Andrew Psaltis 5a9b8ed9a5 Merged r285 of mainline 1.6
The last commit should have read:
  curses/netentry_curses.py:
    Fixed a bug where we are unable to save any individual network information.
  curses/wicd-curses.py
    Added information to the uppermost footer text telling how the user can
      display the help dialog.
  The last commit fixed the removal of a blank string in prefs_curses from the
  backends list, that no longer has a blank string in it any more.
2009-02-07 23:24:08 -05:00
Andrew Psaltis f437f17b58 curses/wicd-curses.py: ListBox focus-maintaining code completely debugged 2009-02-05 16:33:45 -05:00
Andrew Psaltis 96f55c0d3b curses/prefs_curses.py:
Removed the external entry point
  Removed the removing of a blank string that caused
wicd/misc.py:
  Made sure that "advanced_settings" in get_language_list_gui() actually is
    "Advanced Settings"
2009-02-04 17:28:43 -05:00
Andrew Psaltis bb3be43a3e Merged with mainline 1.6, r279 2009-02-04 17:13:04 -05:00
Andrew Psaltis 00d45d5eec Merged with r265 of mainline 1.6, providing PyLintish fixes 2009-01-31 02:13:18 -05:00
Andrew Psaltis b86ec8667c curses/wicd-curses.py:
Made the tagged wireless network actually show the network we're connected to,
    or not, as the case may be.
  Added ' -- ' to the upper statusbar

Also, in the last commit, configscript_curses should be netentry_curses
2009-01-31 02:07:50 -05:00
Andrew Psaltis a89e45f0c8 curses/configscript_curses.py:
Added translations
  Removed the redundant run() function in WirelessSettingsDialog
curses/wicd-curses.py:
  Added translations, some still missing.
wicd/misc.py:
  Added some translations that are not in the database, but are in the translator
2009-01-31 01:33:11 -05:00
Andrew Psaltis 0d669c4e84 Merged with r264 of the mainline, providing a bugfix. 2009-01-30 23:48:44 -05:00
Andrew Psaltis 7cde91e14a curses/configscript_curses.py:
Fixed the typo that rworkman noticed.
curses/wicd-curses.py:
  Ensured that the upper status bar updates itself immediately after a
    connection is made, as opposed to a second or two after the fact
curses/README: Added a FAQ and added the new keybindings
in/man=wicd-curses.8.in: Added the new keybindings
2009-01-30 23:46:07 -05:00
Andrew Psaltis d137cbad85 curses/wicd-curses.py:
Added some stuff to the help dialog.
  '?' and 'h' now raise the help dialog
  'q' now quits the client.
  Keymaps are now colored white in the help dialog.
2009-01-30 00:30:33 -05:00
Andrew Psaltis 7ed5b9fcb7 Merged with r263 of the mainline 1.6 branch, which (somehow) contains more changes than what I originally had in "r265". 2009-01-29 23:29:58 -05:00
Andrew Psaltis e030e5980d curses/wicd-curses.py:
Applied some typographical changes from rworkman
  Fixed the script showing dialog for wireless networks.
2009-01-29 23:25:02 -05:00
Andrew Psaltis b5f6fcc702 Merged in (only) r261 of rworkman's branch, which quotes the strings in the wicd-client script.
Also, the revision numbers of the mainline have changed on me.  r263 contained all of the translations that I requested.
2009-01-29 15:55:32 -05:00
Andrew Psaltis badcd6d9bf Merged with r265 of mainline 1.6, giving me most of the remaining translations that I need. 2009-01-27 21:50:24 -05:00
Andrew Psaltis 26e636e2f2 wicd/misc.py:
Fixed a typo in get_language_list_gui
    (%CURSES_REVNO%)
curses/wicd-curses.py:
  Added in some translations (not done yet)
curses/prefs_curses.py:
  Added all of the translations
  Removed the warning about changing the backends (since it is useless)
2009-01-27 21:46:52 -05:00
Andrew Psaltis b5f664632e Merged with r262 of mainline 1.6, which adds some bugfixes and the translations I need for my next commit. 2009-01-26 23:43:40 -05:00
Andrew Psaltis 887b48704f Merged with r260 of the mainline 1.6 branch. 2009-01-25 23:07:47 -05:00
Andrew Psaltis ff11a52abb curses/prefs_curses.py: Added support for the "Prefer Wired Networks" function. 2009-01-25 23:05:46 -05:00
Andrew Psaltis 3b8966d1a1 Merged with r254 of mainline 1.6 branch. 2009-01-25 17:37:23 -05: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
Andrew Psaltis fa2a5a3704 Merged with r250 of the mainline experimental branch. 2009-01-23 09:30:39 -05: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
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
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