← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/cadxcore/main/gui/progress/statusbarprogreso.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:
src/cadxcore/main/gui/progress/statusbarprogreso.cpp
184
184
                        m_pIconoProgreso->Play();
185
185
                }
186
186
                if(m_MapaTareas.size() == 1) {
187
 
                        m_pMensajeTarea->SetLabel((*m_MapaTareas.begin()).second->GetStatus()); 
 
187
                        if (!(*m_MapaTareas.begin()).second->GetStatus().empty()) {
 
188
                                m_pMensajeTarea->SetLabel((*m_MapaTareas.begin()).second->GetStatus()); 
 
189
                        }
188
190
 
189
191
                        m_pProgresoTarea->SetValue(((*m_MapaTareas.begin()).second->GetProgress() * 100));
190
192
                        if (!m_pProgresoTarea->IsShown()) {
313
315
                                                                        case GNC::GCS::Events::EventoMensajes::Error:
314
316
                                                                                {
315
317
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(), EventoMensajesUsuarioAsync::StatusBar, EventoMensajesUsuarioAsync::Error);
316
 
                                                                                        this->AddPendingEvent(event);
 
318
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
317
319
                                                                                }
318
320
                                                                                break;
319
321
                                                                        case GNC::GCS::Events::EventoMensajes::Aviso:
320
322
                                                                                {
321
323
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(), EventoMensajesUsuarioAsync::StatusBar,EventoMensajesUsuarioAsync::Aviso);
322
 
                                                                                        this->AddPendingEvent(event);
 
324
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
323
325
                                                                                }
324
326
                                                                                break;
325
327
                                                                        case GNC::GCS::Events::EventoMensajes::Informacion:
326
328
                                                                                {
327
329
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(), EventoMensajesUsuarioAsync::StatusBar, EventoMensajesUsuarioAsync::Informacion);
328
 
                                                                                        this->AddPendingEvent(event);
 
330
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
329
331
                                                                                }
330
332
                                                                                break;
331
333
                                                                        default:
332
334
                                                                                {
333
335
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(), EventoMensajesUsuarioAsync::StatusBar, EventoMensajesUsuarioAsync::Informacion);
334
 
                                                                                        this->AddPendingEvent(event);
 
336
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
335
337
                                                                                }
336
338
                                                                                break;
337
339
                                                                }
343
345
                                                                        case GNC::GCS::Events::EventoMensajes::Error:
344
346
                                                                                {
345
347
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(),EventoMensajesUsuarioAsync::PopUp, EventoMensajesUsuarioAsync::Error);
346
 
                                                                                        this->AddPendingEvent(event);
 
348
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
347
349
                                                                                }
348
350
                                                                                break;
349
351
                                                                        case GNC::GCS::Events::EventoMensajes::Aviso:
350
352
                                                                                {
351
353
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(),EventoMensajesUsuarioAsync::PopUp, EventoMensajesUsuarioAsync::Aviso);
352
 
                                                                                        this->AddPendingEvent(event);
 
354
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
353
355
                                                                                }
354
356
                                                                                break;
355
357
                                                                        case GNC::GCS::Events::EventoMensajes::Informacion:
356
358
                                                                                {
357
359
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(),EventoMensajesUsuarioAsync::PopUp, EventoMensajesUsuarioAsync::Informacion);
358
 
                                                                                        this->AddPendingEvent(event);
 
360
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
359
361
                                                                                }
360
362
                                                                                break;
361
363
                                                                        default:
362
364
                                                                                {
363
365
                                                                                        EventoMensajesUsuarioAsync event(pEvt->GetMensaje(),EventoMensajesUsuarioAsync::PopUp, EventoMensajesUsuarioAsync::Informacion);
364
 
                                                                                        this->AddPendingEvent(event);
 
366
                                                                                        this->GetEventHandler()->AddPendingEvent(event);
365
367
                                                                                }
366
368
                                                                                break;
367
369
                                                                }