Commit graph

332 commits

Author SHA1 Message Date
Blake Harnden
27a37c77fc made preexisting nodes a local variable, renamed reuseable to delete_nodes for more clarity 2019-11-25 09:52:50 -08:00
bharnden
4e32c9c13c updates to add reuse of deleted subnets 2019-11-22 23:48:10 -08:00
bharnden
e8f8fa3bd5 cleaned up some of the logic for deleting nodes/edges 2019-11-22 16:30:25 -08:00
bharnden
46627aad11 renamed coreclient delete graph nodes func 2019-11-22 15:43:43 -08:00
bharnden
981be3b7ff small cleanup with stopping sessions 2019-11-22 14:58:41 -08:00
Huy Pham
8ffac10a1e status bar 2019-11-22 14:55:10 -08:00
Huy Pham
ad2d3d63f6 Merge branch 'coretk' into coretk-progress 2019-11-22 13:00:25 -08:00
Huy Pham
15e05ac580 work on status bar 2019-11-22 12:59:22 -08:00
bharnden
e20da62366 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-22 12:52:45 -08:00
bharnden
f2b37d32c8 added netaddr library, added logic to support dealing with creating new subnet when needed 2019-11-22 12:51:58 -08:00
Huy Pham
3e2cc80a80 finish service file config 2019-11-22 11:45:44 -08:00
Huy Pham
e39db4bd63 get rid of 2 unnecessary classes for service config 2019-11-22 10:32:25 -08:00
Huy Pham
3a73b10902 service file configs 2019-11-22 10:01:36 -08:00
bharnden
6c0d4d3a93 updated node labels 2019-11-22 09:09:00 -08:00
bharnden
8ff63219a3 increased node icon size, added improve way to offset text regardless of icon size 2019-11-21 22:55:37 -08:00
bharnden
72e9ae75eb fixed issue with changing themes and abg colors not being present 2019-11-21 22:39:39 -08:00
bharnden
a6cdd63570 fixed name issue with app config, renamed to guiconfig 2019-11-21 22:03:07 -08:00
bharnden
fbbf31f4fa added saving session location to config, and query location when joining a session 2019-11-21 21:56:28 -08:00
Blake Harnden
bb7bad89d3 added a default location for now to get emane working, until session location is supported 2019-11-21 17:14:23 -08:00
Huy Pham
c21f060797 service file config 2019-11-21 16:59:55 -08:00
Blake Harnden
97cb1444f3 updates to emane model config storage, fixes to reconnecting to a wlan session 2019-11-21 16:41:38 -08:00
Huy Pham
741477c043 fix merge conflict 2019-11-21 15:07:43 -08:00
Huy Pham
4cd42c2a20 work on service config 2019-11-21 15:00:17 -08:00
Blake Harnden
b983a09ae7 small cleanup to emane config dialog, fixed default service storage to just use names 2019-11-21 14:41:05 -08:00
Huy Pham
a4055f84bd Merge branch 'coretk' into coretk-config 2019-11-21 12:34:28 -08:00
Huy Pham
e059f89520 change some icons 2019-11-21 12:33:43 -08:00
Blake Harnden
9445b63bd2 removed saving default configurations for wlan and mobility by default, updated session.add_node to set default configurations for wlan and emane 2019-11-21 12:29:33 -08:00
Blake Harnden
eced9863ad removed mobility config class to try and help simplify saving configs 2019-11-21 09:40:57 -08:00
Huy Pham
56876710a1 Merge branch 'coretk' into coretk-config 2019-11-21 07:39:35 -08:00
bharnden
6035032e96 removed wlan config class and canvas action class 2019-11-20 23:16:04 -08:00
Huy Pham
37c032afc5 Merge branch 'coretk' into coretk-config 2019-11-20 16:53:05 -08:00
Huy Pham
2e121a3344 service config, trying out some new icons 2019-11-20 16:52:02 -08:00
bharnden
07c07da099 update node config dialog to display fields based on node type, added field for nodes with images 2019-11-20 11:20:08 -08:00
bharnden
c43e5f999c added node config interface display and updated canvas nodes to use core node porotbuf directly for display and saving data 2019-11-20 10:59:30 -08:00
bharnden
695f5c3e66 updated node config layout 2019-11-16 08:54:15 -08:00
bharnden
c93a07415e merged latest from coretk 2019-11-15 23:47:01 -08:00
bharnden
95cd792675 updated check for creating interfaces on nodes 2019-11-15 23:45:01 -08:00
bharnden
8ad9b7d728 removed CustomNode class, added nodeutils and NodeDraw to support defining the current node type to draw and reuse for custom nodes as well 2019-11-15 23:31:41 -08:00
Huy Pham
7f2a2f8043 fix code based on the new changes 2019-11-15 17:26:02 -08:00
Huy Pham
0006bd4abc save service file data change locally and use that for display and for start session 2019-11-15 17:05:03 -08:00
bharnden
7981340b13 added path for creating non core container based nodes 2019-11-15 13:09:53 -08:00
bharnden
f1b7dd3824 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-15 12:39:48 -08:00
bharnden
814d35d7dd removed coreclient edge and updated code to save and use link protobuf data structures 2019-11-15 12:39:08 -08:00
bharnden
6d38058887 update node creation and storage to leverage protobufs directly 2019-11-15 10:22:30 -08:00
bharnden
fa76bbf01b removed unused code in graph and coreclient 2019-11-14 21:39:44 -08:00
Huy Pham
bfcccd8dab Merge branch 'coretk' into coretk-config 2019-11-14 15:21:09 -08:00
Huy Pham
940281a3ee save work 2019-11-14 15:20:07 -08:00
bharnden
aec1126a14 updated canvas dialogs to make use of common canvas redraw/wallpaper logic 2019-11-14 12:58:27 -08:00
bharnden
4d2b84b107 updated wallpaper dialog to now save and redisplay current wallpaper, updated app to display in center of screen on launch 2019-11-14 11:26:20 -08:00
bharnden
31d8781008 fixed emane icon background to alpha, updated wlan icon to have a white cloud instead of alpha 2019-11-13 23:03:12 -08:00
bharnden
145abca863 added theme configuration to preferences dialog 2019-11-13 22:49:32 -08:00
Blake Harnden
d63da73581 updated framescroll to dynamically set bg based on current style 2019-11-13 13:19:18 -08:00
Blake Harnden
08927b180a changed service checklist style 2019-11-13 12:42:16 -08:00
Blake Harnden
40b2c270e4 fixed typo in canvas dialog variable, updated theming to make label frame have a relief groove border 2019-11-13 12:11:37 -08:00
Huy Pham
234554fdc2 Merge branch 'coretk' into coretk-config 2019-11-13 10:52:29 -08:00
Huy Pham
f01a8a4cb2 node service config 2019-11-13 10:51:16 -08:00
Blake Harnden
1e642b6302 merged latest from coretk 2019-11-13 10:49:14 -08:00
Blake Harnden
ca798215e4 updates to leverage theming, initially using a dark theme, updated all dialogs to be contained within a frame to help provide consistent theming 2019-11-13 10:45:43 -08:00
Huy Pham
c652ad2321 fix merge conflicts, continued work on node service configuration 2019-11-13 09:30:49 -08:00
Huy Pham
b69b24d9fc continued work on node service configuration 2019-11-13 09:09:53 -08:00
Blake Harnden
21d116c4c0 Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-13 08:39:54 -08:00
Blake Harnden
02243684d9 merged latest from coretk and updated code to use ttk widgets 2019-11-13 08:38:08 -08:00
bharnden
1693c5942c added ttk theme based on opensource dark theme with minor tweaks for button presses and menu coloring 2019-11-12 22:42:55 -08:00
Blake Harnden
14187ba79c tweaks to retrieving images/icons, updates to toolbar to use ttk widgets 2019-11-12 17:32:34 -08:00
Blake Harnden
b96f8ff999 updated standard tooltip to use delays and have the same style of the canvas tooltip 2019-11-12 13:01:58 -08:00
Blake Harnden
96abea311f cleanup for padding to canvas dialogs 2019-11-12 12:47:29 -08:00
Blake Harnden
469e32b890 finished converting dialogs to use ttk 2019-11-12 12:13:53 -08:00
Huy Pham
66c9063d2e Merge branch 'coretk' into coretk-config 2019-11-11 16:36:33 -08:00
Huy Pham
3dd3d928dd more work on designing node service configuration 2019-11-11 16:34:41 -08:00
Blake Harnden
58a4db6050 updates to convert more dialogs to use ttk widgets when possible 2019-11-11 16:33:51 -08:00
Blake Harnden
a8f06da338 converted canvas dialogs to use ttk widgets 2019-11-11 15:55:39 -08:00
Blake Harnden
691013eeb8 added preferences dialog, updates to try and simplify config saving a bit, adding default preferences configurations 2019-11-11 15:35:48 -08:00
Blake Harnden
f5480c8e35 updated observers dialog to create/edit/delete custom observers and save configuration 2019-11-11 14:04:50 -08:00
Blake Harnden
dd73c96830 added observers to gui config and display them within menu 2019-11-11 13:33:37 -08:00
Blake Harnden
aa718817d0 updates to implement working observer widgets 2019-11-11 13:23:02 -08:00
Huy Pham
2cc4ef5ac0 Merge branch 'coretk' into coretk-config 2019-11-11 10:58:30 -08:00
Huy Pham
13a7aa73a1 draw node service configurations 2019-11-11 10:57:26 -08:00
bharnden
b88abd0f74 added initial code that can help support canvas tooltips for observer widgets 2019-11-10 17:26:38 -08:00
Blake Harnden
5bf0a2ac05 fixed service editing for custom nodes, fixed hiding picker when clicking edit custom nodes 2019-11-08 16:37:00 -08:00
Blake Harnden
78f44e8110 updates to toolbar event handling to eliminate events being sent to other components when displaying pickers 2019-11-08 16:21:36 -08:00
Blake Harnden
3306dbbfae updates to allow custom nodes to be linked with interfaces 2019-11-08 15:43:58 -08:00
Blake Harnden
b0fe5660bd updates to draw custom nodes on the node picker frame 2019-11-08 11:00:22 -08:00
Blake Harnden
22177def1c updates to disable all unimplemented menu options 2019-11-08 10:07:23 -08:00
bharnden
dbaf5dad91 changed tooltip from pack to grid 2019-11-07 22:11:27 -08:00
bharnden
6357062fec removed packing from toolbar 2019-11-07 22:00:46 -08:00
bharnden
99678499ce some refactoring for menubar code 2019-11-07 21:46:40 -08:00
bharnden
be36940bd1 merged latest from coretk 2019-11-07 16:22:34 -08:00
bharnden
c4d2ae599b removed toolbarhelper, moved logic into coreclient, updated start session click 2019-11-07 16:15:29 -08:00
bharnden
173747fd13 renamed coretoolbar to just toolbar 2019-11-07 15:58:02 -08:00
Huy Pham
9898e50739 Merge branch 'coretk-config' into coretk-nodedelete 2019-11-07 15:21:13 -08:00
Huy Pham
707201ce54 work on node deletion 2019-11-07 15:19:01 -08:00
bharnden
2ee77d097d merged latest from coretk 2019-11-07 14:41:32 -08:00
bharnden
4970fb0d55 cleanup for app toolbar, updated toolbar to use grid layout 2019-11-07 14:37:08 -08:00
Huy Pham
dcfd7f8795 working on delete node 2019-11-07 13:23:02 -08:00
bharnden
2873c32c23 custom nodes dialog works for creating, editing, and saving to config in basic case 2019-11-07 11:33:40 -08:00
Huy Pham
98cfb301bb Merge branch 'coretk' into coretk-config 2019-11-07 07:57:48 -08:00
bharnden
613568ca28 updates to get custom nodes dialog to a working state 2019-11-06 23:58:02 -08:00
bharnden
1cf4847835 removed coreclient set session state 2019-11-06 23:16:49 -08:00
bharnden
5d6d22c6eb updated config frame widget to draw tabs for each config group 2019-11-06 22:41:05 -08:00
bharnden
0147bb9988 updated config generation to use config frame where possible 2019-11-06 20:49:09 -08:00
Huy Pham
a0039d3991 Merge branch 'coretk' into coretk-config 2019-11-06 14:37:19 -08:00
Blake Harnden
9987637564 updated and used common frame scroll class where needed, created common config widget to use where all configurations get drawn 2019-11-06 14:36:36 -08:00
Huy Pham
40e1bb0374 add emane configurations to my start_session() 2019-11-06 14:34:41 -08:00
bharnden
b71f93e606 added scrollable frame widget which can re-use code to be the basis for other scrollable frame widgets 2019-11-06 07:22:40 -08:00
bharnden
2b3e071045 updated nodeicondialog to just icondialog, added custom widgets for convenience, listboxscroll and checkboxlist 2019-11-05 22:44:50 -08:00
Blake Harnden
275a03b9e7 added observer widget dialog, still needs to be hooked to where widgets will be kept 2019-11-05 17:32:48 -08:00
Blake Harnden
73b147b152 updated tk servers dialog to save config 2019-11-05 16:56:47 -08:00
Blake Harnden
bff1c26c2a Merge branch 'coretk' of https://github.com/coreemu/core into coretk 2019-11-05 16:18:11 -08:00
Blake Harnden
1c36c5e291 startred custom node dialog, update node services dialog to use service data retrieved from grpc 2019-11-05 16:16:46 -08:00
Huy Pham
6db4be4e13 fix merge conflict 2019-11-05 15:31:32 -08:00
Huy Pham
6405af2429 more work on coretk 2019-11-05 15:15:22 -08:00
Huy Pham
20637da140 change to appropriate toolbar when join session, emane config, emane model config 2019-11-05 14:25:25 -08:00
Blake Harnden
2d1f5edf79 started initial data for gui config file and added example server to it when initially running gui 2019-11-05 13:10:42 -08:00
Blake Harnden
68a5468ffb added servers dialog for distributed core, updated usages of ttk.Combobox to readonly 2019-11-05 12:37:47 -08:00
Blake Harnden
22601a4580 updated wlan config dialog to use common dialog class 2019-11-04 17:18:59 -08:00
Huy Pham
68da6c0c14 Merge branch 'coretk' into coretk-config 2019-11-04 16:25:47 -08:00
Huy Pham
d7280a3f6d work on emane config 2019-11-04 16:24:35 -08:00
Blake Harnden
c5d5226384 updated configutils parser to save values within configoptions, allowing them to be reused to redraw a config 2019-11-04 16:20:35 -08:00
Huy Pham
81e9bda65d fixed broken get_mobility_configs 2019-11-04 15:51:37 -08:00
Huy Pham
bd7055a87c cleared out old files, leftovers from merge 2019-11-04 15:43:05 -08:00
Huy Pham
cdb4ed571b merged latest from coretk and started work on emane configurations 2019-11-04 15:36:34 -08:00
Blake Harnden
8c4ed15629 converted canvas size and scale dialog to use common dialog class 2019-11-04 14:09:59 -08:00
Blake Harnden
2334f0f688 updated canvas background dialog to use common dialog class 2019-11-04 12:29:01 -08:00
Blake Harnden
22a55b69d3 update node service dialog to use common dialog class 2019-11-04 11:34:28 -08:00
Huy Pham
eb862dd9da emane config 2019-11-04 10:48:22 -08:00
Huy Pham
91ab1b0ee6 mobility config, start emane config 2019-11-03 22:58:45 -08:00
bharnden
d4f77a01e3 moved all modules creating dialogs under dialogs package, updated node config and node icon dialogs to use common dialog class, fixed common dialog class show order to fix delayed cases with grab_set 2019-11-02 23:47:43 -07:00
Huy Pham
eabca7dfcf work on wlan configuration 2019-11-02 21:59:29 -07:00
bharnden
b991dc0242 updates to handle delete hook and button states 2019-11-02 14:46:30 -07:00
bharnden
8c1b70822e fixed how hooks get created and sent to grpc StartSession, also query hooks when joining a session 2019-11-02 14:34:00 -07:00
bharnden
c947d8c6c2 update to hooks dialog to leverage grpc, allows for getting hooks and creation 2019-11-02 10:29:16 -07:00
bharnden
09e18889b0 start to hooks dialog and hook dialog create/edit 2019-11-01 18:14:36 -07:00
bharnden
b4f4ecd93d avoid issues when open/save xml provides no value 2019-11-01 16:47:30 -07:00
bharnden
f10acbc8d9 added gui directory check and creation, created module for referencing gui directories 2019-11-01 16:31:40 -07:00
bharnden
0f78acaa0c update method names for drawing main app, moved delete window call into app 2019-11-01 13:57:41 -07:00
bharnden
6c49a73e38 removed old image, fixed get image calls in images.py 2019-11-01 13:45:42 -07:00
bharnden
6fa3beb1c1 refactoring to change core_grpc to core, and update CoreGrpc to be CoreClient and have core now be client, also refactored usages of application to be just app to keep it short 2019-11-01 13:42:49 -07:00
bharnden
1f230146a6 merged grpcmanager with coregrpc 2019-11-01 13:15:45 -07:00
bharnden
5369694797 merged latest from coretk 2019-11-01 11:34:38 -07:00
bharnden
0e5d7a6f80 cleanup for organizing how some parameters are passed around, merging logic into central places, avoiding things like needing to requery a session multiple times for joining 2019-11-01 10:45:47 -07:00
Huy Pham
96d020a53d coretk 2019-11-01 09:01:56 -07:00
Huy Pham
22e773df1b fix merge conflict 2019-11-01 08:56:35 -07:00
Huy Pham
60fff54918 work on wlan config 2019-11-01 08:35:14 -07:00
bharnden
01d3a3158a updated sessions dialog to use common dialog base, cleaned up code and made widgets expandable 2019-10-31 23:17:26 -07:00
Blake Harnden
f0c32304db removed canvas border for configuration options 2019-10-31 15:54:38 -07:00
Blake Harnden
c65c846638 updated configutils to generate a scrollable view for configurations 2019-10-31 15:18:49 -07:00
Blake Harnden
891e9aef9a initial add with a common dialog class and leveraging it for a session options dialog 2019-10-31 14:06:50 -07:00
Huy Pham
46127b44f9 more work on configurations 2019-10-30 13:33:22 -07:00
Huy Pham
2a32a5b1a2 adjust open xml 2019-10-29 09:04:16 -07:00
Huy Pham
5829e3ae42 more work on coretk 2019-10-24 16:50:24 -07:00
Huy Pham
c1ed7f54d8 coretk 2019-10-22 13:17:47 -07:00
Huy Pham
f18d07985a more work on coretk 2019-10-21 16:33:18 -07:00
Huy Pham
38683cb0d0 more work on coretk 2019-10-18 16:42:00 -07:00
Huy Pham
ec2e959bda move images files, create ip and mac for links, progress on node command and node terminal, progress on save and open xml 2019-10-10 17:02:28 -07:00
Huy Pham
8611106c93 basics on redraw components from prev section, work more on start/stop session 2019-10-04 16:52:07 -07:00
Huy Pham
cb03aa261a some work on grpc add nodes and links, some work on query session, redraw nodes 2019-10-03 16:50:49 -07:00
Huy Pham
cbd593eed6 finish the basics of toolbar and start working on simple grpc 2019-10-01 16:25:26 -07:00
Huy Pham
269d7f8f92 create grids 2019-09-30 10:11:29 -07:00
Huy Pham
4bf08af886 added core to coretk dependencies 2019-09-27 16:18:30 -07:00
Huy Pham
2e007935ee toolbar 2019-09-27 16:00:38 -07:00
Huy Pham
a1af60688e add tool tip class to draw tool tip box for the buttons 2019-09-27 15:28:51 -07:00
Huy Pham
5ce340b8b0 progress on tool bar 2019-09-27 14:19:48 -07:00
Huy Pham
b1bac1dda0 progress on core toolbar 2019-09-26 16:05:57 -07:00
Huy Pham
000da143f9 Create a class for menubar and start working on toolbar 2019-09-25 08:29:34 -07:00
Huy Pham
06979141ad Merge branch 'coretk' into sidebar 2019-09-23 11:44:17 -07:00
Huy Pham
f1698de74b toolbar 2019-09-23 11:43:13 -07:00
Huy Pham
1ebe33cabb get rid all the dash lines in menubar 2019-09-20 13:51:01 -07:00
Huy Pham
01a919eb23 finish up menubar 2019-09-20 13:33:42 -07:00
Huy Pham
aa1fb62182 start working on sidebar 2019-09-20 11:58:15 -07:00
Huy Pham
303e96cdd6 finish up menubar 2019-09-20 10:45:35 -07:00
Huy Pham
5297286b7a working on menubar 2019-09-19 16:24:21 -07:00
Blake Harnden
372a690af9 coretk - added to pre-commit 2019-09-18 11:39:48 -07:00
Blake Harnden
2f8935b4c9 coretk - formatting cleanup 2019-09-18 11:26:26 -07:00
Blake Harnden
17d1830176 coretk changed prints to use logging 2019-09-18 11:25:33 -07:00
Blake Harnden
4a9e6febe5 coretk - changes icons.py to images.py 2019-09-18 11:21:41 -07:00
Blake Harnden
8682f01fdc coretk - updated pipfile to install as editable, added convenient run script, updated images to load assuming local path 2019-09-18 11:20:22 -07:00
Blake Harnden
00a37cbb6f coretk - removed python3.7 hard requirement 2019-09-17 13:18:07 -07:00
Blake Harnden
d88ea50ad2 coretk - changes to have app load all images, and some small cleanup 2019-09-15 23:45:13 -07:00
Blake Harnden
6f916995d7 setup coretk left side buttons as radio buttons 2019-09-15 23:16:08 -07:00
Blake Harnden
bcb7bf4a10 coretk change to set a core-icon 2019-09-15 16:38:12 -07:00
Blake Harnden
28e1e7d796 separated graph module from app for coretk 2019-09-15 16:00:01 -07:00
Blake Harnden
70ec532703 initial commit down a path for a possible core python tkinter gui 2019-09-15 15:20:00 -07:00