summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp12
-rw-r--r--noncore/apps/opie-console/function_keyboard.h5
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp7
3 files changed, 12 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index 977a384..c314949 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -114,9 +114,9 @@ void FunctionKeyboard::paintKey(int row, int col) {
114 114
115 if (row == numRows) { 115 if (row == numRows) {
116 116
117 // sometimes it doesnt draw the last line 117 // sometimes it doesnt draw the last line
118 p.drawLine((col+1) * keyWidth -2, row * keyHeight, 118 p.drawLine((col+1) * keyWidth -2, row * keyHeight,
119 (col+1) * keyWidth -2, (row + 1) * keyHeight 119 (col+1) * keyWidth -2, (row + 1) * keyHeight
120 ); 120 );
121 } 121 }
122 122
@@ -187,10 +187,10 @@ void FunctionKeyboard::loadDefaults() {
187} 187}
188 188
189/* FunctionKeyboardConfig {{{1 */ 189/* FunctionKeyboardConfig {{{1 */
190 190
191FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : 191FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
192 ProfileDialogKeyWidget(name, parent) { 192 : ProfileDialogKeyWidget(name, parent, na) {
193 193
194 194
195 kb = new FunctionKeyboard(this); 195 kb = new FunctionKeyboard(this);
196 196
@@ -225,14 +225,14 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
225FunctionKeyboardConfig::~FunctionKeyboardConfig() { 225FunctionKeyboardConfig::~FunctionKeyboardConfig() {
226 226
227} 227}
228void FunctionKeyboardConfig::load (const Profile& prof) { 228void FunctionKeyboardConfig::load (const Profile& prof) {
229 int i = prof.readNumEntry("keb_rows", 1); 229 //int i = prof.readNumEntry("keb_rows", 1);
230 //m_rowBox->setValue(i); 230 m_rowBox->setValue( 2 );
231} 231}
232void FunctionKeyboardConfig::save (Profile& prof) { 232void FunctionKeyboardConfig::save (Profile& prof) {
233 233
234 //prof.writeEntry("keb_rows", m_rowBox->value()); 234 prof.writeEntry("keb_rows", m_rowBox->value());
235 235
236} 236}
237void FunctionKeyboardConfig::slotChangeRows(int r) { 237void FunctionKeyboardConfig::slotChangeRows(int r) {
238 238
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h
index efeff6d..05b991d 100644
--- a/noncore/apps/opie-console/function_keyboard.h
+++ b/noncore/apps/opie-console/function_keyboard.h
@@ -62,8 +62,9 @@ private:
62 // thie key for the map is the row/col 62 // thie key for the map is the row/col
63 QMap<QString, FKey> keys; 63 QMap<QString, FKey> keys;
64 64
65 uint numRows; 65 uint numRows;
66 int test;
66 uint numCols; 67 uint numCols;
67 uint keyHeight; 68 uint keyHeight;
68 double keyWidth; // decimal point matters! 69 double keyWidth; // decimal point matters!
69 70
@@ -73,11 +74,13 @@ private:
73 74
74}; 75};
75 76
76class FunctionKeyboardConfig : public ProfileDialogKeyWidget { 77class FunctionKeyboardConfig : public ProfileDialogKeyWidget {
78
77 Q_OBJECT 79 Q_OBJECT
80
78public: 81public:
79 FunctionKeyboardConfig(const QString& name, QWidget *wid); 82 FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l );
80 ~FunctionKeyboardConfig(); 83 ~FunctionKeyboardConfig();
81 84
82 void load(const Profile&); 85 void load(const Profile&);
83 void save(Profile&); 86 void save(Profile&);
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 30dd21c..c1020fa 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -496,13 +496,10 @@ void MainWindow::slotFullscreen() {
496 496
497 497
498 498
499 if ( m_isFullscreen ) { 499 if ( m_isFullscreen ) {
500 ( m_curSession->widgetStack() )->reparent( savedParentFullscreen, 0, QPoint(0,0), false ); 500 ( m_curSession->widgetStack() )->reparent( savedParentFullscreen, 0, QPoint(0,0), true );
501 ( m_curSession->widgetStack() )->setFrameStyle( QFrame::Panel | QFrame::Sunken ); 501 ( m_curSession->widgetStack() )->resize( savedParentFullscreen->width(), savedParentFullscreen->height() );
502
503 setCentralWidget( m_consoleWindow );
504 ( m_curSession->widgetStack() )->show();
505 ( m_curSession->emulationHandler() )->cornerButton()->hide(); 502 ( m_curSession->emulationHandler() )->cornerButton()->hide();
506 disconnect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) ); 503 disconnect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
507 504
508 } else { 505 } else {