AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-04 23:35:31 +00:00
Files Issues Releases Activity

Move HTML_WINDOW to widgets folder, also fix some fbps that were wrongly not edited

Browse Source 
Somebody manually edited at least 3 files fixed here....so the fbps were wrong
This commit is contained in:
Marek Roszko 2023-09-11 19:09:55 -04:00
parent 3fcbde00c9
commit 4ac5404822
48 changed files with 70 additions and 103 deletions

2
common/CMakeLists.txt
View File

@ -212,6 +212,7 @@ set( COMMON_WIDGET_SRCS
widgets/grid_icon_text_helpers.cpp
widgets/grid_text_button_helpers.cpp
widgets/grid_text_helpers.cpp
widgets/html_window.cpp
widgets/indicator_icon.cpp
widgets/wx_infobar.cpp
widgets/kistatusbar.cpp
@ -393,7 +394,6 @@ set( COMMON_SRCS
grid_tricks.cpp
hotkey_store.cpp
hotkeys_basic.cpp
html_window.cpp
kiface_base.cpp
kiid.cpp
kiway.cpp

4
common/dialogs/dialog_display_html_text_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.0)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -18,7 +18,7 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent,
bMainSizer->SetMinSize( wxSize( 540,240 ) );
m_htmlWindow = new HTML_WINDOW( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 5 );
bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 10 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK );

7
common/dialogs/dialog_display_html_text_base.fbp
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="15" />
<FileVersion major="1" minor="16" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
@ -14,6 +14,7 @@
<property name="file">dialog_display_html_text_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="image_path_wrapper_function_name"></property>
<property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property name="name">dialog_display_html_text_base</property>
@ -25,6 +26,7 @@
<property name="skip_php_events">1</property>
<property name="skip_python_events">1</property>
<property name="ui_table">UI</property>
<property name="use_array_enum">0</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1">
@ -50,6 +52,7 @@
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title"></property>
<property name="tooltip"></property>
<property name="two_step_creation">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@ -108,7 +111,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxHW_SCROLLBAR_AUTO</property>
<property name="subclass">HTML_WINDOW; html_window.h; </property>
<property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>

4
common/dialogs/dialog_display_html_text_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.0)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -10,7 +10,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include "html_window.h"
#include "widgets/html_window.h"
#include "dialog_shim.h"
#include <wx/html/htmlwin.h>
#include <wx/gdicmn.h>

2
common/dialogs/dialog_plugin_options_base.fbp
View File

@ -555,7 +555,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxHW_SCROLLBAR_AUTO</property>
<property name="subclass">HTML_WINDOW; html_window.h; </property>
<property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>

2
common/dialogs/dialog_plugin_options_base.h
View File

@ -13,7 +13,7 @@
class STD_BITMAP_BUTTON;
class WX_GRID;
#include "html_window.h"
#include "widgets/html_window.h"
#include "dialog_shim.h"
#include <wx/colour.h>
#include <wx/settings.h>

2
common/html_window.cpp → common/widgets/html_window.cpp
View File

@ -22,7 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <html_window.h>
#include <widgets/html_window.h>
#include <wx/settings.h>

2
common/widgets/wx_html_report_box.h
View File

@ -22,7 +22,7 @@
#include <reporter.h>
#include <vector>
#include <html_window.h>
#include <widgets/html_window.h>
#include <eda_units.h>
/**

2
common/widgets/wx_html_report_panel_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!

2
common/widgets/wx_html_report_panel_base.fbp
View File

@ -126,7 +126,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxHW_SCROLLBAR_AUTO</property>
<property name="subclass">HTML_WINDOW; html_window.h; </property>
<property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>

4
common/widgets/wx_html_report_panel_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -10,7 +10,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include "html_window.h"
#include "widgets/html_window.h"
#include <wx/html/htmlwin.h>
#include <wx/gdicmn.h>
#include <wx/font.h>

2
eeschema/dialogs/dialog_choose_symbol.h
View File

@ -27,7 +27,7 @@
#include "dialog_shim.h"
#include <symbol_tree_model_adapter.h>
#include <footprint_info.h>
#include <html_window.h>
#include <widgets/html_window.h>
class wxCheckBox;
class wxStaticBitmap;

2
eeschema/dialogs/dialog_rescue_each_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!

2
eeschema/dialogs/dialog_rescue_each_base.fbp
View File

@ -121,7 +121,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxHW_SCROLLBAR_AUTO</property>
<property name="subclass">HTML_WINDOW; html_window.h; </property>
<property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>

4
eeschema/dialogs/dialog_rescue_each_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -10,7 +10,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include "html_window.h"
#include "widgets/html_window.h"
#include "dialog_shim.h"
#include <wx/html/htmlwin.h>
#include <wx/gdicmn.h>

2
eeschema/dialogs/dialog_symbol_remap_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.0)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!

4
eeschema/dialogs/dialog_symbol_remap_base.fbp
View File

@ -120,7 +120,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxHW_SCROLLBAR_AUTO</property>
<property name="subclass">HTML_WINDOW; html_window.h; </property>
<property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
@ -347,7 +347,7 @@
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="subclass">WX_HTML_REPORT_PANEL; wx_html_report_panel.h</property>
<property name="subclass">WX_HTML_REPORT_PANEL; widgets/wx_html_report_panel.h; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>

4
eeschema/dialogs/dialog_symbol_remap_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.0)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -12,7 +12,7 @@
#include <wx/intl.h>
class WX_HTML_REPORT_PANEL;
#include "html_window.h"
#include "widgets/html_window.h"
#include "dialog_shim.h"
#include <wx/html/htmlwin.h>
#include <wx/gdicmn.h>

0
include/html_window.h → include/widgets/html_window.h
View File

2
include/widgets/lib_tree.h
View File

@ -28,7 +28,7 @@
#include <wx/panel.h>
#include <wx/timer.h>
#include <lib_tree_model_adapter.h>
#include <html_window.h>
#include <widgets/html_window.h>
#include <widgets/wx_dataviewctrl.h>
class wxTextCtrl;

2
kicad/dialogs/dialog_template_selector_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!

2
kicad/dialogs/dialog_template_selector_base.fbp
View File

@ -455,7 +455,7 @@
<property name="show">1</property>
<property name="size">-1,-1</property>
<property name="style">wxHW_SCROLLBAR_AUTO</property>
<property name="subclass">HTML_WINDOW; html_window.h; </property>
<property name="subclass">HTML_WINDOW; widgets/html_window.h; </property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>

4
kicad/dialogs/dialog_template_selector_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -12,7 +12,7 @@
#include <wx/intl.h>
class STD_BITMAP_BUTTON;
#include "html_window.h"
#include "widgets/html_window.h"
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/stattext.h>

2
kicad/pcm/dialogs/panel_packages_view.cpp
View File

@ -20,7 +20,7 @@
#include "panel_packages_view.h"
#include <grid_tricks.h>
#include <html_window.h>
#include <widgets/html_window.h>
#include <pgm_base.h>
#include <kiplatform/ui.h>
#include <settings/common_settings.h>

2
kicad/pcm/dialogs/panel_packages_view_base.cpp
View File

@ -5,7 +5,7 @@
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "html_window.h"
#include "widgets/html_window.h"
#include "widgets/wx_panel.h"
#include "panel_packages_view_base.h"

Some files were not shown because too many files have changed in this diff Show More