- rewrote the SCAP part (doesn't need netcat anymore now)

 - cleaned up the code
 - reworked the GUI a bit

2 files changed, 136 insertions, 119 deletions

diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 266d6d8..fab4044 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -18,5 +18,8 @@
 #include <qapplication.h>
 #include <stdlib.h>
-
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <unistd.h>
 
 #include <qpe/resource.h>
@@ -27,10 +30,9 @@
 #include <qpe/applnk.h>
 #include <qpe/config.h>
-#include <qsocket.h>
 
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qfileinfo.h>
-#include <qpoint.h>
+#include <qlabel.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
@@ -48,4 +50,5 @@
 #include <qdatastream.h>
 #include <qcheckbox.h>
+#include <qmessagebox.h>
 
 
@@ -79,4 +82,7 @@ static char * snapshot_xpm[] = {
 "                "};
 
+static const char *SCAP_hostname = "www.handhelds.org";
+static const int SCAP_port = 80;
+
 
 ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
@@ -84,70 +90,57 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
 {
     setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
-//    qDebug("screenshot control");
-    QVBoxLayout *vbox = new QVBoxLayout( this );
-    QHBoxLayout *hbox = new QHBoxLayout( this );
-//    qDebug("new layout");
-    delaySpin = new QSpinBox( 0,60,1, this, "Spinner" );
-//    qDebug("new spinbox");
-    delaySpin->setFocusPolicy( QWidget::NoFocus );
-
-
-    grabItButton= new QPushButton( this, "GrabButton" );
-//    qDebug("new pushbutton");
-
-    grabItButton ->setFocusPolicy( QWidget::TabFocus );
-    grabItButton->setText(tr("Snapshot"));
-
+	QVBoxLayout *vbox = new QVBoxLayout ( this, 5, 3 );
+	QHBoxLayout *hbox;
 
-    vbox->setMargin( 6 );
-    vbox->setSpacing( 3 );
+	hbox = new QHBoxLayout ( vbox );
 
-    vbox->addWidget( delaySpin);
+	QLabel *l = new QLabel ( tr( "Delay" ), this );
+	hbox-> addWidget ( l );
 
-    vbox->setMargin( 6 );
-    vbox->setSpacing( 3 );
-    QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    vbox->addItem( spacer );
+	delaySpin = new QSpinBox( 0, 60, 1, this, "Spinner" );
+	delaySpin-> setButtonSymbols ( QSpinBox::PlusMinus );
+	delaySpin-> setSuffix ( tr( "sec" ));
+	delaySpin-> setFocusPolicy( QWidget::NoFocus );
+	delaySpin-> setValue ( 1 );
+	hbox-> addWidget ( delaySpin );
 
-    saveNamedCheck= new QCheckBox ( "name it", this);
+	saveNamedCheck = new QCheckBox ( tr( "Save named" ), this);
     saveNamedCheck-> setFocusPolicy ( QWidget::NoFocus );
     vbox->addWidget( saveNamedCheck);
 
+	vbox-> addSpacing ( 3 );
 
-    scapButton = new QPushButton( this, "ScapButton" );
+	l = new QLabel ( tr( "Save screenshot as..." ), this );
+	vbox-> addWidget ( l, AlignCenter );
 
-    scapButton ->setFocusPolicy( QWidget::TabFocus );
-    scapButton ->setText(tr("scap"));
-    if( !QFile("/usr/bin/nc").exists())
-        scapButton->hide();
+	hbox = new QHBoxLayout ( vbox );
         
+	grabItButton = new QPushButton( tr( "File" ), this, "GrabButton" );
+	grabItButton ->setFocusPolicy( QWidget::TabFocus );
     hbox->addWidget( grabItButton);
-    QSpacerItem* spacer2 = new QSpacerItem( 4, 4, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    hbox->addItem( spacer2 );
-    hbox->addWidget( scapButton);
 
-    vbox->addItem(hbox);
+	scapButton = new QPushButton( tr( "Scap" ), this, "ScapButton" );
+	scapButton ->setFocusPolicy( QWidget::TabFocus );
+	hbox-> addWidget ( scapButton );
 
-    setFixedHeight( 100 );
-    setFixedWidth( sizeHint().width() );
+	setFixedSize ( sizeHint ( ));
     setFocusPolicy(QWidget::NoFocus);
 
+
     grabTimer= new QTimer(this,"grab timer");
-    connect( grabTimer, SIGNAL( timeout() ), this, SLOT(  grabTimerDone() ) );
 
-  delaySpin->setValue(1);
-    connect( grabItButton, SIGNAL(released()), SLOT(slotGrab()) );
-    connect( scapButton, SIGNAL(released()), SLOT(slotScap()) );
-    connect(saveNamedCheck, SIGNAL(toggled( bool)), this, SLOT( nameScreenshot(bool)) );
+	connect ( grabTimer, SIGNAL( timeout ( )), this, SLOT( performGrab ( )));
+	connect ( grabItButton, SIGNAL( clicked ( )), SLOT( slotGrab ( )));
+	connect ( scapButton, SIGNAL( clicked ( )), SLOT( slotScap ( )));
 }
 
-void ScreenshotControl::slotGrab() {
-//    qDebug("SlotGrab");
+void ScreenshotControl::slotGrab()
+{
     buttonPushed=1;
     hide();
+
     setFileName=FALSE;
     if( saveNamedCheck->isChecked()) {
         setFileName=TRUE;
-//        qDebug("checked");
         InputDialog *fileDlg;
 
@@ -163,32 +156,29 @@ void ScreenshotControl::slotGrab() {
             else
                 FileNamePath = fileName;
-//            qDebug(fileName);
             
         }
         delete fileDlg;
     }
-    if ( delaySpin->value() ) {
+
+	if ( delaySpin->value() )
         grabTimer->start( delaySpin->value() * 1000, true );
-    } else {
+	else
         show();
     }
-}
 
-void ScreenshotControl::slotScap() {
+void ScreenshotControl::slotScap()
+{
     buttonPushed=2;
     hide();
-    if ( delaySpin->value() ) {
+
+	if ( delaySpin->value() )
         grabTimer->start( delaySpin->value() * 1000, true );
-    } else {
+	else
         show();
     }
-}
-
 
-void ScreenshotControl::grabTimerDone() {
-    performGrab();
-}
 
-void ScreenshotControl::savePixmap() {
+void ScreenshotControl::savePixmap()
+{
     DocLnk lnk;
     QString fileName;
@@ -209,8 +199,12 @@ void ScreenshotControl::savePixmap() {
         if(!lnk.writeLink())
             qDebug("Writing doclink did not work");
-    } else {
+	}
+	else {
 
         fileName = "sc_"+TimeString::dateString( QDateTime::currentDateTime(),false,true);
-        fileName.replace(QRegExp("'"),"");  fileName.replace(QRegExp(" "),"_");  fileName.replace(QRegExp(":"),".");  fileName.replace(QRegExp(","),"");
+		fileName.replace(QRegExp("'"), "");
+		fileName.replace(QRegExp(" "), "_");
+		fileName.replace(QRegExp(":"), ".");
+		fileName.replace(QRegExp(","), "");
         QString dirName = QDir::homeDirPath()+"/Documents/image/png/";
 
@@ -237,72 +231,107 @@ void ScreenshotControl::savePixmap() {
 }
 
-void ScreenshotControl::performGrab() {
+void ScreenshotControl::performGrab()
+{
+	snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() );
 
     if(buttonPushed ==1) {
         qDebug("grabbing screen");
         grabTimer->stop();
-        snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(),0,0,QApplication::desktop()->width(),QApplication::desktop()->height() );
         show();
         qApp->processEvents();        
         savePixmap();
-    } else {
-        qDebug("scap");
-        grabTimer->stop();
-// do scap here
-        QString cmd;
-        cmd="cat /dev/fd0 > /tmp/cap";
-        system(cmd.latin1());
-// qDebug("echo \"POST /scap/capture.cgi http1.1\"
-// echo \"Content-length: 153600\"
-// echo \"Content-Type: image/gif\"
-// echo \"HOST: www.handhelds.org\"
-// echo \"\"
-// cat /tmp/cap | nc h1.handhelds.org 80");
-        cmd="nc h1.handhelds.org 1011 </tmp/cap";
-        qDebug("running command "+cmd);
-
-        system(cmd.latin1());
-        show();
     }
+	else {
+		grabTimer->stop();
     
-}
+		struct sockaddr_in raddr;
+		struct hostent *rhost_info;
+		int sock = -1;
+		bool ok = false;
+
+		if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
+			::memset ( &raddr, 0, sizeof (struct sockaddr_in));
+			::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
+			raddr. sin_family = rhost_info-> h_addrtype;
+			raddr. sin_port = htons ( SCAP_port );
+
+			if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 )
+			{
+				if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
+					QString header;
 
-void ScreenshotControl::setTime(int newTime) {
-       delaySpin->setValue(newTime);
+					header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n"  // 1: model / 2: user
+					         "Content-length: 153600\n"
+					         "Content-Type: image/gif\n"
+					         "Host: %4\n"                               // 3: scap host
+					         "\n";
+
+					header = header. arg ( "" ). arg ( ::getenv ( "USER" )). arg ( SCAP_hostname );
+
+					QPixmap pix;
+
+					if ( snapshot. width ( ) == 320 && snapshot. height ( ) == 240 )
+					{
+						pix = snapshot;
 }
+					else if ( snapshot. width ( ) == 240 && snapshot. height ( ) == 320 )
+					{
+						pix = snapshot. xForm ( QWMatrix ( ). rotate ( 90 ));
+					}
+
+					if ( !pix. isNull ( ))
+					{
+						const char *ascii = header. latin1 ( );
+						uint ascii_len = ::strlen ( ascii );
 
-void ScreenshotControl::nameScreenshot(bool b) {
+						::write ( sock, ascii, ascii_len );
 
+						QImage img = pix. convertToImage ( ). convertDepth ( 16 );
+						::write ( sock, img. bits ( ), img.numBytes ( ));
     
+						ok = true;
 }
+				}
+				::close ( sock );
+			}
+		}
+		if ( ok )
+			QMessageBox::information ( 0, tr( "Success" ), QString ( "<p>%1</p>" ). arg ( tr( "Screenshot was uploaded to %1" )). arg ( SCAP_hostname ));
+		else
+			QMessageBox::warning ( 0, tr( "Error" ), QString ( "<p>%1</p>" ). arg ( tr( "Connection to %1 failed." )). arg ( SCAP_hostname ));
+	}
+
+}
+
+
 
 //===========================================================================
 
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
-    : QWidget( parent, name ) {
-//    qDebug("beginning  applet");
+		: QWidget( parent, name )
+{
     setFixedHeight( 18 );
     setFixedWidth( 14 );
-    vc = new ScreenshotControl(this,"ScreenshotApplet");;
-//    qDebug("new screenshotapplet");
-}
 
-ScreenshotApplet::~ScreenshotApplet() {
+	m_icon = QPixmap ((const char **) snapshot_xpm );
 }
 
-void ScreenshotApplet::mousePressEvent( QMouseEvent *) {
-//    if(!vc)
-    vc = new ScreenshotControl;
-    QPoint curPos = mapToGlobal( rect().topLeft() );
-    vc->move( curPos.x()-(vc->sizeHint().width()-width())/2, curPos.y() - 100 );
-    vc->show();
+ScreenshotApplet::~ScreenshotApplet()
+{
+}
 
+void ScreenshotApplet::mousePressEvent( QMouseEvent *)
+{
+	ScreenshotControl *sc = new ScreenshotControl ( );
+	QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
+	sc-> move ( curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2, 
+	            curPos. y ( ) - sc-> sizeHint ( ). height ( ));
+	sc-> show ( );
 }
 
-void ScreenshotApplet::paintEvent( QPaintEvent* ) {
+void ScreenshotApplet::paintEvent( QPaintEvent* )
+{
     QPainter p(this);
-    qDebug("paint pixmap");
-    p.drawPixmap( 0, 1,  ( const char** ) snapshot_xpm );
-
+	p. drawPixmap ( 0, 1, m_icon );
 }
 
diff --git a/core/applets/screenshotapplet/screenshot.h b/core/applets/screenshotapplet/screenshot.h
index c8dfeaa..74cc5e6 100644
--- a/core/applets/screenshotapplet/screenshot.h
+++ b/core/applets/screenshotapplet/screenshot.h
@@ -35,7 +35,6 @@ class ScreenshotControl : public QFrame
 public:
     ScreenshotControl( QWidget *parent=0, const char *name=0 );
-    void performGrab();
 
-public:
+private:
     QPushButton *grabItButton, *scapButton;
     QPixmap snapshot;
@@ -44,36 +43,25 @@ public:
     QString FileNamePath;
     bool setFileName;
-    void slotSave();
-    void slotCopy();
-    void setTime(int newTime);
-
     QSpinBox  *delaySpin;
-private:
     int buttonPushed;
+
 private slots:
     void slotGrab();
     void slotScap(); 
     void savePixmap();
-    void grabTimerDone();
-    void nameScreenshot(bool);
+    void performGrab();
 };
 
-class ScreenshotApplet : public QWidget
-{
-    Q_OBJECT
+class ScreenshotApplet : public QWidget {
 public:
     ScreenshotApplet( QWidget *parent = 0, const char *name=0 );
     ~ScreenshotApplet();
-    ScreenshotControl *vc; 
-public slots:
-private:
+    
+protected:
     void mousePressEvent( QMouseEvent * );
     void paintEvent( QPaintEvent* );
 
 private:
-    QPixmap snapshotPixmap;
-private slots:
-
-        
+	QPixmap m_icon;
 };