summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -31,8 +31,11 @@ HEADERS = TEWidget.h \
TEmuVt102.h \
session.h \
keytrans.h \
konsole.h \
+ commandeditdialog.h \
+ commandeditwidget.h \
+ playlistselection.h \
MyPty.h
SOURCES = TEScreen.cpp \
TEWidget.cpp \
TEHistory.cpp \
@@ -40,35 +43,56 @@ SOURCES = TEScreen.cpp \
TEmuVt102.cpp \
session.cpp \
keytrans.cpp \
konsole.cpp \
- main.cpp \
- MyPty.cpp
+ commandeditdialog.cpp \
+ commandeditwidget.cpp \
+ playlistselection.cpp \
+ MyPty.cpp \
+ main.cpp
OBJECTS = TEScreen.o \
TEWidget.o \
TEHistory.o \
TEmulation.o \
TEmuVt102.o \
session.o \
keytrans.o \
konsole.o \
+ commandeditdialog.o \
+ commandeditwidget.o \
+ playlistselection.o \
+ MyPty.o \
main.o \
- MyPty.o
-INTERFACES =
-UICDECLS =
-UICIMPLS =
+ commandeditdialogbase.o \
+ smallcommandeditdialogbase.o
+INTERFACES = commandeditdialogbase.ui \
+ smallcommandeditdialogbase.ui
+UICDECLS = commandeditdialogbase.h \
+ smallcommandeditdialogbase.h
+UICIMPLS = commandeditdialogbase.cpp \
+ smallcommandeditdialogbase.cpp
SRCMOC = moc_TEWidget.cpp \
moc_TEmulation.cpp \
moc_TEmuVt102.cpp \
moc_session.cpp \
moc_konsole.cpp \
- moc_MyPty.cpp
+ moc_commandeditdialog.cpp \
+ moc_commandeditwidget.cpp \
+ moc_playlistselection.cpp \
+ moc_MyPty.cpp \
+ moc_commandeditdialogbase.cpp \
+ moc_smallcommandeditdialogbase.cpp
OBJMOC = moc_TEWidget.o \
moc_TEmulation.o \
moc_TEmuVt102.o \
moc_session.o \
moc_konsole.o \
- moc_MyPty.o
+ moc_commandeditdialog.o \
+ moc_commandeditwidget.o \
+ moc_playlistselection.o \
+ moc_MyPty.o \
+ moc_commandeditdialogbase.o \
+ moc_smallcommandeditdialogbase.o
####### Implicit rules
@@ -146,9 +170,10 @@ TEWidget.o: TEWidget.cpp \
TEmuVt102.h \
TEScreen.h \
TEHistory.h \
TEmulation.h \
- keytrans.h
+ keytrans.h \
+ $(OPIEDIR)/include/qpe/config.h
TEHistory.o: TEHistory.cpp \
TEHistory.h \
TECommon.h
@@ -199,9 +224,35 @@ konsole.o: konsole.cpp \
TEScreen.h \
TEHistory.h \
TEmulation.h \
keytrans.h \
- session.h
+ session.h \
+ commandeditdialog.h \
+ commandeditdialogbase.h
+
+commandeditdialog.o: commandeditdialog.cpp \
+ commandeditdialog.h \
+ commandeditdialogbase.h \
+ playlistselection.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ smallcommandeditdialogbase.h
+
+commandeditwidget.o: commandeditwidget.cpp \
+ commandeditwidget.h \
+ playlistselection.h \
+ $(OPIEDIR)/include/qpe/applnk.h
+
+playlistselection.o: playlistselection.cpp \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ playlistselection.h
+
+MyPty.o: MyPty.cpp \
+ MyPty.h
main.o: main.cpp \
konsole.h \
$(OPIEDIR)/include/qpe/qpetoolbar.h \
@@ -215,10 +266,27 @@ main.o: main.cpp \
keytrans.h \
session.h \
$(OPIEDIR)/include/qpe/qpeapplication.h
-MyPty.o: MyPty.cpp \
- MyPty.h
+commandeditdialogbase.h: commandeditdialogbase.ui
+ $(UIC) commandeditdialogbase.ui -o $(INTERFACE_DECL_PATH)/commandeditdialogbase.h
+
+commandeditdialogbase.cpp: commandeditdialogbase.ui
+ $(UIC) commandeditdialogbase.ui -i commandeditdialogbase.h -o commandeditdialogbase.cpp
+
+smallcommandeditdialogbase.h: smallcommandeditdialogbase.ui
+ $(UIC) smallcommandeditdialogbase.ui -o $(INTERFACE_DECL_PATH)/smallcommandeditdialogbase.h
+
+smallcommandeditdialogbase.cpp: smallcommandeditdialogbase.ui
+ $(UIC) smallcommandeditdialogbase.ui -i smallcommandeditdialogbase.h -o smallcommandeditdialogbase.cpp
+
+commandeditdialogbase.o: commandeditdialogbase.cpp \
+ commandeditdialogbase.h \
+ playlistselection.h \
+ $(OPIEDIR)/include/qpe/applnk.h
+
+smallcommandeditdialogbase.o: smallcommandeditdialogbase.cpp \
+ smallcommandeditdialogbase.h
moc_TEWidget.o: moc_TEWidget.cpp \
TEWidget.h \
TECommon.h
@@ -263,11 +331,28 @@ moc_konsole.o: moc_konsole.cpp \
TEmulation.h \
keytrans.h \
session.h
+moc_commandeditdialog.o: moc_commandeditdialog.cpp \
+ commandeditdialog.h \
+ commandeditdialogbase.h
+
+moc_commandeditwidget.o: moc_commandeditwidget.cpp \
+ commandeditwidget.h
+
+moc_playlistselection.o: moc_playlistselection.cpp \
+ playlistselection.h \
+ $(OPIEDIR)/include/qpe/applnk.h
+
moc_MyPty.o: moc_MyPty.cpp \
MyPty.h
+moc_commandeditdialogbase.o: moc_commandeditdialogbase.cpp \
+ commandeditdialogbase.h
+
+moc_smallcommandeditdialogbase.o: moc_smallcommandeditdialogbase.cpp \
+ smallcommandeditdialogbase.h
+
moc_TEWidget.cpp: TEWidget.h
$(MOC) TEWidget.h -o moc_TEWidget.cpp
moc_TEmulation.cpp: TEmulation.h
@@ -281,8 +366,23 @@ moc_session.cpp: session.h
moc_konsole.cpp: konsole.h
$(MOC) konsole.h -o moc_konsole.cpp
+moc_commandeditdialog.cpp: commandeditdialog.h
+ $(MOC) commandeditdialog.h -o moc_commandeditdialog.cpp
+
+moc_commandeditwidget.cpp: commandeditwidget.h
+ $(MOC) commandeditwidget.h -o moc_commandeditwidget.cpp
+
+moc_playlistselection.cpp: playlistselection.h
+ $(MOC) playlistselection.h -o moc_playlistselection.cpp
+
moc_MyPty.cpp: MyPty.h
$(MOC) MyPty.h -o moc_MyPty.cpp
+moc_commandeditdialogbase.cpp: commandeditdialogbase.h
+ $(MOC) commandeditdialogbase.h -o moc_commandeditdialogbase.cpp
+
+moc_smallcommandeditdialogbase.cpp: smallcommandeditdialogbase.h
+ $(MOC) smallcommandeditdialogbase.h -o moc_smallcommandeditdialogbase.cpp
+
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
@@ -540,9 +540,9 @@ void TEWidget::blinkEvent()
/* ------------------------------------------------------------------------- */
void TEWidget::resizeEvent(QResizeEvent* ev)
{
- //printf("resize: %d,%d\n",ev->size().width(),ev->size().height());
+// printf("resize: %d,%d\n",ev->size().width(),ev->size().height());
//printf("approx: %d,%d\n",ev->size().width()/font_w,ev->size().height()/font_h);
//printf("leaves: %d,%d\n",ev->size().width()%font_w,ev->size().height()%font_h);
//printf("curren: %d,%d\n",width(),height());
HCNT("resizeEvent");
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
@@ -220,5 +220,4 @@ if ((i==1) && (!(d->commandEdit->text()).isEmpty()))
m_PlayListSelection->addStringToSelection(d->commandEdit->text());
}
-
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 @@
+/****************************************************************************
+** Form implementation generated from reading ui file 'commandeditdialogbase.ui'
+**
+** Created: Sun Feb 3 15:23:58 2002
+** by: The User Interface Compiler (uic)
+**
+** WARNING! All changes made in this file will be lost!
+****************************************************************************/
+#include "commandeditdialogbase.h"
+
+#include <qheader.h>
+#include <qlabel.h>
+#include <qlistview.h>
+#include <qpushbutton.h>
+#include <qtoolbutton.h>
+#include "playlistselection.h"
+#include <qlayout.h>
+#include <qvariant.h>
+#include <qtooltip.h>
+#include <qwhatsthis.h>
+
+/*
+ * Constructs a CommandEditDialogBase which is a child of 'parent', with the
+ * name 'name' and widget flags set to 'f'
+ *
+ * The dialog will by default be modeless, unless you set 'modal' to
+ * TRUE to construct a modal dialog.
+ */
+CommandEditDialogBase::CommandEditDialogBase( QWidget* parent, const char* name, bool modal, WFlags fl )
+ : QDialog( parent, name, modal, fl )
+{
+ if ( !name )
+ setName( "CommandEditDialogBase" );
+ resize( 196, 414 );
+ setCaption( tr( "Commands" ) );
+ CommandEditDialogBaseLayout = new QGridLayout( this );
+ CommandEditDialogBaseLayout->setSpacing( 6 );
+ CommandEditDialogBaseLayout->setMargin( 11 );
+
+ TextLabel1 = new QLabel( this, "TextLabel1" );
+ TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
+ TextLabel1->setText( tr( "<B>Commands</B>:" ) );
+
+ CommandEditDialogBaseLayout->addWidget( TextLabel1, 0, 0 );
+
+ Layout2 = new QVBoxLayout;
+ Layout2->setSpacing( 6 );
+ Layout2->setMargin( 0 );
+
+ ToolButton1 = new QToolButton( this, "ToolButton1" );
+ ToolButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton1->sizePolicy().hasHeightForWidth() ) );
+ Layout2->addWidget( ToolButton1 );
+
+ ToolButton2 = new QToolButton( this, "ToolButton2" );
+ ToolButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton2->sizePolicy().hasHeightForWidth() ) );
+ Layout2->addWidget( ToolButton2 );
+
+ ToolButton3 = new QToolButton( this, "ToolButton3" );
+ ToolButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton3->sizePolicy().hasHeightForWidth() ) );
+ Layout2->addWidget( ToolButton3 );
+
+ ToolButton4 = new QToolButton( this, "ToolButton4" );
+ ToolButton4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton4->sizePolicy().hasHeightForWidth() ) );
+ Layout2->addWidget( ToolButton4 );
+
+ ToolButton5 = new QToolButton( this, "ToolButton5" );
+ ToolButton5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ToolButton5->sizePolicy().hasHeightForWidth() ) );
+ Layout2->addWidget( ToolButton5 );
+
+ CommandEditDialogBaseLayout->addLayout( Layout2, 1, 2 );
+ QSpacerItem* spacer = new QSpacerItem( 21, 20, QSizePolicy::Fixed, QSizePolicy::Minimum );
+ CommandEditDialogBaseLayout->addItem( spacer, 0, 2 );
+
+ TextLabel1_2 = new QLabel( this, "TextLabel1_2" );
+ TextLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, TextLabel1_2->sizePolicy().hasHeightForWidth() ) );
+ TextLabel1_2->setText( tr( "<B>Suggested Commands</B>:" ) );
+
+ CommandEditDialogBaseLayout->addWidget( TextLabel1_2, 2, 0 );
+
+ m_PlayListSelection = new PlayListSelection( this, "m_PlayListSelection" );
+ m_PlayListSelection->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, m_PlayListSelection->sizePolicy().hasHeightForWidth() ) );
+
+ CommandEditDialogBaseLayout->addMultiCellWidget( m_PlayListSelection, 1, 1, 0, 1 );
+ QSpacerItem* spacer_2 = new QSpacerItem( 20, 30, QSizePolicy::Minimum, QSizePolicy::Fixed );
+ CommandEditDialogBaseLayout->addItem( spacer_2, 2, 1 );
+ QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed );
+ CommandEditDialogBaseLayout->addItem( spacer_3, 2, 2 );
+
+ m_SuggestedCommandList = new QListView( this, "m_SuggestedCommandList" );
+
+ CommandEditDialogBaseLayout->addMultiCellWidget( m_SuggestedCommandList, 3, 3, 0, 1 );
+}
+
+/*
+ * Destroys the object and frees any allocated resources
+ */
+CommandEditDialogBase::~CommandEditDialogBase()
+{
+ // no need to delete child widgets, Qt does it all for us
+}
+
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 @@
+/****************************************************************************
+** Form interface generated from reading ui file 'commandeditdialogbase.ui'
+**
+** Created: Sun Feb 3 15:23:28 2002
+** by: The User Interface Compiler (uic)
+**
+** WARNING! All changes made in this file will be lost!
+****************************************************************************/
+#ifndef COMMANDEDITDIALOGBASE_H
+#define COMMANDEDITDIALOGBASE_H
+
+#include <qvariant.h>
+#include <qdialog.h>
+class QVBoxLayout;
+class QHBoxLayout;
+class QGridLayout;
+class PlayListSelection;
+class QLabel;
+class QListView;
+class QListViewItem;
+class QToolButton;
+
+class CommandEditDialogBase : public QDialog
+{
+ Q_OBJECT
+
+public:
+ CommandEditDialogBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ ~CommandEditDialogBase();
+
+ QLabel* TextLabel1;
+ QToolButton* ToolButton1;
+ QToolButton* ToolButton2;
+ QToolButton* ToolButton3;
+ QToolButton* ToolButton4;
+ QToolButton* ToolButton5;
+ QLabel* TextLabel1_2;
+ PlayListSelection* m_PlayListSelection;
+ QListView* m_SuggestedCommandList;
+
+protected:
+ QGridLayout* CommandEditDialogBaseLayout;
+ QVBoxLayout* Layout2;
+};
+
+#endif // COMMANDEDITDIALOGBASE_H