[Kalzium] KDE/kdeedu/kalzium/src

[Carsten Niehaus]

SVN commit 696621 by cniehaus:

* Removing KGNS2. It is not working at all and I think that is because
  of bugs inside KGNS2 itself. I hope it is ready *and documented* in
  KDE 4.1

CCMAKE: jeremy at scitools.com
CCMAIL: kalzium at kde.org


 M  +1 -1      CMakeLists.txt  
 D             kalzium.knsrc  
 M  +1 -16     tools/moleculeview.cpp  
 M  +0 -2      tools/moleculeview.h  


--- trunk/KDE/kdeedu/kalzium/src/CMakeLists.txt #696620:696621
@@ -102,7 +102,7 @@
 
 kde4_add_executable(kalzium ${kalzium_SRCS} )
 
-target_link_libraries(kalzium ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KHTML_LIBRARY} ${KDE4_KUTILS_LIBRARY} science kdeeduui )
+target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KUTILS_LIBRARY} science kdeeduui )
 
 
 if (OPENBABEL2_FOUND AND OPENGL_FOUND AND EIGEN_FOUND)
--- trunk/KDE/kdeedu/kalzium/src/tools/moleculeview.cpp #696620:696621
@@ -19,24 +19,18 @@
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <KLocale>
-#include <knewstuff2/engine.h>
 
 #include <openbabel2wrapper.h>
 
-#include <QMouseEvent>
-#include <QLayout>
-#include <QDir>
-
 using namespace OpenBabel;
 
 MoleculeDialog::MoleculeDialog( QWidget * parent )
 	: KDialog( parent )
 {
 	setCaption( i18n( "Molecular Viewer" ) );
-	setButtons( Help | User1 | User2 | Close );
+	setButtons( Help | User1 | Close );
 	setDefaultButton( User1 );
 	setButtonGuiItem( User1, KGuiItem( i18n( "Load molecule" ), "open", i18n( "Loading a molecule" ) ) );
-	setButtonGuiItem( User2, KGuiItem( i18n( "Get more molecules" ), "getmore", i18n( "Download a collection of molecule files" ) ) );
 	
 	ui.setupUi(mainWidget());
 
@@ -62,8 +56,6 @@
 
 	connect( this, SIGNAL( user1Clicked() ), 
 			this, SLOT( slotLoadMolecule() ) );
-	connect( this, SIGNAL( user2Clicked() ), 
-			this, SLOT( slotUser2() ) );
 }
 
 void MoleculeDialog::slotLoadMolecule()
@@ -102,13 +94,6 @@
 {
 }
 
-void MoleculeDialog::slotUser2()
-{
-    KNS::Engine engine;
-    engine.init("kalzium.knsrc");
-    KNS::Entry::List entries = engine.downloadDialogModal();
-}
-
 void MoleculeDialog::updateStatistics()
 {
 	Avogadro::Molecule* mol = ui.glWidget->molecule();
--- trunk/KDE/kdeedu/kalzium/src/tools/moleculeview.h #696620:696621
@@ -47,8 +47,6 @@
 		 * Load a molecule
 		 */
 		void slotLoadMolecule();
-
-                void slotUser2();
 };
 
 #endif // MOLECULEVIEW_H