| 4495382a | 2014-10-13 20:09:58 | Timothy Pearson |
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance |
||
|
M knights/knights.cpp M knights/knightstextview.cpp |
||
diff --git a/knights/knights.cpp b/knights/knights.cpp
index e369397..89f994f 100644
--- a/knights/knights.cpp
+++ b/knights/knights.cpp
@@ -278,7 +278,7 @@
matchMenu->setWhatsThis( MENU_PONDER, i18n( "This toggles your opponent's ability to think while it's your turn." ) );
matchMenu->insertSeparator();
// MENU_PAUSE
- matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("player_pause"), TDEIcon::Small ) ),
+ matchMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("media-playback-pause"), TDEIcon::Small ) ),
i18n( "Pause" ), this, TQT_SLOT( Settings(int) ), Key_F12, MENU_PAUSE );
matchMenu->setItemEnabled( MENU_PAUSE, FALSE );
matchMenu->setWhatsThis( MENU_PAUSE, i18n( "Select this to pause the clock for this match." ) );
@@ -914,7 +914,7 @@
if( Core->paused() )
{
matchMenu->changeItem( MENU_PAUSE,
- TQIconSet( Resource->LoadIcon( TQString("player_pause"), TDEIcon::Small ) ),
+ TQIconSet( Resource->LoadIcon( TQString("media-playback-pause"), TDEIcon::Small ) ),
i18n( "Pause" ) );
}
else
diff --git a/knights/knightstextview.cpp b/knights/knightstextview.cpp
index 36cdf1c..2808f73 100644
--- a/knights/knightstextview.cpp
+++ b/knights/knightstextview.cpp
@@ -52,9 +52,9 @@
// i18n( "Find &Next" ), this, TQT_SLOT( menuFunct(int) ), Key_F3, MENU_FIND_NEXT );
// menuView->insertSeparator();
menuView->insertSeparator();
- menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("viewmag+"), TDEIcon::Small ) ),
+ menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("zoom-in"), TDEIcon::Small ) ),
i18n( "Zoom &In" ), this, TQT_SLOT( menuFunct(int) ), 0, MENU_ZOOM_IN );
- menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("viewmag-"), TDEIcon::Small ) ),
+ menuView->insertItem( TQIconSet( Rsrc->LoadIcon( TQString("zoom-out"), TDEIcon::Small ) ),
i18n( "Zoom &Out" ), this, TQT_SLOT( menuFunct(int) ), 0, MENU_ZOOM_OUT );
/* disconnect the linkClicked signal so we can replace it with our own */
|
||
| 052a1028 | 2014-10-13 20:10:54 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/knights |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||