summaryrefslogtreecommitdiff
Unidiff
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 @@
1/* XPM */
2static char * edit_redo_xpm[] = {
3"18 17 70 1",
4 " c None",
5 ".c #1E472E",
6 "+c #234E33",
7 "@c #1B4029",
8 "#c #1B422A",
9 "$c #AFBEBA",
10 "%c #DBEADF",
11 "&c #C1CECC",
12 "*c #214A30",
13 "=c #224B31",
14 "-c #163321",
15 ";c #BFD0C8",
16 ">c #90BD9F",
17 ",c #227D37",
18 "'c #C0D1C9",
19 ")c #245135",
20 "!c #153220",
21 "~c #BDCEC7",
22 "{c #2F9645",
23 "]c #3BB057",
24 "^c #43BA5C",
25 "/c #224B30",
26 "(c #173A23",
27 "_c #143120",
28 ":c #38774E",
29 "<c #1E4335",
30 "[c #0B281E",
31 "}c #143D29",
32 "|c #3FAF57",
33 "1c #42B75B",
34 "2c #7BA08A",
35 "3c #0F2417",
36 "4c #081914",
37 "5c #050E0D",
38 "6c #123926",
39 "7c #36A34D",
40 "8c #9DC6AA",
41 "9c #88AB9C",
42 "0c #C2DBCA",
43 "ac #040B06",
44 "bc #0A1F18",
45 "cc #0D3525",
46 "dc #2A8F3D",
47 "ec #CFE0D4",
48 "fc #0A1910",
49 "gc #0D2419",
50 "hc #030C0B",
51 "ic #041714",
52 "jc #259039",
53 "kc #3E9951",
54 "lc #B2D1BC",
55 "mc #03090A",
56 "nc #071112",
57 "oc #55AE72",
58 "pc #5AB975",
59 "qc #5AA77B",
60 "rc #468166",
61 "sc #000001",
62 "tc #10211F",
63 "uc #03080A",
64 "vc #010003",
65 "wc #020005",
66 "xc #000000",
67 "yc #14311F",
68 "zc #050B0C",
69 "Ac #162D26",
70 "Bc #050D0E",
71 "Cc #142724",
72 "Dc #090F10",
73 "Ec #050A0C",
74" ",
75" ",
76" ..+ ",
77" @#$%&*= ",
78" -;>,,,%'* ) ",
79" !~,,{]^,,%/ )( ",
80" _,:<[[}|1,%*)2( ",
81"3,)4 567,890( ",
82"a,b c7,de( ",
83"fgh i,jkl( ",
84" mn 4,opqr( ",
85" stu vvvwvvxy ",
86" zA5 ",
87" BCD ",
88" sEs ",
89" ",
90" "};
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 @@
1/* XPM */
2static char * edit_undo_xpm[] = {
3"18 17 70 1",
4 " c None",
5 ".c #234E33",
6 "+c #1E472E",
7 "@c #224B31",
8 "#c #214A30",
9 "$c #C1CECC",
10 "%c #DBEADF",
11 "&c #AFBEBA",
12 "*c #1B422A",
13 "=c #1B4029",
14 "-c #245135",
15 ";c #C0D1C9",
16 ">c #227D37",
17 ",c #90BD9F",
18 "'c #BFD0C8",
19 ")c #163321",
20 "!c #173A23",
21 "~c #224B30",
22 "{c #43BA5C",
23 "]c #3BB057",
24 "^c #2F9645",
25 "/c #BDCEC7",
26 "(c #153220",
27 "_c #7BA08A",
28 ":c #42B75B",
29 "<c #3FAF57",
30 "[c #143D29",
31 "}c #0B281E",
32 "|c #1E4335",
33 "1c #38774E",
34 "2c #143120",
35 "3c #C2DBCA",
36 "4c #88AB9C",
37 "5c #9DC6AA",
38 "6c #36A34D",
39 "7c #123926",
40 "8c #050E0D",
41 "9c #081914",
42 "0c #0F2417",
43 "ac #CFE0D4",
44 "bc #2A8F3D",
45 "cc #0D3525",
46 "dc #0A1F18",
47 "ec #040B06",
48 "fc #B2D1BC",
49 "gc #3E9951",
50 "hc #259039",
51 "ic #041714",
52 "jc #030C0B",
53 "kc #0D2419",
54 "lc #0A1910",
55 "mc #468166",
56 "nc #5AA77B",
57 "oc #5AB975",
58 "pc #55AE72",
59 "qc #071112",
60 "rc #03090A",
61 "sc #14311F",
62 "tc #000000",
63 "uc #010003",
64 "vc #020005",
65 "wc #03080A",
66 "xc #10211F",
67 "yc #000001",
68 "zc #162D26",
69 "Ac #050B0C",
70 "Bc #090F10",
71 "Cc #142724",
72 "Dc #050D0E",
73 "Ec #050A0C",
74" ",
75" ",
76" .++ ",
77" @#$%&*= ",
78"- #;%>>>,') ",
79"!- ~%>>{]^>>/( ",
80"!_-#%>:<[}}|1>2 ",
81"!345>678 9->0 ",
82"!ab>6c d>e ",
83"!fgh>i jkl ",
84"!mnop>9 qr ",
85"stuuvuuu wxy ",
86" 8zA ",
87" BCD ",
88" yEy ",
89" ",
90" "};
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 @@
1/* XPM */
2static const char * file_new_xpm[] = {
3"16 16 5 1",
4 " c None",
5 ".c #808080",
6 "+c #FFFFFF",
7 "@c #C0C0C0",
8 "#c #000000",
9" .......... ",
10" .++++++++@. ",
11" .++++++++@+. ",
12" .++++++++#### ",
13" .++++++++++@# ",
14" .++++++++++@# ",
15" .++++++++++@# ",
16" .++++++++++@# ",
17" .++++++++++@# ",
18" .++++++++++@# ",
19" .++++++++++@# ",
20" .++++++++++@# ",
21" .++++++++++@# ",
22" .++++++++++@# ",
23" .@@@@@@@@@@@# ",
24" ############# "};
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 @@
1/* XPM */
2static const char * file_open_xpm[] = {
3"16 16 6 1",
4 " c None",
5 ".c #808080",
6 "+c #FFFFFF",
7 "@c #C0C0C0",
8 "#c #FFFF00",
9 "$c #000000",
10" ",
11" ..... ",
12" .+++++. ",
13" .+@#@#@+...... ",
14" .+#@#@#@+++++.$",
15" .+@#@#@#@#@#@.$",
16".............#.$",
17".++++++++++.$@.$",
18".+@#@#@#@#@#$..$",
19" .+@#@#@#@#@.$.$",
20" .+#@#@#@#@#@$.$",
21" .+#@#@#@#@#.$$",
22" ............$$",
23" $$$$$$$$$$$$$",
24" ",
25" "};
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 @@
1/* XPM */
2static const char * file_save_xpm[] = {
3"16 16 5 1",
4 " c None",
5 ".c #808080",
6 "+c #FFFFFF",
7 "@c #000000",
8 "#c #0000FF",
9" ",
10" ........ ",
11" .++++++.@ ",
12" .+....+.+@ #",
13" .++++++.@@@ ##",
14" .+....++++@ ##@",
15" .+++++++++@##@ ",
16" .+.......+##@ ",
17" .++++++++##@ ",
18" .+......@#@ ",
19" .++++++@@@@ ",
20" .+....@@@+@ ",
21" .++++@++++@ ",
22" .+++++++++@ ",
23" @@@@@@@@@@@ ",
24" "};
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
@@ -27,9 +27,4 @@
27 27
28#include "tinykate.h" 28#include "tinykate.h"
29#include "pics/file-new.xpm"
30#include "pics/file-open.xpm"
31#include "pics/file-save.xpm"
32#include "pics/edit-undo.xpm"
33#include "pics/edit-redo.xpm"
34 29
35#include <katedocument.h> 30#include <katedocument.h>
@@ -40,5 +35,5 @@
40TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : 35TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
41 QMainWindow( parent, name, f ) 36 QMainWindow( parent, name, f )
42{ 37{
43 nextUnnamed=0; 38 nextUnnamed=0;
44 currentView=0; 39 currentView=0;
@@ -62,10 +57,10 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
62 57
63 // Action for creating a new document 58 // Action for creating a new document
64 QAction *a = new QAction( tr( "New" ), QPixmap((const char**)file_new_xpm ), QString::null, 0, this, 0 ); 59 QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
65 a->addTo( popup ); 60 a->addTo( popup );
66 connect(a, SIGNAL(activated()), this, SLOT(slotNew())); 61 connect(a, SIGNAL(activated()), this, SLOT(slotNew()));
67 62
68 // Action for opening an exisiting document 63 // Action for opening an exisiting document
69 a = new QAction( tr( "Open" ), QPixmap((const char**)file_open_xpm), QString::null, 0, this, 0 ); 64 a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 );
70 a->addTo(popup); 65 a->addTo(popup);
71 connect(a, SIGNAL(activated()), this, SLOT(slotOpen())); 66 connect(a, SIGNAL(activated()), this, SLOT(slotOpen()));
@@ -73,18 +68,18 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
73 68
74 // Action for saving document 69 // Action for saving document
75 a = new QAction( tr( "Save" ), QPixmap((const char**)file_save_xpm), QString::null, 0, this, 0 ); 70 a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
76 a->addTo(popup); 71 a->addTo(popup);
77 connect(a, SIGNAL(activated()), this, SLOT(slotSave())); 72 connect(a, SIGNAL(activated()), this, SLOT(slotSave()));
78 73
79 // Action for saving document to a new name 74 // Action for saving document to a new name
80 a = new QAction( tr( "Save As" ), QPixmap((const char**)file_save_xpm), QString::null, 0, this, 0 ); 75 a = new QAction( tr( "Save As" ),Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
81 a->addTo(popup); 76 a->addTo(popup);
82 connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs())); 77 connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs()));
83 78
84 // Action for closing the currently active document 79 // Action for closing the currently active document
85 a = new QAction( tr( "Close" ), QPixmap(), QString::null, 0, this, 0 ); 80 a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 );
86 a->addTo(popup); 81 a->addTo(popup);
87 connect(a, SIGNAL(activated()), this, SLOT(slotClose())); 82 connect(a, SIGNAL(activated()), this, SLOT(slotClose()));
88 83
89 84
90 mb->insertItem(tr("File"),popup); 85 mb->insertItem(tr("File"),popup);
@@ -110,14 +105,14 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
110 105
111 // Action for undo 106 // Action for undo
112 editUndo = new QAction( tr( "Undo" ), QPixmap((const char**)edit_undo_xpm), QString::null, 0, this, 0 ); 107 editUndo = new QAction( tr( "Undo" ),Resource::loadPixmap( "undo" ) , QString::null, 0, this, 0 );
113 editUndo->addTo( bar ); 108 editUndo->addTo( bar );
114 109
115 // Action for redo 110 // Action for redo
116 editRedo = new QAction( tr( "Redo" ), QPixmap((const char**)edit_redo_xpm), QString::null, 0, this, 0 ); 111 editRedo = new QAction( tr( "Redo" ),Resource::loadPixmap( "redo" ) , QString::null, 0, this, 0 );
117 editRedo->addTo( bar ); 112 editRedo->addTo( bar );
118 113
119//VIEW ACITONS 114//VIEW ACITONS
120 popup = new QPopupMenu( this ); 115 popup = new QPopupMenu( this );
121 116
122 viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 ); 117 viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 );
123 viewIncFontSizes->addTo( popup ); 118 viewIncFontSizes->addTo( popup );
@@ -199,5 +194,5 @@ void TinyKate::slotCurrentChanged( QWidget * view)
199 194
200 currentView=(KTextEditor::View*)view; 195 currentView=(KTextEditor::View*)view;
201 196
202 connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); 197 connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy()));
203 connect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); 198 connect(editCut,SIGNAL(activated()),currentView,SLOT(cut()));