Mailinglist Archive: opensuse-commit (640 mails)
| < Previous | Next > |
commit plasma-addons for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 07 Apr 2011 10:38:55 +0200
- Message-id: <20110407083856.02918202A8@hilbert.suse.de>
Hello community,
here is the log from the commit of package plasma-addons for openSUSE:Factory
checked in at Thu Apr 7 10:38:55 CEST 2011.
--------
--- plasma-addons/plasma-addons.changes 2011-03-08 14:10:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/plasma-addons/plasma-addons.changes
2011-04-01 20:36:17.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Apr 1 20:36:15 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.6.2
+ * Bugfixes over KDE 4.6.1
+ * see http://kde.org/announcements/changelogs/changelog4_6_1to4_6_2.php for
details
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdeplasma-addons-4.6.1.tar.bz2
New:
----
kdeplasma-addons-4.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-addons.spec ++++++
--- /var/tmp/diff_new_pack.Fj4n8w/_old 2011-04-07 10:38:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Fj4n8w/_new 2011-04-07 10:38:15.000000000 +0200
@@ -38,7 +38,7 @@
Group: System/GUI/KDE
Summary: Additional Plasma Widgets
Url: http://www.kde.org/
-Version: 4.6.1
+Version: 4.6.2
Release: 1
Source0: kdeplasma-addons-%{version}.tar.bz2
Patch0: 4_6_BRANCH.diff
++++++ kdeplasma-addons-4.6.1.tar.bz2 -> kdeplasma-addons-4.6.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdeplasma-addons-4.6.1/applets/notes/notes.cpp
new/kdeplasma-addons-4.6.2/applets/notes/notes.cpp
--- old/kdeplasma-addons-4.6.1/applets/notes/notes.cpp 2011-02-25
23:49:51.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/applets/notes/notes.cpp 2011-03-31
22:45:58.000000000 +0200
@@ -306,8 +306,7 @@
if (f.open(QIODevice::ReadOnly)) {
QTextStream t(&f);
- m_textEdit->nativeWidget()->setHtml(t.readAll());
- QTimer::singleShot(1000, this, SLOT(saveNote()));
+ m_textEdit->nativeWidget()->setText(t.readAll());
f.close();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/applets/plasmaboard/layouts/full.xml
new/kdeplasma-addons-4.6.2/applets/plasmaboard/layouts/full.xml
--- old/kdeplasma-addons-4.6.1/applets/plasmaboard/layouts/full.xml
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/applets/plasmaboard/layouts/full.xml
2011-03-31 22:45:57.000000000 +0200
@@ -94,7 +94,7 @@
<fkey action="KEYPAD6" width="450"></fkey>
</row>
<row height="1700" width="400">
- <skey action="SHIFT" width="600"></skey>
+ <fkey action="SHIFT" width="600"></fkey>
<key code="94"></key>
<key code="52"></key>
<key code="53" ></key>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/applets/unitconverter/plasma-applet-unitconverter.desktop
new/kdeplasma-addons-4.6.2/applets/unitconverter/plasma-applet-unitconverter.desktop
---
old/kdeplasma-addons-4.6.1/applets/unitconverter/plasma-applet-unitconverter.desktop
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/applets/unitconverter/plasma-applet-unitconverter.desktop
2011-03-31 22:45:55.000000000 +0200
@@ -86,7 +86,7 @@
Comment[pt]=Plasmóide para converter unidades
Comment[pt_BR]=Plasmóide para converter unidades
Comment[ro]=Plasmoid pentru conversia unităților
-Comment[ru]=Преобразование единиц измерения
+Comment[ru]=Виджет для Преобразование
Comment[sk]=Plasmoid na konverziu jednotiek
Comment[sl]=Gradnik za pretvarjanje enot
Comment[sr]=Плазмоид за претварање јединица
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/applets/webslice/plasma/plasma-applet-webslice.desktop
new/kdeplasma-addons-4.6.2/applets/webslice/plasma/plasma-applet-webslice.desktop
---
old/kdeplasma-addons-4.6.1/applets/webslice/plasma/plasma-applet-webslice.desktop
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/applets/webslice/plasma/plasma-applet-webslice.desktop
2011-03-31 22:45:51.000000000 +0200
@@ -34,7 +34,7 @@
Name[sr@latin]=veb isečak
Name[sv]=Webbutdrag
Name[tr]=Web Dilimi
-Name[uk]=Вебзріз
+Name[uk]=Веб-зріз
Name[x-test]=xxWeb Slicexx
Name[zh_CN]=网页切片
Name[zh_TW]=網頁切片
@@ -75,7 +75,7 @@
Comment[sr@latin]=Prikaz dela veb stranice
Comment[sv]=Visa en del av en webbsida
Comment[tr]=Bir web sayfasının belirli bir bölümünü göster
-Comment[uk]=Показ частини вебсторінки
+Comment[uk]=Показ частини веб-сторінки
Comment[x-test]=xxShow a part of a webpagexx
Comment[zh_CN]=显示网页的一部分
Comment[zh_TW]=顯示一部份的網頁
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/applets/webslice/plasma/websliceConfig.ui
new/kdeplasma-addons-4.6.2/applets/webslice/plasma/websliceConfig.ui
--- old/kdeplasma-addons-4.6.1/applets/webslice/plasma/websliceConfig.ui
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/applets/webslice/plasma/websliceConfig.ui
2011-03-31 22:45:51.000000000 +0200
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>276</width>
- <height>102</height>
+ <width>277</width>
+ <height>344</height>
</rect>
</property>
<property name="sizePolicy">
@@ -22,6 +22,9 @@
<height>700</height>
</size>
</property>
+ <property name="windowTitle">
+ <string>Configure the System Bar</string>
+ </property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="urlLabel">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/containments/groupingdesktop/desktop/plasma-containment-groupingdesktop.desktop
new/kdeplasma-addons-4.6.2/containments/groupingdesktop/desktop/plasma-containment-groupingdesktop.desktop
---
old/kdeplasma-addons-4.6.1/containments/groupingdesktop/desktop/plasma-containment-groupingdesktop.desktop
2011-02-25 23:49:51.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/containments/groupingdesktop/desktop/plasma-containment-groupingdesktop.desktop
2011-03-31 22:45:48.000000000 +0200
@@ -19,7 +19,6 @@
Name[pa]=ਡੈਸਕਟਾਪ ਗਰਿੱਪ ਬਣਾਉ
Name[pt]=Ecrã Agrupado
Name[pt_BR]=Área de trabalho agrupada
-Name[ru]=Группирующая комната
Name[sk]=Plocha so skupinami
Name[sl]=Namizje za združevanje
Name[sr]=Групишућа површ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/containments/groupingdesktop/griddesktop/plasma-containment-griddesktop.desktop
new/kdeplasma-addons-4.6.2/containments/groupingdesktop/griddesktop/plasma-containment-griddesktop.desktop
---
old/kdeplasma-addons-4.6.1/containments/groupingdesktop/griddesktop/plasma-containment-griddesktop.desktop
2011-02-25 23:49:51.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/containments/groupingdesktop/griddesktop/plasma-containment-griddesktop.desktop
2011-03-31 22:45:47.000000000 +0200
@@ -19,7 +19,6 @@
Name[pa]=ਡੈਸਕਟਾਪ ਗਰਿੱਡ
Name[pt]=Ecrã em Grelha
Name[pt_BR]=Área de trabalho em grade
-Name[ru]=Клетчатая комната
Name[sk]=Plocha s mriežkou
Name[sl]=Namizje z mrežo
Name[sr]=Решеткаста површ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop
new/kdeplasma-addons-4.6.2/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop
---
old/kdeplasma-addons-4.6.1/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop
2011-02-25 23:49:51.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/containments/groupingdesktop/panel/plasma-containment-groupingpanel.desktop
2011-03-31 22:45:47.000000000 +0200
@@ -19,7 +19,6 @@
Name[pa]=ਗਰਿੱਪਿੰਗ ਪੈਨਲ
Name[pt]=Painel Agrupado
Name[pt_BR]=Painel agrupado
-Name[ru]=Группирующая панель
Name[sk]=Panel so skupinami
Name[sl]=Plošča za združevanje
Name[sr]=Групишући панел
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/CMakeLists.txt
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/CMakeLists.txt
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/CMakeLists.txt
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-project(plasma-kdecommitsengine)
-
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
-include_directories(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
- ${KDE4_INCLUDES}
- )
-
-set(kdecommits_engine_SRCS
- src/kdepresets.cpp
- src/kdecommitsengine.cpp
- src/kdecommitsservice.cpp
-)
-
-kde4_add_plugin(plasma_engine_kdecommits ${kdecommits_engine_SRCS})
-
-target_link_libraries(plasma_engine_kdecommits
- ${QT_QTNETWORK_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KIO_LIBS}
- ${KDE4_PLASMA_LIBS})
-
-install(TARGETS plasma_engine_kdecommits
- DESTINATION ${PLUGIN_INSTALL_DIR})
-
-install(FILES plasma-engine-kdecommits.desktop
- DESTINATION ${SERVICES_INSTALL_DIR})
-
-install(FILES src/kdecommits.operations
- DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/plasma-engine-kdecommits.desktop
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/plasma-engine-kdecommits.desktop
---
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/plasma-engine-kdecommits.desktop
2011-02-25 23:49:51.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/plasma-engine-kdecommits.desktop
1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-[Desktop Entry]
-Name=KDE Commits Engine
-Name[ca]=Motor de «commits» del KDE
-Name[da]=Motor til KDE Commits
-Name[de]=KDE-Comic-Datentreiber
-Name[es]=Motor de cambios confirmados de KDE
-Name[et]=KDE sissekannete mootor
-Name[it]=Motore depositi di KDE
-Name[kk]=KDE өзгерістерін тапсыру тетігі
-Name[nl]=KDE commits-engine
-Name[pt]=Motor de Envios do KDE
-Name[pt_BR]=Mecanismo dos commits do KDE
-Name[ru]=Источник данных об изменениях в репозиториях KDE
-Name[sv]=KDE-gränssnitt för incheckningar
-Name[uk]=Рушій внесків до KDE
-Name[x-test]=xxKDE Commits Enginexx
-Name[zh_TW]=KDE 提交引擎
-Comment=A Data Engine for acquiring consolidated data about KDE SVN Commits
-Comment[ca]=Un motor de dades de captura de dades consolidades quant als
«commits» en el SVN del KDE
-Comment[da]=En datamotor til at hente samlede data om KDE SVN-commits
-Comment[es]=Un motor de datos para adquirir datos consolidados acerca de
cambios confirmados del SVN de KDE
-Comment[et]=Andmemootor, mis hangib konsolideeritud andmeid KDE SVN-i
sissekannete kohta
-Comment[it]=Un motore di dati per l'acquisizione di dati consolidati sui
depositi SVN di KDE
-Comment[kk]=KDE SVN Commits туралы біріктірген деректерді жинайтын тетігі
-Comment[nl]=Een gegevens-engine voor het ophalen van geconsolideerde gegevens
over KDE-SVN-commits
-Comment[pt]=Um motor de dados para adquirir dados consolidados acerca dos
envios do SVN do KDE
-Comment[pt_BR]=Um mecanismo de dados para obtenção de dados consolidados sobre
os commits do KDE SVN
-Comment[ru]=Поставщик данных для сбора общих данных об изменениях в
репозиториях KDE
-Comment[sv]=Ett datagränssnitt för att inhämta samlad data om KDE
SVN-incheckningar
-Comment[uk]=Рушій даних для отримання загальних даних щодо внесків до SVN KDE
-Comment[x-test]=xxA Data Engine for acquiring consolidated data about KDE SVN
Commitsxx
-Comment[zh_TW]=用於提交 KDE SVN 的聯合資料的資料引擎
-Type=Service
-
-X-KDE-ServiceTypes=Plasma/DataEngine
-X-KDE-Library=plasma_engine_kdecommits
-X-Plasma-EngineName=kdecommits
-X-KDE-PluginInfo-Author=Sandro Andrade
-X-KDE-PluginInfo-Email=sandroandrade@xxxxxxx
-X-KDE-PluginInfo-Name=kdecommits
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://plasma.kde.org/
-X-KDE-PluginInfo-Category=Development Tools
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/scripts/load_commits.pl
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/scripts/load_commits.pl
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/scripts/load_commits.pl
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/scripts/load_commits.pl
1970-01-01 01:00:00.000000000 +0100
@@ -1,175 +0,0 @@
-#!/usr/bin/perl
-
-use LWP::Simple;
-use DBI;
-
-if (@ARGV == 0)
-{
- print "Usage: load_commits.pl <YYYY-MM-DD>\n";
- exit();
-}
-
-#$hostname = ""; # Running from Mocha Host
-$hostname = ""; # Running from my computer
-$database = "";
-$user = "";
-$password = "";
-
-$driver = "mysql";
-$dsn = "DBI:$driver:database=$database;host=$hostname";
-$dbh = DBI->connect($dsn, $user, $password)
- or die "Couldn't connect to database: " . DBI->errstr;
-$dbh->{AutoCommit} = 0;
-
-# In some cases a duplicated entry error will be raised because of just
appeared commits
-# that make the last commit in one page pass to the first one in previous
page. I use the
-# REPLACE statement to prevent such errors. Anyway, commits won't be missed.
-my $commits_handle = $dbh->prepare_cached('REPLACE INTO commits VALUES
(?,?,?,?)')
- or die "Couldn't create commit handle";
-
-my $develselect_handle = $dbh->prepare_cached('SELECT COUNT(*) FROM developers
WHERE svn_account = ?')
- or die "Couldn't create develselect handle";
-
-my $develinsert_handle = $dbh->prepare_cached('INSERT INTO developers VALUES
(?,?,?,?)')
- or die "Couldn't create develinsert handle";
-
-my $develupdate_handle = $dbh->prepare_cached('UPDATE developers SET
last_commit = IF (? > last_commit, ?, last_commit), first_commit = IF (? <
first_commit, ?, first_commit) WHERE svn_account = ?')
- or die "Couldn't create develupdate handle";
-
-my $year = substr $ARGV[0], 0, 4;
-my $month = substr $ARGV[0], 5, 2;
-
-my $r = 1;
-my $commitCounter = 0;
-my $invalidCounter = 0;
-
-my $foundData = 0;
-my $finished = 0;
-
-while (!$finished)
-{
- my $url = 'http://lists.kde.org/?l=kde-commits&r=' . $r . '&b=' . $year .
$month . '&w=4';
- my $foundCommit = 0;
-
- print "Getting url $url\n";
- my $content = get $url;
- if (!defined $content)
- {
- print "Failed to get url. 2nd attempt !\n";
- $content = get $url;
- }
- if (!defined $content)
- {
- print "Failed to get url. 3rd attempt !\n";
- $content = get $url;
- }
- die "Couldn't get $url" unless defined $content;
-
- my @lines = split('\n', $content);
-
- foreach my $line (@lines)
- {
- if ($line =~ /^\s*(\d+)\.\s(\d\d\d\d-\d\d-\d\d)\s\s<a
href="(.+?)">(.+?)<\/a>\s*<a
href="\?l=kde-commits&w=4">kde-commits<\/a>\s\s(.+)/)
- {
- $foundCommit = 1;
- my ($commitNumber, $commitDate, $commitLink, $commitPath,
$commitDeveloper) = ($1, $2, $3, $4, $5);
-
- if ($commitDate eq $ARGV[0])
- {
- $foundData = 1;
- $commitDeveloper =~ s/\s+$//;
-
- my $commitContent = get "http://lists.kde.org/"; . $commitLink;
- if (!defined $commitContent)
- {
- print "Failed to get content url. 2nd attempt !\n";
- $commitContent = get "http://lists.kde.org/"; . $commitLink;
- }
- if (!defined $commitContent)
- {
- print "Failed to get content url. 3rd attempt !\n";
- $commitContent = get "http://lists.kde.org/"; . $commitLink;
- }
- die "Couldn't get content $url" unless defined $commitContent;
-
- my @contentLines = split('\n', $commitContent);
-
- my $commitDateTime = "";
- my $commitSVNAccount = "";
- my $commitLog = "";
- my $enteredLogSection = 0;
- foreach my $contentLine (@contentLines)
- {
- if ($contentLine =~ /Date:\s{7}<a
href="\?l=kde-commits&r=\d+&w=4&b=\d{6}">(\d\d\d\d)-(\d\d)-(\d\d)\s(\d{1,2}):(\d\d):(\d\d)<\/a>/)
- {
- my ($year, $month, $day, $hour, $min, $sec) = ($1, $2,
$3, $4, $5, $6);
- $commitDateTime = sprintf ("%04d-%02d-%02d
%02d:%02d:%02d", $year, $month, $day, $hour, $min, $sec);
- }
- elsif ($contentLine =~ /SVN commit \d+ by (.+):/)
- {
- $commitSVNAccount = $1;
- $enteredLogSection = 1;
- }
- elsif ($contentLine =~
/^\s_?[AMDUGC]\s*(\+\d+\s*\-\d+)?\s*\S+/)
- {
- $enteredLogSection = 0;
- last;
- }
- elsif ($enteredLogSection)
- {
- if ($commitLog ne "" and $contentLine ne "")
- {
- $commitLog = $commitLog . "\n";
- }
- $commitLog = $commitLog . $contentLine;
- }
- }
-
- print "\"$commitNumber\"\n";
"\"$commitNumber\"\n\"$commitDateTime\"\n\"$commitLink\"\n\"$commitPath\"\n\"$commitDeveloper\"\n\"$commitSVNAccount\"\n\"$commitLog\"\n\n";
- if ($commitSVNAccount ne "")
- {
- $commitCounter++;
-
- $develselect_handle->execute($commitSVNAccount)
- or die "Couldn't select developer: " . $dbh->errstr;
-
- if ($develselect_handle->fetchrow() eq 0)
- {
- print "Devel nao existe, inserindo\n";
- $develinsert_handle->execute($commitSVNAccount,
$commitDeveloper, $commitDateTime, $commitDateTime)
- or die "Couldn't insert developer: " . $dbh->errstr;
- }
- else
- {
- print "Devel ja existe, atualizando\n";
- $develupdate_handle->execute($commitDateTime,
$commitDateTime, $commitDateTime, $commitDateTime, $commitSVNAccount)
- or die "Couldn't update developer: " . $dbh->errstr;
- }
-
- $commits_handle->execute($commitDateTime,
$commitSVNAccount, $commitPath, $commitLog)
- or die "Couldn't insert commit: " . $dbh->errstr;
- }
- else
- {
- $invalidCounter++;
- }
- }
- elsif ($foundData)
- {
- $finished = 1;
- last;
- }
- }
- }
- if (!$foundCommit)
- {
- $finished = 1;
- }
- $r++;
-}
-$dbh->commit
-or die "Couldn't commit: " . $dbh->errstr;
-
-print "$commitCounter commits inserted\n";
-print "$invalidCounter invalid commits\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/scripts/run_load_commits.pl
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/scripts/run_load_commits.pl
---
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/scripts/run_load_commits.pl
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/scripts/run_load_commits.pl
1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/usr/bin/perl
-
-# Finding today (Mocha) date which is yesterday's KDE server date ...
-my ($year, $month, $day) = (localtime(time))[5,4,3];
-$month++;
-$year += 1900;
-$date = sprintf ("%04d-%02d-%02d", $year, $month, $day);
-
-# Running from my computer
-print "Running /home/sandros/tmp/load_commits.pl $date\n";
-exec "/home/sandros/tmp/load_commits.pl $date";
-
-# Running from Mocha Host
-#print "Running /home/sandros/scripts/load_commits.pl $date\n";
-#exec "/home/sandros/scripts/load_commits.pl $date";
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/servlet/KdeCommitsServlet.java
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/servlet/KdeCommitsServlet.java
---
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/servlet/KdeCommitsServlet.java
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/servlet/KdeCommitsServlet.java
1970-01-01 01:00:00.000000000 +0100
@@ -1,149 +0,0 @@
-import java.io.*;
-import java.sql.*;
-import java.lang.reflect.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-public class KdeCommitsServlet extends HttpServlet
-{
- public void init()
- {
- String dbHost = "";
- String dbName = "";
- String username = "";
- String password = "";
-
- try
- {
- Class.forName("com.mysql.jdbc.Driver");
- }
- catch(ClassNotFoundException e)
- {
- System.out.println("Error loading driver:" + e.getMessage());
- }
-
- try
- {
- String url ="jdbc:mysql://" + dbHost + ":3306/" + dbName;
- conn = DriverManager.getConnection(url, username, password);
- }
- catch(SQLException e)
- {
- String err1Msg = e.getMessage();
- }
- }
-
- public void doGet(HttpServletRequest request, HttpServletResponse response)
- {
- String operation = null;
- Class[] paramTypes = null;
- Object[] paramValues = null;
-
- PrintWriter out = null;
- try
- {
- out = response.getWriter();
- }
- catch (IOException e)
- {
- System.out.println("Error acquiring writer:" + e.getMessage());
- }
-
- try
- {
-
- if (request.getParameterMap().size() == 0)
- {
- response.setContentType("text/html");
- out.println("No operation supplied !");
- return;
- }
-
- response.setContentType("text/plain");
- operation = request.getParameter("op");
- paramTypes = new Class[request.getParameterMap().size()];
- paramValues = new Object[paramTypes.length];
-
- paramTypes[0] = PrintWriter.class;
- paramValues[0] = out;
-
- for (int i = 0; i < paramValues.length - 1; ++i)
- {
- paramTypes[i+1] = String.class;
- paramValues[i+1] = request.getParameter("p" + i);
- }
-
- Method method = getClass().getDeclaredMethod(operation,
paramTypes);
- method.invoke(this, paramValues);
- }
- catch (NoSuchMethodException e)
- {
- response.setContentType("text/html");
- out.println("Unsupported operation " + operation + " with " +
paramTypes.length + " String parameters !");
- }
- catch (Exception e)
- {
- response.setContentType("text/html");
- out.println("Exception: " + e.getClass().getName() + " " +
e.getMessage());
- }
- }
-
- public void allProjectsInfo(PrintWriter out) throws SQLException
- {
- String query = "select name, commit_subject, krazy_report,
krazy_identifier, icon, add_in_view from projects";
- Statement stmt = conn.createStatement();
- ResultSet res = stmt.executeQuery(query);
- printResultSet(out, res);
- }
-
- public void topActiveProjects(PrintWriter out, String n) throws
SQLException
- {
- String query = "select p.name, count(*) from projects p, commits c
where INSTR(c.path, p.commit_subject) > 0 group by p.commit_subject order by
count(*) desc";
- if (!n.equals("0"))
- query = query + " limit 0 , " + n;
- Statement stmt = conn.createStatement();
- ResultSet res = stmt.executeQuery(query);
- printResultSet(out, res);
- }
-
- public void topProjectDevelopers(PrintWriter out, String project, String
n) throws SQLException
- {
- String query;
- if (!project.equals(""))
- query = "select d.full_name, d.svn_account, d.first_commit,
d.last_commit, count(*) from projects p, commits c, developers d where
INSTR(c.path, p.commit_subject) > 0 and d.svn_account = c.svn_account and
p.name = '" + project + "' group by d.full_name, p.name order by count(*) desc";
- else
- query = "select d.full_name, d.svn_account, d.first_commit,
d.last_commit, count(*) from commits c, developers d where d.svn_account =
c.svn_account group by d.full_name order by count(*) desc";
- if (!n.equals("0"))
- query = query + " limit 0 , " + n;
- Statement stmt = conn.createStatement();
- ResultSet res = stmt.executeQuery(query);
- printResultSet(out, res);
- }
-
- public void commitHistory(PrintWriter out, String project, String n)
throws SQLException
- {
- String query;
- if (!project.equals(""))
- query = "select date(c.date_time) date, count(*) from projects p,
commits c where INSTR(c.path, p.commit_subject) > 0 and p.name = '" + project +
"' group by date order by date desc";
- else
- query = "select date(c.date_time) date, count(*) from commits c
group by date order by date desc";
- if (!n.equals("0"))
- query = query + " limit 0 , " + n;
- Statement stmt = conn.createStatement();
- ResultSet res = stmt.executeQuery(query);
- printResultSet(out, res);
- }
-
- private void printResultSet(PrintWriter out, ResultSet res) throws
SQLException
- {
- int count = res.getMetaData().getColumnCount();
- while(res.next())
- {
- for (int i = 1; i < count; ++i)
- out.print(res.getObject(i) + ";");
- out.println(res.getObject(count));
- }
- }
-
- private Connection conn;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommits.operations
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommits.operations
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommits.operations
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommits.operations
1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd";>
-<kcfg>
- <group name="allProjectsInfo">
- </group>
- <group name="topActiveProjects">
- </group>
- <group name="topProjectDevelopers">
- <entry name="project" type="String">
- <label>The project from which to acquire developers</label>
- </entry>
- </group>
- <group name="commitHistory">
- <entry name="project" type="String">
- <label>The project from which to acquire commits</label>
- </entry>
- </group>
-</kcfg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsengine.cpp
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsengine.cpp
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsengine.cpp
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsengine.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-/*************************************************************************
- * Copyright 2010 Sandro Andrade sandroandrade@xxxxxxx *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License or (at your option) version 3 or any later version *
- * accepted by the membership of KDE e.V. (or its successor approved *
- * by the membership of KDE e.V.), which shall act as a proxy *
- * defined in Section 14 of version 3 of the license. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- * ***********************************************************************/
-
-#include "kdecommitsengine.h"
-
-#include "kdepresets.h"
-#include "kdecommitsservice.h"
-
-K_EXPORT_PLASMA_DATAENGINE(kdecommits, KdeCommitsEngine)
-
-KdeCommitsEngine::KdeCommitsEngine(QObject *parent, const QVariantList &args)
-: Plasma::DataEngine(parent, args)
-{
-}
-
-void KdeCommitsEngine::init()
-{
- setData("topActiveProjects", "");
- setData("topProjectDevelopers", "");
- setData("commitHistory", "");
- setData("krazyReport", "");
-}
-
-bool KdeCommitsEngine::sourceRequestEvent (const QString &source)
-{
- if (source == "allProjectsInfo")
- {
- setData("allProjectsInfo", "views", KdePresets::viewsPreset());
- setData("allProjectsInfo", "viewsActive",
KdePresets::viewsActivePreset());
- setData("allProjectsInfo", "automaticallyInViews",
KdePresets::automaticallyInViews());
- setData("allProjectsInfo", "projectNames",
KdePresets::preset(KdePresets::ProjectName));
- setData("allProjectsInfo", "projectCommitSubjects",
KdePresets::preset(KdePresets::ProjectCommitSubject));
- setData("allProjectsInfo", "projectKrazyReports",
KdePresets::preset(KdePresets::ProjectKrazyReport));
- setData("allProjectsInfo", "projectKrazyFilePrefixes",
KdePresets::preset(KdePresets::ProjectKrazyFilePrefix));
- setData("allProjectsInfo", "projectIcons",
KdePresets::preset(KdePresets::ProjectIcon));
-
- return true;
- }
- return false;
-}
-
-Plasma::Service *KdeCommitsEngine::serviceForSource(const QString &source)
-{
- Q_UNUSED(source);
- KdeCommitsService *service = new KdeCommitsService(this);
- service->setParent(this);
- return service;
-}
-
-#include "kdecommitsengine.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsengine.h
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsengine.h
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsengine.h
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsengine.h
1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-/*************************************************************************
- * Copyright 2010 Sandro Andrade sandroandrade@xxxxxxx *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License or (at your option) version 3 or any later version *
- * accepted by the membership of KDE e.V. (or its successor approved *
- * by the membership of KDE e.V.), which shall act as a proxy *
- * defined in Section 14 of version 3 of the license. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- * ***********************************************************************/
-
-#ifndef KDECOMMITSENGINE_HEADER
-#define KDECOMMITSENGINE_HEADER
-
-#include <Plasma/DataEngine>
-
-class QNetworkReply;
-class CommitCollector;
-
-class KdeCommitsEngine : public Plasma::DataEngine
-{
- Q_OBJECT
-public:
- KdeCommitsEngine(QObject *parent, const QVariantList &args);
-
- void init();
-
- bool sourceRequestEvent (const QString &source);
- Plasma::Service *serviceForSource(const QString &source);
-
- friend class KdeCommitsService;
-
-Q_SIGNALS:
- void engineReady();
-};
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsservice.cpp
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsservice.cpp
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsservice.cpp
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsservice.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,153 +0,0 @@
-/*************************************************************************
- * Copyright 2009 Sandro Andrade sandroandrade@xxxxxxx *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License or (at your option) version 3 or any later version *
- * accepted by the membership of KDE e.V. (or its successor approved *
- * by the membership of KDE e.V.), which shall act as a proxy *
- * defined in Section 14 of version 3 of the license. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- * ***********************************************************************/
-
-#include "kdecommitsservice.h"
-
-#include <KUrl>
-#include <KIO/Job>
-#include <KIO/StoredTransferJob>
-
-#include "kdepresets.h"
-
-KdeCommitsService::KdeCommitsService(KdeCommitsEngine *engine)
-: Plasma::Service()
-{
- setName("kdecommits");
- m_engine = engine;
-}
-
-Plasma::ServiceJob *KdeCommitsService::createJob(const QString &operation,
QMap<QString, QVariant> ¶meters)
-{
- if (operation == "allProjectsInfo")
- allProjectsInfo();
- else if (operation == "topActiveProjects")
- topActiveProjects();
- else if (operation == "topProjectDevelopers")
- topProjectDevelopers(parameters["project"].toString());
- else if (operation == "commitHistory")
- commitHistory(parameters["project"].toString());
-
- return 0;
-}
-
-void KdeCommitsService::allProjectsInfo()
-{
- KIO::StoredTransferJob *job =
KIO::storedGet(KUrl("http://sandroandrade.org/servlets/KdeCommitsServlet?op=allProjectsInfo";),
KIO::NoReload, KIO::HideProgressInfo);
- connect(job, SIGNAL(result(KJob*)), this, SLOT(result(KJob*)));
-}
-
-void KdeCommitsService::topActiveProjects()
-{
- KIO::StoredTransferJob *job =
KIO::storedGet(KUrl("http://sandroandrade.org/servlets/KdeCommitsServlet?op=topActiveProjects&p0=0";),
KIO::NoReload, KIO::HideProgressInfo);
- connect(job, SIGNAL(result(KJob*)), this, SLOT(result(KJob*)));
-}
-
-void KdeCommitsService::topProjectDevelopers(const QString &project)
-{
- KIO::StoredTransferJob *job =
KIO::storedGet(KUrl("http://sandroandrade.org/servlets/KdeCommitsServlet?op=topProjectDevelopers&p0=";
+ project + "&p1=0"), KIO::NoReload, KIO::HideProgressInfo);
- connect(job, SIGNAL(result(KJob*)), this, SLOT(result(KJob*)));
-}
-
-void KdeCommitsService::commitHistory(const QString &project)
-{
- KIO::StoredTransferJob *job =
KIO::storedGet(KUrl("http://sandroandrade.org/servlets/KdeCommitsServlet?op=commitHistory&p0=";
+ project + "&p1=0"), KIO::NoReload, KIO::HideProgressInfo);
- connect(job, SIGNAL(result(KJob*)), this, SLOT(result(KJob*)));
-}
-
-void KdeCommitsService::result(KJob *job)
-{
- if (job->error())
- {
- kDebug() << "Job error:" << job->errorText();
- }
- else
- {
- KIO::StoredTransferJob *storedJob =
qobject_cast<KIO::StoredTransferJob*>(job);
-
- QString data (storedJob->data());
- QString url =
QUrl::fromPercentEncoding(storedJob->url().prettyUrl().toUtf8());
- QString mimeType = storedJob->mimetype();
-
- if (!data.isEmpty() && mimeType.contains("text/plain"))
- {
- QString project = "";
- QRegExp regexp("\\&p0=(.*)\\&p1");
- if (regexp.indexIn(url, 0) != -1)
- project = regexp.cap(1);
-
- if (url.contains("op=allProjectsInfo"))
- {
- KdePresets::init(data);
- emit engineReady();
- }
- else if (url.contains("op=topActiveProjects"))
- {
- RankValueMap topActiveProjects;
- foreach (QString row, data.split('\n'))
- {
- if (!row.isEmpty())
- {
- QStringList list = row.split(';');
- QString commits = list.at(1);
- topActiveProjects.insert(commits.remove('\r').toInt(),
list.at(0));
- }
- }
-
- m_engine->setData("topActiveProjects", "topActiveProjects",
QVariant::fromValue<RankValueMap>(topActiveProjects));
- }
- else if (url.contains("op=topProjectDevelopers"))
- {
- RankValueMap projectTopDevelopers;
- foreach (QString row, data.split('\n'))
- {
- if (!row.isEmpty())
- {
- QStringList list = row.split(';');
- QString commits = list.at(4);
-
projectTopDevelopers.insert(commits.remove('\r').toInt(), list.at(0));
- }
- }
-
- m_engine->setData("topProjectDevelopers", "project", project);
- m_engine->setData("topProjectDevelopers",
"topProjectDevelopers",
QVariant::fromValue<RankValueMap>(projectTopDevelopers));
- }
- else if (url.contains("op=commitHistory"))
- {
- DateCommitList commitHistory;
- foreach (QString row, data.split('\n'))
- {
- if (!row.isEmpty())
- {
- QStringList list = row.split(';');
- QString commits = list.at(1);
- commitHistory.append(QPair<QString, int>(list.at(0),
commits.remove('\r').toInt()));
- }
- }
-
- m_engine->setData("commitHistory", "project", project);
- m_engine->setData("commitHistory", "commitHistory",
QVariant::fromValue<DateCommitList>(commitHistory));
- }
- }
- else
- emit engineError();
- }
-}
-
-#include "kdecommitsservice.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsservice.h
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsservice.h
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdecommitsservice.h
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdecommitsservice.h
1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-/*************************************************************************
- * Copyright 2009 Sandro Andrade sandroandrade@xxxxxxx *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License or (at your option) version 3 or any later version *
- * accepted by the membership of KDE e.V. (or its successor approved *
- * by the membership of KDE e.V.), which shall act as a proxy *
- * defined in Section 14 of version 3 of the license. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- * ***********************************************************************/
-
-#ifndef KDECOMMITSSERVICE_HEADER
-#define KDECOMMITSSERVICE_HEADER
-
-#include "kdecommitsengine.h"
-
-#include <Plasma/Service>
-
-class KJob;
-
-namespace Plasma
-{
- class ServiceJob;
-}
-
-class KdeCommitsService : public Plasma::Service
-{
- Q_OBJECT
-public:
- KdeCommitsService(KdeCommitsEngine *engine);
- Plasma::ServiceJob *createJob(const QString &operation, QMap<QString,
QVariant> ¶meters);
-
-protected:
- void allProjectsInfo();
- void topActiveProjects();
- void topProjectDevelopers(const QString &project);
- void commitHistory(const QString &project);
-
-Q_SIGNALS:
- void engineReady();
- void engineError();
-
-protected slots:
- void result(KJob *job);
-
-private:
- KdeCommitsEngine *m_engine;
-};
-
-typedef QMultiMap<int, QString> RankValueMap;
-Q_DECLARE_METATYPE(RankValueMap)
-
-typedef QList< QPair<QString, int> > DateCommitList;
-Q_DECLARE_METATYPE(DateCommitList)
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdepresets.cpp
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdepresets.cpp
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdepresets.cpp
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdepresets.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-/*************************************************************************
- * Copyright 2009 Sandro Andrade sandroandrade@xxxxxxx *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License or (at your option) version 3 or any later version *
- * accepted by the membership of KDE e.V. (or its successor approved *
- * by the membership of KDE e.V.), which shall act as a proxy *
- * defined in Section 14 of version 3 of the license. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- * ***********************************************************************/
-
-#include "kdepresets.h"
-
-#include <KLocale>
-
-QList<QStringList> KdePresets::presets;
-
-void KdePresets::init(const QString &data)
-{
- if (!data.isEmpty())
- {
- foreach (QString row, data.split('\n'))
- {
- if (!row.isEmpty())
- {
- QStringList list;
- foreach (QString token, row.split(';'))
- list << token.remove('\r');
- presets << list;
- }
- }
- }
-}
-
-QStringList KdePresets::preset(PresetInfo info)
-{
- QStringList list;
- int count = presets.count();
- for (int i = 0; i < count; ++i)
- list << presets.at(i).at(info);
- return list;
-}
-
-QList<QVariant> KdePresets::automaticallyInViews()
-{
- QList<QVariant> list;
- int count = presets.count();
- for (int i = 0; i < count; ++i)
- list << ((presets.at(i).last() == "false") ? false:true);
-
- return list;
-}
-
-QStringList KdePresets::viewsPreset()
-{
- return QStringList() << i18n("Top Active Projects") << i18n("Commit
History") << i18n("Top Developers") << i18n("Krazy Report");
-}
-
-QList<QVariant> KdePresets::viewsActivePreset()
-{
- return QList<QVariant>() << true << true << true << true;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdepresets.h
new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdepresets.h
--- old/kdeplasma-addons-4.6.1/dataengines/kdecommits/src/kdepresets.h
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/dataengines/kdecommits/src/kdepresets.h
1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-/*************************************************************************
- * Copyright 2009 Sandro Andrade sandroandrade@xxxxxxx *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License or (at your option) version 3 or any later version *
- * accepted by the membership of KDE e.V. (or its successor approved *
- * by the membership of KDE e.V.), which shall act as a proxy *
- * defined in Section 14 of version 3 of the license. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- * ***********************************************************************/
-
-#ifndef KDEPRESETS_HEADER
-#define KDEPRESETS_HEADER
-
-#include <QStringList>
-
-class KdePresets
-{
-public:
- static void init(const QString &data);
-
- enum PresetInfo
- {
- ProjectName = 0,
- ProjectCommitSubject,
- ProjectKrazyReport,
- ProjectKrazyFilePrefix,
- ProjectIcon
- };
-
- static QStringList preset(PresetInfo info);
- static QList<QVariant> automaticallyInViews();
- static QStringList viewsPreset();
- static QList<QVariant> viewsActivePreset();
-
-private:
- static QList<QStringList> presets;
-};
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/dataengines/kdeobservatory/plasma-engine-kdeobservatory.desktop
new/kdeplasma-addons-4.6.2/dataengines/kdeobservatory/plasma-engine-kdeobservatory.desktop
---
old/kdeplasma-addons-4.6.1/dataengines/kdeobservatory/plasma-engine-kdeobservatory.desktop
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/dataengines/kdeobservatory/plasma-engine-kdeobservatory.desktop
2011-03-31 22:45:48.000000000 +0200
@@ -24,7 +24,7 @@
Name[pl]=Silnik danych Obserwatorium KDE
Name[pt]=Motor de Dados do Observatório do KDE
Name[pt_BR]=Mecanismo de dados do observatório do KDE
-Name[ru]=Поставщик данных для виджета статистики разработки KDE
+Name[ru]=Поставщик данных для обсерватории KDE
Name[sk]=Dátový nástroj observatória KDE
Name[sl]=Podatkovni pogon Opazovanje KDE-ja
Name[sr]=Датомотор опсерваторије КДЕ‑а
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/audioplayercontrol/audioplayercontrolrunner.cpp
new/kdeplasma-addons-4.6.2/runners/audioplayercontrol/audioplayercontrolrunner.cpp
---
old/kdeplasma-addons-4.6.1/runners/audioplayercontrol/audioplayercontrolrunner.cpp
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/runners/audioplayercontrol/audioplayercontrolrunner.cpp
2011-03-31 22:46:03.000000000 +0200
@@ -23,7 +23,6 @@
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusMetaType>
#include <QtDBus/QDBusPendingReply>
-#include <QtDBus/QDBusPendingCallWatcher>
#include <QtDBus/QDBusMessage>
#include <KDE/KMessageBox>
@@ -68,22 +67,10 @@
void AudioPlayerControlRunner::prep()
{
- m_running = false;
- m_songsInPlaylist = 0;
- m_currentTrack = -1;
- m_nextSongAvailable = false;
- m_prevSongAvailable = false;
-
- QDBusInterface player(QString::fromLatin1( "org.mpris.%1").arg(m_player),
QLatin1String( "/TrackList" ), QLatin1String( "org.freedesktop.MediaPlayer" ));
- QDBusPendingCall call = player.asyncCall(QLatin1String( "GetLength" ));
- QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
- QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
- this, SLOT(songsInPlaylist(QDBusPendingCallWatcher*)));
-
- call = player.asyncCall(QLatin1String( "GetCurrentTrack" ));
- watcher = new QDBusPendingCallWatcher(call, this);
- QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
- this,
SLOT(prevNextSongAvailable(QDBusPendingCallWatcher*)));
+ m_running = playerRunning();
+ m_songsInPlaylist = songsInPlaylist();
+ m_nextSongAvailable = nextSongAvailable();
+ m_prevSongAvailable = prevSongAvailable();
}
void AudioPlayerControlRunner::match(Plasma::RunnerContext &context)
@@ -392,7 +379,8 @@
bool AudioPlayerControlRunner::playerRunning() const
{
- return m_running;
+ QDBusInterface intf(QString::fromLatin1( "org.mpris.%1").arg(m_player),
QLatin1String( "/" ));
+ return intf.isValid();
}
bool AudioPlayerControlRunner::startPlayer() const
@@ -404,7 +392,7 @@
if (!KRun::run(m_player, KUrl::List(), 0)) {
//We couldn't start the player
KMessageBox::error(0, i18n("%1 not found", m_player),
- i18n("%1 was not found so the runner is unable to
work.", m_player));
+ i18n("%1 was not found so the runner is unable to
work.",m_player));
return false;
}
@@ -418,51 +406,43 @@
int AudioPlayerControlRunner::posInPlaylist(const KUrl& url)
{
QDBusInterface player(QString::fromLatin1( "org.mpris.%1").arg(m_player),
QLatin1String( "/TrackList" ), QLatin1String( "org.freedesktop.MediaPlayer" ));
- for (int i = 0; i < m_songsInPlaylist; i++) {
+ for (int i = 0; i < songsInPlaylist(); i++)
+ {
QDBusPendingReply<QVariantMap> data = player.asyncCall(QLatin1String(
"GetMetadata" ), i);
KUrl curl =
KUrl(KUrl::fromPercentEncoding(data.value().value(QLatin1String( "location"
)).toByteArray()));
kDebug() << curl << ":" << url;
- if (curl == url) {
+ if (curl == url)
+ {
return i;
}
}
return -1;
}
-void AudioPlayerControlRunner::songsInPlaylist(QDBusPendingCallWatcher *call)
+int AudioPlayerControlRunner::songsInPlaylist() const
{
- QDBusPendingReply<int> reply = *call;
- m_running = !reply.isError();
-
- if (m_running) {
- m_songsInPlaylist = reply.value();
- if (m_currentTrack > -1) {
- // calculate if the next song is available given the new count
- m_nextSongAvailable = m_songsInPlaylist > m_currentTrack;
- }
- } else {
- m_songsInPlaylist = 0;
- }
-
- call->deleteLater();
+ QDBusInterface player(QString::fromLatin1( "org.mpris.%1").arg(m_player),
QLatin1String( "/TrackList" ), QLatin1String( "org.freedesktop.MediaPlayer" ));
+ QDBusPendingReply<int> length = player.asyncCall(QLatin1String(
"GetLength" ));
+ length.waitForFinished();
+ return length.value();
}
-void AudioPlayerControlRunner::prevNextSongAvailable(QDBusPendingCallWatcher
*call)
+bool AudioPlayerControlRunner::nextSongAvailable() const
{
- QDBusPendingReply<int> reply = *call;
- m_running = !reply.isError();
-
- if (m_running) {
- m_currentTrack = reply.value();
- if (m_songsInPlaylist > 0) {
- m_nextSongAvailable = m_songsInPlaylist > m_currentTrack;
- m_prevSongAvailable = m_currentTrack > 0;
- }
- } else {
- m_currentTrack = 0;
- }
+ QDBusInterface player(QString::fromLatin1( "org.mpris.%1").arg(m_player),
QLatin1String( "/TrackList" ), QLatin1String( "org.freedesktop.MediaPlayer" ));
+ QDBusPendingReply<int> length = player.asyncCall(QLatin1String(
"GetLength" ));
+ QDBusPendingReply<int> current = player.asyncCall(QLatin1String(
"GetCurrentTrack" ));
+ length.waitForFinished();
+ current.waitForFinished();
+ return !((length.value() - 1) == current.value());
+}
- call->deleteLater();
+bool AudioPlayerControlRunner::prevSongAvailable() const
+{
+ QDBusInterface player(QString::fromLatin1( "org.mpris.%1").arg(m_player),
QLatin1String( "/TrackList" ), QLatin1String( "org.freedesktop.MediaPlayer" ));
+ QDBusPendingReply<int> current = player.asyncCall(QLatin1String(
"GetCurrentTrack" ));
+ current.waitForFinished();
+ return current.value() > 0;
}
bool AudioPlayerControlRunner::equals(const QString &text, QRegExp reg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/audioplayercontrol/audioplayercontrolrunner.h
new/kdeplasma-addons-4.6.2/runners/audioplayercontrol/audioplayercontrolrunner.h
---
old/kdeplasma-addons-4.6.1/runners/audioplayercontrol/audioplayercontrolrunner.h
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/runners/audioplayercontrol/audioplayercontrolrunner.h
2011-03-31 22:46:03.000000000 +0200
@@ -24,8 +24,6 @@
#include <KIcon>
-class QDBusPendingCallWatcher;
-
class AudioPlayerControlRunner : public Plasma::AbstractRunner
{
Q_OBJECT
@@ -71,6 +69,15 @@
* @return the position of the song, -1 if the song is not in it
*/
int posInPlaylist(const KUrl& url);
+
+ /** @return the number of the songs in the playlist */
+ int songsInPlaylist() const;
+
+ /** @return @c true if there's a next song, @c false in any other case */
+ bool nextSongAvailable() const;
+
+ /** @return @c true if there's a previous song, @c false in any other case
*/
+ bool prevSongAvailable() const;
/** Tests, if text and reg match
* @param text the string
@@ -100,8 +107,6 @@
private slots:
void prep();
- void songsInPlaylist(QDBusPendingCallWatcher *call);
- void prevNextSongAvailable(QDBusPendingCallWatcher *call);
private:
/** The player this runner controls */
@@ -139,12 +144,6 @@
/** How much to decrease */
int m_decreaseBy;
- /** The number of songs in the playlist */
- int m_songsInPlaylist;
-
- /** The current track, as set on prep */
- int m_currentTrack;
-
/** Search the collection */
bool m_searchCollection : 1;
@@ -154,6 +153,9 @@
/** The running state of the player */
bool m_running : 1;
+ /** The number of songs in the playlist */
+ int m_songsInPlaylist : 1;
+
/** @c true if a next song is available */
bool m_nextSongAvailable : 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop
new/kdeplasma-addons-4.6.2/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop
---
old/kdeplasma-addons-4.6.1/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop
2011-03-31 22:46:03.000000000 +0200
@@ -2,7 +2,6 @@
Name=Control Audio Player
Name[ca]=Control del reproductor d'àudio
Name[ca@valencia]=Control del reproductor d'àudio
-Name[cs]=Ovládat zvukový přehrávač
Name[da]=Betjening af lydafspiller
Name[de]=Medienwiedergabe steuern
Name[el]=Έλεγχος του αναπαραγωγέα ήχου
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/characters/CMakeLists.txt
new/kdeplasma-addons-4.6.2/runners/characters/CMakeLists.txt
--- old/kdeplasma-addons-4.6.1/runners/characters/CMakeLists.txt
2011-02-25 23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/runners/characters/CMakeLists.txt
2011-03-31 22:46:03.000000000 +0200
@@ -17,7 +17,6 @@
# Now make sure all files get to the right place
kde4_add_plugin(krunner_charrunner ${krunner_charrunner_SRCS})
target_link_libraries(krunner_charrunner ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
-add_dependencies(krunner_charrunner kcm_krunner_charrunner)
# Install the library and .desktop file
install(TARGETS krunner_charrunner kcm_krunner_charrunner DESTINATION
${PLUGIN_INSTALL_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kdeplasma-addons-4.6.1/runners/events/CMakeLists.txt
new/kdeplasma-addons-4.6.2/runners/events/CMakeLists.txt
--- old/kdeplasma-addons-4.6.1/runners/events/CMakeLists.txt 2011-02-25
23:49:36.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/runners/events/CMakeLists.txt 2011-03-31
22:46:04.000000000 +0200
@@ -11,7 +11,6 @@
kde4_add_plugin(plasma_runner_events ${events_SRCS})
target_link_libraries(plasma_runner_events ${KDE4_PLASMA_LIBS}
${KDE4_KDEUI_LIBS} ${KDE4_AKONADI_LIBS} ${KDEPIMLIBS_KCAL_LIBS})
-add_dependencies(plasma_runner_events kcm_plasma_runner_events)
# Config module
set(kcm_events_SRCS events_config.cpp collection_selector.cpp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/events/plasma-runner-events.desktop
new/kdeplasma-addons-4.6.2/runners/events/plasma-runner-events.desktop
--- old/kdeplasma-addons-4.6.1/runners/events/plasma-runner-events.desktop
2011-02-25 23:49:51.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/runners/events/plasma-runner-events.desktop
2011-03-31 22:46:04.000000000 +0200
@@ -29,7 +29,6 @@
Name[sr@ijekavianlatin]=događaji kalendara
Name[sr@latin]=događaji kalendara
Name[sv]=Kalenderhändelser
-Name[tr]=Takvim Olayları
Name[uk]=Події календаря
Name[wa]=Evenmints do calindrî
Name[x-test]=xxCalendar Eventsxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/events/plasma-runner-events_config.desktop
new/kdeplasma-addons-4.6.2/runners/events/plasma-runner-events_config.desktop
---
old/kdeplasma-addons-4.6.1/runners/events/plasma-runner-events_config.desktop
2011-02-25 23:49:51.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/runners/events/plasma-runner-events_config.desktop
2011-03-31 22:46:04.000000000 +0200
@@ -29,7 +29,6 @@
Name[sr@ijekavianlatin]=događaji kalendara
Name[sr@latin]=događaji kalendara
Name[sv]=Kalenderhändelser
-Name[tr]=Takvim Olayları
Name[uk]=Події календаря
Name[wa]=Evenmints do calindrî
Name[x-test]=xxCalendar Eventsxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/kopete/plasma-runner-kopete.desktop
new/kdeplasma-addons-4.6.2/runners/kopete/plasma-runner-kopete.desktop
--- old/kdeplasma-addons-4.6.1/runners/kopete/plasma-runner-kopete.desktop
2011-02-25 23:49:51.000000000 +0100
+++ new/kdeplasma-addons-4.6.2/runners/kopete/plasma-runner-kopete.desktop
2011-03-31 22:46:04.000000000 +0200
@@ -31,7 +31,6 @@
Name[sr@ijekavianlatin]=Kopeteovi kontakti
Name[sr@latin]=Kopeteovi kontakti
Name[sv]=Kopete kontakter
-Name[tr]=Kopete Kişileri
Name[uk]=Контакти Kopete
Name[x-test]=xxKopete Contactsxx
Name[zh_TW]=Kopete 聯絡人
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/runners/spellchecker/plasma-runner-spellchecker.desktop
new/kdeplasma-addons-4.6.2/runners/spellchecker/plasma-runner-spellchecker.desktop
---
old/kdeplasma-addons-4.6.1/runners/spellchecker/plasma-runner-spellchecker.desktop
2011-02-25 23:49:51.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/runners/spellchecker/plasma-runner-spellchecker.desktop
2011-03-31 22:46:04.000000000 +0200
@@ -30,7 +30,6 @@
Name[sr@ijekavianlatin]=pravopisar
Name[sr@latin]=pravopisar
Name[sv]=Stavningskontroll
-Name[tr]=Yazım Denetleyici
Name[uk]=Перевірка правопису
Name[wa]=Coridjrece ortografike
Name[x-test]=xxSpell Checkerxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kdeplasma-addons-4.6.1/wallpapers/pattern/plasma-wallpaper-pattern.desktop
new/kdeplasma-addons-4.6.2/wallpapers/pattern/plasma-wallpaper-pattern.desktop
---
old/kdeplasma-addons-4.6.1/wallpapers/pattern/plasma-wallpaper-pattern.desktop
2011-02-25 23:49:36.000000000 +0100
+++
new/kdeplasma-addons-4.6.2/wallpapers/pattern/plasma-wallpaper-pattern.desktop
2011-03-31 22:46:03.000000000 +0200
@@ -32,7 +32,7 @@
Name[pt]=Padrão
Name[pt_BR]=Padrão
Name[ro]=Model
-Name[ru]=Орнамент
+Name[ru]=Орнамент
Name[sk]=Vzorka
Name[sl]=Vzorec
Name[sr]=образац
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |