Branch: master

4f0e89f2 2014-10-13 15:43:43 Timothy Pearson
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
M kbarcode/barcodedialog.cpp
M kbarcode/batchwizard.cpp
M kbarcode/configdialog.cpp
M kbarcode/kbarcode.cpp
M kbarcode/labeleditor.cpp
M kbarcode/previewdialog.cpp
diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp
index aa57466..3971548 100644
--- a/kbarcode/barcodedialog.cpp
+++ b/kbarcode/barcodedialog.cpp
@@ -61,21 +61,21 @@
     buttonSave = new KPushButton( this, "buttonSave" );
     buttonSave->setText( i18n( "&Save" ) );
     buttonSave->setEnabled( false );
-    buttonSave->setIconSet( SmallIconSet("filesave") );
+    buttonSave->setIconSet( SmallIconSet("document-save") );
         
     buttonCopy = new KPushButton( this, "buttonCopy" );
     buttonCopy->setText( i18n("&Copy") );
     buttonCopy->setEnabled( false );
-    buttonCopy->setIconSet( SmallIconSet("editcopy") );
+    buttonCopy->setIconSet( SmallIconSet("edit-copy") );
     
     buttonPrint = new KPushButton( this );
     buttonPrint->setText( i18n("&Print") );
     buttonPrint->setEnabled( false );
-    buttonPrint->setIconSet( SmallIconSet("fileprint") );
+    buttonPrint->setIconSet( SmallIconSet("document-print") );
     
     buttonClose = new KPushButton( this );
     buttonClose->setText( i18n("&Close" ) );
-    buttonClose->setIconSet( SmallIconSet("fileclose") );
+    buttonClose->setIconSet( SmallIconSet("window-close") );
     
 
     TQScrollView* sv = new TQScrollView( this );
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 27b30cd..09c2fe4 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -185,7 +185,7 @@
     buttonTableInsert = new KPushButton( i18n("Insert Row"), hbox );
     buttonTableInsert->setIconSet( BarIconSet( "edit" ) );
     buttonTableRemove = new KPushButton( i18n("Delete Row"), hbox );
-    buttonTableRemove->setIconSet( BarIconSet( "editdelete") );
+    buttonTableRemove->setIconSet( BarIconSet( "edit-delete") );
 
     m_varTable = new TQTable( page4 );
     m_varTable->setReadOnly( false );
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index b453771..3dd0ab4 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -77,7 +77,7 @@
 {
     labelprinterdata* lb = PrinterSettings::getInstance()->getData();
     
-    TQFrame* box = addPage( i18n("Print Settings"), "", BarIcon("fileprint") );
+    TQFrame* box = addPage( i18n("Print Settings"), "", BarIcon("document-print") );
 
     TQVBoxLayout* tabLayout = new TQVBoxLayout( box, 11, 6 );
     TQHBoxLayout* Layout0 = new TQHBoxLayout( 0, 6, 6 );
@@ -212,7 +212,7 @@
 void ConfigDialog::setupTab5()
 {
     labelprinterdata* lb = PrinterSettings::getInstance()->getData();
-    TQFrame* box = addPage( i18n("On New"), "", BarIcon("filenew") );
+    TQFrame* box = addPage( i18n("On New"), "", BarIcon("document-new") );
 
     TQVBoxLayout* tabLayout = new TQVBoxLayout( box, 11, 6 );
 
diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp
index 3c6212c..2f864d4 100644
--- a/kbarcode/kbarcode.cpp
+++ b/kbarcode/kbarcode.cpp
@@ -57,7 +57,7 @@
     
     buttonSingle->setIconSet( BarIconSet( "barcode" ) );
     buttonEditor->setIconSet( BarIconSet( "edit" ) );
-    buttonBatch->setIconSet( BarIconSet( "fileprint" ) );
+    buttonBatch->setIconSet( BarIconSet( "document-print" ) );
 
     layout->addWidget( buttonSingle );
     layout->addWidget( buttonEditor );
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index 2bd0d28..6471527 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -445,12 +445,12 @@
 
     recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, TQT_TQOBJECT(this),  TQT_SLOT( loadRecentEditor( const KURL& ) ) );
 
-    TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "fileprint" ), 0, TQT_TQOBJECT(this),  TQT_SLOT( batchPrint() ), actionCollection() );
+    TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "document-print" ), 0, TQT_TQOBJECT(this),  TQT_SLOT( batchPrint() ), actionCollection() );
 
     saveAct = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection(), "save" );
     saveAsAct = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( saveas() ), actionCollection(), "saveas" );
     descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT(changeDes()), actionCollection() );
-    deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("editdelete") ), Key_Delete, TQT_TQOBJECT(cv), TQT_SLOT( deleteCurrent() ), actionCollection() );
+    deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("edit-delete") ), Key_Delete, TQT_TQOBJECT(cv), TQT_SLOT( deleteCurrent() ), actionCollection() );
     editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( doubleClickedCurrent() ), actionCollection() );
     printAct = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(), "print" );
     bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, TQT_TQOBJECT(this),  TQT_SLOT( printBCP() ), actionCollection() );
@@ -591,7 +591,7 @@
     m_mnuContext->insertItem( i18n("&Order"), orderMenu );
     m_mnuContext->insertItem( i18n("&Center"), centerMenu );
     m_mnuContext->insertSeparator();
-    m_mnuContext->insertItem( SmallIcon("editdelete"), i18n("&Delete"), cv, TQT_SLOT( deleteCurrent() ) );
+    m_mnuContext->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), cv, TQT_SLOT( deleteCurrent() ) );
     m_mnuContext->insertItem( i18n("&Protect Position and Size"), TQT_TQOBJECT(this),  TQT_SLOT( lockItem() ), 0, ID_LOCK_ITEM );
     m_mnuContext->insertSeparator();
     m_mnuContext->insertItem( i18n("&Properties"), TQT_TQOBJECT(this),  TQT_SLOT( doubleClickedCurrent() ) );
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index 8dff2dd..7183520 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -90,7 +90,7 @@
 
     buttonUpdate = new KPushButton( i18n("&Update"), this );
     buttonClose = new KPushButton( i18n("&Close"), this );
-    buttonClose->setIconSet( SmallIconSet("fileclose") );
+    buttonClose->setIconSet( SmallIconSet("window-close") );
     
     grid->addWidget( new TQLabel( i18n("Customer Name and No.:"), this ), 0, 0 );
     grid->addWidget( customerName, 0, 1 );