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

333 Commits

Author SHA1 Message Date
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
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
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
Adam Blackburn
fa20f7ec01 Added an information button and a dialog 2009-01-09 21:53:59 +08:00
Adam Blackburn
285e47763b Added a name label 2009-01-09 21:12:48 +08:00
Adam Blackburn
db2d00b2b4 Removed network expanders 2009-01-09 20:40:30 +08:00
Robby Workman
b7fd14cdda Merged r238 of NaCl's branch. 2009-01-07 22:26:31 -06:00
Andrew Psaltis
6fabed0974 Merged with r235 of experimental-rworkman. 2009-01-06 19:04: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
Robby Workman
bb8cfb2b9d Added logic for kde4-config (kde4's equivalent to kde-config) 2009-01-05 23:12:49 -06:00
Robby Workman
e00f80c757 Merged latest changes from NaCl. 2009-01-05 10:25:59 -06:00
Andrew Psaltis
2eaa3e3694 in/man=wicd-curses.8.in: Apparently I can't spell "tentative" properly. Thanks to rworkman. 2009-01-04 20:36:12 -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
Robby Workman
c60713cdd6 s/Tenative/Tentative/g in wicd-curses(8) 2009-01-04 02:31:01 -06:00
Robby Workman
f29e6cb1f4 Merged latest nacl branch. 2009-01-04 02:27:44 -06: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
Robby Workman
944c53f7cd Removed a blank line from the end of the slackware init script.
Trivial, but annoying on upgrades for the config() .new stuff.
2009-01-03 00:08:53 -06:00
Andrew Psaltis
a6801c9a10 Merged from rworkman's frankencurses branch.
Includes features from experimental-rworkman
  Curses client installs now. :-)
  Includes r237 of experimental (1.6)
2009-01-02 22:47:06 -05:00
Robby Workman
1a7d9cc071 Merged in the frankencurses branch, which is basically NaCl's branch
plus integration with setup.py and related files.
2009-01-02 21:43:55 -06:00
Robby Workman
48910f50ea Merged in latest from NaCl's branch. 2009-01-02 21:22:17 -06: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
Robby Workman
feedd7b6c5 Merged r237 of mainline. 2009-01-02 20:57:47 -06:00
Robby Workman
40bc486b2e Merged mainline r237 (which includes the changes from here). 2009-01-02 20:54:12 -06:00
Adam Blackburn
bff4f961e7 Changed 25% signal icon to red and 50% signal icon to orange 2009-01-03 10:35:28 +08:00
Robby Workman
93ef894c45 Removed "in keys" from line 415 per NaCl's suggestion. 2009-01-02 20:25:16 -06:00
Dan O'Reilly
3b1f636ae0 Merge in rworkman-experimental 2009-01-02 19:57:21 -05:00
Dan O'Reilly
7cadae7131 Move logic that saves settings for network entries out of gui.py and into netentry.py. 2009-01-02 19:52:28 -05:00
Robby Workman
066237718f Fixed up setup.py and wpath.py to install the curses client.
Added a wicd-curses wrapper script to /usr/bin
Made curses *.py files executable
All of this passes the build test, but not the "WFM" test. :)
2009-01-01 02:02:26 -06:00
Robby Workman
4798d26f9a Merged my experimental branch into this. 2009-01-01 01:43:00 -06:00
Robby Workman
908267f059 Merged NaCl's curses branch into this. 2009-01-01 01:42:20 -06:00
Robby Workman
62ce9b9852 If kde-config fails, then assume kde is not installed, and don't
install the autostart file for kde.
2008-12-31 23:53:30 -06: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
77f0e1c54b Merged with experimental (1.6) branch, r234. 2008-12-31 18:43:15 -05:00
Robby Workman
f67c171b2c Merged r234 from mainline. 2008-12-31 15:52:27 -06:00
Dan O'Reilly
997e523722 Add a domain entry for dns settings.
Display an error if global dns is enabled for a network, but global dns entries aren't entered in the general preferences window.
2008-12-30 23:20:00 -05:00
Andrew Psaltis
f388b22c53 curses/README: Actually changed the text in the file.
Merged with experimental (1.6) branch, r233.  Mmmm... wpathenhancements
2008-12-30 23:12:42 -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
Robby Workman
5de0569fab Merged r233 from mainline 2008-12-30 20:07:52 -06:00