[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/kde3/graphics/digikam
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2007-07-17 20:55:55
Message-ID: 1184705755.669302.31255.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 689183 by cgilles:
digiKam from KDE3 branch : backport fix from trunk about welcome page view Right to \
Left language management
M +1 -1 data/about/Makefile.am
A data/about/kde_infopage_rtl.css
M +8 -11 data/about/main.html
M +22 -13 digikam/welcomepageview.cpp
M +8 -8 project/project.kdevelop
--- branches/extragear/kde3/graphics/digikam/data/about/Makefile.am #689182:689183
@@ -4,6 +4,6 @@
box-middle-right.png top-middle.png bar-middle-left.png \
bottom-right.png \ box-top-left.png bar-middle-right.png box-bottom-left.png \
box-top-middle.png \ bar-top-left.png box-bottom-middle.png box-top-right.png \
bar-top-middle.png \
- box-bottom-right.png kde_infopage.css
+ box-bottom-right.png kde_infopage.css kde_infopage_rtl.css
aboutdir = $(kde_datadir)/digikam/about
--- branches/extragear/kde3/graphics/digikam/data/about/main.html #689182:689183
@@ -4,15 +4,14 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta name="generator" content=
- "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
+ <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st August 2004), \
see www.w3.org" />
<style type="text/css">
/*<![CDATA[*/
- @import "%1"; /* kde_infopage.css */
- %1 /* maybe @import "kde_infopage_rtl.css"; */
+ @import "%1"; /* locationCss */
+ %2 /* locationRtl */
@import "digikam.css";
- body {font-size: %1px;}
+ body {font-size: %3px;}
/*]]>*/
</style>
@@ -25,11 +24,11 @@
<div id="headerR"/>
<div id="title">
- %2 <!-- digiKam -->
+ %4 <!-- appTitle -->
</div>
<div id="tagline">
- %3 <!-- Catchphrase -->
+ %5 <!-- Catchphrase -->
</div>
</div>
@@ -39,7 +38,7 @@
<div id="barL">
<div id="barR">
<div id="barCenter" class="bar_text">
- %4<!-- digiKam is ... -->
+ %6 <!-- Quick description... -->
</div>
</div>
</div>
@@ -52,8 +51,7 @@
<div id="boxL">
<div id="boxR">
<div id="boxCenter">
- <!--Welcome to digiKam-->
- %5
+ %7 <!-- Advanced informations -->
</div>
</div>
</div>
@@ -63,4 +61,3 @@
<div id="footer"><div id="footerL"/><div id="footerR"/></div>
</body>
</html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
--- branches/extragear/kde3/graphics/digikam/digikam/welcomepageview.cpp \
#689182:689183 @@ -58,24 +58,33 @@
setMetaRefreshEnabled(false);
setURLCursor(KCursor::handCursor());
- QString location = locate("data", "digikam/about/main.html");
- QString content = fileToString(location);
- content = content.arg( locate( "data", "digikam/about/kde_infopage.css" \
) );
- content = content.arg( "" );
-
- begin(KURL( location ));
-
- QString fontSize = QString::number( 12 );
+ QString fontSize = QString::number(12);
QString appTitle = i18n("digiKam");
- QString catchPhrase = "";
+ QString catchPhrase = QString(); // Not enough space for a catch \
phrase at default window size.
QString quickDescription = i18n("A Photo-Management Application for KDE");
- write(content.arg(fontSize).arg(appTitle).arg(catchPhrase)
- .arg(quickDescription).arg(infoPage()));
+ QString locationHtml = locate("data", "digikam/about/main.html");
+ QString locationCss = locate("data", "digikam/about/kde_infopage.css");
+ QString locationRtl = locate("data", "digikam/about/kde_infopage_rtl.css" \
); + QString rtl = kapp->reverseLayout() ? QString("@import \"%1\";" \
).arg(locationRtl) + : QString();
+
+ begin(KURL(locationHtml));
+
+ QString content = fileToString(locationHtml);
+ content = content.arg(locationCss) // %1
+ .arg(rtl) // %2
+ .arg(fontSize) // %3
+ .arg(appTitle) // %4
+ .arg(catchPhrase) // %5
+ .arg(quickDescription) // %6
+ .arg(infoPage()); // %7
+
+ write(content);
end();
show();
connect(browserExtension(), SIGNAL(openURLRequest(const KURL &, const \
KParts::URLArgs &)),
- this, SLOT(slotUrlOpen(const KURL &)));
+ this, SLOT(slotUrlOpen(const KURL &)));
}
WelcomePageView::~WelcomePageView()
@@ -120,7 +129,7 @@
.arg("help:/digikam/index.html") // digiKam help:// URL
.arg("http://www.digikam.org") // digiKam homepage URL
.arg("0.8.2"); // previous digiKam release.
-
+
QStringList newFeatures;
newFeatures << i18n("16-bit/color/pixels image support");
newFeatures << i18n("Full color management support");
--- branches/extragear/kde3/graphics/digikam/project/project.kdevelop #689182:689183
@@ -12,7 +12,7 @@
</keywords>
<projectdirectory>./</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
+ <description/>
<ignoreparts/>
<projectname>digikam</projectname>
<defaultencoding/>
@@ -74,11 +74,11 @@
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
- <programargs></programargs>
- <gdbpath></gdbpath>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <programargs/>
+ <gdbpath/>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@@ -114,7 +114,7 @@
<directoryradio>build</directoryradio>
<customdirectory>/</customdirectory>
<mainprogram>digikam/digikam/digikam</mainprogram>
- <programargs></programargs>
+ <programargs/>
<terminal>false</terminal>
<autocompile>false</autocompile>
<envvars/>
@@ -192,7 +192,7 @@
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
- <prefixGet></prefixGet>
+ <prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic