Merge Profile::HistoryModeEnum and HistorySizeDialog::HistoryMode into Enum::HistoryMode Enum

This commit is contained in:
Jekyll Wu
2012-03-16 14:31:04 +08:00
parent ddfe560885
commit 683f2c9ec5
8 changed files with 92 additions and 67 deletions

View File

@@ -60,6 +60,7 @@
#include "ProfileList.h"
#include "TerminalDisplay.h"
#include "SessionManager.h"
#include "Enumeration.h"
// for SaveHistoryTask
#include <KFileDialog>
@@ -1039,13 +1040,13 @@ void SessionController::showHistoryOptions()
if (currentHistory.isEnabled()) {
if (currentHistory.isUnlimited()) {
dialog->setMode(HistorySizeDialog::UnlimitedHistory);
dialog->setMode(Enum::UnlimitedHistory);
} else {
dialog->setMode(HistorySizeDialog::FixedSizeHistory);
dialog->setMode(Enum::FixedSizeHistory);
dialog->setLineCount(currentHistory.maximumLineCount());
}
} else {
dialog->setMode(HistorySizeDialog::NoHistory);
dialog->setMode(Enum::NoHistory);
}
connect(dialog, SIGNAL(optionsChanged(int,int)),
@@ -1061,13 +1062,13 @@ void SessionController::sessionResizeRequest(const QSize& size)
void SessionController::scrollBackOptionsChanged(int mode, int lines)
{
switch (mode) {
case HistorySizeDialog::NoHistory:
case Enum::NoHistory:
_session->setHistoryType(HistoryTypeNone());
break;
case HistorySizeDialog::FixedSizeHistory:
case Enum::FixedSizeHistory:
_session->setHistoryType(CompactHistoryType(lines));
break;
case HistorySizeDialog::UnlimitedHistory:
case Enum::UnlimitedHistory:
_session->setHistoryType(HistoryTypeFile());
break;
}