Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 20:38:27 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[conf.xml] gui improvements

Browse Source 
- non-editable combo box
- set current conf as active selection
- only ignore conf.xml if it's already a symlink
This commit is contained in:
Felix Ruess
2013-09-12 17:47:11 +02:00
parent 7ffb3343e8
commit bcdb047f2d
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+16 -7
View File
@@ -23,9 +23,12 @@ class ConfChooser:
def update_combo(self, combo, list): def update_combo(self, combo, list):
combo.set_sensitive(False) combo.set_sensitive(False)
combo.get_model().clear() combo.get_model().clear()
for i in list: current_index = 0
combo.append_text(i) for (i, text) in enumerate(list):
combo.set_active(0) combo.append_text(text)
if os.path.join(self.conf_dir, text) == os.path.realpath(self.conf_xml):
current_index = i
combo.set_active(current_index)
combo.set_sensitive(True) combo.set_sensitive(True)
def update_label(self): def update_label(self):
@@ -50,8 +53,8 @@ class ConfChooser:
conf_files = [] conf_files = []
pattern = "*conf.xml*" pattern = "*conf.xml*"
backup_pattern = "conf.xml.2[0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]_*" backup_pattern = "conf.xml.*2[0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]_*"
excludes = ["conf.xml", "%gconf.xml"] excludes = ["%gconf.xml"]
for path, subdirs, files in os.walk(self.conf_dir): for path, subdirs, files in os.walk(self.conf_dir):
for name in files: for name in files:
@@ -77,6 +80,7 @@ class ConfChooser:
def backupconf(self, use_personal=False): def backupconf(self, use_personal=False):
timestr = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M") timestr = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M")
if os.path.islink(self.conf_xml): if os.path.islink(self.conf_xml):
if self.verbose:
print("Symlink does not need backup"); print("Symlink does not need backup");
else: else:
newname = "conf.xml." + timestr newname = "conf.xml." + timestr
@@ -100,10 +104,14 @@ class ConfChooser:
def accept(self, widget): def accept(self, widget):
selected = self.conf_file_combo.get_active_text()
if selected == "conf.xml":
print("conf.xml is not a symlink, maybe you want to copy it to your personal file first?")
else:
self.backupconf() self.backupconf()
link_source = self.conf_file_combo.get_active_text() link_source = self.conf_file_combo.get_active_text()
os.remove(self.conf_xml) os.remove(self.conf_xml)
os.symlink(link_source, self.conf_xml) os.symlink(selected, self.conf_xml)
self.update_label() self.update_label()
self.find_conf_files() self.find_conf_files()
@@ -135,6 +143,7 @@ class ConfChooser:
self.conf_xml = os.path.join(self.conf_dir, "conf.xml") self.conf_xml = os.path.join(self.conf_dir, "conf.xml")
self.exclude_backups = True self.exclude_backups = True
self.verbose = False
# MenuBar # MenuBar
mb = gtk.MenuBar() mb = gtk.MenuBar()
@@ -171,7 +180,7 @@ class ConfChooser:
self.conf_label = gtk.Label("Conf:") self.conf_label = gtk.Label("Conf:")
self.conf_file_combo = gtk.combo_box_entry_new_text() self.conf_file_combo = gtk.combo_box_new_text()
self.find_conf_files() self.find_conf_files()
# self.firmwares_combo.connect("changed", self.parse_list_of_airframes) # self.firmwares_combo.connect("changed", self.parse_list_of_airframes)
self.conf_file_combo.set_size_request(600,30) self.conf_file_combo.set_size_request(600,30)