From cae57210bc7e99ab52c0b0b21dd8c68219d0fbed Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Tue, 16 Aug 2022 13:55:16 +0200
Subject: [PATCH] add optional project and MIB configuration on CCS startup
---
Ccs/ccs.py | 18 ++++++++++--------
Ccs/editor.py | 2 ++
start_ccs | 16 +---------------
3 files changed, 13 insertions(+), 23 deletions(-)
mode change 100755 => 120000 start_ccs
diff --git a/Ccs/ccs.py b/Ccs/ccs.py
index 16923ab..206f761 100755
--- a/Ccs/ccs.py
+++ b/Ccs/ccs.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
+import os
import sys
import editor
import gi
@@ -16,6 +17,7 @@ cfg = confignator.get_config()
def run():
global cfg
+ global files_to_open
win = editor.CcsEditor()
# cfl.start_editor()
@@ -38,12 +40,11 @@ def run():
cfg = confignator.get_config(file_path=confignator.get_option('config-files', 'ccs'))
# pv = TMPoolView(cfg)
DBusGMainLoop(set_as_default=True)
- if len(sys.argv) > 1:
- for fname in sys.argv[1:]:
- if not fname.startswith('-'):
- win.open_file(fname)
+ if files_to_open:
+ for fname in files_to_open:
+ win.open_file(fname)
else:
- win.open_file('getting_started.py')
+ win.open_file(os.path.join(confignator.get_option('paths', 'ccs'),'getting_started.py'))
Bus_Name = cfg.get('ccs-dbus_names', 'editor')
@@ -52,11 +53,12 @@ def run():
if __name__ == "__main__":
- if '--quickstart' not in sys.argv:
+ if '--setup' in sys.argv:
cfl.ProjectDialog()
Gtk.main()
- else:
- sys.argv.remove('--quickstart')
+ sys.argv.remove('--setup')
+
+ files_to_open = [fn for fn in sys.argv[1:] if not fn.startswith('-')]
run()
Gtk.main()
diff --git a/Ccs/editor.py b/Ccs/editor.py
index 2a30204..5bb1430 100644
--- a/Ccs/editor.py
+++ b/Ccs/editor.py
@@ -1774,6 +1774,7 @@ class CcsEditor(Gtk.Window):
self.log_file = file
return True
+
class UnsavedBufferDialog(Gtk.MessageDialog):
def __init__(self, parent=None, msg=None):
Gtk.MessageDialog.__init__(self, title="Unsaved changes", parent=parent, flags=0)
@@ -1788,6 +1789,7 @@ class UnsavedBufferDialog(Gtk.MessageDialog):
self.show_all()
+
class ActionWindow(Gtk.Window):
def __init__(self, editor, nbuttons=20, ncolumns=2):
super(ActionWindow, self).__init__(title='Action Toolbar')
diff --git a/start_ccs b/start_ccs
deleted file mode 100755
index 2198ed4..0000000
--- a/start_ccs
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python3
-import sys
-# import os
-import confignator
-sys.path.append(confignator.get_option('paths', 'ccs'))
-sys.path.append(confignator.get_option('paths', 'tst'))
-import ccs_function_lib as cfl
-
-
-if __name__ == '__main__':
- files_to_open = []
- # os.path.join(confignator.get_option('paths', 'tst'), 'prep_test_env.py'),
- # os.path.join(confignator.get_option('paths', 'obsw'), 'send_TC.py')
-
- cfl.start_editor(False, *files_to_open, '--terminal')
diff --git a/start_ccs b/start_ccs
new file mode 120000
index 0000000..5208575
--- /dev/null
+++ b/start_ccs
@@ -0,0 +1 @@
+Ccs/ccs.py
\ No newline at end of file
--
GitLab