← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/aboutdialog.cpp

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/aboutdialog.cpp
90
90
 
91
91
        wxStaticText* pVer_wx = XRCCTRL(*this, "ID_VER_WX", wxStaticText);
92
92
        if (pVer_wx)
93
 
                pVer_wx->SetLabel(wxVERSION_NUM_DOT_STRING_T);
 
93
                pVer_wx->SetLabel(GetDependencyVersion(dependency::wxwidgets));
94
94
 
95
95
        wxStaticText* pVer_gnutls = XRCCTRL(*this, "ID_VER_GNUTLS", wxStaticText);
96
96
        if (pVer_gnutls)
97
 
                pVer_gnutls->SetLabel(GetDependencyVersion(dependency_gnutls));
 
97
                pVer_gnutls->SetLabel(GetDependencyVersion(dependency::gnutls));
 
98
 
 
99
        wxStaticText* pVer_sqlite = XRCCTRL(*this, "ID_VER_SQLITE", wxStaticText);
 
100
        if (pVer_sqlite)
 
101
                pVer_sqlite->SetLabel(GetDependencyVersion(dependency::sqlite));
98
102
 
99
103
        wxStaticText* pSystemName = XRCCTRL(*this, "ID_SYSTEM_NAME", wxStaticText);
100
104
        if (!pSystemName)
132
136
                pSystemVersionDesc->Hide();
133
137
                pSystemVersion->Hide();
134
138
        }
135
 
   
 
139
 
136
140
        wxStaticText* pSystemPlatform = XRCCTRL(*this, "ID_SYSTEM_PLATFORM", wxStaticText);
137
141
        if (!pSystemPlatform)
138
142
                return false;
173
177
        text += '\n';
174
178
 
175
179
        text += _T("\nBuild information:\n");
176
 
        
 
180
 
177
181
        wxString host = CBuildInfo::GetHostname();
178
182
        if (!host.empty())
179
183
                text += _T("  Compiled for:   ") + host + _T("\n");
190
194
        if (!compilerFlags.empty())
191
195
                text += _T("  Compiler flags: ") + compilerFlags + _T("\n");
192
196
 
193
 
        text += _T("\nLinked against:\n  wxWidgets:      ") + wxString(wxVERSION_NUM_DOT_STRING_T) + _T("\n");
194
 
        text += _T("  GnuTLS:         ") + GetDependencyVersion(dependency_gnutls) + _T("\n");
195
 
 
 
197
        text += _T("\nLinked against:\n");
 
198
        for (int i = 0; i < dependency::count; ++i)
 
199
        {
 
200
                text += wxString::Format(_T("  % -15s %s\n"),
 
201
                        (GetDependencyName(dependency::type(i)) + _T(":")).c_str(),
 
202
                        GetDependencyVersion(dependency::type(i)).c_str());
 
203
        }
196
204
 
197
205
        text += _T("\nOperating system:\n");
198
206
        wxString os = wxGetOsDescription();
199
207
        if (!os.empty())
200
208
                text += _T("  Name:           ") + os + _T("\n");
201
 
        
 
209
 
202
210
        int major, minor;
203
211
        if (wxGetOsVersion(&major, &minor) != wxOS_UNKNOWN)
204
212
                text += wxString::Format(_T("  Version:        %d.%d\n"), major, minor);