onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-11 15:41:41 +02:00
Code Issues Releases Wiki Activity

using right signal in SSHUnx, installer works

Browse Source 
using correct way to find and load QT translations in main.cpp
This commit is contained in:
Vadim Kurland
2007-12-30 07:52:02 +00:00
parent 0820a2c1e9
commit 37bf1363c2
6 changed files with 174 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2007-12-29 <vadim@vk.crocodile.org>
* SSHUnx.cpp (SSHUnx::stateMachine): using signal proper for qt4
(bytesWritten(quint64) instead of wroteToStdin)
2007-12-19 vadim <vadim@vk.crocodile.org> 2007-12-19 vadim <vadim@vk.crocodile.org>
* v2.1.16 release * v2.1.16 release
src/gui/FWBMainWindow_q.ui
+145 -73
View File
@@ -13,9 +13,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -26,6 +24,13 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="font" >
<font>
<family>Sans Serif</family>
<pointsize>11</pointsize>
<stylestrategy>PreferDefault</stylestrategy>
</font>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Firewall Builder</string> <string>Firewall Builder</string>
</property> </property>
@@ -34,18 +39,28 @@
</property> </property>
<widget class="QWidget" name="widget" > <widget class="QWidget" name="widget" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QFrame" name="frame13" > <widget class="QFrame" name="frame13" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -57,18 +72,25 @@
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <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> <number>0</number>
</property> </property>
<item> <item>
<widget class="QSplitter" name="mainSplitter" > <widget class="QSplitter" name="mainSplitter" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -102,10 +124,22 @@
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0" >
@@ -117,18 +151,28 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>2</number> <number>2</number>
</property> </property>
<property name="spacing" > <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>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QToolButton" name="infoStyleButton" > <widget class="QToolButton" name="infoStyleButton" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -185,9 +229,7 @@
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QSplitter" name="objInfoSplitter" > <widget class="QSplitter" name="objInfoSplitter" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -203,9 +245,7 @@
</property> </property>
<widget class="QFrame" name="treeFrame" > <widget class="QFrame" name="treeFrame" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -219,9 +259,7 @@
</widget> </widget>
<widget class="QFrame" name="infoFrame" > <widget class="QFrame" name="infoFrame" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -239,9 +277,7 @@
</widget> </widget>
<widget class="QFrame" name="rightFrame" > <widget class="QFrame" name="rightFrame" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -259,26 +295,45 @@
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <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> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="firewallName" > <widget class="QLabel" name="firewallName" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -319,9 +374,7 @@
<item> <item>
<widget class="QLabel" name="textLabel1" > <widget class="QLabel" name="textLabel1" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<hsizetype>1</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -337,9 +390,7 @@
<item> <item>
<widget class="QComboBox" name="fwList" > <widget class="QComboBox" name="fwList" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -360,9 +411,7 @@
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QTabWidget" name="ruleSets" > <widget class="QTabWidget" name="ruleSets" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
<hsizetype>5</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -377,9 +426,7 @@
<item row="3" column="0" > <item row="3" column="0" >
<widget class="QFrame" name="auxiliaryPanel" > <widget class="QFrame" name="auxiliaryPanel" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -403,21 +450,28 @@
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>11</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin" >
<number>11</number>
</property>
<property name="topMargin" >
<number>11</number>
</property>
<property name="rightMargin" >
<number>11</number>
</property>
<property name="bottomMargin" >
<number>11</number>
</property>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QFrame" name="objectEditorFrame" > <widget class="QFrame" name="objectEditorFrame" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -429,18 +483,28 @@
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QStackedWidget" name="objectEditorStack" > <widget class="QStackedWidget" name="objectEditorStack" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -456,12 +520,21 @@
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>10</number> <number>10</number>
</property> </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> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@@ -481,9 +554,7 @@
<item> <item>
<widget class="QPushButton" name="applyObjectEditorButton" > <widget class="QPushButton" name="applyObjectEditorButton" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -502,9 +573,7 @@
<item> <item>
<widget class="QPushButton" name="closeObjectEditorButton" > <widget class="QPushButton" name="closeObjectEditorButton" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -565,7 +634,10 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<attribute name="toolBarArea" > <attribute name="toolBarArea" >
<number>4</number> <enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak" >
<bool>false</bool>
</attribute> </attribute>
<addaction name="toolbarFileOpen" /> <addaction name="toolbarFileOpen" />
<addaction name="toolbarFileSave" /> <addaction name="toolbarFileSave" />
@@ -581,7 +653,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>741</width> <width>741</width>
<height>32</height> <height>24</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="editMenu" > <widget class="QMenu" name="editMenu" >
src/gui/FWWindow.cpp
+2
View File
@@ -158,6 +158,8 @@ FWWindow::FWWindow()
if (fwbdebug) if (fwbdebug)
qDebug("FWWindow constructor"); qDebug("FWWindow constructor");
setUnifiedTitleAndToolBarOnMac(true);
m_mainWindow = new Ui::FWBMainWindow_q(); m_mainWindow = new Ui::FWBMainWindow_q();
m_mainWindow->setupUi(dynamic_cast<QMainWindow*>(this)); m_mainWindow->setupUi(dynamic_cast<QMainWindow*>(this));
src/gui/SSHUnx.cpp
+1 -1
View File
@@ -223,7 +223,7 @@ void SSHUnx::stateMachine()
{ {
if (fwbdebug) qDebug("SSHUnx::stateMachine - sending a file"); if (fwbdebug) qDebug("SSHUnx::stateMachine - sending a file");
emit updateProgressBar_sign(input.size(),true); emit updateProgressBar_sign(input.size(),true);
connect(proc,SIGNAL(wroteToStdin()),this,SLOT(readyToSend())); connect(proc,SIGNAL(bytesWritten(qint64)),this,SLOT(readyToSend()));
sendLine(); sendLine();
break; break;
} }
src/gui/instDialog.cpp
+1
View File
@@ -2305,6 +2305,7 @@ void instDialog::fillInstallOpList()
} }
} }
} }
void instDialog::initInstall() void instDialog::initInstall()
{ {
if (fwbdebug) if (fwbdebug)
src/gui/main.cpp
+19 -9
View File
@@ -48,8 +48,9 @@
#include <qpixmapcache.h> #include <qpixmapcache.h>
#include <QTextCodec> #include <QTextCodec>
#include <QLocale> #include <QLocale>
//Added by qt3to4:
#include <QTranslator> #include <QTranslator>
#include <QLibraryInfo>
/* /*
#ifdef _WIN32 #ifdef _WIN32
@@ -350,8 +351,6 @@ int main( int argc, char ** argv )
fwbdebug=0; fwbdebug=0;
safemode=false; safemode=false;
bool desktopaware = true;
/* /*
* I am using njamd a lot, but gtkmm and probably some other libs * I am using njamd a lot, but gtkmm and probably some other libs
* generate trap in their global static initialization code. Therefore * generate trap in their global static initialization code. Therefore
@@ -573,10 +572,6 @@ int main( int argc, char ** argv )
cout << VERSION << endl; cout << VERSION << endl;
exit(0); exit(0);
case 'x':
desktopaware=!desktopaware;
break;
case 's': case 's':
safemode = true; safemode = true;
break; break;
@@ -600,8 +595,12 @@ int main( int argc, char ** argv )
if (fwbdebug) qDebug("creating app ..."); if (fwbdebug) qDebug("creating app ...");
QApplication::setDesktopSettingsAware(desktopaware); //QApplication::setDesktopSettingsAware(desktopaware);
app = new QApplication( argc, argv ); app = new QApplication( argc, argv );
app->setOrganizationName(QLatin1String("NetCitadel LLC"));
app->setApplicationName(QLatin1String("Firewall Builder"));
Q_INIT_RESOURCE(MainRes);
if (fwbdebug) qDebug("reading settings ..."); if (fwbdebug) qDebug("reading settings ...");
@@ -648,9 +647,20 @@ int main( int argc, char ** argv )
QString local = QLocale::system().name(); QString local = QLocale::system().name();
QTranslator translator(0); QTranslator translator(0);
translator.load(QString("fwbuilder_")+QString(local),localepath.c_str()); translator.load(QLatin1String("fwbuilder_") +
QString(local), localepath.c_str());
app->installTranslator (&translator); app->installTranslator (&translator);
QString qt_resource_dir =
QLibraryInfo::location(QLibraryInfo::TranslationsPath);
QTranslator qt_translator(0);
qt_translator.load(QLatin1String("qt_") + QLocale::system().name(),
qt_resource_dir);
app->installTranslator (&qt_translator);
/* must build list of available libraries _after_ creation of /* must build list of available libraries _after_ creation of
* FWObjectDatabase and settings */ * FWObjectDatabase and settings */