Branch: master

9f471e2f 2014-10-13 15:43:47 Timothy Pearson 
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance
M kmyfirewall/genericinterface/kmfgenericinterface.cpp
M kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
M kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
M kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
M kmyfirewall/ipteditor/kmfipteditorpart.cpp
M kmyfirewall/ipteditor/kmfruleedit.cpp
M kmyfirewall/kmfwidgets/kmflistview.cpp
M kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
 
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface.cpp b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
index 00f7814..7d339c7 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
@@ -228,7 +228,7 @@
 	icon_name = "network_local";
 	icon_host_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 
-	icon_name = "filesaveas";
+	icon_name = "document-save-as";
 	icon_nat_page = loader->loadIcon( icon_name, TDEIcon::Desktop );
 }
 
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
index de9635b..00aab1e 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
@@ -77,7 +77,7 @@
 	                                 0 , this, TQT_SLOT( slotGoICMPOptions() ), actionCollection(), "icmp_options" );
 
 	
-	m_actionGoNATConfiguration = new TDEAction( i18n( "&NAT Configuration" ), TQIconSet( BarIcon( "filesaveas", KMFGenericInterfacePartFactory::instance() ) ),
+	m_actionGoNATConfiguration = new TDEAction( i18n( "&NAT Configuration" ), TQIconSet( BarIcon( "document-save-as", KMFGenericInterfacePartFactory::instance() ) ),
 	                                 0 , this, TQT_SLOT( slotGoNATConfiguration() ), actionCollection(), "nat_configuration" );
 	
 	m_actionGoLogging = new TDEAction( i18n( "&Logging" ), TQIconSet( BarIcon( "log", KMFGenericInterfacePartFactory::instance() ) ),
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
index adc8e38..7f21588 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
@@ -457,10 +457,10 @@
 	icon_name = "go-down";
 	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editdelete";
+	icon_name = "edit-delete";
 	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filenew";
+	icon_name = "document-new";
 	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
@@ -491,13 +491,13 @@
 	icon_name = "button_ok";
 	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filesaveas";
+	icon_name = "document-save-as";
 	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit-undo";
 	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editclear";
+	icon_name = "edit-clear";
 	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
@@ -506,7 +506,7 @@
 	icon_name = "pipe";
 	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editcopy";
+	icon_name = "edit-copy";
 	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
index 88ac478..16acaa8 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
@@ -622,10 +622,10 @@
 	icon_name = "go-down";
 	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editdelete";
+	icon_name = "edit-delete";
 	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filenew";
+	icon_name = "document-new";
 	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
@@ -656,13 +656,13 @@
 	icon_name = "button_ok";
 	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filesaveas";
+	icon_name = "document-save-as";
 	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit-undo";
 	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editclear";
+	icon_name = "edit-clear";
 	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
@@ -671,7 +671,7 @@
 	icon_name = "pipe";
 	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editcopy";
+	icon_name = "edit-copy";
 	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index e4cdaa7..9496db3 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -86,7 +86,7 @@
 	m_actionNewChain = new TDEAction( i18n( "Add New Chain..." ), TQIconSet( BarIcon( "view_tree", KMFIPTEditorPartFactory::instance() ) ),
 	                                0 , this, TQT_SLOT( slotNewChain() ), actionCollection(), "new_chain" );
 
-	m_actionDelChain = new TDEAction( i18n( "Delete Chain" ), TQIconSet( BarIcon( "editdelete", KMFIPTEditorPartFactory::instance() ) ),
+	m_actionDelChain = new TDEAction( i18n( "Delete Chain" ), TQIconSet( BarIcon( "edit-delete", KMFIPTEditorPartFactory::instance() ) ),
 	                                0 , this, TQT_SLOT( slotDelChain() ), actionCollection(), "del_chain" );
 
 	
@@ -95,7 +95,7 @@
 	
 //	m_actionNewRule->setIconSet( TQIconSet(  loader->loadIcon( "rule-22", TDEIcon::User ) ) );							   
 								   
-	m_actionDelRule = new TDEAction( i18n( "Delete Rule" ), TQIconSet( BarIcon( "editdelete", KMFIPTEditorPartFactory::instance() ) ),
+	m_actionDelRule = new TDEAction( i18n( "Delete Rule" ), TQIconSet( BarIcon( "edit-delete", KMFIPTEditorPartFactory::instance() ) ),
 								   TDEStdAccel::shortcut(TDEStdAccel::DeleteWordBack), this, TQT_SLOT( slotDelRule() ), actionCollection(), "del_rule" );
 	
 	m_actionEditDocOptions = new TDEAction( i18n( "&Configure Firewall Options..." ), "configure", 0 , this, TQT_SLOT( slotEditDocOptions() ),
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index fec1006..69b696f 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -1455,10 +1455,10 @@
 	icon_name = "go-down";
 	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editdelete";
+	icon_name = "edit-delete";
 	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filenew";
+	icon_name = "document-new";
 	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
@@ -1489,13 +1489,13 @@
 	icon_name = "button_ok";
 	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filesaveas";
+	icon_name = "document-save-as";
 	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit-undo";
 	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editclear";
+	icon_name = "edit-clear";
 	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
@@ -1504,7 +1504,7 @@
 	icon_name = "pipe";
 	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editcopy";
+	icon_name = "edit-copy";
 	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";
diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp
index 583d6ff..467b8b2 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmflistview.cpp
@@ -1074,7 +1074,7 @@
 	icon_name = "ereaser";
 	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filenew";
+	icon_name = "document-new";
 	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
@@ -1113,13 +1113,13 @@
 	icon_name = "button_ok";
 	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filesaveas";
+	icon_name = "document-save-as";
 	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit-undo";
 	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editclear";
+	icon_name = "edit-clear";
 	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index 8bc8a6f..856609a 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -522,10 +522,10 @@
 	icon_name = "go-down";
 	icon_down = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editdelete";
+	icon_name = "edit-delete";
 	icon_del = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filenew";
+	icon_name = "document-new";
 	icon_new = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit";
@@ -556,13 +556,13 @@
 	icon_name = "button_ok";
 	icon_accept = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "filesaveas";
+	icon_name = "document-save-as";
 	icon_log = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "edit-undo";
 	icon_return = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editclear";
+	icon_name = "edit-clear";
 	icon_cmd = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "filter";
@@ -571,7 +571,7 @@
 	icon_name = "pipe";
 	icon_queue = loader->loadIcon( icon_name, TDEIcon::Small );
 
-	icon_name = "editcopy";
+	icon_name = "edit-copy";
 	icon_copy = loader->loadIcon( icon_name, TDEIcon::Small );
 
 	icon_name = "forward";