-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/opie-console.pro | 2 |
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 | |||
@@ -205,55 +205,55 @@ void MainWindow::initUI() { | |||
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() ) ); |
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 | |||
@@ -50,27 +50,27 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.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 ) |