~ubuntu-branches/ubuntu/trusty/ginkgocadx/trusty

« back to all changes in this revision

Viewing changes to src/cadxcore/main/tools/showtagstool.cpp

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2013-07-21 11:58:53 UTC
  • mfrom: (7.2.1 sid)
  • Revision ID: package-import@ubuntu.com-20130721115853-44e7n1xujqglu78e
Tags: 3.4.0.928.29+dfsg-1
* New upstream release [July 2013]
  + new B-D: "libjsoncpp-dev".
  + new patch "unbundle-libjsoncpp.patch" to avoid building bundled
    "libjsoncpp-dev".
  + new patch "fix-wx.patch" to avoid FTBFS due to missing
    "-lwx_gtk2u_html-2.8".
* Removed unnecessary versioned Build-Depends.
* Removed obsolete lintian override.
* Reference get-orig-source implementation for orig.tar clean-up and
  DFSG-repackaging.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
78
78
        if (m_pPanelTags != NULL) {
79
79
                if (!IsVisible()) {
80
80
                        if (ViewContract->GetView() != NULL) {
81
 
                                m_pPanelTags->SetEstudio(ViewContract->GetView()->GetEstudio());
 
81
                                m_pPanelTags->SetView(ViewContract->GetView());
82
82
                        } else {
83
 
                                m_pPanelTags->SetEstudio(NULL);
 
83
                                m_pPanelTags->SetView(NULL);
84
84
                        }
85
85
                }
86
86
                m_pPanelTags->MostrarOcultarPanelTags();
112
112
{
113
113
        if ( evt->GetCodigoEvento() == ginkgoEVT_Core_ModificacionImagen) {
114
114
                GNC::GCS::Events::EventoModificacionImagen* pEvt = dynamic_cast<GNC::GCS::Events::EventoModificacionImagen*>(evt);
115
 
                if (pEvt->GetTipo() == GNC::GCS::Events::EventoModificacionImagen::SliceCambiado || pEvt->GetTipo() == GNC::GCS::Events::EventoModificacionImagen::ImagenCargada) {
 
115
                if (pEvt->GetTipo() == GNC::GCS::Events::EventoModificacionImagen::SliceCambiado 
 
116
                        || pEvt->GetTipo() == GNC::GCS::Events::EventoModificacionImagen::ImagenCargada
 
117
                        || pEvt->GetTipo() == GNC::GCS::Events::EventoModificacionImagen::AnotacionesEstaticasModificadas) {
116
118
                        if (m_pPanelTags != NULL) {
117
119
                                if (IsVisible()) {
118
120
                                        if (ViewContract->GetView() != NULL) {
119
 
                                                m_pPanelTags->SetEstudio(ViewContract->GetView()->GetEstudio());
 
121
                                                m_pPanelTags->SetView(ViewContract->GetView());
120
122
                                        } else {
121
 
                                                m_pPanelTags->SetEstudio(NULL);
 
123
                                                m_pPanelTags->SetView(NULL);
122
124
                                        }
123
125
                                }
124
126
                        }