Finish renaming knewstuff

This relates to Bug 2093

CMakeLists.txt

@@ -1064,7 +1064,7 @@ add_subdirectory( tdestyles )
 add_subdirectory( libtdemid )
 add_subdirectory( libtdescreensaver )
 add_subdirectory( networkstatus )
-add_subdirectory( knewstuff )
+add_subdirectory( tdenewstuff )
 add_subdirectory( tdersync )
 add_subdirectory( licenses )
 add_subdirectory( dnssd )

Mainpage.dox

@@ -61,8 +61,8 @@
 	* - <a target="_top" href="arts/html/index.html"><b>arts</b></a>
         *   (<a target="_top" href="arts/html/classes.html">classes</a>)\n
 	*   <i>Trinity bindings for arts including knotify.</i>
-	* - <a target="_top" href="knewstuff/html/index.html"><b>knewstuff</b></a>
+	* - <a target="_top" href="tdenewstuff/html/index.html"><b>tdenewstuff</b></a>
-        *   (<a target="_top" href="knewstuff/html/classes.html">classes</a>)\n
+        *   (<a target="_top" href="tdenewstuff/html/classes.html">classes</a>)\n
 	*   <i>Upload and download of application data.</i>
 	* - <a target="_top" href="dnssd/html/index.html"><b>dnssd</b></a>
         *   (<a target="_top" href="dnssd/html/classes.html">classes</a>)\n

configure.in.in

@@ -259,7 +259,7 @@ AC_SUBST(LIB_TDEHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
 AC_SUBST(LIB_TDEPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
 AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
-AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
+AC_SUBST(LIB_TDENEWSTUFF, '$(top_builddir)/tdenewstuff/libtdenewstuff.la')
 AC_SUBST(LIB_TDEUNITTEST, '$(top_builddir)/tdeunittest/libtdeunittest.la')
 case $host in 
 	*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;

tdenewstuff/CMakeLists.txt

@@ -32,19 +32,19 @@ install( FILES
     downloaddialog.h engine.h entry.h knewstuffgeneric.h
     knewstuff.h providerdialog.h provider.h uploaddialog.h
     knewstuffbutton.h knewstuffsecure.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/knewstuff )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdenewstuff )
 
 
 ##### other data ################################
 
-install( FILES types DESTINATION ${DATA_INSTALL_DIR}/knewstuff )
+install( FILES types DESTINATION ${DATA_INSTALL_DIR}/tdenewstuff )
 install( FILES tdehotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
 tde_install_icons( )
 
 
-##### knewstuff #################################
+##### tdenewstuff ###############################
 
-set( target knewstuff )
+set( target tdenewstuff )
 
 set( ${target}_SRCS
   engine.cpp entry.cpp downloaddialog.cpp uploaddialog.cpp
@@ -70,6 +70,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK knewstuff-shared
+  LINK tdenewstuff-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

tdenewstuff/downloaddialog.cpp

@@ -33,9 +33,9 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 
-#include <knewstuff/entry.h>
+#include <tdenewstuff/entry.h>
-#include <knewstuff/knewstuffgeneric.h>
+#include <tdenewstuff/knewstuffgeneric.h>
-#include <knewstuff/engine.h>
+#include <tdenewstuff/engine.h>
 
 #include <tqlayout.h>
 #include <tqpushbutton.h>
@@ -531,6 +531,13 @@ void DownloadDialog::slotInstall()
   Entry *e = getEntry();
   if(!e) return;
 
+  TQPushButton *de, *in;
+  in = *(m_buttons[d->m_page]->at(0));
+  de = *(m_buttons[d->m_page]->at(1));
+
+  if(in) in->setEnabled(false);
+  if(de) de->setEnabled(false);
+
   d->m_lvtmp_r->setEnabled( false );
   d->m_lvtmp_l->setEnabled( false );
   d->m_lvtmp_d->setEnabled( false );

tdenewstuff/downloaddialog.h

@@ -21,7 +21,7 @@
 #define KNEWSTUFF_DOWNLOADDIALOG_H
 
 #include <kdialogbase.h>
-#include <knewstuff/provider.h>
+#include <tdenewstuff/provider.h>
 
 namespace TDEIO
 {

tdenewstuff/provider.cpp

@@ -352,9 +352,9 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
   if ( providersUrl.isEmpty() ) {
     // TODO: Replace the default by the real one.
     TQString server = cfg->readEntry( "MasterServer",
-                                     "http://korganizer.kde.org" );
+                                     "https://www.trinitydesktop.org" );
   
-    providersUrl = server + "/knewstuff/" + type + "/providers.xml";
+    providersUrl = server + "/ocs/" + type + "/providers.xml";
   }
 
   kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl;