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

[<vz...@us...>]

Revision: 45
          http://kbarcode.svn.sourceforge.net/kbarcode/?rev=45&view=rev
Author:   vzsolt
Date:     2008-03-04 12:34:48 -0800 (Tue, 04 Mar 2008)

Log Message:
-----------
Finished ConfigDialog, no more errors or warnings.

This is my last one for today, I still have to study some Java for the university :D

Modified Paths:
--------------
    trunk/src/dialogs/configdialog.cpp
    trunk/src/dialogs/configdialog.h
    trunk/src/sqltables.h

Modified: trunk/src/dialogs/configdialog.cpp
===================================================================
--- trunk/src/dialogs/configdialog.cpp	2008-03-04 20:02:37 UTC (rev 44)
+++ trunk/src/dialogs/configdialog.cpp	2008-03-04 20:34:48 UTC (rev 45)
@@ -20,13 +20,13 @@
 #include "sqltables.h"
 
 // Qt includes
-#include <q3buttongroup.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
+#include <QCheckBox>
+#include <QLabel>
+#include <QLayout>
+#include <QRadioButton>
+#include <QGroupBox>
 #include <qsqldatabase.h>
-#include <qtooltip.h>
+#include <QToolTip>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <QFrame>
@@ -39,6 +39,7 @@
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <kimageio.h>
+#include <kicon.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kcombobox.h>
@@ -46,16 +47,19 @@
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <kglobal.h>
+#include <kvbox.h>
+#include <kpagewidgetmodel.h>
 
-const QString cached = I18N_NOOP("There are currently %1 cached barcodes.");
+const QString cached = I18N_NOOP( "There are currently %1 cached barcodes." );
+
 using namespace KABC;
 
 ConfigDialog::ConfigDialog( QWidget* parent )
