'KDE/kdewebdev/quanta'

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

List:       kde-commits
Subject:    KDE/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2008-04-14 14:31:14
Message-ID: 1208183474.368068.11456.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 796908 by amantia:

Make loading of toolbars as separate toolbars work.

 M  +20 -18    plugins/usertoolbars/usertoolbarspart.cpp  
 M  +15 -6     quanta.kdevelop  
 M  +0 -53     quanta.kdevelop.filelist  
 M  +1 -1      src/profile.config  


--- trunk/KDE/kdewebdev/quanta/plugins/usertoolbars/usertoolbarspart.cpp \
#796907:796908 @@ -179,7 +179,7 @@
 void UserToolbarsPart::init()
 {
   KConfigGroup config( UserToolbarsFactory::componentData().config(), "General" );
-  m_separateToolbars = config.readEntry("Separate toolbars", false);
+  m_separateToolbars = config.readEntry("Separate toolbars", true);
   m_createActionsMenu = config.readEntry("Create Actions menu", true);
   slotAdjustActions();
   ToolbarGUIBuilder::ref(KDevelop::Core::self()->uiController()->activeMainWindow())->setSeparateToolbars(m_separateToolbars);
 @@ -327,9 +327,9 @@
       p_toolbar = it.value();
       kDebug(24000) << "p_toolbar->guiClient in setSeparateToolbars:" <<  \
p_toolbar->guiClient->domDocument().toString();  \
                mw->guiFactory()->removeClient(p_toolbar->guiClient);
-/*      if (m_separateToolbars)
+     if (m_separateToolbars)
         p_toolbar->guiClient->setClientBuilder(mw->clientBuilder());
-      else*/
+      else
         p_toolbar->guiClient->setClientBuilder(ToolbarGUIBuilder::ref(mw));
       mw->guiFactory()->addClient(p_toolbar->guiClient);
     }
@@ -530,9 +530,11 @@
     p_toolbar->user = true; //TODO
     m_toolbarList.insert(toolbarId, p_toolbar);
 
-//     if (!m_separateToolbars)
-    toolbarGUI->setClientBuilder(ToolbarGUIBuilder::ref(KDevelop::Core::self()->uiController()->activeMainWindow()));
 +    if (!m_separateToolbars)
+      toolbarGUI->setClientBuilder(ToolbarGUIBuilder::ref(KDevelop::Core::self()->uiController()->activeMainWindow()));
                
     KDevelop::Core::self()->uiController()->activeMainWindow()->guiFactory()->addClient(toolbarGUI);
 +    if (m_separateToolbars)
+      slotToolbarLoaded(toolbarId);
 
     delete toolbarDom;
  }
@@ -965,7 +967,7 @@
   p_toolbar->id = toolbarId;
   m_toolbarList.insert(toolbarId, p_toolbar);
 
-//   if (!m_separateToolbars)
+   if (!m_separateToolbars)
     toolbarGUI->setClientBuilder(ToolbarGUIBuilder::ref(KDevelop::Core::self()->uiController()->activeMainWindow()));
  KDevelop::Core::self()->uiController()->activeMainWindow()->guiFactory()->addClient(toolbarGUI);
  ToolbarTabWidget::ref()->setCurrentIndex(ToolbarTabWidget::ref()->count()-1);
@@ -1011,12 +1013,12 @@
           p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->componentData());
       ToolbarTabWidget *tb = ToolbarTabWidget::ref();
       QMenu *actionsMenu = static_cast<QMenu*>(factory()->container("actions", \
                this));
-/*      if (m_separateToolbars)
+      if (m_separateToolbars)
       {
         KToolBar *toolbar = \
dynamic_cast<KToolBar*>(KDevelop::Core::self()->uiController()->activeMainWindow()->factory()->container(id, \
p_toolbar->guiClient));  if (toolbar)
-          toolbar->setTitle(i18n(p_toolbar->name.toUtf8()));
-      }// else*/
+          toolbar->setWindowTitle(i18n(p_toolbar->name.toUtf8()));
+      } else
       {
         for (int i = 0; i < tb->count(); i++)
         {
@@ -1024,20 +1026,19 @@
           {
             tb->setTabText(tb->indexOf(tb->page(id)->parentWidget()), \
                i18n(p_toolbar->name.toUtf8()));
             actionsMenu->changeItem(actionsMenu->idAt(i), \
                i18n(p_toolbar->name.toUtf8()));
-/*            if (m_separateToolbars)
+            if (m_separateToolbars)
             {
               mw->guiFactory()->removeClient(p_toolbar->guiClient);
               mw->guiFactory()->addClient(p_toolbar->guiClient);
-             // dynamic_cast<KToolBar*>(tb->page(id)->parentWidget())->setTitle(i18n(p_toolbar->name.toUtf8()));
                
-            }*/
+              dynamic_cast<KToolBar*>(tb->page(id)->parentWidget())->setWindowTitle(i18n(p_toolbar->name.toUtf8()));
 +            }
             break;
           }
         }
       }
