summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-03-20 21:46:03 (UTC)
committer korovkin <korovkin>2006-03-20 21:46:03 (UTC)
commit14e09a10bff58fac21c14f3171bd0979b2fdbe17 (patch) (side-by-side diff)
tree5ade4e83f386b4f93d86183e879b7f08a21a2ef9
parent74546adb68bd3f17a75003671407c4a4e6b09e73 (diff)
downloadopie-14e09a10bff58fac21c14f3171bd0979b2fdbe17.zip
opie-14e09a10bff58fac21c14f3171bd0979b2fdbe17.tar.gz
opie-14e09a10bff58fac21c14f3171bd0979b2fdbe17.tar.bz2
Quick fix: made dialog boxes fit into the 240x320 screen.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/rfcommassigndialogbase.ui26
-rw-r--r--noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp2
-rw-r--r--noncore/net/opietooth/manager/rfcommdialogitembase.ui2
3 files changed, 26 insertions, 4 deletions
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogbase.ui b/noncore/net/opietooth/manager/rfcommassigndialogbase.ui
index ac574a7..04bda8f 100644
--- a/noncore/net/opietooth/manager/rfcommassigndialogbase.ui
+++ b/noncore/net/opietooth/manager/rfcommassigndialogbase.ui
@@ -1,44 +1,64 @@
<!DOCTYPE UI><UI>
<class>RfcommAssignDialogBase</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>RfcommAssignDialogBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>289</width>
+ <width>361</width>
<height>343</height>
</rect>
</property>
<property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
<name>caption</name>
<string>Rfcomm Bind</string>
</property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
<vbox>
<property stdset="1">
<name>margin</name>
- <number>11</number>
+ <number>4</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>6</number>
+ <number>4</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
<name>text</name>
<string>Bind device to a interface</string>
</property>
</widget>
</vbox>
</widget>
</UI>
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
index 3fe2ea6..be720b8 100644
--- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
+++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
@@ -47,32 +47,34 @@ RfcommAssignDialog::~RfcommAssignDialog()
}
}
void RfcommAssignDialog::newDevice( const QString & mac )
{
for ( int i = 0 ; i < m_range; i++ )
{
QMap<QString, RfCommConfObject*>::Iterator it;
it = confHandler->foundEntries().find( QString("%1").arg( i ) );
// make sure that rfcommX is not assigned yet
if ( it == confHandler->foundEntries().end() )
{
QDialog dialog( this, "newdevice", true, WStyle_ContextHelp );
+ dialog.setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7,
+ (QSizePolicy::SizeType)7, sizePolicy().hasHeightForWidth()));
RfcommDialogItem *newDev = new RfcommDialogItem( &dialog );
newDev->setIdent( i );
newDev->setMac( mac );
if ( QPEApplication::execDialog( &dialog ) == QDialog::Accepted )
{
RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box );
m_itemList.insert( i , rfcomm );
rfcomm->setIdent( i );
rfcomm->setMac( mac );
rfcomm->setChannel( newDev->channel() );
rfcomm->setComment( newDev->comment() );
odebug << "New device set up" << oendl;
}
}
diff --git a/noncore/net/opietooth/manager/rfcommdialogitembase.ui b/noncore/net/opietooth/manager/rfcommdialogitembase.ui
index f9817df..dd8f121 100644
--- a/noncore/net/opietooth/manager/rfcommdialogitembase.ui
+++ b/noncore/net/opietooth/manager/rfcommdialogitembase.ui
@@ -1,30 +1,30 @@
<!DOCTYPE UI><UI>
<class>RfcommDialogItemBase</class>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>RfcommDialogItemBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>289</width>
+ <width>239</width>
<height>95</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Form2</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>0</number>
</property>