[fwbuilder-commits] r2637 - in branches/v4_0: doc src/gui
Brought to you by:
mikehorn
Menu
▾
▴
[fwbuilder-commits] r2637 - in branches/v4_0: doc src/gui
|
From: <ya...@in...> - 2010-02-28 21:57:09
|
Author: yalovoy
Date: 2010-02-28 13:56:57 -0800 (Sun, 28 Feb 2010)
New Revision: 2637
Modified:
branches/v4_0/doc/ChangeLog
branches/v4_0/src/gui/FWWindow.cpp
branches/v4_0/src/gui/RuleSetView.cpp
branches/v4_0/src/gui/RuleSetView.h
Log:
refs #1202: Main menu "Rules" does not match rule context menu
Items in the main menu Rules should get disabled and enabled just
like items in the context menu do.
Added action: insertRuleAction, addRuleAfterCurrentAction,
addToGroupAboveAction, addToGroupBelowAction
Modified: branches/v4_0/doc/ChangeLog
===================================================================
--- branches/v4_0/doc/ChangeLog 2010-02-28 19:35:52 UTC (rev 2636)
+++ branches/v4_0/doc/ChangeLog 2010-02-28 21:56:57 UTC (rev 2637)
@@ -1,3 +1,14 @@
+2010-02-28 yalovoy <ya...@gm...>
+ * refs #1202: Main menu "Rules" does not match rule context menu
+ Items in the main menu Rules should get disabled and enabled just
+ like items in the context menu do.
+ Added action: insertRuleAction, addRuleAfterCurrentAction,
+ addToGroupAboveAction, addToGroupBelowAction
+ Affected files:
+ FWWindow.cpp
+ RuleSetView.cpp
+ RuleSetView.h
+
2010-02-27 vadim <va...@vk...>
* ../src/gui/Tutorial/getting_started/html/page0.html: "Getting
Modified: branches/v4_0/src/gui/FWWindow.cpp
===================================================================
--- branches/v4_0/src/gui/FWWindow.cpp 2010-02-28 19:35:52 UTC (rev 2636)
+++ branches/v4_0/src/gui/FWWindow.cpp 2010-02-28 21:56:57 UTC (rev 2637)
@@ -1533,8 +1533,13 @@
{
m_mainWindow->RulesMenu->addAction(rsv->removeFromGroupAction);
m_mainWindow->RulesMenu->addAction(rsv->newGroupAction);
+ m_mainWindow->RulesMenu->addAction(rsv->addToGroupAboveAction);
+ m_mainWindow->RulesMenu->addAction(rsv->addToGroupBelowAction);
m_mainWindow->RulesMenu->addAction(rsv->moveRuleUpAction);
m_mainWindow->RulesMenu->addAction(rsv->moveRuleDownAction);
+ m_mainWindow->RulesMenu->addAction(rsv->insertRuleAction);
+ m_mainWindow->RulesMenu->addAction(rsv->addRuleAfterCurrentAction);
+
}
m_mainWindow->RulesMenu->addSeparator();
m_mainWindow->RulesMenu->addActions(ruleStaticActions);
Modified: branches/v4_0/src/gui/RuleSetView.cpp
===================================================================
--- branches/v4_0/src/gui/RuleSetView.cpp 2010-02-28 19:35:52 UTC (rev 2636)
+++ branches/v4_0/src/gui/RuleSetView.cpp 2010-02-28 21:56:57 UTC (rev 2637)
@@ -117,6 +117,10 @@
delete moveRuleDownAction;
delete removeFromGroupAction;
delete newGroupAction;
+ delete insertRuleAction;
+ delete addRuleAfterCurrentAction;
+ delete addToGroupAboveAction;
+ delete addToGroupBelowAction;
}
void RuleSetView::init()
@@ -171,6 +175,13 @@
// New group
newGroupAction = createAction(tr("New group"), SLOT( newGroup()));
+ // Insert Rule
+ insertRuleAction = createAction( tr("Insert Rule"), SLOT( insertRule() ) );
+
+ addRuleAfterCurrentAction = createAction(tr("Add Rule Below"), SLOT( addRuleAfterCurrent() ));
+
+ addToGroupAboveAction = createAction("addToGroupAboveAction", SLOT( addToGroupAbove() ));
+ addToGroupBelowAction = createAction("addToGroupBelowAction", SLOT( addToGroupBelow() ));
}
@@ -723,37 +734,17 @@
menu->addAction(removeFromGroupAction);
menu->addAction(newGroupAction);
+ menu->addAction(addToGroupAboveAction);
+ menu->addAction(addToGroupBelowAction);
- if (selectedIndexes.size() > 0 && isOnlyTopLevelRules(selectedIndexes))
- {
-
-
- QString nn =
- md->nodeFromIndex(selectedIndexes.first())->nameOfPredecessorGroup();
-
- if (!nn.isEmpty())
- {
- label = tr("Add to the group ") + nn;
- menu->addAction( label, this, SLOT( addToGroupAbove() ));
- }
-
- nn = md->nodeFromIndex(selectedIndexes.last())->nameOfSuccessorGroup();
-
- if (!nn.isEmpty())
- {
- label = tr("Add to the group ") + nn;
- menu->addAction( label, this, SLOT( addToGroupBelow() ));
- }
- }
-
menu->addSeparator();
addChangeColorSubmenu(menu);
menu->addSeparator();
- menu->addAction( tr("Insert Rule"), this, SLOT( insertRule() ) );
- menu->addAction( tr("Add Rule Below"), this, SLOT( addRuleAfterCurrent() ) );
+ menu->addAction( insertRuleAction );
+ menu->addAction( addRuleAfterCurrentAction );
label = (selectionSize==1)?tr("Remove Rule"):tr("Remove Rules");
menu->addAction( label, this, SLOT( removeRule()));
@@ -2775,6 +2766,18 @@
moveRuleDownAction->setVisible(false);
moveRuleDownAction->setEnabled(false);
+ addToGroupAboveAction->setVisible(false);
+ addToGroupAboveAction->setEnabled(false);
+
+ addToGroupBelowAction->setVisible(false);
+ addToGroupBelowAction->setEnabled(false);
+
+ insertRuleAction->setVisible(false);
+ insertRuleAction->setEnabled(false);
+
+ addRuleAfterCurrentAction->setVisible(false);
+ addRuleAfterCurrentAction->setEnabled(false);
+
} else
{
bool inGroup = true;
@@ -2800,12 +2803,54 @@
{
moveRuleUpAction->setText(tr("Move Rules up"));
moveRuleDownAction->setText(tr("Move Rules down"));
+
} else
{
moveRuleUpAction->setText(tr("Move Rule up"));
moveRuleDownAction->setText(tr("Move Rule down"));
}
+
+
+ if (topLevelOnly)
+ {
+ QString addToGroupLabel = tr("Add to the group ");
+ QString nn;
+
+ nn = md->nodeFromIndex(selectedIndexes.first())->nameOfPredecessorGroup();
+ if (!nn.isEmpty())
+ {
+ addToGroupAboveAction->setText(addToGroupLabel + nn);
+ addToGroupAboveAction->setVisible(true);
+ addToGroupAboveAction->setEnabled(true);
+ } else
+ {
+ addToGroupAboveAction->setVisible(false);
+ addToGroupAboveAction->setEnabled(false);
+ }
+
+ nn = md->nodeFromIndex(selectedIndexes.last())->nameOfSuccessorGroup();
+
+ if (!nn.isEmpty())
+ {
+ addToGroupBelowAction->setText(addToGroupLabel + nn);
+ addToGroupBelowAction->setVisible(true);
+ addToGroupBelowAction->setEnabled(true);
+ } else
+ {
+ addToGroupBelowAction->setVisible(false);
+ addToGroupBelowAction->setEnabled(false);
+ }
+
+ } else
+ {
+ addToGroupAboveAction->setVisible(false);
+ addToGroupAboveAction->setEnabled(false);
+
+ addToGroupBelowAction->setVisible(false);
+ addToGroupBelowAction->setEnabled(false);
+ }
+
removeFromGroupAction->setVisible(inGroup);
removeFromGroupAction->setEnabled(outermost);
@@ -2817,6 +2862,12 @@
moveRuleDownAction->setVisible(true);
moveRuleDownAction->setEnabled(true);
+
+ insertRuleAction->setVisible(true);
+ insertRuleAction->setEnabled(true);
+
+ addRuleAfterCurrentAction->setVisible(true);
+ addRuleAfterCurrentAction->setEnabled(true);
}
}
Modified: branches/v4_0/src/gui/RuleSetView.h
===================================================================
--- branches/v4_0/src/gui/RuleSetView.h 2010-02-28 19:35:52 UTC (rev 2636)
+++ branches/v4_0/src/gui/RuleSetView.h 2010-02-28 21:56:57 UTC (rev 2637)
@@ -127,7 +127,12 @@
QAction *moveRuleUpAction;
QAction *moveRuleDownAction;
+ QAction *insertRuleAction;
+ QAction *addRuleAfterCurrentAction;
+ QAction *addToGroupAboveAction;
+ QAction *addToGroupBelowAction;
+
public slots:
void showContextMenu(const QPoint&);
|