[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdeaddons/konq-plugins/sidebar/metabar/src
From:       Florian Roth <florian () synatic ! net>
Date:       2006-04-18 18:04:07
Message-ID: 1145383447.795162.3730.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 531207 by roth:

Fixed problem with <nobr> tags (Thanks to Michael Kreitzer for the patch)
Some other minor changes and fixes


 M  +1 -0      default.css  
 M  +18 -18    defaultplugin.cpp  
 M  +2 -2      metabarwidget.cpp  
 M  +4 -4      settingsplugin.cpp  


--- branches/KDE/3.5/kdeaddons/konq-plugins/sidebar/metabar/src/default.css \
#531206:531207 @@ -21,6 +21,7 @@
   margin:       0px;
   padding:      0px;
   height:       20px;
+  white-space:	nowrap;
 }
 
 a {
--- branches/KDE/3.5/kdeaddons/konq-plugins/sidebar/metabar/src/defaultplugin.cpp \
#531206:531207 @@ -216,26 +216,26 @@
     KFileItem *that = const_cast<KFileItem *>(item);
     
     DOM::DOMString innerHTML;
-    innerHTML += "<ul class=\"info\"><nobr><b>" + i18n("Type") + ": </b>";
+    innerHTML += "<ul class=\"info\"><b>" + i18n("Type") + ": </b>";
     innerHTML += that->determineMimeType()->comment();
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("Size") + ": \
</b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Size") + ": </b>";
     innerHTML += KIO::convertSize(item->size());
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("User") + ": \
</b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("User") + ": </b>";
     innerHTML += item->user();
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("Group") + ": \
</b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Group") + ": </b>";
     innerHTML += item->group();
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("Permissions") + \
": </b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Permissions") + ": \
</b>";  innerHTML += (item->permissionsString());
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("Modified") + ": \
</b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Modified") + ": </b>";
     innerHTML += item->timeString(KIO::UDS_MODIFICATION_TIME);
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("Accessed") + ": \
</b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Accessed") + ": </b>";
     innerHTML += item->timeString(KIO::UDS_ACCESS_TIME);
-    innerHTML += "</nobr></ul>";
+    innerHTML += "</ul>";
         
     if(item->isLink()){
-      innerHTML += "<ul class=\"info\"><nobr><b>" + i18n("Linktarget") + ": </b>";
+      innerHTML += "<ul class=\"info\"><b>" + i18n("Linktarget") + ": </b>";
       innerHTML += item->linkDest();
-      innerHTML += "</nobr></ul>";
+      innerHTML += "</ul>";
     }
         
     if(!item->isDir()){
@@ -251,7 +251,7 @@
           if(group.isValid()){
             nam.setNum(id);
             
-            innerHTML += "<ul class=\"info\"><nobr><a class=\"infotitle\" \
id=\"info_" + nam + "\" href=\"more://info_" + nam + "\">" + group.translatedName() + \
"</a></nobr></ul>"; +            innerHTML += "<ul class=\"info\"><a \
class=\"infotitle\" id=\"info_" + nam + "\" href=\"more://info_" + nam + "\">" + \
group.translatedName() + "</a></ul>";  
             QStringList keys = group.supportedKeys();
           
@@ -260,9 +260,9 @@
               
               if(metaInfoItem.isValid()){
               
-                innerHTML += "<ul class=\"info\" style=\"display:none\"><nobr><b \
name=\"info_" + nam + "\">" + metaInfoItem.translatedKey() + ": </b>"; +              \
innerHTML += "<ul class=\"info\" style=\"display:none\"><b name=\"info_" + nam + \
"\">" + metaInfoItem.translatedKey() + ": </b>";  innerHTML += metaInfoItem.string();
-                innerHTML += "</nobr></ul>";
+                innerHTML += "</ul>";
               }
             }
             
@@ -291,15 +291,15 @@
     }
  
     DOM::DOMString innerHTML;
-    innerHTML += "<ul class=\"info\"><nobr><b>" + i18n("Size") + ": </b>";
+    innerHTML += "<ul class=\"info\"><b>" + i18n("Size") + ": </b>";
     innerHTML += KIO::convertSize(size);
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("Files") + ": \
</b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Files") + ": </b>";
     innerHTML += QString().setNum(files);
-    innerHTML += "</nobr></ul><ul class=\"info\"><nobr><b>" + i18n("Folders") + ": \
</b>"; +    innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>";
     innerHTML += QString().setNum(dirs);
-        innerHTML += "</ul><ul class=\"info\"><nobr><b>" + i18n("Total Entries") + \
": </b>"; +        innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Total Entries") \
+ ": </b>";  innerHTML += QString().setNum(m_items.count());
-    innerHTML += "</nobr></ul>";    
+    innerHTML += "</ul>";    
     node.setInnerHTML(innerHTML);
   }
   m_functions->show("info");
--- branches/KDE/3.5/kdeaddons/konq-plugins/sidebar/metabar/src/metabarwidget.cpp \
#531206:531207 @@ -556,7 +556,7 @@
     html += " style=\"display: none;\"";
   }
   
-  html += "><nobr><a";
+  html += "><a";
   
   if(!id.isNull() && !id.isEmpty()){
     html += " id=\"";
@@ -576,7 +576,7 @@
   html += getIconPath(icon);
   html += ");\">";
   html += name;
-  html += "</a></nobr></ul>";
+  html += "</a></ul>";
 }
 
 void MetabarWidget::setTheme()
--- branches/KDE/3.5/kdeaddons/konq-plugins/sidebar/metabar/src/settingsplugin.cpp \
#531206:531207 @@ -100,16 +100,16 @@
       bool needsRoot = kcminfo.needsRootPrivileges();
     
       DOM::DOMString innerHTML;
-      innerHTML += "<ul class=\"info\"><nobr><b>" + i18n("Name") + ": </nobr></b>";
+      innerHTML += "<ul class=\"info\"><b>" + i18n("Name") + ": </b>";
       innerHTML += kcminfo.moduleName();
-      innerHTML += "</ul><ul class=\"info\"><nobr><b>" + i18n("Comment") + ": \
</nobr></b>"; +      innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Comment") + \
": </b>";  innerHTML += kcminfo.comment();
       innerHTML += "</ul>";
       
       if(needsRoot){
-        innerHTML += "<ul class=\"info\"><nobr><b>";
+        innerHTML += "<ul class=\"info\"><b>";
         innerHTML += i18n("Needs root privileges");
-        innerHTML += "</b></nobr></ul>";
+        innerHTML += "</b></ul>";
       }
       node.setInnerHTML(innerHTML);
       


[prev in list] [next in list] [prev in thread] [next in thread]