summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -115,7 +115,7 @@ void FunctionKeyboard::paintKey(int row, int col) {
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
);
}
@@ -188,8 +188,8 @@ void FunctionKeyboard::loadDefaults() {
/* 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);
@@ -226,12 +226,12 @@ 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) {
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
@@ -63,6 +63,7 @@ private:
QMap<QString, FKey> keys;
uint numRows;
+ int test;
uint numCols;
uint keyHeight;
double keyWidth; // decimal point matters!
@@ -74,9 +75,11 @@ private:
};
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&);
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
@@ -497,11 +497,8 @@ 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() ) );