onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 12:17:26 +01:00
Code Issues Releases Wiki Activity

fixes #870 Moved "batch install" checkbox to the page that shows compiler progress so the user can decide to do batch install right before they perform installations instead of doing this ahead of time

Browse Source
This commit is contained in:
Vadim Kurland 2009-12-15 20:06:57 +00:00
parent 5eda22b5b0
commit 1c32ab4379
7 changed files with 106 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2138
#define BUILD_NUM 2142

7
doc/ChangeLog
View File

@ -1,3 +1,10 @@
2009-12-15 vadim <vadim@vk.crocodile.org>
* instDialog.cpp (instDialog::instDialog): Moved "batch install"
checkbox to the page that shows compiler progress so the user can
decide to do batch install right before they perform installations
instead of doing this before they start compile.
2009-12-14 vadim <vadim@vk.crocodile.org>
* src/res/configlets/linux24/automatic_rules: Generation of the

2
src/gui/instDialog.cpp
View File

@ -230,8 +230,6 @@ instDialog::instDialog(QWidget* p,
m_dialog->detailMCframe->show();
else
m_dialog->detailMCframe->hide();
togleDetailMC();
}
instDialog::~instDialog()

1
src/gui/instDialog.h
View File

@ -244,7 +244,6 @@ public slots:
void updateProgressBar(int n,bool setsize);
void saveLog();
void togleDetailMC();
void readFromStdout();
void selectAllFirewalls();

16
src/gui/instDialog_ui_ops.cpp
View File

@ -304,22 +304,6 @@ void instDialog::backClicked()
showPage(previousRelevant( currentPage() ));
}
void instDialog::togleDetailMC()
{
if (m_dialog->detailMCframe->isVisible())
{
m_dialog->detailsButton->setText(tr("Show details"));
m_dialog->detailMCframe->hide();
st->setValue(SETTINGS_PATH_PREFIX"/Installer/ShowDetails",false);
}
else
{
m_dialog->detailsButton->setText(tr("Hide details"));
m_dialog->detailMCframe->show();
st->setValue(SETTINGS_PATH_PREFIX"/Installer/ShowDetails",true);
}
}
void instDialog::prepareInstConf(Firewall *)
{
if (fwbdebug) qDebug("instDialog::prepareInstConf");

229
src/gui/instdialog_q.ui
View File

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>745</width>
<height>575</height>
<width>875</width>
<height>619</height>
</rect>
</property>
<property name="sizePolicy" >
@ -59,9 +59,9 @@
</sizepolicy>
</property>
<property name="currentIndex" >
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="page" >
<widget class="QWidget" name="select_firewalls_page" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
@ -73,7 +73,7 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>1</number>
<number>0</number>
</property>
<item row="0" column="0" >
<layout class="QVBoxLayout" >
@ -111,53 +111,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="batchInstFlagFrame" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape" >
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
</property>
<item row="1" column="0" >
<widget class="QCheckBox" name="batchInstall" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Perform batch install</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<string>Check this option if you want to install all selected firewalls automatically. This only works if you use the same user name and password to authenticate to all these firewalls. </string>
</property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame12" >
<property name="sizePolicy" >
@ -265,8 +218,11 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2" >
<widget class="QWidget" name="progress_page" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QFrame" name="frame18_2" >
<property name="frameShape" >
@ -304,9 +260,18 @@
</item>
<item rowspan="2" row="0" column="0" colspan="2" >
<widget class="QTreeWidget" name="fwWorkList" >
<property name="alternatingRowColors" >
<bool>true</bool>
</property>
<property name="itemsExpandable" >
<bool>false</bool>
</property>
<property name="sortingEnabled" >
<bool>true</bool>
</property>
<property name="headerHidden" >
<bool>false</bool>
</property>
<column>
<property name="text" >
<string>Firewall</string>
@ -336,13 +301,10 @@
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>11</number>
</property>
<item>
<layout class="QHBoxLayout" >
<item>
<layout class="QGridLayout" name="gridLayout_4" >
<item row="0" column="0" >
<layout class="QGridLayout" name="gridLayout_3" >
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
<string>Firewalls:</string>
@ -352,7 +314,7 @@
</property>
</widget>
</item>
<item>
<item row="0" column="1" >
<widget class="QLabel" name="fwMCLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
@ -374,18 +336,20 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QProgressBar" name="compFirewallProgress" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<item row="0" column="2" >
<widget class="QProgressBar" name="compFirewallProgress" >
<property name="minimumSize" >
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QLabel" name="infoMCLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
@ -407,62 +371,22 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QProgressBar" name="compProgress" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<item row="1" column="2" >
<widget class="QProgressBar" name="compProgress" >
<property name="minimumSize" >
<size>
<width>180</width>
<height>20</height>
<width>300</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="detailsButton" >
<property name="text" >
<string>Show Details</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>101</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QGroupBox" name="detailMCframe" >
@ -524,6 +448,53 @@
</item>
</layout>
</item>
<item row="2" column="0" >
<widget class="QFrame" name="batchInstFlagFrame" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<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" name="_2" >
<property name="margin" >
<number>0</number>
</property>
<item row="1" column="0" >
<widget class="QCheckBox" name="batchInstall" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Perform batch install</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<string>Check this option if you want to install all selected firewalls automatically. This only works if you use the same user name and password to authenticate to all these firewalls. </string>
</property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
@ -639,22 +610,6 @@
<layoutdefault spacing="6" margin="11" />
<resources/>
<connections>
<connection>
<sender>detailsButton</sender>
<signal>clicked(bool)</signal>
<receiver>instDialog_q</receiver>
<slot>togleDetailMC()</slot>
<hints>
<hint type="sourcelabel" >
<x>509</x>
<y>170</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>saveMCLogButton</sender>
<signal>clicked(bool)</signal>

6
src/res/help/en_US/release_notes_3.1.0.html
View File

@ -209,6 +209,12 @@
they need to enter the name only once.
</p>
<p>
<b>"Batch install"</b> checkbox moved to the page that shows
compiler progress so the user can decide to do batch install right
before they perform installations instead of doing this before they
start compile.
</p>
<a name="cluster"></a>
<h2>Support for High Availability configurations</h2>