[Kst] kdeextragear-2/kst/kst

[Barth Netterfield]

CVS commit by netterfield: 

-fix data range widget to set enables properly when vector settings are changed.
-re-arrange icons slightly.
-Use standard icon in a nearly standard way for making graphics exports


  M +3 -2      datarangewidget.ui   1.7
  M +27 -4     datarangewidget.ui.h   1.2
  M +3 -3      kst.cpp   1.179
  M +2 -1      kstui.rc   1.32
  M +1 -0      kstvectordialog_i.cpp   1.35
  M +0 -1      kstviewwindow.cpp   1.21


--- kdeextragear-2/kst/kst/datarangewidget.ui  #1.6:1.7
@@ -1,3 +1,3 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KstDataRange</class>
 <widget class="QWidget">
@@ -10,5 +10,5 @@
             <y>0</y>
             <width>422</width>
-            <height>126</height>
+            <height>108</height>
         </rect>
     </property>
@@ -287,4 +287,5 @@
     <slot>ClickedReadToEnd()</slot>
     <slot>clickedDoSkip()</slot>
+    <slot>updateEnables()</slot>
 </slots>
 <functions>

--- kdeextragear-2/kst/kst/datarangewidget.ui.h  #1.1:1.2
@@ -49,4 +49,27 @@ void KstDataRange::clickedDoSkip()
 }
 
+void KstDataRange::updateEnables() {
+  if (DoSkip->isChecked()) {
+    Skip->setEnabled( true );
+    DoFilter->setEnabled( true );
+  } else {
+    Skip->setEnabled( false );
+    DoFilter->setEnabled( false );
+  }
+
+  if (CountFromEnd->isChecked()) {
+    N->setEnabled( true );
+    F0->setEnabled( false );
+    ReadToEnd->setChecked( false );
+  } else if (ReadToEnd->isChecked()) {
+    F0->setEnabled( true );
+    N->setEnabled( false );
+  } else {
+    N->setEnabled( true );
+    F0->setEnabled( true );
+  }
+
+}
+
 void KstDataRange::update()
 {

--- kdeextragear-2/kst/kst/kst.cpp  #1.178:1.179
@@ -449,5 +449,5 @@ void KstApp::initActions() {
 
   /************/
-  PluginDialogAction = new KAction(i18n("Use &Plugin..."), 0, 0,
+  PluginDialogAction = new KAction(i18n("New &Plugin..."), 0, 0,
                                    KstPluginDialogI::globalInstance(),
                                    SLOT(show_New()), actionCollection(),
@@ -513,5 +513,5 @@ void KstApp::initActions() {
   /************/
   GraphFileDialogAction = new KAction(i18n("Export to Graphics File..."),
-                                  "kst_graphfile", 0,
+                                  "thumbnail", 0,
                                   this, SLOT(showGraphFileDialog()),
                                   actionCollection(),

--- kdeextragear-2/kst/kst/kstui.rc  #1.31:1.32
@@ -79,4 +79,6 @@
   <Action name="samplesend_action"/>
   <Separator/>
+  <Action name="zoomtie_action"/>
+  <Separator/>
   <Action name="zoomxy_action"/>
   <Action name="zoomx_action"/>
@@ -85,5 +87,4 @@
   <Action name="layoutmode_action"/>
   <Separator/>
-  <Action name="zoomtie_action"/>
   <Action name="datamode_action"/>
 </ToolBar>

--- kdeextragear-2/kst/kst/kstvectordialog_i.cpp  #1.34:1.35
@@ -150,4 +150,5 @@ void KstVectorDialogI::_fillFieldsForEdi
   _kstDataRange->DoSkip->setChecked(DP->doSkip());
   _kstDataRange->DoFilter->setChecked(DP->doAve());
+  _kstDataRange->updateEnables();
 }
 

--- kdeextragear-2/kst/kst/kstviewwindow.cpp  #1.20:1.21
@@ -112,5 +112,4 @@ void KstViewWindow::commonConstructor() 
   readOptions();
 
-  connect(this, SIGNAL(settingsChanged()), this, SLOT(slotSettingsChanged()));
   connect(this, SIGNAL(focusInEventOccurs( KMdiChildView*)), this, SLOT(slotActivated(KMdiChildView*)));