5 files changed, 13 insertions, 117 deletions

diff --git a/core/applets/screenshotapplet/inputDialog.cpp b/core/applets/screenshotapplet/inputDialog.cpp
deleted file mode 100644
index ce03ec0..0000000
--- a/core/applets/screenshotapplet/inputDialog.cpp
+++ b/dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'inputDialog.ui'
-**
-** Created: Sat Mar 2 07:55:03 2002
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "inputDialog.h"
-
-#include <qpe/resource.h>
-
-#include <opie2/ofiledialog.h>
-
-#include <qlineedit.h>
-#include <qpushbutton.h>
-
-using namespace Opie::Ui;
-InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
-{
-    if ( !name )
-  setName( "InputDialog" );
-    resize( 234, 115);
-    setMaximumSize( QSize( 240, 40));
-    setCaption( tr(name ) );
-
-    QPushButton *browserButton;
-    browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton");
-    browserButton->setGeometry( QRect( 205, 10, 22, 22));
-    connect( browserButton, SIGNAL(released()),this,SLOT(browse()));
-    LineEdit1 = new QLineEdit( this, "LineEdit1" );
-    LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-InputDialog::~InputDialog()
-{
-    inputText= LineEdit1->text();
-
-}
-
-void InputDialog::browse() {
-
-    MimeTypes types;
-    QStringList audio, video, all;
-    audio << "audio/*";
-    audio << "playlist/plain";
-    audio << "audio/x-mpegurl";
-
-    video << "video/*";
-    video << "playlist/plain";
-
-    all += audio;
-    all += video;
-    types.insert("All Media Files", all );
-    types.insert("Audio",  audio );
-    types.insert("Video", video );
-
-    QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/","", types, 0 );
-    LineEdit1->setText(str);
-}
-
diff --git a/core/applets/screenshotapplet/inputDialog.h b/core/applets/screenshotapplet/inputDialog.h
deleted file mode 100644
index 3e3e36f..0000000
--- a/core/applets/screenshotapplet/inputDialog.h
+++ b/dev/null
@@ -1,30 +0,0 @@
-/****************************************************************************
-** Form interface generated from reading ui file 'inputDialog.ui'
-**
-** Created: Sat Mar 2 07:54:46 2002
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#ifndef INPUTDIALOG_H
-#define INPUTDIALOG_H
-
-#include <qvariant.h>
-#include <qdialog.h>
-
-class QLineEdit;
-
-class InputDialog : public QDialog
-{ 
-    Q_OBJECT
-
-public:
-    InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~InputDialog();
-    QString inputText;
-    QLineEdit* LineEdit1;
-protected slots:
-    void browse();
-};
-
-#endif // INPUTDIALOG_H
diff --git a/core/applets/screenshotapplet/opie-screenshotapplet.control b/core/applets/screenshotapplet/opie-screenshotapplet.control
index b0b9466..c08953b 100644
--- a/core/applets/screenshotapplet/opie-screenshotapplet.control
+++ b/core/applets/screenshotapplet/opie-screenshotapplet.control
@@ -1,10 +1,10 @@
 Package: opie-screenshotapplet
 Files: plugins/applets/libscreenshotapplet.so* screenshotapplet/*.png
 Priority: optional
 Section: opie/applets
 Maintainer: L. J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Description: Screenshot Applet
  A screenshot taskbar applet for the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 1d88aa5..4ea81c8 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -1,41 +1,41 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com
 **  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.
 **
 **********************************************************************/
 
 #include "screenshot.h"
-#include "inputDialog.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 #include <opie2/otaskbarapplet.h>
+
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.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>
 
 /* STD */
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -98,48 +98,39 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
   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;
 
-    fileDlg = new InputDialog( 0 , tr("Name of screenshot "), TRUE, 0);
-    fileDlg->exec();
-    fileDlg->raise();
-    QString fileName, list;
-    if ( fileDlg->result() == 1 ) {
-      fileName = fileDlg->LineEdit1->text();
+    MimeTypes types;
+    QStringList list;
+    list << "image/*";
+    types. insert ( "Images", list );
 
-      if (fileName.find("/", 0, TRUE) == -1)
-        FileNamePath = QDir::homeDirPath() + "/Documents/image/png/" + fileName;
-      else
-        FileNamePath = fileName;
-
-    }
-    delete fileDlg;
+    FileNamePath = Opie::Ui::OFileDialog::getSaveFileName( 1,"/","", types, 0 );
   }
 
   if ( delaySpin->value() )
     grabTimer->start( delaySpin->value() * 1000, true );
   else
     show();
 }
 
 void ScreenshotControl::slotScap()
 {
   buttonPushed = 2;
   hide();
 
   if ( delaySpin->value() )
     grabTimer->start( delaySpin->value() * 1000, true );
   else
@@ -291,33 +282,33 @@ void ScreenshotControl::performGrab()
         } else {
                 QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
             }
         }
 
 }
 
 
 
 //===========================================================================
 
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
     setFixedHeight( AppLnk::smallIconSize() );
     setFixedWidth( AppLnk::smallIconSize() );
-    m_icon.convertFromImage( Resource::loadImage( "screenshotapplet/screenshot" ).smoothScale( height(), width() ) );
+    m_icon = Opie::Core::OResource::loadPixmap( "screenshotapplet/screenshot", Opie::Core::OResource::SmallIcon );
 }
 
 ScreenshotApplet::~ScreenshotApplet()
 {
 }
 
 int ScreenshotApplet::position()
 {
     return 6;
 }
 
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
 {
   ScreenshotControl *sc = new ScreenshotControl ( );
   QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
 
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index fe8299e..1e4d6a4 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,13 +1,13 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on 
-HEADERS   = screenshot.h inputDialog.h
-SOURCES   = screenshot.cpp inputDialog.cpp
+HEADERS   = screenshot.h
+SOURCES   = screenshot.cpp
 TARGET    = screenshotapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += 
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2 -lopieui2
 VERSION   = 1.0.0
 
 include( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets