[kde-doc-english] [marble] /: Remove outdated setting of Qt's used graphicsSystem (removed for Qt5)
Friedrich W. H. Kossebau
kossebau at kde.org
Wed Jun 15 00:06:54 UTC 2016
Git commit 41837f438dd61d6b6bdad9b159e5be32f32029d4 by Friedrich W. H. Kossebau.
Committed on 15/06/2016 at 00:06.
Pushed by kossebau into branch 'master'.
Remove outdated setting of Qt's used graphicsSystem (removed for Qt5)
M +0 -9 doc/index.docbook
M +0 -13 docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html
M +0 -13 docs/bindings/python/html/marble/Marble.html
M +0 -9 src/apps/marble-kde/marble.kcfg
M +0 -34 src/apps/marble-kde/marble_part.cpp
M +0 -4 src/apps/marble-kde/marble_part.h
M +0 -8 src/bindings/python/sip/MarbleGlobal.sip
M +0 -1 src/bindings/python/sip/QtMarbleConfigDialog.sip
M +0 -8 src/bindings/python/sip/global.sip
M +0 -9 src/lib/marble/MarbleGlobal.h
M +0 -33 src/lib/marble/MarbleViewSettingsWidget.ui
M +1 -63 src/lib/marble/QtMarbleConfigDialog.cpp
M +0 -4 src/lib/marble/QtMarbleConfigDialog.h
http://commits.kde.org/marble/41837f438dd61d6b6bdad9b159e5be32f32029d4
diff --git a/doc/index.docbook b/doc/index.docbook
index 53f9bcf..df9c8ee 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -876,15 +876,6 @@ If a GPS device is connected with your computer, &marble; displays longitude and
</varlistentry>
<varlistentry>
-<term><guilabel>Graphics system</guilabel></term>
-<listitem>
-<para>Specifies the graphics system - <guilabel>Native X11</guilabel> or <guilabel>Raster (Software rendering)</guilabel> -
-that &Qt; uses to draw the map. Changing this setting might be a good idea if there are performance issues with
-the system's graphics drivers. </para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
<term><guilabel>Place names</guilabel></term>
<listitem>
<para>Places often have different names in different languages. The label on the map can show the name in the user's language. Alternatively it can display the name in the official language and glyphs of that place.</para>
diff --git a/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html b/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html
index 42cfe93..3bb5691 100644
--- a/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html
+++ b/docs/bindings/python/html/marble/Marble.QtMarbleConfigDialog.html
@@ -68,7 +68,6 @@ Namespace: <a href="../marble/Marble.html">Marble</a><br />
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" href="#customTimezone">customTimezone</a> (self)</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="#dragLocation">dragLocation</a> (self)</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top">QString </td><td class="memItemRight" valign="bottom"><a class="el" href="#externalMapEditor">externalMapEditor</a> (self)</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a href="../marble/Marble.html#GraphicsSystem">Marble.GraphicsSystem</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="#graphicsSystem">graphicsSystem</a> (self)</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="#initializeCustomTimezone">initializeCustomTimezone</a> (self)</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="#labelLocalization">labelLocalization</a> (self)</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" href="#lastSessionTime">lastSessionTime</a> (self)</td></tr>
@@ -256,18 +255,6 @@ Either by the user or by loading them initially from disk.
</tr>
</table>
</div>
-<div class="memdoc"></div></div><a class="anchor" name="graphicsSystem"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname"><tr>
-<td class="memname"><a href="../marble/Marble.html#GraphicsSystem">Marble.GraphicsSystem</a> graphicsSystem</td>
-<td>(</td>
-<td class="paramtype"> </td>
-<td class="paramname"><em>self</em> )</td>
-<td width="100%"> </td>
-</tr>
-</table>
-</div>
<div class="memdoc"></div></div><a class="anchor" name="initializeCustomTimezone"></a>
<div class="memitem">
<div class="memproto">
diff --git a/docs/bindings/python/html/marble/Marble.html b/docs/bindings/python/html/marble/Marble.html
index 19d84f8..d8143e7 100644
--- a/docs/bindings/python/html/marble/Marble.html
+++ b/docs/bindings/python/html/marble/Marble.html
@@ -112,7 +112,6 @@ last.
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#EnumFeatureId">EnumFeatureId</a> </td><td class="memItemRight" valign="bottom">{ InvalidFeatureId, GeoDataDocumentId, GeoDataFolderId, GeoDataPlacemarkId, GeoDataNetworkLinkId, GeoDataScreenOverlayId, GeoDataGroundOverlayId }</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#EnumGeometryId">EnumGeometryId</a> </td><td class="memItemRight" valign="bottom">{ InvalidGeometryId, GeoDataPointId, GeoDataLineStringId, GeoDataLinearRingId, GeoDataPolygonId, GeoDataMultiGeometryId, GeoDataMultiTrackId, GeoDataModelId, GeoDataTrackId }</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#FlyToMode">FlyToMode</a> </td><td class="memItemRight" valign="bottom">{ Automatic, Instant, Linear, Jump }</td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#GraphicsSystem">GraphicsSystem</a> </td><td class="memItemRight" valign="bottom">{ NativeGraphics, RasterGraphics, OpenGLGraphics }</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#LabelLocalization">LabelLocalization</a> </td><td class="memItemRight" valign="bottom">{ CustomAndNative, Custom, Native }</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#LabelPositionFlag">LabelPositionFlag</a> </td><td class="memItemRight" valign="bottom">{ NoLabel, LineStart, LineCenter, LineEnd, IgnoreXMargin, IgnoreYMargin }</td></tr>
<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="#MapQuality">MapQuality</a> </td><td class="memItemRight" valign="bottom">{ OutlineQuality, LowQuality, NormalQuality, HighQuality, PrintQuality }</td></tr>
@@ -255,18 +254,6 @@ and target camera positions)
</p><dl compact><dt><b>Enumerator: </b></dt><dd>
<table border="0" cellspacing="2" cellpadding="0"><tr><td valign="top"><em>Automatic</em> </td><td><tr><td valign="top"><em>Instant</em> </td><td><tr><td valign="top"><em>Linear</em> </td><td><tr><td valign="top"><em>Jump</em> </td><td></table>
</dl>
-</div></div><p><a class="anchor" name="GraphicsSystem"></a>
-<div class="memitem">
-<div class="memproto">
-<table class="memname">
-<tr><td class="memname">GraphicsSystem</td>
-</tr>
-</table>
-</div>
-<div class="memdoc"><p>This enum is used to choose which graphics system Qt is using.
-</p><dl compact><dt><b>Enumerator: </b></dt><dd>
-<table border="0" cellspacing="2" cellpadding="0"><tr><td valign="top"><em>NativeGraphics</em> </td><td><tr><td valign="top"><em>RasterGraphics</em> </td><td><tr><td valign="top"><em>OpenGLGraphics</em> </td><td></table>
-</dl>
</div></div><p><a class="anchor" name="LabelLocalization"></a>
<div class="memitem">
<div class="memproto">
diff --git a/src/apps/marble-kde/marble.kcfg b/src/apps/marble-kde/marble.kcfg
index 0afeb16..070ee1d 100644
--- a/src/apps/marble-kde/marble.kcfg
+++ b/src/apps/marble-kde/marble.kcfg
@@ -141,15 +141,6 @@
</choices>
<default>Marble::LowQuality</default>
</entry>
- <entry key="graphicsSystem" type="Enum" >
- <label>The graphics system that is used by Qt to render the graphics.</label>
- <choices name="Marble::GraphicsSystem">
- <choice name="NativeGraphics"/>
- <choice name="RasterGraphics"/>
- <choice name="OpenGLGraphics"/>
- </choices>
- <default>Marble::RasterGraphics</default>
- </entry>
<entry key="labelLocalization" type="Enum" >
<label>The localization of the labels.</label>
<choices name="Marble::LabelLocalization">
diff --git a/src/apps/marble-kde/marble_part.cpp b/src/apps/marble-kde/marble_part.cpp
index 4370ce6..a108b7e 100644
--- a/src/apps/marble-kde/marble_part.cpp
+++ b/src/apps/marble-kde/marble_part.cpp
@@ -466,9 +466,6 @@ void MarblePart::readSettings()
m_lockToSubSolarPoint->setChecked( MarbleSettings::lockToSubSolarPoint() );
// View
- m_initialGraphicsSystem = (GraphicsSystem) MarbleSettings::graphicsSystem();
- m_previousGraphicsSystem = m_initialGraphicsSystem;
-
m_lastFileOpenPath = MarbleSettings::lastFileOpenDir();
// Tracking settings
@@ -629,10 +626,6 @@ void MarblePart::writeSettings()
MarbleSettings::setShowBookmarks( m_controlView->marbleModel()->bookmarkManager()->showBookmarks() );
- // FIXME: Hopefully Qt will have a getter for this one in the future ...
- GraphicsSystem graphicsSystem = (GraphicsSystem) MarbleSettings::graphicsSystem();
- MarbleSettings::setGraphicsSystem( graphicsSystem );
-
MarbleSettings::setLastFileOpenDir( m_lastFileOpenPath );
MarbleSettings::setDistanceUnit( MarbleGlobal::getInstance()->locale()->measurementSystem() );
@@ -1414,20 +1407,6 @@ void MarblePart::editSettings()
ui_viewSettings.setupUi( w_viewSettings );
m_configDialog->addPage( w_viewSettings, i18n( "View" ), "configure" );
- // It's experimental -- so we remove it for now.
- // FIXME: Delete the following line once OpenGL support is officially supported.
- ui_viewSettings.kcfg_graphicsSystem->removeItem( OpenGLGraphics );
-
- QString nativeString ( i18n("Native") );
-
- #ifdef Q_WS_X11
- nativeString = i18n( "Native (X11)" );
- #endif
- #ifdef Q_OS_MAC
- nativeString = i18n( "Native (Mac OS X Core Graphics)" );
- #endif
-
- ui_viewSettings.kcfg_graphicsSystem->setItemText( NativeGraphics, nativeString );
ui_viewSettings.label_labelLocalization->hide();
ui_viewSettings.kcfg_labelLocalization->hide();
@@ -1554,8 +1533,6 @@ void MarblePart::updateSettings()
setMapQualityForViewContext( (MapQuality) MarbleSettings::animationQuality(),
Animation );
- GraphicsSystem graphicsSystem = (GraphicsSystem) MarbleSettings::graphicsSystem();
-
m_controlView->marbleWidget()->
setDefaultAngleUnit( (AngleUnit) MarbleSettings::angleUnit() );
MarbleGlobal::getInstance()->locale()->
@@ -1602,17 +1579,6 @@ void MarblePart::updateSettings()
m_controlView->marbleWidget()->update();
- // Show message box
- if ( m_initialGraphicsSystem != graphicsSystem
- && m_previousGraphicsSystem != graphicsSystem ) {
- KMessageBox::information (m_controlView->marbleWidget(),
- i18n("You have decided to run Marble with a different graphics system.\n"
- "For this change to become effective, Marble has to be restarted.\n"
- "Please close the application and start Marble again."),
- i18n("Graphics System Change") );
- }
- m_previousGraphicsSystem = graphicsSystem;
-
// Time
if( MarbleSettings::systemTimezone() == true )
{
diff --git a/src/apps/marble-kde/marble_part.h b/src/apps/marble-kde/marble_part.h
index ca9a910..5f2576d 100644
--- a/src/apps/marble-kde/marble_part.h
+++ b/src/apps/marble-kde/marble_part.h
@@ -261,10 +261,6 @@ class MarblePart: public KParts::ReadOnlyPart
KParts::StatusBarExtension *m_statusBarExtension;
- // Information about the graphics system
- GraphicsSystem m_initialGraphicsSystem;
- GraphicsSystem m_previousGraphicsSystem;
-
QHash< int, int > m_timezone;
QMap<int, QString> m_externalEditorMapping;
Ui_MarbleCloudSyncSettingsWidget m_ui_cloudSyncSettings;
diff --git a/src/bindings/python/sip/MarbleGlobal.sip b/src/bindings/python/sip/MarbleGlobal.sip
index c42c721..afa7131 100644
--- a/src/bindings/python/sip/MarbleGlobal.sip
+++ b/src/bindings/python/sip/MarbleGlobal.sip
@@ -81,14 +81,6 @@ enum MapQuality
};
-enum GraphicsSystem
-{
- NativeGraphics,
- RasterGraphics,
- OpenGLGraphics
-};
-
-
enum LabelPositionFlag
{
NoLabel,
diff --git a/src/bindings/python/sip/QtMarbleConfigDialog.sip b/src/bindings/python/sip/QtMarbleConfigDialog.sip
index befd09a..b93f492 100644
--- a/src/bindings/python/sip/QtMarbleConfigDialog.sip
+++ b/src/bindings/python/sip/QtMarbleConfigDialog.sip
@@ -33,7 +33,6 @@ public:
Marble::MapQuality animationQuality () const;
int labelLocalization () const;
QFont mapFont () const;
- Marble::GraphicsSystem graphicsSystem () const;
int dragLocation () const;
int onStartup () const;
bool animateTargetVoyage () const;
diff --git a/src/bindings/python/sip/global.sip b/src/bindings/python/sip/global.sip
index 3c6bb07..4ce5c2f 100644
--- a/src/bindings/python/sip/global.sip
+++ b/src/bindings/python/sip/global.sip
@@ -80,14 +80,6 @@ enum MapQuality
};
-enum GraphicsSystem
-{
- NativeGraphics,
- RasterGraphics,
- OpenGLGraphics
-};
-
-
enum LabelPositionFlag
{
NoLabel,
diff --git a/src/lib/marble/MarbleGlobal.h b/src/lib/marble/MarbleGlobal.h
index b7a5695..3c186c5 100644
--- a/src/lib/marble/MarbleGlobal.h
+++ b/src/lib/marble/MarbleGlobal.h
@@ -92,15 +92,6 @@ enum MapQuality {
};
/**
- * @brief This enum is used to choose which graphics system Qt is using.
- */
-enum GraphicsSystem {
- NativeGraphics, ///< Uses the native graphics system of the OS
- RasterGraphics, ///< Renders everything onto a pixmap
- OpenGLGraphics ///< Uses OpenGL
-};
-
-/**
* @brief This enum is used to specify the proxy that is used.
*/
enum ProxyType {
diff --git a/src/lib/marble/MarbleViewSettingsWidget.ui b/src/lib/marble/MarbleViewSettingsWidget.ui
index 43e153e..716ea24 100644
--- a/src/lib/marble/MarbleViewSettingsWidget.ui
+++ b/src/lib/marble/MarbleViewSettingsWidget.ui
@@ -241,39 +241,6 @@ p, li { white-space: pre-wrap; }
</item>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_graphicsSystem">
- <property name="text">
- <string>G&raphics system:</string>
- </property>
- <property name="buddy">
- <cstring>kcfg_graphicsSystem</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="kcfg_graphicsSystem">
- <property name="toolTip">
- <string>Specifies the graphics system that Qt uses to draw the map.
-Changing this setting might be a good idea if there are performance issues with the system's graphics drivers.</string>
- </property>
- <item>
- <property name="text">
- <string>Native</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Raster (Software rendering)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>OpenGL</string>
- </property>
- </item>
- </widget>
- </item>
<item row="2" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
diff --git a/src/lib/marble/QtMarbleConfigDialog.cpp b/src/lib/marble/QtMarbleConfigDialog.cpp
index 121338c..2fbc675 100644
--- a/src/lib/marble/QtMarbleConfigDialog.cpp
+++ b/src/lib/marble/QtMarbleConfigDialog.cpp
@@ -24,7 +24,6 @@
#include <QNetworkProxy>
#include <QApplication>
#include <QDialogButtonBox>
-#include <QMessageBox>
#include <QStandardItem>
#include <QTabWidget>
#include <QVBoxLayout>
@@ -64,9 +63,7 @@ class QtMarbleConfigDialogPrivate
m_marbleWidget( marbleWidget ),
m_syncManager( cloudSyncManager ? cloudSyncManager->bookmarkSyncManager() : 0 ),
m_cloudSyncManager(cloudSyncManager),
- m_pluginModel(),
- m_initialGraphicsSystem(),
- m_previousGraphicsSystem()
+ m_pluginModel()
{
}
@@ -88,10 +85,6 @@ class QtMarbleConfigDialogPrivate
RenderPluginModel m_pluginModel;
QHash< int, int > m_timezone;
-
- // Information about the graphics system
- Marble::GraphicsSystem m_initialGraphicsSystem;
- Marble::GraphicsSystem m_previousGraphicsSystem;
};
QtMarbleConfigDialog::QtMarbleConfigDialog(MarbleWidget *marbleWidget, CloudSyncManager *cloudSyncManager,
@@ -122,20 +115,6 @@ QtMarbleConfigDialog::QtMarbleConfigDialog(MarbleWidget *marbleWidget, CloudSync
d->ui_viewSettings.setupUi( w_viewSettings );
tabWidget->addTab( w_viewSettings, tr( "View" ) );
- // It's experimental -- so we remove it for now.
- // FIXME: Delete the following line once OpenGL support is officially supported.
- d->ui_viewSettings.kcfg_graphicsSystem->removeItem( Marble::OpenGLGraphics );
-
- QString nativeString ( tr("Native") );
-
- #ifdef Q_WS_X11
- nativeString = tr( "Native (X11)" );
- #endif
- #ifdef Q_OS_MAC
- nativeString = tr( "Native (Mac OS X Core Graphics)" );
- #endif
-
- d->ui_viewSettings.kcfg_graphicsSystem->setItemText( Marble::NativeGraphics, nativeString );
d->ui_viewSettings.kcfg_labelLocalization->hide();
d->ui_viewSettings.label_labelLocalization->hide();
@@ -309,9 +288,6 @@ void QtMarbleConfigDialog::updateLastSync()
void QtMarbleConfigDialog::readSettings()
{
- d->m_initialGraphicsSystem = graphicsSystem();
- d->m_previousGraphicsSystem = d->m_initialGraphicsSystem;
-
// Sync settings to make sure that we read the current settings.
syncSettings();
@@ -322,7 +298,6 @@ void QtMarbleConfigDialog::readSettings()
d->ui_viewSettings.kcfg_animationQuality->setCurrentIndex( animationQuality() );
d->ui_viewSettings.kcfg_labelLocalization->setCurrentIndex( Marble::Native );
d->ui_viewSettings.kcfg_mapFont->setCurrentFont( mapFont() );
- d->ui_viewSettings.kcfg_graphicsSystem->setCurrentIndex( graphicsSystem() );
// Navigation
d->ui_navigationSettings.kcfg_dragLocation->setCurrentIndex( Marble::KeepAxisVertically );
@@ -410,29 +385,12 @@ void QtMarbleConfigDialog::writeSettings()
{
syncSettings();
- // Determining the graphicsSystemString
- QString graphicsSystemString;
- switch ( d->ui_viewSettings.kcfg_graphicsSystem->currentIndex() )
- {
- case Marble::RasterGraphics :
- graphicsSystemString = "raster";
- break;
- case Marble::OpenGLGraphics :
- graphicsSystemString = "opengl";
- break;
- default:
- case Marble::NativeGraphics :
- graphicsSystemString = "native";
- break;
- }
-
d->m_settings.beginGroup( "View" );
d->m_settings.setValue( "distanceUnit", d->ui_viewSettings.kcfg_distanceUnit->currentIndex() );
d->m_settings.setValue( "angleUnit", d->ui_viewSettings.kcfg_angleUnit->currentIndex() );
d->m_settings.setValue( "stillQuality", d->ui_viewSettings.kcfg_stillQuality->currentIndex() );
d->m_settings.setValue( "animationQuality", d->ui_viewSettings.kcfg_animationQuality->currentIndex() );
d->m_settings.setValue( "mapFont", d->ui_viewSettings.kcfg_mapFont->currentFont() );
- d->m_settings.setValue( "graphicsSystem", graphicsSystemString );
d->m_settings.endGroup();
d->m_settings.beginGroup( "Navigation" );
@@ -490,15 +448,6 @@ void QtMarbleConfigDialog::writeSettings()
d->m_marbleWidget->writePluginSettings( d->m_settings );
emit settingsChanged();
-
- if ( d->m_initialGraphicsSystem != graphicsSystem()
- && d->m_previousGraphicsSystem != graphicsSystem() ) {
- QMessageBox::information (this, tr("Graphics System Change"),
- tr("You have decided to run Marble with a different graphics system.\n"
- "For this change to become effective, Marble has to be restarted.\n"
- "Please close the application and start Marble again.") );
- }
- d->m_previousGraphicsSystem = graphicsSystem();
}
MarbleLocale::MeasurementSystem QtMarbleConfigDialog::measurementSystem() const
@@ -540,17 +489,6 @@ QFont QtMarbleConfigDialog::mapFont() const
return d->m_settings.value( "View/mapFont", QApplication::font() ).value<QFont>();
}
-Marble::GraphicsSystem QtMarbleConfigDialog::graphicsSystem() const
-{
- QString graphicsSystemString = d->m_settings.value( "View/graphicsSystem", "raster" ).toString();
-
- if ( graphicsSystemString == "raster" ) return Marble::RasterGraphics;
- if ( graphicsSystemString == "opengl" ) return Marble::OpenGLGraphics;
-
- // default case: graphicsSystemString == "raster"
- return Marble::NativeGraphics;
-}
-
int QtMarbleConfigDialog::onStartup() const
{
bool smallScreen = MarbleGlobal::getInstance()->profiles() & MarbleGlobal::SmallScreen;
diff --git a/src/lib/marble/QtMarbleConfigDialog.h b/src/lib/marble/QtMarbleConfigDialog.h
index 7d3f152..09ff0f3 100644
--- a/src/lib/marble/QtMarbleConfigDialog.h
+++ b/src/lib/marble/QtMarbleConfigDialog.h
@@ -44,10 +44,6 @@ class MARBLE_EXPORT QtMarbleConfigDialog : public QDialog
Marble::MapQuality animationQuality() const;
QFont mapFont() const;
- // View
- Marble::GraphicsSystem graphicsSystem() const;
-
-
// Navigation Settings
int onStartup() const;
bool animateTargetVoyage() const;
More information about the kde-doc-english
mailing list