Merge branch 'master' into backbone

diff --cc trunk/src/base/gui/main.cpp
index af51773,22ce39f..b5c37f1
--- 1/trunk/src/base/gui/main.cpp
--- 2/trunk/src/base/gui/main.cpp
+++ b/trunk/src/base/gui/main.cpp
@@@ -25,15 -25,35 +25,39 @@@
  #include "MainWindow.h"
  #include "../backbone/backbone.h"
  #include "../../includes/translation.h"
+ #include <QDebug>
  
- int main(int argc, char *argv[])
- {
+ 
+ QStringList parseParameters(int argc, char *argv[]) {
+     bool wordListStarted = false;
+     QStringList result;
+     for(int i=1; i<argc; i++) {
+         QString argument(argv[i]);
+         if(!wordListStarted) {
+             if(argument == "-s") {
+                 wordListStarted = true;
+             }
+         }
+         else {
+             if(!argument.startsWith("-") &&
+                !argument.startsWith("--")) {
+                 result << argument;
+             }
+         }
+     }
+ 
+     return result;
+ }
+ 
+ int main(int argc, char *argv[]) {
      QApplication a(argc, argv);
 +    QApplication::setOrganizationName("Comarch S.A.");
 +    QApplication::setOrganizationDomain("comarch.com");
 +    QApplication::setApplicationName("mDictionary");
 +
  
+     QStringList search = parseParameters(argc, argv);
+ 
      qRegisterMetaType<Translation*>("Translation*");
      qRegisterMetaType<QList<Translation*> >("QList<Translation*>");
      Backbone* backbone = new Backbone;