1 files changed, 23 insertions, 35 deletions

diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index fc403d2..6de8741 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -19,2 +19,3 @@
 #include <qpe/qpetoolbar.h>
+#include <qpe/qpeapplication.h>
 #include <qaction.h>
@@ -36,3 +37,3 @@
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
-  QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0)
+  QDialog( parent, name, f ), _currentItem(0), _fileItem(0)
         {
@@ -40,19 +41,20 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
-  QWidget *mainWidget = new  QWidget(this);
-  setCentralWidget( mainWidget);
-  QGridLayout *mainLayout = new QGridLayout( mainWidget );
-        mainLayout->setSpacing( 3 );
-  mainLayout->setMargin( 3 );
+        //setBaseSize(  qApp->globalStrut() );
+  setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
 
+  mainLayout = new QVBoxLayout( this );
+        mainLayout->setSpacing( 0 );
+  mainLayout->setMargin( 0 );
 
-  qDebug("settingList");
+
+  qDebug("creating settingList");
   settingList = new ListViewConfDir( "/root/Settings/", this, "settingslist");
-  settingList->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding));//, sizePolicy().hasHeightForWidth() ) );
-  mainLayout->addWidget( settingList, 0, 0 );
+  settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
+  mainLayout->addWidget( settingList, 0);
 
-  qDebug("editor");
+  qDebug("creating editor");
   editor = new EditWidget(this);
-  editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum));//, sizePolicy().hasHeightForWidth() ) );
-//  editor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3));//, sizePolicy().hasHeightForWidth() ) );
-  mainLayout->addWidget( editor, 1, 0 );
+  editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) );
+  mainLayout->addWidget( editor, 1 );
+  editor->layoutType( ListViewItemConf::File );
 
@@ -60,6 +62,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
-  qDebug("connect");
   connect(settingList, SIGNAL( pressed(QListViewItem*) ),
                                                 this, SLOT(setCurrent(QListViewItem*)));
-
+        connect( settingList, SIGNAL( clicked( QListViewItem* ) ),
+                                                   this, SLOT( stopTimer( QListViewItem* ) ) );
 
@@ -71,7 +73,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
                    SLOT( valueChanged(const QString&) ) );
-//  qDebug("editor->hide()");
-        // editor->hide();
-  qDebug("connect");
-        connect( settingList, SIGNAL( clicked( QListViewItem* ) ),
-                                                   this, SLOT( stopTimer( QListViewItem* ) ) );
+
          setCurrent(0);
@@ -81,4 +79,2 @@ void MainWindow::makeMenu()
 {
-  qDebug("MainWindow::makeMenu()");
-
   popupTimer = new QTimer(this);
@@ -87,3 +83,2 @@ void MainWindow::makeMenu()
 
-  qDebug("Save");
         popupActionSave = new QAction( tr("Save"),QString::null,  0, this, 0 );
@@ -94,3 +89,2 @@ void MainWindow::makeMenu()
 
-  qDebug("Revert");
         popupActionRevert = new QAction( tr("Revert"),QString::null,  0, this, 0 );
@@ -101,3 +95,2 @@ void MainWindow::makeMenu()
 
-  qDebug("Delete");
   popupActionDelete = new QAction( tr("Delete"),QString::null,  0, this, 0 );
@@ -108,6 +101,4 @@ void MainWindow::makeMenu()
 
-  qDebug("connect");
   connect( popupTimer, SIGNAL(timeout()),
                                         this, SLOT(showPopup()) );
-  qDebug("connect");
 }
@@ -122,3 +113,3 @@ void MainWindow::setCurrent(QListViewItem *item)
 {
-  editor->hide();
+        //qDebug("MainWindow::setCurrent");
         if (!item) return;
@@ -129,3 +120,3 @@ void MainWindow::setCurrent(QListViewItem *item)
   {
-           updateGeometry();
+          editor->layoutType(EditWidget::File);
     _currentItem=0;
@@ -134,3 +125,2 @@ void MainWindow::setCurrent(QListViewItem *item)
   }
-  editor->show();
   _fileItem = 0;
@@ -146,3 +136,3 @@ void MainWindow::setCurrent(QListViewItem *item)
   {
-           editor->isKey(true);
+           editor->layoutType(EditWidget::Entry);
     editor->LineEditKey->setText(key);
@@ -150,7 +140,4 @@ void MainWindow::setCurrent(QListViewItem *item)
   }else{
-    editor->isKey(false);
+    editor->layoutType(EditWidget::Group);
   }
-  updateGeometry();
-  editor->updateGeometry();
-  settingList->updateGeometry();
 }
@@ -199,2 +186,3 @@ void MainWindow::removeConfFile()
 }
+
 void MainWindow::showPopup()