-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 21 | ||||
-rw-r--r-- | noncore/apps/opie-console/profilemanager.cpp | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 46c5bed..0a58b6c 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -50,7 +50,7 @@ void MainWindow::initUI() { | |||
50 | * new Action for new sessions | 50 | * new Action for new sessions |
51 | */ | 51 | */ |
52 | QAction* a = new QAction(tr("New Connection"), | 52 | QAction* a = new QAction(tr("New Connection"), |
53 | Resource::loadPixmap( "new" ), | 53 | Resource::loadPixmap( "new" ), |
54 | QString::null, 0, this, 0); | 54 | QString::null, 0, this, 0); |
55 | a->addTo( m_console ); | 55 | a->addTo( m_console ); |
56 | a->addTo( m_icons ); | 56 | a->addTo( m_icons ); |
@@ -100,7 +100,7 @@ void MainWindow::initUI() { | |||
100 | * the settings action | 100 | * the settings action |
101 | */ | 101 | */ |
102 | m_setProfiles = new QAction(tr("Configure Profiles"), | 102 | m_setProfiles = new QAction(tr("Configure Profiles"), |
103 | Resource::loadPixmap( "SettingsIcon" ), | 103 | Resource::loadPixmap( "SettingsIcon" ), |
104 | QString::null, 0, this, 0); | 104 | QString::null, 0, this, 0); |
105 | m_setProfiles->addTo( m_settings ); | 105 | m_setProfiles->addTo( m_settings ); |
106 | m_setProfiles->addTo( m_icons ); | 106 | m_setProfiles->addTo( m_icons ); |
@@ -113,11 +113,11 @@ void MainWindow::initUI() { | |||
113 | m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0); | 113 | m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0); |
114 | m_recordScript->addTo(m_scripts); | 114 | m_recordScript->addTo(m_scripts); |
115 | connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript())); | 115 | connect(m_recordScript, SIGNAL(activated()), this, SLOT(slotRecordScript())); |
116 | 116 | ||
117 | m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0); | 117 | m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0); |
118 | m_saveScript->addTo(m_scripts); | 118 | m_saveScript->addTo(m_scripts); |
119 | connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript())); | 119 | connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript())); |
120 | 120 | ||
121 | m_runScript = new QAction(tr("Run Script"), QString::null, 0, this, 0); | 121 | m_runScript = new QAction(tr("Run Script"), QString::null, 0, this, 0); |
122 | m_runScript->addTo(m_scripts); | 122 | m_runScript->addTo(m_scripts); |
123 | connect(m_runScript, SIGNAL(activated()), this, SLOT(slotRunScript())); | 123 | connect(m_runScript, SIGNAL(activated()), this, SLOT(slotRunScript())); |
@@ -125,16 +125,16 @@ void MainWindow::initUI() { | |||
125 | /* | 125 | /* |
126 | * action that open/closes the keyboard | 126 | * action that open/closes the keyboard |
127 | */ | 127 | */ |
128 | m_openKeys = new QAction (tr("Open Keyboard..."), | 128 | m_openKeys = new QAction (tr("Open Keyboard..."), |
129 | Resource::loadPixmap( "down" ), | 129 | Resource::loadPixmap( "down" ), |
130 | QString::null, 0, this, 0); | 130 | QString::null, 0, this, 0); |
131 | 131 | ||
132 | m_openKeys->setToggleAction(true); | 132 | m_openKeys->setToggleAction(true); |
133 | 133 | ||
134 | connect (m_openKeys, SIGNAL(toggled(bool)), | 134 | connect (m_openKeys, SIGNAL(toggled(bool)), |
135 | this, SLOT(slotOpenKeb(bool))); | 135 | this, SLOT(slotOpenKeb(bool))); |
136 | m_openKeys->addTo(m_icons); | 136 | m_openKeys->addTo(m_icons); |
137 | 137 | ||
138 | 138 | ||
139 | /* insert the submenu */ | 139 | /* insert the submenu */ |
140 | m_console->insertItem(tr("New from Profile"), m_sessionsPop, | 140 | m_console->insertItem(tr("New from Profile"), m_sessionsPop, |
@@ -145,7 +145,7 @@ void MainWindow::initUI() { | |||
145 | 145 | ||
146 | /* the scripts menu */ | 146 | /* the scripts menu */ |
147 | m_bar->insertItem( tr("Scripts"), m_scripts ); | 147 | m_bar->insertItem( tr("Scripts"), m_scripts ); |
148 | 148 | ||
149 | /* the settings menu */ | 149 | /* the settings menu */ |
150 | m_bar->insertItem( tr("Settings"), m_settings ); | 150 | m_bar->insertItem( tr("Settings"), m_settings ); |
151 | 151 | ||
@@ -156,7 +156,7 @@ void MainWindow::initUI() { | |||
156 | m_keyBar->hide(); | 156 | m_keyBar->hide(); |
157 | 157 | ||
158 | m_kb = new FunctionKeyboard(m_keyBar); | 158 | m_kb = new FunctionKeyboard(m_keyBar); |
159 | 159 | ||
160 | /* | 160 | /* |
161 | * connect to the menu activation | 161 | * connect to the menu activation |
162 | */ | 162 | */ |
@@ -202,6 +202,7 @@ QList<Session> MainWindow::sessions() { | |||
202 | void MainWindow::slotNew() { | 202 | void MainWindow::slotNew() { |
203 | qWarning("New Connection"); | 203 | qWarning("New Connection"); |
204 | ProfileEditorDialog dlg(factory() ); | 204 | ProfileEditorDialog dlg(factory() ); |
205 | dlg.showMaximized(); | ||
205 | int ret = dlg.exec(); | 206 | int ret = dlg.exec(); |
206 | 207 | ||
207 | if ( ret == QDialog::Accepted ) { | 208 | if ( ret == QDialog::Accepted ) { |
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp index 78751e7..c965700 100644 --- a/noncore/apps/opie-console/profilemanager.cpp +++ b/noncore/apps/opie-console/profilemanager.cpp | |||
@@ -77,7 +77,7 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | |||
77 | 77 | ||
78 | QWidgetStack *stack = new QWidgetStack(parent); | 78 | QWidgetStack *stack = new QWidgetStack(parent); |
79 | session->setWidgetStack( stack ); | 79 | session->setWidgetStack( stack ); |
80 | QWidget* dummy = new QWidget(stack ); | 80 | QWidget* dummy = new QWidget( stack ); |
81 | QHBoxLayout* lay = new QHBoxLayout(dummy ); | 81 | QHBoxLayout* lay = new QHBoxLayout(dummy ); |
82 | stack->addWidget( dummy, 0 ); | 82 | stack->addWidget( dummy, 0 ); |
83 | stack->raiseWidget( 0 ); | 83 | stack->raiseWidget( 0 ); |