summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-25 21:25:23 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-25 21:28:52 (GMT)
commit8fde5cbb88e5fac0da821937cd1361451afc87e4 (patch)
tree9ae87333ec49cd8f6fcba178a2937fa07973c47f
parentf82e3a66842a493ca1c49666572ab5ceef6c4f97 (diff)
Remove left-over mentioning of MarbleControlBox and NavigationWidget
Both classes were removed in 5f9835a5ee9acf8c4f54d9bc2bb78f512e4dccb4
-rw-r--r--Mainpage.dox21
-rw-r--r--src/apps/marble-kde/marble_part.h2
-rw-r--r--src/bindings/python/sip/MarbleControlBox.sip59
-rw-r--r--src/bindings/python/sip/NavigationWidget.sip53
-rw-r--r--src/bindings/python/sip/marblemod.sip2
-rw-r--r--src/lib/marble/MarbleMap.h1
-rw-r--r--src/lib/marble/MarbleNavigator.h1
-rw-r--r--src/lib/marble/MarbleWidget.h4
8 files changed, 9 insertions, 134 deletions
diff --git a/Mainpage.dox b/Mainpage.dox
index e2a6a04..dfa7faa 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -14,7 +14,7 @@ The Marble application makes use of the following classes and widgets:
1. MarbleWidget, the main widget in any application using the Marble
framework. This widget displays a view of the earth or any other
globe, depending on which dataset is used. The user can navigate
- the globe using either a control widget, e.g. the MarbleControlBox,
+ the globe using either a control widget, e.g. the MarbleNavigator,
or the mouse.
2. MarbleModel, the data storage class that holds the data that is
@@ -26,22 +26,14 @@ The Marble application makes use of the following classes and widgets:
provide things like country borders and coastlines and <b>placemarks</b>
which can show points of interest, such as cities, mountain tops or the poles.
-3. MarbleControlBox, the most advanced control widget for
- MarbleWidget. It can be used to navigate around the globe, zoom,
- search for placemarks like cities, control aspects of the view such
- as showing water bodies, ice, terrain types, and cities. It can
- also be used to control which dataset is used to provide the
- background for the image and the projection.
-
-These three classes provide the core of the classes that comprise the
+These two classes provide the core of the classes that comprise the
Marble framework. You can use only them and get a very capable
application.
-In addition to this, there is also a simpler control widget called the
-MarbleNavigator that only controls panning and zooming. The
-MarbleNavigator is incorporated into the MarbleControlBox in the first
-tab. This control widget can be used in simpler application where
-theming, searching and other advanced controls are not needed.
+In addition to this, there is also a simple control widget called the
+MarbleNavigator that controls panning and zooming. This control widget
+can be used in simpler application where theming, searching and other
+advanced controls are not needed.
To help you get started, we provide small example programs which you can
find in the examples/cpp directory of the sources. They are also available
@@ -49,7 +41,6 @@ online at <a href="http://techbase.kde.org/Projects/Marble/MarbleCPlusPlus">KDE
@see Marble::MarbleWidget
@see Marble::MarbleModel
-@see Marble::MarbleControlBox
@see Marble::MarbleNavigator
@see <a href="http://techbase.kde.org/Projects/Marble/MarbleCPlusPlus">KDE TechBase: MarbleCPlusPlus</a>
diff --git a/src/apps/marble-kde/marble_part.h b/src/apps/marble-kde/marble_part.h
index 439263e..bea57d9 100644
--- a/src/apps/marble-kde/marble_part.h
+++ b/src/apps/marble-kde/marble_part.h
@@ -196,7 +196,7 @@ class MarblePart: public KParts::ReadOnlyPart
private:
// All the functionality is provided by this widget.
- ControlView *m_controlView; // MarbleControlBox and MarbleWidget
+ ControlView *m_controlView;
SunControlWidget *m_sunControlDialog;
TimeControlWidget *m_timeControlDialog;
DownloadRegionDialog *m_downloadRegionDialog;
diff --git a/src/bindings/python/sip/MarbleControlBox.sip b/src/bindings/python/sip/MarbleControlBox.sip
deleted file mode 100644
index 7be1aed..0000000
--- a/src/bindings/python/sip/MarbleControlBox.sip
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Copyright 2008 Simon Edwards <simon@simonzone.com>
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-
-namespace Marble
-{
-
-class MarbleControlBox : QWidget
-{
-%TypeHeaderCode
-#include <MarbleControlBox.h>
-%End
-
-public:
- explicit MarbleControlBox (QWidget* parent /TransferThis/ = 0);
-
-
- void selectTheme (const QString&);
-// FIXME PlacemarkModel header isn't installed
- void setNavigationTabShown (bool show);
- void setLegendTabShown (bool show);
- void setMapViewTabShown (bool show);
- void setCurrentLocationTabShown (bool show);
- void setFileViewTabShown (bool show);
-
-
- ~MarbleControlBox ();
- void setWorkOffline (bool offline);
- void setRoutingTabShown (bool show);
-signals:
- void showMapWizard ();
- void showUploadDialog ();
-public:
- Marble::CurrentLocationWidget* currentLocationWidget ();
- void setMarbleWidget (Marble::MarbleWidget* widget);
-signals:
- void searchFinished ();
-public:
- void search (const QString& searchTerm, Marble::SearchMode searchMode);
-};
-// MarbleControlBox
-
-};
-// Marble
-
-
diff --git a/src/bindings/python/sip/NavigationWidget.sip b/src/bindings/python/sip/NavigationWidget.sip
deleted file mode 100644
index eab7a14..0000000
--- a/src/bindings/python/sip/NavigationWidget.sip
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2010 Simon Edwards <simon@simonzone.com>
-
-// Generated by twine2
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Library General Public License as
-// published by the Free Software Foundation; either version 2, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details
-
-// You should have received a copy of the GNU Library General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-namespace Marble
-{
-class NavigationWidget : QWidget
-{
-%TypeHeaderCode
-#include <NavigationWidget.h>
-%End
-
-public:
- NavigationWidget (QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f = 0);
- ~NavigationWidget ();
- void setMarbleWidget (Marble::MarbleWidget* widget);
-signals:
- void goHome ();
- void zoomIn ();
- void zoomOut ();
- void zoomChanged (int zoom);
- void moveLeft ();
- void moveRight ();
- void moveUp ();
- void moveDown ();
-public:
- void selectTheme (const QString&);
- void changeZoom (int zoom);
-protected:
- void resizeEvent (QResizeEvent*);
-//FIXME
-signals:
- void searchFinished ();
-public:
- void search (const QString& searchTerm, Marble::SearchMode searchMode);
- void clearSearch ();
-};
-};
diff --git a/src/bindings/python/sip/marblemod.sip b/src/bindings/python/sip/marblemod.sip
index 9baccd4..d21cf93 100644
--- a/src/bindings/python/sip/marblemod.sip
+++ b/src/bindings/python/sip/marblemod.sip
@@ -104,7 +104,6 @@
%Include MapWizard.sip
%Include MarbleAboutDialog.sip
%Include MarbleColors.sip
-%Include MarbleControlBox.sip
%Include MarbleDirs.sip
%Include MarbleGlobal.sip
%Include MarbleGraphicsGridLayout.sip
@@ -115,7 +114,6 @@
%Include MarbleRunnerManager.sip
%Include MarbleWebView.sip
%Include MarbleWidget.sip
-%Include NavigationWidget.sip
%Include ParseRunnerPlugin.sip
%Include ParsingRunner.sip
%Include Planet.sip
diff --git a/src/lib/marble/MarbleMap.h b/src/lib/marble/MarbleMap.h
index da62d66..088eac6 100644
--- a/src/lib/marble/MarbleMap.h
+++ b/src/lib/marble/MarbleMap.h
@@ -83,7 +83,6 @@ class StyleBuilder;
* cities, mountain tops or the poles.
*
* @see MarbleWidget
- * @see MarbleControlBox
* @see MarbleModel
*/
diff --git a/src/lib/marble/MarbleNavigator.h b/src/lib/marble/MarbleNavigator.h
index 200dfc4..0356852 100644
--- a/src/lib/marble/MarbleNavigator.h
+++ b/src/lib/marble/MarbleNavigator.h
@@ -44,7 +44,6 @@ class MarbleNavigatorPrivate;
* Home position from the MarbleNavigator, though.
*
* @see MarbleWidget
- * @see MarbleControlBox
*/
class MARBLE_EXPORT MarbleNavigator : public QWidget
diff --git a/src/lib/marble/MarbleWidget.h b/src/lib/marble/MarbleWidget.h
index 007d71e..33e4cb2 100644
--- a/src/lib/marble/MarbleWidget.h
+++ b/src/lib/marble/MarbleWidget.h
@@ -62,7 +62,7 @@ class StyleBuilder;
*
* This widget displays a view of the earth or any other globe,
* depending on which dataset is used. The user can navigate the
- * globe using either a control widget, e.g. the MarbleControlBox, or
+ * globe using either a control widget, e.g. the MarbleNavigator, or
* the mouse. The mouse and keyboard control is done through a
* MarbleWidgetInputHandler. Only some aspects of the widget can be
* controlled by the mouse and/or keyboard.
@@ -94,7 +94,7 @@ class StyleBuilder;
* Wikipedia to retrieve an article about it. If there is such an
* article, you will get a mini-browser window with the article in a tab.
*
- * @see MarbleControlBox
+ * @see MarbleNavigator
* @see MarbleMap
* @see MarbleModel
*/