Branch: master

289b5d94 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 knights/dlg_engine.cpp
M knights/dlg_server.cpp
M knights/knights.cpp
M knights/knightstextview.cpp
M knights/setpagedisplay.cpp
M knights/setpagegeneral.cpp
M knights/tabpage.cpp
M knights/thinbuttons.cpp
diff --git a/knights/dlg_engine.cpp b/knights/dlg_engine.cpp
index 6a1eec3..800cd50 100644
--- a/knights/dlg_engine.cpp
+++ b/knights/dlg_engine.cpp
@@ -61,8 +61,8 @@
 	EDIT_LogFile = new KLineEdit( BOX_LogFile );
 	BUTTON_LogFile = new TQPushButton( BOX_LogFile );
 	setMainWidget( BOX_Parent );
-	BUTTON_Filename->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
-	BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+	BUTTON_Filename->setPixmap( Resource->LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
+	BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
 	EDIT_Name->setMinimumWidth( 150 );
 	EDIT_Filename->setMinimumWidth( 300 );
 	EDIT_Arguments->setMinimumWidth( 300 );
diff --git a/knights/dlg_server.cpp b/knights/dlg_server.cpp
index 0858694..decefe5 100644
--- a/knights/dlg_server.cpp
+++ b/knights/dlg_server.cpp
@@ -80,7 +80,7 @@
 																		BOX_Parent );
 	EDIT_Timeseal = new KLineEdit( GROUP_Timeseal );
 	BUTTON_Timeseal = new TQPushButton( GROUP_Timeseal );
-	BUTTON_Timeseal->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+	BUTTON_Timeseal->setPixmap( Resource->LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
 	connect( BUTTON_Timeseal, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slot_Timeseal() ) );
 
 	BOX_LogFile = new TQGroupBox( 2,
@@ -91,7 +91,7 @@
 	BUTTON_LogFile = new TQPushButton( BOX_LogFile );
 	
 	setMainWidget( BOX_Parent );
-	BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+	BUTTON_LogFile->setPixmap( Resource->LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
 	EDIT_Name->setMinimumWidth( 120 );
 	EDIT_URL->setMinimumWidth( 120 );
 	EDIT_UserName->setMinimumWidth( 120 );
diff --git a/knights/knights.cpp b/knights/knights.cpp
index ab98776..e369397 100644
--- a/knights/knights.cpp
+++ b/knights/knights.cpp
@@ -301,21 +301,21 @@
 			fileMenu menu
 	*/
 	// MENU_NEWGAME
-	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filenew"), TDEIcon::Small ) ),
+	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-new"), TDEIcon::Small ) ),
 												i18n( "&New Match..." ), this, TQT_SLOT( openNewMatchDialog() ), CTRL+Key_N, MENU_NEWGAME );
 	fileMenu->setWhatsThis( MENU_NEWGAME, i18n( "This allows you to begin a new match." ) );
 	// MENU_LOAD
-	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileopen"), TDEIcon::Small ) ),
+	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-open"), TDEIcon::Small ) ),
 												i18n( "&Load Match..." ), Core, TQT_SLOT( load() ), CTRL+Key_L, MENU_LOAD );
 	fileMenu->setWhatsThis( MENU_LOAD, i18n( "The Load command will allow you to select a previously saved match and play it again." ) );
 	fileMenu->insertSeparator();
 	// MENU_SAVE
-	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ),
+	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-save"), TDEIcon::Small ) ),
 												i18n( "&Save Match" ), this, TQT_SLOT( SaveGame() ), CTRL+Key_S, MENU_SAVE );
 	fileMenu->setItemEnabled( MENU_SAVE, FALSE );
 	fileMenu->setWhatsThis( MENU_SAVE, i18n( "The Save command will allow you to store a copy of your current match for later use." ) );
 	// MENU_SAVEAS
-	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ),
+	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-save"), TDEIcon::Small ) ),
 												i18n( "Save Match &As..." ), this, TQT_SLOT( SaveGameAs() ), CTRL+Key_A, MENU_SAVEAS );
 	fileMenu->setItemEnabled( MENU_SAVEAS, FALSE );
 	fileMenu->setWhatsThis( MENU_SAVEAS, i18n( "The Save command will allow you to store a copy of your current match for later use." ) );
@@ -326,13 +326,13 @@
 	fileMenu->setWhatsThis( MENU_CONNECT, i18n( "Clicking this will connect Knights with an internet chess server." ) );
 	fileMenu->insertSeparator();
 	// MENU_PRINT
-	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileprint"), TDEIcon::Small ) ),
+	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-print"), TDEIcon::Small ) ),
 												i18n( "&Print Notation..." ), Core, TQT_SLOT( print() ), CTRL+Key_P, MENU_PRINT );
 	fileMenu->setItemEnabled( MENU_PRINT, FALSE );
 	fileMenu->setWhatsThis( MENU_PRINT, i18n( "The Print command will allow you to print this game's notation on your printer." ) );
 	fileMenu->insertSeparator();
 	// MENU_CLOSE
-	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileclose"), TDEIcon::Small ) ),
+	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("window-close"), TDEIcon::Small ) ),
 												i18n( "&Close Match" ), Core, TQT_SLOT( clearMatch() ), CTRL+Key_W, MENU_CLOSE );
 	fileMenu->setItemEnabled( MENU_CLOSE, FALSE );
 	fileMenu->setWhatsThis( MENU_CLOSE, i18n( "This command removes the current match." ) );
diff --git a/knights/knightstextview.cpp b/knights/knightstextview.cpp
index 2bea0f5..36cdf1c 100644
--- a/knights/knightstextview.cpp
+++ b/knights/knightstextview.cpp
@@ -40,11 +40,11 @@
 	/*
 		Configure functions in the View right click menu
 	*/
-	menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("editcopy"), TDEIcon::Small ) ),
+	menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("edit-copy"), TDEIcon::Small ) ),
 												i18n( "&Copy" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_C, MENU_COPY );
 	menuView->insertItem( i18n("Select &All"), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_A, MENU_SELECT_ALL );
 	menuView->insertSeparator();
-	menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("fileprint"), TDEIcon::Small ) ),
+	menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("document-print"), TDEIcon::Small ) ),
 												i18n( "&Print" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_P, MENU_PRINT );
 //  menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("edit-find"), TDEIcon::Small ) ),
 //                        i18n( "&Find" ), this, TQT_SLOT( menuFunct(int) ), CTRL+Key_F, MENU_FIND );
diff --git a/knights/setpagedisplay.cpp b/knights/setpagedisplay.cpp
index aadb059..a2d3d11 100644
--- a/knights/setpagedisplay.cpp
+++ b/knights/setpagedisplay.cpp
@@ -99,7 +99,7 @@
 	EDIT_SCID_Images->setText( Resource->SCID_Image_Path );
 	connect( EDIT_SCID_Images, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slot_SCID_Images(const TQString&) ) );
 	BUTTON_SCID_Images = new TQPushButton( GROUP_SCID_Images );
-	BUTTON_SCID_Images->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+	BUTTON_SCID_Images->setPixmap( Resource->LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
 	connect( BUTTON_SCID_Images, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slot_SCID_Images_Button() ) );
 
 	GROUP_General_Graphics = new TQGroupBox( 4,
diff --git a/knights/setpagegeneral.cpp b/knights/setpagegeneral.cpp
index 3254a93..7dcf58e 100644
--- a/knights/setpagegeneral.cpp
+++ b/knights/setpagegeneral.cpp
@@ -73,7 +73,7 @@
 	EDIT_PGN_Filename->setText( Resource->PGN_Filename );
 	connect( EDIT_PGN_Filename, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slot_PGN_Filename(const TQString&) ) );
 	BUTTON_PGN_Filename = new TQPushButton( BOX_Reuse_PGN );
-	BUTTON_PGN_Filename->setPixmap( Resource->LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+	BUTTON_PGN_Filename->setPixmap( Resource->LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
 	connect( BUTTON_PGN_Filename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slot_PGN_Filename_Button() ) );
 	EDIT_PGN_Filename->setEnabled( Resource->OPTION_Reuse_PGN );
 	BUTTON_PGN_Filename->setEnabled( Resource->OPTION_Reuse_PGN );
diff --git a/knights/tabpage.cpp b/knights/tabpage.cpp
index 62503a2..48f3656 100644
--- a/knights/tabpage.cpp
+++ b/knights/tabpage.cpp
@@ -46,7 +46,7 @@
 	if( map.isNull() )
 	{
 		/* Keep for backward compatability with KDE 3.0 */
-		map = icons.loadIcon( TQString("fileclose"), TDEIcon::Small );
+		map = icons.loadIcon( TQString("window-close"), TDEIcon::Small );
 	}
 
 	closeButton = new TQToolButton( actionBar, "closeButton" );
diff --git a/knights/thinbuttons.cpp b/knights/thinbuttons.cpp
index 19f757a..0bb04a9 100644
--- a/knights/thinbuttons.cpp
+++ b/knights/thinbuttons.cpp
@@ -28,15 +28,15 @@
 
 	/* Build the pop-up menu */
 	matchMenu = new TDEPopupMenu( this );
-	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ),
+	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-save"), TDEIcon::Small ) ),
 													i18n("&Save Match"), MENU_SAVE );
-	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("filesave"), TDEIcon::Small ) ),
+	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-save"), TDEIcon::Small ) ),
 													i18n("Save Match &As..."), MENU_SAVEAS );
 	matchMenu->insertSeparator();
-	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileprint"), TDEIcon::Small ) ),
+	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("document-print"), TDEIcon::Small ) ),
 													i18n("&Print Notation..."), MENU_PRINT );
 	matchMenu->insertSeparator();
-	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("fileclose"), TDEIcon::Small ) ),
+	matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("window-close"), TDEIcon::Small ) ),
 													i18n("&Close Match"), MENU_CLOSE );
 	connect( matchMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( menuClicked(int) ) );
 }