Merge branch 'master' of github.com:trikset/trik-studio into junior

Author: iakov

installer/packages/qreal-base/ru.qreal.root.associations/meta/installscript.qs

@@ -9,7 +9,7 @@ Component.prototype.createOperations = function()
     if (installer.value("os") === "win") {
         component.addOperation("RegisterFileType",
                                "tsj",
-                               "@TargetDir@\\" + installer.executableName + " \"%1\"",
+                               "@TargetDir@\\" + installer.executableName + installer.execExtension + " \"%1\"",
                                "@ProductName@ Project",
                                "application/octet-stream");
     }

installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh

@@ -29,6 +29,7 @@ cp    $BIN_DIR/qrgui-tool-plugin-interface.dll                      $PWD/../data
 cp    $BIN_DIR/qrgui-facade.dll                                     $PWD/../data
 cp    "$BIN_DIR/patcher.exe"                                        "$PWD/../data"
 cp    $BIN_DIR/trik-studio.exe                                      $PWD/../data/$PRODUCT.exe
+cp    $INSTALLER_ROOT/platform/$PRODUCT.cmd                         $PWD/../data/
 cp    $BIN_DIR/plugins/tools/updatesChecker.dll                     $PWD/../data/plugins/tools/
 cp    $BIN_DIR/plugins/tools/subprogramsImporterExporter.dll        $PWD/../data/plugins/tools/
 

installer/platform/trik-studio.cmd

@@ -1,4 +1,5 @@
-FOR /F "tokens=* USEBACKQ" %%F IN (`where java`) DO (SET JAVA_PATH=%%~dpF)
-
-set PATH=%SystemRoot%;%SystemRoot%\system32;%JAVA_PATH%;
-%~dp0trik-studio.exe %*
+@echo off
+title TRIK Studio Safe Mode
+FOR /F "tokens=* USEBACKQ" %%F IN (`where java 2^>NUL`) DO (SET JAVA_PATH=%%~dpF)
+set PATH=%SystemRoot%;%SystemRoot%\system32;%JAVA_PATH%
+start "" %~dp0trik-studio.exe %*

qrgui/mainWindow/startWidget/startWidget.cpp

@@ -152,9 +152,11 @@ QWidget *StartWidget::createProjectsManagementWidget()
 	}
 
 	mProjectsManagementLayout->addWidget(mOpenProjectButton);
-	mProjectsManagementLayout->addWidget(mNewProjectButton);
+	if (mNewProjectButton) {
+			mProjectsManagementLayout->addWidget(mNewProjectButton);
+	}
 
-	QWidget * const result = new QWidget;
+	QWidget * const result = new QWidget();
 	result->setLayout(mProjectsManagementLayout);
 	return result;
 }

qrtranslations/fr/qrgui_mainWindow_fr.ts

@@ -1006,7 +1006,7 @@ WARNING: The settings will be restored after application restart</source>
         <translation type="unfinished">Ouvrir un projet</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+58"/>
         <source>Recent projects</source>
         <translation>Projets récents</translation>
     </message>

qrtranslations/ru/qrgui_mainWindow_ru.ts

@@ -1116,7 +1116,7 @@ WARNING: The settings will be restored after application restart</source>
         <translation>Открыть проект</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+58"/>
         <source>Recent projects</source>
         <translation>Недавние проекты</translation>
     </message>