Skip to content

Commit

Permalink
find in files dialog: UI redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
@eranif
eranif committed Apr 16, 2022
1 parent a5dbab1 commit e35743f
Show file tree
Hide file tree
Showing 10 changed files with 1,503 additions and 1,805 deletions.
205 changes: 73 additions & 132 deletions LiteEditor/findinfiles_dlg.cpp
View file

Large diffs are not rendered by default.

36 changes: 13 additions & 23 deletions LiteEditor/findinfiles_dlg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@
#include <wx/combobox.h>
#include <wx/arrstr.h>
#include "clThemedComboBox.hpp"
#include <wx/stc/stc.h>
#include <wx/choice.h>
#include "clThemedChoice.h"
#include <wx/button.h>
#include <wx/notebook.h>
#include <wx/imaglist.h>
#include <wx/statbox.h>
#include <wx/checkbox.h>
#include <wx/checklst.h>
#if wxVERSION_NUMBER >= 2900
Expand All @@ -52,40 +48,37 @@ class FindInFilesDialogBase : public wxDialog
wxPanel* m_panelMainPanel;
wxStaticText* m_staticText1;
clThemedComboBox* m_findString;
wxButton* m_find;
wxStaticText* m_staticText102;
clThemedComboBox* m_replaceString;
wxButton* m_replaceAll;
wxStaticText* m_staticText3;
clThemedComboBox* m_fileTypes;
wxStaticText* m_staticText2;
wxStyledTextCtrl* m_stcPaths;
clThemedComboBox* m_comboBoxWhere;
wxButton* m_btnAddPath;
wxStaticText* m_staticText5;
clThemedChoice* m_choiceEncoding;
wxButton* m_find;
wxButton* m_replaceAll;
clThemedComboBox* m_comboBoxEncoding;
wxButton* m_cancel;
wxButton* m_btnAddPath;
wxNotebook* m_notebook150;
wxPanel* m_panel152;
wxCheckBox* m_matchCase;
wxCheckBox* m_matchWholeWord;
wxCheckBox* m_regualrExpression;
wxCheckBox* m_checkBoxPipeForGrep;
wxCheckBox* m_checkBoxSaveFilesBeforeSearching;
wxPanel* m_panel154;
wxCheckBox* m_checkBoxTODO;
wxCheckBox* m_checkBoxATTN;
wxCheckBox* m_checkBoxBUG;
wxCheckBox* m_checkBoxFIXME;

protected:
virtual void OnFindEnter(wxCommandEvent& event) { event.Skip(); }
virtual void OnReplaceEnter(wxCommandEvent& event) { event.Skip(); }
virtual void OnFind(wxCommandEvent& event) { event.Skip(); }
virtual void OnFindWhatUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void OnReplaceEnter(wxCommandEvent& event) { event.Skip(); }
virtual void OnReplace(wxCommandEvent& event) { event.Skip(); }
virtual void OnReplaceUI(wxUpdateUIEvent& event) { event.Skip(); }
virtual void OnButtonClose(wxCommandEvent& event) { event.Skip(); }
virtual void OnAddPath(wxCommandEvent& event) { event.Skip(); }
virtual void OnButtonClose(wxCommandEvent& event) { event.Skip(); }
virtual void OnRegex(wxCommandEvent& event) { event.Skip(); }
virtual void OnTODO(wxCommandEvent& event) { event.Skip(); }
virtual void OnATTN(wxCommandEvent& event) { event.Skip(); }
Expand All @@ -95,31 +88,28 @@ class FindInFilesDialogBase : public wxDialog
public:
wxStaticText* GetStaticText1() { return m_staticText1; }
clThemedComboBox* GetFindString() { return m_findString; }
wxButton* GetFind() { return m_find; }
wxStaticText* GetStaticText102() { return m_staticText102; }
clThemedComboBox* GetReplaceString() { return m_replaceString; }
wxButton* GetReplaceAll() { return m_replaceAll; }
wxStaticText* GetStaticText3() { return m_staticText3; }
clThemedComboBox* GetFileTypes() { return m_fileTypes; }
wxStaticText* GetStaticText2() { return m_staticText2; }
wxStyledTextCtrl* GetStcPaths() { return m_stcPaths; }
clThemedComboBox* GetComboBoxWhere() { return m_comboBoxWhere; }
wxButton* GetBtnAddPath() { return m_btnAddPath; }
wxStaticText* GetStaticText5() { return m_staticText5; }
clThemedChoice* GetChoiceEncoding() { return m_choiceEncoding; }
wxButton* GetFind() { return m_find; }
wxButton* GetReplaceAll() { return m_replaceAll; }
clThemedComboBox* GetComboBoxEncoding() { return m_comboBoxEncoding; }
wxButton* GetCancel() { return m_cancel; }
wxButton* GetBtnAddPath() { return m_btnAddPath; }
wxPanel* GetPanelMainPanel() { return m_panelMainPanel; }
wxCheckBox* GetMatchCase() { return m_matchCase; }
wxCheckBox* GetMatchWholeWord() { return m_matchWholeWord; }
wxCheckBox* GetRegualrExpression() { return m_regualrExpression; }
wxCheckBox* GetCheckBoxPipeForGrep() { return m_checkBoxPipeForGrep; }
wxCheckBox* GetCheckBoxSaveFilesBeforeSearching() { return m_checkBoxSaveFilesBeforeSearching; }
wxPanel* GetPanel152() { return m_panel152; }
wxCheckBox* GetCheckBoxTODO() { return m_checkBoxTODO; }
wxCheckBox* GetCheckBoxATTN() { return m_checkBoxATTN; }
wxCheckBox* GetCheckBoxBUG() { return m_checkBoxBUG; }
wxCheckBox* GetCheckBoxFIXME() { return m_checkBoxFIXME; }
wxPanel* GetPanel154() { return m_panel154; }
wxNotebook* GetNotebook150() { return m_notebook150; }
FindInFilesDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Find In Files"),
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1),
long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
Expand Down
98 changes: 49 additions & 49 deletions LiteEditor/findinfiles_dlg_formbuilder_bitmaps.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
//
// This file was automatically generated by wxrc, do not edit by hand.
//

#include <wx/wxprec.h>

#ifdef __BORLANDC__
#pragma hdrstop
#endif

#include <wx/filesys.h>
#include <wx/fs_mem.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xh_all.h>

#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
#else
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFile(name, data, size)
#endif

static size_t xml_res_size_0 = 137;
static unsigned char xml_res_file_0[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103,
47,119,120,120,114,99,34,62,10,32,32,60,33,45,45,32,72,97,110,100,108,101,
114,32,71,101,110,101,114,97,116,105,111,110,32,105,115,32,79,78,32,45,
45,62,10,60,47,114,101,115,111,117,114,99,101,62,10};

void wxCABC4InitBitmapResources()
{

// Check for memory FS. If not present, load the handler:
{
wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
wxFileSystem fsys;
wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
if (f) delete f;
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}

XRC_ADD_FILE(wxT("XRC_resource/findinfiles_dlg_formbuilder_bitmaps.cpp$_home_ANT.AMAZON.COM_eifrah_devl_codelite_formbuilder_findinfiles_dlg_formbuilder_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/findinfiles_dlg_formbuilder_bitmaps.cpp$_home_ANT.AMAZON.COM_eifrah_devl_codelite_formbuilder_findinfiles_dlg_formbuilder_bitmaps.xrc"));
}
//
// This file was automatically generated by wxrc, do not edit by hand.
//

#include <wx/wxprec.h>

#ifdef __BORLANDC__
#pragma hdrstop
#endif

#include <wx/filesys.h>
#include <wx/fs_mem.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xh_all.h>

#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
#else
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFile(name, data, size)
#endif

static size_t xml_res_size_0 = 137;
static unsigned char xml_res_file_0[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103,
47,119,120,120,114,99,34,62,10,32,32,60,33,45,45,32,72,97,110,100,108,101,
114,32,71,101,110,101,114,97,116,105,111,110,32,105,115,32,79,78,32,45,
45,62,10,60,47,114,101,115,111,117,114,99,101,62,10};

void wxCABC4InitBitmapResources()
{

// Check for memory FS. If not present, load the handler:
{
wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
wxFileSystem fsys;
wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
if (f) delete f;
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}

XRC_ADD_FILE(wxT("XRC_resource/findinfiles_dlg_formbuilder_bitmaps.cpp$C__src_codelite_formbuilder_findinfiles_dlg_formbuilder_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/findinfiles_dlg_formbuilder_bitmaps.cpp$C__src_codelite_formbuilder_findinfiles_dlg_formbuilder_bitmaps.xrc"));
}
Loading

0 comments on commit e35743f

Please sign in to comment.