Skip to content

Commit

Permalink
Merge branch 'v14' of https://github.com/ObjectVision/GeoDMS into v14
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaartenHilferink
MaartenHilferink committed Sep 19, 2023
2 parents b4548b1 + 05c226b commit 7470b7c
Show file tree
Hide file tree
Showing 6 changed files with 296 additions and 200 deletions.
6 changes: 1 addition & 5 deletions qtgui/exe/res/ui/DmsConfigOptionsWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>470</width>
<width>488</width>
<height>106</height>
</rect>
</property>
Expand All @@ -32,7 +32,6 @@
<widget class="QLabel" name="lbl_configured_or_overridden_value">
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -45,7 +44,6 @@
<widget class="QLabel" name="lbl_override">
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -58,7 +56,6 @@
<widget class="QLabel" name="lbl_option">
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand Down Expand Up @@ -88,7 +85,6 @@
<widget class="QLabel" name="lbl_title">
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand Down
69 changes: 34 additions & 35 deletions qtgui/exe/res/ui/DmsEventLogSelection.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,12 @@
<rect>
<x>20</x>
<y>7</y>
<width>116</width>
<width>151</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -96,13 +95,12 @@
<rect>
<x>210</x>
<y>7</y>
<width>45</width>
<width>131</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -115,13 +113,12 @@
<rect>
<x>370</x>
<y>7</y>
<width>101</width>
<width>141</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand Down Expand Up @@ -153,7 +150,7 @@
<rect>
<x>20</x>
<y>50</y>
<width>57</width>
<width>151</width>
<height>20</height>
</rect>
</property>
Expand All @@ -177,7 +174,7 @@
<rect>
<x>20</x>
<y>30</y>
<width>56</width>
<width>151</width>
<height>20</height>
</rect>
</property>
Expand All @@ -201,7 +198,7 @@
<rect>
<x>140</x>
<y>85</y>
<width>69</width>
<width>141</width>
<height>20</height>
</rect>
</property>
Expand All @@ -225,7 +222,7 @@
<rect>
<x>320</x>
<y>85</y>
<width>52</width>
<width>161</width>
<height>20</height>
</rect>
</property>
Expand All @@ -249,7 +246,7 @@
<rect>
<x>210</x>
<y>30</y>
<width>49</width>
<width>131</width>
<height>20</height>
</rect>
</property>
Expand All @@ -273,7 +270,7 @@
<rect>
<x>210</x>
<y>50</y>
<width>52</width>
<width>131</width>
<height>20</height>
</rect>
</property>
Expand All @@ -297,7 +294,7 @@
<rect>
<x>370</x>
<y>30</y>
<width>84</width>
<width>141</width>
<height>20</height>
</rect>
</property>
Expand All @@ -321,7 +318,7 @@
<rect>
<x>370</x>
<y>50</y>
<width>66</width>
<width>141</width>
<height>20</height>
</rect>
</property>
Expand All @@ -346,7 +343,7 @@
<rect>
<x>540</x>
<y>10</y>
<width>85</width>
<width>101</width>
<height>20</height>
</rect>
</property>
Expand All @@ -370,7 +367,7 @@
<rect>
<x>540</x>
<y>70</y>
<width>53</width>
<width>91</width>
<height>20</height>
</rect>
</property>
Expand All @@ -392,17 +389,17 @@
<widget class="QLineEdit" name="m_text_filter">
<property name="geometry">
<rect>
<x>660</x>
<x>670</x>
<y>40</y>
<width>271</width>
<width>261</width>
<height>25</height>
</rect>
</property>
</widget>
<widget class="Line" name="line_4">
<property name="geometry">
<rect>
<x>630</x>
<x>640</x>
<y>0</y>
<width>20</width>
<height>140</height>
Expand All @@ -421,15 +418,14 @@
<widget class="QLabel" name="lbl_background_layer_2">
<property name="geometry">
<rect>
<x>660</x>
<x>670</x>
<y>7</y>
<width>77</width>
<width>271</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -440,7 +436,7 @@
<widget class="QPushButton" name="m_activate_text_filter">
<property name="geometry">
<rect>
<x>660</x>
<x>670</x>
<y>80</y>
<width>93</width>
<height>28</height>
Expand Down Expand Up @@ -478,7 +474,7 @@
<rect>
<x>540</x>
<y>40</y>
<width>70</width>
<width>91</width>
<height>20</height>
</rect>
</property>
Expand Down Expand Up @@ -521,7 +517,7 @@
<rect>
<x>1180</x>
<y>80</y>
<width>108</width>
<width>181</width>
<height>20</height>
</rect>
</property>
Expand All @@ -542,10 +538,16 @@
<rect>
<x>960</x>
<y>60</y>
<width>129</width>
<width>191</width>
<height>20</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
Expand All @@ -563,7 +565,7 @@
<rect>
<x>1180</x>
<y>60</y>
<width>78</width>
<width>181</width>
<height>20</height>
</rect>
</property>
Expand All @@ -584,13 +586,12 @@
<rect>
<x>960</x>
<y>40</y>
<width>131</width>
<width>191</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -603,13 +604,12 @@
<rect>
<x>1180</x>
<y>40</y>
<width>128</width>
<width>181</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -622,13 +622,12 @@
<rect>
<x>1090</x>
<y>10</y>
<width>136</width>
<width>261</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<family>MS Shell Dlg 2</family>
<pointsize>10</pointsize>
</font>
</property>
Expand All @@ -641,7 +640,7 @@
<rect>
<x>960</x>
<y>80</y>
<width>151</width>
<width>191</width>
<height>20</height>
</rect>
</property>
Expand All @@ -662,7 +661,7 @@
<rect>
<x>1180</x>
<y>100</y>
<width>72</width>
<width>181</width>
<height>20</height>
</rect>
</property>
Expand Down
Loading

0 comments on commit 7470b7c

Please sign in to comment.