Changeset 8a8308c


Ignore:
Timestamp:
05/12/14 05:41:40 (13 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
4e975c8, 7c92c88
Parents:
7a94ac6
Message:

Add the splash screen to the migration path of the AppCafe?, and make sure to run pbi_updateindex before starting the migration UI.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/main.cpp

    re7fce9d r8a8308c  
    55#include <QDebug> 
    66#include <QSplashScreen> 
     7#include <QProcess> 
    78 
    89#include "mainUI.h" 
     
    3940    QDir dir("/var/db/pbi/installed"); 
    4041    if( !dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot).isEmpty() ){ 
     42      QPixmap pix(":/icons/splash.png"); 
     43      QSplashScreen SS(pix); 
     44        SS.showMessage(QObject::tr("Updating Index"), Qt::AlignHCenter | Qt::AlignBottom); 
     45        SS.show(); 
     46        a.processEvents(); 
     47        a.processEvents(); 
     48        QProcess::execute("pbi_updateindex"); 
    4149      //Still on the old system - prompt to migrate to PBI-NG 
    4250      MigrateUI w; 
    4351      w.show(); 
     52      SS.finish(&w); 
    4453      QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &w, SLOT(slotSingleInstance()) ); 
    4554      a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); 
    4655      return a.exec(); 
    4756    }else{ 
    48      //QPixmap pix(":/icons/splash.png"); 
    49      //QSplashScreen SS(pix); 
    50         //SS.showMessage(QObject::tr("Starting Up.."), Qt::AlignHCenter | Qt::AlignBottom); 
    51         //SS.show(); 
    52         //a.processEvents(); 
    53         //a.processEvents(); 
    54  
    5557      //Already on PBI-NG 
    5658      MainUI w;  
     
    6264      } 
    6365      w.show(); 
    64       //SS.finish(&w); 
     66 
    6567      QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &w, SLOT(slotSingleInstance()) ); 
    6668      a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); 
Note: See TracChangeset for help on using the changeset viewer.