[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble/src
From: Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date: 2010-12-27 21:41:14
Message-ID: 20101227214114.7EC3FAC8AD () svn ! kde ! org
[Download RAW message or body]
SVN commit 1209669 by beschow:
merge MapWizard::fillServerCombobox() into MapWizard::setWmsServers()
* the combobox listing all WMS servers should be filled on setWmsServers()
M +0 -1 QtMainWindow.cpp
M +3 -6 lib/MapWizard.cpp
M +0 -1 lib/MapWizard.h
M +0 -1 marble_part.cpp
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1209668:1209669
@@ -1345,7 +1345,6 @@
void MainWindow::showMapWizard()
{
- m_mapWizard->fillServerCombobox();
m_mapWizard->show();
}
--- trunk/KDE/kdeedu/marble/src/lib/MapWizard.cpp #1209668:1209669
@@ -195,6 +195,9 @@
void MapWizard::setWmsServers( const QStringList& uris )
{
d->wmsServerList = uris;
+
+ d->uiWidget.comboBoxWmsServer->clear();
+ d->uiWidget.comboBoxWmsServer->addItems( d->wmsServerList );
}
QStringList MapWizard::wmsServers() const
@@ -202,12 +205,6 @@
return d->wmsServerList;
}
-void MapWizard::fillServerCombobox()
-{
- d->uiWidget.comboBoxWmsServer->clear();
- d->uiWidget.comboBoxWmsServer->addItems( d->wmsServerList );
-}
-
void MapWizard::autoFillDetails()
{
int selected = d->uiWidget.comboBoxWmsMap->currentIndex();
--- trunk/KDE/kdeedu/marble/src/lib/MapWizard.h #1209668:1209669
@@ -59,7 +59,6 @@
// Other
void autoFillDetails();
- void fillServerCombobox();
void downloadLevelZero();
void createLevelZero( QNetworkReply* reply = 0 );
void suggestPreviewImage();
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1209668:1209669
@@ -1228,7 +1228,6 @@
void MarblePart::showMapWizard()
{
- m_mapWizard->fillServerCombobox();
m_mapWizard->show();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic