Get rid of junky timestamps, along with some select pointless log messages
This commit is contained in:
parent
9cef16a47d
commit
8b18af0515
@ -133,7 +133,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
|
|||||||
|
|
||||||
// and instances
|
// and instances
|
||||||
m_instances.reset(new InstanceList(m_settings->get("InstanceDir").toString(), this));
|
m_instances.reset(new InstanceList(m_settings->get("InstanceDir").toString(), this));
|
||||||
std::cout << "Loading Instances..." << std::endl;
|
QLOG_INFO() << "Loading Instances...";
|
||||||
m_instances->loadList();
|
m_instances->loadList();
|
||||||
|
|
||||||
// init the http meta cache
|
// init the http meta cache
|
||||||
|
@ -75,7 +75,6 @@ bool ensureFilePathExists(QString filenamepath)
|
|||||||
QDir dir;
|
QDir dir;
|
||||||
QString ensuredPath = a.path();
|
QString ensuredPath = a.path();
|
||||||
bool success = dir.mkpath ( ensuredPath );
|
bool success = dir.mkpath ( ensuredPath );
|
||||||
qDebug() << "ensureFilePathExists:" << success << ensuredPath << filenamepath;
|
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,7 +84,6 @@ bool ensureFolderPathExists(QString foldernamepath)
|
|||||||
QDir dir;
|
QDir dir;
|
||||||
QString ensuredPath = a.filePath();
|
QString ensuredPath = a.filePath();
|
||||||
bool success = dir.mkpath ( ensuredPath );
|
bool success = dir.mkpath ( ensuredPath );
|
||||||
qDebug() << "ensureFolderPathExists:" << success << ensuredPath << foldernamepath;
|
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -437,7 +437,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
|
|||||||
// settings->getConfig().setValue("MainWindowState", saveState());
|
// settings->getConfig().setValue("MainWindowState", saveState());
|
||||||
QMainWindow::closeEvent(event);
|
QMainWindow::closeEvent(event);
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
|
void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
|
||||||
{
|
{
|
||||||
QMenu *instContextMenu = new QMenu("Instance", this);
|
QMenu *instContextMenu = new QMenu("Instance", this);
|
||||||
@ -447,7 +447,7 @@ void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
|
|||||||
|
|
||||||
instContextMenu->exec(view->mapToGlobal(pos));
|
instContextMenu->exec(view->mapToGlobal(pos));
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
void MainWindow::on_actionLaunchInstance_triggered()
|
void MainWindow::on_actionLaunchInstance_triggered()
|
||||||
{
|
{
|
||||||
if (m_selectedInstance)
|
if (m_selectedInstance)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
@ -39,115 +39,113 @@ class MainWindow;
|
|||||||
class MainWindow : public QMainWindow
|
class MainWindow : public QMainWindow
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit MainWindow(QWidget *parent = 0);
|
explicit MainWindow(QWidget *parent = 0);
|
||||||
~MainWindow();
|
~MainWindow();
|
||||||
|
|
||||||
void closeEvent(QCloseEvent *event);
|
void closeEvent(QCloseEvent *event);
|
||||||
|
|
||||||
// Browser Dialog
|
// Browser Dialog
|
||||||
void openWebPage(QUrl url);
|
void openWebPage(QUrl url);
|
||||||
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onCatToggled(bool);
|
void onCatToggled(bool);
|
||||||
|
|
||||||
void on_actionAbout_triggered();
|
void on_actionAbout_triggered();
|
||||||
|
|
||||||
void on_actionAddInstance_triggered();
|
void on_actionAddInstance_triggered();
|
||||||
|
|
||||||
void on_actionChangeInstGroup_triggered();
|
void on_actionChangeInstGroup_triggered();
|
||||||
|
|
||||||
void on_actionChangeInstIcon_triggered();
|
void on_actionChangeInstIcon_triggered();
|
||||||
|
|
||||||
void on_actionViewInstanceFolder_triggered();
|
void on_actionViewInstanceFolder_triggered();
|
||||||
|
|
||||||
void on_actionConfig_Folder_triggered();
|
void on_actionConfig_Folder_triggered();
|
||||||
|
|
||||||
void on_actionViewSelectedInstFolder_triggered();
|
void on_actionViewSelectedInstFolder_triggered();
|
||||||
|
|
||||||
void on_actionRefresh_triggered();
|
void on_actionRefresh_triggered();
|
||||||
|
|
||||||
void on_actionViewCentralModsFolder_triggered();
|
void on_actionViewCentralModsFolder_triggered();
|
||||||
|
|
||||||
void on_actionCheckUpdate_triggered();
|
void on_actionCheckUpdate_triggered();
|
||||||
|
|
||||||
void on_actionSettings_triggered();
|
void on_actionSettings_triggered();
|
||||||
|
|
||||||
void on_actionReportBug_triggered();
|
void on_actionReportBug_triggered();
|
||||||
|
|
||||||
void on_actionNews_triggered();
|
void on_actionNews_triggered();
|
||||||
|
|
||||||
void on_mainToolBar_visibilityChanged(bool);
|
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_actionLaunchInstance_triggered();
|
||||||
|
|
||||||
void on_actionDeleteInstance_triggered();
|
void on_actionDeleteInstance_triggered();
|
||||||
|
|
||||||
void on_actionRenameInstance_triggered();
|
void on_actionRenameInstance_triggered();
|
||||||
|
|
||||||
void on_actionMakeDesktopShortcut_triggered();
|
void on_actionMakeDesktopShortcut_triggered();
|
||||||
|
|
||||||
void on_actionChangeInstMCVersion_triggered();
|
void on_actionChangeInstMCVersion_triggered();
|
||||||
|
|
||||||
void on_actionEditInstMods_triggered();
|
void on_actionEditInstMods_triggered();
|
||||||
|
|
||||||
void on_actionEditInstNotes_triggered();
|
void on_actionEditInstNotes_triggered();
|
||||||
|
|
||||||
void doLogin(const QString& errorMsg = "");
|
void doLogin(const QString &errorMsg = "");
|
||||||
|
|
||||||
|
|
||||||
void onLoginComplete();
|
void onLoginComplete();
|
||||||
|
|
||||||
|
|
||||||
void onGameUpdateComplete();
|
void onGameUpdateComplete();
|
||||||
void onGameUpdateError(QString error);
|
void onGameUpdateError(QString error);
|
||||||
|
|
||||||
void taskStart();
|
void taskStart();
|
||||||
void taskEnd();
|
void taskEnd();
|
||||||
|
|
||||||
void on_actionChangeInstLWJGLVersion_triggered();
|
void on_actionChangeInstLWJGLVersion_triggered();
|
||||||
|
|
||||||
void instanceEnded();
|
void instanceEnded();
|
||||||
|
|
||||||
void on_actionInstanceSettings_triggered();
|
void on_actionInstanceSettings_triggered();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void instanceActivated ( QModelIndex );
|
void instanceActivated(QModelIndex);
|
||||||
|
|
||||||
|
void instanceChanged(const QModelIndex ¤t, const QModelIndex &previous);
|
||||||
|
|
||||||
void instanceChanged (const QModelIndex & current,const QModelIndex & previous);
|
|
||||||
|
|
||||||
void selectionBad();
|
void selectionBad();
|
||||||
|
|
||||||
void startTask(Task *task);
|
void startTask(Task *task);
|
||||||
|
|
||||||
void launchInstance(BaseInstance *inst, LoginResponse response);
|
void launchInstance(BaseInstance *inst, LoginResponse response);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool eventFilter(QObject *obj, QEvent *ev);
|
bool eventFilter(QObject *obj, QEvent *ev);
|
||||||
void setCatBackground(bool enabled);
|
void setCatBackground(bool enabled);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
KCategoryDrawer * drawer;
|
KCategoryDrawer *drawer;
|
||||||
KCategorizedView * view;
|
KCategorizedView *view;
|
||||||
InstanceProxyModel * proxymodel;
|
InstanceProxyModel *proxymodel;
|
||||||
MinecraftProcess *proc;
|
MinecraftProcess *proc;
|
||||||
ConsoleWindow *console;
|
ConsoleWindow *console;
|
||||||
OneSixAssets *assets_downloader;
|
OneSixAssets *assets_downloader;
|
||||||
LabeledToolButton * renameButton;
|
LabeledToolButton *renameButton;
|
||||||
|
|
||||||
BaseInstance *m_selectedInstance;
|
BaseInstance *m_selectedInstance;
|
||||||
|
|
||||||
// A pointer to the instance we are actively doing stuff with.
|
// 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
|
// This is set when the user launches an instance and is used to refer to that
|
||||||
// instance throughout the launching process.
|
// instance throughout the launching process.
|
||||||
BaseInstance *m_activeInst;
|
BaseInstance *m_activeInst;
|
||||||
LoginResponse m_activeLogin;
|
LoginResponse m_activeLogin;
|
||||||
|
|
||||||
Task *m_versionLoadTask;
|
Task *m_versionLoadTask;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -56,13 +56,12 @@ static const char *LevelToText(Level theLevel)
|
|||||||
class LoggerImpl
|
class LoggerImpl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
LoggerImpl() : level(InfoLevel), start_time(QDateTime::currentDateTime())
|
LoggerImpl() : level(InfoLevel)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
QMutex logMutex;
|
QMutex logMutex;
|
||||||
Level level;
|
Level level;
|
||||||
DestinationList destList;
|
DestinationList destList;
|
||||||
QDateTime start_time;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Logger::Logger() : d(new LoggerImpl)
|
Logger::Logger() : d(new LoggerImpl)
|
||||||
@ -94,10 +93,7 @@ Level Logger::loggingLevel() const
|
|||||||
void Logger::Helper::writeToLog()
|
void Logger::Helper::writeToLog()
|
||||||
{
|
{
|
||||||
const char *const levelName = LevelToText(level);
|
const char *const levelName = LevelToText(level);
|
||||||
const QString completeMessage(QString("%1\t%2\t%3")
|
const QString completeMessage(QString("%1\t%2").arg(levelName, 5).arg(buffer));
|
||||||
.arg(QDateTime::currentDateTime().toString(fmtDateTime))
|
|
||||||
.arg(levelName, 5)
|
|
||||||
.arg(buffer));
|
|
||||||
|
|
||||||
Logger &logger = Logger::instance();
|
Logger &logger = Logger::instance();
|
||||||
QMutexLocker lock(&logger.d->logMutex);
|
QMutexLocker lock(&logger.d->logMutex);
|
||||||
|
@ -316,7 +316,7 @@ InstanceList::InstListError InstanceList::loadList()
|
|||||||
{
|
{
|
||||||
inst->setGroupInitial((*iter));
|
inst->setGroupInitial((*iter));
|
||||||
}
|
}
|
||||||
QLOG_INFO() << QString("Loaded instance %1").arg(inst->name()).toUtf8();
|
QLOG_INFO() << "Loaded instance " << inst->name();
|
||||||
inst->setParent(this);
|
inst->setParent(this);
|
||||||
m_instances.append(inst);
|
m_instances.append(inst);
|
||||||
connect(instPtr, SIGNAL(propertiesChanged(BaseInstance *)), this,
|
connect(instPtr, SIGNAL(propertiesChanged(BaseInstance *)), this,
|
||||||
|
Loading…
Reference in New Issue
Block a user