rebase clean up

KCG/config.cfg

@@ -1,31 +0,0 @@
-
-
-[Misc]
-# defined relativ to icons folder
-newPlotLiveIcon= "graph.svg"
-newPlotDataIcon= "folder.svg"
-timingIcon = "clock.svg"
-singleReadIcon = "project.svg"
-acquireSettingsIcon = "wrench.svg"
-startIcon = "media-play-black.svg"
-stopIcon = "media-stop.svg"
-logIcon = "clipboard.svg"
-logCommentIcon = "clipboard_comm.svg"
-guiIcon = "KCG_Logo_r.png"
-# style = 'blue'
-style = 'default'
-# board_detection_method has to be one of 'dev', 'dummy', 'list'
-# 'dev' means: search for /dev/fpga# (# is a number) and use each result as board
-# (be careful when /dev/fpga devices could exist other than for KAPTURE boards)
-# 'dummy' means: create a set of dummy boards all use the device file /dev/fpga0
-# 'list' means: use boards specified with board_list
-# (board_list has to be a python list with device files as strings (e.g. '/dev/fpga0'), becareful the
-# specified /dev/ files will be used with pci without validation)
-board_detection_method = 'dev'
-device_list = []
-# device_names is a mapping for device ids to pretty names, this makes the use of boards more intuitive
-# format is: device_names = {'device id': 'device name', ...}
-# if this is an empty dict it won't be used
-device_names = {'test0': 'ich_bin_toll', 'test1': 'ne'}
-# num_dummy_boards is the number of dummy boards to create
-num_dummy_boards = 5

KCG/widgets/initialconfig.py

@@ -334,8 +334,6 @@ class ConfigSetup(kcgw.KCGWidgets):
         self.logging_label = self.createLabel("Logging")
         self.logging_label.setStyleSheet("font-size:20pt;")
         self.layout.addWidget(self.logging_label)
-        self.disable_logging = self.createCheckbox("Disable Epics", connect=self.disable_epics)
-        self.layout.addWidget(self.disable_logging)
         
         self.configs.append("\n[Logging]")
         self.logging_entries = []
@@ -352,15 +350,6 @@ class ConfigSetup(kcgw.KCGWidgets):
             self.logging_entries.append(self.configs[-1])
 
         self.scrollWidget.setWidget(self.wid)
-        try:
-            import epics
-        except ImportError:
-            self.disable_epics()
-            self.disable_logging.setChecked(True)
-
-    def disable_epics(self, state=True):
-        for le in self.logging_entries:
-            le.value.setEnabled(not state)
 
     def save(self):
         """