From 3104d758b56032f76fa7344e66f010b85885496f Mon Sep 17 00:00:00 2001 From: harlekin Date: Sat, 22 Mar 2003 17:46:13 +0000 Subject: adated to new icons, adapted to the right help system and removed quit and about --- (limited to 'noncore') diff --git a/noncore/apps/opie-sheet/edit-accept.xpm b/noncore/apps/opie-sheet/edit-accept.xpm deleted file mode 100644 index 5109281..0000000 --- a/noncore/apps/opie-sheet/edit-accept.xpm +++ b/dev/null @@ -1,30 +0,0 @@ -/* XPM */ -static const char *edit_accept_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 8 1", -" c #000000000000", -". c #000040400000", -"X c #404000000000", -"o c #000080800000", -"O c #0000c0c00000", -"+ c #c0c0ffffc0c0", -"@ c #ffffffffffff", -"# c None", -/* pixels */ -"################", -"################", -"##############+#", -"#############+O#", -"############+Oo#", -"###########+Oo.#", -"##+o######+Oo. #", -"#+OOo####+Oo.X##", -" .oOOo##+Oo. ###", -"# .oOOo+Oo.X####", -"##X.oOOOo.X#####", -"### .oOo. ######", -"#### .o. #######", -"##### X ########", -"################", -"################", -}; diff --git a/noncore/apps/opie-sheet/edit-cancel.xpm b/noncore/apps/opie-sheet/edit-cancel.xpm deleted file mode 100644 index 8e1606e..0000000 --- a/noncore/apps/opie-sheet/edit-cancel.xpm +++ b/dev/null @@ -1,25 +0,0 @@ -/* XPM */ -static const char *edit_cancel_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 3 1", -". c red", -"X c #ffffffffffff", -" c None", -/* pixels */ -" ", -" ", -" ..... ", -" ......... ", -" ........... ", -" ..XX...XX.. ", -" ...XXX.XXX... ", -" ....XXXXX.... ", -" .....XXX..... ", -" ....XXXXX.... ", -" ...XXX.XXX... ", -" ..XX...XX.. ", -" ........... ", -" ......... ", -" ..... ", -" ", -}; diff --git a/noncore/apps/opie-sheet/file-new.xpm b/noncore/apps/opie-sheet/file-new.xpm deleted file mode 100644 index ec8dd63..0000000 --- a/noncore/apps/opie-sheet/file-new.xpm +++ b/dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static const char * file_new_xpm[] = { -"16 16 5 1", -" c None", -". c #808080", -"+ c #FFFFFF", -"@ c #C0C0C0", -"# c #000000", -" .......... ", -" .++++++++@. ", -" .++++++++@+. ", -" .++++++++#### ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .++++++++++@# ", -" .@@@@@@@@@@@# ", -" ############# "}; diff --git a/noncore/apps/opie-sheet/file-open.xpm b/noncore/apps/opie-sheet/file-open.xpm deleted file mode 100644 index 8449d5b..0000000 --- a/noncore/apps/opie-sheet/file-open.xpm +++ b/dev/null @@ -1,25 +0,0 @@ -/* XPM */ -static const char * file_open_xpm[] = { -"16 16 6 1", -" c None", -". c #808080", -"+ c #FFFFFF", -"@ c #C0C0C0", -"# c #FFFF00", -"$ c #000000", -" ", -" ..... ", -" .+++++. ", -" .+@#@#@+...... ", -" .+#@#@#@+++++.$", -" .+@#@#@#@#@#@.$", -".............#.$", -".++++++++++.$@.$", -".+@#@#@#@#@#$..$", -" .+@#@#@#@#@.$.$", -" .+#@#@#@#@#@$.$", -" .+#@#@#@#@#.$$", -" ............$$", -" $$$$$$$$$$$$$", -" ", -" "}; diff --git a/noncore/apps/opie-sheet/file-save.xpm b/noncore/apps/opie-sheet/file-save.xpm deleted file mode 100644 index 039a174..0000000 --- a/noncore/apps/opie-sheet/file-save.xpm +++ b/dev/null @@ -1,24 +0,0 @@ -/* XPM */ -static const char * file_save_xpm[] = { -"16 16 5 1", -" c None", -". c #808080", -"+ c #FFFFFF", -"@ c #000000", -"# c #0000FF", -" ", -" ........ ", -" .++++++.@ ", -" .+....+.+@ #", -" .++++++.@@@ ##", -" .+....++++@ ##@", -" .+++++++++@##@ ", -" .+.......+##@ ", -" .++++++++##@ ", -" .+......@#@ ", -" .++++++@@@@ ", -" .+....@@@+@ ", -" .++++@++++@ ", -" .+++++++++@ ", -" @@@@@@@@@@@ ", -" "}; diff --git a/noncore/apps/opie-sheet/help-general.xpm b/noncore/apps/opie-sheet/help-general.xpm deleted file mode 100644 index 9f10527..0000000 --- a/noncore/apps/opie-sheet/help-general.xpm +++ b/dev/null @@ -1,25 +0,0 @@ -/* XPM */ -static const char * help_general_xpm[] = { -"16 16 6 1", -" c None s None", -". c #000000", -"X c #FF0000", -"o c #FFFF00", -"O c #808080", -"+ c #FFFFFF", -" ", -" .. ", -" .XX. ", -" .XXXX. ", -" .XXXoXX. ", -" .XXXoXoXX. ", -" .XXXXXoXoX. ", -" .XXXXXXXoX.O ", -" ..XXXXXXX.+.O ", -" .+.XXXXX.+.O ", -" .+.XXX.+.O ", -" .+.X.+.O ", -" .+.+.O ", -" .+.O ", -" .O ", -" "}; diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp index b9f8e57..43e5131 100644 --- a/noncore/apps/opie-sheet/mainwindow.cpp +++ b/noncore/apps/opie-sheet/mainwindow.cpp @@ -16,8 +16,10 @@ #include #include +#include #include #include +#include #include #include "cellformat.h" #include "numberdlg.h" @@ -25,12 +27,7 @@ #include "sortdlg.h" #include "finddlg.h" -#include "file-new.xpm" -#include "file-open.xpm" -#include "file-save.xpm" -#include "edit-cancel.xpm" -#include "edit-accept.xpm" -#include "help-general.xpm" + #include "func-plus.xpm" #include "func-minus.xpm" #include "func-cross.xpm" @@ -265,25 +262,25 @@ void MainWindow::setDocument(const QString &applnk_filename) void MainWindow::initActions() { - fileNew=new QAction(tr("New File"), QPixmap(file_new_xpm), tr("&New"), 0, this); + fileNew=new QAction(tr("New File"), Resource::loadPixmap( "new" ), tr("&New"), 0, this); connect(fileNew, SIGNAL(activated()), this, SLOT(slotFileNew())); - fileOpen=new QAction(tr("Open File"), QPixmap(file_open_xpm), tr("&Open"), 0, this); + fileOpen=new QAction(tr("Open File"), Resource::loadPixmap( "fileopen" ), tr("&Open"), 0, this); connect(fileOpen, SIGNAL(activated()), this, SLOT(slotFileOpen())); - fileSave=new QAction(tr("Save File"), QPixmap(file_save_xpm), tr("&Save"), 0, this); + fileSave=new QAction(tr("Save File"),Resource::loadPixmap( "save" ), tr("&Save"), 0, this); connect(fileSave, SIGNAL(activated()), this, SLOT(slotFileSave())); - fileSaveAs=new QAction(tr("Save File As"), QPixmap(file_save_xpm), tr("Save &As"), 0, this); + fileSaveAs=new QAction(tr("Save File As"), Resource::loadPixmap( "save" ), tr("Save &As"), 0, this); connect(fileSaveAs, SIGNAL(activated()), this, SLOT(slotFileSaveAs())); - fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this); - connect(fileQuit, SIGNAL(activated()), this, SLOT(close())); + //fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this); + //connect(fileQuit, SIGNAL(activated()), this, SLOT(close())); - helpGeneral=new QAction(tr("General Help"), QPixmap(help_general_xpm), tr("&General"), 0, this); - connect(helpGeneral, SIGNAL(activated()), this, SLOT(slotHelpGeneral())); - helpAbout=new QAction(tr("About Opie Sheet"), tr("&About"), 0, this); - connect(helpAbout, SIGNAL(activated()), this, SLOT(slotHelpAbout())); + // helpGeneral=new QAction(tr("General Help"), QPixmap(help_general_xpm), tr("&General"), 0, this); + //connect(helpGeneral, SIGNAL(activated()), this, SLOT(slotHelpGeneral())); + //helpAbout=new QAction(tr("About Opie Sheet"), tr("&About"), 0, this); + //connect(helpAbout, SIGNAL(activated()), this, SLOT(slotHelpAbout())); - editAccept=new QAction(tr("Accept"), QPixmap(edit_accept_xpm), tr("&Accept"), 0, this); + editAccept=new QAction(tr("Accept"),Resource::loadPixmap( "enter" ) , tr("&Accept"), 0, this); connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept())); - editCancel=new QAction(tr("Cancel"), QPixmap(edit_cancel_xpm), tr("&Cancel"), 0, this); + editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this); connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel())); editCellSelect=new QAction(tr("Cell Selector"), QPixmap(cell_select_xpm), tr("Cell &Selector"), 0, this); editCellSelect->setToggleAction(TRUE); @@ -371,8 +368,8 @@ void MainWindow::initMenu() fileOpen->addTo(menuFile); fileSave->addTo(menuFile); fileSaveAs->addTo(menuFile); - menuFile->insertSeparator(); - fileQuit->addTo(menuFile); +// menuFile->insertSeparator(); +// fileQuit->addTo(menuFile); menu->insertItem(tr("&File"), menuFile); menuEdit=new QPopupMenu; @@ -399,10 +396,10 @@ void MainWindow::initMenu() dataFindReplace->addTo(menuData); menu->insertItem(tr("&Data"), menuData); - menuHelp=new QPopupMenu; - helpGeneral->addTo(menuHelp); - helpAbout->addTo(menuHelp); - menu->insertItem(tr("&Help"), menuHelp); +// menuHelp=new QPopupMenu; +// helpGeneral->addTo(menuHelp); +// helpAbout->addTo(menuHelp); +// menu->insertItem(tr("&Help"), menuHelp); submenuRow=new QPopupMenu; rowHeight->addTo(submenuRow); @@ -517,17 +514,6 @@ void MainWindow::initEditToolbar() editCellSelect->addTo(toolbarEdit); } -void MainWindow::slotHelpGeneral() -{ - if (QFile::exists(helpFile)) - { - QCopEnvelope e("QPE/Application/helpbrowser", "showFile(QString)"); - e << helpFile; - } - else - QMessageBox::critical(this, tr("Error"), tr("Help file not found!")); -} - void MainWindow::slotHelpAbout() { QDialog dialogAbout(this, 0, TRUE); diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h index d68e25c..10d6650 100644 --- a/noncore/apps/opie-sheet/mainwindow.h +++ b/noncore/apps/opie-sheet/mainwindow.h @@ -88,7 +88,6 @@ class MainWindow: public QMainWindow void slotFileSave(); void slotFileSaveAs(); void slotHelpAbout(); - void slotHelpGeneral(); void slotEditAccept(); void slotEditCancel(); void slotEditPaste(); -- cgit v0.9.0.2