[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi/formeditor
From: Jarosław Staniek <staniek () kde ! org>
Date: 2010-05-16 15:45:59
Message-ID: 20100516154559.EC69AAC8B5 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1127438 by staniek:
Forms
*ported tab widget, and inserting/renaming/removing tabs
M +15 -2 container.cpp
M +0 -92 factories/containerfactory.cpp
M +97 -0 factories/containerfactory.h
--- trunk/koffice/kexi/formeditor/container.cpp #1127437:1127438
@@ -72,7 +72,20 @@
{
if (!m_container)
return false;
- //kDebug() << o << m_widget;
+ /*if (ev->type() != QEvent::Paint && ev->type() != QEvent::WindowDeactivate && \
ev->type() != QEvent::FocusIn && ev->type() != QEvent::FocusOut && ev->type() != \
QEvent::ChildInserted) { + kDebug() << o << ev << m_widget;
+ }
+ if (ev->type() == QEvent::MouseButtonRelease && \
m_widget->inherits("QTabWidget")) { + kDebug() << "MOUSE RELASE EVENT \
QTabWidget"; + }*/
+ if (ev->type() == QEvent::MouseButtonPress && o->inherits("QTabBar")) {
+ //kDebug() << "TABBAR:" << tabBar << tabBar->parentWidget();
+ QMouseEvent *mev = static_cast<QMouseEvent*>(ev);
+ if (mev->button() == Qt::RightButton) {
+ // (because of tab widget specifics) block right-click for tab widget's \
tab bar, otherwise form will be selected! + return true;
+ }
+ }
#if 0
// When the user click the empty part of tab bar, only MouseReleaseEvent is \
sent, // we need to simulate the Press event
@@ -821,7 +834,7 @@
void Container::selectWidget(QWidget *w, Form::WidgetSelectionFlags flags)
{
if (w) {
- kDebug() << w->objectName();
+ kDebug() << w;
}
if (!w) {
--- trunk/koffice/kexi/formeditor/factories/containerfactory.cpp #1127437:1127438
@@ -367,20 +367,6 @@
///// Internal actions
-//! Action of adding tab to a tab widget
-//! Keeps context expressed using container and receiver widget
-class AddTabAction : public KAction
-{
-public:
- AddTabAction(KFormDesigner::Container *container,
- TabWidgetBase *receiver, QObject *parent);
-public slots:
- void slotTriggered();
-private:
- KFormDesigner::Container *m_container;
- TabWidgetBase *m_receiver;
-};
-
AddTabAction::AddTabAction(KFormDesigner::Container *container,
TabWidgetBase *receiver, QObject *parent)
: KAction(KIcon("tab-new"), i18nc("Add page to tab widget", "Add Page"),
@@ -393,7 +379,6 @@
void AddTabAction::slotTriggered()
{
- kDebug();
if (!m_receiver->inherits("QTabWidget"))
return;
KFormDesigner::Command *command = new InsertPageCommand(m_container, \
m_receiver); @@ -406,20 +391,6 @@
}
}
-//! Action of removing tab from a tab widget
-//! Keeps context expressed using container and receiver widget
-class RemoveTabAction : public KAction
-{
-public:
- RemoveTabAction(KFormDesigner::Container *container,
- TabWidgetBase *receiver, QObject *parent);
-protected slots:
- void slotTriggered();
-private:
- KFormDesigner::Container *m_container;
- TabWidgetBase *m_receiver;
-};
-
RemoveTabAction::RemoveTabAction(KFormDesigner::Container *container,
TabWidgetBase *receiver, QObject *parent)
: KAction(KIcon("tab-close-other"), i18nc("Remove tab widget's page", "Remove \
Page"), @@ -446,20 +417,6 @@
m_container->form()->addCommand(com);
}
-//! Action renaming tab widget's tab
-//! Keeps context expressed using container and receiver widget
-class RenameTabAction : public KAction
-{
-public:
- RenameTabAction(KFormDesigner::Container *container,
- TabWidgetBase *receiver, QObject *parent);
-protected slots:
- void slotTriggered();
-private:
- KFormDesigner::Container *m_container;
- TabWidgetBase *m_receiver;
-};
-
RenameTabAction::RenameTabAction(KFormDesigner::Container *container,
TabWidgetBase *receiver, QObject *parent)
: KAction(KIcon("edit-rename"), i18nc("Rename tab widget's page", "Rename \
Page..."), @@ -483,20 +440,6 @@
m_receiver->setTabText(m_receiver->indexOf(w), name);
}
-//! Action of adding page to a stacked widget
-//! Keeps context expressed using container and receiver widget
-class AddStackPageAction : public KAction
-{
-public:
- AddStackPageAction(KFormDesigner::Container *container,
- QWidget *receiver, QObject *parent);
-protected slots:
- void slotTriggered();
-private:
- KFormDesigner::Container *m_container;
- QWidget *m_receiver;
-};
-
AddStackPageAction::AddStackPageAction(KFormDesigner::Container *container,
QWidget *receiver, QObject *parent)
: KAction(KIcon("tab-new"), i18nc("Add page to a stacked widget", "Add \
Page..."), @@ -524,20 +467,6 @@
}
}
-//! Action of removing page from a stacked widget
-//! Keeps context expressed using container and receiver widget
-class RemoveStackPageAction : public KAction
-{
-public:
- RemoveStackPageAction(KFormDesigner::Container *container,
- QWidget *receiver, QObject *parent);
-protected slots:
- void slotTriggered();
-private:
- KFormDesigner::Container *m_container;
- QWidget *m_receiver;
-};
-
RemoveStackPageAction::RemoveStackPageAction(KFormDesigner::Container *container,
QWidget *receiver, QObject *parent)
: KAction(KIcon("tab-close-other"), i18nc("Remove page from a stacked widget", \
"Remove Page"), @@ -583,27 +512,6 @@
m_container->form()->addCommand(com);
}
-//! Action of moving between pages of a stacked widget
-//! Keeps context expressed using container and receiver widget
-class GoToStackPageAction : public KAction
-{
-public:
- enum Direction {
- Previous,
- Next
- };
- GoToStackPageAction(Direction direction, KFormDesigner::Container *container,
- QWidget *receiver, QObject *parent);
-protected slots:
- void slotTriggered();
-private:
- int nextWidgetIndex() const;
-
- Direction m_direction;
- KFormDesigner::Container *m_container;
- QWidget *m_receiver;
-};
-
GoToStackPageAction::GoToStackPageAction(Direction direction,
KFormDesigner::Container *container,
QWidget *receiver, QObject *parent)
--- trunk/koffice/kexi/formeditor/factories/containerfactory.h #1127437:1127438
@@ -125,6 +125,103 @@
void handleDropEvent(QDropEvent *e);
};
+//! Action of adding tab to a tab widget
+//! Keeps context expressed using container and receiver widget
+class AddTabAction : public KAction
+{
+Q_OBJECT
+public:
+ AddTabAction(KFormDesigner::Container *container,
+ TabWidgetBase *receiver, QObject *parent);
+public slots:
+ void slotTriggered();
+private:
+ KFormDesigner::Container *m_container;
+ TabWidgetBase *m_receiver;
+};
+
+//! Action of removing tab from a tab widget
+//! Keeps context expressed using container and receiver widget
+class RemoveTabAction : public KAction
+{
+Q_OBJECT
+public:
+ RemoveTabAction(KFormDesigner::Container *container,
+ TabWidgetBase *receiver, QObject *parent);
+protected slots:
+ void slotTriggered();
+private:
+ KFormDesigner::Container *m_container;
+ TabWidgetBase *m_receiver;
+};
+
+//! Action renaming tab widget's tab
+//! Keeps context expressed using container and receiver widget
+class RenameTabAction : public KAction
+{
+Q_OBJECT
+public:
+ RenameTabAction(KFormDesigner::Container *container,
+ TabWidgetBase *receiver, QObject *parent);
+protected slots:
+ void slotTriggered();
+private:
+ KFormDesigner::Container *m_container;
+ TabWidgetBase *m_receiver;
+};
+
+//! Action of adding page to a stacked widget
+//! Keeps context expressed using container and receiver widget
+class AddStackPageAction : public KAction
+{
+Q_OBJECT
+public:
+ AddStackPageAction(KFormDesigner::Container *container,
+ QWidget *receiver, QObject *parent);
+protected slots:
+ void slotTriggered();
+private:
+ KFormDesigner::Container *m_container;
+ QWidget *m_receiver;
+};
+
+//! Action of removing page from a stacked widget
+//! Keeps context expressed using container and receiver widget
+class RemoveStackPageAction : public KAction
+{
+Q_OBJECT
+public:
+ RemoveStackPageAction(KFormDesigner::Container *container,
+ QWidget *receiver, QObject *parent);
+protected slots:
+ void slotTriggered();
+private:
+ KFormDesigner::Container *m_container;
+ QWidget *m_receiver;
+};
+
+//! Action of moving between pages of a stacked widget
+//! Keeps context expressed using container and receiver widget
+class GoToStackPageAction : public KAction
+{
+Q_OBJECT
+public:
+ enum Direction {
+ Previous,
+ Next
+ };
+ GoToStackPageAction(Direction direction, KFormDesigner::Container *container,
+ QWidget *receiver, QObject *parent);
+protected slots:
+ void slotTriggered();
+private:
+ int nextWidgetIndex() const;
+
+ Direction m_direction;
+ KFormDesigner::Container *m_container;
+ QWidget *m_receiver;
+};
+
//! A tab widget
class KFDTabWidget : public KFormDesigner::TabWidget
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic