Revision: 6257
Author: nogu.dev
Date: Fri Mar 19 20:45:35 2010
Log: * Merge r6256 from trunk
http://code.google.com/p/uim/source/detail?r=6257
Modified:
/branches/1.5/qt4/chardict/bushuviewwidget.cpp
/branches/1.5/qt4/chardict/qt4.cpp
/branches/1.5/qt4/chardict/unicodeviewwidget.cpp
/branches/1.5/qt4/pref/customwidgets.cpp
/branches/1.5/qt4/pref/qt4.cpp
=======================================
--- /branches/1.5/qt4/chardict/bushuviewwidget.cpp Sat Nov 21 04:55:15 2009
+++ /branches/1.5/qt4/chardict/bushuviewwidget.cpp Fri Mar 19 20:45:35 2010
@@ -84,6 +84,7 @@
this, SIGNAL( charSelected( const QString & ) ) );
QVBoxLayout *vLayout = new QVBoxLayout;
+ vLayout->setMargin( 0 );
vLayout->addWidget( bushuLabel );
vLayout->addWidget( m_bushuListView );
=======================================
--- /branches/1.5/qt4/chardict/qt4.cpp Sat Nov 21 04:55:15 2009
+++ /branches/1.5/qt4/chardict/qt4.cpp Fri Mar 19 20:45:35 2010
@@ -152,6 +152,7 @@
connect( m_modeCombo, SIGNAL( activated( int ) ),
m_widgetStack, SLOT( setCurrentIndex( int ) ) );
+ layout->setMargin( 0 );
layout->addWidget( upperHWidget );
layout->addWidget( new KSeparator( this ) );
layout->addWidget( m_widgetStack );
=======================================
--- /branches/1.5/qt4/chardict/unicodeviewwidget.cpp Sat Nov 21 04:55:15
2009
+++ /branches/1.5/qt4/chardict/unicodeviewwidget.cpp Fri Mar 19 20:45:35
2010
@@ -236,6 +236,7 @@
this, SIGNAL( charSelected( const QString & ) ) );
QVBoxLayout *vLayout = new QVBoxLayout;
+ vLayout->setMargin( 0 );
vLayout->addWidget( unicodeBlockLabel );
vLayout->addWidget( m_unicodeBlockListView );
=======================================
--- /branches/1.5/qt4/pref/customwidgets.cpp Sat Nov 21 04:55:15 2009
+++ /branches/1.5/qt4/pref/customwidgets.cpp Fri Mar 19 20:45:35 2010
@@ -203,6 +203,7 @@
this, SLOT(slotPathnameButtonClicked()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 3 );
layout->addWidget( m_lineEdit );
layout->addWidget( m_fileButton );
@@ -359,6 +360,7 @@
this, SLOT(slotEditButtonClicked()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 3 );
layout->addWidget( m_lineEdit );
layout->addWidget( m_editButton );
@@ -638,6 +640,7 @@
this, SLOT(slotKeyButtonClicked()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 3 );
layout->addWidget( m_lineEdit );
layout->addWidget( m_editButton );
=======================================
--- /branches/1.5/qt4/pref/qt4.cpp Sat Nov 21 04:55:15 2009
+++ /branches/1.5/qt4/pref/qt4.cpp Fri Mar 19 20:45:35 2010
@@ -175,6 +175,7 @@
buttonHLayout->addWidget( m_applyButton );
buttonHLayout->addWidget( cancelButton );
+ mainVLayout->setMargin( 0 );
mainVLayout->addWidget( mainSplitter );
mainVLayout->addWidget( new KSeparator( this ) );
mainVLayout->addWidget( buttonHWidget );
@@ -568,6 +569,7 @@
this, SLOT(slotCustomValueChanged()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 6 );
layout->addWidget( label );
layout->addStretch();
@@ -589,6 +591,7 @@
this, SLOT(slotCustomValueChanged()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 6 );
layout->addWidget( label );
layout->addWidget( lineEdit );
@@ -609,6 +612,7 @@
this, SLOT(slotCustomValueChanged()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 6 );
layout->addWidget( label );
layout->addWidget( pathnameEdit );
@@ -630,6 +634,7 @@
this, SLOT(slotCustomValueChanged()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 6 );
layout->addWidget( label );
layout->addWidget( choiceCombo );
@@ -650,6 +655,7 @@
this, SLOT(slotCustomValueChanged()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 6 );
layout->addWidget( label );
layout->addWidget( olistEditBox );
@@ -670,6 +676,7 @@
this, SLOT(slotCustomValueChanged()) );
QHBoxLayout *layout = new QHBoxLayout;
+ layout->setMargin( 0 );
layout->setSpacing( 6 );
layout->addWidget( label );
layout->addWidget( keyEditBox );
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
