Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/odemis/gui/cont/acquisition/cryo_acq.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@ def _on_chkbox_save_acquisition(self, evt: wx.Event):

# toggle file controls when saving is enabled
enable = self._panel.chkbox_save_acquisition.IsChecked()
self._panel.lbl_filename.Enable(enable)
self._panel.txt_filename.Enable(enable)
self._panel.btn_cryosecom_change_file.Enable(enable)

Expand Down
62 changes: 25 additions & 37 deletions src/odemis/gui/main_xrc.py
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,6 @@ def __init__(self, parent):
self.fp_acquisitions = xrc.XRCCTRL(self, "fp_acquisitions")
self.streams_chk_list = xrc.XRCCTRL(self, "streams_chk_list")
self.chkbox_save_acquisition = xrc.XRCCTRL(self, "chkbox_save_acquisition")
self.lbl_filename = xrc.XRCCTRL(self, "lbl_filename")
self.txt_filename = xrc.XRCCTRL(self, "txt_filename")
Comment thread
pieleric marked this conversation as resolved.
self.btn_cryosecom_change_file = xrc.XRCCTRL(self, "btn_cryosecom_change_file")
self.btn_cryosecom_acquire = xrc.XRCCTRL(self, "btn_cryosecom_acquire")
Expand Down Expand Up @@ -10169,54 +10168,43 @@ def __init_resources():
<object class="sizeritem">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxFlexGridSizer">
<object class="sizeritem">
<object class="wxStaticText" name="lbl_filename">
<label>Filename</label>
<fg>#E5E5E5</fg>
</object>
<flag>wxTOP</flag>
<border>4</border>
</object>
<object class="sizeritem">
<object class="wxTextCtrl" name="txt_filename">
<size>150,20</size>
<value>Select a destination file</value>
<fg>#2FA7D4</fg>
<bg>#333333</bg>
<style>wxBORDER_NONE|wxTE_READONLY</style>
<XRCED>
<assign_var>1</assign_var>
</XRCED>
</object>
<flag>wxLEFT|wxEXPAND</flag>
<border>1</border>
</object>
<object class="sizeritem">
<object class="wxStaticText">
<label>Filename</label>
<fg>#E5E5E5</fg>
</object>
<flag>wxALIGN_CENTER_VERTICAL</flag>
</object>
<object class="sizeritem">
<object class="wxTextCtrl" name="txt_filename">
<size>-1,20</size>
<value>Select a destination file</value>
<fg>#2FA7D4</fg>
<bg>#333333</bg>
<style>wxBORDER_NONE|wxTE_READONLY</style>
<XRCED>
<assign_var>1</assign_var>
</XRCED>
</object>
<flag>wxLEFT|wxEXPAND</flag>
<border>5</border>
<option>1</option>
</object>
<object class="sizeritem">
<object class="ImageTextButton" name="btn_cryosecom_change_file">
<height>24</height>
<face_colour>def</face_colour>
<label>Change…</label>
<label>change…</label>
<XRCED>
<assign_var>1</assign_var>
</XRCED>
</object>
<flag>wxLEFT</flag>
<border>85</border>
<border>5</border>
</object>
<cols>3</cols>
<rows>1</rows>
<vgap>5</vgap>
<hgap>10</hgap>
<growablecols>1</growablecols>
</object>
<flag>wxLEFT</flag>
<border>10</border>
</object>
<orient>wxHORIZONTAL</orient>
</object>
<option>0</option>
<flag>wxTOP</flag>
<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
<border>10</border>
</object>
Comment thread
pieleric marked this conversation as resolved.
<object class="sizeritem">
Expand Down
61 changes: 25 additions & 36 deletions src/odemis/gui/xmlh/resources/panel_tab_fibsem.xrc
Original file line number Diff line number Diff line change
Expand Up @@ -689,54 +689,43 @@
<object class="sizeritem">
<object class="wxBoxSizer">
<object class="sizeritem">
<object class="wxFlexGridSizer">
<object class="sizeritem">
<object class="wxStaticText" name="lbl_filename">
<label>Filename</label>
<fg>#E5E5E5</fg>
</object>
<flag>wxTOP</flag>
<border>4</border>
</object>
<object class="sizeritem">
<object class="wxTextCtrl" name="txt_filename">
<size>150,20</size>
<value>Select a destination file</value>
<fg>#2FA7D4</fg>
<bg>#333333</bg>
<style>wxBORDER_NONE|wxTE_READONLY</style>
<XRCED>
<assign_var>1</assign_var>
</XRCED>
</object>
<flag>wxLEFT|wxEXPAND</flag>
<border>1</border>
</object>
<object class="sizeritem">
<object class="wxStaticText">
<label>Filename</label>
<fg>#E5E5E5</fg>
</object>
<flag>wxALIGN_CENTER_VERTICAL</flag>
</object>
<object class="sizeritem">
<object class="wxTextCtrl" name="txt_filename">
<size>-1,20</size>
<value>Select a destination file</value>
<fg>#2FA7D4</fg>
<bg>#333333</bg>
<style>wxBORDER_NONE|wxTE_READONLY</style>
<XRCED>
<assign_var>1</assign_var>
</XRCED>
</object>
<flag>wxLEFT|wxEXPAND</flag>
<border>5</border>
<option>1</option>
</object>
<object class="sizeritem">
<object class="ImageTextButton" name="btn_cryosecom_change_file">
<height>24</height>
<face_colour>def</face_colour>
<label>Change…</label>
<label>change…</label>
<XRCED>
<assign_var>1</assign_var>
</XRCED>
</object>
<flag>wxLEFT</flag>
<border>85</border>
<border>5</border>
</object>
<cols>3</cols>
<rows>1</rows>
<vgap>5</vgap>
<hgap>10</hgap>
<growablecols>1</growablecols>
</object>
<flag>wxLEFT</flag>
<border>10</border>
</object>
<orient>wxHORIZONTAL</orient>
</object>
<option>0</option>
<flag>wxTOP</flag>
<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
<border>10</border>
</object>
<object class="sizeritem">
Expand Down