Fixed position of popup and added pixmaps for cut/copy/paste

1 files changed, 7 insertions, 4 deletions

diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 7714f81..cd4f61c 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -110,54 +110,57 @@ static const char * paste_xpm[] = {
 "<fu-umkebhp(0.",
 "<cugg4kbh)_(q.",
 "<cyyymk))p(%q.",
 ",5vvv4k)p_%[q.",
 " ...$mljnn0qd.",
 "     4.......,"};
 
 
 ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
 {
 	setFixedWidth ( 14 );
 	setFixedHeight ( 18 );
 	clipboardPixmap = QPixmap ( paste_xpm );
 	menu = 0;
 }
 
 ClipboardApplet::~ClipboardApplet ( )
 {
 }
 
 void ClipboardApplet::mousePressEvent ( QMouseEvent *)
 {
 	if ( !menu ) {
 		menu = new QPopupMenu ( this );
-		menu-> insertItem ( tr( "Cut" ), 0 );
-		menu-> insertItem ( tr( "Copy" ), 1 );
-		menu-> insertItem ( tr( "Paste" ), 2 );
+		menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 0 );
+		menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 1 );
+		menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 2 );
 		connect ( menu, SIGNAL( activated ( int )), this, SLOT( action ( int )));
 	}
-	menu->popup(mapToGlobal(QPoint(0,0)));
+	QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
+	QSize s = menu-> sizeHint ( );
+	
+	menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )));
 }
 
 void ClipboardApplet::action(int id)
 {
 	ushort unicode=0;
 	int scan=0;
 
 	switch ( id ) {
 		case 0:
 			unicode='X'-'@'; 
 			scan=Key_X; // Cut
 			break;
 		case 1:
 			unicode='C'-'@'; 
 			scan=Key_C; // Copy
 			break;
 		case 2:
 			unicode='V'-'@'; 
 			scan=Key_V; // Paste
 			break;
 	}
 		
 	if ( scan ) {
 		qwsServer->processKeyEvent( unicode, scan, ControlButton, TRUE, FALSE );