Removed hardcoded desktop size

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/net/opiestumbler/opiestumbler.cpp b/noncore/net/opiestumbler/opiestumbler.cpp
index 2f4f54b..3531162 100644
--- a/noncore/net/opiestumbler/opiestumbler.cpp
+++ b/noncore/net/opiestumbler/opiestumbler.cpp
@@ -193,193 +193,193 @@ void OpieStumbler::displayStations()
     for(QListIterator<StumblerStation> it(m_stationsHistory); it.current(); ++it) 
         new StationViewItem( m_listHistory, it.current()->st->ssid, QString::number(it.current()->st->channel),
                 QString::number(it.current()->st->level), it.current()->st->encrypted ? "Y": "N",
                 manufacturer(it.current()->st->macAddress.toString()), it.current()->st->macAddress.toString() );
 }
 
 void OpieStumbler::slotMessageReceived( const QCString &message, const QByteArray &parameters)
 {
     Q_UNUSED(const_cast<QByteArray &>(parameters))
 
     if ( message == "show()" )
         show();
 }
 
 void OpieStumbler::slotCurrentMousePressed(int button, QListViewItem * item, const QPoint &point, int c)
 {
     Q_UNUSED(c)
         
     if ( 2 == button ) {
         m_mac = item->text(CURENC + 1);
         m_popupCurrent->popup(point);
     }
 }
 
 
 void OpieStumbler::slotHistoryMousePressed(int button, QListViewItem * item, const QPoint &point, int c)
 {
     Q_UNUSED(c)
     
     if ( 2 == button ) {
         m_mac = item->text(HISVENDOR + 1);
         m_popupHistory->popup(point);
     }
 }
 
 void OpieStumbler::slotShowDetails()
 {
     QListIterator<StumblerStation> it(m_stationsHistory);
     for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it );
     
     if( it.current() ) {
         StationInfo info(it.current()->st->ssid, it.current()->st->type, QString::number(it.current()->st->channel),
                 QString::number(it.current()->st->rates.last()/1000000), QString::number(it.current()->st->level),
                 it.current()->st->encrypted ? "WEP": "No", 
                 it.current()->st->macAddress.toString(), manufacturer(it.current()->st->macAddress.toString(), true),
                     it.current()->lastTimeSeen.toString() ,this, "", true);
         info.exec();
     }
     
 } 
 
 void OpieStumbler::slotLoadManufacturers()
 {
     m_db = Opie::Net::OManufacturerDB::instance();
 }
 
 QString OpieStumbler::manufacturer( const QString &mac, bool extended )
 {
     QString retval;
     if ( m_db )
         if ( extended )
             retval = m_db->lookupExt(mac);
         else
             retval = m_db->lookup(mac);
 
     if ( retval.isEmpty() )
         retval = tr("Unknown");
 
     return retval;
 }
 
 void OpieStumbler::slotJoinNetwork()
 {
     slotStopScanning();
 
     OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); 
     
     if( !wiface )
         return;
     
     QListIterator<StumblerStation> it(m_stationsHistory);
     
     for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it );
 
     if( !it.current() )
         return;
     
     m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1);
     m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize );
     m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised );
     m_splashBox = new QVBoxLayout( m_splash, 4, 4 );
     m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash );
     m_pbar = new QProgressBar( 3, m_splash );
     m_pbar->setCenterIndicator(true);
     m_splashBox->addWidget( m_infoLabel );
     m_splashBox->addWidget( m_pbar );
-    int sw = m_splashBox->sizeHint().width()*2;
+    int sw = m_splashBox->sizeHint().width() * 2;
     int sh = m_splashBox->sizeHint().height();
-    m_splash->setGeometry((240-(sw))/2, (320-sh)/2, sw, sh);
+    m_splash->setGeometry((qApp->desktop()->width() - sw)/2, (qApp->desktop()->height() - sh)/2, sw, sh);
     m_splash->show();
     m_splash->raise();
 
     Opie::Net::OStation *station = it.current()->st;
     
     odebug << "Bringing interface down" << oendl;
     wiface->setUp(false);
     
     odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl;
     wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" );
     
     odebug << "Setting channel to " << station->channel << oendl;
     wiface->setChannel(station->channel);
     
     odebug << "Setting SSID to " << station->ssid << oendl;
     wiface->setSSID(station->ssid);
     
     wiface->commit();
     
     odebug << "Bringing interface up" << oendl;
     wiface->setUp(true);
     m_pbar->setProgress(1);
     //Wait 5 sec for association
     QTimer::singleShot(5000, this, SLOT(slotAssociated()));
 }
 
 void OpieStumbler::slotAssociated()
 {
     OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface));
 
     if( !wiface ) {
         slotCleanSplash();
         return;
     }
 
     if (!wiface->isAssociated()) {
         Global::statusMessage(tr("Could not Join"));
         m_infoLabel->setText(tr("Could not Join"));
         QTimer::singleShot(5000, this, SLOT(slotCleanSplash()));
         return;
     }
     
     Global::statusMessage(tr("Joined"));
     m_pbar->setProgress(2);
     m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid));
    
     if(m_proc) {
         m_proc->kill();
         delete m_proc;
     }
 
     m_proc = new Opie::Core::OProcess(this);
         
     *m_proc << "udhcpc" << "-f" << "-n" << "-i" << m_interface;
     m_proc->start(Opie::Core::OProcess::DontCare);
     QTimer::singleShot(5000, this, SLOT(slotCheckDHCP()));
 }
 
 void OpieStumbler::slotCheckDHCP()
 {
     if(!m_proc->isRunning()) {
         Global::statusMessage(tr("Could not Obtain an Address"));
         m_infoLabel->setText(QString("<center><b>%1</b></center>").arg(tr("Could not Obtain an Address")));
         delete m_proc;
         m_proc = NULL;
         QTimer::singleShot(5000, this, SLOT(slotCleanSplash()));
         return;
     }
     m_listCurrent->show();
     m_pbar->setProgress(3);
 
     OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface));
     QString ipv4 = wiface->ipV4Address().toString();
     m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Obtained IP")).arg(ipv4));
     Global::statusMessage(tr("Obtained IP") + " " + ipv4);
     QTimer::singleShot(5000, this, SLOT(slotCleanSplash()));
     
 }
 
 void OpieStumbler::slotCleanSplash()
 {
     delete m_pbar;
     m_pbar = 0;  
     
     delete m_infoLabel;
     m_infoLabel = 0;
     
     delete m_splashBox;
     m_splashBox = 0;
     
     delete m_splash;
     m_splash = 0;           
 }