summaryrefslogtreecommitdiff
path: root/core/launcher
Unidiff
Diffstat (limited to 'core/launcher') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp3
-rw-r--r--core/launcher/serverapp.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index bdddd37..98e7481 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -604,26 +604,25 @@ void Launcher::select( const AppLnk *appLnk )
604 appLnk->execute(); 604 appLnk->execute();
605 } 605 }
606} 606}
607 607
608void Launcher::properties( AppLnk *appLnk ) 608void Launcher::properties( AppLnk *appLnk )
609{ 609{
610 if ( appLnk->type() == "Folder" ) { // No tr 610 if ( appLnk->type() == "Folder" ) { // No tr
611 // Not supported: flat is simpler for the user 611 // Not supported: flat is simpler for the user
612 } else { 612 } else {
613/* ### libqtopia FIXME also moving docLnks... */ 613/* ### libqtopia FIXME also moving docLnks... */
614 LnkProperties prop(appLnk,0 ); 614 LnkProperties prop(appLnk,0 );
615 615
616 prop.showMaximized(); 616 QPEApplication::execDialog( &prop );
617 prop.exec();
618 } 617 }
619} 618}
620 619
621void Launcher::storageChanged( const QList<FileSystem> &fs ) 620void Launcher::storageChanged( const QList<FileSystem> &fs )
622{ 621{
623 // ### update combo boxes if we had a combo box for the storage type 622 // ### update combo boxes if we had a combo box for the storage type
624} 623}
625 624
626void Launcher::systemMessage( const QCString &msg, const QByteArray &data) 625void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
627{ 626{
628 QDataStream stream( data, IO_ReadOnly ); 627 QDataStream stream( data, IO_ReadOnly );
629 if ( msg == "busy()" ) { 628 if ( msg == "busy()" ) {
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index e8d49fd..e18bcee 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -693,25 +693,25 @@ void ServerApplication::clearSafeMode()
693 } 693 }
694#endif 694#endif
695} 695}
696 696
697 697
698void ServerApplication::shutdown() 698void ServerApplication::shutdown()
699{ 699{
700 if ( type() != GuiServer ) 700 if ( type() != GuiServer )
701 return; 701 return;
702 ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); 702 ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
703 connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)), 703 connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)),
704 this, SLOT(shutdown(ShutdownImpl::Type)) ); 704 this, SLOT(shutdown(ShutdownImpl::Type)) );
705 sd->showMaximized(); 705 QPEApplication::showWidget( sd );
706} 706}
707 707
708void ServerApplication::shutdown( ShutdownImpl::Type t ) 708void ServerApplication::shutdown( ShutdownImpl::Type t )
709{ 709{
710 char *opt = 0; 710 char *opt = 0;
711 711
712 switch ( t ) { 712 switch ( t ) {
713 case ShutdownImpl::ShutdownSystem: 713 case ShutdownImpl::ShutdownSystem:
714 opt = "-h"; 714 opt = "-h";
715 // fall through 715 // fall through
716 case ShutdownImpl::RebootSystem: 716 case ShutdownImpl::RebootSystem:
717 if ( opt == 0 ) 717 if ( opt == 0 )