author | mickeyl <mickeyl> | 2004-09-07 21:44:14 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-09-07 21:44:14 (UTC) |
commit | 949b51e2243919f79cdb69e91ebc5e14a32c7545 (patch) (unidiff) | |
tree | c699040b8afefceb1c0959bffe6649873793d271 | |
parent | 9c92eb6569b2b3bcb1ad4a2edb2ad263ec9feaa4 (diff) | |
download | opie-949b51e2243919f79cdb69e91ebc5e14a32c7545.zip opie-949b51e2243919f79cdb69e91ebc5e14a32c7545.tar.gz opie-949b51e2243919f79cdb69e91ebc5e14a32c7545.tar.bz2 |
remove tiny goof
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 15290ce..1a5a59f 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -60,193 +60,193 @@ void MainWindow::initUI() { | |||
60 | 60 | ||
61 | /* tool bar for the menu */ | 61 | /* tool bar for the menu */ |
62 | m_tool = new QToolBar( this ); | 62 | m_tool = new QToolBar( this ); |
63 | m_tool->setHorizontalStretchable( TRUE ); | 63 | m_tool->setHorizontalStretchable( TRUE ); |
64 | 64 | ||
65 | m_bar = new QMenuBar( m_tool ); | 65 | m_bar = new QMenuBar( m_tool ); |
66 | m_console = new QPopupMenu( this ); | 66 | m_console = new QPopupMenu( this ); |
67 | m_scripts = new QPopupMenu( this ); | 67 | m_scripts = new QPopupMenu( this ); |
68 | m_sessionsPop= new QPopupMenu( this ); | 68 | m_sessionsPop= new QPopupMenu( this ); |
69 | m_scriptsPop = new QPopupMenu( this ); | 69 | m_scriptsPop = new QPopupMenu( this ); |
70 | 70 | ||
71 | /* add a toolbar for icons */ | 71 | /* add a toolbar for icons */ |
72 | m_icons = new QToolBar(this); | 72 | m_icons = new QToolBar(this); |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * the settings action | 75 | * the settings action |
76 | */ | 76 | */ |
77 | m_setProfiles = new QAction(tr("Configure Profiles"), | 77 | m_setProfiles = new QAction(tr("Configure Profiles"), |
78 | Resource::loadPixmap( "SettingsIcon" ), | 78 | Resource::loadPixmap( "SettingsIcon" ), |
79 | QString::null, 0, this, 0); | 79 | QString::null, 0, this, 0); |
80 | m_setProfiles->addTo( m_console ); | 80 | m_setProfiles->addTo( m_console ); |
81 | connect( m_setProfiles, SIGNAL(activated() ), | 81 | connect( m_setProfiles, SIGNAL(activated() ), |
82 | this, SLOT(slotConfigure() ) ); | 82 | this, SLOT(slotConfigure() ) ); |
83 | 83 | ||
84 | m_console->insertSeparator(); | 84 | m_console->insertSeparator(); |
85 | /* | 85 | /* |
86 | * new Action for new sessions | 86 | * new Action for new sessions |
87 | */ | 87 | */ |
88 | QAction* newCon = new QAction(tr("New Profile"), | 88 | QAction* newCon = new QAction(tr("New Profile"), |
89 | Resource::loadPixmap( "new" ), | 89 | Resource::loadPixmap( "new" ), |
90 | QString::null, 0, this, 0); | 90 | QString::null, 0, this, 0); |
91 | newCon->addTo( m_console ); | 91 | newCon->addTo( m_console ); |
92 | connect( newCon, SIGNAL(activated() ), | 92 | connect( newCon, SIGNAL(activated() ), |
93 | this, SLOT(slotNew() ) ); | 93 | this, SLOT(slotNew() ) ); |
94 | 94 | ||
95 | m_console->insertSeparator(); | 95 | m_console->insertSeparator(); |
96 | 96 | ||
97 | QAction *saveCon = new QAction( tr("Save Profile" ), | 97 | QAction *saveCon = new QAction( tr("Save Profile" ), |
98 | Resource::loadPixmap( "save" ), QString::null, | 98 | Resource::loadPixmap( "save" ), QString::null, |
99 | 0, this, 0 ); | 99 | 0, this, 0 ); |
100 | saveCon->addTo( m_console ); | 100 | saveCon->addTo( m_console ); |
101 | connect( saveCon, SIGNAL(activated() ), | 101 | connect( saveCon, SIGNAL(activated() ), |
102 | this, SLOT(slotSaveSession() ) ); | 102 | this, SLOT(slotSaveSession() ) ); |
103 | m_console->insertSeparator(); | 103 | m_console->insertSeparator(); |
104 | 104 | ||
105 | /* | 105 | /* |
106 | * connect action | 106 | * connect action |
107 | */ | 107 | */ |
108 | m_connect = new QAction( tr("Connect"), Resource::loadPixmap("console/connected"), | 108 | m_connect = new QAction( tr("Connect"), Resource::loadPixmap("console/connected"), |
109 | QString::null, 0, this, 0 ); | 109 | QString::null, 0, this, 0 ); |
110 | m_connect->addTo( m_console ); | 110 | m_connect->addTo( m_console ); |
111 | connect(m_connect, SIGNAL(activated() ), | 111 | connect(m_connect, SIGNAL(activated() ), |
112 | this, SLOT(slotConnect() ) ); | 112 | this, SLOT(slotConnect() ) ); |
113 | 113 | ||
114 | /* | 114 | /* |
115 | * disconnect action | 115 | * disconnect action |
116 | */ | 116 | */ |
117 | m_disconnect = new QAction( tr("Disconnect"), Resource::loadPixmap("console/notconnected"), | 117 | m_disconnect = new QAction( tr("Disconnect"), Resource::loadPixmap("console/notconnected"), |
118 | QString::null, 0, this, 0 ); | 118 | QString::null, 0, this, 0 ); |
119 | m_disconnect->addTo( m_console ); | 119 | m_disconnect->addTo( m_console ); |
120 | connect(m_disconnect, SIGNAL(activated() ), | 120 | connect(m_disconnect, SIGNAL(activated() ), |
121 | this, SLOT(slotDisconnect() ) ); | 121 | this, SLOT(slotDisconnect() ) ); |
122 | 122 | ||
123 | m_console->insertSeparator(); | 123 | m_console->insertSeparator(); |
124 | 124 | ||
125 | 125 | ||
126 | m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 ); | 126 | m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 ); |
127 | m_quickLaunch->addTo( m_icons ); | 127 | m_quickLaunch->addTo( m_icons ); |
128 | connect( m_quickLaunch, SIGNAL( activated() ), | 128 | connect( m_quickLaunch, SIGNAL( activated() ), |
129 | this, SLOT( slotQuickLaunch() ) ); | 129 | this, SLOT( slotQuickLaunch() ) ); |
130 | 130 | ||
131 | QWhatsThis::add( m_icons, tr( "The shell button launches the \"default\" profile. If there is none default values are taken" ) ); | 131 | QWhatsThis::add( m_icons, tr( "The shell button launches the \"default\" profile. If there is none default values are taken" ) ); |
132 | 132 | ||
133 | m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null, | 133 | m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null, |
134 | 0, this, 0 ); | 134 | 0, this, 0 ); |
135 | m_transfer->addTo( m_console ); | 135 | m_transfer->addTo( m_console ); |
136 | connect(m_transfer, SIGNAL(activated() ), | 136 | connect(m_transfer, SIGNAL(activated() ), |
137 | this, SLOT(slotTransfer() ) ); | 137 | this, SLOT(slotTransfer() ) ); |
138 | 138 | ||
139 | 139 | ||
140 | 140 | ||
141 | /* | 141 | /* |
142 | * immediate change of line wrap policy | 142 | * immediate change of line wrap policy |
143 | */ | 143 | */ |
144 | m_isWrapped = true; | 144 | m_isWrapped = true; |
145 | m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0, true ); | 145 | m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0, true ); |
146 | m_wrap->addTo( m_console ); | 146 | m_wrap->addTo( m_console ); |
147 | m_wrap->setOn( true ); | 147 | m_wrap->setOn( true ); |
148 | connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) ); | 148 | connect( m_wrap, SIGNAL( activated() ), SLOT( slotWrap() ) ); |
149 | 149 | ||
150 | /* | 150 | /* |
151 | * fullscreen | 151 | * fullscreen |
152 | */ | 152 | */ |
153 | m_isFullscreen = false; | 153 | m_isFullscreen = false; |
154 | 154 | ||
155 | m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) | 155 | m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) |
156 | , QString::null, 0, this, 0, true ); | 156 | , QString::null, 0, this, 0 ); |
157 | m_fullscreen->addTo( m_console ); | 157 | m_fullscreen->addTo( m_console ); |
158 | connect( m_fullscreen, SIGNAL( activated() ), | 158 | connect( m_fullscreen, SIGNAL( activated() ), |
159 | this, SLOT( slotFullscreen() ) ); | 159 | this, SLOT( slotFullscreen() ) ); |
160 | 160 | ||
161 | m_console->insertSeparator(); | 161 | m_console->insertSeparator(); |
162 | 162 | ||
163 | QAction *a = new QAction(); | 163 | QAction *a = new QAction(); |
164 | a->setText( tr("Save history") ); | 164 | a->setText( tr("Save history") ); |
165 | a->addTo( m_console ); | 165 | a->addTo( m_console ); |
166 | connect(a, SIGNAL(activated() ), | 166 | connect(a, SIGNAL(activated() ), |
167 | this, SLOT(slotSaveHistory() ) ); | 167 | this, SLOT(slotSaveHistory() ) ); |
168 | /* | 168 | /* |
169 | * terminate action | 169 | * terminate action |
170 | */ | 170 | */ |
171 | m_terminate = new QAction(); | 171 | m_terminate = new QAction(); |
172 | m_terminate->setText( tr("Terminate") ); | 172 | m_terminate->setText( tr("Terminate") ); |
173 | m_terminate->addTo( m_console ); | 173 | m_terminate->addTo( m_console ); |
174 | connect(m_terminate, SIGNAL(activated() ), | 174 | connect(m_terminate, SIGNAL(activated() ), |
175 | this, SLOT(slotTerminate() ) ); | 175 | this, SLOT(slotTerminate() ) ); |
176 | 176 | ||
177 | m_closewindow = new QAction(); | 177 | m_closewindow = new QAction(); |
178 | m_closewindow->setText( tr("Close Window") ); | 178 | m_closewindow->setText( tr("Close Window") ); |
179 | m_closewindow->addTo( m_console ); | 179 | m_closewindow->addTo( m_console ); |
180 | connect( m_closewindow, SIGNAL(activated() ), | 180 | connect( m_closewindow, SIGNAL(activated() ), |
181 | this, SLOT(slotClose() ) ); | 181 | this, SLOT(slotClose() ) ); |
182 | 182 | ||
183 | 183 | ||
184 | /* | 184 | /* |
185 | * script actions | 185 | * script actions |
186 | */ | 186 | */ |
187 | m_runScript_id = m_scripts->insertItem(tr("Run Script"), m_scriptsPop, -1, 0); | 187 | m_runScript_id = m_scripts->insertItem(tr("Run Script"), m_scriptsPop, -1, 0); |
188 | connect(m_scriptsPop, SIGNAL(activated(int)), this, SLOT(slotRunScript(int))); | 188 | connect(m_scriptsPop, SIGNAL(activated(int)), this, SLOT(slotRunScript(int))); |
189 | 189 | ||
190 | m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0); | 190 | m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0); |
191 | m_recordScript->addTo(m_scripts); | 191 | m_recordScript->addTo(m_scripts); |
192 | connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript())); | 192 | connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript())); |
193 | 193 | ||
194 | m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0); | 194 | m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0); |
195 | m_saveScript->addTo(m_scripts); | 195 | m_saveScript->addTo(m_scripts); |
196 | connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript())); | 196 | connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript())); |
197 | 197 | ||
198 | 198 | ||
199 | /* | 199 | /* |
200 | * action that open/closes the keyboard | 200 | * action that open/closes the keyboard |
201 | */ | 201 | */ |
202 | m_openKeys = new QAction (tr("Open Keyboard..."), | 202 | m_openKeys = new QAction (tr("Open Keyboard..."), |
203 | Resource::loadPixmap( "console/keys/keyboard_icon" ), | 203 | Resource::loadPixmap( "console/keys/keyboard_icon" ), |
204 | QString::null, 0, this, 0); | 204 | QString::null, 0, this, 0); |
205 | m_openKeys->setToggleAction(true); | 205 | m_openKeys->setToggleAction(true); |
206 | connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); | 206 | connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); |
207 | 207 | ||
208 | /* insert the submenu */ | 208 | /* insert the submenu */ |
209 | m_console->insertItem(tr("New from Profile"), m_sessionsPop, | 209 | m_console->insertItem(tr("New from Profile"), m_sessionsPop, |
210 | -1, 0); | 210 | -1, 0); |
211 | 211 | ||
212 | /* insert the connection menu */ | 212 | /* insert the connection menu */ |
213 | m_bar->insertItem( tr("Connection"), m_console ); | 213 | m_bar->insertItem( tr("Connection"), m_console ); |
214 | 214 | ||
215 | /* the scripts menu */ | 215 | /* the scripts menu */ |
216 | m_bar->insertItem( tr("Scripts"), m_scripts ); | 216 | m_bar->insertItem( tr("Scripts"), m_scripts ); |
217 | 217 | ||
218 | /* and the keyboard */ | 218 | /* and the keyboard */ |
219 | m_keyBar = new QToolBar(this); | 219 | m_keyBar = new QToolBar(this); |
220 | addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); | 220 | addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); |
221 | m_keyBar->setHorizontalStretchable( TRUE ); | 221 | m_keyBar->setHorizontalStretchable( TRUE ); |
222 | m_keyBar->hide(); | 222 | m_keyBar->hide(); |
223 | 223 | ||
224 | m_kb = new FunctionKeyboard(m_keyBar); | 224 | m_kb = new FunctionKeyboard(m_keyBar); |
225 | connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)), | 225 | connect(m_kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)), |
226 | this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool))); | 226 | this, SLOT(slotKeyReceived(FKey,ushort,ushort,bool))); |
227 | 227 | ||
228 | 228 | ||
229 | a = new QAction(tr("Copy"), | 229 | a = new QAction(tr("Copy"), |
230 | Resource::loadPixmap("copy"), QString::null, | 230 | Resource::loadPixmap("copy"), QString::null, |
231 | 0, this, 0 ); | 231 | 0, this, 0 ); |
232 | //a->addTo( m_icons ); | 232 | //a->addTo( m_icons ); |
233 | connect( a, SIGNAL(activated() ), | 233 | connect( a, SIGNAL(activated() ), |
234 | this, SLOT(slotCopy() ) ); | 234 | this, SLOT(slotCopy() ) ); |
235 | 235 | ||
236 | QAction *paste = new QAction(tr("Paste"), | 236 | QAction *paste = new QAction(tr("Paste"), |
237 | Resource::loadPixmap("paste"), QString::null, | 237 | Resource::loadPixmap("paste"), QString::null, |
238 | 0, this, 0 ); | 238 | 0, this, 0 ); |
239 | connect( paste, SIGNAL(activated() ), | 239 | connect( paste, SIGNAL(activated() ), |
240 | this, SLOT(slotPaste() ) ); | 240 | this, SLOT(slotPaste() ) ); |
241 | 241 | ||
242 | 242 | ||
243 | newCon->addTo( m_icons ); | 243 | newCon->addTo( m_icons ); |
244 | //m_setProfiles->addTo( m_icons ); | 244 | //m_setProfiles->addTo( m_icons ); |
245 | paste->addTo( m_icons ); | 245 | paste->addTo( m_icons ); |
246 | m_openKeys->addTo(m_icons); | 246 | m_openKeys->addTo(m_icons); |
247 | m_fullscreen->addTo( m_icons ); | 247 | m_fullscreen->addTo( m_icons ); |
248 | 248 | ||
249 | m_connect->setEnabled( false ); | 249 | m_connect->setEnabled( false ); |
250 | m_disconnect->setEnabled( false ); | 250 | m_disconnect->setEnabled( false ); |
251 | m_terminate->setEnabled( false ); | 251 | m_terminate->setEnabled( false ); |
252 | m_transfer->setEnabled( false ); | 252 | m_transfer->setEnabled( false ); |