[Marble-commits] KDE/kdeedu/marble

[Torsten Rahn]

SVN commit 1166357 by rahn:

- Forward port of 1166356



 M  +0 -2      data/CMakeLists.txt  
 D             data/svg/configure.svgz  
 D             data/svg/help-about.svgz  
 M  +4 -4      src/QtMainWindow.cpp  
 M             src/icons/application-exit.png  
 M             src/icons/document-open.png  
 M             src/icons/edit-copy.png  
 AM            src/icons/help-about.png  
 AM            src/icons/settings-configure.png  
 AM            src/icons/view-fullscreen.png  
 AM            src/icons/view-refresh.png  
 AM            src/icons/view-sidetree.png  
 M             src/icons/zoom-in.png  
 M             src/icons/zoom-out.png  
 M  +2 -2      src/lib/QtMarbleConfigDialog.cpp  
 M  +6 -1      src/marble.qrc  


--- trunk/KDE/kdeedu/marble/data/CMakeLists.txt #1166356:1166357
@@ -37,8 +37,6 @@
 svg/coordinate.svg
 svg/wikipedia.svg
 svg/wikipedia_shadow.svg
-svg/help-about.svgz
-svg/configure.svgz
 svg/sunshine.png
 DESTINATION ${MARBLE_DATA_INSTALL_PATH}/svg)
 
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1166356:1166357
@@ -163,7 +163,7 @@
      m_copyMapAct->setStatusTip(tr("Copy a screenshot of the map"));
      connect(m_copyMapAct, SIGNAL(triggered()), this, SLOT(copyMap()));
 
-     m_configDialogAct = new QAction( tr("&Configure Marble"), this);
+     m_configDialogAct = new QAction( QIcon(":/icons/settings-configure.png"),tr("&Configure Marble"), this);
      m_configDialogAct->setStatusTip(tr("Show the configuration dialog"));
      connect(m_configDialogAct, SIGNAL(triggered()), this, SLOT(editSettings()));
 
@@ -171,14 +171,14 @@
      m_copyCoordinatesAct->setStatusTip(tr("Copy the center coordinates as text"));
      connect(m_copyCoordinatesAct, SIGNAL(triggered()), this, SLOT(copyCoordinates()));
 
-     m_sideBarAct = new QAction( tr("Show &Navigation Panel"), this);
+     m_sideBarAct = new QAction( QIcon(":/icons/view-sidetree.png"), tr("Show &Navigation Panel"), this);
      m_sideBarAct->setShortcut(tr("F9"));
      m_sideBarAct->setCheckable( true );
      m_sideBarAct->setChecked( true );
      m_sideBarAct->setStatusTip(tr("Show Navigation Panel"));
      connect(m_sideBarAct, SIGNAL(triggered( bool )), this, SLOT( showSideBar( bool )));
 
-     m_fullScreenAct = new QAction( tr("&Full Screen Mode"), this);
+     m_fullScreenAct = new QAction( QIcon(":/icons/view-fullscreen.png"), tr("&Full Screen Mode"), this);
      m_fullScreenAct->setShortcut(tr("Ctrl+Shift+F"));
      m_fullScreenAct->setCheckable( true );
      m_fullScreenAct->setStatusTip(tr("Full Screen Mode"));
@@ -217,7 +217,7 @@
      m_controlSunAct->setStatusTip( tr( "Configure Sun Control" ) );
      connect( m_controlSunAct, SIGNAL( triggered() ), this, SLOT( controlSun() ) );
 
-     m_reloadAct = new QAction( tr("&Redisplay"), this);
+     m_reloadAct = new QAction( QIcon(":/icons/view-refresh.png"), tr("&Redisplay"), this);
      m_reloadAct->setShortcut(tr("F5"));
      m_reloadAct->setStatusTip(tr("Reload Current Map"));
      connect(m_reloadAct, SIGNAL(triggered()), this, SLOT(reload()));
--- trunk/KDE/kdeedu/marble/src/lib/QtMarbleConfigDialog.cpp #1166356:1166357
@@ -158,8 +158,8 @@
     tabWidget->addTab( d->w_pluginSettings, tr( "Plugins" ) );
 
     // Setting the icons for the plugin dialog.
-    d->w_pluginSettings->setAboutIcon( QIcon( MarbleDirs::path( "svg/help-about.svgz" ) ) );
-    d->w_pluginSettings->setConfigIcon( QIcon( MarbleDirs::path( "svg/configure.svgz" ) ) );
+    d->w_pluginSettings->setAboutIcon( QIcon(":/icons/help-about.png") );
+    d->w_pluginSettings->setConfigIcon(  QIcon(":/icons/settings-configure.png") );
 
     connect( d->w_pluginSettings, SIGNAL( aboutPluginClicked( QString ) ),
                                   SLOT( showPluginAboutDialog( QString ) ) );
--- trunk/KDE/kdeedu/marble/src/marble.qrc #1166356:1166357
@@ -16,15 +16,20 @@
         <file>icons/go-home.png</file>
         <file>icons/go-home-large.png</file>
         <file>icons/get-hot-new-stuff.png</file>
+        <file>icons/help-about.png</file>
         <file>icons/help-contents.png</file>
         <file>icons/help-whatsthis.png</file>
         <file>icons/map-flat.png</file>
         <file>icons/map-globe.png</file>
         <file>icons/map-mercator.png</file>
         <file>icons/marble.png</file>
-        <file>icons/wikipedia.png</file>
+        <file>icons/settings-configure.png</file>
         <file>icons/user-online.png</file>
         <file>icons/user-offline.png</file>
+        <file>icons/view-fullscreen.png</file>
+        <file>icons/view-sidetree.png</file>
+        <file>icons/view-refresh.png</file>
+        <file>icons/wikipedia.png</file>
         <file>icons/zoom-in.png</file>
         <file>icons/zoom-out.png</file>
         <file>icons/zoom-in-large.png</file>