-      KXMLGUIFactory::readConfigFile(
-          p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->componentData());
+      KXMLGUIFactory::readConfigFile(p_toolbar->guiClient->xmlFile(), \
p_toolbar->guiClient->componentData());  m_toolbarList.insert(id, p_toolbar);
-kDebug(24000) << "p_toolbar->guiClient after rename:" <<  \
p_toolbar->guiClient->domDocument().toString(); +      kDebug(24000) << \
"p_toolbar->guiClient after rename:" <<  \
p_toolbar->guiClient->domDocument().toString();  
     }
   }
@@ -1189,8 +1190,10 @@
   if (!p_toolbar || !m_createActionsMenu)
     return;
   QMenu *actionsMenu = static_cast<QMenu*>(factory()->container("actions", this));
+//   actionsMenu->show();
   //Plug in the actions & build the menu
   QMenu *menu = new QMenu(actionsMenu);
+  menu->hide();
   menu->setTitle(i18n(p_toolbar->name.toUtf8()));
   QAction *action;
   KActionCollection *ac = p_toolbar->guiClient->actionCollection();
@@ -1208,7 +1211,6 @@
 
 
   actionsMenu->addMenu(menu);
-  actionsMenu->setVisible(true);
   if (m_actionsMenuId == -1)
   {
     KMenuBar *menuBar = \
KDevelop::Core::self()->uiController()->activeMainWindow()->menuBar(); @@ -1222,8 \
+1224,8 @@  }
     }
   }
-  if (m_actionsMenuId != -1)
-     KDevelop::Core::self()->uiController()->activeMainWindow()->menuBar()->setItemVisible(m_actionsMenuId, \
true); +/*  if (m_actionsMenuId != -1)
+     KDevelop::Core::self()->uiController()->activeMainWindow()->menuBar()->setItemVisible(m_actionsMenuId, \
true);*/  p_toolbar->menu = menu;
 }
 
--- trunk/KDE/kdewebdev/quanta/quanta.kdevelop #796907:796908
@@ -22,13 +22,22 @@
   <kdevcustomproject>
     <filelistdirectory>/data/development/sources/kde-trunk/kdewebdev/quanta</filelistdirectory>
  <run>
-      <mainprogram>/data/development/build/kde-trunk/kdewebdev/quanta/src/quanta</mainprogram>
 +      <mainprogram>/opt/kde4/bin/quanta</mainprogram>
       <directoryradio>build</directoryradio>
       <customdirectory>/</customdirectory>
       <programargs/>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
-      <envvars/>
+      <envvars>
+        <envvar value="/opt/kde4" name="KDEDIR" />
+        <envvar value="/opt/kde4" name="KDEDIRS" />
+        <envvar value="/home/andris/.kde4" name="KDEHOME" />
+        <envvar value="kde4-andris" name="KDETMP" />
+        <envvar value="/var/tmp/kdecache4-andris" name="KDEVARTMP" />
+        <envvar value="/opt/kde4/lib64:$LD_LIBRARY_PATH" name="LD_LIBRARY_PATH" />
+        <envvar value="/opt/qt4" name="QTDIR" />
+        <envvar value="/opt/kde4/share:$XDG_DATA_DIRS" name="XDG_DATA_DIRS" />
+      </envvars>
       <globaldebugarguments/>
       <globalcwd>/data/development/build/kde-trunk/kdewebdev</globalcwd>
       <useglobalprogram>false</useglobalprogram>
@@ -93,16 +102,16 @@
   </kdevcustomproject>
   <kdevfilecreate>
     <filetypes>
-      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
         <descr>A new empty C++ file.</descr>
       </type>
-      <type icon="source_h" ext="h" name="C/C++ Header" create="template" >
+      <type icon="source_h" ext="h" create="template" name="C/C++ Header" >
         <descr>A new empty header file for C or C++.</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
         <descr>A new empty C++ file.</descr>
       </type>
-      <type icon="source_f" ext="for" name="Preprocessed Fortran" create="template" \
> +      <type icon="source_f" ext="for" create="template" name="Preprocessed \
> Fortran" >
         <descr>A new empty preprocessed Fortran file.</descr>
       </type>
     </filetypes>
