onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 18:27:16 +01:00
Code Issues Releases Wiki Activity

bugfixes 2346,2384,2384,2385,2400,2401,2402,2386,2386,2388,2403,2404

Browse Source
This commit is contained in:
2008-04-11 18:13:57 +00:00
parent 8163d15496
commit 0c0a149c32
17 changed files with 355 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/FWObjectClipboard.cpp
View File

@ -35,7 +35,7 @@
#include "FWObjectClipboard.h"
#include "FWWindow.h"
#include "ProjectPanel.h"
using namespace std;
using namespace libfwbuilder;
@ -62,9 +62,10 @@ void FWObjectClipboard::clear()
if (obj) obj->unref();
}
ids.clear();
windows.clear();
}
void FWObjectClipboard::add(FWObject *_obj)
void FWObjectClipboard::add(FWObject *_obj, ProjectPanel * fww)
{
if (fwbdebug)
{
@ -73,7 +74,12 @@ void FWObjectClipboard::add(FWObject *_obj)
}
_obj->ref();
ids.push_back(_obj->getId());
if (fww==NULL)
windows.push_back (NULL);
else
windows.push_back (fww);
}
FWObject* FWObjectClipboard::getObject()
@ -84,3 +90,20 @@ FWObject* FWObjectClipboard::getObject()
return NULL;
}
size_t FWObjectClipboard::windowsCount (){return windows.size();}
ProjectPanel * FWObjectClipboard::getWindowByIdx (int idx)
{
if (idx<windowsCount ())
{
return windows[idx];
}
return NULL;
}
libfwbuilder::FWObject* FWObjectClipboard::getObjectByIdx (int idx)
{
std::string s1 = ids[idx];
ProjectPanel * w1 = windows[idx];
FWObject *co= w1->db()->findInIndex(s1);
return co;
//w1->db()->FWObject *co= win->db()->findInIndex(*i);
}

11
src/gui/FWObjectClipboard.h
View File

@ -33,10 +33,11 @@
#include <string>
class libfwbuilder::FWObject;
class ProjectPanel ;
class FWObjectClipboard {
std::vector<std::string> ids;
std::vector<ProjectPanel*> windows;
public:
@ -46,7 +47,7 @@ public:
/**
* adds an object to the clipboard
*/
void add(libfwbuilder::FWObject*);
void add(libfwbuilder::FWObject*,ProjectPanel * fww=NULL);
/**
* returns the last added object
@ -57,8 +58,10 @@ public:
* clear the clipboard
*/
void clear();
std::vector<std::string>::iterator begin() { return ids.begin(); }
size_t windowsCount ();
ProjectPanel * getWindowByIdx (int idx);
libfwbuilder::FWObject* getObjectByIdx (int idx);
std::vector<std::string>::iterator begin() { return ids.begin(); }
std::vector<std::string>::iterator end() { return ids.end(); }
std::vector<std::string>::reverse_iterator rbegin() { return ids.rbegin(); }
std::vector<std::string>::reverse_iterator rend() { return ids.rend(); }

14
src/gui/FWWindow.cpp
View File

@ -309,8 +309,9 @@ void FWWindow::fileProp()
void FWWindow::fileNew()
{
ProjectPanel *proj = newProjectPanel();
proj->fileNew();
showSub(proj);
if (proj->fileNew()){
showSub(proj);
} // Memory leak ?
}
void FWWindow::addToRCSActionSetEn(bool en)
@ -335,9 +336,18 @@ void FWWindow::fileSaveActionSetEn(bool en)
void FWWindow::fileOpen()
{
std::auto_ptr<ProjectPanel> proj(newProjectPanel());
if (proj->fileOpen())
{
if (activeProject()->getFileName()=="")
{
//m_space->currentSubWindow()->
m_space->currentSubWindow()->hide();
//activeProject()->closeAuxiliaryPanel();
}
showSub(proj.release());
}
}
void FWWindow::fileClose()

2
src/gui/GroupObjectDialog.cpp
View File

@ -647,7 +647,7 @@ void GroupObjectDialog::copyObj()
o=FWReference::cast(o)->getPointer();
FWObjectClipboard::obj_clipboard->add( o );
FWObjectClipboard::obj_clipboard->add( o,this->m_project );
}
}

9
src/gui/MainRes.qrc
View File

