[Marble-commits] KDE/kdeedu/marble/src/plugins/render

[Torsten Rahn]

SVN commit 1212437 by rahn:

- Fixed minor bug in coordinate grid palette assign.
- Changed RestoreDefaults->Reset to make it more consistent with KDE
  dialogs.



 M  +2 -2      earthquake/EarthquakeConfigWidget.ui  
 M  +1 -1      earthquake/EarthquakePlugin.cpp  
 M  +1 -1      graticule/GraticuleConfigWidget.ui  
 M  +11 -7     graticule/GraticulePlugin.cpp  


--- trunk/KDE/kdeedu/marble/src/plugins/render/earthquake/EarthquakeConfigWidget.ui #1212436:1212437
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>420</width>
+    <width>436</width>
     <height>289</height>
    </rect>
   </property>
@@ -126,7 +126,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
      </property>
     </widget>
    </item>
--- trunk/KDE/kdeedu/marble/src/plugins/render/earthquake/EarthquakePlugin.cpp #1212436:1212437
@@ -163,7 +163,7 @@
 
 void EarthquakePlugin::evaluateClickedButton( QAbstractButton *button )
 {
-    if( button == ui_configWidget->m_buttonBox->button( QDialogButtonBox::RestoreDefaults ) )
+    if( button == ui_configWidget->m_buttonBox->button( QDialogButtonBox::Reset ) )
         restoreDefaultSettings();
 }
 
--- trunk/KDE/kdeedu/marble/src/plugins/render/graticule/GraticuleConfigWidget.ui #1212436:1212437
@@ -1402,7 +1402,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
      </property>
      <property name="centerButtons">
       <bool>false</bool>
--- trunk/KDE/kdeedu/marble/src/plugins/render/graticule/GraticulePlugin.cpp #1212436:1212437
@@ -194,8 +194,10 @@
 
     if ( c.isValid() ) {
         m_gridColor = c;
-        QPalette gridPalette = ui_configWidget->gridPushButton->palette();
-        gridPalette.setColor( QPalette::Button, QColor( m_gridColor ) );
+        QPalette palette = ui_configWidget->gridPushButton->palette();
+        palette.setColor( QPalette::Button, QColor( m_gridColor ) );
+        ui_configWidget->gridPushButton->setPalette( palette );
+
     }
 }
 
@@ -205,8 +207,9 @@
 
     if ( c.isValid() ) {
         m_tropicsColor = c;
-        QPalette tropicsPalette = ui_configWidget->tropicsPushButton->palette();
-        tropicsPalette.setColor( QPalette::Button, QColor( m_tropicsColor ) );
+        QPalette palette = ui_configWidget->tropicsPushButton->palette();
+        palette.setColor( QPalette::Button, QColor( m_tropicsColor ) );
+        ui_configWidget->tropicsPushButton->setPalette( palette );
     }
 }
 
@@ -216,8 +219,9 @@
 
     if ( c.isValid() ) {
         m_equatorColor = c;
-        QPalette equatorPalette = ui_configWidget->equatorPushButton->palette();
-        equatorPalette.setColor( QPalette::Button, QColor( m_equatorColor ) );
+        QPalette palette = ui_configWidget->equatorPushButton->palette();
+        palette.setColor( QPalette::Button, QColor( m_equatorColor ) );
+        ui_configWidget->equatorPushButton->setPalette( palette );
     }
 }
 
@@ -671,7 +675,7 @@
 
 void GraticulePlugin::evaluateClickedButton( QAbstractButton *button )
 {
-    if( button == ui_configWidget->m_buttonBox->button( QDialogButtonBox::RestoreDefaults ) )
+    if( button == ui_configWidget->m_buttonBox->button( QDialogButtonBox::Reset ) )
         restoreDefaultSettings();
 }