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

List:       kde-commits
Subject:    KDE/kdepim/kontact
From:       Allen Winter <winter () kde ! org>
Date:       2008-01-31 22:49:34
Message-ID: 1201819774.416395.31537.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 769257 by winterz:

icon fixes.
I should backport but I'm tired.


 M  +1 -1      plugins/kaddressbook/kaddressbook_plugin.cpp  
 M  +3 -2      plugins/kmail/summarywidget.cpp  
 M  +1 -1      plugins/knode/knode_plugin.cpp  
 M  +3 -2      plugins/knotes/summarywidget.cpp  
 M  +3 -2      plugins/korganizer/apptsummarywidget.cpp  
 M  +1 -1      plugins/korganizer/todoplugin.cpp  
 M  +3 -2      plugins/korganizer/todosummarywidget.cpp  
 M  +3 -2      plugins/newsticker/summarywidget.cpp  
 M  +1 -1      plugins/planner/planner.cpp  
 M  +4 -4      src/mainwindow.cpp  


--- trunk/KDE/kdepim/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp #769256:769257
@@ -61,7 +61,7 @@
   action->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_C));
   insertNewAction(action);
 
-  action  = new KAction( KIcon("kontact_contacts"), i18n("New Distribution List..."), this);
+  action  = new KAction( KIcon("view-pim-contacts"), i18n("New Distribution List..."), this);
   actionCollection()->addAction("new_distributionlist", action );
   connect(action, SIGNAL(triggered(bool)), SLOT( slotNewDistributionList() ) );
   insertNewAction(action);
--- trunk/KDE/kdepim/kontact/plugins/kmail/summarywidget.cpp #769256:769257
@@ -55,8 +55,9 @@
   mainLayout->setSpacing( 3 );
   mainLayout->setMargin( 3 );
 
-  QPixmap icon = KIconLoader::global()->loadIcon( "kontact_mail", KIconLoader::Desktop,
-                                                  KIconLoader::SizeMedium );
+  QPixmap icon =
+    KIconLoader::global()->loadIcon( "view-pim-mail", KIconLoader::Desktop,
+                                     KIconLoader::SizeMedium );
   QWidget *header = createHeader(this, icon, i18n("New Messages"));
   mLayout = new QGridLayout();
   mLayout->setSpacing( 3 );
--- trunk/KDE/kdepim/kontact/plugins/knode/knode_plugin.cpp #769256:769257
@@ -46,7 +46,7 @@
 {
   setComponentData( KNodePluginFactory::componentData() );
 
-  KAction *action  = new KAction(KIcon("mail_new"), i18n("New Article..."), this);
+  KAction *action = new KAction(KIcon("mail-message-new"), i18n("New Article..."), this);
   actionCollection()->addAction("post_article", action );
   action->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_A));
   connect(action, SIGNAL(triggered(bool)), SLOT( slotPostArticle()));
--- trunk/KDE/kdepim/kontact/plugins/knotes/summarywidget.cpp #769256:769257
@@ -55,8 +55,9 @@
   mainLayout->setSpacing( 3 );
   mainLayout->setMargin( 3 );
 
-  QPixmap icon = KIconLoader::global()->loadIcon( "kontact_notes",
-                   KIconLoader::Desktop, KIconLoader::SizeMedium );
+  QPixmap icon =
+    KIconLoader::global()->loadIcon( "view-pim-notes",
+                                     KIconLoader::Desktop, KIconLoader::SizeMedium );
   QWidget* header = createHeader( this, icon, i18n( "Notes" ) );
   mainLayout->addWidget( header );
 
--- trunk/KDE/kdepim/kontact/plugins/korganizer/apptsummarywidget.cpp #769256:769257
@@ -63,8 +63,9 @@
   mainLayout->setSpacing( 3 );
   mainLayout->setMargin( 3 );
 
-  QPixmap icon = KIconLoader::global()->loadIcon( "kontact_date",
-                                                  KIconLoader::Desktop, KIconLoader::SizeMedium );
+  QPixmap icon =
+    KIconLoader::global()->loadIcon( "view-pim-calendar",
+                                     KIconLoader::Desktop, KIconLoader::SizeMedium );
   QWidget *header = createHeader( this, icon, i18n( "Upcoming Events" ) );
   mainLayout->addWidget( header );
 
