Commit 6bf5eb0b authored by Justin Hipple's avatar Justin Hipple
Browse files

VidaliaSettings now uses rootPath instead of hardcoding C:/ and MessageLog has... 

VidaliaSettings now uses rootPath instead of hardcoding C:/ and MessageLog has reclaimed it's _enableLogging member variable in the name of efficiency.

svn:r252
parent e501b62d

src/config/vidaliasettings.cpp

+2 −2
Changes for src/config/vidaliasettings.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


/* Default Tor Settings */

#if defined(Q_OS_WIN32)

#define DEFAULT_TOR_PATH       "C:\\Program Files\\Tor"

#define DEFAULT_TOR_PATH       (QDir::rootPath() + "\\Program Files\\Tor")

#elif defined(Q_OS_MACX)

#define DEFAULT_TOR_PATH       "/usr/bin"

#else
@@ -63,7 +63,7 @@ 
#define DEFAULT_ENABLE_LOG_FILE false



#if defined(Q_OS_WIN32)

#define DEFAULT_LOG_FILE       "C:\\Program Files\\Tor\\tor.log"

#define DEFAULT_LOG_FILE       (QDir::rootPath() + "\\Program Files\\Tor\\tor.log")

#else

#define DEFAULT_LOG_FILE       (QDir::homePath() + "/.tor/tor.log")

#endif

src/gui/messagelog/messagelog.cpp

+7 −4
Changes for src/gui/messagelog/messagelog.cpp: 7 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ MessageLog::MessageLog(TorControl *torControl, QWidget *parent, Qt::WFlags flags 


  /* Load the message log's stored settings */

  _logFile = 0;

  if (_settings->isLogFileEnabled()) {

  _enableLogging = _settings->isLogFileEnabled();

  if (_enableLogging) {

    openLogFile(_settings->getLogFile());

  }
@@ -167,7 +168,8 @@ MessageLog::loadSettings() 
  ui.lblPercentOpacity->setNum(ui.sldrOpacity->value());



  /* Set whether or not logging to file is enabled */

  ui.chkEnableLogFile->setChecked(_settings->isLogFileEnabled());

  _enableLogging = _settings->isLogFileEnabled();

  ui.chkEnableLogFile->setChecked(_enableLogging);

  ui.lineFile->setText(_settings->getLogFile());



  /* Set the checkboxes accordingly */
@@ -211,7 +213,8 @@ MessageLog::saveChanges() 
    _settings->setLogFile(ui.lineFile->text());

    ui.lineFile->setText(QDir::convertSeparators(ui.lineFile->text()));

  }

  _settings->enableLogFile(ui.chkEnableLogFile->isChecked());

  _enableLogging = ui.chkEnableLogFile->isChecked();

  _settings->enableLogFile(_enableLogging);

  

  

  /* Hide the settings frame and reset toggle button*/
@@ -622,7 +625,7 @@ MessageLog::log(LogEvent::Severity type, QString message) 
  }



  /* If we're saving log messages to a file, go ahead and do that now */

  if (_settings->isLogFileEnabled()) {

  if (_enableLogging) {

    _logStream << format(newMessage);

    _logStream.flush(); /* Write to disk right away */

  }

src/gui/messagelog/messagelog.h

+2 −0
Changes for src/gui/messagelog/messagelog.h: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ private: 
  int _maxCount;

  /** Holds the number of messages currently displayed **/

  int _messagesShown;

  /** Set to true if we will log all messages to a file. */  	 

  bool _enableLogging;  

  /** The log file used to store log messages. */

  QFile *_logFile;

  /** Text stream used to write to the log file if enabled*/