Get rid of junky timestamps, along with some select pointless log messages

This commit is contained in:
Petr Mrázek 2013-10-06 03:07:57 +02:00
parent 9cef16a47d
commit 8b18af0515
6 changed files with 54 additions and 62 deletions

View File

@ -133,7 +133,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
// and instances
m_instances.reset(new InstanceList(m_settings->get("InstanceDir").toString(), this));
std::cout << "Loading Instances..." << std::endl;
QLOG_INFO() << "Loading Instances...";
m_instances->loadList();
// init the http meta cache

View File

@ -75,7 +75,6 @@ bool ensureFilePathExists(QString filenamepath)
QDir dir;
QString ensuredPath = a.path();
bool success = dir.mkpath ( ensuredPath );
qDebug() << "ensureFilePathExists:" << success << ensuredPath << filenamepath;
return success;
}
@ -85,7 +84,6 @@ bool ensureFolderPathExists(QString foldernamepath)
QDir dir;
QString ensuredPath = a.filePath();
bool success = dir.mkpath ( ensuredPath );
qDebug() << "ensureFolderPathExists:" << success << ensuredPath << foldernamepath;
return success;
}

View File

@ -437,7 +437,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
// settings->getConfig().setValue("MainWindowState", saveState());
QMainWindow::closeEvent(event);
}
/*
void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
{
QMenu *instContextMenu = new QMenu("Instance", this);
@ -447,7 +447,7 @@ void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
instContextMenu->exec(view->mapToGlobal(pos));
}
*/
void MainWindow::on_actionLaunchInstance_triggered()
{
if (m_selectedInstance)

View File

@ -3,7 +3,7 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
@ -39,115 +39,113 @@ class MainWindow;
class MainWindow : public QMainWindow
{
Q_OBJECT
public:
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
void closeEvent(QCloseEvent *event);
// Browser Dialog
void openWebPage(QUrl url);
private slots:
void onCatToggled(bool);
void on_actionAbout_triggered();
void on_actionAddInstance_triggered();
void on_actionChangeInstGroup_triggered();
void on_actionChangeInstIcon_triggered();
void on_actionViewInstanceFolder_triggered();
void on_actionConfig_Folder_triggered();
void on_actionViewSelectedInstFolder_triggered();
void on_actionRefresh_triggered();
void on_actionViewCentralModsFolder_triggered();
void on_actionCheckUpdate_triggered();
void on_actionSettings_triggered();
void on_actionReportBug_triggered();
void on_actionNews_triggered();
void on_mainToolBar_visibilityChanged(bool);
void on_instanceView_customContextMenuRequested(const QPoint &pos);
// void on_instanceView_customContextMenuRequested(const QPoint &pos);
void on_actionLaunchInstance_triggered();
void on_actionDeleteInstance_triggered();
void on_actionRenameInstance_triggered();
void on_actionMakeDesktopShortcut_triggered();
void on_actionChangeInstMCVersion_triggered();
void on_actionEditInstMods_triggered();
void on_actionEditInstNotes_triggered();
void doLogin(const QString& errorMsg = "");
void doLogin(const QString &errorMsg = "");
void onLoginComplete();
void onGameUpdateComplete();
void onGameUpdateError(QString error);
void taskStart();
void taskEnd();
void on_actionChangeInstLWJGLVersion_triggered();
void instanceEnded();
void on_actionInstanceSettings_triggered();
void on_actionInstanceSettings_triggered();
public slots:
void instanceActivated ( QModelIndex );
void instanceActivated(QModelIndex);
void instanceChanged(const QModelIndex &current, const QModelIndex &previous);
void instanceChanged (const QModelIndex & current,const QModelIndex & previous);
void selectionBad();
void startTask(Task *task);
void launchInstance(BaseInstance *inst, LoginResponse response);
protected:
bool eventFilter(QObject *obj, QEvent *ev);
void setCatBackground(bool enabled);
private:
Ui::MainWindow *ui;
KCategoryDrawer * drawer;
KCategorizedView * view;
InstanceProxyModel * proxymodel;
KCategoryDrawer *drawer;
KCategorizedView *view;
InstanceProxyModel *proxymodel;
MinecraftProcess *proc;
ConsoleWindow *console;
OneSixAssets *assets_downloader;
LabeledToolButton * renameButton;
LabeledToolButton *renameButton;
BaseInstance *m_selectedInstance;
// A pointer to the instance we are actively doing stuff with.
// This is set when the user launches an instance and is used to refer to that
// instance throughout the launching process.
BaseInstance *m_activeInst;
LoginResponse m_activeLogin;
Task *m_versionLoadTask;
};

View File

@ -56,13 +56,12 @@ static const char *LevelToText(Level theLevel)
class LoggerImpl
{
public:
LoggerImpl() : level(InfoLevel), start_time(QDateTime::currentDateTime())
LoggerImpl() : level(InfoLevel)
{
}
QMutex logMutex;
Level level;
DestinationList destList;
QDateTime start_time;
};
Logger::Logger() : d(new LoggerImpl)
@ -94,10 +93,7 @@ Level Logger::loggingLevel() const
void Logger::Helper::writeToLog()
{
const char *const levelName = LevelToText(level);
const QString completeMessage(QString("%1\t%2\t%3")
.arg(QDateTime::currentDateTime().toString(fmtDateTime))
.arg(levelName, 5)
.arg(buffer));
const QString completeMessage(QString("%1\t%2").arg(levelName, 5).arg(buffer));
Logger &logger = Logger::instance();
QMutexLocker lock(&logger.d->logMutex);

View File

@ -316,7 +316,7 @@ InstanceList::InstListError InstanceList::loadList()
{
inst->setGroupInitial((*iter));
}
QLOG_INFO() << QString("Loaded instance %1").arg(inst->name()).toUtf8();
QLOG_INFO() << "Loaded instance " << inst->name();
inst->setParent(this);
m_instances.append(inst);
connect(instPtr, SIGNAL(propertiesChanged(BaseInstance *)), this,