Skip to content

Commit

Permalink
Merge pull request #453 from lixun910/master
Browse files Browse the repository at this point in the history 
GeoDa 1.8.10
  • Loading branch information
@lixun910
lixun910 authored Jul 14, 2016
2 parents af03fbf + 75dc8a7 commit 9400009
Show file tree
Hide file tree
Showing 8 changed files with 1,156 additions and 1,157 deletions.
4 changes: 2 additions & 2 deletions DialogTools/ConnectDatasourceDlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions DialogTools/ExportDataDlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions DialogTools/PublishDlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion GdaCartoDB.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2,263 changes: 1,131 additions & 1,132 deletions rc/GdaAppResources.cpp
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions rc/dialogs.xrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -7383,7 +7383,7 @@
</object>

</object>
<label>CartoDB</label>
<label>Carto</label>
</object>
<size>560,340</size>
</object>
Expand Down Expand Up @@ -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">
Expand All @@ -7808,7 +7808,7 @@
</object>

</object>
<label>CartoDB</label>
<label>Carto</label>
</object>

<size>580,340</size>
Expand Down
16 changes: 8 additions & 8 deletions rc/menus.xrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
8 changes: 4 additions & 4 deletions version.h
View file
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 9400009

Please sign in to comment.