diff --git a/CMakeLists.txt b/CMakeLists.txt index d12bed6d..5fa5841d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ endif () set (PROJECT_NAME ${PROJ_PREFIX}-virt-manager) set (VERSION_MAJOR 0) set (VERSION_MINOR 72) -set (VERSION_MICRO 97) +set (VERSION_MICRO 98) set (QTERM_UI_SRC src/vm_viewer/qterminal/forms/qterminal.ui diff --git a/Changelog b/Changelog index b369b3d5..993b1764 100644 --- a/Changelog +++ b/Changelog @@ -256,3 +256,7 @@ some fixes; fixed deprecated methods; fixed the close of application; fixes for new krdc version; + +0.72.98 : +some fixes for build with new Qt and CPP version; +donation card corrected; diff --git a/qt-virt-manager.spec b/qt-virt-manager.spec index 64d7aac6..16ccb4e3 100644 --- a/qt-virt-manager.spec +++ b/qt-virt-manager.spec @@ -1,7 +1,7 @@ %global binname qt5-virt-manager Name: qt-virt-manager -Version: 0.72.97 +Version: 0.72.98 Release: 1%{?dist} Summary: Qt Virtual Machine Manager @@ -114,6 +114,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/qt5-remote-viewer.de %changelog +* Tue May 18 2021 Fl@sh - 0.72.98-1 +- version updated; + * Tue Dec 22 2020 Fl@sh - 0.72.97-1 - version updated; diff --git a/src/menubar/donate_dialog.cpp b/src/menubar/donate_dialog.cpp index 363b8985..b2dbe475 100644 --- a/src/menubar/donate_dialog.cpp +++ b/src/menubar/donate_dialog.cpp @@ -8,28 +8,28 @@ Donate_Dialog::Donate_Dialog(QWidget *parent) : QDialog(parent) { setWindowTitle(tr("Donate")); - donate1 = new Click_Label(this); - donate1->setToolTip(tr("Donate on Yandex.Money")); - donate1->setOpenExternalLinks(true); - donate1->setPixmap(QIcon::fromTheme("yandex_money").pixmap(128)); + //donate1 = new Click_Label(this); + //donate1->setToolTip(tr("Donate on Yandex.Money")); + //donate1->setOpenExternalLinks(true); + //donate1->setPixmap(QIcon::fromTheme("yandex_money").pixmap(128)); donate2 = new Click_Label(this); donate2->setToolTip(tr("Donate on MasterCard\nCopy card number to Clipboard")); donate2->setOpenExternalLinks(true); donate2->setPixmap(QIcon::fromTheme("mastercard").pixmap(128)); - donate3 = new Click_Label(this); - donate3->setToolTip(tr("Donate Bitcoin\nCopy to Clipboard")); - donate3->setOpenExternalLinks(true); - donate3->setPixmap(QIcon::fromTheme("electrum").pixmap(128)); - donate4 = new Click_Label(this); - donate4->setToolTip(tr("Donate BitcoinCash\nCopy to Clipboard")); - donate4->setOpenExternalLinks(true); - donate4->setPixmap(QIcon::fromTheme("electron-cash").pixmap(128)); + //donate3 = new Click_Label(this); + //donate3->setToolTip(tr("Donate Bitcoin\nCopy to Clipboard")); + //donate3->setOpenExternalLinks(true); + //donate3->setPixmap(QIcon::fromTheme("electrum").pixmap(128)); + //donate4 = new Click_Label(this); + //donate4->setToolTip(tr("Donate BitcoinCash\nCopy to Clipboard")); + //donate4->setOpenExternalLinks(true); + //donate4->setPixmap(QIcon::fromTheme("electron-cash").pixmap(128)); donateLayout = new QGridLayout(this); - donateLayout->addWidget(donate1, 0, 0, Qt::AlignCenter); + //donateLayout->addWidget(donate1, 0, 0, Qt::AlignCenter); donateLayout->addWidget(donate2, 0, 1, Qt::AlignCenter); - donateLayout->addWidget(donate3, 1, 0, Qt::AlignCenter); - donateLayout->addWidget(donate4, 1, 1, Qt::AlignCenter); + //donateLayout->addWidget(donate3, 1, 0, Qt::AlignCenter); + //donateLayout->addWidget(donate4, 1, 1, Qt::AlignCenter); donateWdg = new QWidget(this); donateWdg->setLayout(donateLayout); //again = new QCheckBox(tr("don't show again"), this); @@ -39,14 +39,14 @@ Donate_Dialog::Donate_Dialog(QWidget *parent) : //commonLayout->addWidget(again); setLayout(commonLayout); - connect(donate1, SIGNAL(released()), - this, SLOT(donationClicked())); + //connect(donate1, SIGNAL(released()), + // this, SLOT(donationClicked())); connect(donate2, SIGNAL(released()), this, SLOT(donationClicked())); - connect(donate3, SIGNAL(released()), - this, SLOT(donationClicked())); - connect(donate4, SIGNAL(released()), - this, SLOT(donationClicked())); + //connect(donate3, SIGNAL(released()), + // this, SLOT(donationClicked())); + //connect(donate4, SIGNAL(released()), + // this, SLOT(donationClicked())); } //bool Donate_Dialog::showAgain() const @@ -58,7 +58,7 @@ Donate_Dialog::Donate_Dialog(QWidget *parent) : void Donate_Dialog::donationClicked() { QString url; - if ( sender()==donate1 ) { + /*if ( sender()==donate1 ) { donate1->setEnabled(false); url = QString("https://money.yandex.ru/embed/donate.xml\ ?account=410014229313543&quickpay=donate&payment-type-choice=on\ @@ -67,11 +67,15 @@ void Donate_Dialog::donationClicked() &project-site=http://f1ash.github.io/qt-virt-manager&button-text=01\ &successURL="); QDesktopServices::openUrl(QUrl(url)); - } else if ( sender()==donate2 ) { + } else */ + + if ( sender()==donate2 ) { donate2->setEnabled(false); QClipboard *c = QApplication::clipboard(); c->setText("5469400029117988", QClipboard::Clipboard); - } else if ( sender()==donate3 ) { + } + + /*else if ( sender()==donate3 ) { donate3->setEnabled(false); QClipboard *c = QApplication::clipboard(); c->setText( @@ -84,4 +88,5 @@ void Donate_Dialog::donationClicked() "bitcoincash:qr7qepftr5nrl0t8p0t8fpg6cq2c9fycmveyv3fsff", QClipboard::Clipboard); }; + */ } diff --git a/src/menubar/donate_dialog.h b/src/menubar/donate_dialog.h index 0c9160ec..f6553163 100644 --- a/src/menubar/donate_dialog.h +++ b/src/menubar/donate_dialog.h @@ -15,8 +15,9 @@ class Donate_Dialog : public QDialog //bool showAgain() const; private: - Click_Label *donate1, *donate2, - *donate3, *donate4; + Click_Label //*donate1, + *donate2; + //*donate3, *donate4; QGridLayout *donateLayout; QWidget *donateWdg; //QCheckBox *again;