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

UI adjustments in Print Dialog Window

Browse source 
- move buttons to the bottom of the window
- use QDialogButtonBox that allows to follow platform-dependent button layout
- enlarge window size to not to crop content
- change "Close" button action from "accept" to "reject"

Signed-off-by: Andrey Zhdanov <andrjufka@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Andrey Zhdanov 2014-04-16 21:25:15 +03:00 • committed by Dirk Hohndel
parent 1b6d4f55df
commit 4bd4c01108
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
qt-ui/printdialog.cpp
View file

@ -26,20 +26,7 @@ PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);
QHBoxLayout *hLayout = new QHBoxLayout(); layout->addWidget(optionsWidget);
layout->addLayout(hLayout);
QPushButton *previewButton = new QPushButton(tr("&Preview"));
connect(previewButton, SIGNAL(clicked(bool)), this, SLOT(previewClicked()));
hLayout->addWidget(previewButton);
QPushButton *printButton = new QPushButton(tr("P&rint"));
connect(printButton, SIGNAL(clicked(bool)), this, SLOT(printClicked()));
hLayout->addWidget(printButton);
QPushButton *closeButton = new QPushButton(tr("&Close"));
connect(closeButton, SIGNAL(clicked(bool)), this, SLOT(accept()));
hLayout->addWidget(closeButton);
progressBar = new QProgressBar(); progressBar = new QProgressBar();
connect(printLayout, SIGNAL(signalProgress(int)), progressBar, SLOT(setValue(int))); connect(printLayout, SIGNAL(signalProgress(int)), progressBar, SLOT(setValue(int)));
@ -49,9 +36,25 @@ PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f
progressBar->setTextVisible(false); progressBar->setTextVisible(false);
layout->addWidget(progressBar); layout->addWidget(progressBar);
layout->addWidget(optionsWidget); QHBoxLayout *hLayout = new QHBoxLayout();
layout->addLayout(hLayout);
setFixedSize(520, 350); QPushButton *printButton = new QPushButton(tr("P&rint"));
connect(printButton, SIGNAL(clicked(bool)), this, SLOT(printClicked()));
QPushButton *previewButton = new QPushButton(tr("&Preview"));
connect(previewButton, SIGNAL(clicked(bool)), this, SLOT(previewClicked()));
QDialogButtonBox *buttonBox = new QDialogButtonBox;
buttonBox->addButton(QDialogButtonBox::Cancel);
buttonBox->addButton(printButton, QDialogButtonBox::AcceptRole);
buttonBox->addButton(previewButton, QDialogButtonBox::ActionRole);
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
hLayout->addWidget(buttonBox);
setFixedSize(550, 400);
setWindowTitle(tr("Print")); setWindowTitle(tr("Print"));
setWindowIcon(QIcon(":subsurface-icon")); setWindowIcon(QIcon(":subsurface-icon"));
} }

14
qt-ui/printoptions.ui
View file

@ -7,14 +7,14 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>511</width> <width>511</width>
<height>453</height> <height>448</height>
</rect> </rect>
</property> </property>
<widget class="QGroupBox" name="printOptions"> <widget class="QGroupBox" name="printOptions">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>80</y> <y>70</y>
<width>489</width> <width>489</width>
<height>81</height> <height>81</height>
</rect> </rect>
@ -67,7 +67,7 @@
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>489</width> <width>489</width>
<height>61</height> <height>51</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -153,9 +153,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>170</y> <y>160</y>
<width>489</width> <width>489</width>
<height>91</height> <height>81</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
@ -210,9 +210,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>270</y> <y>250</y>
<width>489</width> <width>489</width>
<height>151</height> <height>141</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">