2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index b3cb208..9b615f1 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -181,103 +181,103 @@ void MainWindow::initUI() {
     */
    m_terminate = new QAction();
    m_terminate->setText( tr("Terminate") );
    m_terminate->addTo( m_console );
    connect(m_terminate, SIGNAL(activated() ),
            this, SLOT(slotTerminate() ) );
    m_closewindow = new QAction();
    m_closewindow->setText( tr("Close Window") );
    m_closewindow->addTo( m_console );
    connect( m_closewindow, SIGNAL(activated() ),
            this, SLOT(slotClose() ) );
    /*
     * script actions
     */
    m_runScript_id = m_scripts->insertItem(tr("Run Script"), m_scriptsPop, -1, 0);
    connect(m_scriptsPop, SIGNAL(activated(int)), this, SLOT(slotRunScript(int)));
    m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0);
    m_recordScript->addTo(m_scripts);
    connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript()));
    m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0);
    m_saveScript->addTo(m_scripts);
    connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript()));
   
         
        
        
    /*
     * action that open/closes the keyboard
     */
    m_openKeys = new QAction (tr("Open Keyboard..."),
                             Resource::loadPixmap( "console/keys/keyboard_icon" ),
                             QString::null, 0, this, 0);
    m_openKeys->setToggleAction(true);
    connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool)));
    /* insert the submenu */
    m_console->insertItem(tr("New from Profile"), m_sessionsPop,
                          -1, 0);
    /* insert the connection menu */
    m_bar->insertItem( tr("Connection"), m_console );
    /* the scripts menu */
-    #ifdef EAST
+#ifdef EAST
-    OConfig cfg("opie-console");
+    Opie::Core::OConfig cfg("opie-console");
        cfg.setGroup("10east");
           if( !cfg.readEntry("scripthide",0) ) {
            m_bar->insertItem( tr("Scripts"), m_scripts );
    }
-        #endif
+#endif
    /* and the keyboard */
    m_keyBar = new QToolBar(this);
    addToolBar( m_keyBar,  "Keyboard", QMainWindow::Top, TRUE );
    m_keyBar->setHorizontalStretchable( TRUE );
    m_keyBar->hide();
    m_kb = new FunctionKeyboard(m_keyBar);
    connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)),
            this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool)));
    a = new QAction(tr("Copy"),
                    Resource::loadPixmap("copy"), QString::null,
                    0, this, 0 );
    //a->addTo( m_icons );
    connect( a, SIGNAL(activated() ),
             this, SLOT(slotCopy() ) );
    QAction *paste = new QAction(tr("Paste"),
                    Resource::loadPixmap("paste"), QString::null,
                    0, this, 0 );
    connect( paste, SIGNAL(activated() ),
             this, SLOT(slotPaste() ) );
    newCon->addTo( m_icons );
    //m_setProfiles->addTo( m_icons );
    paste->addTo( m_icons );
    m_openKeys->addTo(m_icons);
    m_fullscreen->addTo( m_icons );
    m_connect->setEnabled( false );
    m_disconnect->setEnabled( false );
    m_terminate->setEnabled( false );
    m_transfer->setEnabled( false );
    m_scripts->setItemEnabled(m_runScript_id, false);
    m_recordScript->setEnabled( false );
    m_saveScript->setEnabled( false );
    m_fullscreen->setEnabled( false );
    m_closewindow->setEnabled( false );
    m_wrap->setEnabled( false );
    /*
     * connect to the menu activation
     */
    connect( m_sessionsPop, SIGNAL(activated(int) ),
             this, SLOT(slotProfile(int) ) );
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index a7b9d5f..6db9162 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -26,51 +26,51 @@ HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
           dialer.h logger.h \
           terminalwidget.h \
           emulation_handler.h TECommon.h \
           TEHistory.h TEScreen.h TEWidget.h \
           TEmuVt102.h TEmulation.h MyPty.h \
           consoleconfigwidget.h fixit.h \
           comboboxhelper.h
 SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
           file_layer.cpp filetransfer.cpp \
               main.cpp \
           metafactory.cpp \
           session.cpp \
           mainwindow.cpp \
           profile.cpp \
           profileconfig.cpp \
           profilemanager.cpp  \
           tabwidget.cpp \
           configdialog.cpp \
           keytrans.cpp \
           transferdialog.cpp \
           profiledialogwidget.cpp \
           profileeditordialog.cpp \
           iolayerbase.cpp \
           serialconfigwidget.cpp irdaconfigwidget.cpp \
           btconfigwidget.cpp modemconfigwidget.cpp \
           atconfigdialog.cpp dialdialog.cpp \
           default.cpp  procctl.cpp \
               function_keyboard.cpp  \
           receive_layer.cpp filereceive.cpp \
           script.cpp \
           dialer.cpp logger.cpp \
           terminalwidget.cpp \
        emulation_handler.cpp TEHistory.cpp \
        TEScreen.cpp TEWidget.cpp \
        TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
        consoleconfigwidget.cpp fixit.cpp \
        comboboxhelper.cpp
 DESTDIR      = $(OPIEDIR)/bin/
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil
 TARGET       = opie-console
 DEFINES += HAVE_OPENPTY
