diff --git a/DialogTools/AutoUpdateDlg.cpp b/DialogTools/AutoUpdateDlg.cpp index 278bf0ab4..61dad3336 100644 --- a/DialogTools/AutoUpdateDlg.cpp +++ b/DialogTools/AutoUpdateDlg.cpp @@ -287,7 +287,7 @@ wxString AutoUpdate::GetCheckList() } } else { // we don't support auto update on other platforms - return ""; + checklistUrl += ".linux.txt"; } return ReadUrlContent(checklistUrl); @@ -429,29 +429,43 @@ void AutoUpdateDlg::OnOkClick( wxCommandEvent& event ) } else { file_name = exeDir + file_name; - wxString update_file_name = file_name + ".update"; - wxString backup_file_name = file_name + ".backup"; - wxRemoveFile(backup_file_name); - wxRemoveFile(update_file_name); - - file_url.Replace(" ", "%20"); - if (DownloadUrl(file_url.mb_str(), update_file_name.mb_str())){ - // check file size - wxFileName updateFile(update_file_name); - wxULongLong update_size = updateFile.GetSize(); - - if (update_size != size ) - throw GdaException(""); + wxStructStat strucStat; + wxStat(file_name, &strucStat); + wxFileOffset filelen=strucStat.st_size; + + // should skip unless some criticle file + if (filelen == size && + file_name.EndsWith("cache.sqlite") ) + { + success = true; - // replace the old file - wxRenameFile(file_name, backup_file_name); - wxRenameFile(update_file_name, file_name); + } else { + + wxString update_file_name = file_name + ".update"; + wxString backup_file_name = file_name + ".backup"; - wxRemoveFile(backup_file_name); - wxRemoveFile(update_file_name); + wxRemoveFile(backup_file_name); + wxRemoveFile(update_file_name); + + file_url.Replace(" ", "%20"); + if (DownloadUrl(file_url.mb_str(), update_file_name.mb_str())){ + // check file size + wxFileName updateFile(update_file_name); + wxULongLong update_size = updateFile.GetSize(); + + if (update_size != size ) + throw GdaException(""); + + // replace the old file + wxRenameFile(file_name, backup_file_name); + wxRenameFile(update_file_name, file_name); + + wxRemoveFile(backup_file_name); + wxRemoveFile(update_file_name); - success = true; + success = true; + } } progressDlg.Update(current_job++); } diff --git a/Explore/HistogramView.cpp b/Explore/HistogramView.cpp index bd3362d85..2f60d6af5 100644 --- a/Explore/HistogramView.cpp +++ b/Explore/HistogramView.cpp @@ -745,6 +745,10 @@ void HistogramCanvas::PopulateCanvas() } selectable_shps.resize(cur_intervals); + if (!is_custom_category) { + cat_classif_def.colors.resize(cur_intervals); + cat_classif_def.names.resize(cur_intervals); + } for (int i=0; isetPen(GdaConst::qualitative_colors[i%sz]); selectable_shps[i]->setBrush(GdaConst::qualitative_colors[i%sz]); + cat_classif_def.colors[i] = GdaConst::qualitative_colors[i%sz]; } else { selectable_shps[i]->setPen(cat_classif_def.colors[i]); selectable_shps[i]->setBrush(cat_classif_def.colors[i]); @@ -890,6 +895,8 @@ void HistogramCanvas::InitIntervals() ival_obs_cnt.resize(boost::extents[ts][cur_intervals]); ival_obs_sel_cnt.resize(boost::extents[ts][cur_intervals]); + cat_classif_def.num_cats = cur_intervals; + for (int t=0; tLoad(wxT("memory:XRC_resource/GdaAppResources.cpp$003-dialogs.xrc")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$002-data_viewer_dialogs.xrc")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$002-menus.xrc")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$000-toolbar.xrc")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$000-panel.xrc")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$dragdrop.png"), xml_res_file_7, xml_res_size_7, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$dialogs.xrc"), xml_res_file_8, xml_res_size_8, wxT("text/xml")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$8px_help.png"), xml_res_file_9, xml_res_size_9, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$data_viewer_dialogs.xrc"), xml_res_file_10, xml_res_size_10, wxT("text/xml")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$menus.xrc"), xml_res_file_11, xml_res_size_11, wxT("text/xml")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_01.png"), xml_res_file_12, xml_res_size_12, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_02.png"), xml_res_file_13, xml_res_size_13, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_02.png"), xml_res_file_14, xml_res_size_14, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_03.png"), xml_res_file_15, xml_res_size_15, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_03.png"), xml_res_file_16, xml_res_size_16, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_04.png"), xml_res_file_17, xml_res_size_17, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_04.png"), xml_res_file_18, xml_res_size_18, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_05.png"), xml_res_file_19, xml_res_size_19, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_05.png"), xml_res_file_20, xml_res_size_20, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_09.png"), xml_res_file_21, xml_res_size_21, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_09.png"), xml_res_file_22, xml_res_size_22, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_10.png"), xml_res_file_23, xml_res_size_23, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_10.png"), xml_res_file_24, xml_res_size_24, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_11.png"), xml_res_file_25, xml_res_size_25, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_11.png"), xml_res_file_26, xml_res_size_26, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_12.png"), xml_res_file_27, xml_res_size_27, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_12.png"), xml_res_file_28, xml_res_size_28, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_13.png"), xml_res_file_29, xml_res_size_29, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_13.png"), xml_res_file_30, xml_res_size_30, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_14.png"), xml_res_file_31, xml_res_size_31, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_14.png"), xml_res_file_32, xml_res_size_32, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_15.png"), xml_res_file_33, xml_res_size_33, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_15.png"), xml_res_file_34, xml_res_size_34, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_16.png"), xml_res_file_35, xml_res_size_35, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_16.png"), xml_res_file_36, xml_res_size_36, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_17.png"), xml_res_file_37, xml_res_size_37, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_17.png"), xml_res_file_38, xml_res_size_38, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_18.png"), xml_res_file_39, xml_res_size_39, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_18.png"), xml_res_file_40, xml_res_size_40, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_19.png"), xml_res_file_41, xml_res_size_41, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_19.png"), xml_res_file_42, xml_res_size_42, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_20.png"), xml_res_file_43, xml_res_size_43, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_20.png"), xml_res_file_44, xml_res_size_44, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_21.png"), xml_res_file_45, xml_res_size_45, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_21.png"), xml_res_file_46, xml_res_size_46, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_22.png"), xml_res_file_47, xml_res_size_47, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_22.png"), xml_res_file_48, xml_res_size_48, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_23.png"), xml_res_file_49, xml_res_size_49, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_23.png"), xml_res_file_50, xml_res_size_50, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_25.png"), xml_res_file_51, xml_res_size_51, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_25.png"), xml_res_file_52, xml_res_size_52, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_26.png"), xml_res_file_53, xml_res_size_53, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_26.png"), xml_res_file_54, xml_res_size_54, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_27.png"), xml_res_file_55, xml_res_size_55, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_27.png"), xml_res_file_56, xml_res_size_56, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_28.png"), xml_res_file_57, xml_res_size_57, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_29.png"), xml_res_file_58, xml_res_size_58, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_30.png"), xml_res_file_59, xml_res_size_59, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_31.png"), xml_res_file_60, xml_res_size_60, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_32.png"), xml_res_file_61, xml_res_size_61, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_33.png"), xml_res_file_62, xml_res_size_62, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_34.png"), xml_res_file_63, xml_res_size_63, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_36.png"), xml_res_file_64, xml_res_size_64, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$toolbar.xrc"), xml_res_file_65, xml_res_size_65, wxT("text/xml")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-open-folder.png"), xml_res_file_66, xml_res_size_66, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-open-folder_disabled.png"), xml_res_file_67, xml_res_size_67, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-close-folder.png"), xml_res_file_68, xml_res_size_68, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-close-folder_disabled.png"), xml_res_file_69, xml_res_size_69, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_36.png"), xml_res_file_70, xml_res_size_70, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_36_disabled.png"), xml_res_file_71, xml_res_size_71, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_2.png"), xml_res_file_72, xml_res_size_72, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_2_disabled.png"), xml_res_file_73, xml_res_size_73, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_4.png"), xml_res_file_74, xml_res_size_74, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_4_disabled.png"), xml_res_file_75, xml_res_size_75, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_5.png"), xml_res_file_76, xml_res_size_76, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_5_disabled.png"), xml_res_file_77, xml_res_size_77, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_6.png"), xml_res_file_78, xml_res_size_78, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_6_disabled.png"), xml_res_file_79, xml_res_size_79, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_9.png"), xml_res_file_80, xml_res_size_80, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_9_disabled.png"), xml_res_file_81, xml_res_size_81, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_10.png"), xml_res_file_82, xml_res_size_82, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_10_disabled.png"), xml_res_file_83, xml_res_size_83, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_14.png"), xml_res_file_84, xml_res_size_84, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_14_disabled.png"), xml_res_file_85, xml_res_size_85, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_12.png"), xml_res_file_86, xml_res_size_86, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_12_disabled.png"), xml_res_file_87, xml_res_size_87, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_13.png"), xml_res_file_88, xml_res_size_88, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_13_disabled.png"), xml_res_file_89, xml_res_size_89, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_15.png"), xml_res_file_90, xml_res_size_90, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_15_disabled.png"), xml_res_file_91, xml_res_size_91, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_17.png"), xml_res_file_92, xml_res_size_92, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_17_disabled.png"), xml_res_file_93, xml_res_size_93, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_16.png"), xml_res_file_94, xml_res_size_94, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_16_disabled.png"), xml_res_file_95, xml_res_size_95, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_18.png"), xml_res_file_96, xml_res_size_96, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_18_disabled.png"), xml_res_file_97, xml_res_size_97, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_19.png"), xml_res_file_98, xml_res_size_98, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_19_disabled.png"), xml_res_file_99, xml_res_size_99, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_20.png"), xml_res_file_100, xml_res_size_100, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_20_disabled.png"), xml_res_file_101, xml_res_size_101, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_21.png"), xml_res_file_102, xml_res_size_102, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_21_disabled.png"), xml_res_file_103, xml_res_size_103, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_22.png"), xml_res_file_104, xml_res_size_104, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_22_disabled.png"), xml_res_file_105, xml_res_size_105, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_23.png"), xml_res_file_106, xml_res_size_106, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_23_disabled.png"), xml_res_file_107, xml_res_size_107, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_24.png"), xml_res_file_108, xml_res_size_108, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_24_disabled.png"), xml_res_file_109, xml_res_size_109, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_25.png"), xml_res_file_110, xml_res_size_110, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_25_disabled.png"), xml_res_file_111, xml_res_size_111, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_26.png"), xml_res_file_112, xml_res_size_112, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_26_disabled.png"), xml_res_file_113, xml_res_size_113, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_27.png"), xml_res_file_114, xml_res_size_114, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_27_disabled.png"), xml_res_file_115, xml_res_size_115, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_28.png"), xml_res_file_116, xml_res_size_116, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_28_disabled.png"), xml_res_file_117, xml_res_size_117, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_29.png"), xml_res_file_118, xml_res_size_118, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_29_disabled.png"), xml_res_file_119, xml_res_size_119, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_30.png"), xml_res_file_120, xml_res_size_120, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_30_disabled.png"), xml_res_file_121, xml_res_size_121, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_31.png"), xml_res_file_122, xml_res_size_122, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_31_disabled.png"), xml_res_file_123, xml_res_size_123, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_32.png"), xml_res_file_124, xml_res_size_124, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_32_disabled.png"), xml_res_file_125, xml_res_size_125, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$panel.xrc"), xml_res_file_126, xml_res_size_126, wxT("text/xml")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$dialogs.xrc")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$data_viewer_dialogs.xrc")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$menus.xrc")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$toolbar.xrc")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$panel.xrc")); } diff --git a/version.h b/version.h index a0ab061e0..2fab6614d 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ namespace Gda { const int version_major = 1; const int version_minor = 8; const int version_build = 16; - const int version_subbuild = 0; + const int version_subbuild = 4; const int version_year = 2017; const int version_month = 3; const int version_day = 1;