Skip to content

Commit 914bbd2

Browse files
committed
interface, form.fpb
~ Changed Open With dialog title ~ Label is now Protected and spans full width open_with_dlg.cpp + now displays which project it will open using the label
1 parent 32df3a2 commit 914bbd2

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

source/form.fbp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2671,7 +2671,7 @@
26712671
<property name="size">-1,-1</property>
26722672
<property name="style">wxCAPTION|wxCLOSE_BOX|wxRESIZE_BORDER|wxSTAY_ON_TOP</property>
26732673
<property name="subclass">; ; forward_declare</property>
2674-
<property name="title">Set Editor Version</property>
2674+
<property name="title">Open With Specific Editor</property>
26752675
<property name="tooltip"></property>
26762676
<property name="window_extra_style"></property>
26772677
<property name="window_name"></property>
@@ -2689,7 +2689,7 @@
26892689
<property name="vgap">0</property>
26902690
<object class="gbsizeritem" expanded="0">
26912691
<property name="border">5</property>
2692-
<property name="colspan">1</property>
2692+
<property name="colspan">3</property>
26932693
<property name="column">0</property>
26942694
<property name="flag">wxALL</property>
26952695
<property name="row">0</property>
@@ -2731,11 +2731,11 @@
27312731
<property name="minimize_button">0</property>
27322732
<property name="minimum_size"></property>
27332733
<property name="moveable">1</property>
2734-
<property name="name">m_staticText7</property>
2734+
<property name="name">openWithLabel</property>
27352735
<property name="pane_border">1</property>
27362736
<property name="pane_position"></property>
27372737
<property name="pane_size"></property>
2738-
<property name="permission">none</property>
2738+
<property name="permission">protected</property>
27392739
<property name="pin_button">1</property>
27402740
<property name="pos"></property>
27412741
<property name="resize">Resizable</property>

source/interface.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,9 @@ OpenWithEditorDlgBase::OpenWithEditorDlgBase( wxWindow* parent, wxWindowID id, c
319319
openWithSizer->SetFlexibleDirection( wxBOTH );
320320
openWithSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
321321

322-
wxStaticText* m_staticText7;
323-
m_staticText7 = new wxStaticText( this, wxID_ANY, wxT("Select Editor Version"), wxDefaultPosition, wxDefaultSize, 0 );
324-
m_staticText7->Wrap( -1 );
325-
openWithSizer->Add( m_staticText7, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALL, 5 );
322+
openWithLabel = new wxStaticText( this, wxID_ANY, wxT("Select Editor Version"), wxDefaultPosition, wxDefaultSize, 0 );
323+
openWithLabel->Wrap( -1 );
324+
openWithSizer->Add( openWithLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxALL, 5 );
326325

327326
editorsListBox = new wxListBox( this, VERSIONS_LIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE );
328327
openWithSizer->Add( editorsListBox, wxGBPosition( 1, 0 ), wxGBSpan( 1, 3 ), wxALL|wxEXPAND, 5 );

source/interface.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,13 @@ class OpenWithEditorDlgBase : public wxDialog
104104
private:
105105

106106
protected:
107+
wxStaticText* openWithLabel;
107108
wxListBox* editorsListBox;
108109
wxButton* openBtn;
109110

110111
public:
111112

112-
OpenWithEditorDlgBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Set Editor Version"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxRESIZE_BORDER|wxSTAY_ON_TOP );
113+
OpenWithEditorDlgBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Open With Specific Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxRESIZE_BORDER|wxSTAY_ON_TOP );
113114
~OpenWithEditorDlgBase();
114115

115116
};

source/open_with_dlg.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ OpenWithDlg::OpenWithDlg(wxWindow* parent, const project& project, const vector<
2727
p = project;
2828
this->callback = callback;
2929

30+
//set title
31+
openWithLabel->SetLabel("Select editor verison to open \"" + project.name + "\"");
32+
3033
//fix window size
3134
fitWindowMinSize(this);
3235
}

0 commit comments

Comments
 (0)