Even more cleanup.

This commit is contained in:
Klaas Freitag 2013-10-02 15:55:15 +02:00
parent 55722099fa
commit d8309a64cb
4 changed files with 13 additions and 7 deletions

View File

@ -111,12 +111,6 @@ Application::Application(int &argc, char **argv) :
setupTranslations();
connect( this, SIGNAL(messageReceived(QString)), SLOT(slotParseOptions(QString)));
connect( Logger::instance(), SIGNAL(guiLog(QString,QString)),
_gui, SLOT(slotShowTrayMessage(QString,QString)));
connect( Logger::instance(), SIGNAL(optionalGuiLog(QString,QString)),
_gui, SLOT(slotShowOptionalTrayMessage(QString,QString)));
connect( Logger::instance(), SIGNAL(guiMessage(QString,QString)),
_gui, SLOT(slotShowGuiMessage(QString,QString)));
FolderMan::instance()->setSyncEnabled(false);

View File

@ -64,7 +64,7 @@ void Logger::postOptionalGuiLog(const QString &title, const QString &message)
void Logger::postGuiMessage(const QString &title, const QString &message)
{
// emit postGuiMessage(title, message);
emit guiMessage(title, message);
}
void Logger::log(Log log)
@ -117,6 +117,10 @@ void Logger::setLogFile(const QString & name)
_logFile.close();
}
if( name.isEmpty() ) {
return;
}
bool openSucceeded = false;
if (name == QLatin1String("-")) {
openSucceeded = _logFile.open(1, QIODevice::WriteOnly);

View File

@ -56,6 +56,7 @@ public:
void setLogExpire( int expire );
void setLogDir( const QString& dir );
void setLogFlush( bool flush );
signals:
void newLog(const QString&);
void guiLog(const QString&, const QString&);

View File

@ -66,6 +66,13 @@ ownCloudGui::ownCloudGui(Application *parent) :
connect( folderMan, SIGNAL(folderSyncStateChange(QString)),
this,SLOT(slotSyncStateChange(QString)));
connect( Logger::instance(), SIGNAL(guiLog(QString,QString)),
SLOT(slotShowTrayMessage(QString,QString)));
connect( Logger::instance(), SIGNAL(optionalGuiLog(QString,QString)),
SLOT(slotShowOptionalTrayMessage(QString,QString)));
connect( Logger::instance(), SIGNAL(guiMessage(QString,QString)),
SLOT(slotShowGuiMessage(QString,QString)));
}
// This should rather be in application.... or rather in MirallConfigFile?