| ecc461cf | 2014-10-13 20:10:11 | 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 kopete/kopete/chatwindow/kopetechatwindow.cpp M kopete/kopete/chatwindow/kopeteemailwindow.cpp M kopete/libkopete/compat/kpixmapregionselectorwidget.cpp M kopete/libkopete/ui/kopetestdaction.cpp M kopete/protocols/jabber/jabberaccount.cpp M kopete/protocols/jabber/jabbercontact.cpp M kopete/protocols/jabber/jabbertransport.cpp M kopete/protocols/oscar/icq/icqcontact.cpp M kpf/src/AppletItem.cpp M kpf/src/BandwidthGraph.cpp M krdc/krdc.cpp |
||
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 323e581..cc1df98 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -313,7 +313,7 @@
createStandardStatusBarAction();
- chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), TQKeySequence(Key_Return) ,
+ chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), TQKeySequence(Key_Return) ,
TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
chatSend->setEnabled( false );
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 4eb7962..b50d49c 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -206,7 +206,7 @@
{
TDEActionCollection *coll = actionCollection();
- d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), 0,
+ d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" );
//Default to 'Return' for sending messages
d->chatSend->setShortcut( TQKeySequence( Key_Return ) );
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
index 7ba93e9..69d33bd 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
@@ -140,12 +140,12 @@
TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
popup->insertTitle(i18n("Image Operations"));
- TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw",
+ TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
0, this, TQT_SLOT(rotateClockwise()),
popup, "rotateclockwise");
action->plug(popup);
- action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
+ action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
0, this, TQT_SLOT(rotateCounterclockwise()),
popup, "rotatecounterclockwise");
action->plug(popup);
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index b10450d..55bd73e 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -115,12 +115,12 @@
TDEAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
{
- return new TDEAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
+ return new TDEAction( i18n( "&Block Contact" ), TQString::fromLatin1( "media-playback-pause" ), 0, recvr, slot, parent, name );
}
TDEAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
{
- return new TDEAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name );
+ return new TDEAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "media-playback-start" ), 0, recvr, slot, parent, name );
}
#include "kopetestdaction.moc"
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 2982a6f..06ec227 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -194,7 +194,7 @@
action->setEnabled( isConnected() );
m_actionMenu->insert ( action );
- action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
+ action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0,
this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ;
action->setEnabled( isConnected() );
m_actionMenu->insert ( action );
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 92bad45..d5aadad 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -136,12 +136,12 @@
TDEAction *resendAuthAction, *requestAuthAction, *removeAuthAction;
- resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail_forward", 0,
+ resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail-forward", 0,
this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth");
resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None );
actionAuthorization->insert(resendAuthAction);
- requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail_reply", 0,
+ requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail-reply-sender", 0,
this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth");
requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None );
actionAuthorization->insert(requestAuthAction);
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 51ad458..5cf5ffa 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -152,7 +152,7 @@
m_actionMenu->insert ( new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0,
this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") );
- m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
+ m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0,
this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") );
m_actionMenu->insert ( new TDEAction ( i18n ("Edit User Info..."), "identity", 0,
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 7971bd8..41e1f9f 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -687,9 +687,9 @@
actionReadAwayMessage = new TDEAction(awTxt, awIcn, 0,
this, TQT_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage");
*/
- actionRequestAuth = new TDEAction(i18n("&Request Authorization"), "mail_reply", 0,
+ actionRequestAuth = new TDEAction(i18n("&Request Authorization"), "mail-reply-sender", 0,
this, TQT_SLOT(slotRequestAuth()), this, "actionRequestAuth");
- actionSendAuth = new TDEAction(i18n("&Grant Authorization"), "mail_forward", 0,
+ actionSendAuth = new TDEAction(i18n("&Grant Authorization"), "mail-forward", 0,
this, TQT_SLOT(slotSendAuth()), this, "actionSendAuth");
/*
}
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index f83d94f..862dbc3 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -87,7 +87,7 @@
(SmallIcon("reload"), i18n("Restart"), Restart, Restart);
popup_->insertItem
- (SmallIcon("player_pause"), i18n("Pause"), Pause, Pause);
+ (SmallIcon("media-playback-pause"), i18n("Pause"), Pause, Pause);
monitorWindow_ = new ActiveMonitorWindow(server_);
@@ -176,7 +176,7 @@
(Pause, SmallIcon("1rightarrow"), i18n("Unpause"));
else
popup_->changeItem
- (Pause, SmallIcon("player_pause"), i18n("Pause"));
+ (Pause, SmallIcon("media-playback-pause"), i18n("Pause"));
switch (popup_->exec(TQCursor::pos()))
{
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index 641c53f..b36a159 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -314,7 +314,7 @@
{
if (server_->paused())
{
- overlayPixmap_ = SmallIcon("player_pause");
+ overlayPixmap_ = SmallIcon("media-playback-pause");
}
else
{
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index b871e82..f9a7280 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -492,7 +492,7 @@
t->setToggle(FS_AUTOHIDE_ID);
t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(setFsToolbarAutoHide(bool)));
- t->insertButton("window_nofullscreen", FS_FULLSCREEN_ID);
+ t->insertButton("view-restore", FS_FULLSCREEN_ID);
TDEToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID);
TQToolTip::add(fullscreenButton, i18n("Fullscreen"));
t->setToggle(FS_FULLSCREEN_ID);
@@ -512,7 +512,7 @@
t->setItemAutoSized(FS_HOSTLABEL_ID, true);
if (scalingPossible) {
- t->insertButton("viewmagfit", FS_SCALE_ID);
+ t->insertButton("zoom-fit-best", FS_SCALE_ID);
TDEToolBarButton *scaleButton = t->getButton(FS_SCALE_ID);
TQToolTip::add(scaleButton, i18n("Scale view"));
t->setToggle(FS_SCALE_ID);
@@ -592,7 +592,7 @@
m_toolbar = t;
t->setIconText(TDEToolBar::IconTextRight);
connect(t, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(toolbarChanged()));
- t->insertButton("window_fullscreen", 0, true, i18n("Fullscreen"));
+ t->insertButton("view-fullscreen", 0, true, i18n("Fullscreen"));
TDEToolBarButton *fullscreenButton = t->getButton(0);
TQToolTip::add(fullscreenButton, i18n("Fullscreen"));
TQWhatsThis::add(fullscreenButton, i18n("Switches to full screen. If the remote desktop has a different screen resolution, Remote Desktop Connection will automatically switch to the nearest resolution."));
@@ -601,7 +601,7 @@
t->addConnection(0, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(enableFullscreen(bool)));
if (m_view->supportsScaling()) {
- t->insertButton("viewmagfit", 1, true, i18n("Scale"));
+ t->insertButton("zoom-fit-best", 1, true, i18n("Scale"));
TDEToolBarButton *scaleButton = t->getButton(1);
TQToolTip::add(scaleButton, i18n("Scale view"));
TQWhatsThis::add(scaleButton, i18n("This option scales the remote screen to fit your window size."));
|
||
| f1661768 | 2014-10-13 20:11:47 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork |
||
|
M ConfigureChecks.cmake M cmake |
||
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index ce92731..d78e05d 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,6 +9,11 @@ # ################################################# +# required stuff +tde_setup_architecture_flags( ) +find_package( TQt ) +find_package( TDE ) + ##### check for gcc visibility support ######### # FIXME # This should check for [T]Qt3 visibility support @@ -26,10 +31,6 @@ if( BUILD_KOPETE OR BUILD_KPPP ) check_include_file( string.h HAVE_STRING_H ) endif( ) - -# required stuff -find_package( TQt ) -find_package( TDE ) if( WITH_SLP ) check_library_exists( slp "SLPOpen" "" HAVE_SLP ) diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||