From aacc4016cdcb3151990f285f2993d030f97e5747 Mon Sep 17 00:00:00 2001 From: Theron Tock Date: Mon, 13 Jun 2011 14:29:31 -0700 Subject: [PATCH] Removed help button from UI. Fixes #2495. --- src/libgui/ActionsDialog.cpp | 6 ----- src/libgui/ActionsDialog.h | 5 ---- src/libgui/AddressRangeDialog.cpp | 5 ---- src/libgui/AddressRangeDialog.h | 2 -- src/libgui/AddressTableDialog.cpp | 5 ---- src/libgui/AddressTableDialog.h | 2 -- src/libgui/AttachedNetworksDialog.cpp | 5 ---- src/libgui/AttachedNetworksDialog.h | 3 --- src/libgui/BlankDialog.cpp | 5 ---- src/libgui/BlankDialog.h | 3 --- src/libgui/ClusterDialog.cpp | 5 ---- src/libgui/ClusterDialog.h | 1 - src/libgui/ClusterGroupDialog.cpp | 5 ---- src/libgui/ClusterGroupDialog.h | 2 -- src/libgui/CommentEditorPanel.cpp | 5 ---- src/libgui/CommentEditorPanel.h | 2 -- src/libgui/CompilerOutputPanel.cpp | 5 ---- src/libgui/CompilerOutputPanel.h | 1 - src/libgui/CustomServiceDialog.cpp | 5 ---- src/libgui/CustomServiceDialog.h | 2 -- src/libgui/DNSNameDialog.cpp | 5 ---- src/libgui/DNSNameDialog.h | 2 -- src/libgui/DynamicGroupDialog.cpp | 5 ---- src/libgui/DynamicGroupDialog.h | 1 - src/libgui/FWBMainWindow_q.ui | 34 +++-------------------- src/libgui/FWWindow.cpp | 1 - src/libgui/FirewallDialog.cpp | 5 ---- src/libgui/FirewallDialog.h | 3 --- src/libgui/GroupObjectDialog.cpp | 5 ---- src/libgui/GroupObjectDialog.h | 1 - src/libgui/HostDialog.cpp | 5 ---- src/libgui/HostDialog.h | 2 -- src/libgui/ICMPServiceDialog.cpp | 5 ---- src/libgui/ICMPServiceDialog.h | 3 --- src/libgui/IPServiceDialog.cpp | 5 ---- src/libgui/IPServiceDialog.h | 1 - src/libgui/IPv4Dialog.cpp | 5 ---- src/libgui/IPv4Dialog.h | 3 --- src/libgui/IPv6Dialog.cpp | 5 ---- src/libgui/IPv6Dialog.h | 3 --- src/libgui/InterfaceDialog.cpp | 5 ---- src/libgui/InterfaceDialog.h | 2 -- src/libgui/LibraryDialog.cpp | 5 ---- src/libgui/LibraryDialog.h | 3 --- src/libgui/MetricEditorPanel.cpp | 5 ---- src/libgui/MetricEditorPanel.h | 3 --- src/libgui/NATRuleOptionsDialog.cpp | 5 ---- src/libgui/NATRuleOptionsDialog.h | 2 -- src/libgui/NetworkDialog.cpp | 5 ---- src/libgui/NetworkDialog.h | 3 --- src/libgui/NetworkDialogIPv6.cpp | 5 ---- src/libgui/NetworkDialogIPv6.h | 2 -- src/libgui/ObjectEditor.cpp | 36 ------------------------- src/libgui/ObjectEditor.h | 10 ------- src/libgui/PhysicalAddressDialog.cpp | 5 ---- src/libgui/PhysicalAddressDialog.h | 2 -- src/libgui/PrototypeDialogClass.cpp | 5 ---- src/libgui/PrototypeDialogClass.h | 2 -- src/libgui/RoutingRuleOptionsDialog.cpp | 5 ---- src/libgui/RoutingRuleOptionsDialog.h | 2 -- src/libgui/RuleOptionsDialog.cpp | 8 ------ src/libgui/RuleOptionsDialog.h | 3 --- src/libgui/RuleSetDialog.cpp | 5 ---- src/libgui/RuleSetDialog.h | 2 -- src/libgui/TCPServiceDialog.cpp | 5 ---- src/libgui/TCPServiceDialog.h | 2 -- src/libgui/TagServiceDialog.cpp | 5 ---- src/libgui/TagServiceDialog.h | 3 --- src/libgui/TimeDialog.cpp | 5 ---- src/libgui/TimeDialog.h | 2 -- src/libgui/UDPServiceDialog.cpp | 5 ---- src/libgui/UDPServiceDialog.h | 2 -- src/libgui/UserDialog.cpp | 5 ---- src/libgui/UserDialog.h | 2 -- src/libgui/commentkeywords_q.ui | 14 ---------- 75 files changed, 4 insertions(+), 349 deletions(-) diff --git a/src/libgui/ActionsDialog.cpp b/src/libgui/ActionsDialog.cpp index ab9f1699e..563af1b4d 100644 --- a/src/libgui/ActionsDialog.cpp +++ b/src/libgui/ActionsDialog.cpp @@ -97,11 +97,6 @@ void ActionsDialog::loadFWObject(FWObject *o) setRule(Rule::cast(o)); } -void ActionsDialog::getHelpName(QString *str) -{ - *str = help_name; -} - void ActionsDialog::validate(bool *res) { FWOptions *ruleopt =rule->getOptionsObject(); @@ -212,7 +207,6 @@ void ActionsDialog::setRule(Rule *r) { // firewall can be NULL if rule set is in Deleted Objects library platform = firewall->getStr("platform"); - help_name = string(platform + "_" + act).c_str(); editor = DialogFactory::getActionDialogPageName(firewall, r); } diff --git a/src/libgui/ActionsDialog.h b/src/libgui/ActionsDialog.h index 2de9d46a2..6097a71f8 100644 --- a/src/libgui/ActionsDialog.h +++ b/src/libgui/ActionsDialog.h @@ -65,8 +65,6 @@ private: FWObjectDropArea * TagIntArea ; FWObjectDropArea * TagStrArea ; - QString help_name; - public: Ui::ActionsDialog_q *m_dialog; @@ -79,10 +77,7 @@ public slots: virtual void tagvalueChanged(int); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); void setRule(libfwbuilder::Rule*); - - }; #endif diff --git a/src/libgui/AddressRangeDialog.cpp b/src/libgui/AddressRangeDialog.cpp index accf36880..a2672d6f8 100644 --- a/src/libgui/AddressRangeDialog.cpp +++ b/src/libgui/AddressRangeDialog.cpp @@ -66,11 +66,6 @@ AddressRangeDialog::~AddressRangeDialog() delete m_dialog; } -void AddressRangeDialog::getHelpName(QString *str) -{ - *str = "AddressRangeDialog"; -} - void AddressRangeDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/AddressRangeDialog.h b/src/libgui/AddressRangeDialog.h index 242dd5d1a..f6e1fb67c 100644 --- a/src/libgui/AddressRangeDialog.h +++ b/src/libgui/AddressRangeDialog.h @@ -51,8 +51,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // ADDRESSRANGEDIALOG_H diff --git a/src/libgui/AddressTableDialog.cpp b/src/libgui/AddressTableDialog.cpp index 89a7545cb..1b816e7a4 100644 --- a/src/libgui/AddressTableDialog.cpp +++ b/src/libgui/AddressTableDialog.cpp @@ -77,11 +77,6 @@ AddressTableDialog::~AddressTableDialog() delete m_dialog; } -void AddressTableDialog::getHelpName(QString *str) -{ - *str = "AddressTableDialog"; -} - void AddressTableDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/AddressTableDialog.h b/src/libgui/AddressTableDialog.h index b6018f0fa..27d572e59 100644 --- a/src/libgui/AddressTableDialog.h +++ b/src/libgui/AddressTableDialog.h @@ -54,8 +54,6 @@ public slots: virtual void validate(bool*); virtual void browse(); virtual void editFile( void ); - virtual void getHelpName(QString*); - }; #endif diff --git a/src/libgui/AttachedNetworksDialog.cpp b/src/libgui/AttachedNetworksDialog.cpp index de288126e..afa54b66d 100644 --- a/src/libgui/AttachedNetworksDialog.cpp +++ b/src/libgui/AttachedNetworksDialog.cpp @@ -67,11 +67,6 @@ AttachedNetworksDialog::AttachedNetworksDialog(QWidget *parent) : BaseObjectDial AttachedNetworksDialog::~AttachedNetworksDialog() { delete m_dialog; } -void AttachedNetworksDialog::getHelpName(QString *str) -{ - *str = "AttachedNetworksDialog"; -} - void AttachedNetworksDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/AttachedNetworksDialog.h b/src/libgui/AttachedNetworksDialog.h index 9662fce64..db6e999c0 100644 --- a/src/libgui/AttachedNetworksDialog.h +++ b/src/libgui/AttachedNetworksDialog.h @@ -57,9 +57,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - - }; #endif // ATTACHEDNETWORKSDIALOG_H diff --git a/src/libgui/BlankDialog.cpp b/src/libgui/BlankDialog.cpp index e67191be0..f2ebe0847 100644 --- a/src/libgui/BlankDialog.cpp +++ b/src/libgui/BlankDialog.cpp @@ -43,11 +43,6 @@ BlankDialog::~BlankDialog() delete m_dialog; } -void BlankDialog::getHelpName(QString *str) -{ - *str = "BlankDialog"; -} - void BlankDialog::loadFWObject(FWObject *o) { obj = o; diff --git a/src/libgui/BlankDialog.h b/src/libgui/BlankDialog.h index e08d32f08..1b2bf7a4e 100644 --- a/src/libgui/BlankDialog.h +++ b/src/libgui/BlankDialog.h @@ -50,9 +50,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - - }; #endif diff --git a/src/libgui/ClusterDialog.cpp b/src/libgui/ClusterDialog.cpp index 4597df691..aee56ae2f 100644 --- a/src/libgui/ClusterDialog.cpp +++ b/src/libgui/ClusterDialog.cpp @@ -44,11 +44,6 @@ ClusterDialog::~ClusterDialog() delete m_dialog; } -void ClusterDialog::getHelpName(QString *str) -{ - *str = "ClusterDialog"; -} - ClusterDialog::ClusterDialog(QWidget *parent) : BaseObjectDialog(parent) { diff --git a/src/libgui/ClusterDialog.h b/src/libgui/ClusterDialog.h index d7297eb20..7453494fe 100644 --- a/src/libgui/ClusterDialog.h +++ b/src/libgui/ClusterDialog.h @@ -54,7 +54,6 @@ public slots: virtual void hostOSChanged(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); }; #endif /* __CLUSTERDIALOG_H_ */ diff --git a/src/libgui/ClusterGroupDialog.cpp b/src/libgui/ClusterGroupDialog.cpp index ccdad51f9..7bb410b7a 100644 --- a/src/libgui/ClusterGroupDialog.cpp +++ b/src/libgui/ClusterGroupDialog.cpp @@ -53,11 +53,6 @@ ClusterGroupDialog::~ClusterGroupDialog() delete m_dialog; } -void ClusterGroupDialog::getHelpName(QString *str) -{ - *str = "ClusterGroupDialog"; -} - ClusterGroupDialog::ClusterGroupDialog(QWidget *parent) : BaseObjectDialog(parent) { diff --git a/src/libgui/ClusterGroupDialog.h b/src/libgui/ClusterGroupDialog.h index 6673a2da8..b9fc3ecad 100644 --- a/src/libgui/ClusterGroupDialog.h +++ b/src/libgui/ClusterGroupDialog.h @@ -61,12 +61,10 @@ public slots: virtual void validate(bool*); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void openClusterConfDialog(); - virtual void getHelpName(QString*); void openObject(QTreeWidgetItem *item); void objectChanged(); void openParametersEditor(); - }; #endif /* __CLUSTERDIALOG_H_ */ diff --git a/src/libgui/CommentEditorPanel.cpp b/src/libgui/CommentEditorPanel.cpp index b2c1079d2..62f05bb54 100644 --- a/src/libgui/CommentEditorPanel.cpp +++ b/src/libgui/CommentEditorPanel.cpp @@ -127,11 +127,6 @@ void CommentEditorPanel::applyChanges() m_project->undoStack->push(cmd.release()); } -void CommentEditorPanel::getHelpName(QString *str) -{ - *str = "CommentEditorPanel"; -} - void CommentEditorPanel::loadFWObject(FWObject *obj) { Rule *r = Rule::cast(obj); diff --git a/src/libgui/CommentEditorPanel.h b/src/libgui/CommentEditorPanel.h index 06d9a2d86..1e6c48dc8 100644 --- a/src/libgui/CommentEditorPanel.h +++ b/src/libgui/CommentEditorPanel.h @@ -60,8 +60,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif diff --git a/src/libgui/CompilerOutputPanel.cpp b/src/libgui/CompilerOutputPanel.cpp index 11173cb96..8c9da6028 100644 --- a/src/libgui/CompilerOutputPanel.cpp +++ b/src/libgui/CompilerOutputPanel.cpp @@ -72,11 +72,6 @@ void CompilerOutputPanel::applyChanges() { } -void CompilerOutputPanel::getHelpName(QString *str) -{ - *str = "CompilerOutputPanel"; -} - void CompilerOutputPanel::loadFWObject(FWObject *obj) { if (fwbdebug) diff --git a/src/libgui/CompilerOutputPanel.h b/src/libgui/CompilerOutputPanel.h index cce8567fc..bf722c01b 100644 --- a/src/libgui/CompilerOutputPanel.h +++ b/src/libgui/CompilerOutputPanel.h @@ -61,7 +61,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); virtual void closeEvent(QCloseEvent *e); protected: diff --git a/src/libgui/CustomServiceDialog.cpp b/src/libgui/CustomServiceDialog.cpp index 293326cae..f4fcddd8c 100644 --- a/src/libgui/CustomServiceDialog.cpp +++ b/src/libgui/CustomServiceDialog.cpp @@ -68,11 +68,6 @@ CustomServiceDialog::~CustomServiceDialog() delete m_dialog; } -void CustomServiceDialog::getHelpName(QString *str) -{ - *str = "CustomServiceDialog"; -} - void CustomServiceDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/CustomServiceDialog.h b/src/libgui/CustomServiceDialog.h index fb7dc0581..2e17111be 100644 --- a/src/libgui/CustomServiceDialog.h +++ b/src/libgui/CustomServiceDialog.h @@ -63,8 +63,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // CUSTOMSERVICEDIALOG_H diff --git a/src/libgui/DNSNameDialog.cpp b/src/libgui/DNSNameDialog.cpp index dc5c4f1f3..c041a391c 100644 --- a/src/libgui/DNSNameDialog.cpp +++ b/src/libgui/DNSNameDialog.cpp @@ -72,11 +72,6 @@ DNSNameDialog::~DNSNameDialog() delete m_dialog; } -void DNSNameDialog::getHelpName(QString *str) -{ - *str = "DNSNameDialog"; -} - void DNSNameDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/DNSNameDialog.h b/src/libgui/DNSNameDialog.h index 03c4ceb9c..761e27141 100644 --- a/src/libgui/DNSNameDialog.h +++ b/src/libgui/DNSNameDialog.h @@ -50,8 +50,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif diff --git a/src/libgui/DynamicGroupDialog.cpp b/src/libgui/DynamicGroupDialog.cpp index 8a93a4fc4..1676fb43a 100644 --- a/src/libgui/DynamicGroupDialog.cpp +++ b/src/libgui/DynamicGroupDialog.cpp @@ -310,11 +310,6 @@ void DynamicGroupDialog::validate(bool *result) } -void DynamicGroupDialog::getHelpName(QString *) -{ -} - - void DynamicGroupDialog::addMatchClicked() { int newRow = m_model->rowCount(); diff --git a/src/libgui/DynamicGroupDialog.h b/src/libgui/DynamicGroupDialog.h index 25e583520..3b33276b3 100644 --- a/src/libgui/DynamicGroupDialog.h +++ b/src/libgui/DynamicGroupDialog.h @@ -61,7 +61,6 @@ class DynamicGroupDialog : public BaseObjectDialog virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool *); - virtual void getHelpName(QString *); void addMatchClicked(); void deleteFilterClicked(); diff --git a/src/libgui/FWBMainWindow_q.ui b/src/libgui/FWBMainWindow_q.ui index 7231381f3..8e5cb010e 100644 --- a/src/libgui/FWBMainWindow_q.ui +++ b/src/libgui/FWBMainWindow_q.ui @@ -51,7 +51,7 @@ 950 - 300 + 285 @@ -66,7 +66,7 @@ - 12 + 2 2 @@ -231,25 +231,12 @@ - 63 + 0 58 - - - - - 0 - 0 - - - - Help - - - @@ -269,7 +256,7 @@ 16777215 - 300 + 285 @@ -709,19 +696,6 @@ - - - - Qt::Vertical - - - - 20 - 16 - - - - diff --git a/src/libgui/FWWindow.cpp b/src/libgui/FWWindow.cpp index 61bfa478a..b0c6cb791 100644 --- a/src/libgui/FWWindow.cpp +++ b/src/libgui/FWWindow.cpp @@ -231,7 +231,6 @@ FWWindow::FWWindow() : QMainWindow(), // QMainWindow(NULL, Qt::Desktop), m_mainWindow->editorDockWidget->hide(); oe = new ObjectEditor((QWidget*)m_mainWindow->objectEditorStack); - oe->setHelpButton(m_mainWindow->helpObjectEditorButton); m_mainWindow->editorDockWidget->setupEditor(oe); m_mainWindow->editorDockWidget->hide(); diff --git a/src/libgui/FirewallDialog.cpp b/src/libgui/FirewallDialog.cpp index d8cf3f0ef..5d79c374e 100644 --- a/src/libgui/FirewallDialog.cpp +++ b/src/libgui/FirewallDialog.cpp @@ -84,11 +84,6 @@ FirewallDialog::FirewallDialog(QWidget *parent) : connectSignalsOfAllWidgetsToSlotChange(); } -void FirewallDialog::getHelpName(QString *str) -{ - *str = "FirewallDialog"; -} - void FirewallDialog::loadFWObject(FWObject *o) { try diff --git a/src/libgui/FirewallDialog.h b/src/libgui/FirewallDialog.h index e5d5de2df..012540e84 100644 --- a/src/libgui/FirewallDialog.h +++ b/src/libgui/FirewallDialog.h @@ -58,9 +58,6 @@ public slots: virtual void validate(bool*); virtual void openFWDialog(); virtual void openOSDialog(); - virtual void getHelpName(QString*); - - }; #endif // FIREWALLDIALOG_H diff --git a/src/libgui/GroupObjectDialog.cpp b/src/libgui/GroupObjectDialog.cpp index 12f0f5eea..20d954fef 100644 --- a/src/libgui/GroupObjectDialog.cpp +++ b/src/libgui/GroupObjectDialog.cpp @@ -409,11 +409,6 @@ void GroupObjectDialog::addIcon(FWObject *o, bool ref) listView->addTopLevelItem(tree_item); } -void GroupObjectDialog::getHelpName(QString *str) -{ - *str = "GroupObjectDialog"; -} - void GroupObjectDialog::loadFWObject(FWObject *o) { obj = o; diff --git a/src/libgui/GroupObjectDialog.h b/src/libgui/GroupObjectDialog.h index a95a393d4..8060a7fe5 100644 --- a/src/libgui/GroupObjectDialog.h +++ b/src/libgui/GroupObjectDialog.h @@ -84,7 +84,6 @@ class GroupObjectDialog : public BaseObjectDialog virtual void dropped(QDropEvent *ev); virtual void iconContextMenu(const QPoint & pos); virtual void listContextMenu(const QPoint & pos); - virtual void getHelpName(QString*); void copyObj(); void cutObj(); diff --git a/src/libgui/HostDialog.cpp b/src/libgui/HostDialog.cpp index cd502d2f3..c61654787 100644 --- a/src/libgui/HostDialog.cpp +++ b/src/libgui/HostDialog.cpp @@ -68,11 +68,6 @@ HostDialog::~HostDialog() delete m_dialog; } -void HostDialog::getHelpName(QString *str) -{ - *str = "HostDialog"; -} - void HostDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/HostDialog.h b/src/libgui/HostDialog.h index fc35b53b2..a6b6d04d7 100644 --- a/src/libgui/HostDialog.h +++ b/src/libgui/HostDialog.h @@ -50,8 +50,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // HOSTDIALOG_H diff --git a/src/libgui/ICMPServiceDialog.cpp b/src/libgui/ICMPServiceDialog.cpp index 5ccc2be79..5b88d9617 100644 --- a/src/libgui/ICMPServiceDialog.cpp +++ b/src/libgui/ICMPServiceDialog.cpp @@ -68,11 +68,6 @@ ICMPServiceDialog::~ICMPServiceDialog() delete m_dialog; } -void ICMPServiceDialog::getHelpName(QString *str) -{ - *str = "ICMPServiceDialog"; -} - void ICMPServiceDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/ICMPServiceDialog.h b/src/libgui/ICMPServiceDialog.h index 4812acd2c..bfe8e8209 100644 --- a/src/libgui/ICMPServiceDialog.h +++ b/src/libgui/ICMPServiceDialog.h @@ -50,9 +50,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - - }; #endif // ICMPSERVICEDIALOG_H diff --git a/src/libgui/IPServiceDialog.cpp b/src/libgui/IPServiceDialog.cpp index dee7177a1..799dc32b0 100644 --- a/src/libgui/IPServiceDialog.cpp +++ b/src/libgui/IPServiceDialog.cpp @@ -81,11 +81,6 @@ void IPServiceDialog::setCodeLabel() } } -void IPServiceDialog::getHelpName(QString *str) -{ - *str = "IPServiceDialog"; -} - void IPServiceDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/IPServiceDialog.h b/src/libgui/IPServiceDialog.h index c890ab64e..b8180dd84 100644 --- a/src/libgui/IPServiceDialog.h +++ b/src/libgui/IPServiceDialog.h @@ -55,7 +55,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); virtual void anyOptionsStateChanged(); }; diff --git a/src/libgui/IPv4Dialog.cpp b/src/libgui/IPv4Dialog.cpp index 5ee23b144..717a985de 100644 --- a/src/libgui/IPv4Dialog.cpp +++ b/src/libgui/IPv4Dialog.cpp @@ -65,11 +65,6 @@ IPv4Dialog::~IPv4Dialog() delete m_dialog; } -void IPv4Dialog::getHelpName(QString *str) -{ - *str = "IPv4Dialog"; -} - void IPv4Dialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/IPv4Dialog.h b/src/libgui/IPv4Dialog.h index 661364da4..7c949215f 100644 --- a/src/libgui/IPv4Dialog.h +++ b/src/libgui/IPv4Dialog.h @@ -55,9 +55,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void DNSlookup(); - virtual void getHelpName(QString*); - - }; #endif // IPV4DIALOG_H diff --git a/src/libgui/IPv6Dialog.cpp b/src/libgui/IPv6Dialog.cpp index d225bc489..634c9d0c0 100644 --- a/src/libgui/IPv6Dialog.cpp +++ b/src/libgui/IPv6Dialog.cpp @@ -74,11 +74,6 @@ IPv6Dialog::~IPv6Dialog() delete m_dialog; } -void IPv6Dialog::getHelpName(QString *str) -{ - *str = "IPv6Dialog"; -} - void IPv6Dialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/IPv6Dialog.h b/src/libgui/IPv6Dialog.h index 1a5aafbeb..7e546a990 100644 --- a/src/libgui/IPv6Dialog.h +++ b/src/libgui/IPv6Dialog.h @@ -55,9 +55,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void DNSlookup(); - virtual void getHelpName(QString*); - - }; #endif // IPV6DIALOG_H diff --git a/src/libgui/InterfaceDialog.cpp b/src/libgui/InterfaceDialog.cpp index f44dccb57..0e8744759 100644 --- a/src/libgui/InterfaceDialog.cpp +++ b/src/libgui/InterfaceDialog.cpp @@ -93,11 +93,6 @@ InterfaceDialog::~InterfaceDialog() delete m_dialog; } -void InterfaceDialog::getHelpName(QString *str) -{ - *str = "InterfaceDialog"; -} - void InterfaceDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/InterfaceDialog.h b/src/libgui/InterfaceDialog.h index c51e9ea58..41a39b489 100644 --- a/src/libgui/InterfaceDialog.h +++ b/src/libgui/InterfaceDialog.h @@ -58,8 +58,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void openIfaceDialog(); - virtual void getHelpName(QString*); - }; #endif // INTERFACEDIALOG_H diff --git a/src/libgui/LibraryDialog.cpp b/src/libgui/LibraryDialog.cpp index 28f97e890..b71961755 100644 --- a/src/libgui/LibraryDialog.cpp +++ b/src/libgui/LibraryDialog.cpp @@ -79,11 +79,6 @@ LibraryDialog::~LibraryDialog() delete m_dialog; } -void LibraryDialog::getHelpName(QString *str) -{ - *str = "LibraryDialog"; -} - void LibraryDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/LibraryDialog.h b/src/libgui/LibraryDialog.h index 5ee9ba2d3..0459e21bf 100644 --- a/src/libgui/LibraryDialog.h +++ b/src/libgui/LibraryDialog.h @@ -58,9 +58,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void changeColor(); - virtual void getHelpName(QString*); - - }; #endif // LIBRARYDIALOG_H diff --git a/src/libgui/MetricEditorPanel.cpp b/src/libgui/MetricEditorPanel.cpp index 0463e07d8..bff11a4f5 100644 --- a/src/libgui/MetricEditorPanel.cpp +++ b/src/libgui/MetricEditorPanel.cpp @@ -78,11 +78,6 @@ void MetricEditorPanel::applyChanges() rule->setMetric( value() ); } -void MetricEditorPanel::getHelpName(QString *str) -{ - *str = "MetricEditorPanel"; -} - void MetricEditorPanel::loadFWObject(libfwbuilder::FWObject *obj) { RoutingRule *r=RoutingRule::cast(obj); diff --git a/src/libgui/MetricEditorPanel.h b/src/libgui/MetricEditorPanel.h index 4a45a63bb..8eb8b73d4 100644 --- a/src/libgui/MetricEditorPanel.h +++ b/src/libgui/MetricEditorPanel.h @@ -56,10 +56,7 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); virtual void closeEvent(QCloseEvent *e); - - }; #endif diff --git a/src/libgui/NATRuleOptionsDialog.cpp b/src/libgui/NATRuleOptionsDialog.cpp index 28ff25946..5f6b26e64 100644 --- a/src/libgui/NATRuleOptionsDialog.cpp +++ b/src/libgui/NATRuleOptionsDialog.cpp @@ -66,11 +66,6 @@ NATRuleOptionsDialog::NATRuleOptionsDialog(QWidget *parent) : BaseObjectDialog(p init=false; } -void NATRuleOptionsDialog::getHelpName(QString *str) -{ - *str = "NATRuleOptionsDialog"; -} - void NATRuleOptionsDialog::loadFWObject(FWObject *o) { obj = o; diff --git a/src/libgui/NATRuleOptionsDialog.h b/src/libgui/NATRuleOptionsDialog.h index 8ffc7ab49..701fa676b 100644 --- a/src/libgui/NATRuleOptionsDialog.h +++ b/src/libgui/NATRuleOptionsDialog.h @@ -54,8 +54,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // __NATRULEOPTIONSDIALOG_H diff --git a/src/libgui/NetworkDialog.cpp b/src/libgui/NetworkDialog.cpp index a1490d8ba..9682a7c87 100644 --- a/src/libgui/NetworkDialog.cpp +++ b/src/libgui/NetworkDialog.cpp @@ -67,11 +67,6 @@ NetworkDialog::NetworkDialog(QWidget *parent) : BaseObjectDialog(parent) NetworkDialog::~NetworkDialog() { delete m_dialog; } -void NetworkDialog::getHelpName(QString *str) -{ - *str = "NetworkDialog"; -} - void NetworkDialog::loadFWObject(FWObject *o) { obj = o; diff --git a/src/libgui/NetworkDialog.h b/src/libgui/NetworkDialog.h index b439204c6..2688d800a 100644 --- a/src/libgui/NetworkDialog.h +++ b/src/libgui/NetworkDialog.h @@ -51,9 +51,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void addressEntered(); - virtual void getHelpName(QString*); - - }; #endif // NETWORKDIALOG_H diff --git a/src/libgui/NetworkDialogIPv6.cpp b/src/libgui/NetworkDialogIPv6.cpp index 533769e43..da001b603 100644 --- a/src/libgui/NetworkDialogIPv6.cpp +++ b/src/libgui/NetworkDialogIPv6.cpp @@ -67,11 +67,6 @@ NetworkDialogIPv6::NetworkDialogIPv6(QWidget *parent) : BaseObjectDialog(parent) NetworkDialogIPv6::~NetworkDialogIPv6() { delete m_dialog; } -void NetworkDialogIPv6::getHelpName(QString *str) -{ - *str = "NetworkDialogIPv6"; -} - void NetworkDialogIPv6::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/NetworkDialogIPv6.h b/src/libgui/NetworkDialogIPv6.h index dd49b3ee9..cf0c81186 100644 --- a/src/libgui/NetworkDialogIPv6.h +++ b/src/libgui/NetworkDialogIPv6.h @@ -52,8 +52,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void addressEntered(); - virtual void getHelpName(QString*); - }; #endif // NETWORKDIALOG_H diff --git a/src/libgui/ObjectEditor.cpp b/src/libgui/ObjectEditor.cpp index db23b25c1..0006b40e8 100644 --- a/src/libgui/ObjectEditor.cpp +++ b/src/libgui/ObjectEditor.cpp @@ -108,7 +108,6 @@ using namespace libfwbuilder; ObjectEditor::ObjectEditor( QWidget *parent): QObject(parent), opened(0), current_dialog_idx(-1), current_dialog_name(""), editorStack(dynamic_cast(parent)), - helpButton(0), m_project(0), openedOpt(optNone) { @@ -256,7 +255,6 @@ void ObjectEditor::activateDialog(const QString &dialog_name, openedOpt = opt; load(); - findAndLoadHelp(); //show(); @@ -271,10 +269,6 @@ void ObjectEditor::activateDialog(const QString &dialog_name, connect(dialogs[ current_dialog_idx ], SIGNAL(changed_sign()), this, SLOT(changed())); - - connect(this, SIGNAL(getHelpName_sign(QString*)), - dialogs[ current_dialog_idx ], - SLOT(getHelpName(QString*))); } void ObjectEditor::open(FWObject *obj) @@ -313,7 +307,6 @@ void ObjectEditor::disconnectSignals() disconnect( SIGNAL(loadObject_sign(libfwbuilder::FWObject*)) ); disconnect( SIGNAL(validate_sign(bool*)) ); disconnect( SIGNAL(applyChanges_sign()) ); - disconnect( SIGNAL(getHelpName_sign(QString*)) ); if (current_dialog_idx>=0) dialogs[current_dialog_idx]->disconnect( this ); } @@ -324,35 +317,6 @@ void ObjectEditor::purge() openedOpt = optNone; } -void ObjectEditor::setHelpButton(QPushButton * b) -{ - helpButton=b; - helpButton->setEnabled(true); - connect((QWidget*)helpButton,SIGNAL(clicked()),this,SLOT(help())); -} - -void ObjectEditor::help() -{ - QString help_name; - emit getHelpName_sign(&help_name); - if (fwbdebug) - qDebug("ObjectEditor::help: %s", help_name.toStdString().c_str()); - Help *h = Help::getHelpWindow(mw); - h->setSource(QUrl(help_name + ".html")); - h->raise(); - h->show(); -} - -void ObjectEditor::findAndLoadHelp() -{ - QString help_name; - emit getHelpName_sign(&help_name); - - // is help available? - Help *h = Help::getHelpWindow(mw); - helpButton->setEnabled(!h->findHelpFile(help_name + ".html").isEmpty()); -} - void ObjectEditor::load() { emit loadObject_sign(opened); diff --git a/src/libgui/ObjectEditor.h b/src/libgui/ObjectEditor.h index f720ed491..5739c10fc 100644 --- a/src/libgui/ObjectEditor.h +++ b/src/libgui/ObjectEditor.h @@ -56,11 +56,9 @@ class ObjectEditor : public QObject { int current_dialog_idx; QString current_dialog_name; QStackedWidget *editorStack; - QPushButton *helpButton; ProjectPanel *m_project; void disconnectSignals(); - void findAndLoadHelp(); public: enum OptType{optAction, optComment, optMetric, optNone}; @@ -96,14 +94,11 @@ public: void purge(); bool validate(); - void setHelpButton(QPushButton * b); - int getCurrentDialogIndex() { return current_dialog_idx; }; QWidget* getCurrentObjectDialog(); public slots: - void help(); void changed(); void blank(); @@ -127,11 +122,6 @@ signals: * the user and saves data in the object. */ void applyChanges_sign(); - - /** - * the dialog class returns corresponding help file name - */ - void getHelpName_sign(QString *str); }; #endif diff --git a/src/libgui/PhysicalAddressDialog.cpp b/src/libgui/PhysicalAddressDialog.cpp index 73b9366fe..58987300f 100644 --- a/src/libgui/PhysicalAddressDialog.cpp +++ b/src/libgui/PhysicalAddressDialog.cpp @@ -68,11 +68,6 @@ PhysicalAddressDialog::~PhysicalAddressDialog() delete m_dialog; } -void PhysicalAddressDialog::getHelpName(QString *str) -{ - *str = "PhysicalAddressDialog"; -} - void PhysicalAddressDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/PhysicalAddressDialog.h b/src/libgui/PhysicalAddressDialog.h index ea62d58fa..f0f367f32 100644 --- a/src/libgui/PhysicalAddressDialog.h +++ b/src/libgui/PhysicalAddressDialog.h @@ -51,8 +51,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // PHYSICALADDRESSDIALOG_H diff --git a/src/libgui/PrototypeDialogClass.cpp b/src/libgui/PrototypeDialogClass.cpp index 187690ced..c1903ef40 100644 --- a/src/libgui/PrototypeDialogClass.cpp +++ b/src/libgui/PrototypeDialogClass.cpp @@ -48,11 +48,6 @@ using namespace libfwbuilder; using namespace std; -void PrototypeDialog::getHelpName(QString *str) -{ - *str = "PrototypeDialog"; -} - void PrototypeDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/PrototypeDialogClass.h b/src/libgui/PrototypeDialogClass.h index 012b0c91c..08382c988 100644 --- a/src/libgui/PrototypeDialogClass.h +++ b/src/libgui/PrototypeDialogClass.h @@ -49,8 +49,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void closeEvent(QCloseEvent *e); - virtual void getHelpName(QString*); - }; #endif // __PROTOTYPEDIALOG_H diff --git a/src/libgui/RoutingRuleOptionsDialog.cpp b/src/libgui/RoutingRuleOptionsDialog.cpp index 7c2618b3f..dd2d22de5 100644 --- a/src/libgui/RoutingRuleOptionsDialog.cpp +++ b/src/libgui/RoutingRuleOptionsDialog.cpp @@ -70,11 +70,6 @@ RoutingRuleOptionsDialog::RoutingRuleOptionsDialog(QWidget *parent) : m_dialog->setupUi(this); } -void RoutingRuleOptionsDialog::getHelpName(QString *str) -{ - *str = "RoutingRuleOptionsDialog"; -} - void RoutingRuleOptionsDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/RoutingRuleOptionsDialog.h b/src/libgui/RoutingRuleOptionsDialog.h index 0dcb5e808..77b50f7a3 100644 --- a/src/libgui/RoutingRuleOptionsDialog.h +++ b/src/libgui/RoutingRuleOptionsDialog.h @@ -57,8 +57,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // __ROUTINGRULEOPTIONSDIALOG_H diff --git a/src/libgui/RuleOptionsDialog.cpp b/src/libgui/RuleOptionsDialog.cpp index 8b30564ae..7ea23ba7d 100644 --- a/src/libgui/RuleOptionsDialog.cpp +++ b/src/libgui/RuleOptionsDialog.cpp @@ -83,12 +83,6 @@ RuleOptionsDialog::RuleOptionsDialog(QWidget *parent) : init=false; } -void RuleOptionsDialog::getHelpName(QString *str) -{ - // can make help name different depending on the currently opened tab - *str = help_name; -} - void RuleOptionsDialog::loadFWObject(FWObject *o) { obj = o; @@ -98,8 +92,6 @@ void RuleOptionsDialog::loadFWObject(FWObject *o) platform = firewall->getStr("platform").c_str(); string version = firewall->getStr("version"); - help_name = platform + "_rule_options"; - // build a map for combobox so visible combobox items can be localized QStringList route_options = getRouteOptions_pf_ipf(platform); QStringList route_load_options = getRouteLoadOptions_pf(platform); diff --git a/src/libgui/RuleOptionsDialog.h b/src/libgui/RuleOptionsDialog.h index 9353ee1aa..0aa0308d1 100644 --- a/src/libgui/RuleOptionsDialog.h +++ b/src/libgui/RuleOptionsDialog.h @@ -50,8 +50,6 @@ class RuleOptionsDialog : public BaseObjectDialog Ui::RuleOptionsDialog_q*m_dialog; libfwbuilder::FWObject *firewall; - QString help_name; - public: RuleOptionsDialog(QWidget *parent); ~RuleOptionsDialog(); @@ -64,7 +62,6 @@ public slots: virtual void cancelChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); virtual void connlimitAboveLabelChange(); virtual void limitLabelChange(); virtual void iptRouteContinueToggled(); // #2367 diff --git a/src/libgui/RuleSetDialog.cpp b/src/libgui/RuleSetDialog.cpp index e7d74c5b6..6c3e87ad7 100644 --- a/src/libgui/RuleSetDialog.cpp +++ b/src/libgui/RuleSetDialog.cpp @@ -72,11 +72,6 @@ RuleSetDialog::~RuleSetDialog() delete m_dialog; } -void RuleSetDialog::getHelpName(QString *str) -{ - *str = QString(obj->getTypeName().c_str()); -} - void RuleSetDialog::loadFWObject(FWObject *o) { obj = o; diff --git a/src/libgui/RuleSetDialog.h b/src/libgui/RuleSetDialog.h index 7a4f27d67..600436fb6 100644 --- a/src/libgui/RuleSetDialog.h +++ b/src/libgui/RuleSetDialog.h @@ -53,8 +53,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // RULESETDIALOG_H diff --git a/src/libgui/TCPServiceDialog.cpp b/src/libgui/TCPServiceDialog.cpp index 3460f5365..40cbf128b 100644 --- a/src/libgui/TCPServiceDialog.cpp +++ b/src/libgui/TCPServiceDialog.cpp @@ -67,11 +67,6 @@ TCPServiceDialog::~TCPServiceDialog() delete m_dialog; } -void TCPServiceDialog::getHelpName(QString *str) -{ - *str = "TCPServiceDialog"; -} - void TCPServiceDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/TCPServiceDialog.h b/src/libgui/TCPServiceDialog.h index b0f899afb..d6bb821eb 100644 --- a/src/libgui/TCPServiceDialog.h +++ b/src/libgui/TCPServiceDialog.h @@ -51,8 +51,6 @@ public slots: virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); virtual void toggleEstablished(); - virtual void getHelpName(QString*); - }; #endif // TCPSERVICEDIALOG_H diff --git a/src/libgui/TagServiceDialog.cpp b/src/libgui/TagServiceDialog.cpp index 19f48d5dc..a6485cdf4 100644 --- a/src/libgui/TagServiceDialog.cpp +++ b/src/libgui/TagServiceDialog.cpp @@ -70,11 +70,6 @@ TagServiceDialog::TagServiceDialog(QWidget *parent) : BaseObjectDialog(parent) connectSignalsOfAllWidgetsToSlotChange(); } -void TagServiceDialog::getHelpName(QString *str) -{ - *str = "TagServiceDialog"; -} - void TagServiceDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/TagServiceDialog.h b/src/libgui/TagServiceDialog.h index f5a9cdc28..24c99269b 100644 --- a/src/libgui/TagServiceDialog.h +++ b/src/libgui/TagServiceDialog.h @@ -50,9 +50,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - - }; #endif diff --git a/src/libgui/TimeDialog.cpp b/src/libgui/TimeDialog.cpp index 3400bc103..dd8310652 100644 --- a/src/libgui/TimeDialog.cpp +++ b/src/libgui/TimeDialog.cpp @@ -72,11 +72,6 @@ TimeDialog::~TimeDialog() delete m_dialog; } -void TimeDialog::getHelpName(QString *str) -{ - *str = "TimeDialog"; -} - void TimeDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/TimeDialog.h b/src/libgui/TimeDialog.h index db584d243..d80a7c9b5 100644 --- a/src/libgui/TimeDialog.h +++ b/src/libgui/TimeDialog.h @@ -53,8 +53,6 @@ public slots: virtual void useStartOrEndDate(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // __TIMEDIALOG_H diff --git a/src/libgui/UDPServiceDialog.cpp b/src/libgui/UDPServiceDialog.cpp index 8454a7c66..2adf0e1e5 100644 --- a/src/libgui/UDPServiceDialog.cpp +++ b/src/libgui/UDPServiceDialog.cpp @@ -66,11 +66,6 @@ UDPServiceDialog::~UDPServiceDialog() delete m_dialog; } -void UDPServiceDialog::getHelpName(QString *str) -{ - *str = "UDPServiceDialog"; -} - void UDPServiceDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/UDPServiceDialog.h b/src/libgui/UDPServiceDialog.h index 83dc3d72a..00829f4cf 100644 --- a/src/libgui/UDPServiceDialog.h +++ b/src/libgui/UDPServiceDialog.h @@ -50,8 +50,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // UDPSERVICEDIALOG_H diff --git a/src/libgui/UserDialog.cpp b/src/libgui/UserDialog.cpp index ffb9b5818..2e6a4dd78 100644 --- a/src/libgui/UserDialog.cpp +++ b/src/libgui/UserDialog.cpp @@ -64,11 +64,6 @@ UserDialog::UserDialog(QWidget *parent) : BaseObjectDialog(parent) UserDialog::~UserDialog() { delete m_dialog; } -void UserDialog::getHelpName(QString *str) -{ - *str = "UserDialog"; -} - void UserDialog::loadFWObject(FWObject *o) { obj=o; diff --git a/src/libgui/UserDialog.h b/src/libgui/UserDialog.h index a26ff0574..8fff52ec9 100644 --- a/src/libgui/UserDialog.h +++ b/src/libgui/UserDialog.h @@ -50,8 +50,6 @@ public slots: virtual void applyChanges(); virtual void loadFWObject(libfwbuilder::FWObject *obj); virtual void validate(bool*); - virtual void getHelpName(QString*); - }; #endif // UserDialog_H diff --git a/src/libgui/commentkeywords_q.ui b/src/libgui/commentkeywords_q.ui index 0c240fb3f..a5f9e41f0 100644 --- a/src/libgui/commentkeywords_q.ui +++ b/src/libgui/commentkeywords_q.ui @@ -37,13 +37,6 @@ true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Enter comment here</span></p></body></html> - @@ -61,13 +54,6 @@ p, li { white-space: pre-wrap; } - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">No keywords</span></p></body></html> - true