← Back to branch summary

~ubuntu-branches/ubuntu/trusty/hugin/trusty-proposed

« back to all changes in this revision

Viewing changes to src/hugin1/base_wx/huginConfig.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler
  • Date: 2011-01-06 14:28:24 UTC
  • mfrom: (1.1.9 upstream) (0.1.21 experimental)
  • Revision ID: james.westby@ubuntu.com-20110106142824-zn9lxylg5z44dynn
* Drop Cyril Brulebois from Uploaders. Thank you very much for your work.
* Bump package version. (rc3 was re-released as 2010.4.0).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/hugin1/base_wx/huginConfig.cpp
202
202
    return progs;
203
203
}
204
204
 
 
205
AssistantPrograms getAssistantProgramsConfig(wxString bundledBinDir, wxConfigBase * config)
 
206
{
 
207
    AssistantPrograms progs;
 
208
 
 
209
    wxString bindir;
 
210
#ifndef __WXGTK__
 
211
    // add trailing directory separator, if needed
 
212
    wxFileName bindirFN = wxFileName::DirName(bundledBinDir);
 
213
    bindir =  bindirFN.GetPath();
 
214
#endif
 
215
 
 
216
    try {
 
217
        progs.icpfind = getProgram(config,bindir, wxT("icpfind"), wxT("icpfind"));
 
218
    } catch (wxString s) {
 
219
        wxMessageBox(s, _("Warning"));
 
220
    }
 
221
    try {
 
222
        progs.celeste= getProgram(config,bindir, wxT("celeste_standalone"), wxT("celeste_standalone"));
 
223
    } catch (wxString s) {
 
224
        wxMessageBox(s, _("Warning"));
 
225
    }
 
226
 
 
227
    try {
 
228
        progs.cpclean = getProgram(config,bindir, wxT("cpclean"), wxT("cpclean"));
 
229
    } catch (wxString s) {
 
230
        wxMessageBox(s, _("Warning"));
 
231
    }
 
232
    try {
 
233
        progs.autooptimiser= getProgram(config,bindir, wxT("autooptimiser"), wxT("autooptimiser"));
 
234
    } catch (wxString s) {
 
235
        wxMessageBox(s, _("Warning"));
 
236
    }
 
237
    try {
 
238
        progs.pano_modify= getProgram(config,bindir, wxT("pano_modify"), wxT("pano_modify"));
 
239
    } catch (wxString s) {
 
240
        wxMessageBox(s, _("Warning"));
 
241
    }
 
242
    try {
 
243
        progs.checkpto= getProgram(config,bindir, wxT("checkpto"), wxT("checkpto"));
 
244
    } catch (wxString s) {
 
245
        wxMessageBox(s, _("Warning"));
 
246
    }
 
247
    return progs;
 
248
}
 
249
 
205
250
wxString getExePath(wxString argv0)
206
251
{
207
252
    wxString huginPath;