author | tille <tille> | 2002-07-07 17:18:50 (UTC) |
---|---|---|
committer | tille <tille> | 2002-07-07 17:18:50 (UTC) |
commit | 04f29267e391eb4ad7ff9fc86468f6ccd1bd8f6d (patch) (side-by-side diff) | |
tree | 91ed01ce29ec4dfd478f75239f874a22d1672a14 /noncore/apps/confedit | |
parent | a72877e867e70784e3c865fa2948ac40f72b5c39 (diff) | |
download | opie-04f29267e391eb4ad7ff9fc86468f6ccd1bd8f6d.zip opie-04f29267e391eb4ad7ff9fc86468f6ccd1bd8f6d.tar.gz opie-04f29267e391eb4ad7ff9fc86468f6ccd1bd8f6d.tar.bz2 |
better layout
-rw-r--r-- | noncore/apps/confedit/editwidget.cpp | 40 | ||||
-rw-r--r-- | noncore/apps/confedit/editwidget.h | 6 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewconfdir.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewconfdir.h | 3 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconf.h | 1 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconffile.cpp | 13 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconffile.h | 3 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconfigentry.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconfigentry.h | 1 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 58 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.h | 4 |
11 files changed, 95 insertions, 51 deletions
diff --git a/noncore/apps/confedit/editwidget.cpp b/noncore/apps/confedit/editwidget.cpp index 64f968a..f7dc408 100644 --- a/noncore/apps/confedit/editwidget.cpp +++ b/noncore/apps/confedit/editwidget.cpp @@ -17,16 +17,17 @@ EditWidget::EditWidget( QWidget* parent, const char* name, WFlags fl ) { EditWidgetLayout = new QGridLayout( this ); - EditWidgetLayout->setSpacing( 3 ); - EditWidgetLayout->setMargin( 3 ); + EditWidgetLayout->setSpacing( 0 ); + EditWidgetLayout->setMargin( 0 ); +// setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) ); - QLabel *TextLabelFileName = new QLabel( this, "TextLabelFileName" ); + TextLabelFileName = new QLabel( this, "TextLabelFileName" ); TextLabelFileName->setText( tr( "File Name:" ) ); EditWidgetLayout->addWidget( TextLabelFileName, 0, 0 ); TextFileName = new QLabel( this, "TextFileName" ); EditWidgetLayout->addWidget( TextFileName, 0, 1 ); - QLabel *TextLabelGroup = new QLabel( this, "TextLabelGroup" ); + TextLabelGroup = new QLabel( this, "TextLabelGroup" ); TextLabelGroup->setText( tr( "Group:" ) ); EditWidgetLayout->addWidget( TextLabelGroup, 1, 0 ); LineEditGroup = new QLineEdit( this, "LineEditGroup" ); @@ -44,6 +45,7 @@ EditWidget::EditWidget( QWidget* parent, const char* name, WFlags fl ) LineEditValue = new QLineEdit( this, "LineEditValue" ); EditWidgetLayout->addWidget( LineEditValue, 3, 1 ); + // layoutType(Nothing); } @@ -52,22 +54,44 @@ EditWidget::~EditWidget() } -void EditWidget::isKey(bool h) +void EditWidget::layoutType(int t) { - if (h) + switch (t) { + case Entry: LineEditGroup->setEnabled(false); TextLabelKey->show(); LineEditKey->show(); TextLabelValue->show(); LineEditValue->show(); - }else{ + TextLabelGroup->show(); + LineEditGroup->show(); + TextLabelFileName->show(); + TextFileName->show(); + break; + case Group: LineEditGroup->setEnabled(true); TextLabelKey->hide(); LineEditKey->hide(); TextLabelValue->hide(); LineEditValue->hide(); + TextLabelGroup->show(); + LineEditGroup->show(); + TextLabelFileName->show(); + TextFileName->show(); + break; + default: + TextLabelKey->hide(); + LineEditKey->hide(); + TextLabelValue->hide(); + LineEditValue->hide(); + TextLabelGroup->hide(); + LineEditGroup->hide(); + TextLabelFileName->hide(); + TextFileName->hide(); } - update(); +// update(); +// updateGeometry(); +// adjustSize(); } diff --git a/noncore/apps/confedit/editwidget.h b/noncore/apps/confedit/editwidget.h index 673166f..8261c85 100644 --- a/noncore/apps/confedit/editwidget.h +++ b/noncore/apps/confedit/editwidget.h @@ -18,16 +18,20 @@ class EditWidget : public QWidget Q_OBJECT public: + enum{ Entry, Group, File, Nothing}; + EditWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~EditWidget(); QLabel *TextLabelKey; QLabel *TextLabelValue; + QLabel *TextLabelGroup; + QLabel *TextLabelFileName; QLabel *TextFileName; QLineEdit *LineEditGroup; QLineEdit *LineEditKey; QLineEdit *LineEditValue; - void isKey(bool h); + void layoutType(int t); protected: QGridLayout* EditWidgetLayout; diff --git a/noncore/apps/confedit/listviewconfdir.cpp b/noncore/apps/confedit/listviewconfdir.cpp index f466f06..0c2feeb 100644 --- a/noncore/apps/confedit/listviewconfdir.cpp +++ b/noncore/apps/confedit/listviewconfdir.cpp @@ -24,6 +24,8 @@ ListViewConfDir::ListViewConfDir(QString settingsPath, QWidget *parent, const ch if (!confDir.isReadable()) QMessageBox::critical(this,tr("Could not open"),tr("The directory ")+settingsPath+tr(" could not be opened."),1,0); readConfFiles(); + + connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); } @@ -47,7 +49,13 @@ void ListViewConfDir::readConfFiles() { qDebug( "opening: >%s<", fi->fileName().data() ); fileEntry = new ListViewItemConfFile( fi, this ); - + QListViewItem *dummy = new QListViewItem(fileEntry, "dummy"); ++it; } }
\ No newline at end of file + +void ListViewConfDir::expand(QListViewItem *item) +{ + ((ListViewItemConf*)item)->expand(); +} + diff --git a/noncore/apps/confedit/listviewconfdir.h b/noncore/apps/confedit/listviewconfdir.h index 3131972..978007b 100644 --- a/noncore/apps/confedit/listviewconfdir.h +++ b/noncore/apps/confedit/listviewconfdir.h @@ -23,7 +23,8 @@ class ListViewConfDir : public QListView { public: ListViewConfDir(QString settingsPath, QWidget *parent=0, const char *name=0); ~ListViewConfDir(); - +protected slots: + void expand(QListViewItem*); private: QDir confDir; diff --git a/noncore/apps/confedit/listviewitemconf.h b/noncore/apps/confedit/listviewitemconf.h index 3c504ed..c005475 100644 --- a/noncore/apps/confedit/listviewitemconf.h +++ b/noncore/apps/confedit/listviewitemconf.h @@ -27,6 +27,7 @@ public: virtual void revert() = 0; virtual void remove() = 0; virtual void displayText() = 0; + virtual void expand() = 0; virtual void changed(); bool isChanged() {return _changed;}; virtual void unchanged(); diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp index 228421b..1f85095 100644 --- a/noncore/apps/confedit/listviewitemconffile.cpp +++ b/noncore/apps/confedit/listviewitemconffile.cpp @@ -20,7 +20,7 @@ ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent) : ListViewItemConf(parent), _valid(false) { confFileInfo = file; - parseFile(); +// parseFile(); displayText(); } @@ -41,6 +41,7 @@ QString ListViewItemConfFile::fileName() void ListViewItemConfFile::parseFile() { + //qDebug("ListViewItemConfFile::parseFile BEGIN"); QFile confFile(confFileInfo->absFilePath()); if(! confFile.open(IO_ReadOnly)) QMessageBox::critical(0,tr("Could not open"),tr("The file ")+confFileInfo->fileName()+tr(" could not be opened."),1,0); @@ -62,19 +63,21 @@ void ListViewItemConfFile::parseFile() { // qDebug("got group"+s); group = s.mid(1,s.length()-2); + if (!groupItem) groupItem = new ListViewItemConfigEntry(this, tr("no group") ); groupItem = new ListViewItemConfigEntry(this, group ); insertItem( groupItem ); } else if ( int pos = s.find('=') ) { // qDebug("got key"+s); + if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1()); item = new ListViewItemConfigEntry(this, group, s ); groupItem->insertItem( item ); } } confFile.close(); - unchanged(); setExpandable( _valid ); +// qDebug("ListViewItemConfFile::parseFile END"); } @@ -140,3 +143,9 @@ QString ListViewItemConfFile::backupFileName() { return confFileInfo->absFilePath()+"~"; } + + +void ListViewItemConfFile::expand() +{ + parseFile(); +} diff --git a/noncore/apps/confedit/listviewitemconffile.h b/noncore/apps/confedit/listviewitemconffile.h index 679a2ed..18937af 100644 --- a/noncore/apps/confedit/listviewitemconffile.h +++ b/noncore/apps/confedit/listviewitemconffile.h @@ -22,14 +22,15 @@ class ListViewItemConfFile : public ListViewItemConf { public: ListViewItemConfFile(QFileInfo *file, QListView *parent=0); ~ListViewItemConfFile(); - void parseFile(); QString fileName(); void save(); virtual void displayText(); virtual bool revertable(); virtual void revert(); virtual void remove(); + virtual void expand(); QString backupFileName(); + void parseFile(); protected: private: bool _valid; diff --git a/noncore/apps/confedit/listviewitemconfigentry.cpp b/noncore/apps/confedit/listviewitemconfigentry.cpp index b947514..5ef9f61 100644 --- a/noncore/apps/confedit/listviewitemconfigentry.cpp +++ b/noncore/apps/confedit/listviewitemconfigentry.cpp @@ -22,7 +22,6 @@ ListViewItemConfigEntry::ListViewItemConfigEntry(ListViewItemConfFile *parent, Q _groupOrig = group; _keyOrig = _key; _valueOrig = _value; - _fileItem->unchanged(); } ListViewItemConfigEntry::~ListViewItemConfigEntry() @@ -144,3 +143,9 @@ void ListViewItemConfigEntry::revert() _changed=false; displayText(); }
\ No newline at end of file + + +void ListViewItemConfigEntry::expand() +{ + +}
\ No newline at end of file diff --git a/noncore/apps/confedit/listviewitemconfigentry.h b/noncore/apps/confedit/listviewitemconfigentry.h index 6b651a6..c5f8737 100644 --- a/noncore/apps/confedit/listviewitemconfigentry.h +++ b/noncore/apps/confedit/listviewitemconfigentry.h @@ -35,6 +35,7 @@ public: virtual void displayText(); virtual void changed(); virtual void remove(); + virtual void expand(); void save(QTextStream*); virtual void revert(); private: 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 @@ -17,6 +17,7 @@ #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> @@ -34,34 +35,35 @@ 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) { setCaption( tr("Conf File Editor") ); - 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 ); makeMenu(); - qDebug("connect"); connect(settingList, SIGNAL( pressed(QListViewItem*) ), this, SLOT(setCurrent(QListViewItem*))); - + connect( settingList, SIGNAL( clicked( QListViewItem* ) ), + this, SLOT( stopTimer( QListViewItem* ) ) ); connect( editor->LineEditGroup, SIGNAL( textChanged(const QString&) ), SLOT( groupChanged(const QString&) ) ); @@ -69,47 +71,36 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : SLOT( keyChanged(const QString&) ) ); connect( editor->LineEditValue, SIGNAL( textChanged(const QString&) ), SLOT( valueChanged(const QString&) ) ); -// qDebug("editor->hide()"); -// editor->hide(); - qDebug("connect"); - connect( settingList, SIGNAL( clicked( QListViewItem* ) ), - this, SLOT( stopTimer( QListViewItem* ) ) ); + setCurrent(0); } void MainWindow::makeMenu() { - qDebug("MainWindow::makeMenu()"); - popupTimer = new QTimer(this); popupMenuFile = new QPopupMenu(this); popupMenuEntry = new QPopupMenu(this); - qDebug("Save"); popupActionSave = new QAction( tr("Save"),QString::null, 0, this, 0 ); popupActionSave->addTo( popupMenuFile ); // popupActionSave->addTo( popupMenuEntry ); connect( popupActionSave, SIGNAL( activated() ), this , SLOT( saveConfFile() ) ); - qDebug("Revert"); popupActionRevert = new QAction( tr("Revert"),QString::null, 0, this, 0 ); popupActionRevert->addTo( popupMenuFile ); popupActionRevert->addTo( popupMenuEntry ); connect( popupActionRevert, SIGNAL( activated() ), this , SLOT( revertConfFile() ) ); - qDebug("Delete"); popupActionDelete = new QAction( tr("Delete"),QString::null, 0, this, 0 ); popupActionDelete->addTo( popupMenuFile ); popupActionDelete->addTo( popupMenuEntry ); connect( popupActionDelete, SIGNAL( activated() ), this , SLOT( removeConfFile() ) ); - qDebug("connect"); connect( popupTimer, SIGNAL(timeout()), this, SLOT(showPopup()) ); - qDebug("connect"); } MainWindow::~MainWindow() @@ -120,19 +111,18 @@ MainWindow::~MainWindow() void MainWindow::setCurrent(QListViewItem *item) { - editor->hide(); +// qDebug("MainWindow::setCurrent"); if (!item) return; _item = (ListViewItemConf*) item; if (!_item) return; popupTimer->start( 750, true ); if (_item->getType() == ListViewItemConf::File) { - updateGeometry(); + editor->layoutType(EditWidget::File); _currentItem=0; _fileItem = (ListViewItemConfFile*)item; return; } - editor->show(); _fileItem = 0; _currentItem = (ListViewItemConfigEntry*)item; if (!_currentItem) return; @@ -144,15 +134,12 @@ void MainWindow::setCurrent(QListViewItem *item) editor->LineEditGroup->setText(group); if (!key.isEmpty()) { - editor->isKey(true); + editor->layoutType(EditWidget::Entry); editor->LineEditKey->setText(key); editor->LineEditValue->setText(val); }else{ - editor->isKey(false); + editor->layoutType(EditWidget::Group); } - updateGeometry(); - editor->updateGeometry(); - settingList->updateGeometry(); } @@ -197,6 +184,7 @@ void MainWindow::removeConfFile() if (!_item) return; _item->remove(); } + void MainWindow::showPopup() { qDebug("showPopup"); diff --git a/noncore/apps/confedit/mainwindow.h b/noncore/apps/confedit/mainwindow.h index 886b829..5be4a86 100644 --- a/noncore/apps/confedit/mainwindow.h +++ b/noncore/apps/confedit/mainwindow.h @@ -13,6 +13,7 @@ #define MAINWINDOW_H #include <qmainwindow.h> +#include <qdialog.h> #include <qaction.h> #include <qtimer.h> #include <qpopupmenu.h> @@ -23,7 +24,7 @@ class ListViewItemConfFile; class ListViewConfDir; class ListViewItemConf; -class MainWindow : public QMainWindow +class MainWindow : public QDialog//QMainWindow { Q_OBJECT @@ -47,6 +48,7 @@ public slots: private: ListViewConfDir *settingList; EditWidget *editor; + QVBoxLayout *mainLayout; ListViewItemConf *_item; ListViewItemConfigEntry *_currentItem; ListViewItemConfFile *_fileItem; |