From 50818289b6a22343d1718f746764c7fb80ae2b2c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Aug 2014 11:49:12 +0900 Subject: [PATCH] Updated KNewsTicker websites. This resolves bug 1844. --- knewsticker/common/configaccess.cpp | 225 +++++++--------------------- knewsticker/common/configaccess.h | 2 +- 2 files changed, 55 insertions(+), 172 deletions(-) mode change 100644 => 100755 knewsticker/common/configaccess.cpp diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp old mode 100644 new mode 100755 index c8ad18f6..129d28fa --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -21,7 +21,7 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { // Arts --------------- NewsSourceBase::Data( TQString::fromLatin1("Bureau 42"), - TQString::fromLatin1("http://www.bureau42.com/rdf/"), + TQString::fromLatin1("http://www.bureau42.com/feed"), TQString::fromLatin1("http://www.bureau42.com/favicon.ico"), NewsSourceBase::Arts, 5, false, false), NewsSourceBase::Data( @@ -29,58 +29,63 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { TQString::fromLatin1("http://efilmcritic.com/fo.rdf"), TQString::fromLatin1("http://efilmcritic.com/favicon.ico"), NewsSourceBase::Arts, 3, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("superhits.ch"), - TQString::fromLatin1("http://www.superhits.ch/cgi-bin/superhits.cgi?page=rdf"), - TQString::fromLatin1("http://www.superhits.ch/favicon.ico"), - NewsSourceBase::Arts, 10, false, false, TQString::fromLatin1("de")), // Business ----------- + // Computers ---------- NewsSourceBase::Data( - TQString::fromLatin1("Internet.com Business"), - TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), - TQString(), - NewsSourceBase::Business, 10, false, false), + TQString::fromLatin1("Trinity Desktop Environment news"), + TQString::fromLatin1("https://www.trinitydesktop.org/rss.php"), + TQString::fromLatin1("http://www.trinitydesktop.org/favicon.ico"), + NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::fromLatin1("TradeSims"), - TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"), - TQString(), - NewsSourceBase::Business, 10, false, false), - // Computers ---------- + TQString::fromLatin1("Debian news"), + TQString::fromLatin1("https://www.debian.org/News/news"), + TQString::fromLatin1("http://www.debian.org/favicon.ico"), + NewsSourceBase::Computers, 10, true, false), + NewsSourceBase::Data( + TQString::fromLatin1("Fedora news"), + TQString::fromLatin1("http://planet.fedoraproject.org/rss20.xml"), + TQString::fromLatin1("http://planet.fedoraproject.org/favicon.ico"), + NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::fromLatin1( "linuxartist.org" ), - TQString::fromLatin1( "http://www.linuxartist.org/backend.php"), - TQString::fromLatin1( "http://www.linuxartist.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false ), + TQString::fromLatin1("OpenSuse news"), + TQString::fromLatin1("http://news.opensuse.org/feed/"), + TQString::fromLatin1("http://www.opensuse.org/favicon.ico"), + NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::fromLatin1("KDE Deutschland"), - TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), - TQString::fromLatin1("http://www.kde.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")), + TQString::fromLatin1("Arch news"), + TQString::fromLatin1("https://www.archlinux.org/feeds/news/"), + TQString::fromLatin1("http://www.archlinux.org/favicon.ico"), + NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - TQString::fromLatin1("KDE France"), - TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), - TQString(), - NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("fr")), + TQString::fromLatin1("XFCE news"), + TQString::fromLatin1("http://www.xfce.org/feed?lang=en"), + TQString::fromLatin1("http://www.xfce.org/favicon.ico"), + NewsSourceBase::Computers, 10, false, false), + NewsSourceBase::Data( + TQString::fromLatin1("LXDE news"), + TQString::fromLatin1("http://www.lxde.org/rss.xml"), + TQString::fromLatin1("http://www.lxde.org/favicon.ico"), + NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( TQString::fromLatin1("FreeBSD Project News"), TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"), TQString::fromLatin1("http://www.freebsd.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("dot.kde.org"), + TQString::fromLatin1("KDE news"), TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), TQString::fromLatin1("http://www.kde.org/favicon.ico"), - NewsSourceBase::Computers, 10, true, false), + NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("GNOME News"), - TQString::fromLatin1("http://www.gnomedesktop.org/backend.php"), - TQString(), + TQString::fromLatin1("Planet GNOME news"), + TQString::fromLatin1("http://planet.gnome.org/rss20.xml"), + TQString::fromLatin1("http://planet.gnome.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( TQString::fromLatin1("Slashdot"), TQString::fromLatin1("http://slashdot.org/slashdot.rdf"), TQString::fromLatin1("http://slashdot.org/favicon.ico"), - NewsSourceBase::Computers, 10, true, false), + NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( TQString::fromLatin1("Ask Slashdot"), TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"), @@ -102,16 +107,6 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("Jabber News"), - TQString::fromLatin1("http://www.jabber.org/news/rss.xml"), - TQString(), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("Freshmeat"), - TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), - TQString::fromLatin1("http://freshmeat.net/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( TQString::fromLatin1("Linux Weekly News"), TQString::fromLatin1("http://www.lwn.net/headlines/rss"), TQString::fromLatin1("http://www.lwn.net/favicon.ico"), @@ -120,78 +115,33 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { TQString::fromLatin1("heise online news"), TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"), TQString::fromLatin1("http://www.heise.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( TQString::fromLatin1("RUS-CERT Ticker"), TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( TQString::fromLatin1("RUS-CERT Elsewhere"), TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::fromLatin1("Kuro5hin"), - TQString::fromLatin1("http://kuro5hin.org/backend.rdf"), - TQString::fromLatin1("http://kuro5hin.org/favicon.ico"), - NewsSourceBase::Computers, 10, true, false), - NewsSourceBase::Data( TQString::fromLatin1("Prolinux"), TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), TQString::fromLatin1("http://www.prolinux.de/favicon.ico"), NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::fromLatin1("Linuxde.org"), - TQString::fromLatin1("http://www.linuxde.org/backends/news.rdf"), - TQString::fromLatin1("http://www.linuxde.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), - NewsSourceBase::Data( TQString::fromLatin1("LinuxSecurity.com"), TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("Linux Game Tome"), - TQString::fromLatin1("http://happypenguin.org/html/news.rdf"), - TQString(), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("Telefragged"), - TQString::fromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"), - TQString(), - NewsSourceBase::Computers, 10, false, false), -/* NewsSourceBase::Data( - TQString::fromLatin1("Gimp News"), - TQString::fromLatin1("http://www.xach.com/gimp/news/channel.rdf"), - TQString(), - NewsSourceBase::Computers, 10, false, false),*/ - NewsSourceBase::Data( - TQString::fromLatin1("Mozilla"), - TQString::fromLatin1("http://www.mozilla.org/news.rdf"), - TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("MozillaZine"), - TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"), - TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("Daemon News"), - TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), - TQString(), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( TQString::fromLatin1("use Perl;"), TQString::fromLatin1("http://use.perl.org/useperl.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("desktopian.org"), - TQString::fromLatin1("http://www.desktopian.org/includes/headlines.xml"), - TQString::fromLatin1("http://www.desktopian.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( TQString::fromLatin1("Root prompt"), TQString::fromLatin1("http://www.rootprompt.org/rss/"), TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"), @@ -202,13 +152,8 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("LinuxNewbie"), - TQString::fromLatin1("http://www.linuxnewbie.org/news.cdf"), - TQString::fromLatin1("http://www.linuxnewbie.org/favicon.ico"), - NewsSourceBase::Computers, 5, false, false), - NewsSourceBase::Data( TQString::fromLatin1("Arstechnica"), - TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), + TQString::fromLatin1("http://feeds.arstechnica.com/arstechnica/index?format=xml"), TQString::fromLatin1("http://arstechnica.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( @@ -222,61 +167,21 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("RadioTux)"), - TQString::fromLatin1("http://blog.radiotux.de/feed/"), + TQString::fromLatin1("RadioTux"), + TQString::fromLatin1("http://blog.radiotux.de/index.php?/feeds/index.rss2"), TQString(), NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::fromLatin1("kdenews.unixcode.org"), - TQString::fromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"), - TQString(), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( TQString::fromLatin1("FreshPorts - the place for ports"), TQString::fromLatin1("http://www.freshports.org/news.php"), TQString::fromLatin1("http://www.freshports.org/favicon.ico"), NewsSourceBase::Computers, 20, false, false), NewsSourceBase::Data( - TQString::fromLatin1("NetPhoenix"), - TQString::fromLatin1("http://www.netphoenix.at/rss/netphoenix.php"), - TQString::fromLatin1("http://www.netphoenix.at/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), - NewsSourceBase::Data( - TQString::fromLatin1("ShortNews - by www.netphoenix.at"), - TQString::fromLatin1("http://www.netphoenix.at/rss/shortnews.php"), - TQString::fromLatin1("http://www.netphoenix.at/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), - NewsSourceBase::Data( - TQString::fromLatin1("zez.org - about code "), - TQString::fromLatin1("http://zez.org/article/rssheadlines"), - TQString(), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("BSDatwork.com"), - TQString::fromLatin1("http://BSDatwork.com/backend.php"), - TQString::fromLatin1("http://BSDatwork.com/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( TQString::fromLatin1("FreshSource - the place for source"), TQString::fromLatin1("http://www.freshsource.org/news.php"), TQString::fromLatin1("http://www.freshsource.org/favicon.ico"), NewsSourceBase::Computers, 20, false, false), NewsSourceBase::Data( - TQString::fromLatin1("The FreeBSD Diary"), - TQString::fromLatin1("http://www.freebsddiary.org/news.php"), - TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("MaximumBSD"), - TQString::fromLatin1("http://www.maximumbsd.com/backend/mb.rdf"), - TQString::fromLatin1("http://www.maximumbsd.com/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( - TQString::fromLatin1("BR-Linux.org"), - TQString::fromLatin1("http://br-linux.org/noticias/index.rdf"), - TQString::fromLatin1("http://br-linux.org/noticias/favicon.ico"), - NewsSourceBase::Computers, 10, false, false), - NewsSourceBase::Data( TQString::fromLatin1("OSNews.com"), TQString::fromLatin1("http://www.osnews.com/files/recent.rdf"), TQString::fromLatin1("http://www.osnews.com/favicon.ico"), @@ -289,24 +194,22 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { NewsSourceBase::Misc, 10, true, false, TQString::fromLatin1("de")), NewsSourceBase::Data( TQString::fromLatin1("N24.de"), - TQString::fromLatin1("http://www.n24.de/rss/?rubrik=home"), + TQString::fromLatin1("http://feeds.n24.de/n24/homepage?format=xml"), TQString::fromLatin1("http://www.n24.de/favicon.ico"), NewsSourceBase::Misc, 10, true, false, TQString::fromLatin1("de")), -/* NewsSourceBase::Data( - TQString::fromLatin1("CNN"), - TQString::fromLatin1("http://www.cnn.com/cnn.rss"), - TQString::fromLatin1("http://www.cnn.com/favicon.ico"), + TQString::fromLatin1("BBC News"), + TQString::fromLatin1("http://feeds.bbci.co.uk/news/rss.xml?edition=int"), + TQString::fromLatin1("http://www.bbc.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( - TQString::fromLatin1("CNN Europe"), - TQString::fromLatin1("http://europe.cnn.com/cnn.rss"), - TQString::fromLatin1("http://europe.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN top stories"), + TQString::fromLatin1("http://rss.cnn.com/rss/edition.rss"), + TQString::fromLatin1("http://www.cnn.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), -*/ NewsSourceBase::Data( TQString::fromLatin1("HotWired"), - TQString::fromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"), + TQString::fromLatin1("http://feeds.wired.com/wired/index"), TQString::fromLatin1("http://www.hotwired.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( @@ -320,43 +223,23 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false ), // Magazines ------ - NewsSourceBase::Data( - TQString::fromLatin1("Revista do Linux"), - TQString::fromLatin1("http://www.revistadolinux.com.br/noticias/arquivo/noticias.rdf"), - TQString::fromLatin1("http://www.revistadolinux.com.br/favicon.ico"), - NewsSourceBase::Magazines, 10, false, false /*, TQString::fromLatin1("br")*/ ), NewsSourceBase::Data( TQString::fromLatin1("Spiegel.de"), TQString::fromLatin1("http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml"), TQString::fromLatin1("http://www.spiegel.de/favicon.ico"), - NewsSourceBase::Magazines, 10, true, false, TQString::fromLatin1("de")), + NewsSourceBase::Magazines, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( TQString::fromLatin1("FAZ.de"), TQString::fromLatin1("http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml"), TQString::fromLatin1("http://www.faz.net/favicon.ico"), - NewsSourceBase::Magazines, 10, true, false, TQString::fromLatin1("de")), + NewsSourceBase::Magazines, 10, false, false, TQString::fromLatin1("de")), // Recreation - NewsSourceBase::Data( - TQString::fromLatin1("Segfault"), - TQString::fromLatin1("http://segfault.org/stories.xml"), - TQString::fromLatin1("http://segfault.org/favicon.ico"), - NewsSourceBase::Recreation, 10, false, false), // Society NewsSourceBase::Data( - TQString::fromLatin1("nippon.it"), - TQString::fromLatin1("http://www.nippon.it/backend.it.php"), - TQString::fromLatin1("http://www.nippon.it/favicon.ico"), - NewsSourceBase::Society, 10, false, false, TQString::fromLatin1("it")), - NewsSourceBase::Data( - TQString::fromLatin1( "gflash" ), - TQString::fromLatin1( "http://www.gflash.de/backend.php"), - TQString::fromLatin1( "http://www.gflash.de/favicon.ico"), - NewsSourceBase::Society, 10, false, false, TQString::fromLatin1( "de" ) ), - NewsSourceBase::Data( TQString::fromLatin1( "Quintessenz" ), TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"), TQString::fromLatin1( "http://quintessenz.at/favicon.ico"), - NewsSourceBase::Society, 9, false, false, TQString::fromLatin1( "de" ) ) + NewsSourceBase::Society, 9, false, false, TQString::fromLatin1( "de" )) }; ArticleFilter::ArticleFilter(const TQString &action, const TQString &newsSource, diff --git a/knewsticker/common/configaccess.h b/knewsticker/common/configaccess.h index eab1b6fe..3862eaaa 100644 --- a/knewsticker/common/configaccess.h +++ b/knewsticker/common/configaccess.h @@ -21,7 +21,7 @@ #include #include -#define DEFAULT_NEWSSOURCES 63 +#define DEFAULT_NEWSSOURCES 43 #define DEFAULT_SUBJECTS 13 class TQColor;