author | zecke <zecke> | 2005-02-24 00:26:25 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-02-24 00:26:25 (UTC) |
commit | 2b6eb729bfc4c2a0868d5b19e2518b275e3a8f39 (patch) (unidiff) | |
tree | 66863f328c05490078dc5a4740b9176c751bb707 | |
parent | 729a178d1da1b8f80e4b1f6b0fc2c6a4cd15a403 (diff) | |
download | opie-2b6eb729bfc4c2a0868d5b19e2518b275e3a8f39.zip opie-2b6eb729bfc4c2a0868d5b19e2518b275e3a8f39.tar.gz opie-2b6eb729bfc4c2a0868d5b19e2518b275e3a8f39.tar.bz2 |
Speed up application start by more than 30%
-rw-r--r-- | core/apps/textedit/textedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 26b907b..63709dd 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -76,193 +76,193 @@ private: | |||
76 | }; | 76 | }; |
77 | 77 | ||
78 | void QpeEditor::mousePressEvent( QMouseEvent *e ) { | 78 | void QpeEditor::mousePressEvent( QMouseEvent *e ) { |
79 | switch(e->button()) { | 79 | switch(e->button()) { |
80 | case RightButton: | 80 | case RightButton: |
81 | { //rediculous workaround for qt popup menu | 81 | { //rediculous workaround for qt popup menu |
82 | //and the hold right click mechanism | 82 | //and the hold right click mechanism |
83 | this->setSelection( line1, col1, line2, col2); | 83 | this->setSelection( line1, col1, line2, col2); |
84 | QMultiLineEdit::mousePressEvent( e ); | 84 | QMultiLineEdit::mousePressEvent( e ); |
85 | markIt = false; | 85 | markIt = false; |
86 | } | 86 | } |
87 | break; | 87 | break; |
88 | default: | 88 | default: |
89 | { | 89 | { |
90 | if(!markIt) { | 90 | if(!markIt) { |
91 | int line, col; | 91 | int line, col; |
92 | this->getCursorPosition(&line, &col); | 92 | this->getCursorPosition(&line, &col); |
93 | line1=line2=line; | 93 | line1=line2=line; |
94 | col1=col2=col; | 94 | col1=col2=col; |
95 | } | 95 | } |
96 | QMultiLineEdit::mousePressEvent( e ); | 96 | QMultiLineEdit::mousePressEvent( e ); |
97 | } | 97 | } |
98 | break; | 98 | break; |
99 | }; | 99 | }; |
100 | } | 100 | } |
101 | 101 | ||
102 | void QpeEditor::mouseReleaseEvent( QMouseEvent * ) { | 102 | void QpeEditor::mouseReleaseEvent( QMouseEvent * ) { |
103 | if(this->hasMarkedText()) { | 103 | if(this->hasMarkedText()) { |
104 | markIt = true; | 104 | markIt = true; |
105 | this->getMarkedRegion( &line1, &col1, &line2, & col2 ); | 105 | this->getMarkedRegion( &line1, &col1, &line2, & col2 ); |
106 | } else { | 106 | } else { |
107 | markIt = false; | 107 | markIt = false; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | void QpeEditor::find ( const QString &txt, bool caseSensitive, | 111 | void QpeEditor::find ( const QString &txt, bool caseSensitive, |
112 | bool backwards ) | 112 | bool backwards ) |
113 | { | 113 | { |
114 | static bool wrap = false; | 114 | static bool wrap = false; |
115 | int line, col; | 115 | int line, col; |
116 | if ( wrap ) { | 116 | if ( wrap ) { |
117 | if ( !backwards ) | 117 | if ( !backwards ) |
118 | line = col = 0; | 118 | line = col = 0; |
119 | wrap = false; | 119 | wrap = false; |
120 | // emit searchWrapped(); | 120 | // emit searchWrapped(); |
121 | } else { | 121 | } else { |
122 | getCursorPosition( &line, &col ); | 122 | getCursorPosition( &line, &col ); |
123 | } | 123 | } |
124 | //ignore backwards for now.... | 124 | //ignore backwards for now.... |
125 | if ( !backwards ) { | 125 | if ( !backwards ) { |
126 | for ( ; ; ) { | 126 | for ( ; ; ) { |
127 | if ( line >= numLines() ) { | 127 | if ( line >= numLines() ) { |
128 | wrap = true; | 128 | wrap = true; |
129 | //emit notFound(); | 129 | //emit notFound(); |
130 | break; | 130 | break; |
131 | } | 131 | } |
132 | int findCol = getString( line )->find( txt, col, caseSensitive ); | 132 | int findCol = getString( line )->find( txt, col, caseSensitive ); |
133 | if ( findCol >= 0 ) { | 133 | if ( findCol >= 0 ) { |
134 | setCursorPosition( line, findCol, false ); | 134 | setCursorPosition( line, findCol, false ); |
135 | col = findCol + txt.length(); | 135 | col = findCol + txt.length(); |
136 | setCursorPosition( line, col, true ); | 136 | setCursorPosition( line, col, true ); |
137 | 137 | ||
138 | //found = true; | 138 | //found = true; |
139 | break; | 139 | break; |
140 | } | 140 | } |
141 | line++; | 141 | line++; |
142 | col = 0; | 142 | col = 0; |
143 | } | 143 | } |
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | #else | 148 | #else |
149 | 149 | ||
150 | #error "Must make a QpeEditor that inherits QTextEdit" | 150 | #error "Must make a QpeEditor that inherits QTextEdit" |
151 | 151 | ||
152 | #endif | 152 | #endif |
153 | 153 | ||
154 | 154 | ||
155 | static const int nfontsizes = 6; | 155 | static const int nfontsizes = 6; |
156 | static const int fontsize[nfontsizes] = {8,10,12,14,18,24}; | 156 | static const int fontsize[nfontsizes] = {8,10,12,14,18,24}; |
157 | 157 | ||
158 | TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | 158 | TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) |
159 | : QMainWindow( parent, name, f ), bFromDocView( false ) | 159 | : QMainWindow( parent, name, f ), bFromDocView( false ) |
160 | { | 160 | { |
161 | doc = 0; | 161 | doc = 0; |
162 | edited=false; | 162 | edited=false; |
163 | fromSetDocument=false; | 163 | fromSetDocument=false; |
164 | 164 | ||
165 | setToolBarsMovable( false ); | 165 | setToolBarsMovable( false ); |
166 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 166 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
167 | 167 | ||
168 | channel = new QCopChannel( "QPE/Application/textedit", this ); | 168 | channel = new QCopChannel( "QPE/Application/textedit", this ); |
169 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), | 169 | connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), |
170 | this, SLOT(receive(const QCString&,const QByteArray&)) ); | 170 | this, SLOT(receive(const QCString&,const QByteArray&)) ); |
171 | 171 | ||
172 | setIcon( Resource::loadPixmap( "TextEditor" ) ); | 172 | setIcon( Resource::loadPixmap( "textedit/TextEditor" ) ); |
173 | 173 | ||
174 | QToolBar *bar = new QToolBar( this ); | 174 | QToolBar *bar = new QToolBar( this ); |
175 | bar->setHorizontalStretchable( true ); | 175 | bar->setHorizontalStretchable( true ); |
176 | menu = bar; | 176 | menu = bar; |
177 | 177 | ||
178 | QMenuBar *mb = new QMenuBar( bar ); | 178 | QMenuBar *mb = new QMenuBar( bar ); |
179 | QPopupMenu *file = new QPopupMenu( this ); | 179 | QPopupMenu *file = new QPopupMenu( this ); |
180 | QPopupMenu *edit = new QPopupMenu( this ); | 180 | QPopupMenu *edit = new QPopupMenu( this ); |
181 | QPopupMenu *advancedMenu = new QPopupMenu(this); | 181 | QPopupMenu *advancedMenu = new QPopupMenu(this); |
182 | 182 | ||
183 | font = new QPopupMenu( this ); | 183 | font = new QPopupMenu( this ); |
184 | 184 | ||
185 | bar = new QToolBar( this ); | 185 | bar = new QToolBar( this ); |
186 | editBar = bar; | 186 | editBar = bar; |
187 | 187 | ||
188 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), | 188 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), |
189 | QString::null, 0, this, 0 ); | 189 | QString::null, 0, this, 0 ); |
190 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); | 190 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); |
191 | // a->addTo( bar ); | 191 | // a->addTo( bar ); |
192 | a->addTo( file ); | 192 | a->addTo( file ); |
193 | 193 | ||
194 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), | 194 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), |
195 | QString::null, 0, this, 0 ); | 195 | QString::null, 0, this, 0 ); |
196 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); | 196 | connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) ); |
197 | a->addTo( bar ); | 197 | a->addTo( bar ); |
198 | a->addTo( file ); | 198 | a->addTo( file ); |
199 | 199 | ||
200 | a = new QAction( tr( "Save" ), Resource::loadPixmap("save") , | 200 | a = new QAction( tr( "Save" ), Resource::loadPixmap("save") , |
201 | QString::null, 0, this, 0 ); | 201 | QString::null, 0, this, 0 ); |
202 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); | 202 | connect( a, SIGNAL( activated() ), this, SLOT( save() ) ); |
203 | file->insertSeparator(); | 203 | file->insertSeparator(); |
204 | a->addTo( bar ); | 204 | a->addTo( bar ); |
205 | a->addTo( file ); | 205 | a->addTo( file ); |
206 | 206 | ||
207 | a = new QAction( tr( "Save As" ), Resource::loadPixmap("save") , | 207 | a = new QAction( tr( "Save As" ), Resource::loadPixmap("save") , |
208 | QString::null, 0, this, 0 ); | 208 | QString::null, 0, this, 0 ); |
209 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); | 209 | connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) ); |
210 | a->addTo( file ); | 210 | a->addTo( file ); |
211 | 211 | ||
212 | a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), | 212 | a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), |
213 | QString::null, 0, this, 0 ); | 213 | QString::null, 0, this, 0 ); |
214 | connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); | 214 | connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) ); |
215 | a->addTo( editBar ); | 215 | a->addTo( editBar ); |
216 | a->addTo( edit ); | 216 | a->addTo( edit ); |
217 | 217 | ||
218 | a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), | 218 | a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), |
219 | QString::null, 0, this, 0 ); | 219 | QString::null, 0, this, 0 ); |
220 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); | 220 | connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) ); |
221 | a->addTo( editBar ); | 221 | a->addTo( editBar ); |
222 | a->addTo( edit ); | 222 | a->addTo( edit ); |
223 | 223 | ||
224 | a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), | 224 | a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), |
225 | QString::null, 0, this, 0 ); | 225 | QString::null, 0, this, 0 ); |
226 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); | 226 | connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) ); |
227 | a->addTo( editBar ); | 227 | a->addTo( editBar ); |
228 | a->addTo( edit ); | 228 | a->addTo( edit ); |
229 | 229 | ||
230 | 230 | ||
231 | #ifndef QT_NO_CLIPBOARD | 231 | #ifndef QT_NO_CLIPBOARD |
232 | a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), | 232 | a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ), |
233 | QString::null, 0, this, 0 ); | 233 | QString::null, 0, this, 0 ); |
234 | connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); | 234 | connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) ); |
235 | a->addTo( edit ); | 235 | a->addTo( edit ); |
236 | #endif | 236 | #endif |
237 | 237 | ||
238 | a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ), | 238 | a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ), |
239 | QString::null, 0, this, 0 ); | 239 | QString::null, 0, this, 0 ); |
240 | connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) ); | 240 | connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) ); |
241 | edit->insertSeparator(); | 241 | edit->insertSeparator(); |
242 | a->addTo( edit ); | 242 | a->addTo( edit ); |
243 | 243 | ||
244 | a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), | 244 | a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ), |
245 | QString::null, 0, this, 0 ); | 245 | QString::null, 0, this, 0 ); |
246 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); | 246 | connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) ); |
247 | a->addTo( bar ); | 247 | a->addTo( bar ); |
248 | a->addTo( edit ); | 248 | a->addTo( edit ); |
249 | 249 | ||
250 | zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 ); | 250 | zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 ); |
251 | connect( zin, SIGNAL( activated() ), this, SLOT( zoomIn() ) ); | 251 | connect( zin, SIGNAL( activated() ), this, SLOT( zoomIn() ) ); |
252 | zin->addTo( font ); | 252 | zin->addTo( font ); |
253 | 253 | ||
254 | zout = new QAction( tr("Zoom out"), QString::null, 0, this, 0 ); | 254 | zout = new QAction( tr("Zoom out"), QString::null, 0, this, 0 ); |
255 | connect( zout, SIGNAL( activated() ), this, SLOT( zoomOut() ) ); | 255 | connect( zout, SIGNAL( activated() ), this, SLOT( zoomOut() ) ); |
256 | zout->addTo( font ); | 256 | zout->addTo( font ); |
257 | 257 | ||
258 | font->insertSeparator(); | 258 | font->insertSeparator(); |
259 | 259 | ||
260 | font->insertItem(tr("Font"), this, SLOT(changeFont()) ); | 260 | font->insertItem(tr("Font"), this, SLOT(changeFont()) ); |
261 | 261 | ||
262 | font->insertSeparator(); | 262 | font->insertSeparator(); |
263 | font->insertItem(tr("Advanced Features"), advancedMenu); | 263 | font->insertItem(tr("Advanced Features"), advancedMenu); |
264 | 264 | ||
265 | QAction *wa = new QAction( tr("Wrap lines"), | 265 | QAction *wa = new QAction( tr("Wrap lines"), |
266 | QString::null, 0, this, 0 ); | 266 | QString::null, 0, this, 0 ); |
267 | connect( wa, SIGNAL( toggled(bool) ), | 267 | connect( wa, SIGNAL( toggled(bool) ), |
268 | this, SLOT( setWordWrap(bool) ) ); | 268 | this, SLOT( setWordWrap(bool) ) ); |