afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Huy Pham 2020-03-04 14:27:29 -08:00
commit 95d36a1792
9 changed files with 224 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/gui/dialogs/preferences.py
View file

@ -56,9 +56,8 @@ class PreferencesDialog(Dialog):
label = ttk.Label(frame, text="Terminal")
label.grid(row=2, column=0, pady=PADY, padx=PADX, sticky="w")
combobox = ttk.Combobox(
frame, textvariable=self.terminal, values=appconfig.TERMINALS
)
terminals = sorted(appconfig.TERMINALS.values())
combobox = ttk.Combobox(frame, textvariable=self.terminal, values=terminals)
combobox.grid(row=2, column=1, sticky="ew")
label = ttk.Label(frame, text="3D GUI")