← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/hugin1/nona_gui/nona_gui.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/nona_gui/nona_gui.cpp
132
132
    // parse arguments
133
133
    static const wxCmdLineEntryDesc cmdLineDesc[] =
134
134
    {
 
135
        //On wxWidgets 2.9, wide characters don't work here.
 
136
        //On previous versions, the wxT macro is required for unicode builds.
 
137
#if wxCHECK_VERSION(2,9,0)
 
138
      { wxCMD_LINE_SWITCH, "h", "help", "show this help message",
 
139
        wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
 
140
      { wxCMD_LINE_OPTION, "o", "output",  "output file" },
 
141
      { wxCMD_LINE_OPTION, "t", "threads",  "number of threads",
 
142
             wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL },
 
143
      { wxCMD_LINE_PARAM,  NULL, NULL, "<project> <images>",
 
144
#else
135
145
      { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("show this help message"),
136
146
        wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
137
147
      { wxCMD_LINE_OPTION, wxT("o"), wxT("output"),  wxT("output file") },
138
148
      { wxCMD_LINE_OPTION, wxT("t"), wxT("threads"),  wxT("number of threads"),
139
149
             wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL },
140
 
      { wxCMD_LINE_PARAM,  NULL, NULL, _T("<project> <images>"),
 
150
      { wxCMD_LINE_PARAM,  NULL, NULL, wxT("<project> <images>"),
 
151
#endif
141
152
        wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE },
142
153
      { wxCMD_LINE_NONE }
143
154
    };
169
180
        wxFileDialog dlg(0,_("Specify project source project file"),
170
181
                        wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")),
171
182
                        wxT(""), wxT(""),
172
 
                        wxOPEN, wxDefaultPosition);
 
183
                        wxFD_OPEN, wxDefaultPosition);
173
184
        dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")));
174
185
        if (dlg.ShowModal() == wxID_OK) {
175
186
        wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory());  // remember for later
201
212
        wxFileDialog dlg(0,_("Specify output image filename"),
202
213
                         wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")),
203
214
                         wxT(""), wxT(""),
204
 
                         wxSAVE, wxDefaultPosition);
 
215
                         wxFD_SAVE, wxDefaultPosition);
205
216
        dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")));
206
217
        if (dlg.ShowModal() == wxID_OK) {
207
218
            wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory());  // remember for later