diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Mainpage.dox | 4 | ||||
| -rw-r--r-- | configure.in.in | 2 | ||||
| -rw-r--r-- | tdenewstuff/CMakeLists.txt (renamed from knewstuff/CMakeLists.txt) | 10 | ||||
| -rw-r--r-- | tdenewstuff/Mainpage.dox (renamed from knewstuff/Mainpage.dox) | 0 | ||||
| -rw-r--r-- | tdenewstuff/Makefile.am (renamed from knewstuff/Makefile.am) | 0 | ||||
| -rw-r--r-- | tdenewstuff/README.knewstuff (renamed from knewstuff/README.knewstuff) | 0 | ||||
| -rw-r--r-- | tdenewstuff/cr16-action-knewstuff.png (renamed from knewstuff/cr16-action-knewstuff.png) | bin | 710 -> 710 bytes | |||
| -rw-r--r-- | tdenewstuff/cr32-action-knewstuff.png (renamed from knewstuff/cr32-action-knewstuff.png) | bin | 1459 -> 1459 bytes | |||
| -rw-r--r-- | tdenewstuff/cr64-action-knewstuff.png (renamed from knewstuff/cr64-action-knewstuff.png) | bin | 3144 -> 3144 bytes | |||
| -rw-r--r-- | tdenewstuff/downloaddialog.cpp (renamed from knewstuff/downloaddialog.cpp) | 13 | ||||
| -rw-r--r-- | tdenewstuff/downloaddialog.h (renamed from knewstuff/downloaddialog.h) | 2 | ||||
| -rw-r--r-- | tdenewstuff/engine.cpp (renamed from knewstuff/engine.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/engine.h (renamed from knewstuff/engine.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/entry.cpp (renamed from knewstuff/entry.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/entry.h (renamed from knewstuff/entry.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/ghns.cpp (renamed from knewstuff/ghns.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/ghns.h (renamed from knewstuff/ghns.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuff.cpp (renamed from knewstuff/knewstuff.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuff.h (renamed from knewstuff/knewstuff.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuffbutton.cpp (renamed from knewstuff/knewstuffbutton.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuffbutton.h (renamed from knewstuff/knewstuffbutton.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuffgeneric.cpp (renamed from knewstuff/knewstuffgeneric.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuffgeneric.h (renamed from knewstuff/knewstuffgeneric.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuffsecure.cpp (renamed from knewstuff/knewstuffsecure.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/knewstuffsecure.h (renamed from knewstuff/knewstuffsecure.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/provider.cpp (renamed from knewstuff/provider.cpp) | 4 | ||||
| -rw-r--r-- | tdenewstuff/provider.h (renamed from knewstuff/provider.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/providerdialog.cpp (renamed from knewstuff/providerdialog.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/providerdialog.h (renamed from knewstuff/providerdialog.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/security.cpp (renamed from knewstuff/security.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/security.h (renamed from knewstuff/security.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/tdehotnewstuff.cpp (renamed from knewstuff/tdehotnewstuff.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/tdehotnewstuffrc (renamed from knewstuff/tdehotnewstuffrc) | 0 | ||||
| -rw-r--r-- | tdenewstuff/testnewstuff.cpp (renamed from knewstuff/testnewstuff.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/testnewstuff.h (renamed from knewstuff/testnewstuff.h) | 0 | ||||
| -rw-r--r-- | tdenewstuff/types (renamed from knewstuff/types) | 0 | ||||
| -rw-r--r-- | tdenewstuff/uploaddialog.cpp (renamed from knewstuff/uploaddialog.cpp) | 0 | ||||
| -rw-r--r-- | tdenewstuff/uploaddialog.h (renamed from knewstuff/uploaddialog.h) | 0 |
39 files changed, 22 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e97ef57e0..b2ac71afc 100644 --- a/CMakeLists.txt +++ b/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 ) diff --git a/Mainpage.dox b/Mainpage.dox index 77bdc19b1..bef552af1 100644 --- a/Mainpage.dox +++ b/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="knewstuff/html/classes.html">classes</a>)\n + * - <a target="_top" href="tdenewstuff/html/index.html"><b>tdenewstuff</b></a> + * (<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 diff --git a/configure.in.in b/configure.in.in index 16b63b68c..83a6b5181 100644 --- a/configure.in.in +++ b/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' ;; diff --git a/knewstuff/CMakeLists.txt b/tdenewstuff/CMakeLists.txt index 4493ee385..0633603f8 100644 --- a/knewstuff/CMakeLists.txt +++ b/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} ) diff --git a/knewstuff/Mainpage.dox b/tdenewstuff/Mainpage.dox index d7f1c4da5..d7f1c4da5 100644 --- a/knewstuff/Mainpage.dox +++ b/tdenewstuff/Mainpage.dox diff --git a/knewstuff/Makefile.am b/tdenewstuff/Makefile.am index b8532a234..b8532a234 100644 --- a/knewstuff/Makefile.am +++ b/tdenewstuff/Makefile.am diff --git a/knewstuff/README.knewstuff b/tdenewstuff/README.knewstuff index fabefa988..fabefa988 100644 --- a/knewstuff/README.knewstuff +++ b/tdenewstuff/README.knewstuff diff --git a/knewstuff/cr16-action-knewstuff.png b/tdenewstuff/cr16-action-knewstuff.png Binary files differindex ef5ea45e2..ef5ea45e2 100644 --- a/knewstuff/cr16-action-knewstuff.png +++ b/tdenewstuff/cr16-action-knewstuff.png diff --git a/knewstuff/cr32-action-knewstuff.png b/tdenewstuff/cr32-action-knewstuff.png Binary files differindex 757e92668..757e92668 100644 --- a/knewstuff/cr32-action-knewstuff.png +++ b/tdenewstuff/cr32-action-knewstuff.png diff --git a/knewstuff/cr64-action-knewstuff.png b/tdenewstuff/cr64-action-knewstuff.png Binary files differindex ad6d5e566..ad6d5e566 100644 --- a/knewstuff/cr64-action-knewstuff.png +++ b/tdenewstuff/cr64-action-knewstuff.png diff --git a/knewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp index 4a3c56ff4..586fb76b7 100644 --- a/knewstuff/downloaddialog.cpp +++ b/tdenewstuff/downloaddialog.cpp @@ -33,9 +33,9 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <knewstuff/entry.h> -#include <knewstuff/knewstuffgeneric.h> -#include <knewstuff/engine.h> +#include <tdenewstuff/entry.h> +#include <tdenewstuff/knewstuffgeneric.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 ); diff --git a/knewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h index 2c74e21f3..5756a4e6e 100644 --- a/knewstuff/downloaddialog.h +++ b/tdenewstuff/downloaddialog.h @@ -21,7 +21,7 @@ #define KNEWSTUFF_DOWNLOADDIALOG_H #include <kdialogbase.h> -#include <knewstuff/provider.h> +#include <tdenewstuff/provider.h> namespace TDEIO { diff --git a/knewstuff/engine.cpp b/tdenewstuff/engine.cpp index f8e7163a9..f8e7163a9 100644 --- a/knewstuff/engine.cpp +++ b/tdenewstuff/engine.cpp diff --git a/knewstuff/engine.h b/tdenewstuff/engine.h index 432f3b04c..432f3b04c 100644 --- a/knewstuff/engine.h +++ b/tdenewstuff/engine.h diff --git a/knewstuff/entry.cpp b/tdenewstuff/entry.cpp index 2713fadfb..2713fadfb 100644 --- a/knewstuff/entry.cpp +++ b/tdenewstuff/entry.cpp diff --git a/knewstuff/entry.h b/tdenewstuff/entry.h index e04822e39..e04822e39 100644 --- a/knewstuff/entry.h +++ b/tdenewstuff/entry.h diff --git a/knewstuff/ghns.cpp b/tdenewstuff/ghns.cpp index 3217de80e..3217de80e 100644 --- a/knewstuff/ghns.cpp +++ b/tdenewstuff/ghns.cpp diff --git a/knewstuff/ghns.h b/tdenewstuff/ghns.h index 7eea0c489..7eea0c489 100644 --- a/knewstuff/ghns.h +++ b/tdenewstuff/ghns.h diff --git a/knewstuff/knewstuff.cpp b/tdenewstuff/knewstuff.cpp index ad4f0fb98..ad4f0fb98 100644 --- a/knewstuff/knewstuff.cpp +++ b/tdenewstuff/knewstuff.cpp diff --git a/knewstuff/knewstuff.h b/tdenewstuff/knewstuff.h index 55d6db9b4..55d6db9b4 100644 --- a/knewstuff/knewstuff.h +++ b/tdenewstuff/knewstuff.h diff --git a/knewstuff/knewstuffbutton.cpp b/tdenewstuff/knewstuffbutton.cpp index 3baa83397..3baa83397 100644 --- a/knewstuff/knewstuffbutton.cpp +++ b/tdenewstuff/knewstuffbutton.cpp diff --git a/knewstuff/knewstuffbutton.h b/tdenewstuff/knewstuffbutton.h index e4a98ae3a..e4a98ae3a 100644 --- a/knewstuff/knewstuffbutton.h +++ b/tdenewstuff/knewstuffbutton.h diff --git a/knewstuff/knewstuffgeneric.cpp b/tdenewstuff/knewstuffgeneric.cpp index 16fda977c..16fda977c 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/tdenewstuff/knewstuffgeneric.cpp diff --git a/knewstuff/knewstuffgeneric.h b/tdenewstuff/knewstuffgeneric.h index 36feb1a77..36feb1a77 100644 --- a/knewstuff/knewstuffgeneric.h +++ b/tdenewstuff/knewstuffgeneric.h diff --git a/knewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp index 0f95c8c0c..0f95c8c0c 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/tdenewstuff/knewstuffsecure.cpp diff --git a/knewstuff/knewstuffsecure.h b/tdenewstuff/knewstuffsecure.h index 1c292a9a8..1c292a9a8 100644 --- a/knewstuff/knewstuffsecure.h +++ b/tdenewstuff/knewstuffsecure.h diff --git a/knewstuff/provider.cpp b/tdenewstuff/provider.cpp index 029a07caf..4157c5025 100644 --- a/knewstuff/provider.cpp +++ b/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; diff --git a/knewstuff/provider.h b/tdenewstuff/provider.h index 130864158..130864158 100644 --- a/knewstuff/provider.h +++ b/tdenewstuff/provider.h diff --git a/knewstuff/providerdialog.cpp b/tdenewstuff/providerdialog.cpp index f71558ecd..f71558ecd 100644 --- a/knewstuff/providerdialog.cpp +++ b/tdenewstuff/providerdialog.cpp diff --git a/knewstuff/providerdialog.h b/tdenewstuff/providerdialog.h index fe7652f14..fe7652f14 100644 --- a/knewstuff/providerdialog.h +++ b/tdenewstuff/providerdialog.h diff --git a/knewstuff/security.cpp b/tdenewstuff/security.cpp index d161c2969..d161c2969 100644 --- a/knewstuff/security.cpp +++ b/tdenewstuff/security.cpp diff --git a/knewstuff/security.h b/tdenewstuff/security.h index 230821e7e..230821e7e 100644 --- a/knewstuff/security.h +++ b/tdenewstuff/security.h diff --git a/knewstuff/tdehotnewstuff.cpp b/tdenewstuff/tdehotnewstuff.cpp index 7f4135b84..7f4135b84 100644 --- a/knewstuff/tdehotnewstuff.cpp +++ b/tdenewstuff/tdehotnewstuff.cpp diff --git a/knewstuff/tdehotnewstuffrc b/tdenewstuff/tdehotnewstuffrc index 546ebb053..546ebb053 100644 --- a/knewstuff/tdehotnewstuffrc +++ b/tdenewstuff/tdehotnewstuffrc diff --git a/knewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp index f9fc7269f..f9fc7269f 100644 --- a/knewstuff/testnewstuff.cpp +++ b/tdenewstuff/testnewstuff.cpp diff --git a/knewstuff/testnewstuff.h b/tdenewstuff/testnewstuff.h index acd9aece4..acd9aece4 100644 --- a/knewstuff/testnewstuff.h +++ b/tdenewstuff/testnewstuff.h diff --git a/knewstuff/types b/tdenewstuff/types index 6f47cbf63..6f47cbf63 100644 --- a/knewstuff/types +++ b/tdenewstuff/types diff --git a/knewstuff/uploaddialog.cpp b/tdenewstuff/uploaddialog.cpp index a8e13a493..a8e13a493 100644 --- a/knewstuff/uploaddialog.cpp +++ b/tdenewstuff/uploaddialog.cpp diff --git a/knewstuff/uploaddialog.h b/tdenewstuff/uploaddialog.h index 3fc068e3a..3fc068e3a 100644 --- a/knewstuff/uploaddialog.h +++ b/tdenewstuff/uploaddialog.h |
