Diffstat (limited to 'core/applets/clipboardapplet/clipboard.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/clipboardapplet/clipboard.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index 5848d0f..4fbdf6f 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp | |||
@@ -101,64 +101,73 @@ static const char * paste_xpm[] = { | |||
101 | " *{>; ", | 101 | " *{>; ", |
102 | " }}}@e:!;}}} ", | 102 | " }}}@e:!;}}} ", |
103 | "<x8=&:#@+;ll, ", | 103 | "<x8=&:#@+;ll, ", |
104 | "}k/=;;3}337|o ", | 104 | "}k/=;;3}337|o ", |
105 | "<k's24444m45o ", | 105 | "<k's24444m45o ", |
106 | "}8'ss4xkkk]}a ", | 106 | "}8'ss4xkkk]}a ", |
107 | "<1s224keee|b4 ", | 107 | "<1s224keee|b4 ", |
108 | "}r2itmkeee]]44", | 108 | "}r2itmkeee]]44", |
109 | "<9iitmkeeehkw.", | 109 | "<9iitmkeeehkw.", |
110 | "<lt-u4keeb)pn.", | 110 | "<lt-u4keeb)pn.", |
111 | "<fu-umkebhp(0.", | 111 | "<fu-umkebhp(0.", |
112 | "<cugg4kbh)_(q.", | 112 | "<cugg4kbh)_(q.", |
113 | "<cyyymk))p(%q.", | 113 | "<cyyymk))p(%q.", |
114 | ",5vvv4k)p_%[q.", | 114 | ",5vvv4k)p_%[q.", |
115 | " ...$mljnn0qd.", | 115 | " ...$mljnn0qd.", |
116 | " 4.......,"}; | 116 | " 4.......,"}; |
117 | 117 | ||
118 | 118 | ||
119 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) | 119 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) |
120 | { | 120 | { |
121 | setFixedWidth ( 14 ); | 121 | setFixedWidth ( 14 ); |
122 | setFixedHeight ( 18 ); | 122 | setFixedHeight ( 18 ); |
123 | m_clipboardPixmap = QPixmap ( paste_xpm ); | 123 | m_clipboardPixmap = QPixmap ( paste_xpm ); |
124 | 124 | ||
125 | QTimer *timer = new QTimer ( this ); | 125 | m_timer = new QTimer ( this ); |
126 | 126 | ||
127 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); | 127 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); |
128 | connect ( timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); | 128 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); |
129 | connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( ))); | ||
129 | 130 | ||
130 | timer-> start ( 1000 ); | 131 | m_timer-> start ( 1500 ); |
131 | 132 | ||
132 | m_menu = 0; | 133 | m_menu = 0; |
133 | m_dirty = true; | 134 | m_dirty = true; |
134 | m_lasttext = QString::null; | 135 | m_lasttext = QString::null; |
135 | } | 136 | } |
136 | 137 | ||
137 | ClipboardApplet::~ClipboardApplet ( ) | 138 | ClipboardApplet::~ClipboardApplet ( ) |
138 | { | 139 | { |
139 | } | 140 | } |
140 | 141 | ||
142 | void ClipboardApplet::shutdown ( ) | ||
143 | { | ||
144 | // the timer has to be stopped, or Qt/E will hang on quit() | ||
145 | // see launcher/desktop.cpp | ||
146 | |||
147 | m_timer-> stop ( ); | ||
148 | } | ||
149 | |||
141 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) | 150 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) |
142 | { | 151 | { |
143 | if ( m_dirty ) { | 152 | if ( m_dirty ) { |
144 | delete m_menu; | 153 | delete m_menu; |
145 | 154 | ||
146 | m_menu = new QPopupMenu ( this ); | 155 | m_menu = new QPopupMenu ( this ); |
147 | m_menu-> setCheckable ( true ); | 156 | m_menu-> setCheckable ( true ); |
148 | 157 | ||
149 | if ( m_history. count ( )) { | 158 | if ( m_history. count ( )) { |
150 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { | 159 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { |
151 | QString str = m_history [i]; | 160 | QString str = m_history [i]; |
152 | 161 | ||
153 | if ( str. length ( ) > 20 ) | 162 | if ( str. length ( ) > 20 ) |
154 | str = str. left ( 20 ) + "..."; | 163 | str = str. left ( 20 ) + "..."; |
155 | 164 | ||
156 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); | 165 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); |
157 | m_menu-> setItemChecked ( i, false ); | 166 | m_menu-> setItemChecked ( i, false ); |
158 | } | 167 | } |
159 | m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); | 168 | m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); |
160 | m_menu-> insertSeparator ( ); | 169 | m_menu-> insertSeparator ( ); |
161 | } | 170 | } |
162 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); | 171 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); |
163 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); | 172 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); |
164 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); | 173 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); |