author | harlekin <harlekin> | 2002-10-13 16:26:06 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-13 16:26:06 (UTC) |
commit | 40e7d87b58e6146944da4613c04bfafc90dbb379 (patch) (unidiff) | |
tree | aafd035889122c111218fd510821d8dd47d5983c | |
parent | 93133ba6cc82398012c8f7206a7e9a270a04edc6 (diff) | |
download | opie-40e7d87b58e6146944da4613c04bfafc90dbb379.zip opie-40e7d87b58e6146944da4613c04bfafc90dbb379.tar.gz opie-40e7d87b58e6146944da4613c04bfafc90dbb379.tar.bz2 |
fullscreen for new connection
-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 | |||
@@ -47,13 +47,13 @@ void MainWindow::initUI() { | |||
47 | m_icons = new QToolBar(this); | 47 | m_icons = new QToolBar(this); |
48 | 48 | ||
49 | /* | 49 | /* |
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 ); |
57 | connect(a, SIGNAL(activated() ), | 57 | connect(a, SIGNAL(activated() ), |
58 | this, SLOT(slotNew() ) ); | 58 | this, SLOT(slotNew() ) ); |
59 | 59 | ||
@@ -97,69 +97,69 @@ void MainWindow::initUI() { | |||
97 | this, SLOT(slotClose() ) ); | 97 | this, SLOT(slotClose() ) ); |
98 | 98 | ||
99 | /* | 99 | /* |
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 ); |
107 | connect( m_setProfiles, SIGNAL(activated() ), | 107 | connect( m_setProfiles, SIGNAL(activated() ), |
108 | this, SLOT(slotConfigure() ) ); | 108 | this, SLOT(slotConfigure() ) ); |
109 | 109 | ||
110 | /* | 110 | /* |
111 | * script actions | 111 | * script actions |
112 | */ | 112 | */ |
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())); |
124 | 124 | ||
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, |
141 | -1, 0); | 141 | -1, 0); |
142 | 142 | ||
143 | /* insert the connection menu */ | 143 | /* insert the connection menu */ |
144 | m_bar->insertItem( tr("Connection"), m_console ); | 144 | m_bar->insertItem( tr("Connection"), m_console ); |
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 | ||
152 | /* and the keyboard */ | 152 | /* and the keyboard */ |
153 | m_keyBar = new QToolBar(this); | 153 | m_keyBar = new QToolBar(this); |
154 | addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); | 154 | addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); |
155 | m_keyBar->setHorizontalStretchable( TRUE ); | 155 | m_keyBar->setHorizontalStretchable( TRUE ); |
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 | */ |
163 | connect( m_sessionsPop, SIGNAL(activated( int ) ), | 163 | connect( m_sessionsPop, SIGNAL(activated( int ) ), |
164 | this, SLOT(slotProfile( int ) ) ); | 164 | this, SLOT(slotProfile( int ) ) ); |
165 | 165 | ||
@@ -199,12 +199,13 @@ QList<Session> MainWindow::sessions() { | |||
199 | return m_sessions; | 199 | return m_sessions; |
200 | } | 200 | } |
201 | 201 | ||
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 ) { |
208 | create( dlg.profile() ); | 209 | create( dlg.profile() ); |
209 | } | 210 | } |
210 | } | 211 | } |
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 | |||
@@ -74,13 +74,13 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | |||
74 | /* translate the internal name to the external */ | 74 | /* translate the internal name to the external */ |
75 | session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) , | 75 | session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) , |
76 | prof) ); | 76 | prof) ); |
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 ); |
84 | WidgetLayer* wid = new EmulationWidget( prof, dummy ); | 84 | WidgetLayer* wid = new EmulationWidget( prof, dummy ); |
85 | lay->addWidget( wid ); | 85 | lay->addWidget( wid ); |
86 | 86 | ||