Diffstat (limited to 'noncore/apps/opie-console/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index eaa78c8..45a662c 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -10,12 +10,13 @@ | |||
10 | #include "emulation_handler.h" | 10 | #include "emulation_handler.h" |
11 | #include "script.h" | 11 | #include "script.h" |
12 | #include "fixit.h" | 12 | #include "fixit.h" |
13 | 13 | ||
14 | /* OPIE */ | 14 | /* OPIE */ |
15 | #include <opie2/ofiledialog.h> | 15 | #include <opie2/ofiledialog.h> |
16 | #include <opie2/oresource.h> | ||
16 | #include <qpe/filemanager.h> | 17 | #include <qpe/filemanager.h> |
17 | using namespace Opie::Ui; | 18 | using namespace Opie::Ui; |
18 | 19 | ||
19 | /* QT */ | 20 | /* QT */ |
20 | #include <qaction.h> | 21 | #include <qaction.h> |
21 | #include <qmenubar.h> | 22 | #include <qmenubar.h> |
@@ -73,92 +74,95 @@ void MainWindow::initUI() { | |||
73 | m_icons = new QToolBar(this); | 74 | m_icons = new QToolBar(this); |
74 | 75 | ||
75 | /* | 76 | /* |
76 | * the settings action | 77 | * the settings action |
77 | */ | 78 | */ |
78 | m_setProfiles = new QAction(tr("Configure Profiles"), | 79 | m_setProfiles = new QAction(tr("Configure Profiles"), |
79 | Resource::loadPixmap( "SettingsIcon" ), | 80 | Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), |
80 | QString::null, 0, this, 0); | 81 | QString::null, 0, this, 0); |
81 | m_setProfiles->addTo( m_console ); | 82 | m_setProfiles->addTo( m_console ); |
82 | connect( m_setProfiles, SIGNAL(activated() ), | 83 | connect( m_setProfiles, SIGNAL(activated() ), |
83 | this, SLOT(slotConfigure() ) ); | 84 | this, SLOT(slotConfigure() ) ); |
84 | 85 | ||
85 | m_console->insertSeparator(); | 86 | m_console->insertSeparator(); |
86 | /* | 87 | /* |
87 | * new Action for new sessions | 88 | * new Action for new sessions |
88 | */ | 89 | */ |
89 | QAction* newCon = new QAction(tr("New Profile"), | 90 | QAction* newCon = new QAction(tr("New Profile"), |
90 | Resource::loadPixmap( "new" ), | 91 | Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), |
91 | QString::null, 0, this, 0); | 92 | QString::null, 0, this, 0); |
92 | newCon->addTo( m_console ); | 93 | newCon->addTo( m_console ); |
93 | connect( newCon, SIGNAL(activated() ), | 94 | connect( newCon, SIGNAL(activated() ), |
94 | this, SLOT(slotNew() ) ); | 95 | this, SLOT(slotNew() ) ); |
95 | 96 | ||
96 | m_console->insertSeparator(); | 97 | m_console->insertSeparator(); |
97 | 98 | ||
98 | QAction *saveCon = new QAction( tr("Save Profile" ), | 99 | QAction *saveCon = new QAction( tr("Save Profile" ), |
99 | Resource::loadPixmap( "save" ), QString::null, | 100 | Opie::Core::OResource::loadPixmap( "save", Opie::Core::OResource::SmallIcon ), QString::null, |
100 | 0, this, 0 ); | 101 | 0, this, 0 ); |
101 | saveCon->addTo( m_console ); | 102 | saveCon->addTo( m_console ); |
102 | connect( saveCon, SIGNAL(activated() ), | 103 | connect( saveCon, SIGNAL(activated() ), |
103 | this, SLOT(slotSaveSession() ) ); | 104 | this, SLOT(slotSaveSession() ) ); |
104 | m_console->insertSeparator(); | 105 | m_console->insertSeparator(); |
105 | 106 | ||
106 | /* | 107 | /* |
107 | * connect action | 108 | * connect action |
108 | */ | 109 | */ |
109 | m_connect = new QAction( tr("Connect"), Resource::loadPixmap("console/connected"), | 110 | m_connect = new QAction( tr("Connect"), Opie::Core::OResource::loadPixmap("console/connected", |
110 | QString::null, 0, this, 0 ); | 111 | Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); |
111 | m_connect->addTo( m_console ); | 112 | m_connect->addTo( m_console ); |
112 | connect(m_connect, SIGNAL(activated() ), | 113 | connect(m_connect, SIGNAL(activated() ), |
113 | this, SLOT(slotConnect() ) ); | 114 | this, SLOT(slotConnect() ) ); |
114 | 115 | ||
115 | /* | 116 | /* |
116 | * disconnect action | 117 | * disconnect action |
117 | */ | 118 | */ |
118 | m_disconnect = new QAction( tr("Disconnect"), Resource::loadPixmap("console/notconnected"), | 119 | m_disconnect = new QAction( tr("Disconnect"), Opie::Core::OResource::loadPixmap("console/notconnected", |
119 | QString::null, 0, this, 0 ); | 120 | Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); |
120 | m_disconnect->addTo( m_console ); | 121 | m_disconnect->addTo( m_console ); |
121 | connect(m_disconnect, SIGNAL(activated() ), | 122 | connect(m_disconnect, SIGNAL(activated() ), |
122 | this, SLOT(slotDisconnect() ) ); | 123 | this, SLOT(slotDisconnect() ) ); |
123 | 124 | ||
124 | m_console->insertSeparator(); | 125 | m_console->insertSeparator(); |
125 | 126 | ||
126 | #ifndef EAST | 127 | #ifndef EAST |
127 | m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 ); | 128 | m_quickLaunch = new QAction( tr("QuickLaunch"), |
129 | Opie::Core::OResource::loadPixmap("console/konsole_mini", Opie::Core::OResource::SmallIcon ), | ||
130 | QString::null, 0, this, 0 ); | ||
128 | m_quickLaunch->addTo( m_icons ); | 131 | m_quickLaunch->addTo( m_icons ); |
129 | connect( m_quickLaunch, SIGNAL( activated() ), | 132 | connect( m_quickLaunch, SIGNAL( activated() ), |
130 | this, SLOT( slotQuickLaunch() ) ); | 133 | this, SLOT( slotQuickLaunch() ) ); |
131 | #endif | 134 | #endif |
132 | 135 | ||
133 | QWhatsThis::add( m_icons, tr( "The shell button launches the \"default\" profile. If there is none default values are taken" ) ); | 136 | QWhatsThis::add( m_icons, tr( "The shell button launches the \"default\" profile. If there is none default values are taken" ) ); |
134 | 137 | ||
135 | m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null, | 138 | m_transfer = new QAction( tr("Transfer file..."), Opie::Core::OResource::loadPixmap("pass", Opie::Core::OResource::SmallIcon ), |
136 | 0, this, 0 ); | 139 | QString::null, 0, this, 0 ); |
137 | m_transfer->addTo( m_console ); | 140 | m_transfer->addTo( m_console ); |
138 | connect(m_transfer, SIGNAL(activated() ), | 141 | connect(m_transfer, SIGNAL(activated() ), |
139 | this, SLOT(slotTransfer() ) ); | 142 | this, SLOT(slotTransfer() ) ); |
140 | 143 | ||
141 | 144 | ||
142 | 145 | ||
143 | /* | 146 | /* |
144 | * immediate change of line wrap policy | 147 | * immediate change of line wrap policy |
145 | */ | 148 | */ |
146 | m_isWrapped = true; | 149 | m_isWrapped = true; |
147 | m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0, true ); | 150 | m_wrap = new QAction( tr("Line wrap"), Opie::Core::OResource::loadPixmap( "linewrap", Opie::Core::OResource::SmallIcon ), |
151 | QString::null, 0, this, 0, true ); | ||
148 | m_wrap->addTo( m_console ); | 152 | m_wrap->addTo( m_console ); |
149 | m_wrap->setOn( true ); | 153 | m_wrap->setOn( true ); |
150 | connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) ); | 154 | connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) ); |
151 | 155 | ||
152 | /* | 156 | /* |
153 | * fullscreen | 157 | * fullscreen |
154 | */ | 158 | */ |
155 | m_isFullscreen = false; | 159 | m_isFullscreen = false; |
156 | 160 | ||
157 | m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) | 161 | m_fullscreen = new QAction( tr("Full screen"), Opie::Core::OResource::loadPixmap( "fullscreen", |
158 | , QString::null, 0, this, 0 ); | 162 | Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); |
159 | m_fullscreen->addTo( m_console ); | 163 | m_fullscreen->addTo( m_console ); |
160 | connect( m_fullscreen, SIGNAL( activated() ), | 164 | connect( m_fullscreen, SIGNAL( activated() ), |
161 | this, SLOT( slotFullscreen() ) ); | 165 | this, SLOT( slotFullscreen() ) ); |
162 | 166 | ||
163 | m_console->insertSeparator(); | 167 | m_console->insertSeparator(); |
164 | 168 | ||
@@ -208,13 +212,13 @@ void MainWindow::initUI() { | |||
208 | 212 | ||
209 | 213 | ||
210 | /* | 214 | /* |
211 | * action that open/closes the keyboard | 215 | * action that open/closes the keyboard |
212 | */ | 216 | */ |
213 | m_openKeys = new QAction (tr("Open Keyboard..."), | 217 | m_openKeys = new QAction (tr("Open Keyboard..."), |
214 | Resource::loadPixmap( "console/keys/keyboard_icon" ), | 218 | Opie::Core::OResource::loadPixmap( "console/keys/keyboard_icon", Opie::Core::OResource::SmallIcon ), |
215 | QString::null, 0, this, 0); | 219 | QString::null, 0, this, 0); |
216 | m_openKeys->setToggleAction(true); | 220 | m_openKeys->setToggleAction(true); |
217 | connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); | 221 | connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); |
218 | 222 | ||
219 | /* insert the submenu */ | 223 | /* insert the submenu */ |
220 | m_console->insertItem(tr("New from Profile"), m_sessionsPop, | 224 | m_console->insertItem(tr("New from Profile"), m_sessionsPop, |
@@ -241,20 +245,20 @@ void MainWindow::initUI() { | |||
241 | m_kb = new FunctionKeyboard(m_keyBar); | 245 | m_kb = new FunctionKeyboard(m_keyBar); |
242 | connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)), | 246 | connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)), |
243 | this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool))); | 247 | this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool))); |
244 | 248 | ||
245 | 249 | ||
246 | a = new QAction(tr("Copy"), | 250 | a = new QAction(tr("Copy"), |
247 | Resource::loadPixmap("copy"), QString::null, | 251 | Opie::Core::OResource::loadPixmap("copy", Opie::Core::OResource::SmallIcon ), QString::null, |
248 | 0, this, 0 ); | 252 | 0, this, 0 ); |
249 | //a->addTo( m_icons ); | 253 | //a->addTo( m_icons ); |
250 | connect( a, SIGNAL(activated() ), | 254 | connect( a, SIGNAL(activated() ), |
251 | this, SLOT(slotCopy() ) ); | 255 | this, SLOT(slotCopy() ) ); |
252 | 256 | ||
253 | QAction *paste = new QAction(tr("Paste"), | 257 | QAction *paste = new QAction(tr("Paste"), |
254 | Resource::loadPixmap("paste"), QString::null, | 258 | Opie::Core::OResource::loadPixmap("paste", Opie::Core::OResource::SmallIcon ), QString::null, |
255 | 0, this, 0 ); | 259 | 0, this, 0 ); |
256 | connect( paste, SIGNAL(activated() ), | 260 | connect( paste, SIGNAL(activated() ), |
257 | this, SLOT(slotPaste() ) ); | 261 | this, SLOT(slotPaste() ) ); |
258 | 262 | ||
259 | 263 | ||
260 | newCon->addTo( m_icons ); | 264 | newCon->addTo( m_icons ); |