Merge commit 'refs/merge-requests/7' of git://gitorious.org/owncloud/mirall into merge-requests/7

This commit is contained in:
Klaas Freitag 2012-07-26 11:45:30 +03:00
commit 90c4e422d8
2 changed files with 14 additions and 0 deletions

View file

@ -156,6 +156,13 @@ LogBrowser::LogBrowser(QWidget *parent) :
mainLayout->addWidget( btnbox );
// clear button
_clearBtn = new QPushButton;
_clearBtn->setText( tr("Clear") );
_clearBtn->setToolTip( tr("Clear the log display.") );
btnbox->addButton(_clearBtn, QDialogButtonBox::ActionRole);
connect( _clearBtn, SIGNAL(clicked()), this, SLOT(slotClearLog()));
// save Button
_saveBtn = new QPushButton;
_saveBtn->setText( tr("S&ave") );
@ -261,4 +268,9 @@ void LogBrowser::slotSave()
}
void LogBrowser::slotClearLog()
{
_logWidget->clear();
}
} // namespace

View file

@ -93,11 +93,13 @@ protected slots:
void slotFind();
void search( const QString& );
void slotSave();
void slotClearLog();
private:
LogWidget *_logWidget;
QLineEdit *_findTermEdit;
QPushButton *_saveBtn;
QPushButton *_clearBtn;
QLabel *_statusLabel;
QFile _logFile;