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

List:       kde-commits
Subject:    playground
From:       Jakob Petsovits <jpetso () gmx ! at>
Date:       2007-12-28 10:30:33
Message-ID: 1198837833.493230.29691.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 753727 by jpetso:

Icon naming sanity (code changes - playground):
* connection-established -> network-connect
* connect-no -> network-disconnect
and other fixes.


 M  +1 -1      base/kdeprint/libkdeprint/management/kmpropbackend.cpp  
 M  +1 -1      base/kdeprint/libkdeprint/rlpr/kmproprlpr.cpp  
 M  +6 -6      network/knetworksettings/mainwindowimp.cpp  
 M  +1 -1      office/kraft/src/prefsdialog.cpp  
 M  +1 -1      pim/kluje/kluje/preferencesdialog.cpp  
 M  +3 -3      sysadmin/ksystemlog/src/mainWindow.cpp  


--- trunk/playground/base/kdeprint/libkdeprint/management/kmpropbackend.cpp \
#753726:753727 @@ -46,7 +46,7 @@
     main_->addWidget(m_type, 0, 1);
     main_->addWidget(m_uri, 1, 1);
 
-    m_pixmap = "connection-established";
+    m_pixmap = "network-connect";
     m_title = i18n("Interface");
     m_header = i18n("Interface Settings");
 }
--- trunk/playground/base/kdeprint/libkdeprint/rlpr/kmproprlpr.cpp #753726:753727
@@ -46,7 +46,7 @@
     main_->addWidget(m_host, 0, 1);
     main_->addWidget(m_queue, 1, 1);
 
-    m_pixmap = "connection-established";
+    m_pixmap = "network-connect";
     m_title = i18n("Queue");
     m_header = i18n("Remote LPD Queue Settings");
 }
--- trunk/playground/network/knetworksettings/mainwindowimp.cpp #753726:753727
@@ -450,23 +450,23 @@
  
   // Update the icons and information 
 #ifdef QWS
-  item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
+  item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down"))); // KDE \
4 icon names: go-up, go-down  #else
-  item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
+  item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down"))); // KDE 4 icon \
names: go-up, go-down  #endif
   
   QString typeName = "lan";
   if(i->getHardwareName().contains("Local Loopback"))
-    typeName = "lo";
+    typeName = "lo"; // KDE 4 icon name: network-wired
   if(i->getInterfaceName().contains("irda"))
     typeName = "irda";
   if(i->getInterfaceName().contains("wlan"))
-    typeName = "wlan";
+    typeName = "wlan"; // KDE 4 icon name: network-wireless
   if(i->getInterfaceName().contains("usb"))
-    typeName = "usb";
+    typeName = "usb"; // KDE 4 icon name: drive-removable-usb
   
   if(!i->isAttached())
-    typeName = "connect_no";
+    typeName = "connect_no"; // KDE 4 icon name: network-disconnect
   // Actually try to use the Module
   if(i->getModuleOwner() != NULL)
     typeName = i->getModuleOwner()->getPixmapName(i);
--- trunk/playground/office/kraft/src/prefsdialog.cpp #753726:753727
@@ -57,7 +57,7 @@
   QLabel *label;
   QFrame *topFrame = addPage( i18n( "Database" ),
                               i18n( "Database Connection Settings" ),
-                              DesktopIcon( "connect_no" ) );
+                              DesktopIcon( "connect_no" ) ); // KDE 4 name: \
(probably) network-server-database  
   QVBoxLayout *vboxLay = new QVBoxLayout( topFrame );
   QGridLayout *topLayout = new QGridLayout( topFrame );
--- trunk/playground/pim/kluje/kluje/preferencesdialog.cpp #753726:753727
@@ -49,7 +49,7 @@
 {
     QFrame *page = addPage (QString ("Server"),
                             QString ("LiveJournal connection info"),
-                            SmallIcon ("connect_established"));
+                            SmallIcon ("connect_established")); // KDE 3 name: \
network-server  
     QVBoxLayout *topLayout = new QVBoxLayout (page, 0, spacingHint ());
 
--- trunk/playground/sysadmin/ksystemlog/src/mainWindow.cpp #753726:753727
@@ -413,7 +413,7 @@
 	
 	if (paused == true) {
 		d->resumePauseAction->setText(i18n("Resu&me"));
-		d->resumePauseAction->setIcon(KIcon("connection-established"));
+		d->resumePauseAction->setIcon(KIcon("media-playback-start"));
 		d->resumePauseAction->setShortcut(Qt::CTRL + Qt::Key_M);
 		d->resumePauseAction->setToolTip(i18n("Resume the watching of the current log"));
 		d->resumePauseAction->setWhatsThis(i18n("Resumes the watching of the current log. \
This action is only available when the user has already paused the reading.")); @@ \
-421,7 +421,7 @@  }
 	else {
 		d->resumePauseAction->setText(i18n("S&top"));
-		d->resumePauseAction->setIcon(KIcon("connect-no"));
+		d->resumePauseAction->setIcon(KIcon("media-playback-stop"));
 		d->resumePauseAction->setShortcut(Qt::CTRL + Qt::Key_P);
 		d->resumePauseAction->setToolTip(i18n("Pause the watching of the current log"));
 		d->resumePauseAction->setWhatsThis(i18n("Pauses the watching of the current log. \
This action is particularly useful when the system is writing too many lines to log \
files, causing KSystemLog to reload too frequently.")); @@ -717,7 +717,7 @@
 	
 	d->detailAction = actionCollection()->addAction("details", this, \
SLOT(showDetailsDialog()));  d->detailAction->setText(i18n("&Details"));
-	d->detailAction->setIcon(KIcon("help-about"));
+	d->detailAction->setIcon(KIcon("document-preview"));
 	d->detailAction->setShortcut(Qt::ALT + Qt::Key_Return);
 	d->detailAction->setToolTip(i18n("Display details on the selected line"));
 	d->detailAction->setWhatsThis(i18n("Displays a dialog box which contains details on \
the selected line. You are able to navigate through the logs from this dialog box \
with the <b>Previous</b> and <b>Next</b> buttons."));


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