Hello community,
here is the log from the commit of package kdesdk4
checked in at Mon Sep 29 17:53:01 CEST 2008.
--------
--- KDE/kdesdk4/kdesdk4.changes 2008-08-28 12:36:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes 2008-09-25 19:01:23.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 25 19:01:15 CEST 2008 - dmueller@suse.de
+
+- update to 4.1.2
+ * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php
+
+-------------------------------------------------------------------
Old:
----
kdesdk-4.1.1.tar.bz2
New:
----
kdesdk-4.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.r21461/_old 2008-09-29 17:52:48.000000000 +0200
+++ /var/tmp/diff_new_pack.r21461/_new 2008-09-29 17:52:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdesdk4 (Version 4.1.1)
+# spec file for package kdesdk4 (Version 4.1.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
Group: System/GUI/KDE
Summary: KDE SDK Package
Url: http://www.kde.org/
-Version: 4.1.1
+Version: 4.1.2
Release: 1
Source0: kdesdk-%version.tar.bz2
Source1: _upstream
@@ -510,6 +510,9 @@
/usr/share/strigi/fieldproperties/strigi_translation.fieldproperties
%changelog
+* Thu Sep 25 2008 dmueller@suse.de
+- update to 4.1.2
+ * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php
* Thu Aug 28 2008 dmueller@suse.de
- update to 4.1.1
* see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php
++++++ 4_1_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.r21461/_old 2008-09-29 17:52:48.000000000 +0200
+++ /var/tmp/diff_new_pack.r21461/_new 2008-09-29 17:52:48.000000000 +0200
@@ -1,7 +1,15 @@
-package: kdesdk-4.1.1.tar.bz2
+package: kdesdk-4.1.2.tar.bz2
kdemod: kdesdk
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 853806
-+svn di between //tags/KDE/4.1.1/kdesdk and //tags/KDE/4.1.1/kdesdk
++current HEAD:
++svn di between //tags/KDE/4.1.2/kdesdk and //branches/KDE/4.1/kdesdk
+
+Eigenschaftsänderungen: .
+___________________________________________________________________
+Gelöscht: svn:mergeinfo
+Hinzugefügt: svn:externals
+ +
+
+
++++++ kdesdk-4.1.1.tar.bz2 -> kdesdk-4.1.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/cervisia/version.h new/kdesdk-4.1.2/cervisia/version.h
--- old/kdesdk-4.1.1/cervisia/version.h 2008-08-28 10:07:27.000000000 +0200
+++ new/kdesdk-4.1.2/cervisia/version.h 2008-09-25 14:03:36.000000000 +0200
@@ -1,3 +1,3 @@
#ifndef CERVISIA_VERSION
-#define CERVISIA_VERSION "3.1.1"
+#define CERVISIA_VERSION "3.1.2"
#endif // CERVISIA_VERSION
Files old/kdesdk-4.1.1/doc/cervisia/index.cache.bz2 and new/kdesdk-4.1.2/doc/cervisia/index.cache.bz2 differ
Files old/kdesdk-4.1.1/doc/kapptemplate/index.cache.bz2 and new/kdesdk-4.1.2/doc/kapptemplate/index.cache.bz2 differ
Files old/kdesdk-4.1.1/doc/kate/index.cache.bz2 and new/kdesdk-4.1.2/doc/kate/index.cache.bz2 differ
Files old/kdesdk-4.1.1/doc/kate-plugins/index.cache.bz2 and new/kdesdk-4.1.2/doc/kate-plugins/index.cache.bz2 differ
Files old/kdesdk-4.1.1/doc/kbugbuster/index.cache.bz2 and new/kdesdk-4.1.2/doc/kbugbuster/index.cache.bz2 differ
Files old/kdesdk-4.1.1/doc/kcachegrind/index.cache.bz2 and new/kdesdk-4.1.2/doc/kcachegrind/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/doc/kcachegrind/index.docbook new/kdesdk-4.1.2/doc/kcachegrind/index.docbook
--- old/kdesdk-4.1.1/doc/kcachegrind/index.docbook 2008-05-29 13:19:27.000000000 +0200
+++ new/kdesdk-4.1.2/doc/kcachegrind/index.docbook 2008-09-25 14:03:33.000000000 +0200
@@ -33,12 +33,12 @@
</authorgroup>
<copyright>
-<year>2002-2004</year>
+<year>2002-2007</year>
<holder>&Josef.Weidendorfer;</holder>
</copyright>
<legalnotice>&FDLNotice;</legalnotice>
-<date>2004-07-27</date>
+<date>2007-01-15</date>
<releaseinfo>0.4.6</releaseinfo>
<abstract>
@@ -647,7 +647,7 @@
<keycombo>&Ctrl;<keycap>O</keycap></keycombo>
</shortcut>
<guimenu>File</guimenu>
-<guimenuitem>Open</guimenuitem>
+<guimenuitem>Open...</guimenuitem>
</menuchoice></term>
<listitem><para><action>
Pops up the File Open Dialog to choose a profile data file to be loaded.
@@ -665,7 +665,16 @@
<varlistentry>
<term><menuchoice>
<guimenu>File</guimenu>
-<guimenuitem>Add</guimenuitem>
+<guisubmenu>Open Recent</guisubmenu>
+</menuchoice></term>
+<listitem><para>
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Add...</guimenuitem>
</menuchoice></term>
<listitem><para><action>
Adds a profile data file to the current window.
@@ -676,6 +685,8 @@
<varlistentry>
<term><menuchoice>
+<shortcut><keycap>F5</keycap>
+</shortcut>
<guimenu>File</guimenu>
<guimenuitem>Reload</guimenuitem>
</menuchoice></term>
@@ -689,6 +700,25 @@
<varlistentry>
<term><menuchoice>
<shortcut>
+<keycombo>&Ctrl;&Shift;<keycap>Z</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Force Dump</guimenuitem>
+</menuchoice></term>
+<listitem><para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Export Graph</guimenuitem>
+</menuchoice></term>
+<listitem><para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
<keycombo>&Ctrl;<keycap>Q</keycap></keycombo>
</shortcut>
<guimenu>File</guimenu>
@@ -709,7 +739,7 @@
<varlistentry>
<term><menuchoice>
<guimenu>View</guimenu>
-<guimenuitem>Primary Event Type</guimenuitem>
+<guisubmenu>Primary Event Type</guisubmenu>
</menuchoice></term>
<listitem><para><action>(To-do)</action></para></listitem>
</varlistentry>
@@ -717,7 +747,7 @@
<varlistentry>
<term><menuchoice>
<guimenu>View</guimenu>
-<guimenuitem>Secondary Event Type</guimenuitem>
+<guisubmenu>Secondary Event Type</guisubmenu>
</menuchoice></term>
<listitem><para><action>(To-do)</action></para></listitem>
</varlistentry>
@@ -725,7 +755,7 @@
<varlistentry>
<term><menuchoice>
<guimenu>View</guimenu>
-<guimenuitem>Grouping</guimenuitem>
+<guisubmenu>Grouping</guisubmenu>
</menuchoice></term>
<listitem><para><action>(To-do)</action></para></listitem>
</varlistentry>
@@ -733,7 +763,7 @@
<varlistentry>
<term><menuchoice>
<guimenu>View</guimenu>
-<guimenuitem>Layout</guimenuitem>
+<guisubmenu>Layout</guisubmenu>
</menuchoice></term>
<listitem><para><action>(To-do)</action></para></listitem>
</varlistentry>
@@ -746,12 +776,90 @@
<listitem><para><action>(To-do)</action></para></listitem>
</varlistentry>
+<varlistentry>
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Split Horizontal</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Show Absolute Costs</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Percentage Relative to Parent</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Skip Cycle Detection</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
+</varlistentry>
+
+</variablelist>
+</para>
+
+</sect2>
+
+<sect2>
+<title>The <guimenu>Go</guimenu> Menu</title>
+<para>
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Go</guimenu>
+<guimenuitem></guimenuitem>
+</menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
+</varlistentry>
+
+</variablelist>
+</para>
+
+</sect2>
+
+
+<sect2>
+<title>The <guimenu>Settings</guimenu> Menu</title>
+<para>
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem></guimenuitem>
+</menuchoice></term>
+<listitem><para><action>(To-do)</action></para></listitem>
+</varlistentry>
+
</variablelist>
</para>
</sect2>
+<sect2>
+<title>The <guimenu>Help</guimenu> Menu</title>
+
+&help.menu.documentation;
+
+</sect2>
+
+
+
</sect1>
</chapter>
Files old/kdesdk-4.1.1/doc/kompare/index.cache.bz2 and new/kdesdk-4.1.2/doc/kompare/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/doc/kompare/index.docbook new/kdesdk-4.1.2/doc/kompare/index.docbook
--- old/kdesdk-4.1.1/doc/kompare/index.docbook 2008-01-05 00:57:52.000000000 +0100
+++ new/kdesdk-4.1.2/doc/kompare/index.docbook 2008-09-25 14:03:36.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kompare;">
- <!ENTITY version "3.4">
+ <!ENTITY version "3.5.1">
<!ENTITY package "kdesdk">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
@@ -25,8 +25,8 @@
<legalnotice>&FDLNotice;</legalnotice>
-<date>2007-01-20</date>
-<releaseinfo>3.4</releaseinfo>
+<date>2008-07-31</date>
+<releaseinfo>&version;</releaseinfo>
<!-- Abstract about this handbook -->
@@ -217,7 +217,7 @@
<varlistentry>
<term>Statusbar Toggle</term>
<listitem>
-<para>The status bar of the view panel can be toggled ON/OFF by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Hide/Show Statusbar</guimenuitem></menuchoice>.</para>
+<para>The status bar of the view panel can be toggled on and off by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Statusbar</guimenuitem></menuchoice>.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -551,12 +551,14 @@
output is more compact than that of context as it omits redundant context lines.</para>
</listitem>
</varlistentry>
+<!-- not in 3.5.1
<varlistentry>
<term><guilabel>Side-by-side</guilabel></term>
<listitem>
<para>Use the side by side output format which displays files listed in two columns with a gutter between them. This option is only available from the <guilabel>Diff Options</guilabel> dialog (see <xref linkend="creating-a-diff"/>).</para>
</listitem>
</varlistentry>
+-->
</variablelist>
<variablelist>
<title>Lines of Context</title>
@@ -599,7 +601,6 @@
</varlistentry>
</variablelist>
<variablelist>
-<title>Ignore regexp</title>
<varlistentry>
<term><guilabel>Ignore regexp</guilabel></term>
<listitem><para>Ignore lines matching a regular expression.</para></listitem>
@@ -714,7 +715,7 @@
</varlistentry>
<varlistentry>
-<term><menuchoice><guimenu>File</guimenu><guimenuitem>Save .diff</guimenuitem></menuchoice></term>
+<term><menuchoice><guimenu>File</guimenu><guimenuitem>Save .diff...</guimenuitem></menuchoice></term>
<listitem><para>Displays the <guilabel>Diff Options</guilabel> dialog to define diff format and options.</para></listitem>
</varlistentry>
@@ -817,11 +818,11 @@
<title>The <guimenu>Settings</guimenu> Menu</title>
<variablelist>
<varlistentry>
-<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Hide/Show Toolbar</guimenuitem></menuchoice></term>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Toolbar</guimenuitem></menuchoice></term>
<listitem><para>Toggle the toolbar display ON/OFF.</para></listitem>
</varlistentry>
<varlistentry>
-<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show/Hide Statusbar</guimenuitem></menuchoice></term>
+<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Statusbar</guimenuitem></menuchoice></term>
<listitem><para>Toggle the status bar display ON/OFF.</para></listitem>
</varlistentry>
<varlistentry>
Files old/kdesdk-4.1.1/doc/lokalize/index.cache.bz2 and new/kdesdk-4.1.2/doc/lokalize/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/doc/lokalize/index.docbook new/kdesdk-4.1.2/doc/lokalize/index.docbook
--- old/kdesdk-4.1.1/doc/lokalize/index.docbook 2008-07-03 07:06:02.000000000 +0200
+++ new/kdesdk-4.1.2/doc/lokalize/index.docbook 2008-09-25 14:03:36.000000000 +0200
@@ -67,9 +67,9 @@
<para>
It is recommended that you get used to the keyboard shortcuts instead of the
menus and toolbars for increased productivity. For example, use the
-<keycombo><keycap>Alt</keycap><keycap>_</keycap></keycombo> to switch between
+<keycombo>&Alt;<keycap>_</keycap></keycombo> to switch between
views when they are stacked into tabs, or
-<keycombo><keycap>Alt</keycap><keycap>Q</keycap></keycombo> to initiate a query
+<keycombo>&Alt;<keycap>Q</keycap></keycombo> to initiate a query
when in the <guilabel>WebQueries</guilabel>.
</para>
</tip>
@@ -97,7 +97,7 @@
</note>
-<sect1 id="projectView">
+<sect1 id="project-view">
<title>Project View</title>
<para>
@@ -130,7 +130,7 @@
pressing the <keycap>F3</keycap> button to find the next match. If you press the
<keycap>F3</keycap> button and there are no matches left in the current file,
then the search will continue in the next file and so on. To reset the multiple
-file search state, press <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> in &lokalize;, and the editor
+file search state, press <keycombo>&Ctrl;<keycap>F</keycap></keycombo> in &lokalize;, and the editor
window will reset.
</para>
</sect1>
@@ -164,14 +164,14 @@
folder with translation files from say Dolphin into the view,
and then, within five minutes, translation suggestions will be shown automatically on the message entry switch.
To insert the translation suggestions into the file, use
-<keycombo><keycap>Ctrl</keycap><keycap>1</keycap></keycombo>,
-<keycombo><keycap>Ctrl</keycap><keycap>2</keycap></keycombo> and so on, depending on the number of suggestion.
+<keycombo>&Ctrl;<keycap>1</keycap></keycombo>,
+<keycombo>&Ctrl;<keycap>2</keycap></keycombo> and so on, depending on the number of suggestion.
</para>
</chapter>
<chapter id="sync">
-<title>Synchronization capabilities</title>
+<title>Translation Synchronization Capabilities</title>
<para>
The <guilabel>Sync Mode</guilabel> (previously known as <guilabel>Merge Mode</guilabel>)
@@ -191,7 +191,7 @@
any subsequent changes made to this entry will be replicated back to auxiliary file.
</para>
-<sect1 id="FileMerge">
+<sect1 id="file-merge">
<title>Merging</title>
<para>
One use of <guilabel>Sync Mode</guilabel> is reviewing changes made by (new)
@@ -199,13 +199,25 @@
</para>
<para>
Open a base file, then drop its changed version into the <guilabel>Primary Sync</guilabel> view,
-followed by <keycombo><keycap>Alt</keycap><keycap>Down</keycap></keycombo> or <keycombo><keycap>Alt</keycap>
+followed by <keycombo>&Alt;<keycap>Down</keycap></keycombo> or <keycombo>&Alt;
<keycap>Up</keycap></keycombo> (remember that shortcuts may be modified in a usual way for all &kde; apps)
to navigate through entries that are different.
</para>
+<screenshot>
+<screeninfo>&lokalize; used for merging changes in translation</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="sync.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>&lokalize; used for merging changes in translation</phrase>
+ </textobject>
+ </mediaobject>
+</screenshot>
+
</sect1>
-<sect1 id="FileSync">
+<sect1 id="file-sync">
<title>Synchronization</title>
<para>
<guilabel>Sync Mode</guilabel> may also be used to make changes to translation for
@@ -217,12 +229,43 @@
they will automatically be replicated to the branch
(of course, if it contains the same english string).
</para>
+<para>
+For example, if you work on KDE translation, you can checkout trunk to <filename class="directory">/home/xx/hacking/kde/trunk/l10n-kde4/YOUR_LANG</filename>
+and branch to <filename class="directory">/home/xx/hacking/kde/branches/stable/l10n-kde4/YOUR_LANG</filename>.
+Create Lokalize project: <filename>/home/xx/hacking/kde/trunk/l10n-kde4/YOUR_LANG/project.ktp</filename> and
+set <filename class="directory">BranchDir=../../../branches/stable/l10n-kde4/YOUR_LANG</filename>, then work via this project,
+and commit changes in both trunk and branch dirs.
+</para>
</sect1>
+<sect1 id="original-diff">
+<title>Original Diff</title>
+<para>
+When original text changes, gettext tools update translation files and mark entries with changed original text as <emphasis>fuzzy</emphasis> (or <emphasis>non-approved</emphasis> in other terminology).
+They store previous original text so that translators could see what changes exactly were made.
+Lokalize simplifies life of translator and highlights parts of original text that were changed in <guilabel>Original Diff</guilabel> view.
+</para>
+
+<screenshot>
+<screeninfo>&lokalize; highlighting parts of original text that were changed since translation was last reviewed</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="original-diff.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>&lokalize; highlighting parts of original text that were changed since translation was last reviewed</phrase>
+ </textobject>
+ </mediaobject>
+</screenshot>
+
+
+</sect1>
+
</chapter>
-<chapter id="webQuery">
+<!--
+<chapter id="WebQuery">
<title>WebQuery</title>
<para>
@@ -234,7 +277,7 @@
url="http://websvn.kde.org/trunk/l10n-kde4/ru/" />.
</para>
</chapter>
-
+-->
<chapter id="credits">
<title>Credits and License</title>
@@ -261,7 +304,7 @@
<itemizedlist>
<listitem>
<para>
-Nick Shaforostoff <email>shaforostoff@kde.ru</email>
+Nick Shaforostoff <email>shaforostoff AT kde.ru</email>
</para>
</listitem>
</itemizedlist>
Files old/kdesdk-4.1.1/doc/lokalize/original-diff.png and new/kdesdk-4.1.2/doc/lokalize/original-diff.png differ
Files old/kdesdk-4.1.1/doc/lokalize/sync.png and new/kdesdk-4.1.2/doc/lokalize/sync.png differ
Files old/kdesdk-4.1.1/doc/scripts/kdesvn-build/index.cache.bz2 and new/kdesdk-4.1.2/doc/scripts/kdesvn-build/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/doc/scripts/kdesvn-build/index.docbook new/kdesdk-4.1.2/doc/scripts/kdesvn-build/index.docbook
--- old/kdesdk-4.1.1/doc/scripts/kdesvn-build/index.docbook 2008-01-29 10:18:05.000000000 +0100
+++ new/kdesdk-4.1.2/doc/scripts/kdesvn-build/index.docbook 2008-09-25 14:03:33.000000000 +0200
@@ -92,8 +92,8 @@
<legalnotice>&FDLNotice;</legalnotice>
-<date>2008-01-14</date>
-<releaseinfo>1.6</releaseinfo>
+<date>2008-08-09</date>
+<releaseinfo>1.6.3</releaseinfo>
<abstract>
<para>&kdesvn-build; is a script which builds and installs &kde; directly from the sources found in the &kde; &subversion; repository.</para>
@@ -195,11 +195,12 @@
<para>Here is a list of some of the things you will need:</para>
<itemizedlist>
-<listitem><para>&automake; version 1.7, or higher. (&kde; 3 only)</para></listitem>
+<listitem><para>If you are building &kde; 3, you will need the GNU Autotools (i.e. &automake;
+and &autoconf;).</para></listitem>
-<listitem><para>&autoconf; version 2.57, or higher. (&kde; 3 only)</para></listitem>
-
-<listitem><para>&cmake; 2.4.7, or higher.</para></listitem>
+<listitem><para>If you are building &kde; 4, you will need &cmake;. The required
+version will vary depending on what version of &kde; 4 you are building, see the
+TechBase for specifics.</para></listitem>
<listitem><para>The &subversion; client program, including support for Secure
HTTP (https). To ensure needed support, you can run
@@ -237,7 +238,7 @@
<listitem>
<para>If you do not already have &Qt; installed, install it, including any
relevant -dev or -devel packages. You will need at least &Qt; 3.3 if you are
- building &kde; 3.5, or &Qt; 4.3 if you are building &kde; 4.</para>
+ building &kde; 3.5, or &Qt; 4.4 if you are building &kde; 4.</para>
<note><para>If you are building &kde; 4 it is highly recommended to use the
qt-copy version of &Qt;, making sure to apply recommended patches (this is
@@ -253,8 +254,8 @@
its development package. If in doubt, install all. The libraries you need
will change depending on the modules you intend to build, as each module
has its own requirements. The
-<ulink url="http://quality.kde.org/develop/cvsguide/buildstep.php#step1">
-Building &kde; from Source Step by Step Guide</ulink> has more details
+<ulink url="http://techbase.kde.org/Getting_Started/Build/KDE4#Required_packages_from_your_distribution">&kde;
+TechBase</ulink> has more details
about the specific tools and techniques used to install and find the
required software.
</para>
@@ -632,12 +633,6 @@
<itemizedlist>
<listitem><para>
-For developers: Supports <link linkend="building-apidox">building the API
-documentation</link> for a module. Note that this only works for &kde; 3
-modules when not using the &unsermake; script.
-</para></listitem>
-
-<listitem><para>
Supports <link linkend="changing-verbosity">output message levels</link>
ranging from being very quiet to a full debug level.
</para></listitem>
@@ -982,7 +977,6 @@
</para>
<itemizedlist>
-<listitem><para><link linkend="conf-apidox">apidox</link>, to build API Documentation.</para></listitem>
<listitem><para><link linkend="conf-apply-qt-patches">apply-qt-patches</link>, to enhance qt-copy.</para></listitem>
<listitem><para><link linkend="conf-async">async</link>, to update and build at the same time.</para></listitem>
<listitem><para><link linkend="conf-binpath">binpath</link>, to set the <envar>PATH</envar> variable.</para></listitem>
@@ -1040,17 +1034,13 @@
<row id="conf-apidox">
<entry>apidox</entry>
<entry>Overrides global</entry>
-<entry><para>
-Set this option to <replaceable>true</replaceable> in order to have &kdesvn-build; automatically
-build and install the API documentation for the module after the normal build/install
-process. This only works for modules where <command>make apidox</command> does something,
-including kdelibs, kdebase and koffice, among others.
-</para>
-<para>This option does not work for modules using &unsermake; support, due to
-deficiencies in the &unsermake; build system. This option does not work for
-&kde; 4 modules because the required build system support has been migrated to
-a different program which &kdesvn-build; has not been corrected to use yet.
-</para>
+<entry><para>This option was used to allow for building KDE module API documentation.
+It was removed in &kdesvn-build; 1.6.3 due to it not being supported in KDE 4. Online
+API documentation is available from <ulink url="http://api.kde.org/">kde.org</ulink>.
+In addition it is possible to build KDE 4's API documentation using a script included in
+the kdesdk module (/scripts directory). See <ulink url="http://techbase.kde.org/Development/Tools/apidox">KDE
+TechBase</ulink> for more details. It is still possible to manually build API documentation
+for older modules of course.</para>
</entry>
</row>
@@ -1071,7 +1061,7 @@
code update and the build process will be performed in parallel, instead of waiting for
all of the source code updates before starting the build process. This option defaults
to enabling asynchronous mode. To disable, set this option to <replaceable>false</replaceable></para>
-<para>This option is available since the 1.7 release.</para></entry>
+<para>This option is available since the 1.6 release.</para></entry>
</row>
<row id="conf-binpath">
@@ -1159,7 +1149,7 @@
<para>Since these options are passed directly to the &cmake; command line, they
should be given as they would be typed into &cmake;. For example:</para>
-<screen> cmake-options -DRPATH_STYLE=default
+<screen> cmake-options -DKDE4_BUILD_TESTS=ON
</screen>
<para>Since this is a hassle, &kdesvn-build; takes pains to ensure that as long
@@ -1232,18 +1222,18 @@
<row id="conf-do-not-compile">
<entry>do-not-compile</entry>
<entry>Overrides global</entry>
-<entry><para>Use this option to set the <envar>DO_NOT_COMPILE</envar> environment variable prior to
-running the configure script. According to the http://developer.kde.org/documentation/other/developer-faq.html">&kde;
-Developer FAQ</ulink>, this should cause any top-level directory you pass to not be
-built. The directories should be space-separated.</para>
+<entry><para>Use this option to select a specific set of directories to be built in a
+module (instead of all of them). The directories to build should be space-separated.</para>
+
+<para>This feature is supported for both &kde; 3 and &kde; 4. KDE 4 support was added in
+&kdesvn-build; 1.6.3.</para>
<para>Note that the sources to the programs will still be downloaded. You can use
the <link linkend="conf-checkout-only">checkout-only</link>
directive to choose directories that you want to check out.</para>
-<important><para>This option does not yet work with modules built using
-&cmake;.</para></important>
+<para>For example, to hold &juk; and &kscd; in the kdemultimedia module from
+compiling, you would add "do-not-compile juk kscd" to your kdemultimedia settings.</para>
</entry>
</row>
@@ -2682,54 +2672,6 @@
<sect1 id="developer-features">
<title>Features for &kde; developers</title>
-<sect2 id="building-apidox">
-<title>Building API Documentation</title>
-<para>&kdesvn-build; can automatically install additional documentation
-generated from the sources in a module. This only works on some modules,
-and is only useful for &kde; developers.</para>
-
-<important>
-<para>This feature does not work for modules built using the <link linkend="using-unsermake">&unsermake;</link>
-build system. Since this is the default build system for modules that can
-use &unsermake;, you would need to disable &unsermake; support. See example below</link> for more information.
-</para>
-</important>
-
-<para>To enable this, simply set the &apidox; option to <replaceable>true</replaceable> in the <link linkend="configure-data">configuration file</link>,
-for the module that you would like documentation for. Not all modules have
-documentation. Modules that do include kdelibs, kdebase and kdepim.
-</para>
-
-<note>
-<para>If you have access to the Internet, the API documentation for &kde; is
-also available online. In &konqueror;, you can use the shortcut <quote>kde:<replaceable>className</replaceable></quote>.
-</para>
-
-<para>You can also visit the &kde; documentation web site at http://www.englishbreakfastnetwork.org/apidocs/">English Breakfast Network</ulink>.
-</para>
-
-<para>Finally, it is possible to download the documentation in an archived
-form, from <ulink url="http://developer.kde.org/documentation/library/libraryref.php">The &kde; Developer's Corner</ulink>.
-Click on the &kde; version you want documented, and then you can download
-an offline copy for the module you want.
-</para>
-</note>
-
-<informalexample id="example-apidox">
-<para>Installing API Documentation for kdelibs:</para>
-
-<screen>
-module kdelibs
- use-unsermake false # unsermake cannot build apidox
- apidox true # build and install apidox
-end module
-</screen>
-</informalexample>
-
-</sect2>
-
<sect2 id="ssh-agent-reminder">
<title>&ssh; Agent checks</title>
<para>&kdesvn-build; can ensure that &kde; developers that use &ssh; to
@@ -2965,30 +2907,27 @@
autotools-based system that &kde; has used from the beginning.</para>
<para>A introduction to &cmake; page is available on the http://wiki.kde.org/tiki-index.php?page=KDECMakeIntro">&kde; Wiki</ulink>.
+url="http://techbase.kde.org/Development/Tutorials/CMake">&kde; TechBase</ulink>.
Basically, instead of running <userinput><command>make</command> <option>-f</option>
<filename>Makefile.cvs</filename></userinput>, then <command>configure</command>,
then &unsermake; (or &make;), we simply run &cmake; and then &make;.
</para>
-<para>&kdesvn-build; has initial support for &cmake;. A few features of &kdesvn-build;
+<para>&kdesvn-build; has support for &cmake;. A few features of &kdesvn-build;
were really features of the underlying buildsystem, including <link linkend="conf-inst-apps">inst-apps</link>,
<link linkend="conf-configure-flags">configure-flags</link>,
and <link linkend="conf-do-not-compile">do-not-compile</link>. When equivalent
features are available, they are provided. For instance, the equivalent to the
-configure-flags option is <link linkend="conf-cmake-options">cmake-options</link>.
+configure-flags option is <link linkend="conf-cmake-options">cmake-options</link>, and the
+<link linkend="conf-do-not-compile">do-not-compile</link> option is also supported for &cmake;
+as of &kdesvn-build; version 1.6.3.
</para>
-<para>However, some options, like inst-apps or do-not-compile, have no direct
+<para>However, some options (like <link linkend="conf-inst-apps">inst-apps</link>) have no direct
equivalent, and are disabled. Should I find a way to implement them with &cmake;
I will do so and re-enable the option. However, more or less everything works
the same.</para>
-<para>Not all of &kde; has been ported to use &cmake; at this point. For example,
-the <link linkend="conf-apidox">apidox</link> option is rather useless until the
-equivalent infrastructure is ready. I have tried to warn about such things but
-not all deficiencies may be caught by &kdesvn-build; for now.</para>
-
</sect1>
</chapter>
Files old/kdesdk-4.1.1/doc/umbrello/index.cache.bz2 and new/kdesdk-4.1.2/doc/umbrello/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/kate/plugins/xmltools/katexmltools.desktop new/kdesdk-4.1.2/kate/plugins/xmltools/katexmltools.desktop
--- old/kdesdk-4.1.1/kate/plugins/xmltools/katexmltools.desktop 2008-07-03 07:05:55.000000000 +0200
+++ new/kdesdk-4.1.2/kate/plugins/xmltools/katexmltools.desktop 2008-09-25 14:03:32.000000000 +0200
@@ -46,7 +46,7 @@
Comment[gl]=Lista elementos, atributos, valores de atributor e entidades XML permitidos pola DTD
Comment[hu]=Kilistázza a DTD-ben engedélyezett elemeket, attribútumokat, attribútumértékeket és entitásokat
Comment[it]=Elenca gli elementi XML, gli attributi, i loro valori e le entità permesse dalla DTD
-Comment[ja]=DTD で許可されている XML のエレメント、アトリビュートおよびその値やエンティティを表示します
+Comment[ja]=DTD で許可されている XML の要素、属性およびその値やエンティティを表示します
Comment[lt]=Pateikia XML elementus, atributus, atributų reikšmes ir esybes (entities), leistas DTD
Comment[lv]=Rāda XML elementus, atribūtus, atribūtu vērtības un entītijas, ko atļauj DTD
Comment[nds]=Wiest de XML-Elementen, Attributen, Attributweerten un Entiteten, de vun de DTD verlöövt sünd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/kbugbuster/kbugbuster.desktop new/kdesdk-4.1.2/kbugbuster/kbugbuster.desktop
--- old/kdesdk-4.1.1/kbugbuster/kbugbuster.desktop 2008-07-03 07:06:03.000000000 +0200
+++ new/kdesdk-4.1.2/kbugbuster/kbugbuster.desktop 2008-09-25 14:03:36.000000000 +0200
@@ -64,7 +64,7 @@
Name[eo]=Eraroĉasilo
Name[ne]=केडीई बग बस्टर
Name[pl]=Przeglądarka bazy błędów
-Name[sr]=К‑бубловац
+Name[sr]=К‑буболовац
Name[sr@latin]=K‑bubolovac
Name[sv]=Kbugbuster
Name[ta]= Kபக்பஸ்டர்
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/kioslave/svn/svnhelper/apply_patch.desktop new/kdesdk-4.1.2/kioslave/svn/svnhelper/apply_patch.desktop
--- old/kdesdk-4.1.1/kioslave/svn/svnhelper/apply_patch.desktop 2008-07-03 07:06:03.000000000 +0200
+++ new/kdesdk-4.1.2/kioslave/svn/svnhelper/apply_patch.desktop 2008-09-25 14:03:36.000000000 +0200
@@ -29,11 +29,11 @@
Name[km]=អនុវត្តបំណះ...
Name[lt]=Pritaikyti pataisymą...
Name[lv]=Pielietot ielāpu...
-Name[nb]=Bruk lapp …
+Name[nb]=Bruk lapp …
Name[nds]=Kodeplaster inspelen...
Name[ne]=प्याच लागू गर्नुहोस्...
Name[nl]=Patch toepassen...
-Name[nn]=Bruk lapp …
+Name[nn]=Bruk lapp …
Name[pa]=ਪੈਂਚ ਲਾਗੂ...
Name[pl]=Nałóż łatę...
Name[pt]=Aplicar um 'Patch'...
@@ -49,7 +49,7 @@
Name[x-test]=xxApply Patch...xx
Name[zh_CN]=应用补丁...
Name[zh_TW]=套用修補...
-Icon=apply
+Icon=dialog-apply
Exec=
Comment=Apply the patch to another folder/file
Comment[ca]=Aplica el pedaç a una altra carpeta o fitxer
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/kioslave/svn/svnhelper/kio_svn_helper.cpp new/kdesdk-4.1.2/kioslave/svn/svnhelper/kio_svn_helper.cpp
--- old/kdesdk-4.1.1/kioslave/svn/svnhelper/kio_svn_helper.cpp 2008-07-09 13:03:59.000000000 +0200
+++ new/kdesdk-4.1.2/kioslave/svn/svnhelper/kio_svn_helper.cpp 2008-09-25 14:03:36.000000000 +0200
@@ -17,6 +17,7 @@
Boston, MA 02110-1301, USA.
*/
+#include
#include
#include
#include
@@ -284,7 +285,9 @@
}
int main(int argc, char **argv) {
- KCmdLineArgs::init(argc, argv, "kio_svn_helper", 0, ki18n("Subversion Helper"), "0.1", ki18n("KDE frontend for SVN"));
+ KAboutData aboutData("kio_svn_helper", 0, ki18n("Subversion Helper"), "0.1", ki18n("KDE frontend for SVN"));
+ aboutData.setProgramIconName("folder-remote");
+ KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineOptions options;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/kioslave/svn/svnhelper/subversion.desktop new/kdesdk-4.1.2/kioslave/svn/svnhelper/subversion.desktop
--- old/kdesdk-4.1.1/kioslave/svn/svnhelper/subversion.desktop 2008-08-28 10:07:29.000000000 +0200
+++ new/kdesdk-4.1.2/kioslave/svn/svnhelper/subversion.desktop 2008-09-25 14:03:36.000000000 +0200
@@ -156,7 +156,7 @@
Name[x-test]=xxRevert Local Changesxx
Name[zh_CN]=还原本地更改
Name[zh_TW]=回復本地端變更
-Icon=undo
+Icon=edit-undo
Exec=kio_svn_helper -r %U
Comment=Remove any changes made locally. Warning - this cannot be undone.
Comment[ca]=Elimina qualsevol canvi local. Avís: No es pot desfer.
@@ -227,11 +227,11 @@
Name[km]=ប្តូរឈ្មោះ...
Name[lt]=Pervadinti...
Name[lv]=Pārdēvēt...
-Name[nb]=Endre navn …
+Name[nb]=Endre navn …
Name[nds]=Ümnömen...
Name[ne]=पुन: नामकरण गर्नुहोस्...
Name[nl]=Hernoemen...
-Name[nn]=Endra namn …
+Name[nn]=Endra namn …
Name[oc]=Renommar...
Name[pa]=ਨਾਂ ਬਦਲੋ...
Name[pl]=Zmień nazwę...
@@ -248,7 +248,7 @@
Name[x-test]=xxRename...xx
Name[zh_CN]=重命名...
Name[zh_TW]=重新命名...
-Icon=pencil
+Icon=edit-rename
Exec=kio_svn_helper -r %U
Comment=Rename a file locally and in the repository. Use this rather than adding and deleting to rename a file.
Comment[ca]=Reanomena un fitxer localment i en el repositori. Use-ho en comptes d'afegir i eliminar per a reanomenar un fitxer.
@@ -404,11 +404,11 @@
Name[km]=ពិនិត្យពីឃ្លាំង...
Name[lt]=Atsisiųsti iš saugyklos...
Name[lv]=Paņemt no repozitorija...
-Name[nb]=Sjekk ut fra lager …
+Name[nb]=Sjekk ut fra lager …
Name[nds]=Ut Archiv daalladen...
Name[ne]=भण्डारबाट जाँच...
Name[nl]=Repository uitchecken...
-Name[nn]=Sjekk ut frå lager …
+Name[nn]=Sjekk ut frå lager …
Name[pa]=ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਚੈਕਆਉਟ...
Name[pl]=Pobierz z repozytorium...
Name[pt]=Obter do Repositório...
@@ -493,11 +493,11 @@
Name[km]=ប្តូរ...
Name[lt]=Perjungti...
Name[lv]=Pārslēgt...
-Name[nb]=Bytt …
+Name[nb]=Bytt …
Name[nds]=Telg wesseln...
Name[ne]=स्विच...
Name[nl]=Omzetten (switch)...
-Name[nn]=Byt …
+Name[nn]=Byt …
Name[pa]=ਸਵਿੱਚ ਕਰੋ...
Name[pl]=Przełącz...
Name[pt]=Mudar...
@@ -581,11 +581,11 @@
Name[km]=បញ្ចូលចូលគ្នា...
Name[lt]=Sulieti...
Name[lv]=Sapludināt...
-Name[nb]=Flett …
+Name[nb]=Flett …
Name[nds]=Tosamenföhren...
Name[ne]=गाँभ्नुहोस्...
Name[nl]=Samenvoegen...
-Name[nn]=Flett …
+Name[nn]=Flett …
Name[pa]=ਮਿਲਾਨ...
Name[pl]=Połącz...
Name[pt]=Reunir...
@@ -669,11 +669,11 @@
Name[km]=បន្ទោស...
Name[lt]=Nustatyti...
Name[lv]=Vainot...
-Name[nb]=Skyld på …
+Name[nb]=Skyld på …
Name[nds]=Naspören...
Name[ne]=दोष...
Name[nl]=Annotatie...
-Name[nn]=Skuld på …
+Name[nn]=Skuld på …
Name[pl]=Obwiń...
Name[pt]=Culpar...
Name[pt_BR]=Culpar...
@@ -756,11 +756,11 @@
Name[km]=បង្កើតបំណះ...
Name[lt]=Kurti pataisymą...
Name[lv]=Izveidot ielāpu...
-Name[nb]=Lag lapp …
+Name[nb]=Lag lapp …
Name[nds]=Kodeplaster opstellen...
Name[ne]=प्याच सिर्जना गर्नुहोस्...
Name[nl]=Patch aanmaken...
-Name[nn]=Lag lapp …
+Name[nn]=Lag lapp …
Name[pa]=ਪੈਂਚ ਬਣਾਓ...
Name[pl]=Stwórz łatę...
Name[pt]=Criar um 'Patch'...
@@ -805,11 +805,11 @@
Name[km]=នាំចេញ...
Name[lt]=Eksportuoti...
Name[lv]=Eksportēt...
-Name[nb]=Eksporter …
+Name[nb]=Eksporter …
Name[nds]=Exporteren...
Name[ne]=निर्यात...
Name[nl]=Exporteren...
-Name[nn]=Eksporter …
+Name[nn]=Eksporter …
Name[pa]=ਐਕਸਪੋਰਟ...
Name[pl]=Eksportuj...
Name[pt]=Exportar...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/kioslave/svn/svnhelper/subversion_toplevel.desktop new/kdesdk-4.1.2/kioslave/svn/svnhelper/subversion_toplevel.desktop
--- old/kdesdk-4.1.1/kioslave/svn/svnhelper/subversion_toplevel.desktop 2008-07-03 07:06:03.000000000 +0200
+++ new/kdesdk-4.1.2/kioslave/svn/svnhelper/subversion_toplevel.desktop 2008-09-25 14:03:36.000000000 +0200
@@ -52,7 +52,7 @@
Name[x-test]=xxSVN Updatexx
Name[zh_CN]=SVN 更新
Name[zh_TW]=SVN 更新
-Icon=redo
+Icon=edit-redo
Exec=kio_svn_helper -u %U
[Desktop Action Commit]
@@ -98,6 +98,6 @@
Name[x-test]=xxSVN Commitxx
Name[zh_CN]=SVN 提交
Name[zh_TW]=SVN 提交
-Icon=undo
+Icon=edit-undo
Exec=kio_svn_helper -c %U
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/lokalize/src/catalog/catalog.cpp new/kdesdk-4.1.2/lokalize/src/catalog/catalog.cpp
--- old/kdesdk-4.1.1/lokalize/src/catalog/catalog.cpp 2008-08-28 10:07:29.000000000 +0200
+++ new/kdesdk-4.1.2/lokalize/src/catalog/catalog.cpp 2008-09-25 14:03:36.000000000 +0200
@@ -359,15 +359,14 @@
//assumes that d->_originalForLastModifiedPos refers to the same DocPos as d->_lastModifiedPos does
void Catalog::flushUpdateDBBuffer()
{
- //kWarning()<<"flushUpdateDBBuffer";
if (!Settings::autoaddTM())
return;
DocPosition pos=d->_lastModifiedPos;
- if (pos.entry==-1)
+ if (pos.entry==-1 || pos.entry>=numberOfEntries())
{
//nothing to flush
- kWarning()<<"nothing to flush";
+ kWarning()<<"nothing to flush or new file opened";
return;
}
QString currentTarget=target(pos);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/lokalize/src/catalog/gettext/catalogitem.cpp new/kdesdk-4.1.2/lokalize/src/catalog/gettext/catalogitem.cpp
--- old/kdesdk-4.1.1/lokalize/src/catalog/gettext/catalogitem.cpp 2008-07-03 07:06:03.000000000 +0200
+++ new/kdesdk-4.1.2/lokalize/src/catalog/gettext/catalogitem.cpp 2008-09-25 14:03:36.000000000 +0200
@@ -40,6 +40,8 @@
using namespace GettextCatalog;
+QRegExp CatalogItem::fuzzyRegExp("((?:^|\n)#(?:,[^,]*)*),\\s*fuzzy");
+
CatalogItem::CatalogItem()
: d(new CatalogItemPrivate())
{
@@ -187,7 +189,7 @@
bool CatalogItem::isFuzzy() const
{
- return d->_comment.contains( QRegExp(",\\s*fuzzy") );
+ return d->_comment.contains( fuzzyRegExp );
}
bool CatalogItem::isUntranslated() const
@@ -346,7 +348,7 @@
{
QString& comment=d->_comment;
- comment.remove( QRegExp(",\\s*fuzzy"));
+ comment.replace( fuzzyRegExp, "\\1" );
// remove empty comment lines
comment.remove( QRegExp("\n#\\s*$") );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/lokalize/src/catalog/gettext/catalogitem.h new/kdesdk-4.1.2/lokalize/src/catalog/gettext/catalogitem.h
--- old/kdesdk-4.1.1/lokalize/src/catalog/gettext/catalogitem.h 2008-07-08 11:57:35.000000000 +0200
+++ new/kdesdk-4.1.2/lokalize/src/catalog/gettext/catalogitem.h 2008-09-25 14:03:36.000000000 +0200
@@ -135,6 +135,7 @@
private:
CatalogItemPrivate* const d;
+ static QRegExp fuzzyRegExp;
friend class GettextStorage;
void setFuzzy();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/lokalize/src/kaiderview.cpp new/kdesdk-4.1.2/lokalize/src/kaiderview.cpp
--- old/kdesdk-4.1.1/lokalize/src/kaiderview.cpp 2008-08-28 10:07:29.000000000 +0200
+++ new/kdesdk-4.1.2/lokalize/src/kaiderview.cpp 2008-09-25 14:03:36.000000000 +0200
@@ -129,6 +129,12 @@
KTextEdit::keyReleaseEvent(e);
}
+QString ProperTextEdit::toPlainText()
+{
+ QTextCursor cursor = textCursor();
+ cursor.select(QTextCursor::Document);
+ return cursor.selectedText();
+}
KAiderView::KAiderView(QWidget *parent,Catalog* catalog/*,keyEventHandler* kh*/)
: QSplitter(Qt::Vertical,parent)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/lokalize/src/kaiderview.h new/kdesdk-4.1.2/lokalize/src/kaiderview.h
--- old/kdesdk-4.1.1/lokalize/src/kaiderview.h 2008-07-03 07:06:03.000000000 +0200
+++ new/kdesdk-4.1.2/lokalize/src/kaiderview.h 2008-09-25 14:03:36.000000000 +0200
@@ -57,6 +57,7 @@
: KTextEdit(parent)
, m_currentUnicodeNumber(0)
{};
+ QString toPlainText();
private:
int m_currentUnicodeNumber;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/lokalize/src/main.cpp new/kdesdk-4.1.2/lokalize/src/main.cpp
--- old/kdesdk-4.1.1/lokalize/src/main.cpp 2008-02-13 16:45:34.000000000 +0100
+++ new/kdesdk-4.1.2/lokalize/src/main.cpp 2008-09-25 14:03:36.000000000 +0200
@@ -55,6 +55,7 @@
about.addAuthor( ki18n("Nick Shaforostoff"), KLocalizedString(), "shaforostoff@kde.ru" );
about.addCredit (ki18n("Google Inc."), ki18n("sponsored development as part of Google Summer Of Code program"), QByteArray(), "http://google.com");
about.addCredit (ki18n("Stephan Johach"), ki18n("bug fixing patches"), "hunsum@gmx.de");
+ about.addCredit (ki18n("Chusslove Illich"), ki18n("bug fixing patches"), "caslav.ilic@gmx.net");
KCmdLineArgs::init(argc, argv, &about);
KCmdLineOptions options;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/lokalize/src/msgiddiffview.cpp new/kdesdk-4.1.2/lokalize/src/msgiddiffview.cpp
--- old/kdesdk-4.1.1/lokalize/src/msgiddiffview.cpp 2008-08-28 10:07:29.000000000 +0200
+++ new/kdesdk-4.1.2/lokalize/src/msgiddiffview.cpp 2008-09-25 14:03:36.000000000 +0200
@@ -102,13 +102,23 @@
newStr.replace("#| msgid_plural \"","#| \"");
-// QTime time;
-// time.start();
-
//get rid of other info (eg fuzzy marks)
oldStr.remove(QRegExp("\\#[^\\|][^\n]*\n"));
oldStr.remove(QRegExp("\\#[^\\|].*$"));
- oldStr.remove(QRegExp("\\#\\| msgctxt.*\n"));
+
+ int msgCtxtPos=oldStr.indexOf("#| msgctxt ");
+ if (msgCtxtPos!=-1)
+ {
+ int msgIdPos=oldStr.indexOf("#| msgid");
+ if (msgIdPos!=-1 && msgIdPos>msgCtxtPos)
+ oldStr.remove(msgCtxtPos,msgIdPos-msgCtxtPos);
+ else
+ {
+ kWarning()<<"rare case found!!!";
+ oldStr.remove(QRegExp("\\#\\| msgctxt.*\n"));//just the old one-line remover
+ }
+ }
+
if (oldStr.contains("#| msgid \"\""))
{
@@ -136,12 +146,6 @@
result.replace("\\n","\\n<br>");
m_browser->setHtml(result);
-// m_browser->setPlainText(result);
-
-// oldStr.replace("\\n","\\n\n");
-// newStr.replace("\\n","\\n\n");
-
-// kDebug()<<"ELA "<
{
@@ -43,6 +45,37 @@
use constant TAG_GROUPS => join ", ", map "'$_'", sort keys %{&TAG_GROUP};
+# Specification to extract nice element-context for strings.
+use constant ECTX_SPEC =>
+{
+ # Data structure: extension => {tag => [ctxlevel, [attribute, ...]], ...}
+ # Order of attributes determines their order in the extracted comment.
+ "ui" => {
+ "widget" => [10, ["class", "name"]],
+ "item" => [15, []],
+ "property" => [20, ["name"]],
+ "attribute" => [20, ["name"]],
+ },
+ "rc" => {
+ "Menu" => [10, ["name"]],
+ "ToolBar" => [10, ["name"]],
+ },
+ "kcfg" => {
+ "group" => [10, ["name"]],
+ "entry" => [20, ["name"]],
+ "whatsthis" => [30, []],
+ "tooltip" => [30, []],
+ "label" => [30, []],
+ },
+};
+
+# Add attribute lists as hashes, for membership checks.
+for my $ext ( keys %{&ECTX_SPEC} ) {
+ for my $tag ( keys %{ECTX_SPEC->{$ext}} ) {
+ my $arr = ECTX_SPEC->{$ext}{$tag}[1];
+ ECTX_SPEC->{$ext}{$tag}[2] = {map {$_ => 1} @{$arr}};
+ }
+}
###########################################################################################
# Add options here as necessary - perldoc Getopt::Long for details on GetOptions
@@ -51,6 +84,7 @@
"tag-group=s" => \my $opt_tag_group,
"context=s" => \my $opt_context, # I18N context
"lines" => \my $opt_lines,
+ "cstart=s" => \my $opt_cstart,
"help|?" => \&usage );
unless( @ARGV )
@@ -67,7 +101,8 @@
my $tags = TAG_GROUP->{$opt_tag_group};
my $extra_tags = join "", map "|" . quotemeta, @opt_extra_tags;
my $text_string = qr/($tags$extra_tags)( [^>]*)?>/; # Precompile regexp
-
+my $cstart = $opt_cstart || "//";
+my $ectx_known_exts = join "|", keys %{&ECTX_SPEC};
###########################################################################################
# Escape characters in string exactly like uic does.
@@ -100,6 +135,15 @@
next;
}
+ # Ready element-context extraction.
+ my $ectx_ext;
+ my $ectx_string;
+ if ( $file_name =~ /\.($ectx_known_exts)$/ ) {
+ $ectx_ext = $1;
+ my $ectx_tag_gr = join "|", keys %{ECTX_SPEC->{$ectx_ext}};
+ $ectx_string = qr/($ectx_tag_gr)( [^>]*)?>/; # precompile regexp
+ }
+
my $string = "";
my $in_text = 0;
my $start_line_no = 0;
@@ -108,6 +152,10 @@
my $attr = "";
my $context = "";
+ # Element-context data: [[level, tag, [[attribute, value], ...]], ...]
+ # such that subarrays are ordered increasing by level.
+ my @ectx = ();
+
while ( <$fh> )
{
last if $. == 1 and $_ !~ /^(?:<!DOCTYPE|<\?xml|<!--|<ui version=)/;
@@ -132,6 +180,34 @@
unless ( $in_skipped_prop or $in_text )
{
+ # Check if this line contains context-worthy element.
+ if ( $ectx_ext
+ and ( ($tag, $attr) = $string =~ /<$ectx_string/ ) # no /o here
+ and exists ECTX_SPEC->{$ectx_ext}{$tag} )
+ {
+ my @atts;
+ for my $ectx_att ( @{ECTX_SPEC->{$ectx_ext}{$tag}[1]} )
+ {
+ if ( $attr and $attr =~ /\b$ectx_att\s*=\s*(["'])([^"']*?)\1/ )
+ {
+ my $aval = $2;
+ push @atts, [$ectx_att, $aval];
+ }
+ }
+ # Kill all tags in element-context with level higer or equal to this,
+ # and add it to the end.
+ my $clevel = ECTX_SPEC->{$ectx_ext}{$tag}[0];
+ for ( my $i = 0; $i < @ectx; ++$i )
+ {
+ if ( $clevel <= $ectx[$i][0] )
+ {
+ @ectx = @ectx[0 .. ($i - 1)];
+ last;
+ }
+ }
+ push @ectx, [$clevel, $tag, [@atts]];
+ }
+
if ( ($tag, $attr) = $string =~ /<$text_string/o )
{
my ($attr_comment) = $attr =~ /\w*comment=\"([^\"]*)\"/ if $attr;
@@ -161,9 +237,27 @@
{
if ( not $context or $context ne "KDE::DoNotExtract" )
{
- print "//i18n: tag $tag\n";
- print "//i18n: file $file_name line $.\n";
- print "// xgettext: no-c-format\n" if $text =~ /%/o;
+ (my $norm_fname = $file_name) =~ s/^\.\///;
+ print "$cstart i18n: file: $norm_fname:$.\n";
+ if ( @ectx ) {
+ # Format element-context.
+ my @tag_gr;
+ for my $tgr (reverse @ectx)
+ {
+ my @attr_gr;
+ for my $agr ( @{$tgr->[2]} )
+ {
+ #push @attr_gr, "$agr->[0]=$agr->[1]";
+ push @attr_gr, "$agr->[1]"; # no real nead for attribute name
+ }
+ my $attr = join(", ", @attr_gr);
+ push @tag_gr, "$tgr->[1] ($attr)" if $attr;
+ push @tag_gr, "$tgr->[1]" if not $attr;
+ }
+ my $ectx_str = join ", ", @tag_gr;
+ print "$cstart i18n: ectx: $ectx_str\n";
+ }
+ print "$cstart xgettext: no-c-format\n" if $text =~ /%/o;
if ( $context )
{
$context = escape_like_uic($context);
@@ -178,12 +272,12 @@
}
else
{
- print "// Manually excluded message at $file_name line $.\n";
+ print "$cstart Manually excluded message at $file_name line $.\n";
}
}
else
{
- print "// Skipped empty message at $file_name line $.\n";
+ print "$cstart Skipped empty message at $file_name line $.\n";
}
$string =~ s/^.*<\/$text_string//o;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/strigi-analyzer/po/CMakeLists.txt new/kdesdk-4.1.2/strigi-analyzer/po/CMakeLists.txt
--- old/kdesdk-4.1.1/strigi-analyzer/po/CMakeLists.txt 2008-03-13 23:26:30.000000000 +0100
+++ new/kdesdk-4.1.2/strigi-analyzer/po/CMakeLists.txt 2008-09-25 14:03:32.000000000 +0200
@@ -1,5 +1,10 @@
include_directories(${STRIGI_INCLUDE_DIR} ${QT_INCLUDES})
+macro_bool_to_01(STRIGI_NEEDS_SIGNED_CHAR STRIGI_NEEDS_SIGNED_CHAR_01)
+
+configure_file(config-strigi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-strigi.h )
+
+
# build the analyzer as a module
kde4_add_library(po MODULE poendanalyzer.cpp)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/strigi-analyzer/po/config-strigi.h.cmake new/kdesdk-4.1.2/strigi-analyzer/po/config-strigi.h.cmake
--- old/kdesdk-4.1.1/strigi-analyzer/po/config-strigi.h.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kdesdk-4.1.2/strigi-analyzer/po/config-strigi.h.cmake 2008-09-25 14:03:32.000000000 +0200
@@ -0,0 +1,7 @@
+#cmakedefine STRIGI_NEEDS_SIGNED_CHAR_01 1
+#ifdef STRIGI_NEEDS_SIGNED_CHAR_01
+#define STRIGI_ENDANALYZER_RETVAL signed char
+#else
+#define STRIGI_ENDANALYZER_RETVAL char
+#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.1.1/strigi-analyzer/po/poendanalyzer.cpp new/kdesdk-4.1.2/strigi-analyzer/po/poendanalyzer.cpp
--- old/kdesdk-4.1.1/strigi-analyzer/po/poendanalyzer.cpp 2008-08-28 10:07:26.000000000 +0200
+++ new/kdesdk-4.1.2/strigi-analyzer/po/poendanalyzer.cpp 2008-09-25 14:03:32.000000000 +0200
@@ -29,6 +29,7 @@
#include
#include
#include
+#include "config-strigi.h"
#include <iostream>
@@ -41,7 +42,7 @@
PoEndAnalyzer(const PoEndAnalyzerFactory* f):factory(f) {}
const char* name() const {return "PoEndAnalyzer";}
bool checkHeader(const char* header, int32_t headersize) const;
- char analyze(Strigi::AnalysisResult& idx,Strigi::InputStream* in);
+ STRIGI_ENDANALYZER_RETVAL analyze(Strigi::AnalysisResult& idx,Strigi::InputStream* in);
private:
const PoEndAnalyzerFactory* factory;
};
@@ -103,7 +104,7 @@
}
-char PoEndAnalyzer::analyze(AnalysisResult& idx, InputStream* in)
+STRIGI_ENDANALYZER_RETVAL PoEndAnalyzer::analyze(AnalysisResult& idx, InputStream* in)
{
if (idx.extension()=="svn-base")
return Ok;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org