[Kbarcode-svn] SF.net SVN: kbarcode: [31] trunk/src

[<dom...@us...>]

Revision: 31
          http://kbarcode.svn.sourceforge.net/kbarcode/?rev=31&view=rev
Author:   domseichter
Date:     2008-03-04 03:44:54 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
Some more porting

Modified Paths:
--------------
    trunk/src/barcodecombo.cpp
    trunk/src/barcodegenerator.cpp
    trunk/src/documentitem.h
    trunk/src/mimesources.cpp
    trunk/src/mimesources.h
    trunk/src/xmlutils.h

Modified: trunk/src/barcodecombo.cpp
===================================================================
--- trunk/src/barcodecombo.cpp	2008-03-04 08:50:46 UTC (rev 30)
+++ trunk/src/barcodecombo.cpp	2008-03-04 11:44:54 UTC (rev 31)
@@ -144,10 +144,10 @@
         multi = new QTextEdit( this );
 #endif
     multi->setTextFormat( Qt::PlainText );
-    multi->setWordWrap( QTextEdit::NoWrap );
+    multi->setWordWrapMode( QTextOption::NoWrap );
     multi->setEnabled( false );
-    multi->setVScrollBarMode( QScrollView::AlwaysOn );
-    multi->setHScrollBarMode( QScrollView::AlwaysOn );
+    multi->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
+    multi->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
     multi->hide();
     connect( multi, SIGNAL( textChanged() ), this, SLOT( changed() ) );    
     grid->addMultiCellWidget( multi, 3, 3, 1, 3 );
@@ -324,7 +324,7 @@
     if( !m_multi )
         m_barcode.setValue( data->text() );
     else
-        m_barcode.setValue( multi->text() );
+        m_barcode.setValue( multi->toPlainText() );
 
     m_barcode.setType( comboStandard->getEncodingType() );
     m_barcode.setTextVisible( checkText->isChecked() );

Modified: trunk/src/barcodegenerator.cpp
===================================================================
--- trunk/src/barcodegenerator.cpp	2008-03-04 08:50:46 UTC (rev 30)
+++ trunk/src/barcodegenerator.cpp	2008-03-04 11:44:54 UTC (rev 31)
@@ -39,6 +39,8 @@
 #include <qpainter.h>
 #include <QPaintDevice>
 #include <q3picture.h>
+#include <QDesktopWidget>
+#include <QScrollArea>
 #include <QX11Info>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -53,7 +55,7 @@
     Layout6 = new QVBoxLayout( 0, 0, 6, "Layout2");
     widget = new BarcodeWidget( this );
 
-    m_token = new TokenProvider( KApplication::desktop() );
+    m_token = new TokenProvider( KApplication::desktop()->screen() );
     widget->setTokenProvider( m_token );
 
     buttonGenerate = new KPushButton( this );
@@ -81,10 +83,10 @@
     buttonClose->setIconSet( SmallIconSet("fileclose") );
     
 
-    QScrollView* sv = new QScrollView( this );
+    QScrollArea* sv = new QScrollArea( this );
     
-    barcode = new QLabel( sv->viewport(), "barcode" );
-    sv->addChild( barcode );
+    barcode = new QLabel( NULL );
+    sv->setWidget( barcode );
     connect( buttonGenerate, SIGNAL( clicked() ), this, SLOT( generate() ) );
     connect( buttonSave, SIGNAL( clicked() ), this, SLOT( save() ) );
     connect( buttonPrint, SIGNAL( clicked() ), this, SLOT( print() ) );
@@ -139,22 +141,24 @@
 
     if(!bc.isValid()) 
     {
-        KFileDialog fd( ":save_image", KImageIO::pattern( KImageIO::Writing ), this, true );
-        fd.setMode( KFile::File );
+        KFileDialog fd( KUrl("kfiledialog:///save_image"), 
+                        KImageIO::pattern( KImageIO::Writing ), this );
+        fd.setMode( KFile::File | KFile::LocalOnly );
         fd.setOperationMode( KFileDialog::Saving );       
+        
         if( fd.exec() == QDialog::Accepted ) 
         {
-            QString path = fd.selectedURL().path();
-            QString extension = KImageIO::type( path );
+            QString path = fd.selectedUrl().path();
+            QString extension = KImageIO::typeForMime( path ).first();
         
             if( extension.isNull() )
-                extension = KImageIO::type( fd.currentFilter() ); 
+                extension = KImageIO::typeForMime( fd.currentFilter() ).first(); 
 
         
             bc.setTokenProvider( m_token );
             bc.update( KApplication::desktop() );
 
-            if(!bc.pixmap().save( path, extension, 0 ))
+            if(!bc.pixmap().save( path, extension.toLatin1().data(), 0 ))
                 KMessageBox::error( this, i18n("An error occurred during saving the image") );
         }
     }        

Modified: trunk/src/documentitem.h
===================================================================
--- trunk/src/documentitem.h	2008-03-04 08:50:46 UTC (rev 30)
+++ trunk/src/documentitem.h	2008-03-04 11:44:54 UTC (rev 31)
@@ -224,7 +224,7 @@
     return m_visibilityScript;
 }
 
-typedef QList<DocumentItem> DocumentItemList;
+typedef QList<DocumentItem*> DocumentItemList;
 
 #endif //DOCUMENTITEM_H
 

Modified: trunk/src/mimesources.cpp
===================================================================
--- trunk/src/mimesources.cpp	2008-03-04 08:50:46 UTC (rev 30)
+++ trunk/src/mimesources.cpp	2008-03-04 11:44:54 UTC (rev 31)
@@ -76,7 +76,7 @@
         doc.save( t, 0 );
         
         buffer.close();
-        setEncodedData( data );    
+        setData( data );    
     }
 }
 

Modified: trunk/src/mimesources.h
===================================================================
--- trunk/src/mimesources.h	2008-03-04 08:50:46 UTC (rev 30)
+++ trunk/src/mimesources.h	2008-03-04 11:44:54 UTC (rev 31)
@@ -25,7 +25,7 @@
 class TokenProvider;
 class MyCanvasView;
 
-class DocumentItemDrag : public QStoredDrag {
+class DocumentItemDrag : public QMimeData {
     Q_OBJECT
     public:
         DocumentItemDrag( QWidget* dragSource = NULL );

Modified: trunk/src/xmlutils.h
===================================================================
--- trunk/src/xmlutils.h	2008-03-04 08:50:46 UTC (rev 30)
+++ trunk/src/xmlutils.h	2008-03-04 11:44:54 UTC (rev 31)
@@ -34,7 +34,7 @@
 class QRect;
 class QString;
 class QWidget;
-typedef QList<DocumentItem> DocumentItemList;
+typedef QList<DocumentItem*> DocumentItemList;
 
 /** This class provides helper function for saving and reading to XML files.
   *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.