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

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2006-10-18 9:14:17
Message-ID: 1161162857.637299.2180.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 596711 by amantia:

Regression fix: show the Find in Files when KFileReplace is installed. Was broken due \
to the commit for #132530.

CCBUG: 132530

 M  +5 -1      ChangeLog  
 M  +3 -6      quanta.kdevelop  
 M  +2 -4      src/quanta_init.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #596710:596711
@@ -1,7 +1,11 @@
 This files contains the changes since Quanta 2.0 until the current 3.5.x series.
 
-Version 3.5.5 (Release date: xx-10-2006; Started 01-09-2006):
+Version 3.5.6 (Release date: xx-xx-2006; Started 01-09-2006):
  - bugfixes:
+      - show Find in Files menu if KFileReplace is installed [related to #132530]
+
+Version 3.5.5 (Release date: 11-10-2006; Started 01-09-2006):
+ - bugfixes:
       - do not allow growing of quantarc until it crashes Quanta [#111049]
       - symlink handling fixes (hopefully won't break anything)
       - fix Save As problems, possibly #131728
--- branches/KDE/3.5/kdewebdev/quanta/quanta.kdevelop #596710:596711
@@ -245,10 +245,10 @@
   </kdevcvs>
   <kdevfilecreate>
     <filetypes>
-      <type icon="" ext="h" create="template" name="C++ header" >
+      <type icon="" ext="h" name="C++ header" create="template" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" create="template" name="C++ source" >
+      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
@@ -275,10 +275,7 @@
       <processPrimaryTypes>true</processPrimaryTypes>
       <processFunctionArguments>false</processFunctionArguments>
     </codecompletion>
-    <references>
-      <pcs>Qt3</pcs>
-      <pcs>KDElibs3</pcs>
-    </references>
+    <references/>
     <creategettersetter>
       <prefixGet/>
       <prefixSet>set</prefixSet>
--- branches/KDE/3.5/kdewebdev/quanta/src/quanta_init.cpp #596710:596711
@@ -176,8 +176,6 @@
           m_quanta->m_debugger, SLOT(slotHandleEvent(const QString &, const QString \
&, const QString &)));  connect(m_quanta->m_debugger, SIGNAL(hideSplash()), m_quanta, \
SLOT(slotHideSplash()));  
-  m_quanta->m_pluginInterface->readConfig(); //call here, so the plugin actions are \
                created before the GUI
-
   //m_quanta->KDockMainWindow::createGUI( QString::null, false /* conserveMemory */ \
);  m_quanta->createShellGUI(true);
 
@@ -1094,8 +1092,8 @@
   connect(m_quanta->m_pluginInterface, SIGNAL(statusMsg(const QString &)),
           m_quanta, SLOT(slotStatusMsg(const QString & )));
 
-  QuantaPlugin *fileReplacePlugin =m_quanta-> \
                m_pluginInterface->plugin("KFileReplace");
-  if (!fileReplacePlugin)
+  m_quanta->m_pluginInterface->readConfig();
+  if (!m_quanta->m_pluginInterface->pluginAvailable("KFileReplace"))
   {
     delete m_quanta->actionCollection()->action("find_in_files");
   }


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