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
@@ -38,137 +38,140 @@ static const char * paste_xpm[] = {
         "+c #867616",
         "@c #A69A42",
         "#c #BAB676",
         "$c #060606",
         "%c #EAD2AA",
         "&c #F6F6DA",
         "*c #222212",
         "=c #86761E",
         "-c #868686",
         ";c #5A5202",
         ">c #8A7E2E",
         ",c #2C2C2C",
         "'c #9A9A9A",
         ")c #F6EADA",
         "!c #AAA262",
         "~c #323232",
         "{c #726A32",
         "]c #6E6E6E",
         "^c #C2B69E",
         "/c #9E9E9E",
         "(c #EED6BA",
         "_c #F2DEC2",
         ":c #D2CE8E",
         "<c #3A3A3A",
         "[c #EACAA2",
         "}c #3E3E3E",
         "|c #727272",
         "1c #CECECE",
         "2c #929292",
         "3c #4A462A",
         "4c #424242",
         "5c #666666",
         "6c #C2AE96",
         "7c #767676",
         "8c #D6D6D6",
         "9c #C2C2C2",
         "0c #BFA681",
         "ac #1E1E1E",
         "bc #FAF6F3",
         "cc #AEAEAE",
         "dc #C29A6A",
         "ec #FEFEFE",
         "fc #B6B6B6",
         "gc #7E7E7E",
         "hc #FAF2E6",
         "ic #8E8E8E",
         "jc #C6BCAE",
         "kc #DEDEDE",
         "lc #BEBEBE",
         "mc #464646",
         "nc #BEAE92",
         "oc #262626",
         "pc #F2E2CE",
         "qc #C2A175",
         "rc #CACACA",
         "sc #969696",
         "tc #8A8A8A",
         "uc #828282",
         "vc #6A6A6A",
         "wc #BEB6AE",
         "xc #E2E0E0",
         "yc #7A7A7A",
 "    *{>;      ",
 " }}}@e:!;}}}  ",
 "<x8=&:#@+;ll, ",
 "}k/=;;3}337|o ",
 "<k's24444m45o ",
 "}8'ss4xkkk]}a ",
 "<1s224keee|b4 ",
 "}r2itmkeee]]44",
 "<9iitmkeeehkw.",
 "<lt-u4keeb)pn.",
 "<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 );
                 qwsServer->processKeyEvent( unicode, scan, ControlButton, FALSE, FALSE );
         }
 }
 
 void ClipboardApplet::paintEvent ( QPaintEvent* )
 {
         QPainter p ( this );
         p. drawPixmap ( 0, 1, clipboardPixmap );
 }