EI/VirtualLeaf Changeset - d897bf22346f · Centrum Wiskunde & Informatica (CWI)

Changeset - d897bf22346f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Michael Guravage - 15 years ago 2010-06-28 15:48:24
michael.guravage@cwi.nl

Look for gpl3.txt in either an ancestor doc directory (Linux) or a
decedent doc directory (Windows, via the binary installer).

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
changed src/ChangeLog
changed src/canvas.cpp

2 files changed with 16 insertions and 2 deletions:

src/ChangeLog

src/canvas.cpp

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -06-28    <guravage@caterpie.sen.cwi.nl>
 	* VirtualLeaf-install.nsi: Grab gpl3.txt from doc directory.
 	* canvas.cpp (gpl): move gpl3.txt back to the doc directory.
 	* canvas.cpp (gpl): gpl3.txt can be either in an ancestor doc
 	directory (Linux) or a decedent doc directory (Windows, via the
 	binary installer).
 	* VirtualLeaf-install.nsi: Add VirtualLeaf doc directory.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* gpl3.txt: Moved gpl3.txt from doc to src directory.
 	* VirtualLeaf.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.
 	* libplugin.pro: Ditto.

src/canvas.cpp

➞

Show inline comments

@@ @@ -75,24 +75,26 @@ @@
 #include <cstdlib>
 #include <cstdio>
 #include "modelcatalogue.h"
 #include <algorithm>
 // Include VIB and PSB logos
 #include "psb.xpm"
 #include "cwi.xpm"
 static const std::string _module_id("$Id$");
 using namespace std;
 // We use a global variable to save memory - all the brushes and pens in
 // the mesh are shared.
 #define QUOTE_ME(s) QUOTE_ME_2NDLEV(s)
 #define QUOTE_ME_2NDLEV(s) #s
 static QColor dark_red("darkRed");
 static const int imageRTTI = 984376;
 extern Parameter par;
 const QString Main::caption("Virtual leaf");
@@ @@ -945,26 +947,35 @@ void Main::about() @@
       QMessageBox::Information, 1, 0, 0, this, 0, FALSE );
   about->setButtonText( 1, "Dismiss" );
   about->show();
+}
 void Main::gpl()
+{
   static QMessageBox* gpl = new QMessageBox ( "GPL License", "",
       QMessageBox::Information, 1, 0, 0, this, 0, FALSE );
   QDir docDir(QApplication::applicationDirPath());
   docDir.cd("../doc");
+  docDir.cd("../doc"); // Where Linux expects gpl3.txt
   QString path = docDir.filePath("gpl3.txt");
   if (!docDir.exists("gpl3.txt")){
     docDir = QApplication::applicationDirPath();
     docDir.cd("doc"); // Where Windows expects gpl3.txt
     path = docDir.filePath("gpl3.txt");
+  }
   // At this point path points either to the linux variant, which
   // exists, or the windows variant, which may exist. Testing the
   // ifstream object will determine whether we've found gpl3.txt.
   std::ifstream file(path.toStdString().c_str());
   std::string str;
   if (file) {
     file.seekg(0, std::ios::end);
     str.reserve(file.tellg());
     file.seekg(0, std::ios::beg);
     str.assign((std::istreambuf_iterator<char>(file)),
 	       std::istreambuf_iterator<char>());

0 comments (0 inline, 0 general)