right widget size when comming back rom fullscreen

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
@@ -94,49 +94,49 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
                                 keys[handle].getL()
                 );
             }
         }
     }
 }
 
 void FunctionKeyboard::paintKey(int row, int col) {
 
     QPainter p(this);
 
     p.fillRect(QRect(QPoint(col * keyWidth + 1, row * keyHeight + 1),
                      QPoint((col + 1) * keyWidth - 1, row * keyHeight + keyHeight- 1)),
                (pressedRow != -1 && pressedCol != -1 ) ? QColor(97,119,155) : QColor(255,255,255));
     p.drawText(
                     col * keyWidth + 1, row * keyHeight + 1,
                     keyWidth, keyHeight,
                     Qt::AlignHCenter | Qt::AlignVCenter,
                     keys["r" + QString::number(row) + "c" + QString::number(col)].getL()
     );
 
     if (row == numRows) {
 
         // sometimes it doesnt draw the last line
-        p.drawLine((col+1) * keyWidth -2, row * keyHeight, 
+        p.drawLine((col+1) * keyWidth -2, row * keyHeight,
                    (col+1) * keyWidth -2, (row + 1) * keyHeight
         );
     }
 
 }
 
 void FunctionKeyboard::mousePressEvent(QMouseEvent *e) {
 
     pressedRow = e->y() / keyHeight;
     pressedCol = (int) (e->x() / keyWidth);
 
     paintKey(pressedRow, pressedCol);
 
     // emit that sucker!
     FKey k = keys["r" + QString::number(pressedRow) + "c" + QString::number(pressedCol)];
     emit keyPressed(k.getU(), k.getQ(), 0, 1, 0, pressedRow, pressedCol);
 
 }
 
 void FunctionKeyboard::mouseReleaseEvent(QMouseEvent *) {
 
     if (pressedRow != -1 && pressedRow != -1) {
 
         int row = pressedRow; pressedRow = -1;
@@ -167,92 +167,92 @@ QSize FunctionKeyboard::sizeHint() const {
 void FunctionKeyboard::loadDefaults() {
 
     /* what keys should be default? */
     keys.insert( "r0c0", FKey ("F1", 4144, 0));
     keys.insert( "r0c1", FKey ("F2", 4145, 0));
     keys.insert( "r0c2", FKey ("F3", 4145, 0));
     keys.insert( "r0c3", FKey ("F4", 4146, 0));
     keys.insert( "r0c4", FKey ("F5", 4147, 0));
     keys.insert( "r0c5", FKey ("F6", 4148, 0));
     keys.insert( "r0c6", FKey ("F7", 4149, 0));
     keys.insert( "r0c7", FKey ("F8", 4150, 0));
     keys.insert( "r0c8", FKey ("F9", 4151, 0));
     keys.insert( "r0c9", FKey ("F10", 4152, 0));
     keys.insert( "r0c10", FKey ("F11", 4153, 0));
 
     keys.insert( "r1c7", FKey ("Ho", 4112, 0));
     keys.insert( "r1c8", FKey ("End", 4113, 0));
     keys.insert( "r1c9", FKey ("PU", 4118, 0));
     keys.insert( "r1c10", FKey ("PD", 4119, 0));
 
 }
 
 /* FunctionKeyboardConfig {{{1 */
 
-FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) :
-    ProfileDialogKeyWidget(name, parent) {
+FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
+    : ProfileDialogKeyWidget(name, parent, na) {
 
 
     kb = new FunctionKeyboard(this);
 
     QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this);
     QLabel *l = new QLabel("Rows", dimentions);
     QSpinBox *m_rowBox = new QSpinBox(1, 15, 1, dimentions);
     connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int)));
     l = new QLabel("Columns", dimentions);
     m_colBox = new QSpinBox(1, 15, 1, dimentions);
     connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int)));
 
     QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this);
     l = new QLabel("Label", editKey);
     /*
     m_labels = new QComboBox(false, editKey);
     labels->insertItem("text");
 
     QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList();
 
     for (uint i = 0; i < files.count(); i++) {
 
         m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i]));
     }
     connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int)));
     */
 
     QVBoxLayout *root = new QVBoxLayout(this, 2);
     root->addWidget(kb);
     root->addWidget(dimentions);
     root->addWidget(editKey);
 }
 FunctionKeyboardConfig::~FunctionKeyboardConfig() {
 
 }
 void FunctionKeyboardConfig::load (const Profile& prof) {
-    int i = prof.readNumEntry("keb_rows", 1);
-    //m_rowBox->setValue(i);
+    //int i = prof.readNumEntry("keb_rows", 1);
+    m_rowBox->setValue( 2 );
 }
 void FunctionKeyboardConfig::save (Profile& prof) {
 
-    //prof.writeEntry("keb_rows", m_rowBox->value());
+    prof.writeEntry("keb_rows", m_rowBox->value());
 
 }
 void FunctionKeyboardConfig::slotChangeRows(int r) {
 
     kb->changeRows(r);
 
     // have to do this so the whole thing gets redrawn
     kb->hide(); kb->show();
 }
 void FunctionKeyboardConfig::slotChangeCols(int c) {
 
     kb->changeCols(c);
 }
 void FunctionKeyboardConfig::slotKeyPressed(ushort, ushort, bool, bool, bool, ushort row, ushort col) {
 
 }
 void FunctionKeyboardConfig::slotChangeIcon(int index) {
 
     if (index == 0) {
 
         // is text
         //if(!labels->editable()) labels->setEditable(true);
     } else {
 
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
@@ -42,59 +42,62 @@ public:
     void changeCols(int);
 
     void paintEvent(QPaintEvent *);
     void paintKey(int, int);
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
     QSize sizeHint() const;
 
 signals:
 
     void keyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
 
 private:
 
     void loadDefaults();
 
 
 private:
 
     // thie key for the map is the row/col
     QMap<QString, FKey> keys;
 
     uint numRows;
+    int test;
     uint numCols;
     uint keyHeight;
     double keyWidth; // decimal point matters!
 
     int pressedRow, pressedCol;
 
     QObject *parent;
 
 };
 
 class FunctionKeyboardConfig : public ProfileDialogKeyWidget {
+
     Q_OBJECT
+
 public:
-    FunctionKeyboardConfig(const QString& name, QWidget *wid);
+    FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l );
     ~FunctionKeyboardConfig();
 
     void load(const Profile&);
     void save(Profile&);
 
 private slots:
 
     void slotKeyPressed(ushort, ushort, bool, bool, bool, ushort, ushort);
     void slotChangeRows(int);
     void slotChangeCols(int);
     void slotChangeIcon(int);
 
 private:
 
     FunctionKeyboard *kb;
     QSpinBox *m_rowBox, *m_colBox;
     QComboBox *m_labels;
 
 };
 
 #endif
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
@@ -476,53 +476,50 @@ void MainWindow::slotOpenButtons( bool state ) {
 
 void MainWindow::slotSessionChanged( Session* ses ) {
     qWarning("changed!");
     if ( ses ) {
         m_curSession = ses;
         qDebug(QString("is connected : %1").arg(  m_curSession->layer()->isConnected() ) );
         if ( m_curSession->layer()->isConnected() ) {
             m_connect->setEnabled( false );
             m_disconnect->setEnabled( true );
         } else {
             m_connect->setEnabled( true );
             m_disconnect->setEnabled( false );
         }
 
         QWidget *w = m_curSession->widget();
         if(w) w->setFocus();
     }
 }
 
 void MainWindow::slotFullscreen() {
 
 
 
     if ( m_isFullscreen ) {
-        ( m_curSession->widgetStack() )->reparent(  savedParentFullscreen, 0, QPoint(0,0), false );
-        ( m_curSession->widgetStack() )->setFrameStyle( QFrame::Panel | QFrame::Sunken );
-
-        setCentralWidget( m_consoleWindow );
-        ( m_curSession->widgetStack() )->show();
+        ( m_curSession->widgetStack() )->reparent(  savedParentFullscreen, 0, QPoint(0,0), true );
+        ( m_curSession->widgetStack() )->resize( savedParentFullscreen->width(), savedParentFullscreen->height() );
         ( m_curSession->emulationHandler() )->cornerButton()->hide();
         disconnect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
 
     } else {
         savedParentFullscreen = ( m_curSession->widgetStack() )->parentWidget();
         ( m_curSession->widgetStack() )->setFrameStyle( QFrame::NoFrame );
         ( m_curSession->widgetStack() )->reparent( 0, WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop
                                                    , QPoint(0,0), false );
         ( m_curSession->widgetStack() )->resize( qApp->desktop()->width(), qApp->desktop()->height() );
         ( m_curSession->widgetStack() )->setFocus();
         ( m_curSession->widgetStack() )->show();
 
         ( ( m_curSession->emulationHandler() )->cornerButton() )->show();
 
         connect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
     }
 
     m_isFullscreen = !m_isFullscreen;
 }
 
 
 void MainWindow::slotKeyReceived(ushort u, ushort q, bool, bool pressed, bool, ushort, ushort) {
 
     //qWarning("unicode: %x, qkey: %x, %s", u, q, pressed ? "pressed" : "released");