20 changed files with 449 additions and 350 deletions
@ -1,71 +0,0 @@
@@ -1,71 +0,0 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Jon Beniston, M7RCE <jon@beniston.com> //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QVBoxLayout> |
||||
#include <QHBoxLayout> |
||||
#include <QPushButton> |
||||
#include <QDebug> |
||||
|
||||
#include "mapcolordialog.h" |
||||
|
||||
MapColorDialog::MapColorDialog(const QColor &initial, QWidget *parent) : |
||||
QDialog(parent) |
||||
{ |
||||
m_colorDialog = new QColorDialog(); |
||||
m_colorDialog->setWindowFlags(Qt::Widget); |
||||
m_colorDialog->setOptions(QColorDialog::ShowAlphaChannel | QColorDialog::NoButtons | QColorDialog::DontUseNativeDialog); |
||||
m_colorDialog->setCurrentColor(initial); // Needs to be set after setOptions on Linux, which seems to overwrite QColorDialog(initial)
|
||||
QVBoxLayout *v = new QVBoxLayout(this); |
||||
v->addWidget(m_colorDialog); |
||||
QHBoxLayout *h = new QHBoxLayout(); |
||||
m_noColorButton = new QPushButton("No Color"); |
||||
m_cancelButton = new QPushButton("Cancel"); |
||||
m_okButton = new QPushButton("OK"); |
||||
h->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding)); |
||||
h->addWidget(m_noColorButton); |
||||
h->addWidget(m_cancelButton); |
||||
h->addWidget(m_okButton); |
||||
v->addLayout(h); |
||||
|
||||
connect(m_noColorButton, &QPushButton::clicked, this, &MapColorDialog::noColorClicked); |
||||
connect(m_cancelButton, &QPushButton::clicked, this, &QDialog::reject); |
||||
connect(m_okButton, &QPushButton::clicked, this, &QDialog::accept); |
||||
|
||||
m_noColorSelected = false; |
||||
} |
||||
|
||||
QColor MapColorDialog::selectedColor() const |
||||
{ |
||||
return m_colorDialog->selectedColor(); |
||||
} |
||||
|
||||
bool MapColorDialog::noColorSelected() const |
||||
{ |
||||
return m_noColorSelected; |
||||
} |
||||
|
||||
void MapColorDialog::accept() |
||||
{ |
||||
m_colorDialog->accept(); |
||||
QDialog::accept(); |
||||
} |
||||
|
||||
void MapColorDialog::noColorClicked() |
||||
{ |
||||
m_noColorSelected = true; |
||||
accept(); |
||||
} |
||||
@ -1,48 +0,0 @@
@@ -1,48 +0,0 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany //
|
||||
// written by Christian Daniel //
|
||||
// Copyright (C) 2015-2019 Edouard Griffiths, F4EXB <f4exb06@gmail.com> //
|
||||
// Copyright (C) 2021-2022 Jon Beniston, M7RCE <jon@beniston.com> //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDE_FEATURE_MAPCOLORDIALOG_H |
||||
#define INCLUDE_FEATURE_MAPCOLORDIALOG_H |
||||
|
||||
#include <QColorDialog> |
||||
|
||||
class MapColorDialog : public QDialog { |
||||
Q_OBJECT |
||||
|
||||
public: |
||||
explicit MapColorDialog(const QColor &initial, QWidget *parent = nullptr); |
||||
QColor selectedColor() const; |
||||
bool noColorSelected() const; |
||||
|
||||
public slots: |
||||
virtual void accept() override; |
||||
void noColorClicked(); |
||||
|
||||
private: |
||||
|
||||
QColorDialog *m_colorDialog; |
||||
QPushButton *m_noColorButton; |
||||
QPushButton *m_cancelButton; |
||||
QPushButton *m_okButton; |
||||
|
||||
bool m_noColorSelected; |
||||
}; |
||||
|
||||
#endif // INCLUDE_FEATURE_MAPCOLORDIALOG_H
|
||||
Loading…
Reference in new issue