1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00
Commit Graph

33 Commits

Author SHA1 Message Date
Andrew Psaltis
8014a2b16a Added support for disabling nonexistent external tools in the pref_curses.py.
Added a DynRadioButton in curses_misc.py.
2009-04-21 13:16:44 -04:00
Andrew Psaltis
69fe67d6af Generic updates and a bugfix.
curses/README,curses/TODO: Cleaned up and updated respectively
curses/curses_misc.py: added a get_caption() method to MaskingEdit
curses/netentry_curses.py: Actually made the error dialogs work instead of crashing the program.
curses/wicd-curses.py: Changed some capitalization in the help.
2009-04-01 19:01:00 -04:00
Andrew Psaltis
4446016734 Various fixes.
curses/curses_misc.py:
  Simplified changing the "arrow" on the ComboBox, if I decide to do so.                                                             
curses/prefs_curses.py: Added a docstring                                 
curses/wicd-curses.py:                                                    
  'q' or 'Q' quits a dialog without saving now.                           
  Fixed a bug where a scan run while a dialog is up would lock the screen and
    half-close the dialog when it is done.
2009-03-25 12:36:57 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Andrew Psaltis
4ab56b1183 Checkpoint in WirelessNetEntry development
curses/curses_misc.py:
  Refactored some DynWrap internals
  Added MaskingEdit, a password edit
  Modified ComboBox to use a DynWrap internally instead of an AttrWrap
curses/netentry_curses.py:
  Added most of the WirelessNetEntry.  It doesn't save information yet, but it does
    load most of it.  Support for viewing the templated network settings is not
    implemented yet.
curses/wicd-curses.py:
  Activated support for the WirelessNetEntry configurator.  The wired one is not
    implemented yet.
2009-01-06 19:02:27 -05:00
Andrew Psaltis
68036d91ac curses/curses_misc.py:
Added DynWrapper, a wrapper class with which we can dynamically change the
    selectability of a widget.
  Removed ToggleEdit, replaced by DynWrapper.
curses/netentry_curses.py: ADDED.  Network entry configurator dialog.
  Has a base class for the common elements of the wired/wireless NetEntries.
curses/prefs_curses.py: Replaced ToggleEdits with DynWrapped Edits.
curses/wicd-curses.py:
  Rebuilt the connect function into the main keyhandler.  I discovered that
    implementing that the way I had previously done it would have made
    displaying the dialogs a bit more difficult
  Added support for running the NetEntry selector
in/man=wicd-curses.8.in, curses/README:
  Modified to say that the NetEntry dialog is now a WIP (Raise it with 'C')
setup.py:
  Install netentry_curses.py if we are installing the rest of the curses client
  Install the man page only if we want to install the rest of the man pages and
    the curses client
2009-01-04 20:33:31 -05:00
Andrew Psaltis
5b8417e8a8 curses/curses_misc.py:
meta+left/right now sets focus back to whereever you were in the list.
curses/wicd-curses.py:
  Made a custom combobox for the wired networks.  The one during the last commit was actually the wireless list.
  (Hopefully) made the wired network show up when it is actually active.
  Removed appGUI.call_connect and appGUI.connect.  They are no longer needed.
in/man=wicd-curses.8.in: ADDED.  wicd-curses(8) man page
setup.py: Install the above man page if we are installing the rest of the curses client
2009-01-03 22:57:41 -05:00
Andrew Psaltis
0b0f3e0968 curses/curses_misc.py:
meta+right or meta+left now move the selected tab right and left respectively.  Focus goes back to the tabs, though.
  Fixed a bug in ComboBox where show_first does nothing
  Restored get_selected to its original state
curses/prefs_curses.py:
  Moved the automatic reconnect category to "General Settings"
  Made the backend selector actually select the selected backend at first
  Reset the button statuses each time we load the settings
  meta+enter now saves+closes the preferences dialog
