Diffstat (limited to 'noncore/apps/confedit/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp index 47d9518..77b91f6 100644 --- a/noncore/apps/confedit/mainwindow.cpp +++ b/noncore/apps/confedit/mainwindow.cpp | |||
@@ -40,5 +40,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
40 | 40 | ||
41 | popupTimer = new QTimer(this); | ||
42 | popupMenu = new QPopupMenu(this); | ||
43 | |||
44 | QWidget *mainWidget = new QWidget(this); | 41 | QWidget *mainWidget = new QWidget(this); |
@@ -60,6 +57,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
60 | 57 | ||
61 | connect( popupTimer, SIGNAL(timeout()), | ||
62 | this, SLOT(showPopup()) ); | ||
63 | connect( settingList, SIGNAL( clicked( QListViewItem* ) ), | ||
64 | this, SLOT( stopTimer( QListViewItem* ) ) ); | ||
65 | 58 | ||
@@ -78,2 +71,18 @@ void MainWindow::makeMenu() | |||
78 | 71 | ||
72 | popupTimer = new QTimer(this); | ||
73 | popupMenuFile = new QPopupMenu(this); | ||
74 | |||
75 | popupActionSave = new QAction( tr("Save"),QString::null, 0, this, 0 ); | ||
76 | popupActionSave->addTo( popupMenuFile ); | ||
77 | connect( popupActionSave, SIGNAL( activated() ), | ||
78 | this , SLOT( saveConfFile() ) ); | ||
79 | popupActionRevert = new QAction( tr("Revert"),QString::null, 0, this, 0 ); | ||
80 | popupActionRevert->addTo( popupMenuFile ); | ||
81 | connect( popupActionRevert, SIGNAL( activated() ), | ||
82 | this , SLOT( revertConfFile() ) ); | ||
83 | |||
84 | connect( popupTimer, SIGNAL(timeout()), | ||
85 | this, SLOT(showPopup()) ); | ||
86 | connect( settingList, SIGNAL( clicked( QListViewItem* ) ), | ||
87 | this, SLOT( stopTimer( QListViewItem* ) ) ); | ||
79 | } | 88 | } |
@@ -153,16 +162,20 @@ void MainWindow::saveConfFile() | |||
153 | 162 | ||
154 | void MainWindow::showPopup() | 163 | void MainWindow::revertConfFile() |
155 | { | 164 | { |
156 | qDebug("showPopup"); | ||
157 | if (!_fileItem) return; | 165 | if (!_fileItem) return; |
158 | popupMenu->clear(); | 166 | _fileItem->revert(); |
159 | 167 | } | |
160 | QAction *popupAction; | ||
161 | popupAction = new QAction( tr("Save"),QString::null, 0, this, 0 ); | ||
162 | popupAction->addTo( popupMenu ); | ||
163 | connect( popupAction, SIGNAL( activated() ), | ||
164 | this , SLOT( saveConfFile() ) ); | ||
165 | 168 | ||
169 | void MainWindow::showPopup() | ||
170 | { | ||
171 | qDebug("showPopup"); | ||
172 | if (_fileItem) | ||
173 | { | ||
174 | popupActionSave->setEnabled(_fileItem->isChanged()); | ||
175 | popupActionRevert->setEnabled(_fileItem->revertable()); | ||
176 | popupMenuFile->popup( QCursor::pos() ); | ||
177 | }else if(_currentItem->isChanged()) | ||
178 | { | ||
166 | 179 | ||
167 | popupMenu->popup( QCursor::pos() ); | 180 | } |
168 | } | 181 | } |