diff options
| -rw-r--r-- | qt-ui/divecomponentselection.ui | 31 | ||||
| -rw-r--r-- | qt-ui/diveplanner.ui | 12 | ||||
| -rw-r--r-- | qt-ui/diveshareexportdialog.ui | 73 |
3 files changed, 84 insertions, 32 deletions
diff --git a/qt-ui/divecomponentselection.ui b/qt-ui/divecomponentselection.ui index 7eade039b..8262a5c2a 100644 --- a/qt-ui/divecomponentselection.ui +++ b/qt-ui/divecomponentselection.ui @@ -28,6 +28,18 @@ </iconset> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>5</number> + </property> + <property name="topMargin"> + <number>5</number> + </property> + <property name="rightMargin"> + <number>5</number> + </property> + <property name="bottomMargin"> + <number>5</number> + </property> <item> <widget class="QGroupBox" name="groupBox"> <property name="sizePolicy"> @@ -40,6 +52,21 @@ <string>Which components would you like to copy</string> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="leftMargin"> + <number>5</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <property name="spacing"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QCheckBox" name="divesite"> <property name="text"> @@ -125,9 +152,7 @@ </item> </layout> </widget> - <resources> - <include location="../subsurface.qrc"/> - </resources> + <resources/> <connections> <connection> <sender>buttonBox</sender> diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui index 0edd742fa..adb44fad9 100644 --- a/qt-ui/diveplanner.ui +++ b/qt-ui/diveplanner.ui @@ -15,16 +15,16 @@ </property> <layout class="QGridLayout" name="gridLayout"> <property name="leftMargin"> - <number>0</number> + <number>5</number> </property> <property name="topMargin"> - <number>0</number> + <number>5</number> </property> <property name="rightMargin"> - <number>0</number> + <number>5</number> </property> <property name="bottomMargin"> - <number>0</number> + <number>5</number> </property> <property name="spacing"> <number>0</number> @@ -45,8 +45,8 @@ <rect> <x>0</x> <y>0</y> - <width>515</width> - <height>591</height> + <width>505</width> + <height>581</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> diff --git a/qt-ui/diveshareexportdialog.ui b/qt-ui/diveshareexportdialog.ui index 2456bf2b4..2235740c8 100644 --- a/qt-ui/diveshareexportdialog.ui +++ b/qt-ui/diveshareexportdialog.ui @@ -6,14 +6,26 @@ <rect> <x>0</x> <y>0</y> - <width>320</width> - <height>309</height> + <width>593</width> + <height>420</height> </rect> </property> <property name="windowTitle"> <string>Dialog</string> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>5</number> + </property> + <property name="topMargin"> + <number>5</number> + </property> + <property name="rightMargin"> + <number>5</number> + </property> + <property name="bottomMargin"> + <number>5</number> + </property> <item> <widget class="QFrame" name="frameConfigure"> <property name="frameShape"> @@ -26,8 +38,23 @@ <number>0</number> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>2</number> + </property> <item> <widget class="QLabel" name="label"> <property name="text"> @@ -43,13 +70,10 @@ </widget> </item> <item> - <widget class="QPushButton" name="cmdClear"> + <widget class="QToolButton" name="cmdClear"> <property name="text"> <string>⌫</string> </property> - <property name="flat"> - <bool>true</bool> - </property> </widget> </item> <item> @@ -126,13 +150,32 @@ <enum>QFrame::Raised</enum> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="spacing"> + <number>2</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> <item> <widget class="QTextBrowser" name="txtResult"> <property name="readOnly"> <bool>true</bool> </property> <property name="html"> - <string></string> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Oxygen-Sans'; font-size:7pt; font-weight:600; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string> </property> <property name="openExternalLinks"> <bool>true</bool> @@ -225,22 +268,6 @@ </hints> </connection> <connection> - <sender>cmdClear</sender> - <signal>clicked()</signal> - <receiver>txtUID</receiver> - <slot>clear()</slot> - <hints> - <hint type="sourcelabel"> - <x>148</x> - <y>36</y> - </hint> - <hint type="destinationlabel"> - <x>105</x> - <y>27</y> - </hint> - </hints> - </connection> - <connection> <sender>buttonBox</sender> <signal>accepted()</signal> <receiver>DiveShareExportDialog</receiver> |