[Kst] branches/work/kst/portto4/kst/src

[Nicolas Brisset]

SVN commit 1177319 by brisset:

Start KDE integration by "borrowing" oxygen icons for those missing :-)

They're currently copied locally, I guess when we do a proper KDE integration
they'll have to be gathered from the system, if we are on a system
where KDE is installed. For that reason I kept the original names. I think it would make
sense to replace as many icons as possible with oxygen icons. They look good and it will 
help later to integrate into KDE.
Some old icons are lying around, does anybody mind if I clean them up?


 AM            images/application-exit.png  
 AM            images/document-open.png  
 AM            images/document-print.png  
 AM            images/document-save.png  
 AM            images/draw-bezier-curves.png  
 AM            images/edit-redo.png  
 AM            images/edit-undo.png  
 M  +9 -2      images/images.qrc  
 M  +8 -1      libkstapp/mainwindow.cpp  


--- branches/work/kst/portto4/kst/src/images/images.qrc #1177318:1177319
@@ -1,5 +1,5 @@
-<!DOCTYPE RCC><RCC version="1.0">
-    <qresource>
+<RCC>
+    <qresource prefix="/" >
         <file>hi32-mime-kst.png</file>
         <file>kstplot.png</file>
         <file>lo16-app-kst.png</file>
@@ -75,5 +75,12 @@
         <file>kst_bold.png</file>
         <file>kst_italic.png</file>
         <file>kst_reload.png</file>
+        <file>application-exit.png</file>
+        <file>document-open.png</file>
+        <file>document-print.png</file>
+        <file>document-save.png</file>
+        <file>edit-redo.png</file>
+        <file>edit-undo.png</file>
+        <file>draw-bezier-curves.png</file>
     </qresource>
 </RCC>
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #1177318:1177319
@@ -649,11 +649,13 @@
     _openAct = new QAction(tr("&Open..."), this);
     _openAct->setStatusTip(tr("Open a new session"));
     _openAct->setShortcut(tr("Ctrl+O"));
+  _openAct->setIcon(QPixmap(":document-open.png"));
     connect(_openAct, SIGNAL(triggered()), this, SLOT(open()));
 
     _saveAct = new QAction(tr("&Save"), this);
     _saveAct->setStatusTip(tr("Save the current session"));
     _saveAct->setShortcut(tr("Ctrl+S"));
+  _saveAct->setIcon(QPixmap(":document-save.png"));
     connect(_saveAct, SIGNAL(triggered()), this, SLOT(save()));
 
     _saveAsAct = new QAction(tr("Save &as..."), this);
@@ -667,6 +669,7 @@
 
     _printAct = new QAction(tr("&Print..."), this);
     _printAct->setStatusTip(tr("Print the current view"));
+  _printAct->setIcon(QPixmap(":document-print.png"));
     connect(_printAct, SIGNAL(triggered()), this, SLOT(print()));
 
     _exportGraphicsAct = new QAction(tr("&Export..."), this);
@@ -685,13 +688,16 @@
     _exitAct = new QAction(tr("E&xit"), this);
     _exitAct->setShortcut(tr("Ctrl+Q"));
     _exitAct->setStatusTip(tr("Exit the application"));
+  _exitAct->setIcon(QPixmap(":application-exit.png"));
     connect(_exitAct, SIGNAL(triggered()), this, SLOT(close()));
 
   // ************************** Edit Actions ******************************* //
   _undoAct = _undoGroup->createUndoAction(this);
   _undoAct->setShortcut(tr("Ctrl+Z"));
+  _undoAct->setIcon(QPixmap(":edit-undo.png"));
   _redoAct = _undoGroup->createRedoAction(this);
   _redoAct->setShortcut(tr("Ctrl+Shift+Z"));
+  _redoAct->setIcon(QPixmap(":edit-redo.png"));
 
   // ********************* View Actions ********************************** //
   _dataManagerAct = new QAction(tr("&Data Manager"), this);
@@ -830,6 +836,7 @@
 
   _createSvgAct = new QAction(tr("&Svg"), this);
   _createSvgAct->setStatusTip(tr("Create a svg for the current view"));
+  _createSvgAct->setIcon(QPixmap(":draw-bezier-curves.png"));
   _createSvgAct->setShortcut(QString("F11"));
   _createSvgAct->setCheckable(true);
   connect(_createSvgAct, SIGNAL(triggered()), this, SLOT(createSvg()));
@@ -1051,7 +1058,7 @@
   _annotationToolBar->addAction(_createPictureAct);
   _annotationToolBar->addAction(_createPlotAct);
   _annotationToolBar->addAction(_createSvgAct);
-  addToolBar(Qt::LeftToolBarArea, _annotationToolBar);
+  addToolBar(Qt::TopToolBarArea, _annotationToolBar); // Try a side toolbar by default?
   _annotationToolBar->setVisible(true);
 
 }