[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [KGraphViewer/libkgraphviz] 3a11718: Minor: Fix some signal/slot
From: Kevin Funk <krf () electrostorm ! net>
Date: 2010-12-16 17:22:19
Message-ID: 20101216172219.D23A4A60B0 () git ! kde ! org
[Download RAW message or body]
commit 3a117186c77f64659a7c8a75ef15c74a5e5fa5f8
branch libkgraphviz
Author: Kevin Funk <krf@electrostorm.net>
Date: Thu Dec 16 15:57:11 2010 +0100
Minor: Fix some signal/slot connections
diff --git a/src/kgrapheditor.cpp b/src/kgrapheditor.cpp
index 40e2ff1..9f261fb 100644
--- a/src/kgrapheditor.cpp
+++ b/src/kgrapheditor.cpp
@@ -74,7 +74,8 @@ KGraphEditor::KGraphEditor() :
setCentralWidget(m_widget);
- QDockWidget* topLeftDockWidget = new QDockWidget(this);
+ QDockWidget* topLeftDockWidget = new QDockWidget(i18n("Node tree"), this);
+ topLeftDockWidget->setObjectName("nodesTreeWidget");
m_treeWidget = new KGraphEditorNodesTreeWidget(topLeftDockWidget);
connect(m_treeWidget,SIGNAL(itemChanged(QTreeWidgetItem*,int)),
this,SLOT(slotItemChanged(QTreeWidgetItem*,int)));
@@ -92,14 +93,15 @@ KGraphEditor::KGraphEditor() :
topLeftDockWidget->setWidget(m_treeWidget);
addDockWidget ( Qt::LeftDockWidgetArea, topLeftDockWidget );
- QDockWidget* bottomLeftDockWidget = new QDockWidget(this);
+ QDockWidget* bottomLeftDockWidget = new QDockWidget(i18n("Element tree"), this);
+ bottomLeftDockWidget->setObjectName("elementTreeWidget");
m_newElementAttributesWidget = new KGraphEditorElementTreeWidget(bottomLeftDockWidget);
connect(m_newElementAttributesWidget,SIGNAL(itemChanged(QTreeWidgetItem*,int)),
this,SLOT(slotNewElementItemChanged(QTreeWidgetItem*,int)));
- connect(m_newElementAttributesWidget, SIGNAL(addAttribute()),
- this, SLOT(slotAddNewElementAttribute()));
- connect(m_newElementAttributesWidget, SIGNAL(removeAttribute(const QString&)),
- this, SLOT(slotRemoveNewElementAttribute(const QString&)));
+ connect(m_newElementAttributesWidget, SIGNAL(addAttribute(QString)),
+ this, SLOT(slotAddNewElementAttribute(QString)));
+ connect(m_newElementAttributesWidget, SIGNAL(removeAttribute(QString)),
+ this, SLOT(slotRemoveNewElementAttribute(QString)));
m_newElementAttributesWidget->setColumnCount(2);
bottomLeftDockWidget->setWidget(m_newElementAttributesWidget);
addDockWidget ( Qt::LeftDockWidgetArea, bottomLeftDockWidget );
@@ -232,7 +234,7 @@ void KGraphEditor::setupActions()
actionCollection()->addAction( KStandardAction::Save, "file_save", this, SLOT( fileSave() ) );
actionCollection()->addAction( KStandardAction::SaveAs, "file_save_as", this, SLOT( fileSaveAs() ) );
- actionCollection()->addAction( KStandardAction::Quit, "file_quit", this, SLOT( quit() ) );
+ actionCollection()->addAction( KStandardAction::Quit, "file_quit", qApp, SLOT( quit() ) );
m_statusbarAction = KStandardAction::showStatusbar(this, SLOT(optionsShowStatusbar()), this);
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index a953f09..fc2c5b7 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -343,6 +343,7 @@ void DotGraphViewPrivate::setupPopup()
foreach (const QString& algorithm, algorithms) {
KAction* action = new KAction(algorithm, q);
action->setWhatsThis(i18n("Layout the graph using the %1 program.", algorithm));
+ action->setCheckable(true);
actionCollection()->addAction(QString("layout_%1").arg(algorithm), action);
m_layoutAlgoSelectAction->addAction(action);
diff --git a/src/kgraphviz/dotgraphview.h b/src/kgraphviz/dotgraphview.h
index b46327c..2d944f4 100644
--- a/src/kgraphviz/dotgraphview.h
+++ b/src/kgraphviz/dotgraphview.h
@@ -74,8 +74,6 @@ public:
static KGraphViewer::KGraphViewerInterface::PannerPosition zoomPos(const QString&);
static QString zoomPosString(KGraphViewer::KGraphViewerInterface::PannerPosition);
- void setPannerEnabled(bool enabled);
-
virtual void wheelEvent(QWheelEvent* e);
/// multiplies current zoom factor with @p factor
@@ -159,6 +157,7 @@ public Q_SLOTS:
void print();
void printPreview();
void viewBevActivated(int newPos);
+ void setPannerEnabled(bool enabled);
void slotExportImage();
void slotSelectLayoutAlgo(const QString& text);
void slotLayoutSpecify();
diff --git a/src/kgraphviz/support/dot2qtconsts.cpp b/src/kgraphviz/support/dot2qtconsts.cpp
index d1fba1f..312ee76 100644
--- a/src/kgraphviz/support/dot2qtconsts.cpp
+++ b/src/kgraphviz/support/dot2qtconsts.cpp
@@ -932,7 +932,7 @@ QFont Dot2QtConsts::qtFont(const QString& dotFont) const
return (*(m_psFonts.find(dotFont)));
else
{
- qWarning() << "Unknown dot font '" << dotFont << "'. returning Qt default.";
+ kWarning() << "Unknown dot font '" << dotFont << "'. returning Qt default.";
return QFont(QFont::substitute(dotFont));
}
}
diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui
index 4f9d7f2..80508e7 100644
--- a/src/part/simpleprintingpagesetupbase.ui
+++ b/src/part/simpleprintingpagesetupbase.ui
@@ -398,9 +398,6 @@
<property name="text" >
<string/>
</property>
- <property name="icon" >
- <iconset/>
- </property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic