| 0997355d | 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 chalk/plugins/viewplugins/rotateimage/rotateimage.cc M chalk/ui/kis_previewwidget.cc M kexi/main/keximainwindowimpl.cpp M kexi/main/printing/kexisimpleprintpreviewwindow.cpp M kexi/plugins/forms/kexiactionselectiondialog.cpp M kexi/plugins/forms/kexiformpart.cpp M kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp M kexi/widget/kexibrowser.cpp M kivio/kiviopart/ui/kivio_birdeye_panel.cpp M kpresenter/KPrEffectDia.cpp M kpresenter/KPrSlideTransitionDia.cpp M kpresenter/KPrTransEffectDia.cpp M kpresenter/KPrView.cpp M lib/kofficecore/KoView.cpp |
||
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
index 5f2474a..8a0985c 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
@@ -60,15 +60,15 @@
setXMLFile(locate("data","chalkplugins/rotateimage.rc"), true);
m_view = (KisView*) parent;
(void) new TDEAction(i18n("&Rotate Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage");
- (void) new TDEAction(i18n("Rotate Image CW"), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90");
+ (void) new TDEAction(i18n("Rotate Image CW"), "object-rotate-right", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90");
(void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180");
- (void) new TDEAction(i18n("Rotate Image CCW"), "rotate_ccw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90");
+ (void) new TDEAction(i18n("Rotate Image CCW"), "object-rotate-left", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90");
(void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer");
(void)new TDEAction(i18n("Rotate 1&80"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180");
- (void)new TDEAction(i18n("Rotate CCW"), "rotate_ccw", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90");
- (void)new TDEAction(i18n("Rotate CW"), "rotate_cw", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90");
+ (void)new TDEAction(i18n("Rotate CCW"), "object-rotate-left", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90");
+ (void)new TDEAction(i18n("Rotate CW"), "object-rotate-right", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90");
}
}
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index b7045f1..29a91fb 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -85,9 +85,9 @@
, m_firstFilter(true)
, m_firstZoom(true)
{
- btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", TDEIcon::MainToolbar, 16 ));
+ btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-in", TDEIcon::MainToolbar, 16 ));
connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn()));
- btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", TDEIcon::MainToolbar, 16 ));
+ btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-out", TDEIcon::MainToolbar, 16 ));
connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut()));
btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", TDEIcon::MainToolbar, 16 ));
connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate()));
@@ -95,7 +95,7 @@
connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool)));
connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool)));
- btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", TDEIcon::MainToolbar, 16 ));
+ btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "zoom-original", TDEIcon::MainToolbar, 16 ));
connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne()));
m_progress = new KisLabelProgress(frmProgress);
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 1201a79..45b3c4e 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -812,7 +812,7 @@
d->action_data_cancel_row_changes->setWhatsThis(i18n("Cancels changes made to the current row."));
//temp. disable because of problems with volatile actions setActionVolatile( d->action_data_cancel_row_changes, true );
- d->action_data_execute = createSharedAction(i18n("&Execute"), "player_play", 0 , "data_execute");
+ d->action_data_execute = createSharedAction(i18n("&Execute"), "media-playback-start", 0 , "data_execute");
//d->action_data_execute->setToolTip(i18n("")); //TODO
//d->action_data_execute->setWhatsThis(i18n("")); //TODO
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 6ddb195..3870f09 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -180,11 +180,11 @@
#ifndef KEXI_NO_UNFINISHED
//! @todo unfinished
- id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("viewmag+"), i18n("Zoom In"), m_toolbar));
+ id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-in"), i18n("Zoom In"), m_toolbar));
m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomInClicked()));
m_toolbar->insertSeparator();
- id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("viewmag-"), i18n("Zoom Out"), m_toolbar));
+ id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-out"), i18n("Zoom Out"), m_toolbar));
m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOutClicked()));
m_toolbar->insertSeparator();
#endif
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 95954cc..9b1af9c 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -270,7 +270,7 @@
}
if (part->info()->isExecuteSupported()) {
item = new ActionSelectorDialogListItem("execute", this, i18n("Execute"));
- item->setPixmap(0, SmallIcon("player_play"));
+ item->setPixmap(0, SmallIcon("media-playback-start"));
}
if (part->info()->isPrintingSupported()) {
ActionSelectorDialogListItem *printItem = new ActionSelectorDialogListItem(
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 76492ed..11d711c 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -144,7 +144,7 @@
if (mode==Kexi::DesignViewMode) {
KFormDesigner::FormManager::self()->createActions(col, 0);
new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder");
- new TDEAction(i18n("Adjust Size"), "viewmagfit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust");
+ new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust");
}
//TODO
}
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index 1c24db1..b45c97c 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -155,7 +155,7 @@
void KexiScriptPart::initInstanceActions()
{
- //createSharedAction(Kexi::DesignViewMode, i18n("Execute Script"), "player_play", 0, "data_execute");
+ //createSharedAction(Kexi::DesignViewMode, i18n("Execute Script"), "media-playback-start", 0, "data_execute");
createSharedAction(Kexi::DesignViewMode, i18n("Configure Editor..."), "configure", 0, "script_config_editor");
}
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 208fb97..3e16cdd 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -190,7 +190,7 @@
}
}
- m_executeAction = new TDEAction(i18n("Execute"), "player_play", 0, TQT_TQOBJECT(this),
+ m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotExecuteObject()), TQT_TQOBJECT(this), "data_execute");
m_exportActionMenu = new TDEActionMenu(i18n("Export"));
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index bb97e0c..0d5fc9d 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -39,8 +39,8 @@
connect( m_pView, TQT_SIGNAL(zoomChanged(int)), TQT_SLOT(canvasZoomChanged(int)));
connect( m_pCanvas, TQT_SIGNAL(visibleAreaChanged()), TQT_SLOT(updateView()));
- m_zoomOutButton->setIconSet(SmallIconSet("viewmag-", 16));
- m_zoomInButton->setIconSet(SmallIconSet("viewmag+", 16));
+ m_zoomOutButton->setIconSet(SmallIconSet("zoom-out", 16));
+ m_zoomInButton->setIconSet(SmallIconSet("zoom-in", 16));
connect(m_zoomOutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomMinus()));
connect(m_zoomInButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomPlus()));
connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)), m_pView, TQT_SLOT(viewZoom(int)));
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index 955d249..55c074a 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -185,7 +185,7 @@
connect( buttonTestPlaySoundEffect1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound1() ) );
buttonTestStopSoundEffect1 = new TQPushButton( grp1 );
- buttonTestStopSoundEffect1->setIconSet( SmallIconSet("player_stop") );
+ buttonTestStopSoundEffect1->setIconSet( SmallIconSet("media-playback-stop") );
TQToolTip::add( buttonTestStopSoundEffect1, i18n("Stop") );
upperRow->addWidget( buttonTestStopSoundEffect1, 6, 3 );
@@ -289,7 +289,7 @@
connect( buttonTestPlaySoundEffect2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound2() ) );
buttonTestStopSoundEffect2 = new TQPushButton( grp2 );
- buttonTestStopSoundEffect2->setIconSet( SmallIconSet("player_stop") );
+ buttonTestStopSoundEffect2->setIconSet( SmallIconSet("media-playback-stop") );
TQToolTip::add( buttonTestStopSoundEffect2, i18n("Stop") );
lowerRow->addWidget( buttonTestStopSoundEffect2, 5, 3 );
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 8dd46db..de893b3 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -144,8 +144,8 @@
m_dialog->soundCheckBox->setChecked( m_soundEffect );
m_dialog->soundRequester->setURL( m_soundFileName );
soundEffectChanged();
- m_dialog->playButton->setIconSet( SmallIconSet( "player_play" ) );
- m_dialog->stopButton->setIconSet( SmallIconSet( "player_stop" ) );
+ m_dialog->playButton->setIconSet( SmallIconSet( "media-playback-start" ) );
+ m_dialog->stopButton->setIconSet( SmallIconSet( "media-playback-stop" ) );
connect( m_dialog->playButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) );
connect( m_dialog->stopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) );
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index aeee98b..4344ab4 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -296,7 +296,7 @@
connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) );
buttonTestStopSoundEffect = new TQPushButton( soundgrp );
- buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", TDEIcon::SizeSmall) );
+ buttonTestStopSoundEffect->setPixmap( BarIcon("media-playback-stop", TDEIcon::SizeSmall) );
TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") );
connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) );
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index c8c9ba8..d975acc 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -2656,7 +2656,7 @@
- actionExtraRotate = new TDEAction( i18n( "R&otate Objects..." ), "rotate_cw", 0,
+ actionExtraRotate = new TDEAction( i18n( "R&otate Objects..." ), "object-rotate-right", 0,
TQT_TQOBJECT(this), TQT_SLOT( extraRotate() ),
actionCollection(), "extra_rotate" );
@@ -3044,10 +3044,10 @@
TQT_TQOBJECT(this), TQT_SLOT( configureCompletion() ),
actionCollection(), "configure_completion" );
- actionZoomMinus = new TDEAction( i18n( "Zoom Out" ), "viewmag-",0,
+ actionZoomMinus = new TDEAction( i18n( "Zoom Out" ), "zoom-out",0,
TQT_TQOBJECT(this), TQT_SLOT( zoomMinus() ),
actionCollection(), "zoom_minus" );
- actionZoomPlus = new TDEAction( i18n( "Zoom In" ), "viewmag+",0,
+ actionZoomPlus = new TDEAction( i18n( "Zoom In" ), "zoom-in",0,
TQT_TQOBJECT(this), TQT_SLOT( zoomPlus() ),
actionCollection(), "zoom_plus" );
actionZoomEntirePage = new TDEAction( i18n( "Zoom Entire Slide" ), 0,
@@ -3057,7 +3057,7 @@
actionZoomMinus = new TDEAction( i18n( "Zoom Slide Width" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( zoomPageWidth() ),
actionCollection(), "zoom_page_width" );
- actionZoomSelectedObject= new TDEAction( i18n( "Zoom Selected Objects" ), "viewmagfit",0,
+ actionZoomSelectedObject= new TDEAction( i18n( "Zoom Selected Objects" ), "zoom-fit-best",0,
TQT_TQOBJECT(this), TQT_SLOT( zoomSelectedObject() ),
actionCollection(), "zoom_selected_object" );
actionZoomPageHeight= new TDEAction( i18n( "Zoom Slide Height" ), 0,
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 1c8b88a..9494125 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -626,7 +626,7 @@
void KoView::setupGlobalActions() {
- actionNewView = new TDEAction( i18n( "&New View" ), "window_new", 0,
+ actionNewView = new TDEAction( i18n( "&New View" ), "window-new", 0,
TQT_TQOBJECT(this), TQT_SLOT( newView() ),
actionCollection(), "view_newview" );
}
|
||
| 5844cd0f | 2014-10-13 20:10:56 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/koffice |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c ** Diff limit reached (max: 250 lines) ** |
||