From e49d6213ad129284a45d53c3fcdc03249e84efe2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 3 Sep 2015 14:20:19 -0300 Subject: Move qt-ui to desktop-widgets Since we have now destkop and mobile versions, 'qt-ui' was a very poor name choice for a folder that contains only destkop-enabled widgets. Also, move the graphicsview-common.h/cpp to subsurface-core because it doesn't depend on qgraphicsview, it merely implements all the colors that we use throughout Subsurface, and we will use colors on both desktop and mobile versions Same thing applies for metrics.h/cpp Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/printdialog.cpp | 194 -------------------------------------------------- 1 file changed, 194 deletions(-) delete mode 100644 qt-ui/printdialog.cpp (limited to 'qt-ui/printdialog.cpp') diff --git a/qt-ui/printdialog.cpp b/qt-ui/printdialog.cpp deleted file mode 100644 index cf08062d2..000000000 --- a/qt-ui/printdialog.cpp +++ /dev/null @@ -1,194 +0,0 @@ -#include "printdialog.h" -#include "printoptions.h" -#include "mainwindow.h" - -#ifndef NO_PRINTING -#include -#include -#include -#include -#include -#include - -#define SETTINGS_GROUP "PrintDialog" - -template_options::color_palette_struct ssrf_colors, almond_colors, blueshades_colors, custom_colors; - -PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) -{ - // initialize const colors - ssrf_colors.color1 = QColor::fromRgb(0xff, 0xff, 0xff); - ssrf_colors.color2 = QColor::fromRgb(0xa6, 0xbc, 0xd7); - ssrf_colors.color3 = QColor::fromRgb(0xef, 0xf7, 0xff); - ssrf_colors.color4 = QColor::fromRgb(0x34, 0x65, 0xa4); - ssrf_colors.color5 = QColor::fromRgb(0x20, 0x4a, 0x87); - ssrf_colors.color6 = QColor::fromRgb(0x17, 0x37, 0x64); - almond_colors.color1 = QColor::fromRgb(255, 255, 255); - almond_colors.color2 = QColor::fromRgb(253, 204, 156); - almond_colors.color3 = QColor::fromRgb(243, 234, 207); - almond_colors.color4 = QColor::fromRgb(136, 160, 150); - almond_colors.color5 = QColor::fromRgb(187, 171, 139); - almond_colors.color6 = QColor::fromRgb(0, 0, 0); - blueshades_colors.color1 = QColor::fromRgb(255, 255, 255); - blueshades_colors.color2 = QColor::fromRgb(142, 152, 166); - blueshades_colors.color3 = QColor::fromRgb(182, 192, 206); - blueshades_colors.color4 = QColor::fromRgb(31, 49, 75); - blueshades_colors.color5 = QColor::fromRgb(21, 45, 84); - blueshades_colors.color6 = QColor::fromRgb(0, 0, 0); - - // check if the options were previously stored in the settings; if not use some defaults. - QSettings s; - bool stored = s.childGroups().contains(SETTINGS_GROUP); - if (!stored) { - printOptions.print_selected = true; - printOptions.color_selected = true; - printOptions.landscape = false; - printOptions.p_template = "one_dive.html"; - printOptions.type = print_options::DIVELIST; - templateOptions.font_index = 0; - templateOptions.font_size = 9; - templateOptions.color_palette_index = SSRF_COLORS; - templateOptions.line_spacing = 1; - custom_colors = ssrf_colors; - } else { - s.beginGroup(SETTINGS_GROUP); - printOptions.type = (print_options::print_type)s.value("type").toInt(); - printOptions.print_selected = s.value("print_selected").toBool(); - printOptions.color_selected = s.value("color_selected").toBool(); - printOptions.landscape = s.value("landscape").toBool(); - printOptions.p_template = s.value("template_selected").toString(); - qprinter.setOrientation((QPrinter::Orientation)printOptions.landscape); - templateOptions.font_index = s.value("font").toInt(); - templateOptions.font_size = s.value("font_size").toDouble(); - templateOptions.color_palette_index = s.value("color_palette").toInt(); - templateOptions.line_spacing = s.value("line_spacing").toDouble(); - custom_colors.color1 = QColor(s.value("custom_color_1").toString()); - custom_colors.color2 = QColor(s.value("custom_color_2").toString()); - custom_colors.color3 = QColor(s.value("custom_color_3").toString()); - custom_colors.color4 = QColor(s.value("custom_color_4").toString()); - custom_colors.color5 = QColor(s.value("custom_color_5").toString()); - } - - // handle cases from old QSettings group - if (templateOptions.font_size < 9) { - templateOptions.font_size = 9; - } - if (templateOptions.line_spacing < 1) { - templateOptions.line_spacing = 1; - } - - switch (templateOptions.color_palette_index) { - case SSRF_COLORS: // default Subsurface derived colors - templateOptions.color_palette = ssrf_colors; - break; - case ALMOND: // almond - templateOptions.color_palette = almond_colors; - break; - case BLUESHADES: // blueshades - templateOptions.color_palette = blueshades_colors; - break; - case CUSTOM: // custom - templateOptions.color_palette = custom_colors; - break; - } - - // create a print options object and pass our options struct - optionsWidget = new PrintOptions(this, &printOptions, &templateOptions); - - // create a new printer object - printer = new Printer(&qprinter, &printOptions, &templateOptions, Printer::PRINT); - - QVBoxLayout *layout = new QVBoxLayout(this); - setLayout(layout); - - layout->addWidget(optionsWidget); - - progressBar = new QProgressBar(); - progressBar->setMinimum(0); - progressBar->setMaximum(100); - progressBar->setValue(0); - progressBar->setTextVisible(false); - layout->addWidget(progressBar); - - QHBoxLayout *hLayout = new QHBoxLayout(); - layout->addLayout(hLayout); - - 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); - - setWindowTitle(tr("Print")); - setWindowIcon(QIcon(":subsurface-icon")); - - QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this); - connect(close, SIGNAL(activated()), this, SLOT(close())); - QShortcut *quit = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this); - connect(quit, SIGNAL(activated()), parent, SLOT(close())); - - // seems to be the most reliable way to track for all sorts of dialog disposal. - connect(this, SIGNAL(finished(int)), this, SLOT(onFinished())); -} - -void PrintDialog::onFinished() -{ - QSettings s; - s.beginGroup(SETTINGS_GROUP); - - // save print paper settings - s.setValue("type", printOptions.type); - s.setValue("print_selected", printOptions.print_selected); - s.setValue("color_selected", printOptions.color_selected); - s.setValue("template_selected", printOptions.p_template); - - // save template settings - s.setValue("font", templateOptions.font_index); - s.setValue("font_size", templateOptions.font_size); - s.setValue("color_palette", templateOptions.color_palette_index); - s.setValue("line_spacing", templateOptions.line_spacing); - - // save custom colors - s.setValue("custom_color_1", custom_colors.color1.name()); - s.setValue("custom_color_2", custom_colors.color2.name()); - s.setValue("custom_color_3", custom_colors.color3.name()); - s.setValue("custom_color_4", custom_colors.color4.name()); - s.setValue("custom_color_5", custom_colors.color5.name()); -} - -void PrintDialog::previewClicked(void) -{ - QPrintPreviewDialog previewDialog(&qprinter, this, Qt::Window - | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint - | Qt::WindowTitleHint); - connect(&previewDialog, SIGNAL(paintRequested(QPrinter *)), this, SLOT(onPaintRequested(QPrinter *))); - previewDialog.exec(); -} - -void PrintDialog::printClicked(void) -{ - QPrintDialog printDialog(&qprinter, this); - if (printDialog.exec() == QDialog::Accepted) { - connect(printer, SIGNAL(progessUpdated(int)), progressBar, SLOT(setValue(int))); - printer->print(); - close(); - } -} - -void PrintDialog::onPaintRequested(QPrinter *printerPtr) -{ - connect(printer, SIGNAL(progessUpdated(int)), progressBar, SLOT(setValue(int))); - printer->print(); - progressBar->setValue(0); - disconnect(printer, SIGNAL(progessUpdated(int)), progressBar, SLOT(setValue(int))); -} -#endif -- cgit v1.2.3-70-g09d2