Skip to content

Commit

Permalink
update files
Browse files Browse the repository at this point in the history
Signed-off-by: Sala Carlo <[email protected]>
  • Loading branch information
Carluccio committed Mar 28, 2019
1 parent b0fbbf6 commit ffa088c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Sorgenti/file.manifest
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<description>wxWindows application</description>

<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
</windowsSettings>
</application>
</assembly>


22 changes: 11 additions & 11 deletions Sorgenti/gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxVERTICAL );

m_staticText1 = new wxStaticText( m_panel1, wxID_ANY, _("Secondo la formula di Keys"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticText1 = new wxStaticText( m_panel1, wxID_ANY, _T("Secondo la formula di Keys"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticText1->Wrap( -1 );
m_staticText1->SetFont(wxFontInfo(16).FaceName("Arial").Italic().Bold());
//m_staticText1->SetFont( wxFont( 16, 74, 93, 92, false, wxT("Arial") ) );
m_staticText1->SetForegroundColour( wxColour( 32, 54, 210 ) );

bSizer3->Add( m_staticText1, 0, wxALL|wxEXPAND|wxLEFT|wxRIGHT, 5 );

m_staticText2 = new wxStaticText( m_panel1, wxID_ANY, _("(Possibilità di inserire anche i decimali !!)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticText2 = new wxStaticText( m_panel1, wxID_ANY, _T("(Possibilità di inserire anche i decimali !!)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticText2->Wrap( -1 );
m_staticText2->SetFont(wxFontInfo(9).FaceName("Arial").Italic().Bold());
//m_staticText2->SetFont( wxFont( 9, 74, 93, 92, false, wxT("Arial") ) );
Expand All @@ -58,7 +58,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
wxBoxSizer* bSizer4;
bSizer4 = new wxBoxSizer( wxHORIZONTAL );

m_staticText3 = new wxStaticText( m_panel1, wxID_ANY, _("Altezza in cm.:"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
m_staticText3 = new wxStaticText( m_panel1, wxID_ANY, _T("Altezza in cm.:"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
m_staticText3->Wrap( -1 );
m_staticText3->SetFont(wxFontInfo(9).FaceName("Arial"));
bSizer4->Add( m_staticText3, 0, wxALL, 5 );
Expand All @@ -81,7 +81,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t

bSizer4->Add( 60, 0, 0, wxEXPAND, 5 );

m_radioBtn1 = new wxRadioButton( m_panel1, wxID_ANY, _("Maschio"), wxDefaultPosition, wxDefaultSize, 0 );
m_radioBtn1 = new wxRadioButton( m_panel1, wxID_ANY, _T("Maschio"), wxDefaultPosition, wxDefaultSize, 0 );
m_radioBtn1->SetValue( true );
bSizer4->Add( m_radioBtn1, 0, wxALL, 5 );

Expand All @@ -91,7 +91,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
wxBoxSizer* bSizer6;
bSizer6 = new wxBoxSizer( wxHORIZONTAL );

m_staticText5 = new wxStaticText( m_panel1, wxID_ANY, _("Peso attuale in Kg.:"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
m_staticText5 = new wxStaticText( m_panel1, wxID_ANY, _T("Peso attuale in Kg.:"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
m_staticText5->Wrap( -1 );
m_staticText5->SetFont(wxFontInfo(9).FaceName("Arial"));

Expand All @@ -115,7 +115,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t

bSizer6->Add( 60, 0, 0, wxEXPAND, 5 );

m_radioBtn2 = new wxRadioButton( m_panel1, wxID_ANY, _("Femmina"), wxDefaultPosition, wxDefaultSize, 0 );
m_radioBtn2 = new wxRadioButton( m_panel1, wxID_ANY, _T("Femmina"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer6->Add( m_radioBtn2, 0, wxALL, 5 );


Expand All @@ -124,13 +124,13 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
wxBoxSizer* bSizer7;
bSizer7 = new wxBoxSizer( wxHORIZONTAL );

m_button1 = new wxButton( m_panel1, wxID_ANY, _("Calcola !!"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
m_button1 = new wxButton( m_panel1, wxID_ANY, _T("Calcola !!"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
bSizer7->Add( m_button1, 0, wxLEFT, 5 );


bSizer7->Add( 0, 0, 1, wxEXPAND, 5 );

m_button2 = new wxButton( m_panel1, wxID_ANY, _("?"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
m_button2 = new wxButton( m_panel1, wxID_ANY, _T("?"), wxDefaultPosition, wxSize(dpiz(122), -1), 0 );
bSizer7->Add( m_button2, 0, wxRIGHT, 5 );


Expand All @@ -139,7 +139,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
wxBoxSizer* bSizer8;
bSizer8 = new wxBoxSizer( wxHORIZONTAL );

m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Il tuo peso forma è Kg.:"), wxDefaultPosition, wxSize(dpiz(258), -1), 0 );
m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _T("Il tuo peso forma è Kg.:"), wxDefaultPosition, wxSize(dpiz(258), -1), 0 );
m_staticText7->Wrap( -1 );
m_staticText7->SetFont(wxFontInfo(9).FaceName("Arial"));
bSizer8->Add( m_staticText7, 0, wxLEFT, 5 );
Expand All @@ -159,7 +159,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
wxBoxSizer* bSizer9;
bSizer9 = new wxBoxSizer( wxHORIZONTAL );

m_staticText9 = new wxStaticText( m_panel1, wxID_ANY, _("Differenza rispetto al tuo peso forma, Kg.:"), wxDefaultPosition, wxSize(dpiz(258), -1), 0 );
m_staticText9 = new wxStaticText( m_panel1, wxID_ANY, _T("Differenza rispetto al tuo peso forma, Kg.:"), wxDefaultPosition, wxSize(dpiz(258), -1), 0 );
m_staticText9->SetFont(wxFontInfo(9).FaceName("Arial").Bold());
m_staticText9->Wrap( -1 );

Expand All @@ -181,7 +181,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
bSizer10 = new wxBoxSizer( wxVERTICAL );
bSizer10->Add( 0, 0, 1, wxEXPAND, 5 );
m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
m_hyperlink1 = new wxGenericHyperlinkCtrl( m_panel1, wxID_ANY, _("© Carlo Sala software"), wxT("https://www.carlosala.net/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_hyperlink1 = new wxGenericHyperlinkCtrl( m_panel1, wxID_ANY, _T("© Carlo Sala software"), wxT("https://www.carlosala.net/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_statusBar->PushStatusText(" V.: 3.0.0");
m_hyperlink1->SetHoverColour( wxColour( 32, 54, 210 ) );
m_hyperlink1->SetNormalColour( wxColour( 64, 64, 64 ) );
Expand Down
13 changes: 6 additions & 7 deletions Sorgenti/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Name: main.cpp
* Purpose: Implements simple wxWidgets application with GUI
* created using wxFormBuilder.
* Author: Sala Carlo
* Created: 10/03/2019
* Author:
* Created:
* Copyright:
* License: wxWidgets license (www.wxwidgets.org)
*
Expand Down Expand Up @@ -36,7 +36,7 @@ bool MainApp::OnInit()

MainFrame::MainFrame(wxWindow *parent) : MainFrameBase( parent )
{
SetIcon(wxICON(iconFrame));
SetIcon(wxICON(sample));
}

MainFrame::~MainFrame()
Expand All @@ -59,8 +59,8 @@ void MainFrame::OnClickCalcola(wxCommandEvent& event)
variabile=(atof(m_textCtrl1->GetValue()+"."+ m_textCtrl2->GetValue()))/100;
pesoAttuale= atof(m_textCtrl3->GetValue()+"."+ m_textCtrl4->GetValue());
if(variabile > 2.50 || variabile < 1.00 || pesoAttuale > 280 || pesoAttuale < 7) {
wxMessageBox("Valori non ammessi !!",
"Avviso", wxOK | wxICON_EXCLAMATION);
wxMessageBox (_T("Valori non ammessi !!"),
_T("Avviso"), wxOK | wxICON_EXCLAMATION);
variabile =0;
pesoAttuale = 0;
} else {
Expand All @@ -78,6 +78,5 @@ void MainFrame::OnClickCalcola(wxCommandEvent& event)

void MainFrame::OnClickHelp(wxCommandEvent& event)
{
wxMessageBox(" Formula di Keys\n Uomini: (altezza in metri) x (altezza in metri) x 22.1\n Donne: (altezza in metri) x (altezza in metri) x 20.6\n\n Nei risultati è usato il punto per i decimali !!\n Al di sotto o al di sopra di certi valori, il programma non è attendibile !!",
"Precisazione ...", wxOK | wxICON_INFORMATION);
wxMessageBox (_T(" Formula di Keys\n Uomini: (altezza in metri) x (altezza in metri) x 22.1\n Donne: (altezza in metri) x (altezza in metri) x 20.6\n\n Nei risultati è usato il punto per i decimali !!\n Al di sotto o al di sopra di certi valori, il programma non è attendibile !!") ,_T("Precisazione ..."), wxOK | wxICON_INFORMATION);
}

0 comments on commit ffa088c

Please sign in to comment.