Fix a couple of PCM formatting issues
- Include files using global includes - Use standard file format extensions
This commit is contained in:
parent
b447d55900
commit
b554c4cb66
|
@ -20,22 +20,23 @@
|
|||
|
||||
// kicad_curl_easy.h **must be** included before any wxWidgets header to avoid conflicts
|
||||
// at least on Windows/msys2
|
||||
#include "kicad_curl/kicad_curl_easy.h"
|
||||
#include <kicad_curl/kicad_curl_easy.h>
|
||||
|
||||
#include "dialog_pcm.h"
|
||||
#include "bitmaps.h"
|
||||
#include "dialog_manage_repositories.h"
|
||||
#include "grid_tricks.h"
|
||||
#include "ki_exception.h"
|
||||
#include "kicad_settings.h"
|
||||
#include "pcm_task_manager.h"
|
||||
#include "pgm_base.h"
|
||||
#include "settings/settings_manager.h"
|
||||
#include "thread"
|
||||
#include "widgets/wx_grid.h"
|
||||
#include <dialog_pcm.h>
|
||||
#include <bitmaps.h>
|
||||
#include <dialog_manage_repositories.h>
|
||||
#include <grid_tricks.h>
|
||||
#include <ki_exception.h>
|
||||
#include <kicad_settings.h>
|
||||
#include <pcm_task_manager.h>
|
||||
#include <pgm_base.h>
|
||||
#include <settings/settings_manager.h>
|
||||
#include <widgets/wx_grid.h>
|
||||
#include <wildcards_and_files_ext.h>
|
||||
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
#include <wx/filedlg.h>
|
||||
#include <wx/msgdlg.h>
|
||||
|
@ -250,7 +251,7 @@ void DIALOG_PCM::OnRefreshClicked( wxCommandEvent& event )
|
|||
void DIALOG_PCM::OnInstallFromFileClicked( wxCommandEvent& event )
|
||||
{
|
||||
wxFileDialog open_file_dialog( this, _( "Choose package file" ), wxEmptyString, wxEmptyString,
|
||||
wxT( "Zip files (*.zip)|*.zip" ), wxFD_OPEN | wxFD_FILE_MUST_EXIST );
|
||||
ZipFileWildcard(), wxFD_OPEN | wxFD_FILE_MUST_EXIST );
|
||||
|
||||
if( open_file_dialog.ShowModal() == wxID_CANCEL )
|
||||
return;
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include <widgets/wx_panel.h>
|
||||
#include <string_utils.h>
|
||||
#include <html_window.h>
|
||||
#include <wildcards_and_files_ext.h>
|
||||
|
||||
#include <cmath>
|
||||
#include <fstream>
|
||||
|
@ -484,7 +485,7 @@ void PANEL_PACKAGES_VIEW::OnDownloadVersionClicked( wxCommandEvent& event )
|
|||
|
||||
wxFileDialog dialog( this, _( "Save package" ), app_settings->m_PcmLastDownloadDir,
|
||||
wxString::Format( wxT( "%s_v%s.zip" ), package.identifier, version ),
|
||||
wxT( "ZIP files (*.zip)|*.zip" ), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
|
||||
ZipFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
|
||||
|
||||
if( dialog.ShowModal() == wxID_CANCEL )
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue