Remove all the non-konqueror-specific graphics and the main css file, and update things to use the ones I've just put in kdelibs

svn path=/trunk/kdebase/konqueror/; revision=386268

konqueror/about/Makefile.am

@@ -12,13 +12,6 @@ METASOURCES = AUTO
 
 konq_aboutpage_datadir = $(kde_datadir)/konqueror/about
 konq_aboutpage_data_DATA = \
-	bar-bottom-left.png    bar-top-right.png      box-centre-konqueror.png  more.png \
+	box-centre-konqueror.png  more.png          top-right-konqueror.png  lightning.png \
-	bar-bottom-middle.png  bottom-left.png        box-middle-left.png       top-left.png \
+	launch.html               intro.html        specs.html               tips.html \
-	bar-bottom-right.png   bottom-middle.png      box-middle-right.png      top-middle.png \
+	plugins.html              plugins_rtl.html  konq.css
-	bar-middle-left.png    bottom-right.png       box-top-left.png          top-right-konqueror.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   lightning.png \
-	launch.html intro.html specs.html tips.html plugins.html \
-	plugins_rtl.html \
-	konq_about.css konq_about_rtl.css

konqueror/about/intro.html

@@ -9,8 +9,9 @@
 
   <style type="text/css">
   /*<![CDATA[*/
-    @import "konq_about.css";
+    @import "%1"; /* kde_infopage.css */
-    %1 /* maybe @import "rtl.css"; */
+    %1 /* maybe @import "kde_infopage_rtl.css"; */
+    @import "konq.css";
   /*]]>*/
   </style>
 

konqueror/about/konq_about.css

@@ -1,276 +0,0 @@
-img {margin: 0px; padding: 0px}
-body {margin: 0px; padding: 0px; background-color: #7ea0cb;}
-.bar_text a {color: #008;}
-
-/*
- * the header
- */
-
-#header {
-  background-image: url(top-middle.png);
-  width: 100%;
-  height: 131px;
-}
-
-#headerL {
-  position: absolute;
-  background-image: url(top-left.png);
-  left: 0px;
-  height: 131px;
-  width: 147px;
-  z-index: 1;
-}
-
-#headerR {
-  position: absolute;
-  right: 0px;
-  width: 430px;
-  height: 131px;
-  background-image: url(top-right-konqueror.png);
-}
-
-#title {
-  position: absolute;
-  top: 25px;
-  right: 100px;
-  text-align: right;
-  font-size: xx-large;
-  font-weight: bold;
-  text-shadow: #fff 0px 0px 5px;
-  color: #444;
-  z-index: 5;
-}
-
-#tagline {
-  position: absolute;
-  top: 70px;
-  right: 100px;
-  text-align: right;
-  font-size: large;
-  font-weight: bold;
-  text-shadow: #fff 0px 0px 5px;
-  color: #444;
-  z-index: 5;
-}
-
-/*
- * the nav bar
- */
-
-#bar {
-  width: 100%;
-  background-color: #7693BA;
-  border-bottom: 1px solid black;
-  padding-bottom: 3px;
-}
-
-#barT {
-  width: 100%;
-  height: 19px;
-  background-image: url(bar-top-middle.png);
-}
-
-#barTL {
-  width: 22px;
-  height: 19px;
-  float: left;
-  background-image: url(bar-top-left.png);
-}
-
-#barTR {
-  width: 22px;
-  height: 19px;
-  float: right;
-  background-image: url(bar-top-right.png);
-}
-
-#barL {
-  background-image: url(bar-middle-left.png);
-  background-repeat: repeat-y;
-  background-position: left;
-  padding-left: 22px;
-}
-
-#barCenter {
-  text-align: center;
-  color: #282828;
-  font-weight: bold;
-  font-size: small;
-}
-
-#barCenter a.selected, #barCenter a.selected:hover {
-  color: #282828;
-  text-decoration: none;
-  text-shadow: #c8c8c8 0px 0px 5px;
-}
-
-
-#barCenter li a:link, #barCenter li a:visited, #barCenter li a:active {
-  color: #282828;
-  text-decoration: none;
-  text-shadow: none;
-}
-
-#barCenter li a:hover {
-  color: #282828;
-  text-decoration: none;
-  text-shadow: #fff 0px 0px 6px;
-}
-
-#barCenter ul {
-  margin: 0;
-  padding: 0;
-}
-
-#barCenter li {
-  display: inline;
-}
-
-#barCenter li:not(:first-child):before { /* Aren't css3 selectors great? */
-  content: " · ";
-}
-
-#barR {
-  background-image: url(bar-middle-right.png);
-  background-repeat: repeat-y;
-  background-position: right;
-  padding-right: 22px;
-}
-
-#barB {
-  width: 100%;
-  height: 25px;
-  background-image: url(bar-bottom-middle.png);
-}
-
-#barBL {
-  width: 22px;
-  height: 25px;
-  float: left;
-  background-image: url(bar-bottom-left.png);
-}
-
-#barBR {
-  width: 22px;
-  height: 25px;
-  float: right;
-  background-image: url(bar-bottom-right.png);
-}
-
-/*
- * the main box
- */
-
-#box {
-  width: 90%;
-  margin-left: 5%;
-  margin-right: 5%;
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-#boxT {
-  width: 100%;
-  height: 22px;
-  background-image: url(box-top-middle.png);
-}
-
-#boxTL {
-  width: 25px;
-  height: 22px;
-  float: left;
-  background-image: url(box-top-left.png);
-}
-
-#boxTR {
-  width: 25px;
-  height: 22px;
-  float: right;
-  background-image: url(box-top-right.png);
-}
-
-#boxL {
-  background-image: url(box-middle-left.png);
-  background-repeat: repeat-y;
-  background-position: left;
-  padding-left: 20px;
-}
-
-#boxCenter {
-  background-image: url(box-centre-konqueror.png);
-  background-repeat: no-repeat;
-  background-color: #dfe7f3;
-  background-position: center;
-  text-align: left;
-}
-
-#boxR {
-  background-image: url(box-middle-right.png);
-  background-repeat: repeat-y;
-  background-position: right;
-  padding-right: 20px;
-}
-
-#boxB {
-  width: 100%;
-  height: 22px;
-  background-image: url(box-bottom-middle.png);
-}
-
-#boxBL {
-  width: 25px;
-  height: 22px;
-  float: left;
-  background-image: url(box-bottom-left.png);
-}
-
-#boxBR {
-  width: 25px;
-  height: 22px;
-  float: right;
-  background-image: url(box-bottom-right.png);
-}
-
-#subtext {
-    font-size: 10pt;
-    font-style: italic;
-}
-
-#nextlink {
-    margin-bottom: 0px;
-    text-align: right;
-    font-size: 10pt;
-}
-
-/*
- * the footer
- */
-
-#footer {
-  position: fixed;
-  background-image: url(bottom-middle.png);
-  width: 100%;
-  height: 100px;
-  z-index: -2;
-  bottom:0;
-}
-
-#footerL {
-  position: fixed;
-  background-image: url(bottom-left.png);
-  left: 0px;
-  width: 155px;
-  height: 100px;
-  z-index: -2;
-}
-
-#footerR {
-  position: fixed;
-  background-image: url(bottom-right.png);
-  right: 0px;
-  width: 429px;
-  height: 100px;
-  z-index: -1;
-}
-
-/* vim:set sw=2 et nocindent smartindent: */

