summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-21 20:59:43 (UTC)
committer harlekin <harlekin>2003-03-21 20:59:43 (UTC)
commita1342464252328754954a59abf82d6dd030c88f0 (patch) (side-by-side diff)
treee49e5c3e9cd9fd4816df78b788f7a9999d4b4581
parent1e1a09e08d441db9ee899845a0200a5f70ac38a1 (diff)
downloadopie-a1342464252328754954a59abf82d6dd030c88f0.zip
opie-a1342464252328754954a59abf82d6dd030c88f0.tar.gz
opie-a1342464252328754954a59abf82d6dd030c88f0.tar.bz2
adapted to new icons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/pics/edit-redo.xpm90
-rw-r--r--noncore/apps/tinykate/pics/edit-undo.xpm90
-rw-r--r--noncore/apps/tinykate/pics/file-new.xpm24
-rw-r--r--noncore/apps/tinykate/pics/file-open.xpm25
-rw-r--r--noncore/apps/tinykate/pics/file-save.xpm24
-rw-r--r--noncore/apps/tinykate/tinykate.cpp27
6 files changed, 11 insertions, 269 deletions
diff --git a/noncore/apps/tinykate/pics/edit-redo.xpm b/noncore/apps/tinykate/pics/edit-redo.xpm
deleted file mode 100644
index 7557ac5..0000000
--- a/noncore/apps/tinykate/pics/edit-redo.xpm
+++ b/dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * edit_redo_xpm[] = {
-"18 17 70 1",
-" c None",
-". c #1E472E",
-"+ c #234E33",
-"@ c #1B4029",
-"# c #1B422A",
-"$ c #AFBEBA",
-"% c #DBEADF",
-"& c #C1CECC",
-"* c #214A30",
-"= c #224B31",
-"- c #163321",
-"; c #BFD0C8",
-"> c #90BD9F",
-", c #227D37",
-"' c #C0D1C9",
-") c #245135",
-"! c #153220",
-"~ c #BDCEC7",
-"{ c #2F9645",
-"] c #3BB057",
-"^ c #43BA5C",
-"/ c #224B30",
-"( c #173A23",
-"_ c #143120",
-": c #38774E",
-"< c #1E4335",
-"[ c #0B281E",
-"} c #143D29",
-"| c #3FAF57",
-"1 c #42B75B",
-"2 c #7BA08A",
-"3 c #0F2417",
-"4 c #081914",
-"5 c #050E0D",
-"6 c #123926",
-"7 c #36A34D",
-"8 c #9DC6AA",
-"9 c #88AB9C",
-"0 c #C2DBCA",
-"a c #040B06",
-"b c #0A1F18",
-"c c #0D3525",
-"d c #2A8F3D",
-"e c #CFE0D4",
-"f c #0A1910",
-"g c #0D2419",
-"h c #030C0B",
-"i c #041714",
-"j c #259039",
-"k c #3E9951",
-"l c #B2D1BC",
-"m c #03090A",
-"n c #071112",
-"o c #55AE72",
-"p c #5AB975",
-"q c #5AA77B",
-"r c #468166",
-"s c #000001",
-"t c #10211F",
-"u c #03080A",
-"v c #010003",
-"w c #020005",
-"x c #000000",
-"y c #14311F",
-"z c #050B0C",
-"A c #162D26",
-"B c #050D0E",
-"C c #142724",
-"D c #090F10",
-"E c #050A0C",
-" ",
-" ",
-" ..+ ",
-" @#$%&*= ",
-" -;>,,,%'* ) ",
-" !~,,{]^,,%/ )( ",
-" _,:<[[}|1,%*)2( ",
-"3,)4 567,890( ",
-"a,b c7,de( ",
-"fgh i,jkl( ",
-" mn 4,opqr( ",
-" stu vvvwvvxy ",
-" zA5 ",
-" BCD ",
-" sEs ",
-" ",
-" "};
diff --git a/noncore/apps/tinykate/pics/edit-undo.xpm b/noncore/apps/tinykate/pics/edit-undo.xpm
deleted file mode 100644
index 17a1f30..0000000
--- a/noncore/apps/tinykate/pics/edit-undo.xpm
+++ b/dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * edit_undo_xpm[] = {
-"18 17 70 1",
-" c None",
-". c #234E33",
-"+ c #1E472E",
-"@ c #224B31",
-"# c #214A30",
-"$ c #C1CECC",
-"% c #DBEADF",
-"& c #AFBEBA",
-"* c #1B422A",
-"= c #1B4029",
-"- c #245135",
-"; c #C0D1C9",
-"> c #227D37",
-", c #90BD9F",
-"' c #BFD0C8",
-") c #163321",
-"! c #173A23",
-"~ c #224B30",
-"{ c #43BA5C",
-"] c #3BB057",
-"^ c #2F9645",
-"/ c #BDCEC7",
-"( c #153220",
-"_ c #7BA08A",
-": c #42B75B",
-"< c #3FAF57",
-"[ c #143D29",
-"} c #0B281E",
-"| c #1E4335",
-"1 c #38774E",
-"2 c #143120",
-"3 c #C2DBCA",
-"4 c #88AB9C",
-"5 c #9DC6AA",
-"6 c #36A34D",
-"7 c #123926",
-"8 c #050E0D",
-"9 c #081914",
-"0 c #0F2417",
-"a c #CFE0D4",
-"b c #2A8F3D",
-"c c #0D3525",
-"d c #0A1F18",
-"e c #040B06",
-"f c #B2D1BC",
-"g c #3E9951",
-"h c #259039",
-"i c #041714",
-"j c #030C0B",
-"k c #0D2419",
-"l c #0A1910",
-"m c #468166",
-"n c #5AA77B",
-"o c #5AB975",
-"p c #55AE72",
-"q c #071112",
-"r c #03090A",
-"s c #14311F",
-"t c #000000",
-"u c #010003",
-"v c #020005",
-"w c #03080A",
-"x c #10211F",
-"y c #000001",
-"z c #162D26",
-"A c #050B0C",
-"B c #090F10",
-"C c #142724",
-"D c #050D0E",
-"E c #050A0C",
-" ",
-" ",
-" .++ ",
-" @#$%&*= ",
-"- #;%>>>,') ",
-"!- ~%>>{]^>>/( ",
-"!_-#%>:<[}}|1>2 ",
-"!345>678 9->0 ",
-"!ab>6c d>e ",
-"!fgh>i jkl ",
-"!mnop>9 qr ",
-"stuuvuuu wxy ",
-" 8zA ",
-" BCD ",
-" yEy ",
-" ",
-" "};
diff --git a/noncore/apps/tinykate/pics/file-new.xpm b/noncore/apps/tinykate/pics/file-new.xpm
deleted file mode 100644
index ec8dd63..0000000
--- a/noncore/apps/tinykate/pics/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/tinykate/pics/file-open.xpm b/noncore/apps/tinykate/pics/file-open.xpm
deleted file mode 100644
index 8449d5b..0000000
--- a/noncore/apps/tinykate/pics/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/tinykate/pics/file-save.xpm b/noncore/apps/tinykate/pics/file-save.xpm
deleted file mode 100644
index 039a174..0000000
--- a/noncore/apps/tinykate/pics/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/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index aecc1bd..a25f81f 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -26,11 +26,6 @@
#include <opie/ofiledialog.h>
#include "tinykate.h"
-#include "pics/file-new.xpm"
-#include "pics/file-open.xpm"
-#include "pics/file-save.xpm"
-#include "pics/edit-undo.xpm"
-#include "pics/edit-redo.xpm"
#include <katedocument.h>
#include <katehighlight.h>
@@ -39,7 +34,7 @@
TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
QMainWindow( parent, name, f )
-{
+{
nextUnnamed=0;
currentView=0;
viewCount=0;
@@ -61,31 +56,31 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
QPopupMenu *popup = new QPopupMenu( this );
// Action for creating a new document
- QAction *a = new QAction( tr( "New" ), QPixmap((const char**)file_new_xpm ), QString::null, 0, this, 0 );
+ QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
a->addTo( popup );
connect(a, SIGNAL(activated()), this, SLOT(slotNew()));
// Action for opening an exisiting document
- a = new QAction( tr( "Open" ), QPixmap((const char**)file_open_xpm), QString::null, 0, this, 0 );
+ a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 );
a->addTo(popup);
connect(a, SIGNAL(activated()), this, SLOT(slotOpen()));
// Action for saving document
- a = new QAction( tr( "Save" ), QPixmap((const char**)file_save_xpm), QString::null, 0, this, 0 );
+ a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
a->addTo(popup);
connect(a, SIGNAL(activated()), this, SLOT(slotSave()));
// Action for saving document to a new name
- a = new QAction( tr( "Save As" ), QPixmap((const char**)file_save_xpm), QString::null, 0, this, 0 );
+ a = new QAction( tr( "Save As" ),Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
a->addTo(popup);
connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs()));
// Action for closing the currently active document
- a = new QAction( tr( "Close" ), QPixmap(), QString::null, 0, this, 0 );
+ a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 );
a->addTo(popup);
connect(a, SIGNAL(activated()), this, SLOT(slotClose()));
-
+
mb->insertItem(tr("File"),popup);
@@ -109,16 +104,16 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
editFindReplace->addTo( bar );
// Action for undo
- editUndo = new QAction( tr( "Undo" ), QPixmap((const char**)edit_undo_xpm), QString::null, 0, this, 0 );
+ editUndo = new QAction( tr( "Undo" ),Resource::loadPixmap( "undo" ) , QString::null, 0, this, 0 );
editUndo->addTo( bar );
// Action for redo
- editRedo = new QAction( tr( "Redo" ), QPixmap((const char**)edit_redo_xpm), QString::null, 0, this, 0 );
+ editRedo = new QAction( tr( "Redo" ),Resource::loadPixmap( "redo" ) , QString::null, 0, this, 0 );
editRedo->addTo( bar );
//VIEW ACITONS
popup = new QPopupMenu( this );
-
+
viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 );
viewIncFontSizes->addTo( popup );
@@ -198,7 +193,7 @@ void TinyKate::slotCurrentChanged( QWidget * view)
}
currentView=(KTextEditor::View*)view;
-
+
connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy()));
connect(editCut,SIGNAL(activated()),currentView,SLOT(cut()));
connect(editPaste,SIGNAL(activated()),currentView,SLOT(paste()));