src/libkstapp/datasourcepluginfactory.cpp

@@ -48,6 +48,8 @@ DataSourcePtr DataSourcePluginFactory::generateDataSource(ObjectStore *store, QX
     if (xml.isStartElement()) {
       if (n == DataSource::staticTypeTag) {
         QXmlStreamAttributes attrs = xml.attributes();
+        // Ignore "reader" and let kst figure out the file type based on whatever data source
+        // plugins are currently installed.
         //fileType = attrs.value("reader").toString();
         fileName = DataPrimitive::readFilename(attrs);
         if (attrs.hasAttribute("updateType")) {

src/libkstapp/mainwindow.cpp

@@ -312,6 +312,7 @@ void MainWindow::newDoc(bool force) {
   }
 
   if (clearApproved) {
+    cleanup();
     delete _dataManager;
     _dataManager = 0;
     delete _doc;
@@ -1374,7 +1375,6 @@ void MainWindow::createActions() {
 
   _changeFileDialogAct = new QAction(tr("Change Data &File"), this);
   _changeFileDialogAct->setIcon(KstGetIcon("change-data-file"));
-  _changeFileDialogAct->setShortcut(QString("f"));
   _changeFileDialogAct->setStatusTip(tr("Show Kst's Change Data File Dialog (%1)").arg(_changeFileDialogAct->shortcut().toString()));
   connect(_changeFileDialogAct, SIGNAL(triggered()), this, SLOT(showChangeFileDialog()));
 

src/libkstapp/plotitem.cpp

@@ -551,19 +551,16 @@ void PlotItem::createActions() {
 
 
   _shareBoxShareX = new QAction(tr("Share Plots on X-Axis"), this);
-  _shareBoxShareX->setShortcut(Qt::Key_X);
   _shareBoxShareX->setCheckable(true);
   registerShortcut(_shareBoxShareX);
   connect(_shareBoxShareX, SIGNAL(triggered()), this, SIGNAL(shareXAxisTriggered()));
 
   _shareBoxShareY = new QAction(tr("Share Plots on Y-Axis"), this);
-  _shareBoxShareY->setShortcut(Qt::Key_Y);
   _shareBoxShareY->setCheckable(true);
   registerShortcut(_shareBoxShareY);
   connect(_shareBoxShareY, SIGNAL(triggered()), this, SIGNAL(shareYAxisTriggered()));
 
   _breakSharedBox = new QAction(tr("Break Shared Axis Box"), this);
-  _breakSharedBox->setShortcut(Qt::Key_B);
   registerShortcut(_breakSharedBox);
   connect(_breakSharedBox, SIGNAL(triggered()), this, SIGNAL(breakShareTriggered()));
 

src/libkstapp/sharedaxisboxitem.cpp

@@ -48,7 +48,6 @@ SharedAxisBoxItem::SharedAxisBoxItem(View *parent)
   setBrush(Qt::transparent);
 
   _breakAction = new QAction(tr("Break Shared Axis Box"), this);
-  _breakAction->setShortcut(Qt::Key_B);
   registerShortcut(_breakAction);
   connect(_breakAction, SIGNAL(triggered()), this, SLOT(breakShare()));
 

src/libkstapp/view.cpp

@@ -89,11 +89,13 @@ void View::init()
   loadSettings();
 
   _editAction = new QAction(tr("Edit"), this);
-  _editAction->setShortcut(Qt::Key_E);
+  //_editAction->setShortcut(Qt::Key_E);
 //   registerShortcut(_editAction);
   connect(_editAction, SIGNAL(triggered()), this, SLOT(edit()));
 
   _autoLayoutAction = new QAction(tr("Automatic"), this);
+  //_autoLayoutAction->setShortcut(Qt::Key_U);
+  //registerShortcut(_autoLayoutAction);
   connect(_autoLayoutAction, SIGNAL(triggered()), this, SLOT(createUnprotectedLayout()));
 
   _protectedLayoutAction = new QAction(tr("Protect Layout"), this);

src/libkstapp/viewitem.cpp

@@ -121,6 +121,8 @@ ViewItem::ViewItem(View *parentView) :
   connect(_lowerAction, SIGNAL(triggered()), this, SLOT(lower()));
 
   _autoLayoutAction = new QAction(tr("Automatic"), this);
+  _autoLayoutAction->setShortcut(Qt::Key_U);
+  registerShortcut(_autoLayoutAction);
   connect(_autoLayoutAction, SIGNAL(triggered()), this, SLOT(createAutoLayout()));
 
   _protectedLayoutAction = new QAction(tr("Protect Layout"), this);