--- trunk/KDE/kdewebdev/quanta/quanta.kdevelop.filelist #796907:796908
@@ -93,9 +93,6 @@
 klinkstatus/src/actionmanager.cpp
 klinkstatus/src/actionmanager.h
 klinkstatus/src/engine
-klinkstatus/src/engine/interfaces
-klinkstatus/src/engine/interfaces/isearchmanager.cpp
-klinkstatus/src/engine/interfaces/isearchmanager.h
 klinkstatus/src/engine/linkchecker.cpp
 klinkstatus/src/engine/linkchecker.h
 klinkstatus/src/engine/linkfilter.cpp
@@ -262,17 +259,6 @@
 kommander/executor/instance.h
 kommander/executor/main.cpp
 kommander/executor/register.cpp
-kommander/factory
-kommander/factory/CMakeLists.txt
-kommander/factory/domtool.cpp
-kommander/factory/domtool.h
-kommander/factory/kommanderfactory.cpp
-kommander/factory/kommanderfactory.h
-kommander/factory/kommanderversion.h
-kommander/plugin
-kommander/plugin/CMakeLists.txt
-kommander/plugin/kommanderplugin.cpp
-kommander/plugin/kommanderplugin.h
 kommander/pluginmanager
 kommander/pluginmanager/CMakeLists.txt
 kommander/pluginmanager/main.cpp
@@ -280,31 +266,6 @@
 kommander/pluginmanager/mainwindow.h
 kommander/pluginmanager/pluginmanager.cpp
 kommander/pluginmanager/pluginmanager.h
-kommander/widget
-kommander/widget/CMakeLists.txt
-kommander/widget/expression.cpp
-kommander/widget/expression.h
-kommander/widget/function.cpp
-kommander/widget/function.h
-kommander/widget/functionlib.cpp
-kommander/widget/kommander_export.h
-kommander/widget/kommanderfunctions.cpp
-kommander/widget/kommanderwidget.cpp
-kommander/widget/kommanderwidget.h
-kommander/widget/kommanderwindow.cpp
-kommander/widget/kommanderwindow.h
-kommander/widget/myprocess.cpp
-kommander/widget/myprocess.h
-kommander/widget/parsenode.cpp
-kommander/widget/parsenode.h
-kommander/widget/parser.cpp
-kommander/widget/parser.h
-kommander/widget/parserdata.cpp
-kommander/widget/parserdata.h
-kommander/widget/specialinformation.cpp
-kommander/widget/specialinformation.h
-kommander/widget/specials.cpp
-kommander/widget/specials.h
 kommander/widgets
 kommander/widgets/CMakeLists.txt
 kommander/widgets/buttongroup.cpp
@@ -431,8 +392,6 @@
 kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
 kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
 kxsldbg/kxsldbgpart/qxsldbgdoc.h
-kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
-kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h
 kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
 kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h
 kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp
@@ -448,25 +407,13 @@
 kxsldbg/kxsldbgpart/xsldbgdocmap.h
 kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp
 kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h
-kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp
-kxsldbg/kxsldbgpart/xsldbggloballistitem.h
-kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp
-kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h
 kxsldbg/kxsldbgpart/xsldbginspector.cpp
 kxsldbg/kxsldbgpart/xsldbginspector.h
-kxsldbg/kxsldbgpart/xsldbglistitem.cpp
-kxsldbg/kxsldbgpart/xsldbglistitem.h
-kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
-kxsldbg/kxsldbgpart/xsldbglocallistitem.h
-kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
-kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h
 kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h
 kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
 kxsldbg/kxsldbgpart/xsldbgoutputview.h
 kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp
 kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h
-kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp
-kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h
 kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp
 kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h
 kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp
--- trunk/KDE/kdewebdev/quanta/src/profile.config #796907:796908
@@ -9,4 +9,4 @@
 GenericName=quanta
 
 [Properties]
-List=QuantaCore,Quanta-CreateProject,Quanta-FilesTree,Quanta-Preview,Quanta-ProjectTr \
ee,Quanta-StructureTree,Quanta-TagDialogs,Quanta-TemplatesTree,UserToolbars,Console,Subversion,Quanta-Upload,Quanta-KXSLDbg
 +List=QuantaCore,Quanta-CreateProject,Quanta-FilesTree,Quanta-Preview,Quanta-ProjectT \
ree,Quanta-StructureTree,Quanta-TagDialogs,Quanta-TemplatesTree,UserToolbars,Console,Subversion,Quanta-Upload



[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic