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
@@ -3,100 +3,124 @@
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:
@@ -118,171 +142,247 @@ listallmodules:
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
@@ -512,65 +512,65 @@ HCNT("paintEvent");
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
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
@@ -192,33 +192,32 @@ int i = 0;
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