summaryrefslogtreecommitdiff
Unidiff
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
@@ -33,4 +33,7 @@ HEADERS = TEWidget.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 \
@@ -42,6 +45,9 @@ SOURCES = TEScreen.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 \
@@ -52,9 +58,17 @@ OBJECTS = TEScreen.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 \
@@ -62,5 +76,10 @@ SRCMOC = moc_TEWidget.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 \
@@ -68,5 +87,10 @@ OBJMOC = moc_TEWidget.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
@@ -148,5 +172,6 @@ TEWidget.o: TEWidget.cpp \
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 \
@@ -201,5 +226,31 @@ konsole.o: konsole.cpp \
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 \
@@ -217,6 +268,23 @@ main.o: main.cpp \
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 \
@@ -265,7 +333,24 @@ moc_konsole.o: moc_konsole.cpp \
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
@@ -283,6 +368,21 @@ moc_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
@@ -542,5 +542,5 @@ void TEWidget::blinkEvent()
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);
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
@@ -222,3 +222,2 @@ m_PlayListSelection->addStringToSelection(d->commandEdit->text());
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