-rw-r--r-- | core/applets/screenshotapplet/config.in | 2 | ||||
-rw-r--r-- | core/applets/screenshotapplet/inputDialog.cpp | 3 | ||||
-rw-r--r-- | core/applets/screenshotapplet/screenshot.cpp | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/applets/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in index cafd470..98f2b61 100644 --- a/core/applets/screenshotapplet/config.in +++ b/core/applets/screenshotapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config SCREENSHOTAPPLET | 1 | config SCREENSHOTAPPLET |
2 | boolean "opie-screenshotapplet (create images from your current display)" | 2 | boolean "opie-screenshotapplet (create images from your current display)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/screenshotapplet/inputDialog.cpp b/core/applets/screenshotapplet/inputDialog.cpp index 73ec773..ce03ec0 100644 --- a/core/applets/screenshotapplet/inputDialog.cpp +++ b/core/applets/screenshotapplet/inputDialog.cpp | |||
@@ -6,24 +6,25 @@ | |||
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #include "inputDialog.h" | 9 | #include "inputDialog.h" |
10 | 10 | ||
11 | #include <qpe/resource.h> | 11 | #include <qpe/resource.h> |
12 | 12 | ||
13 | #include <opie2/ofiledialog.h> | 13 | #include <opie2/ofiledialog.h> |
14 | 14 | ||
15 | #include <qlineedit.h> | 15 | #include <qlineedit.h> |
16 | #include <qpushbutton.h> | 16 | #include <qpushbutton.h> |
17 | 17 | ||
18 | using namespace Opie::Ui; | ||
18 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 19 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
19 | : QDialog( parent, name, modal, fl ) | 20 | : QDialog( parent, name, modal, fl ) |
20 | { | 21 | { |
21 | if ( !name ) | 22 | if ( !name ) |
22 | setName( "InputDialog" ); | 23 | setName( "InputDialog" ); |
23 | resize( 234, 115); | 24 | resize( 234, 115); |
24 | setMaximumSize( QSize( 240, 40)); | 25 | setMaximumSize( QSize( 240, 40)); |
25 | setCaption( tr(name ) ); | 26 | setCaption( tr(name ) ); |
26 | 27 | ||
27 | QPushButton *browserButton; | 28 | QPushButton *browserButton; |
28 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); | 29 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); |
29 | browserButton->setGeometry( QRect( 205, 10, 22, 22)); | 30 | browserButton->setGeometry( QRect( 205, 10, 22, 22)); |
@@ -49,16 +50,16 @@ void InputDialog::browse() { | |||
49 | audio << "playlist/plain"; | 50 | audio << "playlist/plain"; |
50 | audio << "audio/x-mpegurl"; | 51 | audio << "audio/x-mpegurl"; |
51 | 52 | ||
52 | video << "video/*"; | 53 | video << "video/*"; |
53 | video << "playlist/plain"; | 54 | video << "playlist/plain"; |
54 | 55 | ||
55 | all += audio; | 56 | all += audio; |
56 | all += video; | 57 | all += video; |
57 | types.insert("All Media Files", all ); | 58 | types.insert("All Media Files", all ); |
58 | types.insert("Audio", audio ); | 59 | types.insert("Audio", audio ); |
59 | types.insert("Video", video ); | 60 | types.insert("Video", video ); |
60 | 61 | ||
61 | QString str = Opie::OFileDialog::getOpenFileName( 1,"/","", types, 0 ); | 62 | QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/","", types, 0 ); |
62 | LineEdit1->setText(str); | 63 | LineEdit1->setText(str); |
63 | } | 64 | } |
64 | 65 | ||
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp index 20e1c9b..9aa012a 100644 --- a/core/applets/screenshotapplet/screenshot.cpp +++ b/core/applets/screenshotapplet/screenshot.cpp | |||
@@ -30,24 +30,25 @@ | |||
30 | #include <qlayout.h> | 30 | #include <qlayout.h> |
31 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
32 | #include <qmessagebox.h> | 32 | #include <qmessagebox.h> |
33 | 33 | ||
34 | /* STD */ | 34 | /* STD */ |
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | #include <sys/socket.h> | 36 | #include <sys/socket.h> |
37 | #include <netinet/in.h> | 37 | #include <netinet/in.h> |
38 | #include <netdb.h> | 38 | #include <netdb.h> |
39 | #include <unistd.h> | 39 | #include <unistd.h> |
40 | 40 | ||
41 | /* XPM */ | 41 | /* XPM */ |
42 | using namespace Opie::Ui; | ||
42 | static char * snapshot_xpm[] = { | 43 | static char * snapshot_xpm[] = { |
43 | "32 32 177 2", | 44 | "32 32 177 2", |
44 | " c None", | 45 | " c None", |
45 | ". c #042045", | 46 | ". c #042045", |
46 | "+ c #0D2B47", | 47 | "+ c #0D2B47", |
47 | "@ c #0E325E", | 48 | "@ c #0E325E", |
48 | "# c #0D2E50", | 49 | "# c #0D2E50", |
49 | "$ c #0A1C32", | 50 | "$ c #0A1C32", |
50 | "% c #0F3A69", | 51 | "% c #0F3A69", |
51 | "& c #164680", | 52 | "& c #164680", |
52 | "* c #165EAE", | 53 | "* c #165EAE", |
53 | "= c #134D89", | 54 | "= c #134D89", |
@@ -527,17 +528,15 @@ void ScreenshotApplet::mousePressEvent( QMouseEvent *) | |||
527 | } | 528 | } |
528 | 529 | ||
529 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); | 530 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); |
530 | sc-> show ( ); | 531 | sc-> show ( ); |
531 | } | 532 | } |
532 | 533 | ||
533 | void ScreenshotApplet::paintEvent( QPaintEvent* ) | 534 | void ScreenshotApplet::paintEvent( QPaintEvent* ) |
534 | { | 535 | { |
535 | QPainter p ( this ); | 536 | QPainter p ( this ); |
536 | p.drawPixmap( 0,0, m_icon ); | 537 | p.drawPixmap( 0,0, m_icon ); |
537 | } | 538 | } |
538 | 539 | ||
539 | Q_EXPORT_INTERFACE() | 540 | |
540 | { | 541 | EXPORT_OPIE_APPLET_v1( ScreenshotApplet ) |
541 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> ); | ||
542 | } | ||
543 | 542 | ||