-    : KDialog( parent )
+        : KPageDialog( parent )
 {
-    setFaceType( List );
-    setCaption( i18n("Configure KBarcode") );
-    setButtons( KDialog::Ok|KDialog::Cancel );
+    setFaceType( KPageDialog::List );
+    setCaption( i18n( "Configure KBarcode" ) );
+    setButtons( KDialog::Ok | KDialog::Cancel );
     setDefaultButton( KDialog::Ok );
     setModal( true );
 
@@ -74,7 +78,7 @@
 {
     KVBox* page = new KVBox();
     KPageWidgetItem* item = addPage( page, i18n( "SQL Settings" ) );
-    item->setIcon( BarIcon( "connect_no" ) );
+    item->setIcon( KIcon( "connect_no" ) );
 
     sqlwidget = new SqlWidget( false, page );
 
@@ -88,7 +92,7 @@
 
     KVBox* page = new KVBox();
     KPageWidgetItem* item = addPage( page, i18n( "Print Settings" ) );
-    item->setIcon( BarIcon( "fileprint" ) );
+    item->setIcon( KIcon( "fileprint" ) );
 
     QHBoxLayout* Layout0 = new QHBoxLayout( page );
     QHBoxLayout* Layout1 = new QHBoxLayout( page );
@@ -136,12 +140,12 @@
 
     QWidget* page = new QWidget( this );
     KPageWidgetItem* item = addPage( page, i18n( "Import" ) );
-    item->setIcon( BarIcon( "fileimport" ) );
+    item->setIcon( KIcon( "fileimport" ) );
 
-    QGridLayout* grid = new QGridLayout( box, 2, 2 );
+    QGridLayout* grid = new QGridLayout( page );
 
     QLabel* label = new QLabel( page );
-    label->setText( i18n("Comment:") );
+    label->setText( i18n( "Comment:" ) );
     grid->addWidget( label, 0, 0 );
 
     comment = new KLineEdit( lb->comment, page );
@@ -155,47 +159,47 @@
     grid->addWidget( separator, 1, 1 );
 
     label = new QLabel( page );
-    label->setText( i18n("Quote Character:") );
+    label->setText( i18n( "Quote Character:" ) );
     grid->addWidget( label, 2, 0 );
 
     quote  = new KLineEdit( lb->quote, page );
     grid->addWidget( quote, 2, 1 );
 
-    checkUseCustomNo = new QCheckBox( i18n("&Use customer article no. for import"), page );
+    checkUseCustomNo = new QCheckBox( i18n( "&Use customer article no. for import" ), page );
     checkUseCustomNo->setChecked( lb->useCustomNo );
-    
+
     grid->addWidget( checkUseCustomNo, 3, 0, 1, 2 );
-    
-    QHBoxLayout* Layout1 = new QHBoxLayout( 0 );
-    Layout1->addWidget( new QLabel( i18n("File Format:"), page ) );
 
+    QHBoxLayout* Layout1 = new QHBoxLayout( page );
+    Layout1->addWidget( new QLabel( i18n( "File Format:" ), page ) );
+
     combo1 = new KComboBox( page );
-    combo1->addItem( i18n("Quantity") );
-    combo1->addItem( i18n("Article Number") );
-    combo1->addItem( i18n("Group") );
+    combo1->addItem( i18n( "Quantity" ) );
+    combo1->addItem( i18n( "Article Number" ) );
+    combo1->addItem( i18n( "Group" ) );
     Layout1->addWidget( combo1 );
 
     combo2 = new KComboBox( page );
-    combo2->addItem( i18n("Quantity") );
-    combo2->addItem( i18n("Article Number") );
-    combo2->addItem( i18n("Group") );
+    combo2->addItem( i18n( "Quantity" ) );
+    combo2->addItem( i18n( "Article Number" ) );
+    combo2->addItem( i18n( "Group" ) );
     Layout1->addWidget( combo2 );
 
     combo3 = new KComboBox( page );
-    combo3->addItem( i18n("Quantity") );
-    combo3->addItem( i18n("Article Number") );
-    combo3->addItem( i18n("Group") );
+    combo3->addItem( i18n( "Quantity" ) );
+    combo3->addItem( i18n( "Article Number" ) );
+    combo3->addItem( i18n( "Group" ) );
     Layout1->addWidget( combo3 );
 
     grid->addLayout( Layout1, 4, 0, 1, 2 );
     QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
     grid->addItem( spacer, 5, 0 );
-    
-    KConfigGroup config = KGlobal::config()->group("FileFormat");
-    combo1->setCurrentIndex( config.readEntry("Data0", 0 ) );
-    combo2->setCurrentIndex( config.readEntry("Data1", 1 ) );
-    combo3->setCurrentIndex( config.readEntry("Data2", 2 ) );
 
+    KConfigGroup config = KGlobal::config()->group( "FileFormat" );
+    combo1->setCurrentIndex( config.readEntry( "Data0", 0 ) );
+    combo2->setCurrentIndex( config.readEntry( "Data1", 1 ) );
+    combo3->setCurrentIndex( config.readEntry( "Data2", 2 ) );
+
     page->setLayout( grid );
 }
 
@@ -203,70 +207,69 @@
 {
     QWidget* page = new QWidget( this );
     KPageWidgetItem* item = addPage( page, i18n( "Label Editor" ) );
-    item->setIcon( BarIcon( "kbarcode" ) );
+    item->setIcon( KIcon( "kbarcode" ) );
 
-    QGridLayout* tabLayout = new QGridLayout( box, 11, 6 );
+    QGridLayout* tabLayout = new QGridLayout( page );
 
     checkNewDlg = new QCheckBox( page );
-    checkNewDlg->setText( i18n("&Create a new label on startup") );
+    checkNewDlg->setText( i18n( "&Create a new label on startup" ) );
 
     date = new KLineEdit( page );
     labelDate = new QLabel( page );
-    
+
     connect( date, SIGNAL( textChanged( const QString & ) ), this, SLOT( updateDatePreview() ) );
 
     spinGrid = new KIntNumInput( 0, page );
-    spinGrid->setLabel( i18n("Grid:" ), Qt::AlignLeft | Qt::AlignVCenter );
-    spinGrid->setRange(2, 100, 1 );
+    spinGrid->setLabel( i18n( "Grid:" ), Qt::AlignLeft | Qt::AlignVCenter );
+    spinGrid->setRange( 2, 100, 1 );
     spinGrid->setSliderEnabled( false );
-    
+
     colorGrid = new KColorButton( page );
 
     tabLayout->addWidget( checkNewDlg, 0, 0 );
     tabLayout->addWidget( spinGrid, 1, 0, 1, 2 );
-    tabLayout->addWidget( new QLabel( i18n("Grid Color:"), page ), 2, 0 );
+    tabLayout->addWidget( new QLabel( i18n( "Grid Color:" ), page ), 2, 0 );
     tabLayout->addWidget( colorGrid, 2, 1 );
-    tabLayout->addWidget( new QLabel( i18n("Date Format:"), page ), 3, 0 );
+    tabLayout->addWidget( new QLabel( i18n( "Date Format:" ), page ), 3, 0 );
     tabLayout->addWidget( date, 3, 1 );
     tabLayout->addWidget( labelDate, 3, 2 );
-    
-    page.setLayout( tabLayout );
+
+    page->setLayout( tabLayout );
 }
 
 void ConfigDialog::setupTab5()
 {
     labelprinterdata* lb = PrinterSettings::getInstance()->getData();
-    
+
     KVBox* page = new KVBox();
     KPageWidgetItem* item = addPage( page, i18n( "On New" ) );
-    item->setIcon( BarIcon( "filenew" ) );
-    
-    QButtonGroup* bg = new QButtonGroup( i18n("On New Article"), page );
-    bg->setColumnLayout(0, Qt::Vertical );
-    QGridLayout* bgLayout = new QGridLayout( bg->layout() );
+    item->setIcon( KIcon( "filenew" ) );
 
     QStringList alist, glist;
-    alist.append( i18n("No Line Break") );
-    alist.append( i18n("Line Break") );
-    alist.append( i18n("Insert Label X") );
-    alist.append( i18n("New Page") );
-    alist.append( i18n("Article No.") );
+    alist.append( i18n( "No Line Break" ) );
+    alist.append( i18n( "Line Break" ) );
+    alist.append( i18n( "Insert Label X" ) );
+    alist.append( i18n( "New Page" ) );
+    alist.append( i18n( "Article No." ) );
 
-    glist.append( i18n("No Line Break") );
-    glist.append( i18n("Line Break") );
-    glist.append( i18n("Insert Label X") );
-    glist.append( i18n("New Page") );
-    glist.append( i18n("Group Name") );
+    glist.append( i18n( "No Line Break" ) );
+    glist.append( i18n( "Line Break" ) );
+    glist.append( i18n( "Insert Label X" ) );
+    glist.append( i18n( "New Page" ) );
+    glist.append( i18n( "Group Name" ) );
 
+    QGroupBox* bg = new QGroupBox( i18n( "On New Article" ), page );
+    QGridLayout* bgLayout = new QGridLayout( bg );
+
     onNewArticle1 = new KComboBox( false, bg );
     onNewArticle2 = new KComboBox( false, bg );
     onNewArticle3 = new KComboBox( false, bg );
     onNewArticle4 = new KComboBox( false, bg );
 
-    onNewArticle1->insertStringList( alist );
-    onNewArticle2->insertStringList( alist );
-    onNewArticle3->insertStringList( alist );
-    onNewArticle4->insertStringList( alist );
+    onNewArticle1->insertItems( 0, alist );
+    onNewArticle2->insertItems( 0, alist );
+    onNewArticle3->insertItems( 0, alist );
+    onNewArticle4->insertItems( 0, alist );
 
     bgLayout->setColumnStretch( 1, 3 );
 
@@ -280,19 +283,20 @@
     bgLayout->addWidget( onNewArticle3, 2, 1 );
     bgLayout->addWidget( onNewArticle4, 3, 1 );
 
-    QButtonGroup* bg2 = new QButtonGroup( i18n("On New Group"), page );
-    bg2->setColumnLayout(0, Qt::Vertical );
-    QGridLayout* bg2Layout = new QGridLayout( bg2->layout() );
+    bg->setLayout( bgLayout );
 
+    QGroupBox* bg2 = new QGroupBox( i18n( "On New Group" ), page );
+    QGridLayout* bg2Layout = new QGridLayout( bg2 );
+
     onNewGroup1 = new KComboBox( false, bg2 );
     onNewGroup2 = new KComboBox( false, bg2 );
     onNewGroup3 = new KComboBox( false, bg2 );
     onNewGroup4 = new KComboBox( false, bg2 );
 
-    onNewGroup1->insertStringList( glist );
-    onNewGroup2->insertStringList( glist );
-    onNewGroup3->insertStringList( glist );
-    onNewGroup4->insertStringList( glist );
+    onNewGroup1->insertItems( 0, glist );
+    onNewGroup2->insertItems( 0, glist );
+    onNewGroup3->insertItems( 0, glist );
+    onNewGroup4->insertItems( 0, glist );
 
     bg2Layout->setColumnStretch( 1, 3 );
 
@@ -306,6 +310,8 @@
     bg2Layout->addWidget( onNewGroup3, 2, 1 );
     bg2Layout->addWidget( onNewGroup4, 3, 1 );
 
+    bg2->setLayout( bg2Layout );
+
     onNewArticle1->setCurrentIndex( lb->articleEvent1 );
     onNewArticle2->setCurrentIndex( lb->articleEvent2 );
     onNewArticle3->setCurrentIndex( lb->articleEvent3 );
@@ -319,12 +325,12 @@
 
 void ConfigDialog::accept()
 {
-    KConfigGroup config = KGlobal::config()->group("FileFormat");
-    
-    config.writeEntry("Data0", combo1->currentIndex() );
-    config.writeEntry("Data1", combo2->currentIndex() );
-    config.writeEntry("Data2", combo3->currentIndex() );
+    KConfigGroup config = KGlobal::config()->group( "FileFormat" );
 
+    config.writeEntry( "Data0", combo1->currentIndex() );
+    config.writeEntry( "Data1", combo2->currentIndex() );
+    config.writeEntry( "Data2", combo3->currentIndex() );
+
     sqlwidget->save();
 
     labelprinterdata* lpdata = PrinterSettings::getInstance()->getData();
@@ -344,16 +350,21 @@
     lpdata->groupEvent4 = onNewGroup4->currentIndex();
     lpdata->useCustomNo = checkUseCustomNo->isChecked();
 
-    switch( printerQuality->currentIndex() ) {
+    switch ( printerQuality->currentIndex() )
+    {
+
         case 0:
             lpdata->quality = PrinterSettings::Middle;
             break;
+
         case 1:
             lpdata->quality = PrinterSettings::High;
             break;
+
         case 2:
             lpdata->quality = PrinterSettings::VeryHigh;
             break;
+
         default:
             break;
     }
@@ -363,7 +374,7 @@
 
 void ConfigDialog::updateDatePreview()
 {
-    labelDate->setText( i18n("Preview: ") + QDateTime::currentDateTime().toString( date->text() ) );
+    labelDate->setText( i18n( "Preview: " ) + QDateTime::currentDateTime().toString( date->text() ) );
 }
 
 #include "configdialog.moc"

Modified: trunk/src/dialogs/configdialog.h
===================================================================
--- trunk/src/dialogs/configdialog.h	2008-03-04 20:02:37 UTC (rev 44)
+++ trunk/src/dialogs/configdialog.h	2008-03-04 20:34:48 UTC (rev 45)
@@ -18,7 +18,7 @@
 #ifndef CONFIGDIALOG_H
 #define CONFIGDIALOG_H
 
-#include <kdialog.h>
+#include <kpagedialog.h>
 
 struct labelprinterdata;
 struct mysqldata;
@@ -37,7 +37,7 @@
 /** KBarcodes configuration dialog for advanced settings.
   */
 
-class ConfigDialog : public KDialog  {
+class ConfigDialog : public KPageDialog  {
     Q_OBJECT
     public:
         ConfigDialog( QWidget* parent );

Modified: trunk/src/sqltables.h
===================================================================
--- trunk/src/sqltables.h	2008-03-04 20:02:37 UTC (rev 44)
+++ trunk/src/sqltables.h	2008-03-04 20:34:48 UTC (rev 45)
@@ -71,6 +71,8 @@
   */
 class SqlDescription {
     public:
+        virtual ~SqlDescription() {}
+        
         /** return the name of the database we can always
           * use to connect to this database.
           */


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