Skip to content

Commit

Permalink
Mac version GUI improvement.
Browse files Browse the repository at this point in the history
  • Loading branch information
BiologyTools committed Feb 27, 2023
1 parent d3210ed commit 9474aa4
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 10 deletions.
15 changes: 14 additions & 1 deletion Glade/BioConsole.glade~
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<child>
<object class="GtkFixed">
<property name="width-request">451</property>
<property name="height-request">62</property>
<property name="height-request">67</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
Expand Down Expand Up @@ -141,6 +141,19 @@
<property name="y">10</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="resultBox">
<property name="label" translatable="yes">Open Result in New Tab</property>
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="y">35</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
Expand Down
5 changes: 3 additions & 2 deletions Glade/Console.glade
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
</child>
<child>
<object class="GtkFixed">
<property name="height-request">64</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
Expand All @@ -58,7 +59,7 @@
</object>
<packing>
<property name="x">400</property>
<property name="y">7</property>
<property name="y">15</property>
</packing>
</child>
<child>
Expand All @@ -71,7 +72,7 @@
</object>
<packing>
<property name="x">293</property>
<property name="y">8</property>
<property name="y">15</property>
</packing>
</child>
<child>
Expand Down
23 changes: 18 additions & 5 deletions Glade/Console.glade~
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<property name="receives-default">True</property>
</object>
<packing>
<property name="x">381</property>
<property name="x">400</property>
<property name="y">7</property>
</packing>
</child>
Expand All @@ -70,7 +70,7 @@
<property name="receives-default">True</property>
</object>
<packing>
<property name="x">278</property>
<property name="x">293</property>
<property name="y">8</property>
</packing>
</child>
Expand Down Expand Up @@ -98,7 +98,7 @@
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="x">110</property>
<property name="x">89</property>
<property name="y">6</property>
</packing>
</child>
Expand All @@ -120,15 +120,28 @@
<child>
<object class="GtkRadioButton" id="tabRadioBut">
<property name="label" translatable="yes">Tab</property>
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<property name="group">selRadioBut</property>
</object>
<packing>
<property name="x">110</property>
<property name="x">81</property>
<property name="y">29</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="resultsBox">
<property name="label" translatable="yes">Open Result in New Tab</property>
<property name="width-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="x">134</property>
<property name="y">29</property>
</packing>
</child>
Expand Down
9 changes: 7 additions & 2 deletions Source/BioConsole.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected void SetupHandlers()

private void ResultsBox_Clicked(object sender, EventArgs e)
{
throw new NotImplementedException();
resultInNewTab = resultsBox.Active;
}

private void BioConsole_DeleteEvent(object o, DeleteEventArgs args)
Expand Down Expand Up @@ -114,7 +114,12 @@ private void SelRadioBox_Clicked(object sender, EventArgs e)

private void BioformatsBox_Clicked(object sender, EventArgs e)
{
useBioformats = bioformatsBox.Active;
if(!OperatingSystem.IsMacOS())
useBioformats = bioformatsBox.Active;
else
{
BioImage.OMESupport();
}
}

private void HeadlessBox_Clicked(object sender, EventArgs e)
Expand Down

0 comments on commit 9474aa4

Please sign in to comment.