Merge pull request #453 from lixun910/master

GeoDa 1.8.10
GeoDaCenter · Jul 14, 2016 · 9400009 · 9400009
2 parents af03fbf + 75dc8a7
commit 9400009
Show file tree

Hide file tree

Showing 8 changed files with 1,156 additions and 1,157 deletions.
diff --git a/DialogTools/ConnectDatasourceDlg.cpp b/DialogTools/ConnectDatasourceDlg.cpp
@@ -402,10 +402,10 @@ IDataSource* ConnectDatasourceDlg::CreateDataSource()
         std::string key(m_cartodb_key->GetValue().Trim().mb_str());
 
         if (user.empty()) {
-           throw GdaException("Please input CartoDB User Name.");
+           throw GdaException("Please input Carto User Name.");
         }
         if (key.empty()) {
-           throw GdaException("Please input CartoDB App Key.");
+           throw GdaException("Please input Carto App Key.");
         }
 
         CPLSetConfigOption("CARTODB_API_KEY", key.c_str());

diff --git a/DialogTools/ExportDataDlg.cpp b/DialogTools/ExportDataDlg.cpp
@@ -663,10 +663,10 @@ IDataSource* ExportDataDlg::GetDatasource()
         std::string key(m_cartodb_key->GetValue().Trim().mb_str());
 
         if (user.empty()) {
-            throw GdaException("Please input CartoDB User Name.");
+            throw GdaException("Please input Carto User Name.");
         }
         if (key.empty()) {
-            throw GdaException("Please input CartoDB App Key.");
+            throw GdaException("Please input Carto App Key.");
         }
 
         CPLSetConfigOption("CARTODB_API_KEY", key.c_str());

diff --git a/DialogTools/PublishDlg.cpp b/DialogTools/PublishDlg.cpp
@@ -316,7 +316,7 @@ void GeoDaWebProxy::doGet(string& parameter)
         // Grab image 
         res = curl_easy_perform(curl);
         if( res ) {
-            printf("Cannot connect cartodb.com!\n");
+            printf("Cannot connect carto.com!\n");
         } 
 
         int res_code = 0;
@@ -359,7 +359,7 @@ string GeoDaWebProxy::doPost(const string& _parameter)
 
         res = curl_easy_perform(curl);
         if( res ) {
-            printf("Cannot connect cartodb.com!\n");
+            printf("Cannot connect carto.com!\n");
         } 
 
         int res_code = 0;

diff --git a/GdaCartoDB.cpp b/GdaCartoDB.cpp
@@ -164,7 +164,7 @@ void CartoDBProxy::_doGet(string parameter)
         // Grab image 
         res = curl_easy_perform(curl);
         if( res ) {
-            printf("Cannot connect cartodb.com!\n");
+            printf("Cannot connect carto.com!\n");
         } 
 
         int res_code = 0;

diff --git a/rc/GdaAppResources.cpp b/rc/GdaAppResources.cpp
diff --git a/rc/dialogs.xrc b/rc/dialogs.xrc
@@ -7362,13 +7362,13 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Get a free CartoDB account: </label>
+                        <label>Get a free Carto account: </label>
                       </object>
                     </object>
                     <orient>wxHORIZONTAL</orient>
                     <object class="sizeritem">
                       <object class="wxHyperlinkCtrl">
-                        <url>https://www.cartodb.com/</url>
+                        <url>https://www.carto.com/</url>
                       </object>
                     </object>
                     <object class="sizeritem">
@@ -7383,7 +7383,7 @@
               </object>
 
             </object>
-            <label>CartoDB</label>
+            <label>Carto</label>
           </object>
           <size>560,340</size>
         </object>
@@ -7787,13 +7787,13 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
-                        <label>Get a free CartoDB account: </label>
+                        <label>Get a free Carto account: </label>
                       </object>
                     </object>
                     <orient>wxHORIZONTAL</orient>
                     <object class="sizeritem">
                       <object class="wxHyperlinkCtrl">
-                        <url>https://www.cartodb.com/</url>
+                        <url>https://www.carto.com/</url>
                       </object>
                     </object>
                     <object class="sizeritem">
@@ -7808,7 +7808,7 @@
               </object>
 
             </object>
-            <label>CartoDB</label>
+            <label>Carto</label>
           </object>
 
           <size>580,340</size>

diff --git a/rc/menus.xrc b/rc/menus.xrc
@@ -2273,19 +2273,19 @@
           </object>
           <object class="separator"/>
           <object class="wxMenuItem" name="ID_BASEMAP_1">
-              <label>CartoDB Light</label>
+              <label>Carto Light</label>
               <checkable>1</checkable>
           </object>
           <object class="wxMenuItem" name="ID_BASEMAP_2">
-              <label>CartoDB Dark</label>
+              <label>Carto Dark</label>
               <checkable>1</checkable>
           </object>
           <object class="wxMenuItem" name="ID_BASEMAP_3">
-              <label>CartoDB Light (No Labels)</label>
+              <label>Carto Light (No Labels)</label>
               <checkable>1</checkable>
           </object>
           <object class="wxMenuItem" name="ID_BASEMAP_4">
-              <label>CartoDB Dark (No Labels)</label>
+              <label>Carto Dark (No Labels)</label>
               <checkable>1</checkable>
           </object>
           <object class="wxMenuItem" name="ID_BASEMAP_5">
@@ -2329,19 +2329,19 @@
 	  </object>
 	  <object class="separator"/>
 	  <object class="wxMenuItem" name="ID_BASEMAP_1">
-		  <label>CartoDB Light</label>
+		  <label>Carto Light</label>
 		  <checkable>1</checkable>
 	  </object>
 	  <object class="wxMenuItem" name="ID_BASEMAP_2">
-		  <label>CartoDB Dark</label>
+		  <label>Carto Dark</label>
 		  <checkable>1</checkable>
 	  </object>
 	  <object class="wxMenuItem" name="ID_BASEMAP_3">
-		  <label>CartoDB Light (No Labels)</label>
+		  <label>Carto Light (No Labels)</label>
 		  <checkable>1</checkable>
 	  </object>
 	  <object class="wxMenuItem" name="ID_BASEMAP_4">
-		  <label>CartoDB Dark (No Labels)</label>
+		  <label>Carto Dark (No Labels)</label>
 		  <checkable>1</checkable>
 	  </object>
 	  <object class="wxMenuItem" name="ID_BASEMAP_5">

diff --git a/version.h b/version.h
@@ -1,11 +1,11 @@
 namespace Gda {
 	const int version_major = 1;
 	const int version_minor = 8;
-	const int version_build = 9;
-	const int version_subbuild = 3;
+	const int version_build = 10;
+	const int version_subbuild = 0;
 	const int version_year = 2016;
 	const int version_month = 7;
-	const int version_day = 8;
+	const int version_day = 14;
 	const int version_night = 0;
-	const int version_type = 1; // 0: alpha, 1: beta, 2: release
+	const int version_type = 2; // 0: alpha, 1: beta, 2: release
 }