Continued to flesh out merge subsystem.

This commit is contained in:
Jim Evins
2016-05-01 22:42:03 -04:00
parent 3cd0806792
commit 2ff07f01b3
12 changed files with 614 additions and 129 deletions
+86 -15
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MergeView</class>
<widget class="QWidget" name="MergePropertyEditor">
<widget class="QWidget" name="MergeView">
<property name="geometry">
<rect>
<x>0</x>
@@ -22,6 +22,13 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QPushButton" name="locationButton">
<property name="text">
<string>Location</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
@@ -29,22 +36,15 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="locationLabel">
<property name="text">
<string>Location:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Placeholder</string>
</property>
</widget>
<item row="0" column="1">
<widget class="QComboBox" name="formatCombo"/>
</item>
</layout>
</item>
@@ -71,19 +71,19 @@
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QTableWidget" name="tableWidget"/>
<widget class="QTableWidget" name="recordsTable"/>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_2">
<widget class="QPushButton" name="selectAllButton">
<property name="text">
<string>Select all</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_3">
<widget class="QPushButton" name="unselectAllButton">
<property name="text">
<string>Unselect all</string>
</property>
@@ -110,5 +110,76 @@
</layout>
</widget>
<resources/>
<connections/>
<connections>
<connection>
<sender>selectAllButton</sender>
<signal>clicked()</signal>
<receiver>MergeView</receiver>
<slot>onSelectAllButtonClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>63</x>
<y>571</y>
</hint>
<hint type="destinationlabel">
<x>69</x>
<y>601</y>
</hint>
</hints>
</connection>
<connection>
<sender>unselectAllButton</sender>
<signal>clicked()</signal>
<receiver>MergeView</receiver>
<slot>onUnselectAllButtonClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>178</x>
<y>567</y>
</hint>
<hint type="destinationlabel">
<x>263</x>
<y>600</y>
</hint>
</hints>
</connection>
<connection>
<sender>locationButton</sender>
<signal>clicked()</signal>
<receiver>MergeView</receiver>
<slot>onUnselectAllButtonClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>175</x>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>570</x>
<y>75</y>
</hint>
</hints>
</connection>
<connection>
<sender>formatCombo</sender>
<signal>activated(int)</signal>
<receiver>MergeView</receiver>
<slot>onFormatComboChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>166</x>
<y>48</y>
</hint>
<hint type="destinationlabel">
<x>565</x>
<y>56</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>onSelectAllButtonClicked()</slot>
<slot>onUnselectAllButtonClicked()</slot>
<slot>onLocationButtonClicked()</slot>
<slot>onFormatComboChanged()</slot>
</slots>
</ui>