chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed F12 screenshot ability for Mac

Browse Source
This commit is contained in:
Mark Watkins 2014-04-10 02:14:41 +10:00
parent 6d65611caf
commit e13128122c
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/docs/update_notes.html
View File

@ -7,7 +7,7 @@
</div> </div>
<b>Changes in this version</b><br/> <b>Changes in this version</b><br/>
<list> <list>
<li>Added ability to pin Event and Flow waveform graphs</li> <li>Added ability to pin graphs</li>
<li>Fixed tranlation loading on Mac</li> <li>Fixed tranlation loading on Mac</li>
<li>Updated Dutch Tranlsations (Thanks Arie)</li> <li>Updated Dutch Tranlsations (Thanks Arie)</li>
<li>Fixed overview graph legends showing wrong details</li> <li>Fixed overview graph legends showing wrong details</li>

29
sleepyhead/mainwindow.cpp
View File

@ -95,7 +95,7 @@ MainWindow::MainWindow(QWidget *parent) :
// Disable Screenshot on Mac Platform,as it doesn't work, and the system provides this functionality anyway. // Disable Screenshot on Mac Platform,as it doesn't work, and the system provides this functionality anyway.
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
ui->action_Screenshot->setVisible(false); // ui->action_Screenshot->setVisible(false);
#endif #endif
overview=NULL; overview=NULL;
@ -736,31 +736,26 @@ void MainWindow::on_action_Screenshot_triggered()
} }
void MainWindow::DelayedScreenshot() void MainWindow::DelayedScreenshot()
{ {
//#ifdef Q_OS_MAC int w=width();
// CGImageRef windowImage = CGWindowListCreateImage(imageBounds, singleWindowListOptions, windowID, imageOptions); int h=height();
// originalPixmap = new QPixmap(QPixmap::fromMacCGImageRef(windowImage));
// Scale for high resolution displays (like Retina)
qreal pr=devicePixelRatio();
w/=pr;
h/=pr;
QPixmap pixmap=QPixmap::grabWindow(this->winId(),x(),y(),w,h);
// CGImageRef img = CGDisplayCreateImageForRect(displayID, *rect);
// CFMutableDataRef imgData = CFDataCreateMutable(0, 0);
// CGImageDestinationRef imgDst = CGImageDestinationCreateWithData(imgData, kUTTypeJPEG2000, 1, 0);
// CGImageDestinationAddImage(imgDst, img, 0);
// CGImageDestinationFinalize(imgDst);
// CFRelease(imgDst);
// QPixmap pixmap=QPixmap::fromMacCGImageRef(img);
//#else
QPixmap pixmap = QPixmap::grabWindow(this->winId());
//#endif
QString a=PREF.Get("{home}/Screenshots"); QString a=PREF.Get("{home}/Screenshots");
QDir dir(a); QDir dir(a);
if (!dir.exists()){ if (!dir.exists()){
dir.mkdir(a); dir.mkdir(a);
} }
a+="/screenshot-"+QDateTime::currentDateTime().toString(Qt::ISODate)+".jpg"; a+="/screenshot-"+QDateTime::currentDateTime().toString(Qt::ISODate)+".png";
qDebug() << "Saving screenshot to" << a; qDebug() << "Saving screenshot to" << a;
if (pixmap.save(a)) { if (!pixmap.save(a)) { Notify(tr("There was an error saving screenshot to file \"%1\"").arg(QDir::toNativeSeparators(a)));
Notify(tr("There was an error saving screenshot to file \"%1\"").arg(QDir::toNativeSeparators(a)));
} }
} }