author | tille <tille> | 2002-07-07 17:18:50 (UTC) |
---|---|---|
committer | tille <tille> | 2002-07-07 17:18:50 (UTC) |
commit | 04f29267e391eb4ad7ff9fc86468f6ccd1bd8f6d (patch) (unidiff) | |
tree | 91ed01ce29ec4dfd478f75239f874a22d1672a14 /noncore/apps | |
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 | 60 | ||||
-rw-r--r-- | noncore/apps/confedit/editwidget.h | 6 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewconfdir.cpp | 12 | ||||
-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 | 17 | ||||
-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, 108 insertions, 64 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 | |||
@@ -19,6 +19,7 @@ EditWidget::EditWidget( QWidget* parent, const char* name, WFlags fl ) | |||
19 | EditWidgetLayout = new QGridLayout( this ); | 19 | EditWidgetLayout = new QGridLayout( this ); |
20 | EditWidgetLayout->setSpacing( 3 ); | 20 | EditWidgetLayout->setSpacing( 0 ); |
21 | EditWidgetLayout->setMargin( 3 ); | 21 | EditWidgetLayout->setMargin( 0 ); |
22 | // setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) ); | ||
22 | 23 | ||
23 | QLabel *TextLabelFileName = new QLabel( this, "TextLabelFileName" ); | 24 | TextLabelFileName = new QLabel( this, "TextLabelFileName" ); |
24 | TextLabelFileName->setText( tr( "File Name:" ) ); | 25 | TextLabelFileName->setText( tr( "File Name:" ) ); |
@@ -28,3 +29,3 @@ EditWidget::EditWidget( QWidget* parent, const char* name, WFlags fl ) | |||
28 | 29 | ||
29 | QLabel *TextLabelGroup = new QLabel( this, "TextLabelGroup" ); | 30 | TextLabelGroup = new QLabel( this, "TextLabelGroup" ); |
30 | TextLabelGroup->setText( tr( "Group:" ) ); | 31 | TextLabelGroup->setText( tr( "Group:" ) ); |
@@ -46,2 +47,3 @@ EditWidget::EditWidget( QWidget* parent, const char* name, WFlags fl ) | |||
46 | 47 | ||
48 | // layoutType(Nothing); | ||
47 | } | 49 | } |
@@ -54,19 +56,41 @@ EditWidget::~EditWidget() | |||
54 | 56 | ||
55 | void EditWidget::isKey(bool h) | 57 | void EditWidget::layoutType(int t) |
56 | { | 58 | { |
57 | if (h) | 59 | switch (t) |
58 | { | 60 | { |
59 | LineEditGroup->setEnabled(false); | 61 | case Entry: |
60 | TextLabelKey->show(); | 62 | LineEditGroup->setEnabled(false); |
61 | LineEditKey->show(); | 63 | TextLabelKey->show(); |
62 | TextLabelValue->show(); | 64 | LineEditKey->show(); |
63 | LineEditValue->show(); | 65 | TextLabelValue->show(); |
64 | }else{ | 66 | LineEditValue->show(); |
65 | LineEditGroup->setEnabled(true); | 67 | TextLabelGroup->show(); |
66 | TextLabelKey->hide(); | 68 | LineEditGroup->show(); |
67 | LineEditKey->hide(); | 69 | TextLabelFileName->show(); |
68 | TextLabelValue->hide(); | 70 | TextFileName->show(); |
69 | LineEditValue->hide(); | 71 | break; |
72 | case Group: | ||
73 | LineEditGroup->setEnabled(true); | ||
74 | TextLabelKey->hide(); | ||
75 | LineEditKey->hide(); | ||
76 | TextLabelValue->hide(); | ||
77 | LineEditValue->hide(); | ||
78 | TextLabelGroup->show(); | ||
79 | LineEditGroup->show(); | ||
80 | TextLabelFileName->show(); | ||
81 | TextFileName->show(); | ||
82 | break; | ||
83 | default: | ||
84 | TextLabelKey->hide(); | ||
85 | LineEditKey->hide(); | ||
86 | TextLabelValue->hide(); | ||
87 | LineEditValue->hide(); | ||
88 | TextLabelGroup->hide(); | ||
89 | LineEditGroup->hide(); | ||
90 | TextLabelFileName->hide(); | ||
91 | TextFileName->hide(); | ||
70 | } | 92 | } |
71 | update(); | 93 | // update(); |
94 | // updateGeometry(); | ||
95 | // adjustSize(); | ||
72 | } | 96 | } |
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 | |||
@@ -20,2 +20,4 @@ class EditWidget : public QWidget | |||
20 | public: | 20 | public: |
21 | enum{ Entry, Group, File, Nothing}; | ||
22 | |||
21 | EditWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 23 | EditWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
@@ -25,2 +27,4 @@ public: | |||
25 | QLabel *TextLabelValue; | 27 | QLabel *TextLabelValue; |
28 | QLabel *TextLabelGroup; | ||
29 | QLabel *TextLabelFileName; | ||
26 | QLabel *TextFileName; | 30 | QLabel *TextFileName; |
@@ -29,3 +33,3 @@ public: | |||
29 | QLineEdit *LineEditValue; | 33 | QLineEdit *LineEditValue; |
30 | void isKey(bool h); | 34 | void layoutType(int t); |
31 | protected: | 35 | protected: |
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 | |||
@@ -26,2 +26,4 @@ ListViewConfDir::ListViewConfDir(QString settingsPath, QWidget *parent, const ch | |||
26 | readConfFiles(); | 26 | readConfFiles(); |
27 | |||
28 | connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); | ||
27 | } | 29 | } |
@@ -49,5 +51,11 @@ void ListViewConfDir::readConfFiles() | |||
49 | fileEntry = new ListViewItemConfFile( fi, this ); | 51 | fileEntry = new ListViewItemConfFile( fi, this ); |
50 | 52 | QListViewItem *dummy = new QListViewItem(fileEntry, "dummy"); | |
51 | ++it; | 53 | ++it; |
52 | } | 54 | } |
53 | } \ No newline at end of file | 55 | } |
56 | |||
57 | void ListViewConfDir::expand(QListViewItem *item) | ||
58 | { | ||
59 | ((ListViewItemConf*)item)->expand(); | ||
60 | } | ||
61 | |||
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 | |||
@@ -25,3 +25,4 @@ public: | |||
25 | ~ListViewConfDir(); | 25 | ~ListViewConfDir(); |
26 | 26 | protected slots: | |
27 | void expand(QListViewItem*); | ||
27 | private: | 28 | private: |
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 | |||
@@ -29,2 +29,3 @@ public: | |||
29 | virtual void displayText() = 0; | 29 | virtual void displayText() = 0; |
30 | virtual void expand() = 0; | ||
30 | virtual void changed(); | 31 | virtual void changed(); |
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 | |||
@@ -22,3 +22,3 @@ ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent) | |||
22 | confFileInfo = file; | 22 | confFileInfo = file; |
23 | parseFile(); | 23 | // parseFile(); |
24 | displayText(); | 24 | displayText(); |
@@ -43,2 +43,3 @@ void ListViewItemConfFile::parseFile() | |||
43 | { | 43 | { |
44 | //qDebug("ListViewItemConfFile::parseFile BEGIN"); | ||
44 | QFile confFile(confFileInfo->absFilePath()); | 45 | QFile confFile(confFileInfo->absFilePath()); |
@@ -54,3 +55,3 @@ void ListViewItemConfFile::parseFile() | |||
54 | s = t.readLine().stripWhiteSpace(); | 55 | s = t.readLine().stripWhiteSpace(); |
55 | //qDebug( "line: >%s<\n", s.latin1() ); | 56 | //qDebug( "line: >%s<\n", s.latin1() ); |
56 | if (s.contains("<?xml")) | 57 | if (s.contains("<?xml")) |
@@ -64,2 +65,3 @@ void ListViewItemConfFile::parseFile() | |||
64 | group = s.mid(1,s.length()-2); | 65 | group = s.mid(1,s.length()-2); |
66 | if (!groupItem) groupItem = new ListViewItemConfigEntry(this, tr("no group") ); | ||
65 | groupItem = new ListViewItemConfigEntry(this, group ); | 67 | groupItem = new ListViewItemConfigEntry(this, group ); |
@@ -69,3 +71,4 @@ void ListViewItemConfFile::parseFile() | |||
69 | { | 71 | { |
70 | // qDebug("got key"+s); | 72 | // qDebug("got key"+s); |
73 | if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1()); | ||
71 | item = new ListViewItemConfigEntry(this, group, s ); | 74 | item = new ListViewItemConfigEntry(this, group, s ); |
@@ -75,4 +78,4 @@ void ListViewItemConfFile::parseFile() | |||
75 | confFile.close(); | 78 | confFile.close(); |
76 | unchanged(); | ||
77 | setExpandable( _valid ); | 79 | setExpandable( _valid ); |
80 | //qDebug("ListViewItemConfFile::parseFile END"); | ||
78 | } | 81 | } |
@@ -142 +145,7 @@ QString ListViewItemConfFile::backupFileName() | |||
142 | } | 145 | } |
146 | |||
147 | |||
148 | void ListViewItemConfFile::expand() | ||
149 | { | ||
150 | parseFile(); | ||
151 | } | ||
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 | |||
@@ -24,3 +24,2 @@ public: | |||
24 | ~ListViewItemConfFile(); | 24 | ~ListViewItemConfFile(); |
25 | void parseFile(); | ||
26 | QString fileName(); | 25 | QString fileName(); |
@@ -31,3 +30,5 @@ public: | |||
31 | virtual void remove(); | 30 | virtual void remove(); |
31 | virtual void expand(); | ||
32 | QString backupFileName(); | 32 | QString backupFileName(); |
33 | void parseFile(); | ||
33 | protected: | 34 | protected: |
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 | |||
@@ -24,3 +24,2 @@ ListViewItemConfigEntry::ListViewItemConfigEntry(ListViewItemConfFile *parent, Q | |||
24 | _valueOrig = _value; | 24 | _valueOrig = _value; |
25 | _fileItem->unchanged(); | ||
26 | } | 25 | } |
@@ -145,2 +144,8 @@ void ListViewItemConfigEntry::revert() | |||
145 | displayText(); | 144 | displayText(); |
145 | } | ||
146 | |||
147 | |||
148 | void ListViewItemConfigEntry::expand() | ||
149 | { | ||
150 | |||
146 | } \ No newline at end of file | 151 | } \ 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 | |||
@@ -37,2 +37,3 @@ public: | |||
37 | virtual void remove(); | 37 | virtual void remove(); |
38 | virtual void expand(); | ||
38 | void save(QTextStream*); | 39 | void save(QTextStream*); |
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 @@ | |||
19 | #include <qpe/qpetoolbar.h> | 19 | #include <qpe/qpetoolbar.h> |
20 | #include <qpe/qpeapplication.h> | ||
20 | #include <qaction.h> | 21 | #include <qaction.h> |
@@ -36,3 +37,3 @@ | |||
36 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | 37 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : |
37 | QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0) | 38 | QDialog( parent, name, f ), _currentItem(0), _fileItem(0) |
38 | { | 39 | { |
@@ -40,19 +41,20 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
40 | 41 | ||
41 | QWidget *mainWidget = new QWidget(this); | 42 | //setBaseSize( qApp->globalStrut() ); |
42 | setCentralWidget( mainWidget); | 43 | setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) ); |
43 | QGridLayout *mainLayout = new QGridLayout( mainWidget ); | ||
44 | mainLayout->setSpacing( 3 ); | ||
45 | mainLayout->setMargin( 3 ); | ||
46 | 44 | ||
45 | mainLayout = new QVBoxLayout( this ); | ||
46 | mainLayout->setSpacing( 0 ); | ||
47 | mainLayout->setMargin( 0 ); | ||
47 | 48 | ||
48 | qDebug("settingList"); | 49 | |
50 | qDebug("creating settingList"); | ||
49 | settingList = new ListViewConfDir( "/root/Settings/", this, "settingslist"); | 51 | settingList = new ListViewConfDir( "/root/Settings/", this, "settingslist"); |
50 | settingList->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding));//, sizePolicy().hasHeightForWidth() ) ); | 52 | settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) ); |
51 | mainLayout->addWidget( settingList, 0, 0 ); | 53 | mainLayout->addWidget( settingList, 0); |
52 | 54 | ||
53 | qDebug("editor"); | 55 | qDebug("creating editor"); |
54 | editor = new EditWidget(this); | 56 | editor = new EditWidget(this); |
55 | editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum));//, sizePolicy().hasHeightForWidth() ) ); | 57 | editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) ); |
56 | // editor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3));//, sizePolicy().hasHeightForWidth() ) ); | 58 | mainLayout->addWidget( editor, 1 ); |
57 | mainLayout->addWidget( editor, 1, 0 ); | 59 | editor->layoutType( ListViewItemConf::File ); |
58 | 60 | ||
@@ -60,6 +62,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
60 | 62 | ||
61 | qDebug("connect"); | ||
62 | connect(settingList, SIGNAL( pressed(QListViewItem*) ), | 63 | connect(settingList, SIGNAL( pressed(QListViewItem*) ), |
63 | this, SLOT(setCurrent(QListViewItem*))); | 64 | this, SLOT(setCurrent(QListViewItem*))); |
64 | 65 | connect( settingList, SIGNAL( clicked( QListViewItem* ) ), | |
66 | this, SLOT( stopTimer( QListViewItem* ) ) ); | ||
65 | 67 | ||
@@ -71,7 +73,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
71 | SLOT( valueChanged(const QString&) ) ); | 73 | SLOT( valueChanged(const QString&) ) ); |
72 | // qDebug("editor->hide()"); | 74 | |
73 | // editor->hide(); | ||
74 | qDebug("connect"); | ||
75 | connect( settingList, SIGNAL( clicked( QListViewItem* ) ), | ||
76 | this, SLOT( stopTimer( QListViewItem* ) ) ); | ||
77 | setCurrent(0); | 75 | setCurrent(0); |
@@ -81,4 +79,2 @@ void MainWindow::makeMenu() | |||
81 | { | 79 | { |
82 | qDebug("MainWindow::makeMenu()"); | ||
83 | |||
84 | popupTimer = new QTimer(this); | 80 | popupTimer = new QTimer(this); |
@@ -87,3 +83,2 @@ void MainWindow::makeMenu() | |||
87 | 83 | ||
88 | qDebug("Save"); | ||
89 | popupActionSave = new QAction( tr("Save"),QString::null, 0, this, 0 ); | 84 | popupActionSave = new QAction( tr("Save"),QString::null, 0, this, 0 ); |
@@ -94,3 +89,2 @@ void MainWindow::makeMenu() | |||
94 | 89 | ||
95 | qDebug("Revert"); | ||
96 | popupActionRevert = new QAction( tr("Revert"),QString::null, 0, this, 0 ); | 90 | popupActionRevert = new QAction( tr("Revert"),QString::null, 0, this, 0 ); |
@@ -101,3 +95,2 @@ void MainWindow::makeMenu() | |||
101 | 95 | ||
102 | qDebug("Delete"); | ||
103 | popupActionDelete = new QAction( tr("Delete"),QString::null, 0, this, 0 ); | 96 | popupActionDelete = new QAction( tr("Delete"),QString::null, 0, this, 0 ); |
@@ -108,6 +101,4 @@ void MainWindow::makeMenu() | |||
108 | 101 | ||
109 | qDebug("connect"); | ||
110 | connect( popupTimer, SIGNAL(timeout()), | 102 | connect( popupTimer, SIGNAL(timeout()), |
111 | this, SLOT(showPopup()) ); | 103 | this, SLOT(showPopup()) ); |
112 | qDebug("connect"); | ||
113 | } | 104 | } |
@@ -122,3 +113,3 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
122 | { | 113 | { |
123 | editor->hide(); | 114 | //qDebug("MainWindow::setCurrent"); |
124 | if (!item) return; | 115 | if (!item) return; |
@@ -129,3 +120,3 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
129 | { | 120 | { |
130 | updateGeometry(); | 121 | editor->layoutType(EditWidget::File); |
131 | _currentItem=0; | 122 | _currentItem=0; |
@@ -134,3 +125,2 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
134 | } | 125 | } |
135 | editor->show(); | ||
136 | _fileItem = 0; | 126 | _fileItem = 0; |
@@ -146,3 +136,3 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
146 | { | 136 | { |
147 | editor->isKey(true); | 137 | editor->layoutType(EditWidget::Entry); |
148 | editor->LineEditKey->setText(key); | 138 | editor->LineEditKey->setText(key); |
@@ -150,7 +140,4 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
150 | }else{ | 140 | }else{ |
151 | editor->isKey(false); | 141 | editor->layoutType(EditWidget::Group); |
152 | } | 142 | } |
153 | updateGeometry(); | ||
154 | editor->updateGeometry(); | ||
155 | settingList->updateGeometry(); | ||
156 | } | 143 | } |
@@ -199,2 +186,3 @@ void MainWindow::removeConfFile() | |||
199 | } | 186 | } |
187 | |||
200 | void MainWindow::showPopup() | 188 | void MainWindow::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 | |||
@@ -15,2 +15,3 @@ | |||
15 | #include <qmainwindow.h> | 15 | #include <qmainwindow.h> |
16 | #include <qdialog.h> | ||
16 | #include <qaction.h> | 17 | #include <qaction.h> |
@@ -25,3 +26,3 @@ class ListViewItemConf; | |||
25 | 26 | ||
26 | class MainWindow : public QMainWindow | 27 | class MainWindow : public QDialog//QMainWindow |
27 | { | 28 | { |
@@ -49,2 +50,3 @@ private: | |||
49 | EditWidget *editor; | 50 | EditWidget *editor; |
51 | QVBoxLayout *mainLayout; | ||
50 | ListViewItemConf *_item; | 52 | ListViewItemConf *_item; |