curses/wicd-curses.py:
  Turned the wired list into a list of custom SelTexts, so that they can do the connecting/script-choosing/configuring/etc, instead of the dialog itself
  Offset the version in the about dialog a little less
  Recycle the old preferences dialog instead of making a new one if we run it more than once
2009-01-02 22:12:58 -05:00
Andrew Psaltis
8ed394abf3 curses/*.py: updated copyrights to include 2009
curses/wicd-curses.py: Fixed missing comma in the About Dialog text
2009-01-01 00:36:08 -05:00
Andrew Psaltis
f0466be6b8 curses/curses_misc.py:
Added a Dialog class, mostly borrowed from a urwid example
curses/prefs_curses.py:
  Added the DNS domain to the dialog, as was done in the GTK UI
curses/wicd-curses.py:
  Added a semi-pretty about dialog.
curses/README: Activating about dialog is done by "A"
2009-01-01 00:30:53 -05:00
Andrew Psaltis
64741b032a curses/curses_misc.py:
Added a get_edit_text function to ToggleEdit.
  Changed the get_selected function in ComboBox to return the index only.
curses/prefs_curses.py:
  Completed the load+save functions of the UI
  Buttons are now functional.  Only selecting the OK button will save the data for now.
curses/wicd-curses.py:
  Added support for the "Always Show Wired Interface" config option
  Completed support for the preferences dialog
curses/TODO,README: Preferences dialog is done. :-)
2008-12-30 23:10:18 -05:00
Andrew Psaltis
5fd6cca50b Yet another checkpoint in building the Preferences Dialog up to completion. Some of the code isn't used yet, but this should all be done relatively soon.
curses/curses_misc.py:
  Added a function in the ToggleEdit to set its text to something
  Changed the name of ComboText to ComboBox
  Provided the ability to generate the initial parts of a ComboBox w/o needing the screen.
  Added ComboBoxException, a simple derived exception for the ComboBox.  Used it to die of the user never called build_combobox()
curses/prefs_curses.py:
  Changed the names of some of the widgets.
  Adjusted the code to use the modified ComboBox widget
curses/wicd-curses.py:
  Adjusted the code to use the modified ComboBox widget
2008-12-30 21:27:41 -05:00
Andrew Psaltis
2db3b3e60d Checkpoint in getting the Preferences dialog functional. There's still some tweaking left to do.
curses/curses_misc.py: Changed the internal layout of the widgets to allow me to stick buttons on the bottom.
curses/prefs_curses.py: Added rudimentary Dbus support to the dialog.
Started getting the config settings to save to wicd.
Added buttons (which don't do anything yet).
The PrefOverlay has been renamed to PrefsDialog.  The PrefsDialog widget is wrapped around a TabColumns widget.
Added a main entry point into the file to allow for somewhat easier testing.  It can now be called indepentently of wicd-curses, if needed.
curses/wicd-curses.py: Undid a change that caused the ESC key to disconnect from the current network, in addition to its current function.
2008-12-29 22:04:40 -05:00
Andrew Psaltis
689d31b098 curses/curses_misc.py: Added a tabbed interface widget for use in the preferences dialog.
curses/prefs_curses.py: Converted the code to use the tabbed interface found in curses_misc.py.  The dialog now fills up the terminal, but it still does nothing.
curses/wicd-curses.py: Turned the "list" wired section of the interface to a combo box.
2008-12-27 22:35:58 -05:00
Andrew Psaltis
0d4811b129 curses/curses_misc.py: ADDED. Various urwid classes that I use throughout the program.
curses/prefs_curses.py: Frontend is complete.  However, it is still missing buttons and the ability to save information.  Removed code that is now in curses_misc.py.
curses/wicd-curses.py: Removed code that is now in curses_misc.py.  Tweaked the visuals a little bit.
curses/README: Preferences configuration is a WIP now.
curses/TODO: A combo box has been implemented in curses_misc.py, so that part has been removed.  Also added a part about making a man page.
2008-12-27 00:18:03 -05:00