[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kio-extras] /: help:/common has been replaced by help:/kdoctools5-common
From: Luigi Toscano <luigi.toscano () tiscali ! it>
Date: 2014-05-01 0:41:24
Message-ID: E1Wff40-0005oh-B5 () scm ! kde ! org
[Download RAW message or body]
Git commit e49ca7315d63c20b77a7815e6e14fa3002f4e9b4 by Luigi Toscano.
Committed on 01/05/2014 at 00:40.
Pushed by ltoscano into branch 'master'.
help:/common has been replaced by help:/kdoctools5-common
This is a follow-up of RR117781 in kdoctools.
M +6 -6 info/kde-info2html
M +2 -2 man/kio_man.cpp
M +5 -5 man/man2html.cpp
http://commits.kde.org/kio-extras/e49ca7315d63c20b77a7815e6e14fa3002f4e9b4
diff --git a/info/kde-info2html b/info/kde-info2html
index 203ca4e..44642e2 100755
--- a/info/kde-info2html
+++ b/info/kde-info2html
@@ -60,10 +60,10 @@ require $config_file; #-- configuration settings
my $DOCTYPE = qq(<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" >);
my $STYLESHEET_KDE =
- qq(<link rel="stylesheet" href="help:common/kde-default.css" type="text/css">
+ qq(<link rel="stylesheet" href="help:/kdoctools5-common/kde-default.css" \
type="text/css"> <link rel="stylesheet" href="file://$css_file" type="text/css">
<style type="text/css"><!-- .chapter { padding-right: 1em } --></style>);
-my $LOGO_KDE = "<img src=\"help:/common/kde_logo.png\" alt=\"KDE - The K Desktop \
Environment\" width=\"296\" height=\"79\" border=\"0\">"; +my $LOGO_KDE = "<img \
src=\"help:/kdoctools5-common/kde_logo.png\" alt=\"KDE - The K Desktop Environment\" \
width=\"296\" height=\"79\" border=\"0\">";
# the use of a query should make sure it never conflicts with a "real" path
my $BROWSE_BY_FILE_PATH = '/browse_by_file?special=yes';
@@ -659,9 +659,9 @@ $DOCTYPE
<!-- These can't be in the .css file due to the help KIOSlave not being
followed. -->
<style type="text/css">
- #header_top { background-image: url("help:/common/top.jpg"); }
- #header_top div { background-image: url("help:/common/top-left.jpg"); }
- #header_top div div { background-image: url("help:/common/top-right.jpg"); }
+ #header_top { background-image: url("help:/kdoctools5-common/top.jpg"); }
+ #header_top div { background-image: \
url("help:/kdoctools5-common/top-left.jpg"); } + #header_top div div { \
background-image: url("help:/kdoctools5-common/top-right.jpg"); }
/* Newer updates to kde.org, looks good */
#header_bottom {
@@ -677,7 +677,7 @@ $DOCTYPE
<!--header start-->
<div id="header"><div id="header_top">
<div><div>
- <img src="help:common/top-kde.jpg" alt="[KDE Help]"> $UpcaseInfoFile: \
$LinkList[1]</div></div> + <img src="help:/kdoctools5-common/top-kde.jpg" \
alt="[KDE Help]"> $UpcaseInfoFile: $LinkList[1]</div></div> </div>
<div class="header_bottom" style="border: none">
EOF
diff --git a/man/kio_man.cpp b/man/kio_man.cpp
index 7b479a5..0971534 100644
--- a/man/kio_man.cpp
+++ b/man/kio_man.cpp
@@ -133,8 +133,8 @@ MANProtocol::MANProtocol(const QByteArray &pool_socket, const \
QByteArray &app_so {
assert(!_self);
_self = this;
- const QString common_dir = KGlobal::dirs()->findResourceDir( "html", \
"en/common/kde-default.css" );
- const QString strPath=QString( "file:%1/en/common" ).arg( common_dir );
+ const QString common_dir = KGlobal::dirs()->findResourceDir( "html", \
"en/kdoctools5-common/kde-default.css" ); + const QString strPath=QString( \
"file:%1/en/kdoctools5-common" ).arg( common_dir ); m_cssPath=strPath.toLocal8Bit(); \
// ### TODO encode for CSS
section_names << "0" << "0p" << "1" << "1p" << "2" << "3" << "3n" << "3p" << "4" \
<< "5" << "6" << "7" << "8" << "9" << "l" << "n";
diff --git a/man/man2html.cpp b/man/man2html.cpp
index 9045ece..65ee0b7 100644
--- a/man/man2html.cpp
+++ b/man/man2html.cpp
@@ -4455,7 +4455,7 @@ static char *scan_request(char *c)
out_html(" Manpage</TITLE>\n");
// KDE defaults.
- out_html("<link rel=\"stylesheet\" \
href=\"help:/common/kde-default.css\""); + out_html("<link \
rel=\"stylesheet\" href=\"help:/kdoctools5-common/kde-default.css\""); out_html(" \
type=\"text/css\">\n");
// Output our custom stylesheet.
@@ -4467,11 +4467,11 @@ static char *scan_request(char *c)
// could not be included in the stylesheet,
// include it now.
out_html("<style type=\"text/css\">\n#header_top { "
- "background-image: url(\"help:/common/top.jpg\"); }\n\n"
+ "background-image: url(\"help:/kdoctools5-common/top.jpg\"); \
}\n\n" "#header_top div { "
- "background-image: url(\"help:/common/top-left.jpg\"); }\n\n"
+ "background-image: \
url(\"help:/kdoctools5-common/top-left.jpg\"); }\n\n" "#header_top div div { "
- "background-image: url(\"help:/common/top-right.jpg\"); }\n\n"
+ "background-image: \
url(\"help:/kdoctools5-common/top-right.jpg\"); }\n\n" "</style>\n\n"
);
@@ -4487,7 +4487,7 @@ static char *scan_request(char *c)
out_html("<div id=\"header\"><div id=\"header_top\">\n");
out_html("<div><div>\n");
- out_html("<img src=\"help:/common/top-kde.jpg\" alt=\"top-kde\"> ");
+ out_html("<img src=\"help:/kdoctools5-common/top-kde.jpg\" \
alt=\"top-kde\"> "); if ( args.count() )
scan_troff(args[0].data(), 0, NULL);
out_html(" - KDE Man Page Viewer");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic