summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-sheet/cell-select.xpm25
-rw-r--r--noncore/apps/opie-sheet/excel16.xpm187
-rw-r--r--noncore/apps/opie-sheet/func-comma.xpm24
-rw-r--r--noncore/apps/opie-sheet/func-cross.xpm23
-rw-r--r--noncore/apps/opie-sheet/func-divide.xpm23
-rw-r--r--noncore/apps/opie-sheet/func-equal.xpm23
-rw-r--r--noncore/apps/opie-sheet/func-func.xpm23
-rw-r--r--noncore/apps/opie-sheet/func-minus.xpm23
-rw-r--r--noncore/apps/opie-sheet/func-paran-close.xpm24
-rw-r--r--noncore/apps/opie-sheet/func-paran-open.xpm24
-rw-r--r--noncore/apps/opie-sheet/func-plus.xpm23
-rw-r--r--noncore/apps/opie-sheet/mainwindow.cpp35
12 files changed, 11 insertions, 446 deletions
diff --git a/noncore/apps/opie-sheet/cell-select.xpm b/noncore/apps/opie-sheet/cell-select.xpm
deleted file mode 100644
index 4836c02..0000000
--- a/noncore/apps/opie-sheet/cell-select.xpm
+++ b/dev/null
@@ -1,25 +0,0 @@
1/* XPM */
2static const char *cell_select_xpm[]={
3"16 16 6 1",
4"# c None",
5"c c #0058c0",
6". c #585858",
7"b c #58a8ff",
8"a c #a8dcff",
9"d c #c0ffff",
10".###############",
11".#####...#######",
12"#...#.aab.######",
13"###..acaaa.#####",
14"###.aaacabc.####",
15"##.acaaaccab.###",
16"#.caacabbaaa.###",
17"#.ccaacbaaaaa.##",
18"#.bacbcaaaadaa.#",
19"##.bacbaaaddda.#",
20"###.bacaaaadaa.#",
21"####.bacaaaaac.#",
22"#####.bacaaacb.#",
23"######.bacccb.##",
24"#######.babb.###",
25"########....####"};
diff --git a/noncore/apps/opie-sheet/excel16.xpm b/noncore/apps/opie-sheet/excel16.xpm
deleted file mode 100644
index 45dd96d..0000000
--- a/noncore/apps/opie-sheet/excel16.xpm
+++ b/dev/null
@@ -1,187 +0,0 @@
1/* XPM */
2static const char *excel16_xpm[]={
3"16 16 168 2",
4"aL c None",
5"Qt c None",
6"aK c #24440a",
7"#y c #247d21",
8"#B c #276d1e",
9"aw c #284a0d",
10"au c #2b4e10",
11"#P c #2c6e1a",
12"ag c #2d5114",
13"ad c #2e541a",
14"af c #304326",
15"#2 c #317a1c",
16"ae c #334f25",
17"#5 c #335919",
18"#F c #375d1f",
19"#O c #3a872f",
20"#t c #3d6324",
21"ac c #3d7939",
22"#Y c #3e7132",
23"#p c #407f39",
24"#Z c #42903e",
25"#i c #436d28",
26".9 c #446e2a",
27"aJ c #466628",
28"av c #476430",
29"aI c #476829",
30".W c #47732d",
31"#K c #479643",
32"#1 c #48872e",
33"aH c #496b2d",
34".6 c #4a8a49",
35"aG c #4b6e31",
36".z c #4b7832",
37"#L c #4d9647",
38"aF c #4e7336",
39"aE c #52783b",
40".m c #527a3e",
41"#x c #529c4f",
42"#N c #549c4b",
43"aD c #567a3f",
44"#V c #579342",
45"#X c #588649",
46"aC c #598041",
47".T c #598955",
48"#A c #59a354",
49"#W c #5a8f48",
50"aB c #5d8745",
51"ax c #5d914d",
52"#o c #5ea657",
53"#C c #5f8755",
54"aA c #5f8947",
55".5 c #5f9f5a",
56"#e c #60965b",
57"#f c #609c5b",
58"az c #618b4a",
59".l c #629450",
60"ay c #679350",
61".k c #689854",
62"#U c #69a15f",
63"ah c #6c9c59",
64"#d c #6cae66",
65".R c #6da767",
66".S c #6ea564",
67"#n c #6eaf67",
68".3 c #6fad69",
69"#0 c #6fb067",
70".j c #719f5f",
71"ab c #729a6b",
72"#6 c #72a161",
73".2 c #74a270",
74"#J c #75b56d",
75".i c #76a366",
76"#l c #77ae74",
77"#M c #78b570",
78"#I c #79b176",
79".4 c #79b870",
80"#S c #7ba66b",
81".N c #7bb374",
82".h c #7da970",
83".1 c #7fbd76",
84"#G c #81ab74",
85"#c c #81bb78",
86".M c #83bb7b",
87"aa c #869782",
88".g c #86b079",
89"a# c #879783",
90"a. c #889885",
91"#u c #88b279",
92"#9 c #899886",
93".U c #89b188",
94".L c #89c081",
95".O c #8ab485",
96".0 c #8ac381",
97".f c #8eb580",
98"#j c #8eb680",
99".y c #91a483",
100"#m c #91c28a",
101"#. c #92b885",
102"#8 c #93ae91",
103".e c #93ba87",
104"#3 c #93be91",
105"at c #94a089",
106"#4 c #96a18b",
107"#z c #96c78d",
108".# c #97bc8a",
109"#D c #99b598",
110"#Q c #9abb99",
111"#R c #9ba890",
112".d c #9bbf90",
113"#E c #9ca991",
114"#s c #9ca992",
115"#b c #9dc895",
116"#h c #9fac95",
117".c c #9fc294",
118"#a c #a0c99b",
119".8 c #a2b198",
120".V c #a3b199",
121".b c #a4c699",
122".K c #a5b29b",
123".Z c #a6cf9f",
124".Y c #a7cda1",
125".a c #a9c99e",
126".n c #acc4a3",
127".x c #b2c3aa",
128"ai c #b4c4ab",
129".w c #b6c7ad",
130"#7 c #b7c7ae",
131".v c #b9cab1",
132"#T c #bbcab3",
133".u c #bbcbb3",
134".Q c #bbd0ba",
135"#H c #bccbb4",
136".t c #beceb7",
137".s c #c0d1ba",
138"#k c #c1d1bb",
139".r c #c2d1bc",
140"## c #c2d2bc",
141".X c #c4d5be",
142".q c #c6d9c1",
143".p c #c8d9c2",
144".o c #c9dac3",
145"#q c #cdddcd",
146"as c #d3e3d3",
147"ar c #d4e4d4",
148"aq c #d7e6d7",
149"ap c #d8e7d9",
150"ao c #dae9db",
151".7 c #dce8db",
152"#r c #dce9dc",
153"an c #ddebdd",
154"#g c #dfecdf",
155"am c #e1ede0",
156"al c #e3ede3",
157"#w c #e5efe5",
158"ak c #e6efe6",
159".J c #e7f0e7",
160"aj c #e8f0e8",
161".I c #eaf2ea",
162".P c #ebf3eb",
163".H c #ecf4ec",
164".G c #f0f5f0",
165".F c #f2f7f2",
166"#v c #f3f7f3",
167".E c #f4f8f4",
168".D c #f7f9f6",
169".C c #f9fbf8",
170".B c #fafcfa",
171".A c #fcfdfc",
172"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
173"Qt.#.a.b.c.d.e.f.g.h.i.j.k.l.mQt",
174"Qt.a.n.o.p.q.r.s.t.u.v.w.x.y.zQt",
175"Qt.b.o.A.B.C.D.E.F.G.H.I.J.K.zQt",
176"Qt.c.p.L.M.N.O.P.Q.R.S.T.U.V.WQt",
177"Qt.d.X.Y.Z.0.1.2.3.4.5.6.7.8.9Qt",
178"Qt#.##.D#a#b#c#d#e#f.6.7#g#h#iQt",
179"Qt#j#k.E.F#l#m#n#o#p#q#g#r#s#tQt",
180"Qt#u.s#v#w#x#y#z#A#A#B#C#D#E#FQt",
181"Qt#G#H.P#I#J#K#L#M#N#O#P#Q#R#FQt",
182"Qt#S#T#U#V#W#X#Y#Z#0#1#2#3#4#5Qt",
183"Qt#6#7#8#9a.a#aaabacadaeaf#4agQt",
184"QtahaiajakalamanaoapaqarasatauQt",
185"Qt.kavavavavavavavavavavavavawQt",
186"QtaxayazaAaBaCaDaEaFaGaHaIaJaKQt",
187"aLaLaLaLaLaLaLaLaLaLaLaLaLaLaLaL"};
diff --git a/noncore/apps/opie-sheet/func-comma.xpm b/noncore/apps/opie-sheet/func-comma.xpm
deleted file mode 100644
index 2e680d2..0000000
--- a/noncore/apps/opie-sheet/func-comma.xpm
+++ b/dev/null
@@ -1,24 +0,0 @@
1/* XPM */
2static const char *func_comma_xpm[]={
3"16 16 5 1",
4". c None",
5"# c #000000",
6"a c #0000ff",
7"b c #0058c0",
8"c c #0080ff",
9"................",
10"................",
11"................",
12"......###.......",
13".....#aaa#......",
14".....#bcca#.....",
15".....#bbaa#.....",
16"......##ba#.....",
17"........#b#.....",
18"........#b#.....",
19".......#b#......",
20"......#b#.......",
21"......##........",
22"................",
23"................",
24"................"};
diff --git a/noncore/apps/opie-sheet/func-cross.xpm b/noncore/apps/opie-sheet/func-cross.xpm
deleted file mode 100644
index 3b3f3d5..0000000
--- a/noncore/apps/opie-sheet/func-cross.xpm
+++ b/dev/null
@@ -1,23 +0,0 @@
1/* XPM */
2static const char *func_cross_xpm[]={
3"16 16 4 1",
4". c None",
5"b c #0000ff",
6"a c #0058c0",
7"# c #585858",
8"................",
9"................",
10"....#......##...",
11"...#a#....#ab#..",
12"..#bba#..#abb#..",
13"...#bba##abb#...",
14"....#bbaabb#....",
15".....#bbbb#.....",
16".....#bbbb#.....",
17"....#bbaabb#....",
18"...#bba##abb#...",
19"..#bba#..#abb#..",
20"..#ba#....#a#...",
21"...##......#....",
22"................",
23"................"};
diff --git a/noncore/apps/opie-sheet/func-divide.xpm b/noncore/apps/opie-sheet/func-divide.xpm
deleted file mode 100644
index beb3473..0000000
--- a/noncore/apps/opie-sheet/func-divide.xpm
+++ b/dev/null
@@ -1,23 +0,0 @@
1/* XPM */
2static const char *func_divide_xpm[]={
3"16 16 4 1",
4". c None",
5"# c #000000",
6"b c #0000ff",
7"a c #0058c0",
8"................",
9"................",
10"...........##...",
11"..........#ab#..",
12".........#aba#..",
13"........#bba#...",
14".......#bba#....",
15"......#bba#.....",
16".....#abb#......",
17"....#abb#.......",
18"...#abb#........",
19"..#aba#.........",
20"..#ba#..........",
21"...##...........",
22"................",
23"................"};
diff --git a/noncore/apps/opie-sheet/func-equal.xpm b/noncore/apps/opie-sheet/func-equal.xpm
deleted file mode 100644
index 8f34895..0000000
--- a/noncore/apps/opie-sheet/func-equal.xpm
+++ b/dev/null
@@ -1,23 +0,0 @@
1/* XPM */
2static const char *func_equal_xpm[]={
3"16 16 4 1",
4". c None",
5"b c #0000ff",
6"a c #0058c0",
7"# c #585858",
8"................",
9"................",
10"................",
11"...##########...",
12"..#aaabbbbaaa#..",
13"..#bbbbbbbbbb#..",
14"..############..",
15"................",
16"................",
17"..############..",
18"..#bbbbbbbbbb#..",
19"..#aaabbbbaaa#..",
20"...##########...",
21"................",
22"................",
23"................"};
diff --git a/noncore/apps/opie-sheet/func-func.xpm b/noncore/apps/opie-sheet/func-func.xpm
deleted file mode 100644
index b9ec747..0000000
--- a/noncore/apps/opie-sheet/func-func.xpm
+++ b/dev/null
@@ -1,23 +0,0 @@
1/* XPM */
2static const char *func_func_xpm[]={
3"16 16 4 1",
4". c None",
5"a c #0000ff",
6"b c #0058c0",
7"# c #585858",
8"................",
9".........#ab....",
10".......#aa##....",
11".......ab#......",
12".......ab#......",
13"......#a#.......",
14"....#aaaa#......",
15"....bbabbb......",
16"....##ab#a#.ba..",
17".....aa##baba#..",
18".....ab#.#ba#...",
19".....ab#.baba...",
20"....#a#.ba##ba..",
21"....ab#..#..#b..",
22"...#a#..........",
23"................"};
diff --git a/noncore/apps/opie-sheet/func-minus.xpm b/noncore/apps/opie-sheet/func-minus.xpm
deleted file mode 100644
index b747bd7..0000000
--- a/noncore/apps/opie-sheet/func-minus.xpm
+++ b/dev/null
@@ -1,23 +0,0 @@
1/* XPM */
2static const char *func_minus_xpm[]={
3"16 16 4 1",
4". c None",
5"a c #0000ff",
6"b c #0058c0",
7"# c #585858",
8"................",
9"................",
10"................",
11"................",
12"................",
13"................",
14"...##########...",
15"...#aaaaaabb#...",
16"...#bbaaaaaa#...",
17"...##########...",
18"................",
19"................",
20"................",
21"................",
22"................",
23"................"};
diff --git a/noncore/apps/opie-sheet/func-paran-close.xpm b/noncore/apps/opie-sheet/func-paran-close.xpm
deleted file mode 100644
index 1e9994c..0000000
--- a/noncore/apps/opie-sheet/func-paran-close.xpm
+++ b/dev/null
@@ -1,24 +0,0 @@
1/* XPM */
2static const char *func_paran_close_xpm[]={
3"16 16 5 1",
4"c c None",
5". c None",
6"b c #0000ff",
7"# c #0058c0",
8"a c #585858",
9"......#a........",
10"......#baa......",
11".......#bba.....",
12"........#b#.....",
13"........c##a....",
14"........c#ba....",
15"........c#ba....",
16"........c#ba....",
17"........c#ba....",
18"........c#ba....",
19"........#b#a....",
20".......abb#.....",
21".......#bba.....",
22"......#baa......",
23"......#a........",
24"................"};
diff --git a/noncore/apps/opie-sheet/func-paran-open.xpm b/noncore/apps/opie-sheet/func-paran-open.xpm
deleted file mode 100644
index ace24b0..0000000
--- a/noncore/apps/opie-sheet/func-paran-open.xpm
+++ b/dev/null
@@ -1,24 +0,0 @@
1/* XPM */
2static const char *func_paran_open_xpm[]={
3"16 16 5 1",
4"c c None",
5". c None",
6"b c #0000ff",
7"a c #0058c0",
8"# c #585858",
9"........#a......",
10"......##ba......",
11".....#bba.......",
12".....aba........",
13"....#aacc.......",
14"....#bacc.......",
15"....#bacc.......",
16"....#bacc.......",
17"....#bac........",
18"....#bac........",
19"....#aac........",
20".....abbc.......",
21".....#bba.......",
22"......##bac.....",
23"........#ac.....",
24"..........c....."};
diff --git a/noncore/apps/opie-sheet/func-plus.xpm b/noncore/apps/opie-sheet/func-plus.xpm
deleted file mode 100644
index c779f23..0000000
--- a/noncore/apps/opie-sheet/func-plus.xpm
+++ b/dev/null
@@ -1,23 +0,0 @@
1/* XPM */
2static const char *func_plus_xpm[]={
3"16 16 4 1",
4". c None",
5"a c #0000ff",
6"b c #0058c0",
7"# c #585858",
8"................",
9"................",
10"......####......",
11"......#ab#......",
12"......#ab#......",
13"......#ab#......",
14"..####babb####..",
15"..#aaaaaabbbb#..",
16"..#bbbbaaaaaa#..",
17"..####bbab####..",
18"......#ba#......",
19"......#ba#......",
20"......#ba#......",
21"......####......",
22"................",
23"................"};
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index a725e31..d47a570 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -27,19 +27,6 @@
27#include "sortdlg.h" 27#include "sortdlg.h"
28#include "finddlg.h" 28#include "finddlg.h"
29 29
30
31#include "func-plus.xpm"
32#include "func-minus.xpm"
33#include "func-cross.xpm"
34#include "func-divide.xpm"
35#include "func-paran-open.xpm"
36#include "func-paran-close.xpm"
37#include "func-comma.xpm"
38#include "func-func.xpm"
39#include "func-equal.xpm"
40#include "cell-select.xpm"
41#include "excel16.xpm"
42
43#define DEFAULT_NUM_ROWS 300 30#define DEFAULT_NUM_ROWS 300
44#define DEFAULT_NUM_COLS (26*3) 31#define DEFAULT_NUM_COLS (26*3)
45#define DEFAULT_NUM_SHEETS 3 32#define DEFAULT_NUM_SHEETS 3
@@ -293,7 +280,7 @@ void MainWindow::initActions()
293 280
294 //fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this); 281 //fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this);
295 //connect(fileQuit, SIGNAL(activated()), this, SLOT(close())); 282 //connect(fileQuit, SIGNAL(activated()), this, SLOT(close()));
296 fileExcelImport=new QAction(tr("Import Excel file"),QPixmap(excel16_xpm),tr("Import E&xcel file"),0,this); 283 fileExcelImport=new QAction(tr("Import Excel file"),Resource::loadPixmap( "/opie-sheet/excel16" ),tr("Import E&xcel file"),0,this);
297 connect(fileExcelImport, SIGNAL(activated()), this, SLOT(slotImportExcelOpen())); 284 connect(fileExcelImport, SIGNAL(activated()), this, SLOT(slotImportExcelOpen()));
298 285
299 // helpGeneral=new QAction(tr("General Help"), QPixmap(help_general_xpm), tr("&General"), 0, this); 286 // helpGeneral=new QAction(tr("General Help"), QPixmap(help_general_xpm), tr("&General"), 0, this);
@@ -305,7 +292,7 @@ void MainWindow::initActions()
305 connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept())); 292 connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept()));
306 editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this); 293 editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this);
307 connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel())); 294 connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel()));
308 editCellSelect=new QAction(tr("Cell Selector"), QPixmap(cell_select_xpm), tr("Cell &Selector"), 0, this); 295 editCellSelect=new QAction(tr("Cell Selector"), Resource::loadPixmap( "opie-sheet/cell_select" ), tr("Cell &Selector"), 0, this);
309 editCellSelect->setToggleAction(TRUE); 296 editCellSelect->setToggleAction(TRUE);
310 connect(editCellSelect, SIGNAL(toggled(bool)), this, SLOT(slotCellSelect(bool))); 297 connect(editCellSelect, SIGNAL(toggled(bool)), this, SLOT(slotCellSelect(bool)));
311 editCut=new QAction(tr("Cut Cells"), tr("Cu&t"), 0, this); 298 editCut=new QAction(tr("Cut Cells"), tr("Cu&t"), 0, this);
@@ -356,28 +343,28 @@ void MainWindow::initActions()
356 dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this); 343 dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this);
357 connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace())); 344 connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace()));
358 345
359 funcEqual=new QAction(tr("Equal To"), QPixmap(func_equal_xpm), tr("&Equal To"), 0, this); 346 funcEqual=new QAction(tr("Equal To"), Resource::loadPixmap( "opie-sheet/func_equal" ), tr("&Equal To"), 0, this);
360 funcEqual->setToolTip("="); 347 funcEqual->setToolTip("=");
361 connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 348 connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
362 funcPlus=new QAction(tr("Addition"), QPixmap(func_plus_xpm), tr("&Addition"), 0, this); 349 funcPlus=new QAction(tr("Addition"), Resource::loadPixmap( "opie-sheet/func_plus" ), tr("&Addition"), 0, this);
363 funcPlus->setToolTip("+"); 350 funcPlus->setToolTip("+");
364 connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 351 connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
365 funcMinus=new QAction(tr("Subtraction"), QPixmap(func_minus_xpm), tr("&Subtraction"), 0, this); 352 funcMinus=new QAction(tr("Subtraction"), Resource::loadPixmap( "opie-sheet/func_minus" ), tr("&Subtraction"), 0, this);
366 funcMinus->setToolTip("-"); 353 funcMinus->setToolTip("-");
367 connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 354 connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
368 funcCross=new QAction(tr("Multiplication"), QPixmap(func_cross_xpm), tr("&Multiplication"), 0, this); 355 funcCross=new QAction(tr("Multiplication"), Resource::loadPixmap ("opie-sheet/func_cross" ), tr("&Multiplication"), 0, this);
369 funcCross->setToolTip("*"); 356 funcCross->setToolTip("*");
370 connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 357 connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
371 funcDivide=new QAction(tr("Division"), QPixmap(func_divide_xpm), tr("&Division"), 0, this); 358 funcDivide=new QAction(tr("Division"), Resource::loadPixmap( "opie-sheet/func_divide" ), tr("&Division"), 0, this);
372 funcDivide->setToolTip("/"); 359 funcDivide->setToolTip("/");
373 connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 360 connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
374 funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), QPixmap(func_paran_open_xpm), tr("&Open Paranthesis"), 0, this); 361 funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), Resource::loadPixmap( "opie-sheet/func_paran_open" ), tr("&Open Paranthesis"), 0, this);
375 funcParanOpen->setToolTip("("); 362 funcParanOpen->setToolTip("(");
376 connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 363 connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
377 funcParanClose=new QAction(tr("Close Paranthesis"), QPixmap(func_paran_close_xpm), tr("&Close Paranthesis"), 0, this); 364 funcParanClose=new QAction(tr("Close Paranthesis"), Resource::loadPixmap( "opie-sheet/func_paran_close" ), tr("&Close Paranthesis"), 0, this);
378 funcParanClose->setToolTip(")"); 365 funcParanClose->setToolTip(")");
379 connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 366 connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
380 funcComma=new QAction(tr("Comma"), QPixmap(func_comma_xpm), tr("&Comma"), 0, this); 367 funcComma=new QAction(tr("Comma"), Resource::loadPixmap( "opie-sheet/func_comma" ), tr("&Comma"), 0, this);
381 funcComma->setToolTip(","); 368 funcComma->setToolTip(",");
382 connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput())); 369 connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
383} 370}
@@ -613,7 +600,7 @@ void MainWindow::initFunctionsToolbar()
613 funcComma->addTo(toolbarFunctions); 600 funcComma->addTo(toolbarFunctions);
614 601
615 toolFunction=new QToolButton(toolbarFunctions); 602 toolFunction=new QToolButton(toolbarFunctions);
616 toolFunction->setPixmap(func_func_xpm); 603 toolFunction->setPixmap(Resource::loadPixmap( "opie-sheet/func_func" ));
617 toolFunction->setTextLabel(tr("Functions")); 604 toolFunction->setTextLabel(tr("Functions"));
618 toolFunction->setPopup(submenuFunc); 605 toolFunction->setPopup(submenuFunc);
619 toolFunction->setPopupDelay(0); 606 toolFunction->setPopupDelay(0);