--- trunk/KDE/kdepim/kontact/plugins/korganizer/todoplugin.cpp #769256:769257
@@ -62,7 +62,7 @@
   KIconLoader::global()->addAppDir("korganizer");
 
 
-  KAction *action  = new KAction(KIcon("newtodo"), i18n("New To-do..."), this);
+  KAction *action  = new KAction(KIcon("task-new"), i18n("New To-do..."), this);
   actionCollection()->addAction("new_todo", action );
   action->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_T));
   connect(action, SIGNAL(triggered(bool)), SLOT( slotNewTodo() ));
--- trunk/KDE/kdepim/kontact/plugins/korganizer/todosummarywidget.cpp #769256:769257
@@ -67,8 +67,9 @@
   mainLayout->setSpacing( 3 );
   mainLayout->setMargin( 3 );
 
-  QPixmap icon = KIconLoader::global()->loadIcon( "kontact_todo",
-                   KIconLoader::Desktop, KIconLoader::SizeMedium );
+  QPixmap icon =
+    KIconLoader::global()->loadIcon( "view-pim-tasks",
+                                     KIconLoader::Desktop, KIconLoader::SizeMedium );
   QWidget *header = createHeader( this, icon, i18n( "Pending To-dos" ) );
   mainLayout->addWidget( header );
 
--- trunk/KDE/kdepim/kontact/plugins/newsticker/summarywidget.cpp #769256:769257
@@ -53,8 +53,9 @@
   vlay->setSpacing( 3 );
   vlay->setMargin( 3 );
 
-  QPixmap icon = KIconLoader::global()->loadIcon( "kontact_news",
-                                                  KIconLoader::Desktop, KIconLoader::SizeMedium );
+  QPixmap icon =
+    KIconLoader::global()->loadIcon( "view-pim-news",
+                                     KIconLoader::Desktop, KIconLoader::SizeMedium );
 
   QWidget *header = createHeader( this, icon, i18n( "News Feeds" ) );
   vlay->addWidget( header );
--- trunk/KDE/kdepim/kontact/plugins/planner/planner.cpp #769256:769257
@@ -354,7 +354,7 @@
       }
 
       //Show Event icon
-      QPixmap re = loader.loadIcon( "appointment", KIconLoader::Small );
+      QPixmap re = loader.loadIcon( "view-calendar-upcoming-events", KIconLoader::Small );
       label = new QLabel( this );
       label->setPixmap( re );
       label->setMaximumWidth( label->minimumSizeHint().width() );
--- trunk/KDE/kdepim/kontact/src/mainwindow.cpp #769256:769257
@@ -99,7 +99,7 @@
                                  int flags = 0 );
 
     // We need to keep track of the plugins which are loaded, so pass a pointer
-    // to the plugin list here. Be sure to reset it back to 0 with 
+    // to the plugin list here. Be sure to reset it back to 0 with
     // setPluginList() as soon as the list gets destroyed.
     ServiceStarter( PluginList *pluginList ) {
       mPlugins = pluginList;
@@ -992,9 +992,9 @@
   KIconLoader *iconloader = KIconLoader::global();
   int iconSize = iconloader->currentSize( KIconLoader::Desktop );
 
-  QString handbook_icon_path = iconloader->iconPath( "contents2",  KIconLoader::Desktop );
-  QString html_icon_path = iconloader->iconPath( "html",  KIconLoader::Desktop );
-  QString wizard_icon_path = iconloader->iconPath( "wizard",  KIconLoader::Desktop );
+  QString handbook_icon_path = iconloader->iconPath( "help-contents",  KIconLoader::Desktop );
+  QString html_icon_path = iconloader->iconPath( "text-html",  KIconLoader::Desktop );
+  QString wizard_icon_path = iconloader->iconPath( "tools-wizard",  KIconLoader::Desktop );
 
   QString info = ki18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
       "<p>%2</p>"
[prev in list] [next in list] [prev in thread] [next in thread]