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

List:       kde-commits
Subject:    kdeextragear-1/gwenview
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2004-06-11 21:55:26
Message-ID: 20040611215526.4152216AF3 () office ! kde ! org
[Download RAW message or body]

CVS commit by gateau: 

KIPI fixes


  M +3 -0      gwenviewapp/gwenviewui.rc   1.3
  M +8 -0      src/gvmainwindow.cpp   1.111


--- kdeextragear-1/gwenview/gwenviewapp/gwenviewui.rc  #1.2:1.3
@@ -60,4 +60,7 @@
       <text>Tools</text>
     </Menu>
+    <Menu name="kipi_batch">
+      <text>Batch processing</text>
+    </Menu>
     <Menu name="kipi_import">
       <text>Import</text>

--- kdeextragear-1/gwenview/src/gvmainwindow.cpp  #1.110:1.111
@@ -991,4 +991,5 @@ void GVMainWindow::loadPlugins() {
         categoryMap[KIPI::EFFECTSPLUGIN]="kipi_effects";
         categoryMap[KIPI::TOOLSPLUGIN]="kipi_tools";
+        categoryMap[KIPI::BATCHPLUGIN]="kipi_batch";
         categoryMap[KIPI::IMPORTPLUGIN]="kipi_import";
         categoryMap[KIPI::EXPORTPLUGIN]="kipi_export";
@@ -997,4 +998,5 @@ void GVMainWindow::loadPlugins() {
         GVKIPIInterface* interface = new GVKIPIInterface(this, mFileViewStack);
         KIPI::PluginLoader* loader = new KIPI::PluginLoader(QStringList(), interface );
+        loader->loadPlugins();
 
         // Fill the plugin menu
@@ -1003,5 +1005,11 @@ void GVMainWindow::loadPlugins() {
         for( ; it!=itEnd; ++it ) {
                 KIPI::Plugin* plugin = (*it)->plugin;
+                Q_ASSERT(plugin);
+                if (!plugin) continue;
 
+                if (!categoryMap.contains(plugin->category())) {
+                        kdWarning() << "Unknown category '" << plugin->category() << "'\n";
+                        continue;
+                }
                 QPopupMenu *popup = static_cast<QPopupMenu*>(
                         factory()->container( categoryMap[plugin->category()], this));


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