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

List:       kde-commits
Subject:    branches/work/kde4/playground/base/systemsettings
From:       Laurent Montel <montel () kde ! org>
Date:       2006-05-21 16:37:23
Message-ID: 1148229443.695070.28627.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 543294 by mlaurent:

Port to new kdelibs


 M  +1 -1      kcmsearch.cpp  
 M  +2 -2      kcmsearch.h  
 M  +3 -3      kcmultiwidget.cpp  
 M  +8 -6      mainwindow.cpp  
 M  +3 -3      mainwindow.h  


--- branches/work/kde4/playground/base/systemsettings/kcmsearch.cpp #543293:543294
@@ -25,7 +25,7 @@
 #include <QTableView>
 
 KcmSearch::KcmSearch(QTableView * mainView, QWidget * parent)
-:KIconViewSearchLine(parent)
+:K3IconViewSearchLine(parent)
 {
     this->mainView = mainView;
 }
--- branches/work/kde4/playground/base/systemsettings/kcmsearch.h #543293:543294
@@ -20,7 +20,7 @@
 #ifndef KCMSEARCH_H
 #define KCMSEARCH_H
 
-#include <kiconviewsearchline.h>
+#include <k3iconviewsearchline.h>
 #include "kcmodulemenu.h"
 
 class QTableView;
@@ -29,7 +29,7 @@
  * Searches all the ModuleIconItem's in MainWindow and "disables" the ones
  * whos keywords don't match the current search.
  */
-class KcmSearch : public KIconViewSearchLine {
+class KcmSearch : public K3IconViewSearchLine {
   Q_OBJECT
 
 public:
--- branches/work/kde4/playground/base/systemsettings/kcmultiwidget.cpp #543293:543294
@@ -194,7 +194,7 @@
             break;
         }
 
-    KUrl url( KURL("help:/"), docPath );
+    KUrl url( KUrl("help:/"), docPath );
 
     if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
         KProcess process;
@@ -258,12 +258,12 @@
                 parentmodulenames += moduleinfo.moduleName();
                 page = (QFrame*)addHBoxPage( parentmodulenames, moduleinfo.comment(),
                         SmallIcon( moduleinfo.icon(),
-                            IconSize( KIcon::Small ) ) );
+                            IconSize( K3Icon::Small ) ) );
                 break;
             case IconList:
                 page =  (QFrame*)addHBoxPage( moduleinfo.moduleName(),
                         moduleinfo.comment(), DesktopIcon( moduleinfo.icon(),
-                            KIcon::SizeMedium ) );
+                            K3Icon::SizeMedium ) );
                 break;
             case Plain:
                 page = plainPage();
--- branches/work/kde4/playground/base/systemsettings/mainwindow.cpp #543293:543294
@@ -20,6 +20,8 @@
 #include "mainwindow.h"
 
 #include <kstdaction.h>
+#include <kactioncollection.h>
+#include <k3widgetaction.h>
 #include <qwhatsthis.h>
 #include <qlabel.h>
 #include <QList>
@@ -32,7 +34,7 @@
 #include <kiconloader.h>
 #include <kcmoduleloader.h>
 #include <kdialogbase.h>
-#include <kiconviewsearchline.h>
+#include <k3iconviewsearchline.h>
 #include <kapplication.h>
 #include <kaboutapplication.h>
 #include <kdebug.h>
@@ -138,15 +140,15 @@
     //searchLabel->setPixmap( SmallIcon("find"));
     searchLabel->setMargin(2);
     searchText =
-        new KWidgetAction(searchLabel, i18n("&Search:"), Qt::Key_F6, 0, 0,
+        new K3WidgetAction(searchLabel, i18n("&Search:"), Qt::Key_F6, 0, 0,
                           actionCollection(), "searchText");
     searchLabel->setBuddy(search);
 
     searchAction =
-        new KWidgetAction(search, i18n("Search System Settings"), 0, 0, 0,
+        new K3WidgetAction(search, i18n("Search System Settings"), 0, 0, 0,
                           actionCollection(), "search");
     searchAction->setShortcutConfigurable(false);
-    searchAction->setAutoSized(true);
+    //searchAction->setAutoSized(true);
     QWhatsThis::add(search, i18n("Search Bar<p>" "Enter a search term."));
 
     searchClear = new KAction(i18n("Reset"), QApplication::reverseLayout()
@@ -293,10 +295,10 @@
 {
     if (currentModule->aboutData()) {
         aboutModuleAction->
-            setText(i18n("Help menu->about <modulename>", "About %1").
+            setText(i18nc("Help menu->about <modulename>", "About %1").
                     arg(currentModule->moduleInfo().moduleName().
                         replace("&", "&&")));
-        aboutModuleAction->setIcon(currentModule->moduleInfo().icon());
+        aboutModuleAction->setIcon(KIcon(currentModule->moduleInfo().icon()));
         aboutModuleAction->setEnabled(true);
     }
     else {
--- branches/work/kde4/playground/base/systemsettings/mainwindow.h #543293:543294
@@ -27,7 +27,7 @@
 class QStackedWidget;
 class KCMultiWidget;
 class KAction;
-class KWidgetAction;
+class K3WidgetAction;
 class KCModule;
 class KCModuleProxy;
 class KAboutData;
@@ -62,9 +62,9 @@
     KAction *defaultModule;
 
     KAction *showAllAction;
-    KWidgetAction *searchText;
+    K3WidgetAction *searchText;
     KAction *searchClear;
-    KWidgetAction *searchAction;
+    K3WidgetAction *searchAction;
 
     KAction *reportBugAction;
     KAction *aboutModuleAction;
[prev in list] [next in list] [prev in thread] [next in thread]