konqueror/about/konq_about_rtl.css

@@ -1,7 +0,0 @@
-body {direction: rtl}
-
-#boxCenter {
-  text-align: right;
-}
-
-/* vim:set sw=2 et nocindent smartindent: */

konqueror/about/konq_aboutpage.cc

@@ -103,7 +103,11 @@ QString KonqAboutPageFactory::launch()
   QString home_folder = QDir::homeDirPath();
   QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
 
-  res = res.arg( kapp->reverseLayout() ? "@import \"konq_about_rtl.css\";" : "" );
+  res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+  if ( kapp->reverseLayout() )
+    res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+  else
+    res = res.arg( "" );
 
   res = res.arg( i18n("Conquer your Desktop!") )
       .arg( i18n( "Konqueror" ) )
@@ -144,6 +148,7 @@ QString KonqAboutPageFactory::launch()
       .arg( i18n( "Next: An Introduction to Konqueror" ) )
       ;
   i18n("Search the Web");//i18n for possible future use
+  kdDebug() << res << endl;
 
   s_launch_html = new QString( res );
 
@@ -164,7 +169,11 @@ QString KonqAboutPageFactory::intro()
     QString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small );
     QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
 
-    res = res.arg( kapp->reverseLayout() ? "@import \"konq_about_rtl.css\";" : "" );
+    res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+    if ( kapp->reverseLayout() )
+	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+    else
+	res = res.arg( "" );
 
     res = res.arg( i18n("Conquer your Desktop!") )
 	.arg( i18n( "Konqueror" ) )
@@ -215,7 +224,11 @@ QString KonqAboutPageFactory::specs()
     if ( res.isEmpty() )
 	return res;
 
-    res = res.arg( kapp->reverseLayout() ? "@import \"konq_about_rtl.css\";" : "" );
+    res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+    if ( kapp->reverseLayout() )
+	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+    else
+	res = res.arg( "" );
 
     res = res.arg( i18n("Conquer your Desktop!") )
 	.arg( i18n( "Konqueror" ) )
@@ -308,7 +321,11 @@ QString KonqAboutPageFactory::tips()
 	    iconloader->iconPath("view_left_right", KIcon::Small );
     QString continue_icon_path = QApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small );
 
-    res = res.arg( kapp->reverseLayout() ? "@import \"konq_about_rtl.css\";" : "" );
+    res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) );
+    if ( kapp->reverseLayout() )
+	res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) );
+    else
+	res = res.arg( "" );
 
     res = res.arg( i18n("Conquer your Desktop!") )
 	.arg( i18n( "Konqueror" ) )

konqueror/about/launch.html

@@ -9,8 +9,9 @@
 
   <style type="text/css">
   /*<![CDATA[*/
-    @import "konq_about.css";
+    @import "%1"; /* kde_infopage.css */
-    %1 /* maybe @import "rtl.css"; */
+    %1 /* maybe @import "kde_infopage_rtl.css"; */
+    @import "konq.css";
   /*]]>*/
   </style>
 

konqueror/about/specs.html

@@ -9,8 +9,9 @@
 
   <style type="text/css">
   /*<![CDATA[*/
-    @import "konq_about.css";
+    @import "%1"; /* kde_infopage.css */
-    %1 /* maybe @import "rtl.css"; */
+    %1 /* maybe @import "kde_infopage_rtl.css"; */
+    @import "konq.css";
   /*]]>*/
   </style>
 

konqueror/about/tips.html

@@ -9,8 +9,9 @@
 
   <style type="text/css">
   /*<![CDATA[*/
-    @import "konq_about.css";
+    @import "%1"; /* kde_infopage.css */
-    %1 /* maybe @import "rtl.css"; */
+    %1 /* maybe @import "kde_infopage_rtl.css"; */
+    @import "konq.css";
   /*]]>*/
   </style>