-DEFINES += EAST FSCKED_DISTRI 
+#DEFINES += EAST FSCKED_DISTRI 
 include ( $(OPIEDIR)/include.pro )

diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index b3cb208..9b615f1 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -181,103 +181,103 @@ void MainWindow::initUI() {
181	*/	181	*/
182	m_terminate = new QAction();	182	m_terminate = new QAction();
183	m_terminate->setText( tr("Terminate") );	183	m_terminate->setText( tr("Terminate") );
184	m_terminate->addTo( m_console );	184	m_terminate->addTo( m_console );
185	connect(m_terminate, SIGNAL(activated() ),	185	connect(m_terminate, SIGNAL(activated() ),
186	this, SLOT(slotTerminate() ) );	186	this, SLOT(slotTerminate() ) );
187		187
188	m_closewindow = new QAction();	188	m_closewindow = new QAction();
189	m_closewindow->setText( tr("Close Window") );	189	m_closewindow->setText( tr("Close Window") );
190	m_closewindow->addTo( m_console );	190	m_closewindow->addTo( m_console );
191	connect( m_closewindow, SIGNAL(activated() ),	191	connect( m_closewindow, SIGNAL(activated() ),
192	this, SLOT(slotClose() ) );	192	this, SLOT(slotClose() ) );
193		193
194		194
195	/*	195	/*
196	* script actions	196	* script actions
197	*/	197	*/
198	m_runScript_id = m_scripts->insertItem(tr("Run Script"), m_scriptsPop, -1, 0);	198	m_runScript_id = m_scripts->insertItem(tr("Run Script"), m_scriptsPop, -1, 0);
199	connect(m_scriptsPop, SIGNAL(activated(int)), this, SLOT(slotRunScript(int)));	199	connect(m_scriptsPop, SIGNAL(activated(int)), this, SLOT(slotRunScript(int)));
200		200
201	m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0);	201	m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0);
202	m_recordScript->addTo(m_scripts);	202	m_recordScript->addTo(m_scripts);
203	connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript()));	203	connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript()));
204		204
205	m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0);	205	m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0);
206	m_saveScript->addTo(m_scripts);	206	m_saveScript->addTo(m_scripts);
207	connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript()));	207	connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript()));
208		208
209		209
210		210
211		211
212	/*	212	/*
213	* action that open/closes the keyboard	213	* action that open/closes the keyboard
214	*/	214	*/
215	m_openKeys = new QAction (tr("Open Keyboard..."),	215	m_openKeys = new QAction (tr("Open Keyboard..."),
216	Resource::loadPixmap( "console/keys/keyboard_icon" ),	216	Resource::loadPixmap( "console/keys/keyboard_icon" ),
217	QString::null, 0, this, 0);	217	QString::null, 0, this, 0);
218	m_openKeys->setToggleAction(true);	218	m_openKeys->setToggleAction(true);
219	connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool)));	219	connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool)));
220		220
221	/* insert the submenu */	221	/* insert the submenu */
222	m_console->insertItem(tr("New from Profile"), m_sessionsPop,	222	m_console->insertItem(tr("New from Profile"), m_sessionsPop,
223	-1, 0);	223	-1, 0);
224		224
225	/* insert the connection menu */	225	/* insert the connection menu */
226	m_bar->insertItem( tr("Connection"), m_console );	226	m_bar->insertItem( tr("Connection"), m_console );
227		227
228	/* the scripts menu */	228	/* the scripts menu */
229	#ifdef EAST	229	#ifdef EAST
230	OConfig cfg("opie-console");	230	Opie::Core::OConfig cfg("opie-console");
231	cfg.setGroup("10east");	231	cfg.setGroup("10east");
232	if( !cfg.readEntry("scripthide",0) ) {	232	if( !cfg.readEntry("scripthide",0) ) {
233	m_bar->insertItem( tr("Scripts"), m_scripts );	233	m_bar->insertItem( tr("Scripts"), m_scripts );
234	}	234	}
235	#endif	235	#endif
236		236
237	/* and the keyboard */	237	/* and the keyboard */
238	m_keyBar = new QToolBar(this);	238	m_keyBar = new QToolBar(this);
239	addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE );	239	addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE );
240	m_keyBar->setHorizontalStretchable( TRUE );	240	m_keyBar->setHorizontalStretchable( TRUE );
241	m_keyBar->hide();	241	m_keyBar->hide();
242		242
243	m_kb = new FunctionKeyboard(m_keyBar);	243	m_kb = new FunctionKeyboard(m_keyBar);
244	connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)),	244	connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)),
245	this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool)));	245	this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool)));
246		246
247		247
248	a = new QAction(tr("Copy"),	248	a = new QAction(tr("Copy"),
249	Resource::loadPixmap("copy"), QString::null,	249	Resource::loadPixmap("copy"), QString::null,
250	0, this, 0 );	250	0, this, 0 );
251	//a->addTo( m_icons );	251	//a->addTo( m_icons );
252	connect( a, SIGNAL(activated() ),	252	connect( a, SIGNAL(activated() ),
253	this, SLOT(slotCopy() ) );	253	this, SLOT(slotCopy() ) );
254		254
255	QAction *paste = new QAction(tr("Paste"),	255	QAction *paste = new QAction(tr("Paste"),
256	Resource::loadPixmap("paste"), QString::null,	256	Resource::loadPixmap("paste"), QString::null,
257	0, this, 0 );	257	0, this, 0 );
258	connect( paste, SIGNAL(activated() ),	258	connect( paste, SIGNAL(activated() ),
259	this, SLOT(slotPaste() ) );	259	this, SLOT(slotPaste() ) );
260		260
261		261
262	newCon->addTo( m_icons );	262	newCon->addTo( m_icons );
263	//m_setProfiles->addTo( m_icons );	263	//m_setProfiles->addTo( m_icons );
264	paste->addTo( m_icons );	264	paste->addTo( m_icons );
265	m_openKeys->addTo(m_icons);	265	m_openKeys->addTo(m_icons);
266	m_fullscreen->addTo( m_icons );	266	m_fullscreen->addTo( m_icons );
267		267
268	m_connect->setEnabled( false );	268	m_connect->setEnabled( false );
269	m_disconnect->setEnabled( false );	269	m_disconnect->setEnabled( false );
270	m_terminate->setEnabled( false );	270	m_terminate->setEnabled( false );
271	m_transfer->setEnabled( false );	271	m_transfer->setEnabled( false );
272	m_scripts->setItemEnabled(m_runScript_id, false);	272	m_scripts->setItemEnabled(m_runScript_id, false);
273	m_recordScript->setEnabled( false );	273	m_recordScript->setEnabled( false );
274	m_saveScript->setEnabled( false );	274	m_saveScript->setEnabled( false );
275	m_fullscreen->setEnabled( false );	275	m_fullscreen->setEnabled( false );
276	m_closewindow->setEnabled( false );	276	m_closewindow->setEnabled( false );
277	m_wrap->setEnabled( false );	277	m_wrap->setEnabled( false );
278		278
279	/*	279	/*
280	* connect to the menu activation	280	* connect to the menu activation
281	*/	281	*/
282	connect( m_sessionsPop, SIGNAL(activated(int) ),	282	connect( m_sessionsPop, SIGNAL(activated(int) ),
283	this, SLOT(slotProfile(int) ) );	283	this, SLOT(slotProfile(int) ) );


diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro index a7b9d5f..6db9162 100644 --- a/noncore/apps/opie-console/opie-console.pro +++ b/noncore/apps/opie-console/opie-console.pro
@@ -26,51 +26,51 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
26	dialer.h logger.h \	26	dialer.h logger.h \
27	terminalwidget.h \	27	terminalwidget.h \
28	emulation_handler.h TECommon.h \	28	emulation_handler.h TECommon.h \
29	TEHistory.h TEScreen.h TEWidget.h \	29	TEHistory.h TEScreen.h TEWidget.h \
30	TEmuVt102.h TEmulation.h MyPty.h \	30	TEmuVt102.h TEmulation.h MyPty.h \
31	consoleconfigwidget.h fixit.h \	31	consoleconfigwidget.h fixit.h \
32	comboboxhelper.h	32	comboboxhelper.h
33		33
34	SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \	34	SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
35	file_layer.cpp filetransfer.cpp \	35	file_layer.cpp filetransfer.cpp \
36	main.cpp \	36	main.cpp \
37	metafactory.cpp \	37	metafactory.cpp \
38	session.cpp \	38	session.cpp \
39	mainwindow.cpp \	39	mainwindow.cpp \
40	profile.cpp \	40	profile.cpp \
41	profileconfig.cpp \	41	profileconfig.cpp \
42	profilemanager.cpp \	42	profilemanager.cpp \
43	tabwidget.cpp \	43	tabwidget.cpp \
44	configdialog.cpp \	44	configdialog.cpp \
45	keytrans.cpp \	45	keytrans.cpp \
46	transferdialog.cpp \	46	transferdialog.cpp \
47	profiledialogwidget.cpp \	47	profiledialogwidget.cpp \
48	profileeditordialog.cpp \	48	profileeditordialog.cpp \
49	iolayerbase.cpp \	49	iolayerbase.cpp \
50	serialconfigwidget.cpp irdaconfigwidget.cpp \	50	serialconfigwidget.cpp irdaconfigwidget.cpp \
51	btconfigwidget.cpp modemconfigwidget.cpp \	51	btconfigwidget.cpp modemconfigwidget.cpp \
52	atconfigdialog.cpp dialdialog.cpp \	52	atconfigdialog.cpp dialdialog.cpp \
53	default.cpp procctl.cpp \	53	default.cpp procctl.cpp \
54	function_keyboard.cpp \	54	function_keyboard.cpp \
55	receive_layer.cpp filereceive.cpp \	55	receive_layer.cpp filereceive.cpp \
56	script.cpp \	56	script.cpp \
57	dialer.cpp logger.cpp \	57	dialer.cpp logger.cpp \
58	terminalwidget.cpp \	58	terminalwidget.cpp \
59	emulation_handler.cpp TEHistory.cpp \	59	emulation_handler.cpp TEHistory.cpp \
60	TEScreen.cpp TEWidget.cpp \	60	TEScreen.cpp TEWidget.cpp \
61	TEmuVt102.cpp TEmulation.cpp MyPty.cpp \	61	TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
62	consoleconfigwidget.cpp fixit.cpp \	62	consoleconfigwidget.cpp fixit.cpp \
63	comboboxhelper.cpp	63	comboboxhelper.cpp
64		64
65		65
66	DESTDIR = $(OPIEDIR)/bin/	66	DESTDIR = $(OPIEDIR)/bin/
67	INTERFACES = configurebase.ui editbase.ui	67	INTERFACES = configurebase.ui editbase.ui
68	INCLUDEPATH += $(OPIEDIR)/include	68	INCLUDEPATH += $(OPIEDIR)/include
69	DEPENDPATH += $(OPIEDIR)/include	69	DEPENDPATH += $(OPIEDIR)/include
70	LIBS += -lqpe -lopiecore2 -lopieui2 -lutil	70	LIBS += -lqpe -lopiecore2 -lopieui2 -lutil
71	TARGET = opie-console	71	TARGET = opie-console
72		72
73	DEFINES += HAVE_OPENPTY	73	DEFINES += HAVE_OPENPTY
74	DEFINES += EAST FSCKED_DISTRI	74	#DEFINES += EAST FSCKED_DISTRI
75		75
76	include ( $(OPIEDIR)/include.pro )	76	include ( $(OPIEDIR)/include.pro )