Changeset 474

Show
Ignore:
Timestamp:
03/24/06 17:45:08 (3 years ago)
Author:
edmanm
Message:

Add language settings to VidaliaSettings?. Default to the appropriate language
for the system locale.

Location:
trunk/src
Files:
2 added
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/config/vidaliasettings.cpp

    r470 r474  
    2727#include <QDir> 
    2828#include <QCoreApplication> 
     29#include <lang/languagesupport.h> 
    2930 
    3031#include "vidaliasettings.h" 
     
    3839 
    3940/* Vidalia's Settings */ 
     41#define SETTING_LANGUAGE            "LanguageCode" 
    4042#define SETTING_RUN_TOR_AT_START    "RunTorAtStart" 
    4143 
     
    5052 
    5153/* Default Vidalia Settings */ 
     54#define DEFAULT_LANGUAGE         LanguageSupport::defaultLanguageCode() 
    5255#define DEFAULT_RUN_TOR_AT_START false 
    5356 
     
    9194  QSettings settings("vidalia", "vidalia"); 
    9295  settings.clear(); 
     96} 
     97 
     98/** Gets the currently preferred language code for Vidalia. */ 
     99QString 
     100VidaliaSettings::getLanguageCode() 
     101{ 
     102  return value(SETTING_LANGUAGE, DEFAULT_LANGUAGE).toString(); 
     103} 
     104 
     105/** Sets the preferred language code. */ 
     106void 
     107VidaliaSettings::setLanguageCode(QString languageCode) 
     108{ 
     109  setValue(SETTING_LANGUAGE, languageCode); 
    93110} 
    94111 
     
    143160} 
    144161 
    145  
    146162/** Returns the current message filter. */ 
    147163uint 
  • trunk/src/config/vidaliasettings.h

    r470 r474  
    5454  static void reset(); 
    5555 
     56  /** Gets the currently preferred language code for Vidalia. */ 
     57  QString getLanguageCode(); 
     58  /** Saves the preferred language code. */ 
     59  void setLanguageCode(QString languageCode); 
     60   
    5661  /** Returns true if Vidalia should start Tor when it starts. */ 
    5762  bool runTorAtStart(); 
  • trunk/src/lang/lang.pri

    r473 r474  
    2222################################################################# 
    2323 
     24HEADERS += $$PWD/languagesupport.h 
     25 
     26SOURCES += $$PWD/languagesupport.cpp 
     27 
    2428TRANSLATIONS += $$PWD/vidalia_en.ts 
    2529