Commit 5f10a332 authored by Jan Möbius's avatar Jan Möbius
Browse files

Minor cleanup

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4587 383ad7c9-94d9-4d36-a494-682f7c89f535
parent ebb50877
...@@ -409,6 +409,10 @@ Core::init() { ...@@ -409,6 +409,10 @@ Core::init() {
} }
// ===============================================================================================
// Load Settings from configuration files
// ===============================================================================================
QStringList optionFiles = OpenFlipper::Options::optionFiles(); QStringList optionFiles = OpenFlipper::Options::optionFiles();
for ( int i = 0 ; i < (int)optionFiles.size(); ++i) { for ( int i = 0 ; i < (int)optionFiles.size(); ++i) {
...@@ -418,17 +422,20 @@ Core::init() { ...@@ -418,17 +422,20 @@ Core::init() {
QApplication::processEvents(); QApplication::processEvents();
} }
// Load global ini files. Use plugin and global options from these files // Load global ini files. Use plugin and global options from these files but dont load objects
openIniFile( optionFiles[i] ,true,true,false); openIniFile( optionFiles[i] ,true,true,false);
} }
// ===============================================================================================
// Load Settings from configuration files
// ===============================================================================================
if ( OpenFlipper::Options::lang().contains("UTF") || OpenFlipper::Options::lang().contains("utf") ) { if ( OpenFlipper::Options::lang().contains("UTF") || OpenFlipper::Options::lang().contains("utf") ) {
emit log(LOGWARN,"Warning, OpenFlipper detected that you are using an utf-8 locale!"); emit log(LOGWARN,"UTF8-Locale used!");
emit log(LOGWARN,"Only OFF files are fully supported with UTF8. Others might fail."); // emit log(LOGWARN,"Only OFF files are fully supported with UTF8. Others might fail.");
emit log(LOGWARN,"You can change your locale by :"); // emit log(LOGWARN,"You can change your locale by :");
emit log(LOGWARN,"export LANG=C"); // emit log(LOGWARN,"export LANG=C");
emit log(LOGWARN,"Work is in progress to resolve this issue."); // emit log(LOGWARN,"Work is in progress to resolve this issue.");
} }
if ( OpenFlipper::Options::gui() ) { if ( OpenFlipper::Options::gui() ) {
......
...@@ -358,7 +358,6 @@ void Core::loadSettings(){ ...@@ -358,7 +358,6 @@ void Core::loadSettings(){
OpenFlipper::Options::currentDir(newpath); OpenFlipper::Options::currentDir(newpath);
if ( complete_name.endsWith("ini") ) { if ( complete_name.endsWith("ini") ) {
// TODO OptionsDialog for choosing which information should be read
openIniFile( complete_name, openIniFile( complete_name,
loadProgramSettings->isChecked(), loadProgramSettings->isChecked(),
loadPluginSettings->isChecked(), loadPluginSettings->isChecked(),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment