← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/hugin1/hugin/PreviewFrame.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/hugin/PreviewFrame.cpp
111
111
    EVT_BUTTON(PROJ_PARAM_RESET_ID, PreviewFrame::OnProjParameterReset)
112
112
END_EVENT_TABLE()
113
113
 
114
 
#define PF_STYLE (wxMAXIMIZE_BOX | wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN)
 
114
#define PF_STYLE (wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN)
115
115
 
116
116
PreviewFrame::PreviewFrame(wxFrame * frame, PT::Panorama &pano)
117
117
    : wxFrame(frame,-1, _("Panorama preview"), wxDefaultPosition, wxDefaultSize,
347
347
 
348
348
    // set the minimize icon
349
349
#ifdef __WXMSW__
350
 
    wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO);
 
350
    wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/hugin.ico"),wxBITMAP_TYPE_ICO);
351
351
#else
352
 
    wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG);
 
352
    wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/hugin.png"),wxBITMAP_TYPE_PNG);
353
353
#endif
354
354
    SetIcon(myIcon);
355
355
 
376
376
    wxAcceleratorEntry entries[3];
377
377
    entries[0].Set(wxACCEL_NORMAL,WXK_F11,ID_FULL_SCREEN);
378
378
    entries[1].Set(wxACCEL_CTRL,(int)'Z',ID_UNDO);
379
 
    entries[2].Set(wxACCEL_CTRL,(int)'Y',ID_REDO);
 
379
    entries[2].Set(wxACCEL_CTRL,(int)'R',ID_REDO);
380
380
    wxAcceleratorTable accel(3, entries);
381
381
    SetAcceleratorTable(accel);
382
382
#ifdef __WXGTK__
494
494
        assert((int) params.size() == nParam);
495
495
        for (int i=0; i < nParam; i++) {
496
496
            wxString val = wxString(doubleToString(params[i],1).c_str(), wxConvLocal);
497
 
            m_projParamTextCtrl[i]->SetValue(wxString(val.c_str(), wxConvLocal));
 
497
            m_projParamTextCtrl[i]->SetValue(wxString(val.wc_str(), wxConvLocal));
498
498
            m_projParamSlider[i]->SetValue(utils::roundi(params[i]));
499
499
        }
500
500
    }
972
972
void PreviewFrame::OnUndo(wxCommandEvent &e)
973
973
{
974
974
    wxCommandEvent dummy(wxEVT_COMMAND_MENU_SELECTED, XRCID("ID_EDITUNDO"));
975
 
    m_parent->AddPendingEvent(dummy);
 
975
    m_parent->GetEventHandler()->AddPendingEvent(dummy);
976
976
};
977
977
 
978
978
void PreviewFrame::OnRedo(wxCommandEvent &e)
979
979
{
980
980
    wxCommandEvent dummy(wxEVT_COMMAND_MENU_SELECTED, XRCID("ID_EDITREDO"));
981
 
    m_parent->AddPendingEvent(dummy);
 
981
    m_parent->GetEventHandler()->AddPendingEvent(dummy);
982
982
};
983
983