From kde-commits  Mon Jul 31 22:40:31 2006
From: Olivier Goffart <ogoffart () kde ! org>
Date: Mon, 31 Jul 2006 22:40:31 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/libkopete/ui
Message-Id: <1154385631.473826.29758.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=115438563904317

SVN commit 568380 by ogoffart:

make button of the fileconfirm dialog working.    make the label word wrap.
  (i've tested fletransfer with jabber :  it works! )


 M  +3 -9      fileconfirmbase.ui  
 M  +10 -25    kopetefileconfirmdialog.cpp  
 M  +2 -6      kopetefileconfirmdialog.h  


--- trunk/KDE/kdenetwork/kopete/libkopete/ui/fileconfirmbase.ui #568379:568380
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>FileConfirmBase</class>
  <widget class="QWidget" name="FileConfirmBase" >
   <property name="geometry" >
@@ -42,6 +39,9 @@
      <property name="alignment" >
       <set>Qt::AlignVCenter</set>
      </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item row="6" column="3" colspan="2" >
@@ -139,22 +139,16 @@
    <class>Q3TextEdit</class>
    <extends>Q3Frame</extends>
    <header>q3textedit.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QWidget</extends>
    <header>klineedit.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
    <class>KPushButton</class>
    <extends>QWidget</extends>
    <header>kpushbutton.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
  <resources/>
--- trunk/KDE/kdenetwork/kopete/libkopete/ui/kopetefileconfirmdialog.cpp #568379:568380
@@ -35,12 +35,10 @@
 : KDialog( parent ), m_info( info )
 {
 	setCaption( i18n( "A User Would Like to Send You a File" ) );
-	setButtons( KDialog::User1 | KDialog::User2 );
-	setButtonGuiItem( KDialog::User1, i18n("&Refuse") );
-	setButtonGuiItem( KDialog::User2, i18n("&Accept") );	
+	setButtons( KDialog::Ok | KDialog::Cancel );
+	setButtonGuiItem( KDialog::Cancel, i18n("&Refuse") );
+	setButtonGuiItem( KDialog::Ok, i18n("&Accept") );	
 
-	setEscapeButton( KDialog::User1 );
-	setDefaultButton( KDialog::User2 );
 	setAttribute( Qt::WA_DeleteOnClose );
 	m_emited=false;
 
@@ -69,6 +67,10 @@
 
 KopeteFileConfirmDialog::~KopeteFileConfirmDialog()
 {
+	if(!m_emited)
+	{
+		emit refused(m_info);
+	}
 }
 
 void KopeteFileConfirmDialog::slotBrowsePressed()
@@ -80,9 +82,8 @@
 	}
 }
 
-void KopeteFileConfirmDialog::slotUser2()
+void KopeteFileConfirmDialog::accept()
 {
-	m_emited=true;
 	KUrl url = KUrl(m_saveto->text());
 	if(url.isValid() && url.isLocalFile() )
 	{
@@ -102,28 +103,12 @@
 		}
 
 		emit accepted(m_info,m_saveto->text());
-		close();
+		m_emited=true;
+		KDialog::accept();
 	}
 	else
 		KMessageBox::queuedMessageBox (this, KMessageBox::Sorry, i18n("You must provide a valid local filename") );
 }
 
-void KopeteFileConfirmDialog::slotUser1()
-{
-	m_emited=true;
-	emit refused(m_info);
-	close();
-}
-
-void KopeteFileConfirmDialog::closeEvent( QCloseEvent *e)
-{
-	if(!m_emited)
-	{
-		m_emited=true;
-		emit refused(m_info);
-	}
-	KDialog::closeEvent(e);
-}
-
 #include "kopetefileconfirmdialog.moc"
 
--- trunk/KDE/kdenetwork/kopete/libkopete/ui/kopetefileconfirmdialog.h #568379:568380
@@ -35,7 +35,7 @@
 	                         const QString& description = QString::null,
 	                         QWidget *parent = 0 );
 	~KopeteFileConfirmDialog();
-
+	
 private:
 	QWidget* m_view;
 	Kopete::FileTransferInfo m_info;
@@ -43,12 +43,8 @@
 
 public slots:
 	void slotBrowsePressed();
+	virtual void accept();
 
-protected slots:
-	virtual void slotUser2();
-	virtual void slotUser1();
-	virtual void closeEvent( QCloseEvent *e);
-
 signals:
 	void accepted(const Kopete::FileTransferInfo &info, const QString &filename);
 	void refused(const Kopete::FileTransferInfo &info);