ok button gone

2 files changed, 7 insertions, 7 deletions

diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 3b8042f..8e36980 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -1,114 +1,114 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 
 #include "mainwindow.h"
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 
 #include "listviewconfdir.h"
 #include "listviewitemconf.h"
 #include "listviewitemconfigentry.h"
 
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
-  QDialog( parent, name, f ), _currentItem(0), _fileItem(0)
-{	
+  QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0)
+{
   setCaption( tr("Conf File Editor") );
 
 //	setBaseSize(  qApp->globalStrut() );
   setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
 
   mainLayout = new QVBoxLayout( this );
 	mainLayout->setSpacing( 0 );
   mainLayout->setMargin( 0 );
 
 
   qDebug("creating settingList");
   settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist");
   settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
   mainLayout->addWidget( settingList, 0);
 
   qDebug("creating editor");
   editor = new EditWidget(this);
   editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) );
   mainLayout->addWidget( editor, 1 );
   editor->layoutType( ListViewItemConf::File );
 
   makeMenu();
 
   connect(settingList, SIGNAL( pressed(QListViewItem*) ),
 						this, SLOT(setCurrent(QListViewItem*)));
 	connect( settingList, SIGNAL( clicked( QListViewItem* ) ),
-					   this, SLOT( stopTimer( QListViewItem* ) ) );	
+					   this, SLOT( stopTimer( QListViewItem* ) ) );
 
  	connect( editor->LineEditGroup, SIGNAL( textChanged(const QString&) ),
 	           SLOT( groupChanged(const QString&) ) );
 	connect( editor->LineEditKey, SIGNAL( textChanged(const QString&) ),
 	           SLOT( keyChanged(const QString&) ) );
  	connect( editor->LineEditValue, SIGNAL( textChanged(const QString&) ),
 	           SLOT( valueChanged(const QString&) ) );
 
  	setCurrent(0);
   editor->layoutType(EditWidget::File);
 }
 
 void MainWindow::makeMenu()
 {
   popupTimer = new QTimer(this);
   popupMenuFile = new QPopupMenu(this);
   popupMenuEntry = new QPopupMenu(this);
 
 	popupActionSave = new QAction( tr("Save"),QString::null,  0, this, 0 );
 	popupActionSave->addTo( popupMenuFile );
  // popupActionSave->addTo( popupMenuEntry );
   connect( popupActionSave, SIGNAL( activated() ),
 		  	 	this , SLOT( saveConfFile() ) );
 
 	popupActionRevert = new QAction( tr("Revert"),QString::null,  0, this, 0 );
 	popupActionRevert->addTo( popupMenuFile );
   popupActionRevert->addTo( popupMenuEntry );
   connect( popupActionRevert, SIGNAL( activated() ),
 		  	 	this , SLOT( revertConfFile() ) );
 
   popupActionDelete = new QAction( tr("Delete"),QString::null,  0, this, 0 );
 	popupActionDelete->addTo( popupMenuFile );
   popupActionDelete->addTo( popupMenuEntry );
   connect( popupActionDelete, SIGNAL( activated() ),
 		  	 	this , SLOT( removeConfFile() ) );
 
   connect( popupTimer, SIGNAL(timeout()),
 		  			this, SLOT(showPopup()) );
 }
 
 MainWindow::~MainWindow()
 {
 }
 
 
 
 void MainWindow::setCurrent(QListViewItem *item)
 {
@@ -125,79 +125,79 @@ void MainWindow::setCurrent(QListViewItem *item)
    	return;
   }
   _fileItem = 0;
  	_currentItem = (ListViewItemConfigEntry*)item;
   if (!_currentItem) return;
   QString file  = _currentItem->getFile();
   QString group = _currentItem->getGroup();
   QString key   = _currentItem->getKey();
   QString val   = _currentItem->getValue();
   editor->TextFileName->setText(file);
   editor->LineEditGroup->setText(group);
   if (!key.isEmpty())
   {
    	editor->layoutType(EditWidget::Entry);
     editor->LineEditKey->setText(key);
     editor->LineEditValue->setText(val);
   }else{
     editor->layoutType(EditWidget::Group);
   }
 }
 
 
 void MainWindow::groupChanged(const QString &g)
 {
 	if (!_currentItem) return;
 	_currentItem->setGroup(g);
 }
 
 void MainWindow::keyChanged(const QString &k)
 {
 	if (!_currentItem) return;
 	_currentItem->keyChanged(k);
 }
 
 void MainWindow::valueChanged(const QString &v)
 {
 	if (!_currentItem) return;
 	_currentItem->valueChanged(v);
 }
 
 
 void MainWindow::stopTimer( QListViewItem* )
 {
 	popupTimer->stop();
 }
 
 void MainWindow::saveConfFile()
 {
-	if (!_fileItem) return;	
+	if (!_fileItem) return;
  	_fileItem->save();
 }
 
 void MainWindow::revertConfFile()
 {
-	if (!_item) return;	
+	if (!_item) return;
  	_item->revert();
 }
 
 void MainWindow::removeConfFile()
 {
-	if (!_item) return;	
+	if (!_item) return;
  	_item->remove();
 }
 
 void MainWindow::showPopup()
 {
 qDebug("showPopup");
  	if (!_item) return;
  	popupActionRevert->setEnabled(_item->revertable());
 	popupActionSave->setEnabled(_item->isChanged());
  	if (_fileItem)
   {
  		popupActionSave->setEnabled(_fileItem->isChanged());
     popupMenuFile->popup( QCursor::pos() );
   }else if(_currentItem)
   {
     popupMenuEntry->popup( QCursor::pos() );
   }
 }
diff --git a/noncore/apps/confedit/mainwindow.h b/noncore/apps/confedit/mainwindow.h
index 5be4a86..878558a 100644
--- a/noncore/apps/confedit/mainwindow.h
+++ b/noncore/apps/confedit/mainwindow.h
@@ -1,68 +1,68 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qdialog.h>
 #include <qaction.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 #include "editwidget.h"
 
 class QPEToolBar;
 class ListViewItemConfFile;
 class ListViewConfDir;
 class ListViewItemConf;
 
-class MainWindow : public QDialog//QMainWindow
+class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 
 public:
   MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
   ~MainWindow();
 
 
 public slots:
   void setCurrent(QListViewItem*);
   void groupChanged(const QString&);
   void keyChanged(const QString&);
   void valueChanged(const QString&);
   void showPopup();
   void stopTimer( QListViewItem* );
   void saveConfFile();
   void revertConfFile();
   void removeConfFile();
 
 private:
 	ListViewConfDir *settingList;
  	EditWidget *editor;
   QVBoxLayout *mainLayout;
   ListViewItemConf *_item;
   ListViewItemConfigEntry *_currentItem;
   ListViewItemConfFile *_fileItem;
   QTimer *popupTimer;
   QPopupMenu *popupMenuFile;
   QPopupMenu *popupMenuEntry;
 	QAction *popupActionSave;
 	QAction *popupActionRevert;
 	QAction *popupActionDelete;
 	QAction *popupActionNew;
 //	QAction *popupAction;
 //	QAction *popupAction;
 
   void makeMenu();
 };
 
 #endif