diff --git a/Code/Mantid/Framework/ScriptRepository/src/GitScriptRepository.cpp b/Code/Mantid/Framework/ScriptRepository/src/GitScriptRepository.cpp index 4643d87f4945550844e87f09c9ce29dbd7aeb0e8..ce8aed478c15ab63b7673d4d86a51ef27a55b893 100644 --- a/Code/Mantid/Framework/ScriptRepository/src/GitScriptRepository.cpp +++ b/Code/Mantid/Framework/ScriptRepository/src/GitScriptRepository.cpp @@ -660,7 +660,7 @@ namespace API if (err) throw gitException("Failure to download."); /// @todo provide a better explanation. - g_log.notice() << file_path << " downloaded!" << std::endl; + g_log.debug() << file_path << " downloaded!" << std::endl; } diff --git a/Code/Mantid/MantidQt/API/src/RepoModel.cpp b/Code/Mantid/MantidQt/API/src/RepoModel.cpp index 099a05b64eea603b1dc603defb47f2c54b7e186c..dcea825b8e8d5d71de3cc769c5769204e017428d 100644 --- a/Code/Mantid/MantidQt/API/src/RepoModel.cpp +++ b/Code/Mantid/MantidQt/API/src/RepoModel.cpp @@ -69,7 +69,7 @@ QVariant RepoItem::data(int column, int role ) const case 1: return "Download"; case 2: - return "Update"; + return "Status"; case 3: return "Publish"; default: @@ -95,7 +95,7 @@ QVariant RepoItem::data(int column, int role ) const } return "true"; break; - case 2:/* Update -> The file is up to date?*/ + case 2:/* Status -> The file is up to date?*/ if (status == Mantid::API::BOTH_UNCHANGED) return "true"; else{ @@ -133,7 +133,7 @@ QVariant RepoItem::data(int column, int role ) const { if (column > 0) return QVariant(); - + if (directory){ if (status == Mantid::API::REMOTE_ONLY) return QIcon::fromTheme("folder-remote", QIcon(QPixmap(":/win/folder-remote"))); @@ -147,7 +147,7 @@ QVariant RepoItem::data(int column, int role ) const if (path.contains("readme",Qt::CaseInsensitive)) return QIcon::fromTheme("text-x-readme", QIcon(QPixmap(":/win/txt_file.png"))); - + QString extension = QString(path).remove(0,pos); if (extension == ".cpp" || extension == ".CPP" || extension == ".c" || extension == ".C") return QIcon::fromTheme("text-x-c++", QIcon(QPixmap(":/win/unknown"))); @@ -161,11 +161,60 @@ QVariant RepoItem::data(int column, int role ) const return QIcon::fromTheme("application-pdf", QIcon(QPixmap(":/win/file_pdf"))); else return QIcon::fromTheme("unknown", QIcon(QPixmap(":/win/unknown"))); - + } } break; + case Qt::ToolTipRole: + { + switch(column){ + case 0: + return QVariant(); + break; + case 1: /*Donwload -> is this file already donwloaded?*/ + if (status == Mantid::API::REMOTE_ONLY){ + if (directory) + return "Click here to download this folder and all its files"; + else + return "Click here to download this file"; + } + break; + case 2:/* Status -> The file is up to date?*/ + if (status == Mantid::API::BOTH_UNCHANGED){ + if (directory) + return "This folder is up-to-date"; + else + return "This file is up-to-date"; + } + else{ + if (status == Mantid::API::LOCAL_CHANGED) + return "This file has been changed locally."; // FIXME: you may consider publish + if (status == Mantid::API::REMOTE_CHANGED || + status == Mantid::API::BOTH_CHANGED){ + if (directory) + return "There is a new version of the files inside this folder. Click here to install them."; + else + return "There is a new version of this file available. Click here to install it."; + } + + } + break; + case 3: /* Publish -> is this file already published?*/ + if (status == Mantid::API::LOCAL_ONLY + || + status == Mantid::API::LOCAL_CHANGED) + return "You have changed this file. Click here to publish it."; + + break; + case 4: + return path; + default: + break; + } + return QVariant(); + } + break; } return QVariant(); } diff --git a/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp b/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp index 4011239fc0ba7848cc36b279277a464ebd63fbec..f3852632dcb8d91b81405ac6ab8a973576e3494a 100644 --- a/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp +++ b/Code/Mantid/MantidQt/API/src/ScriptRepositoryView.cpp @@ -22,9 +22,9 @@ namespace API const QString install_mantid_label = "<html><head/><body><p>New in this release, the <span style=\" font-weight:600;\">" "Script Repository</span> allows you to:</p>" "<p> * Share your scripts and reduction algorithms;</p>" - "<p> * Get <span style=\" font-weight:600;\">Mantid</span> Scripts from the mantid developers and the comunity. </p>" + "<p> * Get <span style=\" font-weight:600;\">Mantid</span> Scripts from the mantid developers and the community. </p>" "<p><span style=\" font-style:italic;\">" - "Obs: The installation usually requires a couple of minutes, depending on your broadband available. </span></p>" + "N.B. The installation usually requires a couple of minutes, depending on your network bandwidth. </span></p>" "<p>More Information available at " "<a href=\"http://www.mantidproject.org/ScriptRepository\"><span style=\" text-decoration: underline; color:#0000ff;\">" "http://www.mantidproject.org/ScriptRepository</span></a></p></br><p><span style=\" font-weight:600;\">"