@ -22,7 +22,8 @@
<file>Icons/blank_2x16.png</file>
<file>Icons/books1.png</file>
<file alias="Icons/Both">Icons/both.png</file>
<file alias="Icons/Branch">Icons/branch_25.png</file>
<file alias="Icons/Both-tree">Icons/both_16.png</file>
<file alias="Icons/Branch">Icons/branch_25.png</file>
<file>Icons/cancel.png</file>
<file>Icons/cert_druid_logo.png</file>
<file>Icons/check.png</file>
@ -63,7 +64,8 @@
<file>Icons/host_64.png</file>
<file>Icons/host_64.xpm</file>
<file alias="Icons/Inbound">Icons/inbound.png</file>
<file>Icons/info_25.png</file>
<file alias="Icons/Inbound-tree">Icons/inbound_16.png</file>
<file>Icons/info_25.png</file>
<file>Icons/install_25.png</file>
<file alias="Icons/Interface/icon-neg">Icons/interface-neg_25.png</file>
<file alias="Icons/Interface/icon-ref">Icons/interface-ref_25.png</file>
@ -93,7 +95,8 @@
<file>Icons/openfile_25.png</file>
<file alias="Icons/Options">Icons/options_25.png</file>
<file alias="Icons/Outbound">Icons/outbound.png</file>
<file>Icons/physaddress-neg_25.png</file>
<file alias="Icons/Outbound-tree">Icons/outbound_16.png</file>
<file>Icons/physaddress-neg_25.png</file>
<file>Icons/physaddress-ref_25.png</file>
<file>Icons/physaddress_16.png</file>
<file>Icons/physaddress_25.png</file>

20
src/gui/ObjectManipulator.cpp
View File

@ -914,8 +914,9 @@ void ObjectManipulator::contextMenuRequested(const QPoint &pos)
duptargets->addAction(tr("place here"), this, SLOT( duplicateObjUnderSameParent()));
QAction *dupID = duptargets->addAction( tr("Duplicate ...") );
QAction *movID;
//QAction *dupID = duptargets->addAction( tr("Duplicate ...") ); // BUGFIX-2346
QAction *dupID = popup->addAction( tr("Duplicate ...") ,this, SLOT (duplicateObjUnderSameParent()));//popup->
QAction *movID;
if (moveTargets!=0)
{
@ -1155,6 +1156,12 @@ void ObjectManipulator::getMenuState(bool haveMoveTargets,
i!=FWObjectClipboard::obj_clipboard->end(); ++i)
{
FWObject *co= m_project->db()->findInIndex(*i);
if (co==NULL)
{
continue ;
//QString s2 = obj->getTypeName().c_str();
}
QString s3 = obj->getTypeName().c_str();
FWObject *nobj=pasteTo( obj , co , false, true);
pasteMenuItem = pasteMenuItem && (nobj!=NULL);
}
@ -1549,7 +1556,7 @@ void ObjectManipulator::copyObj()
{
obj= *i;
if ( ! m_project->isSystem(obj) )
FWObjectClipboard::obj_clipboard->add( obj );
FWObjectClipboard::obj_clipboard->add( obj,m_project );
}
}
@ -1564,12 +1571,11 @@ void ObjectManipulator::pasteObj()
if (getCurrentObjectTree()->getNumSelected()==0) return;
FWObject *obj=getCurrentObjectTree()->getSelectedObjects().front();
if (obj==NULL) return;
vector<string>::iterator i;
for (i= FWObjectClipboard::obj_clipboard->begin();
i!=FWObjectClipboard::obj_clipboard->end(); ++i)
int idx = 0;
for (i= FWObjectClipboard::obj_clipboard->begin(); i!=FWObjectClipboard::obj_clipboard->end(); ++i)
{
FWObject *co= m_project->db()->findInIndex(*i);
FWObject *co= FWObjectClipboard::obj_clipboard->getObjectByIdx(idx); //win->db()->findInIndex(*i);
FWObject *nobj=pasteTo( obj , co );
if (nobj!=NULL)
{

37
src/gui/ProjectPanel.cpp
View File

@ -1048,6 +1048,18 @@ QString ProjectPanel::chooseNewFileName(const QString &fname,
return "";
}
QString ProjectPanel::getFileName ()
{
if (rcs!=NULL)
{
return rcs->getFileName();
}
else
{
return QString ();
}
}
void ProjectPanel::setFileName(const QString &fname)
{
systemFile=false;
@ -1070,15 +1082,17 @@ void ProjectPanel::fileProp()
}
}
void ProjectPanel::fileNew()
bool ProjectPanel::fileNew()
{
QString nfn=chooseNewFileName(st->getWDir(),true,
tr("Choose name and location for the new file"));
if ( !nfn.isEmpty() )
{
//if (!saveIfModified() || !checkin(true)) return;
if (!systemFile && rcs!=NULL) fileClose(); // fileClose calls load(this)
else load(this);
if (!systemFile && rcs!=NULL)
fileClose(); // fileClose calls load(this)
else
load(this);
visibleFirewall = NULL;
showFirewalls( false );
@ -1089,10 +1103,19 @@ void ProjectPanel::fileNew()
save();
setupAutoSave();
}
mainW->addToRCSActionSetEn( !rcs->isInRCS() && !rcs->isRO() && !rcs->isTemp());
mainW->fileDiscardActionSetEn( rcs->isInRCS() && !rcs->isRO() && !rcs->isTemp());
mainW->fileCommitActionSetEn( rcs->isInRCS() && !rcs->isRO() && !rcs->isTemp());
mainW->fileSaveActionSetEn( !rcs->isRO() && !rcs->isTemp() );
if (rcs!=NULL)
{
mainW->addToRCSActionSetEn( !rcs->isInRCS() && !rcs->isRO() && !rcs->isTemp());
mainW->fileDiscardActionSetEn( rcs->isInRCS() && !rcs->isRO() && !rcs->isTemp());
mainW->fileCommitActionSetEn( rcs->isInRCS() && !rcs->isRO() && !rcs->isTemp());
mainW->fileSaveActionSetEn( !rcs->isRO() && !rcs->isTemp() );
return true ;
}
else
{
return false ;
}
}
bool ProjectPanel::fileOpen()

5
src/gui/ProjectPanel.h
View File

@ -139,7 +139,7 @@ public:
libfwbuilder::FWObject *copyFrom=NULL,
libfwbuilder::FWObject *parent=NULL,
bool ask4Lib = true);
FWWindow* getWindow (){ return mainW;}
void moveObject(libfwbuilder::FWObject *target,
libfwbuilder::FWObject *obj);
@ -261,6 +261,7 @@ public:
QString getDestDir(const QString &fname);
QString chooseNewFileName(const QString &fname, bool checkPresence,const QString &title);
void setFileName(const QString &fname);
QString getFileName ();
void check4Depends(libfwbuilder::FWObject *obj,
std::list<libfwbuilder::FWObject*> & objList,
libfwbuilder::FWObject *lib);
@ -295,7 +296,7 @@ public:
virtual void restoreRuleSetTab();
virtual void fileProp();
virtual void fileNew();
virtual bool fileNew();
virtual bool fileOpen();
virtual void fileClose();

