git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@3827 383ad7c9-94d9-4d36-a494-682f7c89f535

OpenFlipper/gui.kdevelop

@@ -16,7 +16,7 @@
   </general>
   <kdevcustomproject>
     <run>
-      <mainprogram>/data/home1/moebius/projects/OpenFlipper/OpenFlipper/Debian_64_Release/OpenFlipper</mainprogram>
+      <mainprogram>/data/home1/moebius/projects/OpenFlipper/OpenFlipper/Debian_64_Debug/OpenFlipper</mainprogram>
       <directoryradio>executable</directoryradio>
       <customdirectory>/</customdirectory>
       <programargs/>

OpenFlipper/gui.kdevses

 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="6" >
-  <Doc0 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/OpenFlipper/widgets/coreWidget/CoreWidget.cc" >
-   <View0 Encoding="" line="18" Type="Source" />
+ <DocsAndViews NumberOfDocuments="3" >
+  <Doc0 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateModelingPlugin.cc" >
+   <View0 Encoding="" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/ACG/Scenegraph/MeshNodeT.hh" >
-   <View0 Encoding="" line="0" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateBlendingComputation.cc" >
+   <View0 Encoding="" Type="Source" />
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/ACG/Scenegraph/MeshNodeT.cc" >
-   <View0 Encoding="" line="825" Type="Source" />
+  <Doc2 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/Init.cc" >
+   <View0 Encoding="" line="1041" Type="Source" />
   </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/OpenFlipper/common/MeshObjectT.hh" >
-   <View0 Encoding="" line="204" Type="Source" />
-  </Doc3>
-  <Doc4 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-Move/MovePlugin.cc" >
-   <View0 Encoding="" line="25" Type="Source" />
-  </Doc4>
-  <Doc5 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-PolyLine/PolyLinePlugin.cc" >
-   <View0 Encoding="" line="56" Type="Source" />
-  </Doc5>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>

OpenFlipper/widgets/coreWidget/CoreWidget.cc

@@ -179,7 +179,7 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
       button->setIcon(icon);
     } else if ( actions[i]->text() == "Light" ) {
       QIcon icon;
-      icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"ktip.png");
+      icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"light-mode.png");
 
       QToolButton * button = qobject_cast<QToolButton *>( viewerToolbar_->widgetForAction ( actions[i] ) );
       button->setIcon(icon);

OpenFlipper/widgets/coreWidget/MenuBar.cc

@@ -124,7 +124,7 @@ void CoreWidget::setupMenuBar()
   QAction* AC_AddEmpty = new QAction(tr("&Add Empty Object"), this);
   AC_AddEmpty->setStatusTip(tr("Add an empty object"));
   AC_AddEmpty->setWhatsThis("Creates a new empty object of a given type");
-  icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"document-new.png");
+  icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"add-empty-object.png");
   AC_AddEmpty->setIcon(icon);
   connect(AC_AddEmpty, SIGNAL(triggered()), this, SIGNAL(addEmptyObjectMenu()));
   fileMenu_->addAction(AC_AddEmpty);
@@ -156,7 +156,7 @@ void CoreWidget::setupMenuBar()
   QAction* AC_load_ini = new QAction(tr("&Load Settings"), this);
   AC_load_ini->setStatusTip(tr("Load Settings from INI file"));
   AC_load_ini->setWhatsThis("Load a previous settings from file (objects,colors,...)");
-  icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"folder.png");
+  icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"load-settings.png");
   AC_load_ini->setIcon(icon);
   connect(AC_load_ini, SIGNAL(triggered()), this, SIGNAL(loadIniMenu()));
   fileMenu_->addAction(AC_load_ini);
@@ -165,7 +165,7 @@ void CoreWidget::setupMenuBar()
   QAction* AC_save_ini = new QAction(tr("&Save Settings"), this);
   AC_save_ini->setStatusTip(tr("Save current settings to INI file"));
   AC_save_ini->setWhatsThis("Save settings to file (objects,colors,...)");
-  icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"folder-txt.png");
+  icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"save-settings.png");
   AC_save_ini->setIcon(icon);
   connect(AC_save_ini, SIGNAL(triggered()), this, SIGNAL(saveIniMenu()));
   fileMenu_->addAction(AC_save_ini);

Plugin-Datacontrol/Popup.cc

@@ -184,7 +184,7 @@ void DataControlPlugin::slotCustomContextMenuRequested ( const QPoint & _pos ) {
       action->setIcon(icon);
       menu.addSeparator();
       action = menu.addAction("Remove",this,SLOT ( slotPopupRemove() ));
-      icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"user-trash.png");
+      icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"datacontrol-delete-item.png");
       action->setIcon(icon);
     } else {
       action = menu.addAction("Zoom to object",this,SLOT ( slotZoomTo() ));
@@ -198,7 +198,7 @@ void DataControlPlugin::slotCustomContextMenuRequested ( const QPoint & _pos ) {
       action->setIcon(icon);
       menu.addSeparator();
       action = menu.addAction("Remove",this,SLOT ( slotPopupRemove() ));
-      icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"user-trash.png");
+      icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"datacontrol-delete-item.png");
       action->setIcon(icon);
     }