mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the layout on the Print Dialog

Browse source 
The layout was a hardcoded position without layouts, that
would only work on english language since other languages can
have bigger strings than the current ones.

Also removed the 'setFixedSize' stuff and let the widget
find it's best size for itself.

Fixes #656
Fixes #396

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-08-04 13:27:29 -03:00 • committed by Dirk Hohndel
parent 116608201d
commit 0416a09a1e
2 changed files with 166 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

1
qt-ui/printdialog.cpp
View file

@ -57,7 +57,6 @@ PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f
hLayout->addWidget(buttonBox); hLayout->addWidget(buttonBox);
setFixedSize(550, 400);
setWindowTitle(tr("Print")); setWindowTitle(tr("Print"));
setWindowIcon(QIcon(":subsurface-icon")); setWindowIcon(QIcon(":subsurface-icon"));

211
qt-ui/printoptions.ui
View file

@ -6,70 +6,13 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>511</width> <width>367</width>
<height>308</height> <height>433</height>
</rect> </rect>
</property> </property>
<widget class="QGroupBox" name="printOptions"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="geometry"> <item>
<rect>
<x>10</x>
<y>70</y>
<width>489</width>
<height>81</height>
</rect>
</property>
<property name="title">
<string>Print options</string>
</property>
<widget class="QCheckBox" name="printSelected">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>461</width>
<height>18</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Print only selected dives</string>
</property>
</widget>
<widget class="QCheckBox" name="printInColor">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>461</width>
<height>18</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Print in color</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="printType"> <widget class="QGroupBox" name="printType">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>489</width>
<height>51</height>
</rect>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -85,26 +28,8 @@
<property name="title"> <property name="title">
<string>Print type</string> <string>Print type</string>
</property> </property>
<widget class="QWidget" name="horizontalLayoutWidget_2"> <layout class="QGridLayout" name="gridLayout">
<property name="geometry"> <item row="0" column="0" colspan="2">
<rect>
<x>0</x>
<y>20</y>
<width>491</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="layoutPrintType">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="leftMargin">
<number>15</number>
</property>
<property name="rightMargin">
<number>15</number>
</property>
<item>
<widget class="QRadioButton" name="radioSixDives"> <widget class="QRadioButton" name="radioSixDives">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -113,27 +38,14 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>6 dives per page</string> <string>&amp;6 dives per page</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QRadioButton" name="radioTwoDives">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>2 dives per page</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioOneDive"> <widget class="QRadioButton" name="radioOneDive">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -142,11 +54,24 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>1 dive per page</string> <string>&amp;1 dive per page</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="3" column="0" colspan="2">
<widget class="QRadioButton" name="radioTwoDives">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;2 dives per page</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QRadioButton" name="radioTablePrint"> <widget class="QRadioButton" name="radioTablePrint">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -155,34 +80,69 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Table print</string> <string>&amp;Table print</string>
</property>
</widget>
</item>
<item row="2" column="2" rowspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="printOptions">
<property name="title">
<string>Print options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="printSelected">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Print only selected dives</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="printInColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Print in color</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</widget> </item>
<item>
<widget class="QGroupBox" name="ordering"> <widget class="QGroupBox" name="ordering">
<property name="geometry">
<rect>
<x>10</x>
<y>160</y>
<width>489</width>
<height>81</height>
</rect>
</property>
<property name="title"> <property name="title">
<string>Ordering</string> <string>Ordering</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QRadioButton" name="profileOnTop"> <widget class="QRadioButton" name="profileOnTop">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>461</width>
<height>18</height>
</rect>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -190,21 +150,15 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Profile on top</string> <string>Prof&amp;ile on top</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QRadioButton" name="notesOnTop"> <widget class="QRadioButton" name="notesOnTop">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>461</width>
<height>18</height>
</rect>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -212,18 +166,21 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Notes on top</string> <string>&amp;Notes on top</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>radioSixDives</tabstop> <tabstop>radioSixDives</tabstop>
<tabstop>radioTwoDives</tabstop> <tabstop>radioTwoDives</tabstop>
<tabstop>radioTablePrint</tabstop>
<tabstop>printSelected</tabstop> <tabstop>printSelected</tabstop>
<tabstop>printInColor</tabstop> <tabstop>printInColor</tabstop>
<tabstop>profileOnTop</tabstop> <tabstop>profileOnTop</tabstop>