17
src/gui/RuleSetView.cpp
View File

@ -1231,7 +1231,11 @@ void RuleSetView::paintCell(QPainter *pntr,
if (rule==NULL) return;
string dir = rule->getDirectionAsString();
if (dir.empty()) dir = "Both";
QString dir_ = rule->getDirectionAsString().c_str();
if (dir.empty())
dir = "Both";
//dir="Both-tree";
QString icn = chooseIcon((":/Icons/" + dir).c_str());
QPixmap pm;
@ -1350,6 +1354,13 @@ QString RuleSetView::chooseIcon(QString icn)
return icn.replace("-ref", "-tree");
if (icn.contains("-neg"))
return icn.replace("-neg", "-tree");
if (icn.contains("Both"))
return icn+="-tree";
if (icn.contains("Inbound"))
return icn+="-tree";
if (icn.contains("Outbound"))
return icn+="-tree";
return QString();
}
return icn;
@ -2454,7 +2465,7 @@ void RuleSetView::cutSelectedObject()
if ( selectedObject!=NULL)
{
FWObjectClipboard::obj_clipboard->clear();
FWObjectClipboard::obj_clipboard->add( selectedObject );
FWObjectClipboard::obj_clipboard->add( selectedObject, m_project );
deleteSelectedObject();
}
}
@ -3284,7 +3295,7 @@ void RuleSetView::copyRule()
.arg(PolicyRule::cast(rule)->getDirectionAsString().c_str())
.toAscii().constData());
FWObjectClipboard::obj_clipboard->add( rule );
FWObjectClipboard::obj_clipboard->add( rule, m_project );
}
}
}

161
src/gui/addresstabledialog_q.ui
View File

@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>765</width>
<height>200</height>
<height>296</height>
</rect>
</property>
<property name="baseSize" >
@ -158,7 +158,7 @@
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="2" >
<item row="0" column="1" >
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<string>Comment:</string>
@ -177,56 +177,6 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1_2" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<property name="text" >
<string>Library:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
@ -247,6 +197,22 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1_2" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<property name="text" >
<string>Library:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="libs" >
<property name="sizePolicy" >
@ -257,34 +223,7 @@
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1" >
<widget class="QGroupBox" name="buttonGroup1" >
<property name="title" >
<string/>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<item row="2" column="0" colspan="2" >
<widget class="QRadioButton" name="r_compiletime" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -297,7 +236,7 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<item row="3" column="0" colspan="2" >
<widget class="QRadioButton" name="r_runtime" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -310,23 +249,7 @@
</property>
</widget>
</item>
<item row="5" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<item row="4" column="0" colspan="2" >
<widget class="QLabel" name="textLabel2_2" >
<property name="text" >
<string>File name:</string>
@ -336,7 +259,23 @@
</property>
</widget>
</item>
<item row="4" column="0" >
<item row="5" column="0" colspan="2" >
<widget class="QLineEdit" name="filename" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>250</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
@ -394,26 +333,26 @@
</item>
</layout>
</item>
<item row="3" column="0" >
<widget class="QLineEdit" name="filename" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="7" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="minimumSize" >
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>250</width>
<height>0</height>
<width>307</width>
<height>16</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="2" >
<item row="1" column="1" >
<widget class="QTextEdit" name="comment" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >

152
src/gui/customservicedialog_q.ui
View File

@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>770</width>
<height>202</height>
<height>286</height>
</rect>
</property>
<property name="windowTitle" >
@ -66,10 +66,10 @@
</size>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
@ -131,10 +131,10 @@
<item>
<widget class="QFrame" name="frame7" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
@ -155,7 +155,7 @@
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="2" >
<item row="0" column="1" >
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<string>Comment:</string>
@ -165,50 +165,15 @@
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QTextEdit" name="comment" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>90</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QFrame" name="frame13" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
@ -219,7 +184,7 @@
</property>
</widget>
</item>
<item row="0" column="1" >
<item row="0" column="1" colspan="2" >
<widget class="QLineEdit" name="obj_name" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@ -239,7 +204,7 @@
</property>
</widget>
</item>
<item row="1" column="1" >
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="libs" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@ -249,59 +214,7 @@
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1" >
<widget class="QFrame" name="frame14" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="4" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" colspan="2" >
<item row="2" column="0" colspan="3" >
<widget class="QLabel" name="textLabel2_2" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -332,7 +245,7 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<item row="3" column="0" >
<widget class="QLabel" name="textLabel3" >
<property name="text" >
<string>Platform:</string>
@ -342,10 +255,10 @@
</property>
</widget>
</item>
<item row="1" column="1" >
<item row="3" column="1" colspan="2" >
<widget class="QComboBox" name="platform" />
</item>
<item row="2" column="0" colspan="2" >
<item row="4" column="0" colspan="3" >
<widget class="QLabel" name="textLabel1_3" >
<property name="text" >
<string>Code:</string>
@ -355,7 +268,7 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<item row="5" column="0" colspan="3" >
<widget class="QLineEdit" name="code" >
<property name="minimumSize" >
<size>
@ -368,9 +281,44 @@
</property>
</widget>
</item>
<item row="6" column="1" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>191</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="1" >
<widget class="QTextEdit" name="comment" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>90</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>

