Merge last changes from aleksei_kanash_dev

Sankore 3.1.iss

@@ -83,13 +83,13 @@ Source: "..\Qt-4.8\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phon
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 ;qt multimedia plugins
-Source: "c:\OpenSankore\plugins\mediaservice\dsengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\mediaservice\dsengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\dsengine.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\dsengined.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "c:\OpenSankore\plugins\mediaservice"; Flags: ignoreversion
 
-Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
-Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\plugins\playlistformats"; Flags: ignoreversion
 
 [Icons]
 Name: "{group}\Open-Sankoré"; Filename: "{app}\Open-Sankore.exe"

src/board/UBFeaturesController.cpp

@@ -642,19 +642,31 @@ void UBFeaturesController::importImage(const QImage &image, const QString &fileN
 void UBFeaturesController::importImage( const QImage &image, const UBFeature &destination, const QString &fileName )
 {
     QString mFileName = fileName;
+    QString filePath;
+    UBFeature dest = destination;
     if (mFileName.isNull()) {
         QDateTime now = QDateTime::currentDateTime();
-        mFileName  = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+        static int imageCounter = 0;
+        mFileName  = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss");
+        
+        filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
+
+        if (QFile::exists(filePath+".png"))
+            mFileName += QString("-[%1]").arg(++imageCounter);
+        else
+            imageCounter = 0;
+        
+        mFileName += ".png";
     }
     
-    UBFeature dest = destination;
+
 
     if ( !destination.getFullVirtualPath().startsWith( picturesElement.getFullVirtualPath(), Qt::CaseInsensitive ) )
     {
 	    dest = picturesElement;
     }
 
-    QString filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
+    filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
     image.save(filePath);
 
     QImage thumb = createThumbnail( filePath );

src/core/UBDisplayManager.cpp

@@ -148,11 +148,13 @@ void UBDisplayManager::setDisplayWidget(QWidget* pDisplayWidget)
     {
         if (mDisplayWidget)
         {
+            mDisplayWidget->hide();
             pDisplayWidget->setGeometry(mDisplayWidget->geometry());
             pDisplayWidget->setWindowFlags(mDisplayWidget->windowFlags());
         }
         mDisplayWidget = pDisplayWidget;
         mDisplayWidget->setGeometry(mDesktop->screenGeometry(mDisplayScreenIndex));
+        if (UBSettings::settings()->appUseMultiscreen->get().toBool())
             mDisplayWidget->showFullScreen();
 		// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC

src/gui/UBFeaturesWidget.cpp

@@ -170,9 +170,14 @@ void UBFeaturesWidget::deleteSelectedElements()
 {
     QModelIndexList selected = centralWidget->listView()->selectionModel()->selectedIndexes();
 
-    foreach ( QModelIndex sel, selected )
+    QList<UBFeature> featureasToMove;
+    for (int i = 0; i < selected.count(); i++)
+    {
+        featureasToMove.append(controller->getFeature(selected.at(i), objNameFeatureList));
+    }
+    
+    foreach (UBFeature feature, featureasToMove)
     {
-        UBFeature feature = sel.data(Qt::UserRole + 1).value<UBFeature>();
         if (feature.isDeletable()) {
             if (feature.inTrash()) {
                 controller->deleteItem(feature);
@@ -181,6 +186,7 @@ void UBFeaturesWidget::deleteSelectedElements()
             }
         }
     }
+
     controller->refreshModels();
 }