summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-02-04 00:49:31 (UTC)
committer llornkcor <llornkcor>2002-02-04 00:49:31 (UTC)
commit946f23d8cdb9a02175ba173ebed9a0aeb9c7c677 (patch) (unidiff)
tree2b8c927cb1b0064f89c182fc0587fcb693e7a773
parent0c60039ffbd115dc09431722d105dfce4319e187 (diff)
downloadopie-946f23d8cdb9a02175ba173ebed9a0aeb9c7c677.zip
opie-946f23d8cdb9a02175ba173ebed9a0aeb9c7c677.tar.gz
opie-946f23d8cdb9a02175ba173ebed9a0aeb9c7c677.tar.bz2
*** empty log message ***
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/Makefile.in124
-rw-r--r--core/apps/embeddedkonsole/TEWidget.cpp2
-rw-r--r--core/apps/embeddedkonsole/commandeditdialog.cpp1
-rw-r--r--core/apps/embeddedkonsole/commandeditdialogbase.cpp101
-rw-r--r--core/apps/embeddedkonsole/commandeditdialogbase.h46
5 files changed, 260 insertions, 14 deletions
diff --git a/core/apps/embeddedkonsole/Makefile.in b/core/apps/embeddedkonsole/Makefile.in
index 1c24ded..44310a6 100644
--- a/core/apps/embeddedkonsole/Makefile.in
+++ b/core/apps/embeddedkonsole/Makefile.in
@@ -1,288 +1,388 @@
1############################################################################# 1#############################################################################
2 2
3####### Compiler, tools and options 3####### Compiler, tools and options
4 4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT) 5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) 6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
7 CC =$(SYSCONF_CC) $(QT_C_MT) 7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS) 8 CFLAGS =$(SYSCONF_CFLAGS)
9 INCPATH =-I$(OPIEDIR)/include 9 INCPATH =-I$(OPIEDIR)/include
10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) 10 LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) 11 LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC) 12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC) 13 UIC =$(SYSCONF_UIC)
14 14
15####### Target 15####### Target
16 16
17DESTDIR = $(OPIEDIR)/bin/ 17DESTDIR = $(OPIEDIR)/bin/
18VER_MAJ = 1 18VER_MAJ = 1
19VER_MIN = 0 19VER_MIN = 0
20VER_PATCH = 0 20VER_PATCH = 0
21 TARGET= embeddedkonsole 21 TARGET= embeddedkonsole
22TARGET1 = lib$(TARGET).so.$(VER_MAJ) 22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23 23
24####### Files 24####### Files
25 25
26 HEADERS =TEWidget.h \ 26 HEADERS =TEWidget.h \
27 TEScreen.h \ 27 TEScreen.h \
28 TECommon.h \ 28 TECommon.h \
29 TEHistory.h \ 29 TEHistory.h \
30 TEmulation.h \ 30 TEmulation.h \
31 TEmuVt102.h \ 31 TEmuVt102.h \
32 session.h \ 32 session.h \
33 keytrans.h \ 33 keytrans.h \
34 konsole.h \ 34 konsole.h \
35 commandeditdialog.h \
36 commandeditwidget.h \
37 playlistselection.h \
35 MyPty.h 38 MyPty.h
36 SOURCES =TEScreen.cpp \ 39 SOURCES =TEScreen.cpp \
37 TEWidget.cpp \ 40 TEWidget.cpp \
38 TEHistory.cpp \ 41 TEHistory.cpp \
39 TEmulation.cpp \ 42 TEmulation.cpp \
40 TEmuVt102.cpp \ 43 TEmuVt102.cpp \
41 session.cpp \ 44 session.cpp \
42 keytrans.cpp \ 45 keytrans.cpp \
43 konsole.cpp \ 46 konsole.cpp \
44 main.cpp \ 47 commandeditdialog.cpp \
45 MyPty.cpp 48 commandeditwidget.cpp \
49 playlistselection.cpp \
50 MyPty.cpp \
51 main.cpp
46 OBJECTS =TEScreen.o \ 52 OBJECTS =TEScreen.o \
47 TEWidget.o \ 53 TEWidget.o \
48 TEHistory.o \ 54 TEHistory.o \
49 TEmulation.o \ 55 TEmulation.o \
50 TEmuVt102.o \ 56 TEmuVt102.o \
51 session.o \ 57 session.o \
52 keytrans.o \ 58 keytrans.o \
53 konsole.o \ 59 konsole.o \
60 commandeditdialog.o \
61 commandeditwidget.o \
62 playlistselection.o \
63 MyPty.o \
54 main.o \ 64 main.o \
55 MyPty.o 65 commandeditdialogbase.o \
56INTERFACES = 66 smallcommandeditdialogbase.o
57UICDECLS = 67INTERFACES = commandeditdialogbase.ui \
58UICIMPLS = 68 smallcommandeditdialogbase.ui
69UICDECLS = commandeditdialogbase.h \
70 smallcommandeditdialogbase.h
71UICIMPLS = commandeditdialogbase.cpp \
72 smallcommandeditdialogbase.cpp
59 SRCMOC =moc_TEWidget.cpp \ 73 SRCMOC =moc_TEWidget.cpp \
60 moc_TEmulation.cpp \ 74 moc_TEmulation.cpp \
61 moc_TEmuVt102.cpp \ 75 moc_TEmuVt102.cpp \
62 moc_session.cpp \ 76 moc_session.cpp \
63 moc_konsole.cpp \ 77 moc_konsole.cpp \
64 moc_MyPty.cpp 78 moc_commandeditdialog.cpp \
79 moc_commandeditwidget.cpp \
80 moc_playlistselection.cpp \
81 moc_MyPty.cpp \
82 moc_commandeditdialogbase.cpp \
83 moc_smallcommandeditdialogbase.cpp
65 OBJMOC =moc_TEWidget.o \ 84 OBJMOC =moc_TEWidget.o \
66 moc_TEmulation.o \ 85 moc_TEmulation.o \
67 moc_TEmuVt102.o \ 86 moc_TEmuVt102.o \
68 moc_session.o \ 87 moc_session.o \
69 moc_konsole.o \ 88 moc_konsole.o \
70 moc_MyPty.o 89 moc_commandeditdialog.o \
90 moc_commandeditwidget.o \
91 moc_playlistselection.o \
92 moc_MyPty.o \
93 moc_commandeditdialogbase.o \
94 moc_smallcommandeditdialogbase.o
71 95
72 96
73####### Implicit rules 97####### Implicit rules
74 98
75.SUFFIXES: .cpp .cxx .cc .C .c 99.SUFFIXES: .cpp .cxx .cc .C .c
76 100
77.cpp.o: 101.cpp.o:
78 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 102 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
79 103
80.cxx.o: 104.cxx.o:
81 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 105 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
82 106
83.cc.o: 107.cc.o:
84 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 108 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
85 109
86.C.o: 110.C.o:
87 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< 111 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
88 112
89.c.o: 113.c.o:
90 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< 114 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
91 115
92####### Build rules 116####### Build rules
93 117
94 118
95all: $(DESTDIR)$(TARGET) 119all: $(DESTDIR)$(TARGET)
96 120
97$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) 121$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
98 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) 122 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
99 123
100moc: $(SRCMOC) 124moc: $(SRCMOC)
101 125
102tmake: 126tmake:
103 tmake embeddedkonsole.pro 127 tmake embeddedkonsole.pro
104 128
105clean: 129clean:
106 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) 130 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
107 -rm -f *~ core 131 -rm -f *~ core
108 -rm -f allmoc.cpp 132 -rm -f allmoc.cpp
109 133
110####### Extension Modules 134####### Extension Modules
111 135
112listpromodules: 136listpromodules:
113 @echo 137 @echo
114 138
115listallmodules: 139listallmodules:
116 @echo 140 @echo
117 141
118listaddonpromodules: 142listaddonpromodules:
119 @echo 143 @echo
120 144
121listaddonentmodules: 145listaddonentmodules:
122 @echo 146 @echo
123 147
124 148
125REQUIRES=embeddedkonsole 149REQUIRES=embeddedkonsole
126 150
127####### Sub-libraries 151####### Sub-libraries
128 152
129 153
130###### Combined headers 154###### Combined headers
131 155
132 156
133 157
134####### Compile 158####### Compile
135 159
136TEScreen.o: TEScreen.cpp \ 160TEScreen.o: TEScreen.cpp \
137 TEScreen.h \ 161 TEScreen.h \
138 TECommon.h \ 162 TECommon.h \
139 TEHistory.h 163 TEHistory.h
140 164
141TEWidget.o: TEWidget.cpp \ 165TEWidget.o: TEWidget.cpp \
142 TEWidget.h \ 166 TEWidget.h \
143 TECommon.h \ 167 TECommon.h \
144 session.h \ 168 session.h \
145 MyPty.h \ 169 MyPty.h \
146 TEmuVt102.h \ 170 TEmuVt102.h \
147 TEScreen.h \ 171 TEScreen.h \
148 TEHistory.h \ 172 TEHistory.h \
149 TEmulation.h \ 173 TEmulation.h \
150 keytrans.h 174 keytrans.h \
175 $(OPIEDIR)/include/qpe/config.h
151 176
152TEHistory.o: TEHistory.cpp \ 177TEHistory.o: TEHistory.cpp \
153 TEHistory.h \ 178 TEHistory.h \
154 TECommon.h 179 TECommon.h
155 180
156TEmulation.o: TEmulation.cpp \ 181TEmulation.o: TEmulation.cpp \
157 TEmulation.h \ 182 TEmulation.h \
158 TEWidget.h \ 183 TEWidget.h \
159 TECommon.h \ 184 TECommon.h \
160 TEScreen.h \ 185 TEScreen.h \
161 TEHistory.h \ 186 TEHistory.h \
162 keytrans.h 187 keytrans.h
163 188
164TEmuVt102.o: TEmuVt102.cpp \ 189TEmuVt102.o: TEmuVt102.cpp \
165 TEmuVt102.h \ 190 TEmuVt102.h \
166 TEWidget.h \ 191 TEWidget.h \
167 TECommon.h \ 192 TECommon.h \
168 TEScreen.h \ 193 TEScreen.h \
169 TEHistory.h \ 194 TEHistory.h \
170 TEmulation.h \ 195 TEmulation.h \
171 keytrans.h 196 keytrans.h
172 197
173session.o: session.cpp \ 198session.o: session.cpp \
174 session.h \ 199 session.h \
175 MyPty.h \ 200 MyPty.h \
176 TEWidget.h \ 201 TEWidget.h \
177 TECommon.h \ 202 TECommon.h \
178 TEmuVt102.h \ 203 TEmuVt102.h \
179 TEScreen.h \ 204 TEScreen.h \
180 TEHistory.h \ 205 TEHistory.h \
181 TEmulation.h \ 206 TEmulation.h \
182 keytrans.h 207 keytrans.h
183 208
184keytrans.o: keytrans.cpp \ 209keytrans.o: keytrans.cpp \
185 keytrans.h \ 210 keytrans.h \
186 $(OPIEDIR)/include/qpe/qpeapplication.h \ 211 $(OPIEDIR)/include/qpe/qpeapplication.h \
187 default.keytab.h 212 default.keytab.h
188 213
189konsole.o: konsole.cpp \ 214konsole.o: konsole.cpp \
190 $(OPIEDIR)/include/qpe/resource.h \ 215 $(OPIEDIR)/include/qpe/resource.h \
191 $(OPIEDIR)/include/qpe/qpetoolbar.h \ 216 $(OPIEDIR)/include/qpe/qpetoolbar.h \
192 $(OPIEDIR)/include/qpe/qpemenubar.h \ 217 $(OPIEDIR)/include/qpe/qpemenubar.h \
193 $(OPIEDIR)/include/qpe/config.h \ 218 $(OPIEDIR)/include/qpe/config.h \
194 konsole.h \ 219 konsole.h \
195 MyPty.h \ 220 MyPty.h \
196 TEWidget.h \ 221 TEWidget.h \
197 TECommon.h \ 222 TECommon.h \
198 TEmuVt102.h \ 223 TEmuVt102.h \
199 TEScreen.h \ 224 TEScreen.h \
200 TEHistory.h \ 225 TEHistory.h \
201 TEmulation.h \ 226 TEmulation.h \
202 keytrans.h \ 227 keytrans.h \
203 session.h 228 session.h \
229 commandeditdialog.h \
230 commandeditdialogbase.h
231
232commandeditdialog.o: commandeditdialog.cpp \
233 commandeditdialog.h \
234 commandeditdialogbase.h \
235 playlistselection.h \
236 $(OPIEDIR)/include/qpe/applnk.h \
237 $(OPIEDIR)/include/qpe/config.h \
238 $(OPIEDIR)/include/qpe/qpetoolbar.h \
239 $(OPIEDIR)/include/qpe/qpemenubar.h \
240 $(OPIEDIR)/include/qpe/resource.h \
241 smallcommandeditdialogbase.h
242
243commandeditwidget.o: commandeditwidget.cpp \
244 commandeditwidget.h \
245 playlistselection.h \
246 $(OPIEDIR)/include/qpe/applnk.h
247
248playlistselection.o: playlistselection.cpp \
249 $(OPIEDIR)/include/qpe/applnk.h \
250 $(OPIEDIR)/include/qpe/resource.h \
251 playlistselection.h
252
253MyPty.o: MyPty.cpp \
254 MyPty.h
204 255
205main.o: main.cpp \ 256main.o: main.cpp \
206 konsole.h \ 257 konsole.h \
207 $(OPIEDIR)/include/qpe/qpetoolbar.h \ 258 $(OPIEDIR)/include/qpe/qpetoolbar.h \
208 MyPty.h \ 259 MyPty.h \
209 TEWidget.h \ 260 TEWidget.h \
210 TECommon.h \ 261 TECommon.h \
211 TEmuVt102.h \ 262 TEmuVt102.h \
212 TEScreen.h \ 263 TEScreen.h \
213 TEHistory.h \ 264 TEHistory.h \
214 TEmulation.h \ 265 TEmulation.h \
215 keytrans.h \ 266 keytrans.h \
216 session.h \ 267 session.h \
217 $(OPIEDIR)/include/qpe/qpeapplication.h 268 $(OPIEDIR)/include/qpe/qpeapplication.h
218 269
219MyPty.o: MyPty.cpp \ 270commandeditdialogbase.h: commandeditdialogbase.ui
220 MyPty.h 271 $(UIC) commandeditdialogbase.ui -o $(INTERFACE_DECL_PATH)/commandeditdialogbase.h
272
273commandeditdialogbase.cpp: commandeditdialogbase.ui
274 $(UIC) commandeditdialogbase.ui -i commandeditdialogbase.h -o commandeditdialogbase.cpp
275
276smallcommandeditdialogbase.h: smallcommandeditdialogbase.ui
277 $(UIC) smallcommandeditdialogbase.ui -o $(INTERFACE_DECL_PATH)/smallcommandeditdialogbase.h
278
279smallcommandeditdialogbase.cpp: smallcommandeditdialogbase.ui
280 $(UIC) smallcommandeditdialogbase.ui -i smallcommandeditdialogbase.h -o smallcommandeditdialogbase.cpp
281
282commandeditdialogbase.o: commandeditdialogbase.cpp \
283 commandeditdialogbase.h \
284 playlistselection.h \
285 $(OPIEDIR)/include/qpe/applnk.h
286
287smallcommandeditdialogbase.o: smallcommandeditdialogbase.cpp \
288 smallcommandeditdialogbase.h
221 289
222moc_TEWidget.o: moc_TEWidget.cpp \ 290moc_TEWidget.o: moc_TEWidget.cpp \
223 TEWidget.h \ 291 TEWidget.h \
224 TECommon.h 292 TECommon.h
225 293
226moc_TEmulation.o: moc_TEmulation.cpp \ 294moc_TEmulation.o: moc_TEmulation.cpp \
227 TEmulation.h \ 295 TEmulation.h \
228 TEWidget.h \ 296 TEWidget.h \
229 TECommon.h \ 297 TECommon.h \
230 TEScreen.h \ 298 TEScreen.h \
231 TEHistory.h \ 299 TEHistory.h \
232 keytrans.h 300 keytrans.h
233 301
234moc_TEmuVt102.o: moc_TEmuVt102.cpp \ 302moc_TEmuVt102.o: moc_TEmuVt102.cpp \
235 TEmuVt102.h \ 303 TEmuVt102.h \
236 TEWidget.h \ 304 TEWidget.h \
237 TECommon.h \ 305 TECommon.h \
238 TEScreen.h \ 306 TEScreen.h \
239 TEHistory.h \ 307 TEHistory.h \
240 TEmulation.h \ 308 TEmulation.h \
241 keytrans.h 309 keytrans.h
242 310
243moc_session.o: moc_session.cpp \ 311moc_session.o: moc_session.cpp \
244 session.h \ 312 session.h \
245 MyPty.h \ 313 MyPty.h \
246 TEWidget.h \ 314 TEWidget.h \
247 TECommon.h \ 315 TECommon.h \
248 TEmuVt102.h \ 316 TEmuVt102.h \
249 TEScreen.h \ 317 TEScreen.h \
250 TEHistory.h \ 318 TEHistory.h \
251 TEmulation.h \ 319 TEmulation.h \
252 keytrans.h 320 keytrans.h
253 321
254moc_konsole.o: moc_konsole.cpp \ 322moc_konsole.o: moc_konsole.cpp \
255 konsole.h \ 323 konsole.h \
256 $(OPIEDIR)/include/qpe/qpetoolbar.h \ 324 $(OPIEDIR)/include/qpe/qpetoolbar.h \
257 MyPty.h \ 325 MyPty.h \
258 TEWidget.h \ 326 TEWidget.h \
259 TECommon.h \ 327 TECommon.h \
260 TEmuVt102.h \ 328 TEmuVt102.h \
261 TEScreen.h \ 329 TEScreen.h \
262 TEHistory.h \ 330 TEHistory.h \
263 TEmulation.h \ 331 TEmulation.h \
264 keytrans.h \ 332 keytrans.h \
265 session.h 333 session.h
266 334
335moc_commandeditdialog.o: moc_commandeditdialog.cpp \
336 commandeditdialog.h \
337 commandeditdialogbase.h
338
339moc_commandeditwidget.o: moc_commandeditwidget.cpp \
340 commandeditwidget.h
341
342moc_playlistselection.o: moc_playlistselection.cpp \
343 playlistselection.h \
344 $(OPIEDIR)/include/qpe/applnk.h
345
267moc_MyPty.o: moc_MyPty.cpp \ 346moc_MyPty.o: moc_MyPty.cpp \
268 MyPty.h 347 MyPty.h
269 348
349moc_commandeditdialogbase.o: moc_commandeditdialogbase.cpp \
350 commandeditdialogbase.h
351
352moc_smallcommandeditdialogbase.o: moc_smallcommandeditdialogbase.cpp \
353 smallcommandeditdialogbase.h
354
270moc_TEWidget.cpp: TEWidget.h 355moc_TEWidget.cpp: TEWidget.h
271 $(MOC) TEWidget.h -o moc_TEWidget.cpp 356 $(MOC) TEWidget.h -o moc_TEWidget.cpp
272 357
273moc_TEmulation.cpp: TEmulation.h 358moc_TEmulation.cpp: TEmulation.h
274 $(MOC) TEmulation.h -o moc_TEmulation.cpp 359 $(MOC) TEmulation.h -o moc_TEmulation.cpp
275 360
276moc_TEmuVt102.cpp: TEmuVt102.h 361moc_TEmuVt102.cpp: TEmuVt102.h
277 $(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp 362 $(MOC) TEmuVt102.h -o moc_TEmuVt102.cpp
278 363
279moc_session.cpp: session.h 364moc_session.cpp: session.h
280 $(MOC) session.h -o moc_session.cpp 365 $(MOC) session.h -o moc_session.cpp
281 366
282moc_konsole.cpp: konsole.h 367moc_konsole.cpp: konsole.h
283 $(MOC) konsole.h -o moc_konsole.cpp 368 $(MOC) konsole.h -o moc_konsole.cpp
284 369
370moc_commandeditdialog.cpp: commandeditdialog.h
371 $(MOC) commandeditdialog.h -o moc_commandeditdialog.cpp
372
373moc_commandeditwidget.cpp: commandeditwidget.h
374 $(MOC) commandeditwidget.h -o moc_commandeditwidget.cpp
375
376moc_playlistselection.cpp: playlistselection.h
377 $(MOC) playlistselection.h -o moc_playlistselection.cpp
378
285moc_MyPty.cpp: MyPty.h 379moc_MyPty.cpp: MyPty.h
286 $(MOC) MyPty.h -o moc_MyPty.cpp 380 $(MOC) MyPty.h -o moc_MyPty.cpp
287 381
382moc_commandeditdialogbase.cpp: commandeditdialogbase.h
383 $(MOC) commandeditdialogbase.h -o moc_commandeditdialogbase.cpp
384
385moc_smallcommandeditdialogbase.cpp: smallcommandeditdialogbase.h
386 $(MOC) smallcommandeditdialogbase.h -o moc_smallcommandeditdialogbase.cpp
387
288 388
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index a56dc50..dab0ea3 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -288,513 +288,513 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
288 connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); 288 connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
289 289
290 Config cfg("Konsole"); 290 Config cfg("Konsole");
291 cfg.setGroup("ScrollBar"); 291 cfg.setGroup("ScrollBar");
292 switch( cfg.readNumEntry("Position",2)){ 292 switch( cfg.readNumEntry("Position",2)){
293 case 0: 293 case 0:
294 scrollLoc = SCRNONE; 294 scrollLoc = SCRNONE;
295 break; 295 break;
296 case 1: 296 case 1:
297 scrollLoc = SCRLEFT; 297 scrollLoc = SCRLEFT;
298 break; 298 break;
299 case 2: 299 case 2:
300 scrollLoc = SCRRIGHT; 300 scrollLoc = SCRRIGHT;
301 break; 301 break;
302 }; 302 };
303 303
304 blinkT = new QTimer(this); 304 blinkT = new QTimer(this);
305 connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent())); 305 connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent()));
306 // blinking = FALSE; 306 // blinking = FALSE;
307 blinking = TRUE; 307 blinking = TRUE;
308 308
309 resizing = FALSE; 309 resizing = FALSE;
310 actSel = 0; 310 actSel = 0;
311 image = 0; 311 image = 0;
312 lines = 1; 312 lines = 1;
313 columns = 1; 313 columns = 1;
314 font_w = 1; 314 font_w = 1;
315 font_h = 1; 315 font_h = 1;
316 font_a = 1; 316 font_a = 1;
317 word_selection_mode = FALSE; 317 word_selection_mode = FALSE;
318 318
319 setMouseMarks(TRUE); 319 setMouseMarks(TRUE);
320 setVTFont( QFont("fixed") ); 320 setVTFont( QFont("fixed") );
321 setColorTable(base_color_table); // init color table 321 setColorTable(base_color_table); // init color table
322 322
323 qApp->installEventFilter( this ); //FIXME: see below 323 qApp->installEventFilter( this ); //FIXME: see below
324// KCursor::setAutoHideCursor( this, true ); 324// KCursor::setAutoHideCursor( this, true );
325 325
326 // Init DnD //////////////////////////////////////////////////////////////// 326 // Init DnD ////////////////////////////////////////////////////////////////
327 currentSession = NULL; 327 currentSession = NULL;
328// setAcceptDrops(true); // attempt 328// setAcceptDrops(true); // attempt
329// m_drop = new QPopupMenu(this); 329// m_drop = new QPopupMenu(this);
330// m_drop->insertItem( QString("Paste"), 0); 330// m_drop->insertItem( QString("Paste"), 0);
331// m_drop->insertItem( QString("cd"), 1); 331// m_drop->insertItem( QString("cd"), 1);
332// connect(m_drop, SIGNAL(activated(int)), SLOT(drop_menu_activated(int))); 332// connect(m_drop, SIGNAL(activated(int)), SLOT(drop_menu_activated(int)));
333 333
334 // we need focus so that the auto-hide cursor feature works 334 // we need focus so that the auto-hide cursor feature works
335 setFocus(); 335 setFocus();
336 setFocusPolicy( WheelFocus ); 336 setFocusPolicy( WheelFocus );
337} 337}
338 338
339//FIXME: make proper destructor 339//FIXME: make proper destructor
340// Here's a start (David) 340// Here's a start (David)
341TEWidget::~TEWidget() 341TEWidget::~TEWidget()
342{ 342{
343 qApp->removeEventFilter( this ); 343 qApp->removeEventFilter( this );
344 if (image) free(image); 344 if (image) free(image);
345} 345}
346 346
347/* ------------------------------------------------------------------------- */ 347/* ------------------------------------------------------------------------- */
348/* */ 348/* */
349/* Display Operations */ 349/* Display Operations */
350/* */ 350/* */
351/* ------------------------------------------------------------------------- */ 351/* ------------------------------------------------------------------------- */
352 352
353/*! 353/*!
354 attributed string draw primitive 354 attributed string draw primitive
355*/ 355*/
356 356
357void TEWidget::drawAttrStr(QPainter &paint, QRect rect, 357void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
358 QString& str, ca attr, BOOL pm, BOOL clear) 358 QString& str, ca attr, BOOL pm, BOOL clear)
359{ 359{
360 if (pm && color_table[attr.b].transparent) 360 if (pm && color_table[attr.b].transparent)
361 { 361 {
362 paint.setBackgroundMode( TransparentMode ); 362 paint.setBackgroundMode( TransparentMode );
363 if (clear) erase(rect); 363 if (clear) erase(rect);
364 } 364 }
365 else 365 else
366 { 366 {
367 if (blinking) 367 if (blinking)
368 paint.fillRect(rect, color_table[attr.b].color); 368 paint.fillRect(rect, color_table[attr.b].color);
369 else 369 else
370 { 370 {
371 paint.setBackgroundMode( OpaqueMode ); 371 paint.setBackgroundMode( OpaqueMode );
372 paint.setBackgroundColor( color_table[attr.b].color ); 372 paint.setBackgroundColor( color_table[attr.b].color );
373 } 373 }
374 } 374 }
375 375
376 if (color_table[attr.f].bold) 376 if (color_table[attr.f].bold)
377 paint.setPen(QColor( 0x8F, 0x00, 0x00 )); 377 paint.setPen(QColor( 0x8F, 0x00, 0x00 ));
378 else 378 else
379 paint.setPen(color_table[attr.f].color); 379 paint.setPen(color_table[attr.f].color);
380 380
381 paint.drawText(rect.x(),rect.y()+font_a, str); 381 paint.drawText(rect.x(),rect.y()+font_a, str);
382 382
383 if (attr.r & RE_UNDERLINE) 383 if (attr.r & RE_UNDERLINE)
384 paint.drawLine(rect.left(), rect.y()+font_a+1, rect.right(),rect.y()+font_a+1 ); 384 paint.drawLine(rect.left(), rect.y()+font_a+1, rect.right(),rect.y()+font_a+1 );
385} 385}
386 386
387/*! 387/*!
388 The image can only be set completely. 388 The image can only be set completely.
389 389
390 The size of the new image may or may not match the size of the widget. 390 The size of the new image may or may not match the size of the widget.
391*/ 391*/
392 392
393void TEWidget::setImage(const ca* const newimg, int lines, int columns) 393void TEWidget::setImage(const ca* const newimg, int lines, int columns)
394{ int y,x,len; 394{ int y,x,len;
395 const QPixmap* pm = backgroundPixmap(); 395 const QPixmap* pm = backgroundPixmap();
396 QPainter paint; 396 QPainter paint;
397 setUpdatesEnabled(FALSE); 397 setUpdatesEnabled(FALSE);
398 paint.begin( this ); 398 paint.begin( this );
399HCNT("setImage"); 399HCNT("setImage");
400 400
401 QPoint tL = contentsRect().topLeft(); 401 QPoint tL = contentsRect().topLeft();
402 int tLx = tL.x(); 402 int tLx = tL.x();
403 int tLy = tL.y(); 403 int tLy = tL.y();
404 hasBlinker = FALSE; 404 hasBlinker = FALSE;
405 405
406 int cf = -1; // undefined 406 int cf = -1; // undefined
407 int cb = -1; // undefined 407 int cb = -1; // undefined
408 int cr = -1; // undefined 408 int cr = -1; // undefined
409 409
410 int lins = QMIN(this->lines, QMAX(0,lines )); 410 int lins = QMIN(this->lines, QMAX(0,lines ));
411 int cols = QMIN(this->columns,QMAX(0,columns)); 411 int cols = QMIN(this->columns,QMAX(0,columns));
412 QChar *disstrU = new QChar[cols]; 412 QChar *disstrU = new QChar[cols];
413 413
414//{ static int cnt = 0; printf("setImage %d\n",cnt++); } 414//{ static int cnt = 0; printf("setImage %d\n",cnt++); }
415 for (y = 0; y < lins; y++) 415 for (y = 0; y < lins; y++)
416 { 416 {
417 const ca* lcl = &image[y*this->columns]; 417 const ca* lcl = &image[y*this->columns];
418 const ca* const ext = &newimg[y*columns]; 418 const ca* const ext = &newimg[y*columns];
419 if (!resizing) // not while resizing, we're expecting a paintEvent 419 if (!resizing) // not while resizing, we're expecting a paintEvent
420 for (x = 0; x < cols; x++) 420 for (x = 0; x < cols; x++)
421 { 421 {
422 hasBlinker |= (ext[x].r & RE_BLINK); 422 hasBlinker |= (ext[x].r & RE_BLINK);
423 if (ext[x] != lcl[x]) 423 if (ext[x] != lcl[x])
424 { 424 {
425 cr = ext[x].r; 425 cr = ext[x].r;
426 cb = ext[x].b; 426 cb = ext[x].b;
427 if (ext[x].f != cf) cf = ext[x].f; 427 if (ext[x].f != cf) cf = ext[x].f;
428 int lln = cols - x; 428 int lln = cols - x;
429 disstrU[0] = fontMap(ext[x+0].c); 429 disstrU[0] = fontMap(ext[x+0].c);
430 for (len = 1; len < lln; len++) 430 for (len = 1; len < lln; len++)
431 { 431 {
432 if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr || 432 if (ext[x+len].f != cf || ext[x+len].b != cb || ext[x+len].r != cr ||
433 ext[x+len] == lcl[x+len] ) 433 ext[x+len] == lcl[x+len] )
434 break; 434 break;
435 disstrU[len] = fontMap(ext[x+len].c); 435 disstrU[len] = fontMap(ext[x+len].c);
436 } 436 }
437 QString unistr(disstrU,len); 437 QString unistr(disstrU,len);
438 drawAttrStr(paint, 438 drawAttrStr(paint,
439 QRect(blX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h), 439 QRect(blX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h),
440 unistr, ext[x], pm != NULL, true); 440 unistr, ext[x], pm != NULL, true);
441 x += len - 1; 441 x += len - 1;
442 } 442 }
443 } 443 }
444 // finally, make `image' become `newimg'. 444 // finally, make `image' become `newimg'.
445 memcpy((void*)lcl,(const void*)ext,cols*sizeof(ca)); 445 memcpy((void*)lcl,(const void*)ext,cols*sizeof(ca));
446 } 446 }
447 drawFrame( &paint ); 447 drawFrame( &paint );
448 paint.end(); 448 paint.end();
449 setUpdatesEnabled(TRUE); 449 setUpdatesEnabled(TRUE);
450 if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms 450 if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms
451 if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = FALSE; } 451 if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = FALSE; }
452 delete [] disstrU; 452 delete [] disstrU;
453} 453}
454 454
455// paint Event //////////////////////////////////////////////////// 455// paint Event ////////////////////////////////////////////////////
456 456
457/*! 457/*!
458 The difference of this routine vs. the `setImage' is, 458 The difference of this routine vs. the `setImage' is,
459 that the drawing does not include a difference analysis 459 that the drawing does not include a difference analysis
460 between the old and the new image. Instead, the internal 460 between the old and the new image. Instead, the internal
461 image is used and the painting bound by the PaintEvent box. 461 image is used and the painting bound by the PaintEvent box.
462*/ 462*/
463 463
464void TEWidget::paintEvent( QPaintEvent* pe ) 464void TEWidget::paintEvent( QPaintEvent* pe )
465{ 465{
466 466
467//{ static int cnt = 0; printf("paint %d\n",cnt++); } 467//{ static int cnt = 0; printf("paint %d\n",cnt++); }
468 const QPixmap* pm = backgroundPixmap(); 468 const QPixmap* pm = backgroundPixmap();
469 QPainter paint; 469 QPainter paint;
470 setUpdatesEnabled(FALSE); 470 setUpdatesEnabled(FALSE);
471 paint.begin( this ); 471 paint.begin( this );
472 paint.setBackgroundMode( TransparentMode ); 472 paint.setBackgroundMode( TransparentMode );
473HCNT("paintEvent"); 473HCNT("paintEvent");
474 474
475 // Note that the actual widget size can be slightly larger 475 // Note that the actual widget size can be slightly larger
476 // that the image (the size is truncated towards the smaller 476 // that the image (the size is truncated towards the smaller
477 // number of characters in `resizeEvent'. The paint rectangle 477 // number of characters in `resizeEvent'. The paint rectangle
478 // can thus be larger than the image, but less then the size 478 // can thus be larger than the image, but less then the size
479 // of one character. 479 // of one character.
480 480
481 QRect rect = pe->rect().intersect(contentsRect()); 481 QRect rect = pe->rect().intersect(contentsRect());
482 482
483 QPoint tL = contentsRect().topLeft(); 483 QPoint tL = contentsRect().topLeft();
484 int tLx = tL.x(); 484 int tLx = tL.x();
485 int tLy = tL.y(); 485 int tLy = tL.y();
486 486
487 int lux = QMIN(columns-1, QMAX(0,(rect.left() - tLx - blX ) / font_w)); 487 int lux = QMIN(columns-1, QMAX(0,(rect.left() - tLx - blX ) / font_w));
488 int luy = QMIN(lines-1, QMAX(0,(rect.top() - tLy - bY ) / font_h)); 488 int luy = QMIN(lines-1, QMAX(0,(rect.top() - tLy - bY ) / font_h));
489 int rlx = QMIN(columns-1, QMAX(0,(rect.right() - tLx - blX ) / font_w)); 489 int rlx = QMIN(columns-1, QMAX(0,(rect.right() - tLx - blX ) / font_w));
490 int rly = QMIN(lines-1, QMAX(0,(rect.bottom() - tLy - bY ) / font_h)); 490 int rly = QMIN(lines-1, QMAX(0,(rect.bottom() - tLy - bY ) / font_h));
491 491
492 /* 492 /*
493 printf("paintEvent: %d..%d, %d..%d (%d..%d, %d..%d)\n",lux,rlx,luy,rly, 493 printf("paintEvent: %d..%d, %d..%d (%d..%d, %d..%d)\n",lux,rlx,luy,rly,
494 rect.left(), rect.right(), rect.top(), rect.bottom()); 494 rect.left(), rect.right(), rect.top(), rect.bottom());
495 */ 495 */
496 496
497 // if (pm != NULL && color_table[image->b].transparent) 497 // if (pm != NULL && color_table[image->b].transparent)
498 // erase(rect); 498 // erase(rect);
499 // BL: I have no idea why we need this, and it breaks the refresh. 499 // BL: I have no idea why we need this, and it breaks the refresh.
500 500
501 QChar *disstrU = new QChar[columns]; 501 QChar *disstrU = new QChar[columns];
502 for (int y = luy; y <= rly; y++) 502 for (int y = luy; y <= rly; y++)
503 for (int x = lux; x <= rlx; x++) 503 for (int x = lux; x <= rlx; x++)
504 { 504 {
505 int len = 1; 505 int len = 1;
506 disstrU[0] = fontMap(image[loc(x,y)].c); 506 disstrU[0] = fontMap(image[loc(x,y)].c);
507 int cf = image[loc(x,y)].f; 507 int cf = image[loc(x,y)].f;
508 int cb = image[loc(x,y)].b; 508 int cb = image[loc(x,y)].b;
509 int cr = image[loc(x,y)].r; 509 int cr = image[loc(x,y)].r;
510 while (x+len <= rlx && 510 while (x+len <= rlx &&
511 image[loc(x+len,y)].f == cf && 511 image[loc(x+len,y)].f == cf &&
512 image[loc(x+len,y)].b == cb && 512 image[loc(x+len,y)].b == cb &&
513 image[loc(x+len,y)].r == cr ) 513 image[loc(x+len,y)].r == cr )
514 { 514 {
515 disstrU[len] = fontMap(image[loc(x+len,y)].c); 515 disstrU[len] = fontMap(image[loc(x+len,y)].c);
516 len += 1; 516 len += 1;
517 } 517 }
518 QString unistr(disstrU,len); 518 QString unistr(disstrU,len);
519 drawAttrStr(paint, 519 drawAttrStr(paint,
520 QRect(blX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h), 520 QRect(blX+tLx+font_w*x,bY+tLy+font_h*y,font_w*len,font_h),
521 unistr, image[loc(x,y)], pm != NULL, false); 521 unistr, image[loc(x,y)], pm != NULL, false);
522 x += len - 1; 522 x += len - 1;
523 } 523 }
524 delete [] disstrU; 524 delete [] disstrU;
525 drawFrame( &paint ); 525 drawFrame( &paint );
526 paint.end(); 526 paint.end();
527 setUpdatesEnabled(TRUE); 527 setUpdatesEnabled(TRUE);
528} 528}
529 529
530void TEWidget::blinkEvent() 530void TEWidget::blinkEvent()
531{ 531{
532 blinking = !blinking; 532 blinking = !blinking;
533 repaint(FALSE); 533 repaint(FALSE);
534} 534}
535 535
536/* ------------------------------------------------------------------------- */ 536/* ------------------------------------------------------------------------- */
537/* */ 537/* */
538/* Resizing */ 538/* Resizing */
539/* */ 539/* */
540/* ------------------------------------------------------------------------- */ 540/* ------------------------------------------------------------------------- */
541 541
542void TEWidget::resizeEvent(QResizeEvent* ev) 542void TEWidget::resizeEvent(QResizeEvent* ev)
543{ 543{
544 //printf("resize: %d,%d\n",ev->size().width(),ev->size().height()); 544// printf("resize: %d,%d\n",ev->size().width(),ev->size().height());
545 //printf("approx: %d,%d\n",ev->size().width()/font_w,ev->size().height()/font_h); 545 //printf("approx: %d,%d\n",ev->size().width()/font_w,ev->size().height()/font_h);
546 //printf("leaves: %d,%d\n",ev->size().width()%font_w,ev->size().height()%font_h); 546 //printf("leaves: %d,%d\n",ev->size().width()%font_w,ev->size().height()%font_h);
547 //printf("curren: %d,%d\n",width(),height()); 547 //printf("curren: %d,%d\n",width(),height());
548HCNT("resizeEvent"); 548HCNT("resizeEvent");
549 549
550 // see comment in `paintEvent' concerning the rounding. 550 // see comment in `paintEvent' concerning the rounding.
551 //FIXME: could make a routine here; check width(),height() 551 //FIXME: could make a routine here; check width(),height()
552 assert(ev->size().width() == width()); 552 assert(ev->size().width() == width());
553 assert(ev->size().height() == height()); 553 assert(ev->size().height() == height());
554 554
555 propagateSize(); 555 propagateSize();
556} 556}
557 557
558void TEWidget::propagateSize() 558void TEWidget::propagateSize()
559{ 559{
560 ca* oldimg = image; 560 ca* oldimg = image;
561 int oldlin = lines; 561 int oldlin = lines;
562 int oldcol = columns; 562 int oldcol = columns;
563 makeImage(); 563 makeImage();
564 // we copy the old image to reduce flicker 564 // we copy the old image to reduce flicker
565 int lins = QMIN(oldlin,lines); 565 int lins = QMIN(oldlin,lines);
566 int cols = QMIN(oldcol,columns); 566 int cols = QMIN(oldcol,columns);
567 if (oldimg) 567 if (oldimg)
568 { 568 {
569 for (int lin = 0; lin < lins; lin++) 569 for (int lin = 0; lin < lins; lin++)
570 memcpy((void*)&image[columns*lin], 570 memcpy((void*)&image[columns*lin],
571 (void*)&oldimg[oldcol*lin],cols*sizeof(ca)); 571 (void*)&oldimg[oldcol*lin],cols*sizeof(ca));
572 free(oldimg); //FIXME: try new,delete 572 free(oldimg); //FIXME: try new,delete
573 } 573 }
574 else 574 else
575 clearImage(); 575 clearImage();
576 576
577 //NOTE: control flows from the back through the chest right into the eye. 577 //NOTE: control flows from the back through the chest right into the eye.
578 // `emu' will call back via `setImage'. 578 // `emu' will call back via `setImage'.
579 579
580 resizing = TRUE; 580 resizing = TRUE;
581 emit changedImageSizeSignal(lines, columns); // expose resizeEvent 581 emit changedImageSizeSignal(lines, columns); // expose resizeEvent
582 resizing = FALSE; 582 resizing = FALSE;
583} 583}
584 584
585/* ------------------------------------------------------------------------- */ 585/* ------------------------------------------------------------------------- */
586/* */ 586/* */
587/* Scrollbar */ 587/* Scrollbar */
588/* */ 588/* */
589/* ------------------------------------------------------------------------- */ 589/* ------------------------------------------------------------------------- */
590 590
591void TEWidget::scrollChanged(int) 591void TEWidget::scrollChanged(int)
592{ 592{
593 emit changedHistoryCursor(scrollbar->value()); //expose 593 emit changedHistoryCursor(scrollbar->value()); //expose
594} 594}
595 595
596void TEWidget::setScroll(int cursor, int slines) 596void TEWidget::setScroll(int cursor, int slines)
597{ 597{
598 disconnect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); 598 disconnect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
599 scrollbar->setRange(0,slines); 599 scrollbar->setRange(0,slines);
600 scrollbar->setSteps(1,lines); 600 scrollbar->setSteps(1,lines);
601 scrollbar->setValue(cursor); 601 scrollbar->setValue(cursor);
602 connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int))); 602 connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
603} 603}
604 604
605void TEWidget::setScrollbarLocation(int loc) 605void TEWidget::setScrollbarLocation(int loc)
606{ 606{
607 if (scrollLoc == loc) return; // quickly 607 if (scrollLoc == loc) return; // quickly
608 scrollLoc = loc; 608 scrollLoc = loc;
609 propagateSize(); 609 propagateSize();
610 update(); 610 update();
611} 611}
612 612
613/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
614/* */ 614/* */
615/* Mouse */ 615/* Mouse */
616/* */ 616/* */
617/* ------------------------------------------------------------------------- */ 617/* ------------------------------------------------------------------------- */
618 618
619/*! 619/*!
620 Three different operations can be performed using the mouse, and the 620 Three different operations can be performed using the mouse, and the
621 routines in this section serve all of them: 621 routines in this section serve all of them:
622 622
623 1) The press/release events are exposed to the application 623 1) The press/release events are exposed to the application
624 2) Marking (press and move left button) and Pasting (press middle button) 624 2) Marking (press and move left button) and Pasting (press middle button)
625 3) The right mouse button is used from the configuration menu 625 3) The right mouse button is used from the configuration menu
626 626
627 NOTE: During the marking process we attempt to keep the cursor within 627 NOTE: During the marking process we attempt to keep the cursor within
628 the bounds of the text as being displayed by setting the mouse position 628 the bounds of the text as being displayed by setting the mouse position
629 whenever the mouse has left the text area. 629 whenever the mouse has left the text area.
630 630
631 Two reasons to do so: 631 Two reasons to do so:
632 1) QT does not allow the `grabMouse' to confine-to the TEWidget. 632 1) QT does not allow the `grabMouse' to confine-to the TEWidget.
633 Thus a `XGrapPointer' would have to be used instead. 633 Thus a `XGrapPointer' would have to be used instead.
634 2) Even if so, this would not help too much, since the text area 634 2) Even if so, this would not help too much, since the text area
635 of the TEWidget is normally not identical with it's bounds. 635 of the TEWidget is normally not identical with it's bounds.
636 636
637 The disadvantage of the current handling is, that the mouse can visibly 637 The disadvantage of the current handling is, that the mouse can visibly
638 leave the bounds of the widget and is then moved back. Because of the 638 leave the bounds of the widget and is then moved back. Because of the
639 current construction, and the reasons mentioned above, we cannot do better 639 current construction, and the reasons mentioned above, we cannot do better
640 without changing the overall construction. 640 without changing the overall construction.
641*/ 641*/
642 642
643/*! 643/*!
644*/ 644*/
645 645
646void TEWidget::mousePressEvent(QMouseEvent* ev) 646void TEWidget::mousePressEvent(QMouseEvent* ev)
647{ 647{
648//printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); 648//printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
649 if ( !contentsRect().contains(ev->pos()) ) return; 649 if ( !contentsRect().contains(ev->pos()) ) return;
650 QPoint tL = contentsRect().topLeft(); 650 QPoint tL = contentsRect().topLeft();
651 int tLx = tL.x(); 651 int tLx = tL.x();
652 int tLy = tL.y(); 652 int tLy = tL.y();
653 653
654 word_selection_mode = FALSE; 654 word_selection_mode = FALSE;
655 655
656//printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY); 656//printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY);
657 if ( ev->button() == LeftButton) 657 if ( ev->button() == LeftButton)
658 { 658 {
659 QPoint pos = QPoint((ev->x()-tLx-blX)/font_w,(ev->y()-tLy-bY)/font_h); 659 QPoint pos = QPoint((ev->x()-tLx-blX)/font_w,(ev->y()-tLy-bY)/font_h);
660 660
661 if ( ev->state() & ControlButton ) preserve_line_breaks = FALSE ; 661 if ( ev->state() & ControlButton ) preserve_line_breaks = FALSE ;
662 662
663 if (mouse_marks || (ev->state() & ShiftButton)) 663 if (mouse_marks || (ev->state() & ShiftButton))
664 { 664 {
665 emit clearSelectionSignal(); 665 emit clearSelectionSignal();
666 iPntSel = pntSel = pos; 666 iPntSel = pntSel = pos;
667 actSel = 1; // left mouse button pressed but nothing selected yet. 667 actSel = 1; // left mouse button pressed but nothing selected yet.
668 grabMouse( /*crossCursor*/ ); // handle with care! 668 grabMouse( /*crossCursor*/ ); // handle with care!
669 } 669 }
670 else 670 else
671 { 671 {
672 emit mouseSignal( 0, pos.x() + 1, pos.y() + 1 ); // left button 672 emit mouseSignal( 0, pos.x() + 1, pos.y() + 1 ); // left button
673 } 673 }
674 } 674 }
675 if ( ev->button() == MidButton ) 675 if ( ev->button() == MidButton )
676 { 676 {
677 emitSelection(); 677 emitSelection();
678 } 678 }
679 if ( ev->button() == RightButton ) // Configure 679 if ( ev->button() == RightButton ) // Configure
680 { 680 {
681 emit configureRequest( this, ev->state()&(ShiftButton|ControlButton), ev->x(), ev->y() ); 681 emit configureRequest( this, ev->state()&(ShiftButton|ControlButton), ev->x(), ev->y() );
682 } 682 }
683} 683}
684 684
685void TEWidget::mouseMoveEvent(QMouseEvent* ev) 685void TEWidget::mouseMoveEvent(QMouseEvent* ev)
686{ 686{
687 // for auto-hiding the cursor, we need mouseTracking 687 // for auto-hiding the cursor, we need mouseTracking
688 if (ev->state() == NoButton ) return; 688 if (ev->state() == NoButton ) return;
689 689
690 if (actSel == 0) return; 690 if (actSel == 0) return;
691 691
692 // don't extend selection while pasting 692 // don't extend selection while pasting
693 if (ev->state() & MidButton) return; 693 if (ev->state() & MidButton) return;
694 694
695 //if ( !contentsRect().contains(ev->pos()) ) return; 695 //if ( !contentsRect().contains(ev->pos()) ) return;
696 QPoint tL = contentsRect().topLeft(); 696 QPoint tL = contentsRect().topLeft();
697 int tLx = tL.x(); 697 int tLx = tL.x();
698 int tLy = tL.y(); 698 int tLy = tL.y();
699 int scroll = scrollbar->value(); 699 int scroll = scrollbar->value();
700 700
701 // we're in the process of moving the mouse with the left button pressed 701 // we're in the process of moving the mouse with the left button pressed
702 // the mouse cursor will kept catched within the bounds of the text in 702 // the mouse cursor will kept catched within the bounds of the text in
703 // this widget. 703 // this widget.
704 704
705 // Adjust position within text area bounds. See FIXME above. 705 // Adjust position within text area bounds. See FIXME above.
706 QPoint pos = ev->pos(); 706 QPoint pos = ev->pos();
707 if ( pos.x() < tLx+blX ) pos.setX( tLx+blX ); 707 if ( pos.x() < tLx+blX ) pos.setX( tLx+blX );
708 if ( pos.x() > tLx+blX+columns*font_w-1 ) pos.setX( tLx+blX+columns*font_w ); 708 if ( pos.x() > tLx+blX+columns*font_w-1 ) pos.setX( tLx+blX+columns*font_w );
709 if ( pos.y() < tLy+bY ) pos.setY( tLy+bY ); 709 if ( pos.y() < tLy+bY ) pos.setY( tLy+bY );
710 if ( pos.y() > tLy+bY+lines*font_h-1 ) pos.setY( tLy+bY+lines*font_h-1 ); 710 if ( pos.y() > tLy+bY+lines*font_h-1 ) pos.setY( tLy+bY+lines*font_h-1 );
711 // check if we produce a mouse move event by this 711 // check if we produce a mouse move event by this
712 if ( pos != ev->pos() ) cursor().setPos(mapToGlobal(pos)); 712 if ( pos != ev->pos() ) cursor().setPos(mapToGlobal(pos));
713 713
714 if ( pos.y() == tLy+bY+lines*font_h-1 ) 714 if ( pos.y() == tLy+bY+lines*font_h-1 )
715 { 715 {
716 scrollbar->setValue(scrollbar->value()+yMouseScroll); // scrollforward 716 scrollbar->setValue(scrollbar->value()+yMouseScroll); // scrollforward
717 } 717 }
718 if ( pos.y() == tLy+bY ) 718 if ( pos.y() == tLy+bY )
719 { 719 {
720 scrollbar->setValue(scrollbar->value()-yMouseScroll); // scrollback 720 scrollbar->setValue(scrollbar->value()-yMouseScroll); // scrollback
721 } 721 }
722 722
723 QPoint here = QPoint((pos.x()-tLx-blX)/font_w,(pos.y()-tLy-bY)/font_h); 723 QPoint here = QPoint((pos.x()-tLx-blX)/font_w,(pos.y()-tLy-bY)/font_h);
724 QPoint ohere; 724 QPoint ohere;
725 bool swapping = FALSE; 725 bool swapping = FALSE;
726 726
727 if ( word_selection_mode ) 727 if ( word_selection_mode )
728 { 728 {
729 // Extend to word boundaries 729 // Extend to word boundaries
730 int i; 730 int i;
731 int selClass; 731 int selClass;
732 732
733 bool left_not_right = ( here.y() < iPntSel.y() || 733 bool left_not_right = ( here.y() < iPntSel.y() ||
734 here.y() == iPntSel.y() && here.x() < iPntSel.x() ); 734 here.y() == iPntSel.y() && here.x() < iPntSel.x() );
735 bool old_left_not_right = ( pntSel.y() < iPntSel.y() || 735 bool old_left_not_right = ( pntSel.y() < iPntSel.y() ||
736 pntSel.y() == iPntSel.y() && pntSel.x() < iPntSel.x() ); 736 pntSel.y() == iPntSel.y() && pntSel.x() < iPntSel.x() );
737 swapping = left_not_right != old_left_not_right; 737 swapping = left_not_right != old_left_not_right;
738 738
739 // Find left (left_not_right ? from here : from start) 739 // Find left (left_not_right ? from here : from start)
740 QPoint left = left_not_right ? here : iPntSel; 740 QPoint left = left_not_right ? here : iPntSel;
741 i = loc(left.x(),left.y()); 741 i = loc(left.x(),left.y());
742 selClass = charClass(image[i].c); 742 selClass = charClass(image[i].c);
743 while ( left.x() > 0 && charClass(image[i-1].c) == selClass ) 743 while ( left.x() > 0 && charClass(image[i-1].c) == selClass )
744 { i--; left.rx()--; } 744 { i--; left.rx()--; }
745 745
746 // Find left (left_not_right ? from start : from here) 746 // Find left (left_not_right ? from start : from here)
747 QPoint right = left_not_right ? iPntSel : here; 747 QPoint right = left_not_right ? iPntSel : here;
748 i = loc(right.x(),right.y()); 748 i = loc(right.x(),right.y());
749 selClass = charClass(image[i].c); 749 selClass = charClass(image[i].c);
750 while ( right.x() < columns-1 && charClass(image[i+1].c) == selClass ) 750 while ( right.x() < columns-1 && charClass(image[i+1].c) == selClass )
751 { i++; right.rx()++; } 751 { i++; right.rx()++; }
752 752
753 // Pick which is start (ohere) and which is extension (here) 753 // Pick which is start (ohere) and which is extension (here)
754 if ( left_not_right ) 754 if ( left_not_right )
755 { 755 {
756 here = left; ohere = right; 756 here = left; ohere = right;
757 } 757 }
758 else 758 else
759 { 759 {
760 here = right; ohere = left; 760 here = right; ohere = left;
761 } 761 }
762 } 762 }
763 763
764 if (here == pntSel && scroll == scrollbar->value()) return; // not moved 764 if (here == pntSel && scroll == scrollbar->value()) return; // not moved
765 765
766 if ( word_selection_mode ) { 766 if ( word_selection_mode ) {
767 if ( actSel < 2 || swapping ) { 767 if ( actSel < 2 || swapping ) {
768 emit beginSelectionSignal( ohere.x(), ohere.y() ); 768 emit beginSelectionSignal( ohere.x(), ohere.y() );
769 } 769 }
770 } else if ( actSel < 2 ) { 770 } else if ( actSel < 2 ) {
771 emit beginSelectionSignal( pntSel.x(), pntSel.y() ); 771 emit beginSelectionSignal( pntSel.x(), pntSel.y() );
772 } 772 }
773 773
774 actSel = 2; // within selection 774 actSel = 2; // within selection
775 pntSel = here; 775 pntSel = here;
776 emit extendSelectionSignal( here.x(), here.y() ); 776 emit extendSelectionSignal( here.x(), here.y() );
777} 777}
778 778
779void TEWidget::mouseReleaseEvent(QMouseEvent* ev) 779void TEWidget::mouseReleaseEvent(QMouseEvent* ev)
780{ 780{
781//printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); 781//printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
782 if ( ev->button() == LeftButton) 782 if ( ev->button() == LeftButton)
783 { 783 {
784 if ( actSel > 1 ) emit endSelectionSignal(preserve_line_breaks); 784 if ( actSel > 1 ) emit endSelectionSignal(preserve_line_breaks);
785 preserve_line_breaks = TRUE; 785 preserve_line_breaks = TRUE;
786 actSel = 0; 786 actSel = 0;
787 787
788 //FIXME: emits a release event even if the mouse is 788 //FIXME: emits a release event even if the mouse is
789 // outside the range. The procedure used in `mouseMoveEvent' 789 // outside the range. The procedure used in `mouseMoveEvent'
790 // applies here, too. 790 // applies here, too.
791 791
792 QPoint tL = contentsRect().topLeft(); 792 QPoint tL = contentsRect().topLeft();
793 int tLx = tL.x(); 793 int tLx = tL.x();
794 int tLy = tL.y(); 794 int tLy = tL.y();
795 795
796 if (!mouse_marks && !(ev->state() & ShiftButton)) 796 if (!mouse_marks && !(ev->state() & ShiftButton))
797 emit mouseSignal( 3, // release 797 emit mouseSignal( 3, // release
798 (ev->x()-tLx-blX)/font_w + 1, 798 (ev->x()-tLx-blX)/font_w + 1,
799 (ev->y()-tLy-bY)/font_h + 1 ); 799 (ev->y()-tLy-bY)/font_h + 1 );
800 releaseMouse(); 800 releaseMouse();
diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp
index e8ef858..ce21c47 100644
--- a/core/apps/embeddedkonsole/commandeditdialog.cpp
+++ b/core/apps/embeddedkonsole/commandeditdialog.cpp
@@ -1,224 +1,223 @@
1//comandeditdialog.cpp 1//comandeditdialog.cpp
2 2
3#include "commandeditdialog.h" 3#include "commandeditdialog.h"
4#include "playlistselection.h" 4#include "playlistselection.h"
5#include <qstring.h> 5#include <qstring.h>
6#include <qpe/config.h> 6#include <qpe/config.h>
7#include <qpe/qpetoolbar.h> 7#include <qpe/qpetoolbar.h>
8#include <qwidget.h> 8#include <qwidget.h>
9#include <qpe/qpemenubar.h> 9#include <qpe/qpemenubar.h>
10#include <qpe/resource.h> 10#include <qpe/resource.h>
11#include <qlist.h> 11#include <qlist.h>
12#include <qtoolbutton.h> 12#include <qtoolbutton.h>
13#include <qvbox.h> 13#include <qvbox.h>
14#include <qlistview.h> 14#include <qlistview.h>
15#include <qlineedit.h> 15#include <qlineedit.h>
16#include <qheader.h> 16#include <qheader.h>
17#include <qlabel.h> 17#include <qlabel.h>
18#include <qmessagebox.h> 18#include <qmessagebox.h>
19#include "smallcommandeditdialogbase.h" 19#include "smallcommandeditdialogbase.h"
20 20
21CommandEditDialog::CommandEditDialog(QWidget *parent, const char* name, WFlags fl ) 21CommandEditDialog::CommandEditDialog(QWidget *parent, const char* name, WFlags fl )
22 : CommandEditDialogBase(parent, name, TRUE, fl) 22 : CommandEditDialogBase(parent, name, TRUE, fl)
23 23
24{ 24{
25 m_SuggestedCommandList->addColumn( tr("Command Selection") ); 25 m_SuggestedCommandList->addColumn( tr("Command Selection") );
26 m_SuggestedCommandList->header()->hide(); 26 m_SuggestedCommandList->header()->hide();
27 m_SuggestedCommandList->setSorting(-1,FALSE); 27 m_SuggestedCommandList->setSorting(-1,FALSE);
28 m_SuggestedCommandList->clearSelection(); 28 m_SuggestedCommandList->clearSelection();
29 m_SuggestedCommandList->setSorting(0,TRUE); 29 m_SuggestedCommandList->setSorting(0,TRUE);
30 30
31 QListViewItem *item; 31 QListViewItem *item;
32 32
33 33
34 item = new QListViewItem( m_SuggestedCommandList,"ls "); 34 item = new QListViewItem( m_SuggestedCommandList,"ls ");
35 35
36 item = new QListViewItem( m_SuggestedCommandList,"cat "); 36 item = new QListViewItem( m_SuggestedCommandList,"cat ");
37 item = new QListViewItem( m_SuggestedCommandList,"cd "); 37 item = new QListViewItem( m_SuggestedCommandList,"cd ");
38 item = new QListViewItem( m_SuggestedCommandList,"chmod "); 38 item = new QListViewItem( m_SuggestedCommandList,"chmod ");
39 item = new QListViewItem( m_SuggestedCommandList,"cp "); 39 item = new QListViewItem( m_SuggestedCommandList,"cp ");
40 item = new QListViewItem( m_SuggestedCommandList,"dc "); 40 item = new QListViewItem( m_SuggestedCommandList,"dc ");
41 item = new QListViewItem( m_SuggestedCommandList,"df "); 41 item = new QListViewItem( m_SuggestedCommandList,"df ");
42 item = new QListViewItem( m_SuggestedCommandList,"dmesg "); 42 item = new QListViewItem( m_SuggestedCommandList,"dmesg ");
43 item = new QListViewItem( m_SuggestedCommandList,"echo "); 43 item = new QListViewItem( m_SuggestedCommandList,"echo ");
44 item = new QListViewItem( m_SuggestedCommandList,"export "); 44 item = new QListViewItem( m_SuggestedCommandList,"export ");
45 item = new QListViewItem( m_SuggestedCommandList,"env "); 45 item = new QListViewItem( m_SuggestedCommandList,"env ");
46 item = new QListViewItem( m_SuggestedCommandList,"find "); 46 item = new QListViewItem( m_SuggestedCommandList,"find ");
47 item = new QListViewItem( m_SuggestedCommandList,"free "); 47 item = new QListViewItem( m_SuggestedCommandList,"free ");
48 item = new QListViewItem( m_SuggestedCommandList,"ifconfig "); 48 item = new QListViewItem( m_SuggestedCommandList,"ifconfig ");
49 item = new QListViewItem( m_SuggestedCommandList,"ipkg "); 49 item = new QListViewItem( m_SuggestedCommandList,"ipkg ");
50 item = new QListViewItem( m_SuggestedCommandList,"mkdir "); 50 item = new QListViewItem( m_SuggestedCommandList,"mkdir ");
51 item = new QListViewItem( m_SuggestedCommandList,"mv "); 51 item = new QListViewItem( m_SuggestedCommandList,"mv ");
52 item = new QListViewItem( m_SuggestedCommandList,"nc localhost 7776 "); 52 item = new QListViewItem( m_SuggestedCommandList,"nc localhost 7776 ");
53 item = new QListViewItem( m_SuggestedCommandList,"nc localhost 7777 "); 53 item = new QListViewItem( m_SuggestedCommandList,"nc localhost 7777 ");
54 item = new QListViewItem( m_SuggestedCommandList,"nslookup "); 54 item = new QListViewItem( m_SuggestedCommandList,"nslookup ");
55 item = new QListViewItem( m_SuggestedCommandList,"ping "); 55 item = new QListViewItem( m_SuggestedCommandList,"ping ");
56 item = new QListViewItem( m_SuggestedCommandList,"ps aux"); 56 item = new QListViewItem( m_SuggestedCommandList,"ps aux");
57 item = new QListViewItem( m_SuggestedCommandList,"pwd "); 57 item = new QListViewItem( m_SuggestedCommandList,"pwd ");
58 item = new QListViewItem( m_SuggestedCommandList,"rm "); 58 item = new QListViewItem( m_SuggestedCommandList,"rm ");
59 item = new QListViewItem( m_SuggestedCommandList,"rmdir "); 59 item = new QListViewItem( m_SuggestedCommandList,"rmdir ");
60 item = new QListViewItem( m_SuggestedCommandList,"route "); 60 item = new QListViewItem( m_SuggestedCommandList,"route ");
61 item = new QListViewItem( m_SuggestedCommandList,"gzip "); 61 item = new QListViewItem( m_SuggestedCommandList,"gzip ");
62 item = new QListViewItem( m_SuggestedCommandList,"gunzip "); 62 item = new QListViewItem( m_SuggestedCommandList,"gunzip ");
63 item = new QListViewItem( m_SuggestedCommandList,"chgrp "); 63 item = new QListViewItem( m_SuggestedCommandList,"chgrp ");
64 item = new QListViewItem( m_SuggestedCommandList,"chown "); 64 item = new QListViewItem( m_SuggestedCommandList,"chown ");
65 item = new QListViewItem( m_SuggestedCommandList,"date "); 65 item = new QListViewItem( m_SuggestedCommandList,"date ");
66 item = new QListViewItem( m_SuggestedCommandList,"dd "); 66 item = new QListViewItem( m_SuggestedCommandList,"dd ");
67 item = new QListViewItem( m_SuggestedCommandList,"df "); 67 item = new QListViewItem( m_SuggestedCommandList,"df ");
68 item = new QListViewItem( m_SuggestedCommandList,"dmesg "); 68 item = new QListViewItem( m_SuggestedCommandList,"dmesg ");
69 item = new QListViewItem( m_SuggestedCommandList,"fuser "); 69 item = new QListViewItem( m_SuggestedCommandList,"fuser ");
70 item = new QListViewItem( m_SuggestedCommandList,"hostname "); 70 item = new QListViewItem( m_SuggestedCommandList,"hostname ");
71 item = new QListViewItem( m_SuggestedCommandList,"kill "); 71 item = new QListViewItem( m_SuggestedCommandList,"kill ");
72 item = new QListViewItem( m_SuggestedCommandList,"killall "); 72 item = new QListViewItem( m_SuggestedCommandList,"killall ");
73 item = new QListViewItem( m_SuggestedCommandList,"ln "); 73 item = new QListViewItem( m_SuggestedCommandList,"ln ");
74 item = new QListViewItem( m_SuggestedCommandList,"ln -s "); 74 item = new QListViewItem( m_SuggestedCommandList,"ln -s ");
75 item = new QListViewItem( m_SuggestedCommandList,"mount "); 75 item = new QListViewItem( m_SuggestedCommandList,"mount ");
76 item = new QListViewItem( m_SuggestedCommandList,"more "); 76 item = new QListViewItem( m_SuggestedCommandList,"more ");
77 item = new QListViewItem( m_SuggestedCommandList,"sort "); 77 item = new QListViewItem( m_SuggestedCommandList,"sort ");
78 item = new QListViewItem( m_SuggestedCommandList,"touch "); 78 item = new QListViewItem( m_SuggestedCommandList,"touch ");
79 item = new QListViewItem( m_SuggestedCommandList,"umount "); 79 item = new QListViewItem( m_SuggestedCommandList,"umount ");
80 item = new QListViewItem( m_SuggestedCommandList,"mknod "); 80 item = new QListViewItem( m_SuggestedCommandList,"mknod ");
81 item = new QListViewItem( m_SuggestedCommandList,"netstat "); 81 item = new QListViewItem( m_SuggestedCommandList,"netstat ");
82 item = new QListViewItem( m_SuggestedCommandList,"cardctl eject "); 82 item = new QListViewItem( m_SuggestedCommandList,"cardctl eject ");
83 m_SuggestedCommandList->setSelected(m_SuggestedCommandList->firstChild(),TRUE); 83 m_SuggestedCommandList->setSelected(m_SuggestedCommandList->firstChild(),TRUE);
84 m_SuggestedCommandList->sort(); 84 m_SuggestedCommandList->sort();
85 85
86 connect( m_SuggestedCommandList, SIGNAL( clicked( QListViewItem * ) ), m_PlayListSelection, SLOT( addToSelection( QListViewItem *) ) ); 86 connect( m_SuggestedCommandList, SIGNAL( clicked( QListViewItem * ) ), m_PlayListSelection, SLOT( addToSelection( QListViewItem *) ) );
87 87
88 88
89 89
90 ToolButton1->setTextLabel("new"); 90 ToolButton1->setTextLabel("new");
91 ToolButton1->setPixmap(Resource::loadPixmap("new")); 91 ToolButton1->setPixmap(Resource::loadPixmap("new"));
92 ToolButton1->setAutoRaise(TRUE); 92 ToolButton1->setAutoRaise(TRUE);
93 ToolButton1->setFocusPolicy(QWidget::NoFocus); 93 ToolButton1->setFocusPolicy(QWidget::NoFocus);
94 connect(ToolButton1,SIGNAL(clicked()),this,SLOT(showAddDialog())); 94 connect(ToolButton1,SIGNAL(clicked()),this,SLOT(showAddDialog()));
95 95
96 ToolButton2->setTextLabel("edit"); 96 ToolButton2->setTextLabel("edit");
97 ToolButton2->setPixmap(Resource::loadPixmap("edit")); 97 ToolButton2->setPixmap(Resource::loadPixmap("edit"));
98 ToolButton2->setAutoRaise(TRUE); 98 ToolButton2->setAutoRaise(TRUE);
99 ToolButton2->setFocusPolicy(QWidget::NoFocus); 99 ToolButton2->setFocusPolicy(QWidget::NoFocus);
100 connect(ToolButton2,SIGNAL(clicked()),this,SLOT(showEditDialog())); 100 connect(ToolButton2,SIGNAL(clicked()),this,SLOT(showEditDialog()));
101 101
102 ToolButton3->setTextLabel("delete"); 102 ToolButton3->setTextLabel("delete");
103 ToolButton3->setPixmap(Resource::loadPixmap("editdelete")); 103 ToolButton3->setPixmap(Resource::loadPixmap("editdelete"));
104 ToolButton3->setAutoRaise(TRUE); 104 ToolButton3->setAutoRaise(TRUE);
105 ToolButton3->setFocusPolicy(QWidget::NoFocus); 105 ToolButton3->setFocusPolicy(QWidget::NoFocus);
106 connect(ToolButton3,SIGNAL(clicked()),m_PlayListSelection,SLOT(removeSelected())); 106 connect(ToolButton3,SIGNAL(clicked()),m_PlayListSelection,SLOT(removeSelected()));
107 107
108 ToolButton4->setTextLabel("up"); 108 ToolButton4->setTextLabel("up");
109 ToolButton4->setPixmap(Resource::loadPixmap("up")); 109 ToolButton4->setPixmap(Resource::loadPixmap("up"));
110 ToolButton4->setAutoRaise(TRUE); 110 ToolButton4->setAutoRaise(TRUE);
111 ToolButton4->setFocusPolicy(QWidget::NoFocus); 111 ToolButton4->setFocusPolicy(QWidget::NoFocus);
112 connect(ToolButton4,SIGNAL(clicked()),m_PlayListSelection,SLOT(moveSelectedUp())); 112 connect(ToolButton4,SIGNAL(clicked()),m_PlayListSelection,SLOT(moveSelectedUp()));
113 113
114 ToolButton5->setTextLabel("down"); 114 ToolButton5->setTextLabel("down");
115 ToolButton5->setPixmap(Resource::loadPixmap("down")); 115 ToolButton5->setPixmap(Resource::loadPixmap("down"));
116 ToolButton5->setAutoRaise(TRUE); 116 ToolButton5->setAutoRaise(TRUE);
117 ToolButton5->setFocusPolicy(QWidget::NoFocus); 117 ToolButton5->setFocusPolicy(QWidget::NoFocus);
118 118
119connect(ToolButton5,SIGNAL(clicked()),m_PlayListSelection,SLOT(moveSelectedDown())); 119connect(ToolButton5,SIGNAL(clicked()),m_PlayListSelection,SLOT(moveSelectedDown()));
120 120
121 121
122 122
123 123
124 QListViewItem *current = m_SuggestedCommandList->selectedItem(); 124 QListViewItem *current = m_SuggestedCommandList->selectedItem();
125 if ( current ) 125 if ( current )
126 item->moveItem( current ); 126 item->moveItem( current );
127 m_SuggestedCommandList->setSelected( item, TRUE ); 127 m_SuggestedCommandList->setSelected( item, TRUE );
128 m_SuggestedCommandList->ensureItemVisible( m_SuggestedCommandList->selectedItem() ); 128 m_SuggestedCommandList->ensureItemVisible( m_SuggestedCommandList->selectedItem() );
129 Config cfg("Konsole"); 129 Config cfg("Konsole");
130 cfg.setGroup("Commands"); 130 cfg.setGroup("Commands");
131 if (cfg.readEntry("Commands Set","FALSE") == "TRUE") { 131 if (cfg.readEntry("Commands Set","FALSE") == "TRUE") {
132 for (int i = 0; i < 100; i++) { 132 for (int i = 0; i < 100; i++) {
133 QString tmp; 133 QString tmp;
134 tmp = cfg.readEntry( QString::number(i),""); 134 tmp = cfg.readEntry( QString::number(i),"");
135 if (!tmp.isEmpty()) 135 if (!tmp.isEmpty())
136 m_PlayListSelection->addStringToSelection(tmp); 136 m_PlayListSelection->addStringToSelection(tmp);
137 } 137 }
138 } else { 138 } else {
139 139
140m_PlayListSelection->addStringToSelection("ls "); 140m_PlayListSelection->addStringToSelection("ls ");
141m_PlayListSelection->addStringToSelection("cardctl eject"); 141m_PlayListSelection->addStringToSelection("cardctl eject");
142m_PlayListSelection->addStringToSelection("cat "); 142m_PlayListSelection->addStringToSelection("cat ");
143m_PlayListSelection->addStringToSelection("cd "); 143m_PlayListSelection->addStringToSelection("cd ");
144m_PlayListSelection->addStringToSelection("chmod "); 144m_PlayListSelection->addStringToSelection("chmod ");
145m_PlayListSelection->addStringToSelection("cp "); 145m_PlayListSelection->addStringToSelection("cp ");
146m_PlayListSelection->addStringToSelection("dc "); 146m_PlayListSelection->addStringToSelection("dc ");
147m_PlayListSelection->addStringToSelection("df "); 147m_PlayListSelection->addStringToSelection("df ");
148m_PlayListSelection->addStringToSelection("dmesg"); 148m_PlayListSelection->addStringToSelection("dmesg");
149m_PlayListSelection->addStringToSelection("echo "); 149m_PlayListSelection->addStringToSelection("echo ");
150m_PlayListSelection->addStringToSelection("env"); 150m_PlayListSelection->addStringToSelection("env");
151m_PlayListSelection->addStringToSelection("find "); 151m_PlayListSelection->addStringToSelection("find ");
152m_PlayListSelection->addStringToSelection("free"); 152m_PlayListSelection->addStringToSelection("free");
153m_PlayListSelection->addStringToSelection("grep "); 153m_PlayListSelection->addStringToSelection("grep ");
154m_PlayListSelection->addStringToSelection("ifconfig "); 154m_PlayListSelection->addStringToSelection("ifconfig ");
155m_PlayListSelection->addStringToSelection("ipkg "); 155m_PlayListSelection->addStringToSelection("ipkg ");
156m_PlayListSelection->addStringToSelection("mkdir "); 156m_PlayListSelection->addStringToSelection("mkdir ");
157m_PlayListSelection->addStringToSelection("mv "); 157m_PlayListSelection->addStringToSelection("mv ");
158m_PlayListSelection->addStringToSelection("nc localhost 7776"); 158m_PlayListSelection->addStringToSelection("nc localhost 7776");
159m_PlayListSelection->addStringToSelection("nc localhost 7777"); 159m_PlayListSelection->addStringToSelection("nc localhost 7777");
160m_PlayListSelection->addStringToSelection("nslookup "); 160m_PlayListSelection->addStringToSelection("nslookup ");
161m_PlayListSelection->addStringToSelection("ping "); 161m_PlayListSelection->addStringToSelection("ping ");
162m_PlayListSelection->addStringToSelection("ps aux"); 162m_PlayListSelection->addStringToSelection("ps aux");
163m_PlayListSelection->addStringToSelection("pwd "); 163m_PlayListSelection->addStringToSelection("pwd ");
164m_PlayListSelection->addStringToSelection("rm "); 164m_PlayListSelection->addStringToSelection("rm ");
165m_PlayListSelection->addStringToSelection("rmdir "); 165m_PlayListSelection->addStringToSelection("rmdir ");
166m_PlayListSelection->addStringToSelection("route "); 166m_PlayListSelection->addStringToSelection("route ");
167m_PlayListSelection->addStringToSelection("set "); 167m_PlayListSelection->addStringToSelection("set ");
168m_PlayListSelection->addStringToSelection("traceroute"); 168m_PlayListSelection->addStringToSelection("traceroute");
169 169
170} 170}
171} 171}
172CommandEditDialog::~CommandEditDialog() 172CommandEditDialog::~CommandEditDialog()
173{ 173{
174} 174}
175 175
176void CommandEditDialog::accept() 176void CommandEditDialog::accept()
177{ 177{
178int i = 0; 178int i = 0;
179 Config *cfg = new Config("Konsole"); 179 Config *cfg = new Config("Konsole");
180 cfg->setGroup("Commands"); 180 cfg->setGroup("Commands");
181 cfg->clearGroup(); 181 cfg->clearGroup();
182 182
183 QListViewItemIterator it( m_PlayListSelection ); 183 QListViewItemIterator it( m_PlayListSelection );
184 184
185 for ( ; it.current(); ++it ) { 185 for ( ; it.current(); ++it ) {
186// qDebug(it.current()->text(0)); 186// qDebug(it.current()->text(0));
187 cfg->writeEntry(QString::number(i),it.current()->text(0)); 187 cfg->writeEntry(QString::number(i),it.current()->text(0));
188 i++; 188 i++;
189 189
190 } 190 }
191 cfg->writeEntry("Commands Set","TRUE"); 191 cfg->writeEntry("Commands Set","TRUE");
192// qDebug("CommandEditDialog::accept() - written"); 192// qDebug("CommandEditDialog::accept() - written");
193 delete cfg; 193 delete cfg;
194 emit commandsEdited(); 194 emit commandsEdited();
195 close(); 195 close();
196 196
197 197
198 198
199 199
200 200
201} 201}
202 202
203void CommandEditDialog::showEditDialog() 203void CommandEditDialog::showEditDialog()
204{ 204{
205editCommandBase *d = new editCommandBase(this,"smalleditdialog", TRUE); 205editCommandBase *d = new editCommandBase(this,"smalleditdialog", TRUE);
206d->setCaption("Edit command"); 206d->setCaption("Edit command");
207d->TextLabel->setText("Edit command:"); 207d->TextLabel->setText("Edit command:");
208d->commandEdit->setText(m_PlayListSelection->currentItem()->text(0)); 208d->commandEdit->setText(m_PlayListSelection->currentItem()->text(0));
209int i = d->exec(); 209int i = d->exec();
210if ((i==1) && (!(d->commandEdit->text()).isEmpty())) 210if ((i==1) && (!(d->commandEdit->text()).isEmpty()))
211 m_PlayListSelection->currentItem()->setText(0,(d->commandEdit->text())); 211 m_PlayListSelection->currentItem()->setText(0,(d->commandEdit->text()));
212} 212}
213 213
214void CommandEditDialog::showAddDialog() 214void CommandEditDialog::showAddDialog()
215{ 215{
216 216
217editCommandBase *d = new editCommandBase(this,"smalleditdialog", TRUE); 217editCommandBase *d = new editCommandBase(this,"smalleditdialog", TRUE);
218int i = d->exec(); 218int i = d->exec();
219if ((i==1) && (!(d->commandEdit->text()).isEmpty())) 219if ((i==1) && (!(d->commandEdit->text()).isEmpty()))
220m_PlayListSelection->addStringToSelection(d->commandEdit->text()); 220m_PlayListSelection->addStringToSelection(d->commandEdit->text());
221 221
222} 222}
223 223
224
diff --git a/core/apps/embeddedkonsole/commandeditdialogbase.cpp b/core/apps/embeddedkonsole/commandeditdialogbase.cpp
new file mode 100644
index 0000000..f25edb4
--- a/dev/null
+++ b/core/apps/embeddedkonsole/commandeditdialogbase.cpp
@@ -0,0 +1,101 @@
1/****************************************************************************
2** Form implementation generated from reading ui file 'commandeditdialogbase.ui'
3**
4** Created: Sun Feb 3 15:23:58 2002
5** by: The User Interface Compiler (uic)
6**
7** WARNING! All changes made in this file will be lost!
8****************************************************************************/
9#include "commandeditdialogbase.h"
10
11#include <qheader.h>
12#include <qlabel.h>
13#include <qlistview.h>
14#include <qpushbutton.h>
15#include <qtoolbutton.h>
16#include "playlistselection.h"
17#include <qlayout.h>
18#include <qvariant.h>
19#include <qtooltip.h>
20#include <qwhatsthis.h>
21
22/*
23 * Constructs a CommandEditDialogBase which is a child of 'parent', with the
24 * name 'name' and widget flags set to 'f'
25 *
26 * The dialog will by default be modeless, unless you set 'modal' to
27 * TRUE to construct a modal dialog.
28 */
29CommandEditDialogBase::CommandEditDialogBase( QWidget* parent, const char* name, bool modal, WFlags fl )
30 : QDialog( parent, name, modal, fl )
31{
32 if ( !name )
33 setName( "CommandEditDialogBase" );
34 resize( 196, 414 );
35 setCaption( tr( "Commands" ) );
36 CommandEditDialogBaseLayout = new QGridLayout( this );
37 CommandEditDialogBaseLayout->setSpacing( 6 );
38 CommandEditDialogBaseLayout->setMargin( 11 );
39
40 TextLabel1 = new QLabel( this, "TextLabel1" );
41 TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
42 TextLabel1->setText( tr( "<B>Commands</B>:" ) );
43
44 CommandEditDialogBaseLayout->addWidget( TextLabel1, 0, 0 );
45
46 Layout2 = new QVBoxLayout;
47 Layout2->setSpacing( 6 );
48 Layout2->setMargin( 0 );
49
50 ToolButton1 = new QToolButton( this, "ToolButton1" );
51 ToolButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton1->sizePolicy().hasHeightForWidth() ) );
52 Layout2->addWidget( ToolButton1 );
53
54 ToolButton2 = new QToolButton( this, "ToolButton2" );
55 ToolButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton2->sizePolicy().hasHeightForWidth() ) );
56 Layout2->addWidget( ToolButton2 );
57
58 ToolButton3 = new QToolButton( this, "ToolButton3" );
59 ToolButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton3->sizePolicy().hasHeightForWidth() ) );
60 Layout2->addWidget( ToolButton3 );
61
62 ToolButton4 = new QToolButton( this, "ToolButton4" );
63 ToolButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton4->sizePolicy().hasHeightForWidth() ) );
64 Layout2->addWidget( ToolButton4 );
65
66 ToolButton5 = new QToolButton( this, "ToolButton5" );
67 ToolButton5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton5->sizePolicy().hasHeightForWidth() ) );
68 Layout2->addWidget( ToolButton5 );
69
70 CommandEditDialogBaseLayout->addLayout( Layout2, 1, 2 );
71 QSpacerItem* spacer = new QSpacerItem( 21, 20, QSizePolicy::Fixed, QSizePolicy::Minimum );
72 CommandEditDialogBaseLayout->addItem( spacer, 0, 2 );
73
74 TextLabel1_2 = new QLabel( this, "TextLabel1_2" );
75 TextLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, TextLabel1_2->sizePolicy().hasHeightForWidth() ) );
76 TextLabel1_2->setText( tr( "<B>Suggested Commands</B>:" ) );
77
78 CommandEditDialogBaseLayout->addWidget( TextLabel1_2, 2, 0 );
79
80 m_PlayListSelection = new PlayListSelection( this, "m_PlayListSelection" );
81 m_PlayListSelection->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, m_PlayListSelection->sizePolicy().hasHeightForWidth() ) );
82
83 CommandEditDialogBaseLayout->addMultiCellWidget( m_PlayListSelection, 1, 1, 0, 1 );
84 QSpacerItem* spacer_2 = new QSpacerItem( 20, 30, QSizePolicy::Minimum, QSizePolicy::Fixed );
85 CommandEditDialogBaseLayout->addItem( spacer_2, 2, 1 );
86 QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed );
87 CommandEditDialogBaseLayout->addItem( spacer_3, 2, 2 );
88
89 m_SuggestedCommandList = new QListView( this, "m_SuggestedCommandList" );
90
91 CommandEditDialogBaseLayout->addMultiCellWidget( m_SuggestedCommandList, 3, 3, 0, 1 );
92}
93
94/*
95 * Destroys the object and frees any allocated resources
96 */
97CommandEditDialogBase::~CommandEditDialogBase()
98{
99 // no need to delete child widgets, Qt does it all for us
100}
101
diff --git a/core/apps/embeddedkonsole/commandeditdialogbase.h b/core/apps/embeddedkonsole/commandeditdialogbase.h
new file mode 100644
index 0000000..6a37ec9
--- a/dev/null
+++ b/core/apps/embeddedkonsole/commandeditdialogbase.h
@@ -0,0 +1,46 @@
1/****************************************************************************
2** Form interface generated from reading ui file 'commandeditdialogbase.ui'
3**
4** Created: Sun Feb 3 15:23:28 2002
5** by: The User Interface Compiler (uic)
6**
7** WARNING! All changes made in this file will be lost!
8****************************************************************************/
9#ifndef COMMANDEDITDIALOGBASE_H
10#define COMMANDEDITDIALOGBASE_H
11
12#include <qvariant.h>
13#include <qdialog.h>
14class QVBoxLayout;
15class QHBoxLayout;
16class QGridLayout;
17class PlayListSelection;
18class QLabel;
19class QListView;
20class QListViewItem;
21class QToolButton;
22
23class CommandEditDialogBase : public QDialog
24{
25 Q_OBJECT
26
27public:
28 CommandEditDialogBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
29 ~CommandEditDialogBase();
30
31 QLabel* TextLabel1;
32 QToolButton* ToolButton1;
33 QToolButton* ToolButton2;
34 QToolButton* ToolButton3;
35 QToolButton* ToolButton4;
36 QToolButton* ToolButton5;
37 QLabel* TextLabel1_2;
38 PlayListSelection* m_PlayListSelection;
39 QListView* m_SuggestedCommandList;
40
41protected:
42 QGridLayout* CommandEditDialogBaseLayout;
43 QVBoxLayout* Layout2;
44};
45
46#endif // COMMANDEDITDIALOGBASE_H