-rw-r--r-- | core/launcher/launcher.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 1bd1156..6948976 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -601,13 +601,13 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) | |||
601 | tabs = 0; | 601 | tabs = 0; |
602 | rootFolder = 0; | 602 | rootFolder = 0; |
603 | docsFolder = 0; | 603 | docsFolder = 0; |
604 | 604 | ||
605 | int stamp = uidgen.generate(); // this is our timestamp to see which devices we know | 605 | int stamp = uidgen.generate(); // this is our timestamp to see which devices we know |
606 | //uidgen.store( stamp ); | 606 | //uidgen.store( stamp ); |
607 | m_timeStamp = QString::number( stamp ); | 607 | m_timeStamp = QString::number( stamp ); |
608 | 608 | ||
609 | tabs = new CategoryTabWidget( this ); | 609 | tabs = new CategoryTabWidget( this ); |
610 | tabs->setMaximumWidth( qApp->desktop()->width() ); | 610 | tabs->setMaximumWidth( qApp->desktop()->width() ); |
611 | setCentralWidget( tabs ); | 611 | setCentralWidget( tabs ); |
612 | 612 | ||
613 | connect( tabs, SIGNAL(selected(const QString&)), | 613 | connect( tabs, SIGNAL(selected(const QString&)), |
@@ -976,17 +976,22 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
976 | if (!appName.isEmpty()) { | 976 | if (!appName.isEmpty()) { |
977 | cfg.writeEntry("Apps", appName); | 977 | cfg.writeEntry("Apps", appName); |
978 | cfg.writeEntry("Delay", delay); | 978 | cfg.writeEntry("Delay", delay); |
979 | } | 979 | } |
980 | } else { | 980 | } else { |
981 | } | 981 | } |
982 | } else if ( msg == "sendVersionInfo()" ) { | 982 | } |
983 | /* | ||
984 | * QtopiaDesktop relies on the major number | ||
985 | * to start with 1. We're at 0.9 | ||
986 | * so wee need to fake at least 1.4 to be able | ||
987 | * to sync with QtopiaDesktop1.6 | ||
988 | */ | ||
989 | else if ( msg == "sendVersionInfo()" ) { | ||
983 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" ); | 990 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString)" ); |
984 | QString v = QPE_VERSION; | 991 | QString v2 = QString::fromLatin1("1.4"); |
985 | QStringList l = QStringList::split( '.', v ); | ||
986 | QString v2 = l[0] + '.' + l[1]; | ||
987 | e << v2; | 992 | e << v2; |
988 | //qDebug("version %s\n", line.latin1()); | 993 | //qDebug("version %s\n", line.latin1()); |
989 | } else if ( msg == "sendCardInfo()" ) { | 994 | } else if ( msg == "sendCardInfo()" ) { |
990 | #ifndef QT_NO_COP | 995 | #ifndef QT_NO_COP |
991 | QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" ); | 996 | QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" ); |
992 | #endif | 997 | #endif |
@@ -1047,13 +1052,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
1047 | syncDialog = new SyncDialog( this, "syncProgress", FALSE, | 1052 | syncDialog = new SyncDialog( this, "syncProgress", FALSE, |
1048 | WStyle_Tool | WStyle_Customize | | 1053 | WStyle_Tool | WStyle_Customize | |
1049 | Qt::WStyle_StaysOnTop ); | 1054 | Qt::WStyle_StaysOnTop ); |
1050 | syncDialog->showMaximized(); | 1055 | syncDialog->showMaximized(); |
1051 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); | 1056 | syncDialog->whatLabel->setText( "<b>" + what + "</b>" ); |
1052 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), | 1057 | connect( syncDialog->buttonCancel, SIGNAL( clicked() ), |
1053 | SLOT( cancelSync() ) ); | 1058 | SLOT( cancelSync() ) ); |
1054 | } else if ( msg == "stopSync()") { | 1059 | } else if ( msg == "stopSync()") { |
1055 | delete syncDialog; syncDialog = 0; | 1060 | delete syncDialog; syncDialog = 0; |
1056 | } else if ( msg == "getAllDocLinks()" ) { | 1061 | } else if ( msg == "getAllDocLinks()" ) { |
1057 | loadDocs(); | 1062 | loadDocs(); |
1058 | 1063 | ||
1059 | QString contents; | 1064 | QString contents; |
@@ -1090,13 +1095,13 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
1090 | 1095 | ||
1091 | //qDebug( "sending length %d", contents.length() ); | 1096 | //qDebug( "sending length %d", contents.length() ); |
1092 | #ifndef QT_NO_COP | 1097 | #ifndef QT_NO_COP |
1093 | QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" ); | 1098 | QCopEnvelope e( "QPE/Desktop", "docLinks(QString)" ); |
1094 | e << contents; | 1099 | e << contents; |
1095 | #endif | 1100 | #endif |
1096 | 1101 | ||
1097 | //qDebug( "================ \n\n%s\n\n===============", | 1102 | //qDebug( "================ \n\n%s\n\n===============", |
1098 | //contents.latin1() ); | 1103 | //contents.latin1() ); |
1099 | 1104 | ||
1100 | delete docsFolder; | 1105 | delete docsFolder; |
1101 | docsFolder = 0; | 1106 | docsFolder = 0; |
1102 | #ifdef QWS | 1107 | #ifdef QWS |