-rw-r--r-- | noncore/apps/opie-write/mainwindow.cpp | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp index aa03060..296a1b0 100644 --- a/noncore/apps/opie-write/mainwindow.cpp +++ b/noncore/apps/opie-write/mainwindow.cpp | |||
@@ -25,5 +25,5 @@ | |||
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <opie2/oresource.h> | ||
26 | #include <qpe/fileselector.h> | 27 | #include <qpe/fileselector.h> |
27 | #include <qpe/applnk.h> | 28 | #include <qpe/applnk.h> |
28 | #include <qpe/resource.h> | ||
29 | #include <qpe/fontdatabase.h> | 29 | #include <qpe/fontdatabase.h> |
@@ -170,3 +170,4 @@ void MainWindow::setupActions() | |||
170 | 170 | ||
171 | a = new QAction( tr( "New" ), Resource::loadPixmap("new"), QString::null, 0, this, 0 ); | 171 | a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon), |
172 | QString::null, 0, this, 0 ); | ||
172 | connect( a, SIGNAL(activated()), this, SLOT(fileNew()) ); | 173 | connect( a, SIGNAL(activated()), this, SLOT(fileNew()) ); |
@@ -174,3 +175,4 @@ void MainWindow::setupActions() | |||
174 | 175 | ||
175 | a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); | 176 | a = new QAction( tr( "Open" ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ), |
177 | QString::null, 0, this, 0 ); | ||
176 | connect( a, SIGNAL(activated()), this, SLOT(fileOpen()) ); | 178 | connect( a, SIGNAL(activated()), this, SLOT(fileOpen()) ); |
@@ -178,4 +180,4 @@ void MainWindow::setupActions() | |||
178 | 180 | ||
179 | a = new QAction( tr( "Undo" ), Resource::loadIconSet("undo"), | 181 | a = new QAction( tr( "Undo" ), Opie::Core::OResource::loadPixmap("undo", Opie::Core::OResource::SmallIcon), |
180 | QString::null, 0, this, "editUndo" ); | 182 | QString::null, 0, this, "editUndo" ); |
181 | connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) ); | 183 | connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) ); |
@@ -184,3 +186,3 @@ void MainWindow::setupActions() | |||
184 | a->addTo( edit ); | 186 | a->addTo( edit ); |
185 | a = new QAction( tr( "Redo" ), Resource::loadIconSet("redo"), | 187 | a = new QAction( tr( "Redo" ), Opie::Core::OResource::loadPixmap("redo", Opie::Core::OResource::SmallIcon), |
186 | QString::null, 0, this, "editRedo" ); | 188 | QString::null, 0, this, "editRedo" ); |
@@ -193,3 +195,3 @@ void MainWindow::setupActions() | |||
193 | 195 | ||
194 | a = new QAction( tr( "Copy" ), Resource::loadIconSet("copy"), | 196 | a = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap("copy", Opie::Core::OResource::SmallIcon ), |
195 | QString::null, 0, this, "editCopy" ); | 197 | QString::null, 0, this, "editCopy" ); |
@@ -199,3 +201,3 @@ void MainWindow::setupActions() | |||
199 | a->addTo( edit ); | 201 | a->addTo( edit ); |
200 | a = new QAction( tr( "Cut" ), Resource::loadIconSet("cut"), | 202 | a = new QAction( tr( "Cut" ), Opie::Core::OResource::loadPixmap("cut", Opie::Core::OResource::SmallIcon ), |
201 | QString::null, 0, this, "editCut" ); | 203 | QString::null, 0, this, "editCut" ); |
@@ -205,3 +207,3 @@ void MainWindow::setupActions() | |||
205 | a->addTo( edit ); | 207 | a->addTo( edit ); |
206 | a = new QAction( tr( "Paste" ), Resource::loadPixmap("paste"), | 208 | a = new QAction( tr( "Paste" ), Opie::Core::OResource::loadPixmap("paste", Opie::Core::OResource::SmallIcon ), |
207 | QString::null, 0, this, "editPaste" ); | 209 | QString::null, 0, this, "editPaste" ); |
@@ -238,5 +240,5 @@ void MainWindow::setupActions() | |||
238 | actionTextBold = new QAction( tr( "Bold" ), | 240 | actionTextBold = new QAction( tr( "Bold" ), |
239 | Resource::loadPixmap("bold"), | 241 | Opie::Core::OResource::loadPixmap("bold", Opie::Core::OResource::SmallIcon ), |
240 | QString::null, CTRL + Key_B, | 242 | QString::null, CTRL + Key_B, |
241 | this, "textBold" ); | 243 | this, "textBold" ); |
242 | connect( actionTextBold, SIGNAL( activated() ), this, SLOT( textBold() ) ); | 244 | connect( actionTextBold, SIGNAL( activated() ), this, SLOT( textBold() ) ); |
@@ -245,5 +247,5 @@ void MainWindow::setupActions() | |||
245 | actionTextItalic = new QAction( tr( "Italic" ), | 247 | actionTextItalic = new QAction( tr( "Italic" ), |
246 | Resource::loadPixmap("italic"), | 248 | Opie::Core::OResource::loadPixmap("italic", Opie::Core::OResource::SmallIcon ), |
247 | tr( "&Italic" ), CTRL + Key_I, | 249 | tr( "&Italic" ), CTRL + Key_I, |
248 | this, "textItalic" ); | 250 | this, "textItalic" ); |
249 | connect( actionTextItalic, SIGNAL( activated() ), this, | 251 | connect( actionTextItalic, SIGNAL( activated() ), this, |
@@ -253,5 +255,5 @@ void MainWindow::setupActions() | |||
253 | actionTextUnderline = new QAction( tr( "Underline" ), | 255 | actionTextUnderline = new QAction( tr( "Underline" ), |
254 | Resource::loadPixmap("underline"), | 256 | Opie::Core::OResource::loadPixmap("underline", Opie::Core::OResource::SmallIcon ), |
255 | tr( "&Underline" ), CTRL + Key_U, | 257 | tr( "&Underline" ), CTRL + Key_U, |
256 | this, "textUnderline" ); | 258 | this, "textUnderline" ); |
257 | connect( actionTextUnderline, SIGNAL( activated() ), | 259 | connect( actionTextUnderline, SIGNAL( activated() ), |
@@ -262,6 +264,9 @@ void MainWindow::setupActions() | |||
262 | alignMenu = new ButtonMenu( tbStyle ); | 264 | alignMenu = new ButtonMenu( tbStyle ); |
263 | alignMenu->insertItem( Resource::loadPixmap("left"), tr("Left"), AlignLeft ); | 265 | alignMenu->insertItem( Opie::Core::OResource::loadPixmap("left", Opie::Core::OResource::SmallIcon), tr("Left"), AlignLeft ); |
264 | alignMenu->insertItem( Resource::loadPixmap("center"), tr("Center"), AlignCenter ); | 266 | alignMenu->insertItem( Opie::Core::OResource::loadPixmap("center", Opie::Core::OResource::SmallIcon), |
265 | alignMenu->insertItem( Resource::loadPixmap("right"), tr("Right"), AlignRight ); | 267 | tr("Center"), AlignCenter ); |
266 | alignMenu->insertItem( Resource::loadPixmap("opie-write/justify"), tr("Full"), Qt3::AlignJustify ); | 268 | alignMenu->insertItem( Opie::Core::OResource::loadPixmap("right", Opie::Core::OResource::SmallIcon), |
269 | tr("Right"), AlignRight ); | ||
270 | alignMenu->insertItem( Opie::Core::OResource::loadPixmap("opie-write/justify", Opie::Core::OResource::SmallIcon), | ||
271 | tr("Full"), Qt3::AlignJustify ); | ||
267 | connect( alignMenu, SIGNAL(activated(int)), this, SLOT(textAlign(int)) ); | 272 | connect( alignMenu, SIGNAL(activated(int)), this, SLOT(textAlign(int)) ); |