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

[Andrew Walker]

SVN commit 1117641 by arwalker:

continue kst1kde4

 M  +0 -4      CMakeLists.txt  
 M  +4 -3      kst/CMakeLists.txt  
 A             kst/kst.qrc  
 AM            kst/kst_advance.png  
 AM            kst/kst_back.png  
 AM            kst/kst_blank.png  
 AM            kst/kst_bold.png  
 AM            kst/kst_changefile.png  
 AM            kst/kst_changenpts.png  
 AM            kst/kst_choosecolor.png  
 AM            kst/kst_csdnew.png  
 AM            kst/kst_curvenew.png  
 AM            kst/kst_datamanager.png  
 AM            kst/kst_datamode.png  
 AM            kst/kst_datawizard.png  
 AM            kst/kst_differentiatecurves.png  
 AM            kst/kst_downarrow.png  
 AM            kst/kst_editplots.png  
 AM            kst/kst_equationedit.png  
 AM            kst/kst_equationnew.png  
 AM            kst/kst_error_1.png  
 AM            kst/kst_error_2.png  
 AM            kst/kst_eventnew.png  
 AM            kst/kst_forward.png  
 AM            kst/kst_gfx_arrow.png  
 AM            kst/kst_gfx_breaklayout.png  
 AM            kst/kst_gfx_ellipse.png  
 AM            kst/kst_gfx_label.png  
 AM            kst/kst_gfx_layout.png  
 AM            kst/kst_gfx_line.png  
 AM            kst/kst_gfx_picture.png  
 AM            kst/kst_gfx_polygon.png  
 AM            kst/kst_gfx_polyline.png  
 AM            kst/kst_gfx_rectangle.png  
 AM            kst/kst_gfx_rounded_rectangle.png  
 AM            kst/kst_gfx_sharedaxisbox.png  
 AM            kst/kst_graphfile.png  
 AM            kst/kst_graphics.png  
 AM            kst/kst_histogramnew.png  
 AM            kst/kst_imagenew.png  
 AM            kst/kst_italic.png  
 AM            kst/kst_layoutmode.png  
 AM            kst/kst_leftarrow.png  
 AM            kst/kst_matrixedit.png  
 AM            kst/kst_matrixnew.png  
 AM            kst/kst_newplot.png  
 AM            kst/kst_pause.png  
 AM            kst/kst_pluginnew.png  
 AM            kst/kst_psdnew.png  
 AM            kst/kst_quickcurves.png  
 AM            kst/kst_quickpsd.png  
 AM            kst/kst_readFromEnd.png  
 AM            kst/kst_reload.png  
 AM            kst/kst_rightarrow.png  
 AM            kst/kst_scalaredit.png  
 AM            kst/kst_scalarnew.png  
 AM            kst/kst_stringedit.png  
 AM            kst/kst_stringnew.png  
 AM            kst/kst_uparrow.png  
 AM            kst/kst_vectoredit.png  
 AM            kst/kst_vectornew.png  
 AM            kst/kst_viewmanager.png  
 AM            kst/kst_zoomtie.png  
 AM            kst/kst_zoomx.png  
 AM            kst/kst_zoomxy.png  
 AM            kst/kst_zoomy.png  
 AM            kst/no.png  
 AM            kst/yes.png  
 M  +22 -0     libkstapp/kst.cpp  


--- branches/work/kst/kst1kde4/kst/src/CMakeLists.txt #1117640:1117641
@@ -10,7 +10,3 @@
 add_subdirectory(d2asc)
 add_subdirectory(plugins)
 add_subdirectory(extensions)
-
-IF (NOT HAVE_KMDI)
-    add_subdirectory(libkstkmdi)
-ENDIF (NOT HAVE_KMDI)
--- branches/work/kst/kst1kde4/kst/src/kst/CMakeLists.txt #1117640:1117641
@@ -1,13 +1,14 @@
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/extdate ${CMAKE_SOURCE_DIR}/src/libkst ${CMAKE_SOURCE_DIR}/src/libkstmath ${CMAKE_SOURCE_DIR}/src/widgets ${CMAKE_SOURCE_DIR}/src/libkstapp ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 
-add_subdirectory(pics)
-
 ########### next target ###############
 
 set(kst_SRCS main.cpp)
+set(kst_RCCS kst.qrc)
 
-add_executable(kst ${kst_SRCS})
+qt4_add_resources(kst_RCC_SRCS ${kst_RCCS})
 
+add_executable(kst ${kst_SRCS} ${kst_RCC_SRCS})
+
 target_link_libraries(kst kstapp ${KDE4_KDECORE_LIBS} QtXml QtGui)
 
 install(TARGETS kst 
--- branches/work/kst/kst1kde4/kst/src/libkstapp/kst.cpp #1117640:1117641
@@ -318,6 +318,28 @@
 
 
 void KstApp::initActions() {
+  //
+  // define the standard icons...
+  //
+
+  _actionOpen->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton));
+  _actionSave->setIcon(style()->standardIcon(QStyle::SP_DialogSaveButton));
+  _actionQuit->setIcon(style()->standardIcon(QStyle::SP_DialogCloseButton));
+
+  _actionSamplesDown->setIcon(style()->standardIcon(QStyle::SP_MediaSeekBackward));
+  _actionSamplesUp->setIcon(style()->standardIcon(QStyle::SP_MediaSeekForward));
+  _actionSamplesFromEnd->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));
+  _actionPause->setIcon(style()->standardIcon(QStyle::SP_MediaPause));
+
+  //
+  // define the non-standard icons
+  //
+
+  _actionZoomX->setIcon(QIcon((":/kst_zoomx.png")));
+  _actionZoomY->setIcon(QIcon((":/kst_zoomy.png")));
+  _actionZoomXY->setIcon(QIcon((":/kst_zoomxy.png")));
+  _actionLayout->setIcon(QIcon((":/kst_gfx_layout.png")));
+
   connect(_actionOpen, SIGNAL(triggered()), this, SLOT(slotFileOpen()));
 // xxx  connect(_actionOpenRecent, SIGNAL(triggered()), this, SLOT(slotFileOpenRecent(const QUrl &));
   connect(_actionSave, SIGNAL(triggered()), this, SLOT(slotFileSave()));