data: removed directory data/gui/installer and moved EULA files to data/license
* moved EULA files to data/license * moved 3rd party license to data/license * updated paths in installer scripts
This commit is contained in:
+1
-1
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(250));
|
||||
|
||||
std::shared_ptr<TextAccess> text =
|
||||
TextAccess::createFromFile(ResourcePaths::getGuiPath().concatenate(L"installer/EULA.txt"));
|
||||
TextAccess::createFromFile(ResourcePaths::getLicensePath().concatenate(L"EULA.txt"));
|
||||
|
||||
std::cout << std::endl << text->getText() << std::endl;
|
||||
std::cout << "Do you accept the Sourcetrail End User License Agreement? (y/n)" << std::endl;
|
||||
|
||||
@@ -27,6 +27,11 @@ FilePath ResourcePaths::getGuiPath()
|
||||
return AppPath::getAppPath().concatenate(L"data/gui/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getLicensePath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/license/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getJavaPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/java/");
|
||||
|
||||
@@ -13,6 +13,7 @@ public:
|
||||
static FilePath getFallbackPath();
|
||||
static FilePath getFontsPath();
|
||||
static FilePath getGuiPath();
|
||||
static FilePath getLicensePath();
|
||||
static FilePath getJavaPath();
|
||||
static FilePath getPythonPath();
|
||||
static FilePath getCxxCompilerHeaderPath();
|
||||
|
||||
@@ -35,7 +35,7 @@ void QtEulaWindow::populateWindow(QWidget* widget)
|
||||
}
|
||||
|
||||
std::shared_ptr<TextAccess> text =
|
||||
TextAccess::createFromFile(ResourcePaths::getGuiPath().concatenate(L"installer/EULA.txt"));
|
||||
TextAccess::createFromFile(ResourcePaths::getLicensePath().concatenate(L"EULA.txt"));
|
||||
|
||||
QTextEdit* licenseText = new QTextEdit();
|
||||
licenseText->setObjectName("textField");
|
||||
|
||||
Reference in New Issue
Block a user