From 59e6b9b87d67adf79293d368dfaaa5097e2dceff Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Tue, 22 Oct 2019 20:46:40 +0200 Subject: screenGeometry/screenCount -> QGuiApplication::screens(). another round --- src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp') diff --git a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp index 88192943..09e05892 100644 --- a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp @@ -241,7 +241,7 @@ void MainUI::getPixmap(){ //Grab the whole screen cpic = scrn->grabWindow(QApplication::desktop()->winId()); }else if(cwin==0 && ui->radio_monitor->isChecked()){ - QRect geom = QApplication::desktop()->screenGeometry(ui->spin_monitor->value()-1); + QRect geom = QGuiApplication::screens().at(ui->spin_monitor->value()-1)->availableGeometry(); cpic = scrn->grabWindow(QApplication::desktop()->winId(), geom.x(), geom.y(), geom.width(), geom.height() ); }else if(cwin==0 && ui->radio_area->isChecked()){ //Grab the section of the screen which was selected @@ -329,7 +329,7 @@ void MainUI::closeEvent(QCloseEvent *ev){ //qDebug() << "Close Event:" << ui->check_show_popups->isChecked() << picSaved; if(ui->check_show_popups->isChecked() && !picSaved){ //Ask what to do about the unsaved changed - QMessageBox dialog( QMessageBox::Warning, tr("Unsaved Screenshot"), + QMessageBox dialog( QMessageBox::Warning, tr("Unsaved Screenshot"), tr("The current screenshot has not been saved yet. Do you want to save or discard your changes?"), QMessageBox::Discard | QMessageBox::Save | QMessageBox::Cancel, this); dialog.setDefaultButton(QMessageBox::Cancel); -- cgit From ba6883f0e256a583c670df939987fcc4907aa894 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Tue, 22 Oct 2019 20:50:10 +0200 Subject: fix lumina-screenshot/MainUI.cpp --- src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp') diff --git a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp index 09e05892..5e859f73 100644 --- a/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-screenshot/MainUI.cpp @@ -22,9 +22,9 @@ MainUI::MainUI() IMG = new ImageEditor(this); ui->scrollArea->setWidget(IMG); areaOverlay = 0; - ui->label_zoom_percent->setMinimumWidth( ui->label_zoom_percent->fontMetrics().width("200%") ); + ui->label_zoom_percent->setMinimumWidth( ui->label_zoom_percent->fontMetrics().horizontalAdvance("200%") ); setupIcons(); - ui->spin_monitor->setMaximum(QApplication::desktop()->screenCount()); + ui->spin_monitor->setMaximum(QGuiApplication::screens().count()); if(ui->spin_monitor->maximum()<2){ ui->spin_monitor->setEnabled(false); ui->radio_monitor->setEnabled(false); -- cgit