Skip to content
Snippets Groups Projects
Commit 124e63cf authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

2017

parent e21c20e1
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
contrib/mobile/Android/AndroidManifest.xml
+ 3
− 3
View file @ 124e63cf
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geuz.onelab" package="org.geuz.onelab"
android:versionName="1.6.0" android:versionName="1.7.0"
android:versionCode="29" android:versionCode="30"
android:installLocation="auto" > android:installLocation="auto" >
<uses-sdk android:minSdkVersion="14" <uses-sdk android:minSdkVersion="14"
android:targetSdkVersion="22" /> android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-feature android:glEsVersion="0x00010000" android:required="true" /> <uses-feature android:glEsVersion="0x00010000" android:required="true" />
......
contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java
+ 1
− 1
View file @ 124e63cf
...@@ -95,7 +95,7 @@ public class AboutActivity extends Activity{ ...@@ -95,7 +95,7 @@ public class AboutActivity extends Activity{
} }
catch (android.content.pm.PackageManager.NameNotFoundException e) { catch (android.content.pm.PackageManager.NameNotFoundException e) {
} }
aboutOnelab += "<p>Copyright (C) 2014-2016 Christophe Geuzaine and Maxime Graulich, "; aboutOnelab += "<p>Copyright (C) 2014-2017 Christophe Geuzaine and Maxime Graulich, ";
aboutOnelab += "University of Li&egrave;ge</p>"; aboutOnelab += "University of Li&egrave;ge</p>";
aboutOnelab += "<p>Visit <a href=\"http://onelab.info/\">http://onelab.info/</a> "; aboutOnelab += "<p>Visit <a href=\"http://onelab.info/\">http://onelab.info/</a> ";
aboutOnelab += "for more information</p>"; aboutOnelab += "for more information</p>";
......
contrib/mobile/README.txt
+ 1
− 1
View file @ 124e63cf
This directory contains the source code for Onelab/Mobile, the mobile version of This directory contains the source code for Onelab/Mobile, the mobile version of
ONELAB for iOS and Android devices. ONELAB for iOS and Android devices.
Copyright (C) 2014-2016 Christophe Geuzaine and Maxime Graulich, University of Liege Copyright (C) 2014-2017 Christophe Geuzaine and Maxime Graulich, University of Liege
Onelab/Mobile (http://onelab.info) is a finite element package based on the open Onelab/Mobile (http://onelab.info) is a finite element package based on the open
source mesh generator Gmsh (http://gmsh.info) and the solver GetDP source mesh generator Gmsh (http://gmsh.info) and the solver GetDP
......
contrib/mobile/androidUtils.cpp
+ 2
− 2
View file @ 124e63cf
...@@ -312,7 +312,7 @@ extern "C" { ...@@ -312,7 +312,7 @@ extern "C" {
sstream << "<center><h3>Gmsh</h3>" sstream << "<center><h3>Gmsh</h3>"
<< "Version " << GMSH_VERSION << " " << "Version " << GMSH_VERSION << " "
<< "(<i>Build date:</i> " << GMSH_DATE << ")" << "(<i>Build date:</i> " << GMSH_DATE << ")"
<< "<p>Copyright (C) 1997-2016 Christophe Geuzaine and Jean-Fran&ccedil;ois Remacle</p>" << "<p>Copyright (C) 1997-2017 Christophe Geuzaine and Jean-Fran&ccedil;ois Remacle</p>"
<< "<p><a href=\"http://gmsh.info/doc/CREDITS.txt\">Credits</a> " << "<p><a href=\"http://gmsh.info/doc/CREDITS.txt\">Credits</a> "
<< "and <a href=\"http://gmsh.info/doc/LICENSE.txt\">licensing information</a></p>" << "and <a href=\"http://gmsh.info/doc/LICENSE.txt\">licensing information</a></p>"
<< "<p><i>Build options:</i> " << GMSH_CONFIG_OPTIONS << "</p>" << "<p><i>Build options:</i> " << GMSH_CONFIG_OPTIONS << "</p>"
...@@ -326,7 +326,7 @@ extern "C" { ...@@ -326,7 +326,7 @@ extern "C" {
sstream << "<center><h3>GetDP</h3>" sstream << "<center><h3>GetDP</h3>"
<< "Version " << GETDP_VERSION << " " << "Version " << GETDP_VERSION << " "
<< "(<i>Build date:</i> " << GETDP_DATE << ")" << "(<i>Build date:</i> " << GETDP_DATE << ")"
<< "<p>Copyright (C) 1997-2016 Patrick Dular and Christophe Geuzaine, University of Li&egrave;ge</p>" << "<p>Copyright (C) 1997-2017 Patrick Dular and Christophe Geuzaine, University of Li&egrave;ge</p>"
<< "<p><a href=\"http://getdp.info/doc/CREDITS.txt\">Credits</a> " << "<p><a href=\"http://getdp.info/doc/CREDITS.txt\">Credits</a> "
<< "and <a href=\"http://getdp.info/doc/LICENSE.txt\">licensing information</a></p>" << "and <a href=\"http://getdp.info/doc/LICENSE.txt\">licensing information</a></p>"
<< "<p><i>Build options:</i> " << GETDP_CONFIG_OPTIONS << "</p>" << "<p><i>Build options:</i> " << GETDP_CONFIG_OPTIONS << "</p>"
......
contrib/mobile/iOS/Onelab/AboutViewController.mm
+ 1
− 1
View file @ 124e63cf
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
NSString *css = [NSString stringWithFormat:@"body { background-color: #FFFFFF; color: #252525; margin: 35px 10px 35px 10px; padding: 0; font-family: helvetica-neue,sans-serif; font-size: 1em; } b { font-weight: normal; color: rgb(%d,%d,%d); } a { color: rgb(%d,%d,%d); }", r, g, b, r, g, b]; NSString *css = [NSString stringWithFormat:@"body { background-color: #FFFFFF; color: #252525; margin: 35px 10px 35px 10px; padding: 0; font-family: helvetica-neue,sans-serif; font-size: 1em; } b { font-weight: normal; color: rgb(%d,%d,%d); } a { color: rgb(%d,%d,%d); }", r, g, b, r, g, b];
if([self.fileToEdit isEqual:@"About"]){ if([self.fileToEdit isEqual:@"About"]){
[self.aboutView loadHTMLString:[NSString stringWithFormat:@"<html><head><style type=\"text/css\">%@</style></head><body><center><p><!-- img width=32 src=\"icon_onelab.png\"--></p><h3>Onelab/Mobile</h3>Version %@<p>Copyright (C) 2014-2016 Christophe Geuzaine and Maxime Graulich, University of Li&egrave;ge</p><p>Visit <a href=\"http://onelab.info/\">http://onelab.info/</a> for more information</p><p style=\"padding-top: 35px;\">This version of Onelab/Mobile contains:</p><h3>Gmsh</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2016 Christophe Geuzaine and Jean-Fran&ccedil;ois Remacle</p><p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://gmsh.info/\">http://gmsh.info</a> for more information</p><h3>GetDP</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2016 Patrick Dular and Christophe Geuzaine, University of Li&egrave;ge</p><p><a href=\"http://geuz.org/getdp/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/getdp/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://getdp.info\">http://getdp.info</a> for more information</p></center></body></html>", css, [self.aboutView loadHTMLString:[NSString stringWithFormat:@"<html><head><style type=\"text/css\">%@</style></head><body><center><p><!-- img width=32 src=\"icon_onelab.png\"--></p><h3>Onelab/Mobile</h3>Version %@<p>Copyright (C) 2014-2017 Christophe Geuzaine and Maxime Graulich, University of Li&egrave;ge</p><p>Visit <a href=\"http://onelab.info/\">http://onelab.info/</a> for more information</p><p style=\"padding-top: 35px;\">This version of Onelab/Mobile contains:</p><h3>Gmsh</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2017 Christophe Geuzaine and Jean-Fran&ccedil;ois Remacle</p><p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://gmsh.info/\">http://gmsh.info</a> for more information</p><h3>GetDP</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2017 Patrick Dular and Christophe Geuzaine, University of Li&egrave;ge</p><p><a href=\"http://geuz.org/getdp/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/getdp/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://getdp.info\">http://getdp.info</a> for more information</p></center></body></html>", css,
[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"], [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"],
GMSH_VERSION, GMSH_VERSION,
GMSH_DATE, GMSH_DATE,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment