"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/interface/settings/optionspage_interface.cpp" between
FileZilla_3.48.0_src.tar.bz2 and FileZilla_3.48.1_src.tar.bz2

About: FileZilla is a fast and feature-rich cross-platform FTP, FTPS and SFTP client with an intuitive graphical user interface.

optionspage_interface.cpp  (FileZilla_3.48.0_src.tar.bz2):optionspage_interface.cpp  (FileZilla_3.48.1_src.tar.bz2)
skipping to change at line 113 skipping to change at line 113
void COptionsPageInterface::OnLayoutChange(wxCommandEvent&) void COptionsPageInterface::OnLayoutChange(wxCommandEvent&)
{ {
m_pOptions->SetOption(OPTION_FILEPANE_LAYOUT, GetChoice(XRCID("ID_FILEPAN ELAYOUT"))); m_pOptions->SetOption(OPTION_FILEPANE_LAYOUT, GetChoice(XRCID("ID_FILEPAN ELAYOUT")));
m_pOptions->SetOption(OPTION_FILEPANE_SWAP, GetCheck(XRCID("ID_FILEPANESW AP")) ? 1 : 0); m_pOptions->SetOption(OPTION_FILEPANE_SWAP, GetCheck(XRCID("ID_FILEPANESW AP")) ? 1 : 0);
m_pOptions->SetOption(OPTION_MESSAGELOG_POSITION, GetChoice(XRCID("ID_MES SAGELOGPOS"))); m_pOptions->SetOption(OPTION_MESSAGELOG_POSITION, GetChoice(XRCID("ID_MES SAGELOGPOS")));
} }
bool COptionsPageInterface::CreateControls(wxWindow* parent) bool COptionsPageInterface::CreateControls(wxWindow* parent)
{ {
auto const& layout = m_pOwner->layout(); auto const& lay = m_pOwner->layout();
Create(parent); Create(parent);
auto outer = new wxBoxSizer(wxVERTICAL); auto main = lay.createFlex(1);
main->AddGrowableCol(0);
SetSizer(main);
{
auto [box, inner] = lay.createStatBox(main, _("Layout"), 1);
auto rows = lay.createFlex(2);
inner->Add(rows);
rows->Add(new wxStaticText(box, -1, _("&Layout of file and direct
ory panes:")), lay.valign);
auto choice = new wxChoice(box, XRCID("ID_FILEPANELAYOUT"));
choice->Append(_("Classic"));
choice->Append(_("Explorer"));
choice->Append(_("Widescreen"));
choice->Append(_("Blackboard"));
rows->Add(choice, lay.valign);
rows->Add(new wxStaticText(box, -1, _("Message log positio&n:")),
lay.valign);
choice = new wxChoice(box, XRCID("ID_MESSAGELOGPOS"));
choice->Append(_("Above the file lists"));
choice->Append(_("Next to the transfer queue"));
choice->Append(_("As tab in the transfer queue pane"));
rows->Add(choice, lay.valign);
inner->Add(new wxCheckBox(box, XRCID("ID_FILEPANESWAP"), _("&Swap
local and remote panes")));
}
auto boxSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Layout")); {
outer->Add(boxSizer, layout.grow); auto [box, inner] = lay.createStatBox(main, _("Behaviour"), 1);
auto box = boxSizer->GetStaticBox();
auto layoutSizer = layout.createFlex(1);
boxSizer->Add(layoutSizer, 0, wxALL, layout.border);
auto innerlayoutSizer = layout.createFlex(2);
layoutSizer->Add(innerlayoutSizer);
innerlayoutSizer->Add(new wxStaticText(box, -1, _("&Layout of file and di
rectory panes:")), layout.valign);
auto choice = new wxChoice(box, XRCID("ID_FILEPANELAYOUT"));
choice->Append(_("Classic"));
choice->Append(_("Explorer"));
choice->Append(_("Widescreen"));
choice->Append(_("Blackboard"));
innerlayoutSizer->Add(choice, layout.valign);
innerlayoutSizer->Add(new wxStaticText(box, -1, _("Message log positio&n:
")), layout.valign);
choice = new wxChoice(box, XRCID("ID_MESSAGELOGPOS"));
choice->Append(_("Above the file lists"));
choice->Append(_("Next to the transfer queue"));
choice->Append(_("As tab in the transfer queue pane"));
innerlayoutSizer->Add(choice, layout.valign);
layoutSizer->Add(new wxCheckBox(box, XRCID("ID_FILEPANESWAP"), _("&Swap l
ocal and remote panes")));
boxSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Behaviour"));
outer->Add(boxSizer, layout.grow);
box = boxSizer->GetStaticBox();
auto behaviour = layout.createFlex(1);
boxSizer->Add(behaviour, 0, wxALL, layout.border);
#ifndef __WXMAC__ #ifndef __WXMAC__
behaviour->Add(new wxCheckBox(box, XRCID("ID_MINIMIZE_TRAY"), _("&Minimiz e to tray"))); inner->Add(new wxCheckBox(box, XRCID("ID_MINIMIZE_TRAY"), _("&Min imize to tray")));
#endif #endif
behaviour->Add(new wxCheckBox(box, XRCID("ID_PREVENT_IDLESLEEP"), _("P&re inner->Add(new wxCheckBox(box, XRCID("ID_PREVENT_IDLESLEEP"), _("
vent system from entering idle sleep during transfers and other operations"))); P&revent system from entering idle sleep during transfers and other operations")
behaviour->AddSpacer(0); ));
behaviour->Add(new wxStaticText(box, -1, _("On startup of FileZilla:"))); inner->AddSpacer(0);
behaviour->Add(new wxRadioButton(box, XRCID("ID_INTERFACE_STARTUP_NORMAL" inner->Add(new wxStaticText(box, -1, _("On startup of FileZilla:"
), _("S&tart normally"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP)); )));
behaviour->Add(new wxRadioButton(box, XRCID("ID_INTERFACE_STARTUP_SITEMAN inner->Add(new wxRadioButton(box, XRCID("ID_INTERFACE_STARTUP_NOR
AGER"), _("S&how the Site Manager on startup"))); MAL"), _("S&tart normally"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP));
behaviour->Add(new wxRadioButton(box, XRCID("ID_INTERFACE_STARTUP_RESTORE inner->Add(new wxRadioButton(box, XRCID("ID_INTERFACE_STARTUP_SIT
"), _("Restore ta&bs and reconnect"))); EMANAGER"), _("S&how the Site Manager on startup")));
behaviour->AddSpacer(0); inner->Add(new wxRadioButton(box, XRCID("ID_INTERFACE_STARTUP_RES
behaviour->Add(new wxStaticText(box, -1, _("When st&arting a new connecti TORE"), _("Restore ta&bs and reconnect")));
on while already connected:"))); inner->AddSpacer(0);
choice = new wxChoice(box, XRCID("ID_NEWCONN_ACTION")); inner->Add(new wxStaticText(box, -1, _("When st&arting a new conn
choice->Append(_("Ask for action")); ection while already connected:")));
choice->Append(_("Connect in new tab")); auto choice = new wxChoice(box, XRCID("ID_NEWCONN_ACTION"));
choice->Append(_("Connect in current tab")); choice->Append(_("Ask for action"));
behaviour->Add(choice); choice->Append(_("Connect in new tab"));
choice->Append(_("Connect in current tab"));
boxSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Transfer Queue")); inner->Add(choice);
outer->Add(boxSizer, layout.grow); }
box = boxSizer->GetStaticBox();
boxSizer->Add(new wxCheckBox(box, XRCID("ID_SPEED_DISPLAY"), _("&Display {
momentary transfer speed instead of average speed")), 0, wxALL, layout.border); auto [box, inner] = lay.createStatBox(main, _("Transfer Queue"),
1);
SetSizer(outer); inner->Add(new wxCheckBox(box, XRCID("ID_SPEED_DISPLAY"), _("&Dis
play momentary transfer speed instead of average speed")));
}
return true; return true;
} }
 End of changes. 6 change blocks. 
60 lines changed or deleted 59 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)