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

List:       kde-commits
Subject:    koffice/kivio
From:       Peter Simonsson <psn () linux ! se>
Date:       2005-12-27 22:55:47
Message-ID: 1135724147.416134.26305.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 491892 by psn:

Add a stencil list palette


 M  +10 -0     kiviopart/kivio_view.cpp  
 M  +3 -0      kiviopart/kivio_view.h  
 M  +1 -1      kiviopart/kivioglobal.cpp  
 M  +6 -6      kiviopart/ui/Makefile.am  
 A             kiviopart/ui/objectlistpalette.cpp   [License: GPL (v2+)]
 A             kiviopart/ui/objectlistpalette.h   [License: GPL (v2+)]
 M  +1 -1      plugins/kivioselecttool/tool_select.cpp  


--- trunk/koffice/kivio/kiviopart/kivio_view.cpp #491891:491892
@@ -127,6 +127,7 @@
 #include "kivioaddstencilsetpanel.h"
 #include "kiviostencilsetinstaller.h"
 #include "addstenciltool.h"
+#include "objectlistpalette.h"
 
 #define TOGGLE_ACTION(X) ((KToggleAction*)actionCollection()->action(X))
 #define MOUSEPOS_TEXT 1000
@@ -264,6 +265,7 @@
   // Must be executed before setActivePage() and before setupActions()
   createBirdEyeDock();
   createLayerDock();
+  createObjectListPalette();
   createGeometryDock();
   createProtectionDock();
 //   createAddStencilSetDock();
@@ -369,6 +371,12 @@
   connect(this, SIGNAL(updateStencilSetList()), m_addStencilSetPanel, \
SLOT(updateList()));  }
 
+void KivioView::createObjectListPalette()
+{
+  m_objectListPalette = new Kivio::ObjectListPalette(this);
+  m_objectListPalette->setCaption("Stencils");
+  paletteManager()->addWidget(m_objectListPalette, "objectlistpalette", \
"birdeyedocker"); +}
 
 void KivioView::setupActions()
 {
@@ -666,6 +674,7 @@
 
   m_pCanvas->guideLines().setGuideLines(m_pActivePage->horizontalGuideLines(),
  m_pActivePage->verticalGuideLines());
+  m_objectListPalette->updateObjectList();
 }
 
 void KivioView::setActiveSpawnerSet( KivioStencilSpawnerSet *set )
@@ -820,6 +829,7 @@
   m_pCanvas->updateScrollBars();
   vRuler->update();
   hRuler->update();
+  m_objectListPalette->updateObjectList();
 }
 
 void KivioView::paintContent( KivioPainter&, const QRect&, bool)
--- trunk/koffice/kivio/kiviopart/kivio_view.h #491891:491892
@@ -39,6 +39,7 @@
   class PluginManager;
   class AddStencilSetPanel;
   class AddStencilTool;
+  class ObjectListPalette;
 }
 
 class KivioBirdEyePanel;
@@ -154,6 +155,7 @@
     void createBirdEyeDock();
     void createProtectionDock();
     void createAddStencilSetDock();
+    void createObjectListPalette();
 
   public slots:
     void paperLayoutDlg();
@@ -339,6 +341,7 @@
     KivioBirdEyePanel* m_pBirdEyePanel;
     KivioProtectionPanel* m_pProtectionPanel;
     Kivio::AddStencilSetPanel* m_addStencilSetPanel;
+    Kivio::ObjectListPalette* m_objectListPalette;
     KToggleAction* showPageMargins;
     KToggleAction* showRulers;
     KToggleAction* showGrid;
--- trunk/koffice/kivio/kiviopart/kivioglobal.cpp #491891:491892
@@ -1306,7 +1306,7 @@
   pix.fill(Qt::white);
   KivioScreenPainter kpainter;
   kpainter.start(&pix);
-  kpainter.translateBy((width - rect.width()) / 2, (height - \
rect.height()) / 2); +  kpainter.translateBy(-rect.x() + ((width - \
rect.width()) / 2), -rect.y() + ((height - rect.height()) / 2));  \
KivioIntraStencilData data;  data.painter = &kpainter;
   data.zoomHandler = &zoomHandler;
--- trunk/koffice/kivio/kiviopart/ui/Makefile.am #491891:491892
@@ -12,9 +12,9 @@
 libui_la_METASOURCES = AUTO
 
 libui_la_SOURCES = aligndialog.ui kivio_birdeye_panel.cpp \
-		kivio_birdeye_panel_base.ui kivio_layer_panel_base.ui \
                kivio_layer_panel.cpp \
-		kivio_protection_panel_base.ui kivio_protection_panel.cpp \
                kiviooptionsdialog.cpp \
-		export_page_dialog_base.ui export_page_dialog.cpp kiviotextformatdlg.cpp \
                kiviostencilformatdlg.cpp \
-		kivioarrowheadformatdlg.cpp kivioaligndialog.cpp \
                kivioaddstencilsetpanel.cpp \
-		kiviostencilsetwidget.ui
-noinst_HEADERS = kivioaddstencilsetpanel.h
+			kivio_birdeye_panel_base.ui kivio_layer_panel_base.ui \
kivio_layer_panel.cpp \ +			kivio_protection_panel_base.ui \
kivio_protection_panel.cpp kiviooptionsdialog.cpp \ \
+			export_page_dialog_base.ui export_page_dialog.cpp \
kiviotextformatdlg.cpp kiviostencilformatdlg.cpp \ \
+			kivioarrowheadformatdlg.cpp kivioaligndialog.cpp \
kivioaddstencilsetpanel.cpp \ +			kiviostencilsetwidget.ui \
objectlistpalette.cpp +noinst_HEADERS = kivioaddstencilsetpanel.h \
                objectlistpalette.h
--- trunk/koffice/kivio/plugins/kivioselecttool/tool_select.cpp \
#491891:491892 @@ -110,7 +110,7 @@
       if( m->button() == RightButton ) {
         showPopupMenu(m->globalPos());
       } else if( m->button() == LeftButton ) {
-        if((m->state() & ControlButton) || (m->state() & ShiftButton)) {
+        if(m->state() & ControlButton) {
           m_controlKey = true;
         } else {
           m_controlKey = false;


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