295
src/gui/dnsnamedialog_q.ui
View File

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>630</width>
<height>214</height>
<width>622</width>
<height>252</height>
</rect>
</property>
<property name="windowTitle" >
@ -63,10 +63,10 @@
</size>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
@ -128,10 +128,10 @@
<item>
<widget class="QFrame" name="frame7" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
@ -152,7 +152,7 @@
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="2" >
<item row="0" column="1" >
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<string>Comment:</string>
@ -162,7 +162,109 @@
</property>
</widget>
</item>
<item row="1" column="2" >
<item row="1" column="0" >
<widget class="QFrame" name="frame17" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
<string>Name:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2" >
<widget class="QLineEdit" name="obj_name" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1_2" >
<property name="text" >
<string>Library:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="libs" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="textLabel2_2" >
<property name="text" >
<string>DNS Record:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2" >
<widget class="QLineEdit" name="dnsrec" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QRadioButton" name="r_compiletime" >
<property name="text" >
<string>Compile Time</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3" >
<widget class="QRadioButton" name="r_runtime" >
<property name="text" >
<string>Run Time</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="1" >
<widget class="QTextEdit" name="comment" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@ -181,166 +283,6 @@
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QGroupBox" name="buttonGroup1" >
<property name="title" >
<string/>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>2</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QRadioButton" name="r_compiletime" >
<property name="text" >
<string>Compile Time</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="r_runtime" >
<property name="text" >
<string>Run Time</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QFrame" name="frame17" >
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="3" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1_2" >
<property name="text" >
<string>Library:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
<string>Name:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="textLabel2_2" >
<property name="text" >
<string>DNS Record:</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLineEdit" name="dnsrec" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="obj_name" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="libs" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
@ -353,7 +295,6 @@
<tabstop>obj_name</tabstop>
<tabstop>libs</tabstop>
<tabstop>dnsrec</tabstop>
<tabstop>r_compiletime</tabstop>
<tabstop>r_runtime</tabstop>
<tabstop>comment</tabstop>
</tabstops>
@ -423,22 +364,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>r_compiletime</sender>
<signal>toggled(bool)</signal>
<receiver>DNSNameDialog_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>r_runtime</sender>
<signal>toggled(bool)</signal>

10
src/gui/icmpservicedialog_q.ui
View File

@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>562</width>
<height>179</height>
<width>595</width>
<height>186</height>
</rect>
</property>
<property name="sizePolicy" >
@ -192,6 +192,12 @@
</item>
<item row="1" column="0" >
<widget class="QFrame" name="frame30" >
<property name="maximumSize" >
<size>
<width>400</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape" >
<enum>QFrame::Box</enum>
</property>

17
src/gui/ipv4dialog_q.ui
View File

@ -66,10 +66,10 @@
</size>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
@ -104,6 +104,15 @@
<bold>true</bold>
</font>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="lineWidth" >
<number>1</number>
</property>
<property name="midLineWidth" >
<number>0</number>
</property>
<property name="text" >
<string>Address</string>
</property>
@ -143,10 +152,10 @@
</sizepolicy>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >

10
src/gui/newHostDialog.cpp
View File

@ -400,10 +400,10 @@ void newHostDialog::showPage(const int page)
}
}
}
void newHostDialog::templateSelected(QListWidgetItem *cur)
void newHostDialog::templateSelected(QListWidgetItem *itm)
//void newHostDialog::templateSelected(QListWidgetItem *cur)
{
QListWidgetItem *itm = cur;
//QListWidgetItem *itm = cur;
if (fwbdebug) qDebug("newHostDialog::templateSelected ");
FWObject *o=templates[itm];
@ -521,8 +521,8 @@ void newHostDialog::addInterface()
new QTreeWidgetItem(m_dialog->iface_list, sl);
}
void newHostDialog::selectedInterface(QTreeWidgetItem *cur)
void newHostDialog::selectedInterface(QTreeWidgetItem*cur,QTreeWidgetItem*)
//void newHostDialog::selectedInterface(QTreeWidgetItem *cur)
{
QTreeWidgetItem *itm = cur;
m_dialog->iface_name->setText( itm->text(0) );

9
src/gui/newHostDialog.h
View File

@ -81,10 +81,15 @@ public slots:
virtual void updateInterface();
virtual void deleteInterface();
virtual void changed();
virtual void selectedInterface(QTreeWidgetItem *cur);
// virtual void selectedInterface(QTreeWidgetItem *cur);
virtual void getInterfacesViaSNMP();
virtual void monitor();
virtual void templateSelected(QListWidgetItem *cur);
// virtual void templateSelected(QListWidgetItem *cur);
virtual void selectedInterface(QTreeWidgetItem*,QTreeWidgetItem*);
virtual void templateSelected(QListWidgetItem *itm);
protected slots:
virtual void finishClicked();

2
src/gui/newhostdialog_q.ui
View File

@ -1103,7 +1103,7 @@
<sender>templateList</sender>
<signal>currentItemChanged(QListWidgetItem*,QListWidgetItem*)</signal>
<receiver>newHostDialog_q</receiver>
<slot>templateSelected(QListWidgetItem*,QListWidgetItem*)</slot>
<slot>templateSelected(QListWidgetItem*)</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>