| -rw-r--r-- | core/applets/screenshotapplet/screenshot.cpp | 27 | ||||
| -rw-r--r-- | core/applets/screenshotapplet/screenshot.h | 11 |
2 files changed, 31 insertions, 7 deletions
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp index 938ea0c..042f390 100644 --- a/core/applets/screenshotapplet/screenshot.cpp +++ b/core/applets/screenshotapplet/screenshot.cpp @@ -11,26 +11,26 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** **********************************************************************/ #include "screenshot.h" #include "inputDialog.h" /* OPIE */ #include <opie2/odebug.h> #include <opie2/otaskbarapplet.h> #include <qpe/qpeapplication.h> #include <qpe/applnk.h> -using namespace Opie::Core; -using namespace Opie::Ui; +#include <qpe/qcopenvelope_qws.h> + /* QT */ #include <qlineedit.h> #include <qdir.h> #include <qlabel.h> #include <qpushbutton.h> #include <qpainter.h> #include <qspinbox.h> #include <qlayout.h> #include <qcheckbox.h> #include <qmessagebox.h> @@ -245,24 +245,28 @@ static char * snapshot_xpm[] = { "; < ' ' ' ' , , 4 4 ~ ! ! ~ ! 5 e q e e q A H.d q q e e B.Q.9 ", "; $ R.K.5 4 4 ' ! ! 4 ~ ! ~ ~ ~ o { B o A A L.S.B.B.B.B.B.Q.> ", " ] $ 0 R.= ' ' 4 4 5 4 5 5 o B o B p A A L.d e e B.B.B.Q.9 ", " # + - { 4 4 ~ ! o { o L.p p p p p H.S.B.B.s.Q.Q.M.T. ", " + s.6 B o o 5 B p L.p p L.p H.q B.Q.Q.Q.Q.M.; ", " < # s.- B o B p p L.L.H.L.H.d B.Q.Q.Q.Q.Q.9 ", " $ . s.d 6 B A p H.S.L.H.q B.Q.Q.M.M.. ; ", " ; 9 . 6 L.p L.d L.H.d Q.M.M.. 9 ; ] ", " | > e L.d L.H.e M.. ; ] ] ", " > 9 . S.Q.. ; ] ", " T.; ] "}; + +using namespace Opie::Core; +using namespace Opie::Ui; + static const char *SCAP_hostname = "www.handhelds.org"; static const int SCAP_port = 80; ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name ) : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) { setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); QVBoxLayout *vbox = new QVBoxLayout ( this, 5, 3 ); QHBoxLayout *hbox; hbox = new QHBoxLayout ( vbox ); @@ -283,37 +287,42 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name ) vbox-> addSpacing ( 3 ); l = new QLabel ( tr( "Save screenshot as..." ), this ); vbox-> addWidget ( l, AlignCenter ); hbox = new QHBoxLayout ( vbox ); grabItButton = new QPushButton( tr( "File" ), this, "GrabButton" ); grabItButton ->setFocusPolicy( QWidget::TabFocus ); hbox-> addWidget ( grabItButton ); + QPushButton* drawPadButton = new QPushButton( tr("Opie drawpad"), this, "DrawPadButton" ); + drawPadButton->setFocusPolicy( QWidget::TabFocus ); + hbox->addWidget( drawPadButton ); + scapButton = new QPushButton( tr( "Scap" ), this, "ScapButton" ); scapButton ->setFocusPolicy( QWidget::TabFocus ); hbox-> addWidget ( scapButton ); setFixedSize ( sizeHint ( )); setFocusPolicy ( QWidget::NoFocus ); grabTimer = new QTimer ( this, "grab timer"); connect ( grabTimer, SIGNAL( timeout()), this, SLOT( performGrab())); connect ( grabItButton, SIGNAL( clicked()), SLOT( slotGrab())); connect ( scapButton, SIGNAL( clicked()), SLOT( slotScap())); + connect ( drawPadButton, SIGNAL(clicked()), SLOT(slotDrawpad()) ); } void ScreenshotControl::slotGrab() { buttonPushed = 1; hide(); setFileName = FALSE; if ( saveNamedCheck->isChecked()) { setFileName = TRUE; InputDialog *fileDlg; @@ -341,24 +350,33 @@ void ScreenshotControl::slotGrab() void ScreenshotControl::slotScap() { buttonPushed = 2; hide(); if ( delaySpin->value() ) grabTimer->start( delaySpin->value() * 1000, true ); else show(); } +void ScreenshotControl::slotDrawpad() +{ + buttonPushed = 3; + hide(); + if ( delaySpin->value() ) + grabTimer->start( delaySpin->value()*1000, true ); + else + show(); +} void ScreenshotControl::savePixmap() { DocLnk lnk; QString fileName; if ( setFileName) { fileName = FileNamePath; //not sure why this is needed here, but it forgets fileName // if this is below the braces if (fileName.right(3) != "png") @@ -404,24 +422,29 @@ void ScreenshotControl::savePixmap() } void ScreenshotControl::performGrab() { snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() ); if (buttonPushed == 1) { odebug << "grabbing screen" << oendl; grabTimer->stop(); show(); qApp->processEvents(); savePixmap(); + }else if ( buttonPushed == 3 ) { + grabTimer->stop(); + show(); + QCopEnvelope env("QPE/Application/drawpad", "importPixmap(QPixmap)" ); + env << snapshot; } else { grabTimer->stop(); struct sockaddr_in raddr; struct hostent *rhost_info; int sock = -1; bool ok = false; QString displayEnv = getenv("QWS_DISPLAY"); odebug << displayEnv << oendl; if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) { diff --git a/core/applets/screenshotapplet/screenshot.h b/core/applets/screenshotapplet/screenshot.h index b753583..e7b6040 100644 --- a/core/applets/screenshotapplet/screenshot.h +++ b/core/applets/screenshotapplet/screenshot.h @@ -3,26 +3,26 @@ ** All rights reserved. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** **********************************************************************/ -#ifndef __SCREENSHOT_APPLET_H__ -#define __SCREENSHOT_APPLET_H__ +#ifndef SCREENSHOT_APPLET_H__ +#define SCREENSHOT_APPLET_H__ #include <qwidget.h> #include <qframe.h> #include <qpixmap.h> #include <qguardedptr.h> #include <qtimer.h> class QComboBox; class QCheckBox; class QSpinBox; @@ -38,34 +38,35 @@ public: private: QPushButton *grabItButton, *scapButton; QPixmap snapshot; QTimer* grabTimer; QCheckBox *saveNamedCheck; QString FileNamePath; bool setFileName; QSpinBox *delaySpin; int buttonPushed; private slots: void slotGrab(); - void slotScap(); + void slotScap(); + void slotDrawpad(); void savePixmap(); void performGrab(); }; class ScreenshotApplet : public QWidget { public: ScreenshotApplet( QWidget *parent = 0, const char *name=0 ); ~ScreenshotApplet(); static int position(); - + protected: void mousePressEvent( QMouseEvent * ); void paintEvent( QPaintEvent* ); - + private: QPixmap m_icon; }; #endif // __SCREENSHOT_APPLET_H__ |