Skip to content

Commit

Permalink
GUI: make Spatial and Cluster tab ui files Gtk3 compatible
Browse files Browse the repository at this point in the history 
Updates #770
  • Loading branch information
@shawnlaffan
shawnlaffan committed Nov 1, 2020
1 parent 0f8d881 commit 121023c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 21 deletions.
25 changes: 12 additions & 13 deletions bin/ui/hboxClusteringPage.ui
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkIconFactory" id="iconfactory1"/>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">10000000000</property>
<property name="step_increment">1</property>
Expand All @@ -18,6 +16,7 @@
<property name="step_increment">1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkIconFactory" id="iconfactory1"/>
<object class="GtkHBox" id="hboxClusteringPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand All @@ -27,7 +26,6 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="toolbar_style">icons</property>
<property name="tooltips">False</property>
<child>
<object class="GtkToolItem" id="toolitemClusteringSelect">
<property name="visible">True</property>
Expand Down Expand Up @@ -553,7 +551,6 @@ Does not affect the vertical connectors.
<object class="GtkScrolledWindow" id="scrolledwindow20">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<child>
<object class="GtkViewport" id="viewport4">
<property name="visible">True</property>
Expand All @@ -579,11 +576,13 @@ Does not affect the vertical connectors.
<property name="can_focus">True</property>
<property name="border_width">5</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="treeSpatialCalculations">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
</child>
</object>
Expand Down Expand Up @@ -755,8 +754,6 @@ set 1</property>
<property name="text" translatable="yes">Spatial1</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">2</property>
Expand Down Expand Up @@ -895,8 +892,6 @@ than one pair of elements can be merged. </property>
<property name="width_chars">15</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
Expand Down Expand Up @@ -965,6 +960,7 @@ use caching </property>
<property name="tooltip_text" translatable="yes">Don't use caching when building the matrix.
This reduces memory requirements
but can slow down processing.</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Expand All @@ -983,6 +979,7 @@ and then stop</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Just build the matrices
and don't actually cluster.</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Expand All @@ -1001,6 +998,7 @@ direct to text files</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Output the matrices direct to a text formatted sparse matrix file or files.
Will not cluster if set and matrices will not be displayable via the project.</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Expand All @@ -1021,6 +1019,7 @@ compatible format</property>
<property name="tooltip_text" translatable="yes">Only if the "Output
matrices to text files"
option is checked.</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Expand All @@ -1041,6 +1040,7 @@ neighbours output</property>
neighbouring groups used for matrix building.
Use this if you want to better understand how
your results were generated.</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Expand All @@ -1062,6 +1062,7 @@ view the matrix as it is destroyed as part
of clustering. It will not be added to the BaseData object.
Matrix exporting is also slowed, as the
system must rebuild the matrices each time you export.</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Expand All @@ -1082,6 +1083,7 @@ nodes from tree</property>
connected directly to the root.
Clearing them is useful
for RegionGrower analyses. </property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Expand Down Expand Up @@ -1138,7 +1140,6 @@ for RegionGrower analyses. </property>
<object class="GtkHButtonBox" id="hbuttonbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">edge</property>
<child>
<object class="GtkButton" id="btnCluster">
<property name="label" translatable="yes">Go!</property>
Expand Down Expand Up @@ -1490,8 +1491,6 @@ This setting has no effect on the slider bar.</property>
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment6</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
Expand Down
12 changes: 4 additions & 8 deletions bin/ui/hboxSpatialPage.ui
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1"/>
<object class="GtkAdjustment" id="adjustment2"/>
<object class="GtkAdjustment" id="adjustment3"/>
Expand All @@ -21,7 +20,6 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="toolbar_style">icons</property>
<property name="tooltips">False</property>
<child>
<object class="GtkToolItem" id="toolitemSpatialSelect">
<property name="visible">True</property>
Expand Down Expand Up @@ -580,7 +578,6 @@ Does not affect the vertical connectors.</property>
<object class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<child>
<object class="GtkViewport" id="viewport3">
<property name="visible">True</property>
Expand All @@ -606,11 +603,13 @@ Does not affect the vertical connectors.</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="treeCalculations">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
</child>
</object>
Expand Down Expand Up @@ -786,8 +785,6 @@ Use the checkbox to show/hide the edit box to free up screen real estate.</prope
<property name="text" translatable="yes">Spatial1</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
Expand Down Expand Up @@ -852,7 +849,6 @@ Use the checkbox to show/hide the edit box to free up screen real estate.</prope
<object class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">edge</property>
<child>
<object class="GtkButton" id="btnSpatialRun">
<property name="label" translatable="yes">Go!</property>
Expand Down

0 comments on commit 121023c

Please sign in to comment.