mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 11:40:07 +00:00
Masses of icon fixes and adaptions, caused by the original
desire to rename "edit" to "object-edit". I changed my mind in the middle of the process (but had lots of other changes lying around already and really need to stop), so many or all of the newly renamed "object-edit" icons might vanish again. But all in all, there are improvements in many places. svn path=/trunk/KDE/kdegraphics/okular/; revision=744272
This commit is contained in:
parent
bd294e1de6
commit
d9de20dfe7
16
part.cpp
16
part.cpp
|
@ -230,7 +230,7 @@ m_cliPresentation(false), m_generatorGuiClient(0)
|
||||||
// KToolBar * rtb = new KToolBar( rightContainer, "mainToolBarSS" );
|
// KToolBar * rtb = new KToolBar( rightContainer, "mainToolBarSS" );
|
||||||
// rightLayout->addWidget( rtb );
|
// rightLayout->addWidget( rtb );
|
||||||
m_topMessage = new PageViewTopMessage( rightContainer );
|
m_topMessage = new PageViewTopMessage( rightContainer );
|
||||||
m_topMessage->setup( i18n( "This document has embedded files. <a href=\"okular:/embeddedfiles\">Click here to see them</a> or go to File -> Embedded Files." ), KIcon( "attach" ) );
|
m_topMessage->setup( i18n( "This document has embedded files. <a href=\"okular:/embeddedfiles\">Click here to see them</a> or go to File -> Embedded Files." ), KIcon( "mail-attachment" ) );
|
||||||
connect( m_topMessage, SIGNAL( action() ), this, SLOT( slotShowEmbeddedFiles() ) );
|
connect( m_topMessage, SIGNAL( action() ), this, SLOT( slotShowEmbeddedFiles() ) );
|
||||||
rightLayout->addWidget( m_topMessage );
|
rightLayout->addWidget( m_topMessage );
|
||||||
m_formsMessage = new PageViewTopMessage( rightContainer );
|
m_formsMessage = new PageViewTopMessage( rightContainer );
|
||||||
|
@ -327,13 +327,13 @@ m_cliPresentation(false), m_generatorGuiClient(0)
|
||||||
|
|
||||||
m_prevBookmark = ac->addAction("previous_bookmark");
|
m_prevBookmark = ac->addAction("previous_bookmark");
|
||||||
m_prevBookmark->setText(i18n( "Previous Bookmark" ));
|
m_prevBookmark->setText(i18n( "Previous Bookmark" ));
|
||||||
m_prevBookmark->setIcon(KIcon( "edit-find-previous" ));
|
m_prevBookmark->setIcon(KIcon( "go-up-search" ));
|
||||||
m_prevBookmark->setWhatsThis( i18n( "Go to the previous bookmarked page" ) );
|
m_prevBookmark->setWhatsThis( i18n( "Go to the previous bookmarked page" ) );
|
||||||
connect( m_prevBookmark, SIGNAL( triggered() ), this, SLOT( slotPreviousBookmark() ) );
|
connect( m_prevBookmark, SIGNAL( triggered() ), this, SLOT( slotPreviousBookmark() ) );
|
||||||
|
|
||||||
m_nextBookmark = ac->addAction("next_bookmark");
|
m_nextBookmark = ac->addAction("next_bookmark");
|
||||||
m_nextBookmark->setText(i18n( "Next Bookmark" ));
|
m_nextBookmark->setText(i18n( "Next Bookmark" ));
|
||||||
m_nextBookmark->setIcon(KIcon( "edit-find-next" ));
|
m_nextBookmark->setIcon(KIcon( "go-down-search" ));
|
||||||
m_nextBookmark->setWhatsThis( i18n( "Go to the next bookmarked page" ) );
|
m_nextBookmark->setWhatsThis( i18n( "Go to the next bookmarked page" ) );
|
||||||
connect( m_nextBookmark, SIGNAL( triggered() ), this, SLOT( slotNextBookmark() ) );
|
connect( m_nextBookmark, SIGNAL( triggered() ), this, SLOT( slotNextBookmark() ) );
|
||||||
|
|
||||||
|
@ -378,7 +378,7 @@ m_cliPresentation(false), m_generatorGuiClient(0)
|
||||||
|
|
||||||
m_showLeftPanel = ac->add<KToggleAction>("show_leftpanel");
|
m_showLeftPanel = ac->add<KToggleAction>("show_leftpanel");
|
||||||
m_showLeftPanel->setText(i18n( "Show &Navigation Panel"));
|
m_showLeftPanel->setText(i18n( "Show &Navigation Panel"));
|
||||||
m_showLeftPanel->setIcon(KIcon( "show_side_panel" ));
|
m_showLeftPanel->setIcon(KIcon( "view-sidetree" ));
|
||||||
connect( m_showLeftPanel, SIGNAL( toggled( bool ) ), this, SLOT( slotShowLeftPanel() ) );
|
connect( m_showLeftPanel, SIGNAL( toggled( bool ) ), this, SLOT( slotShowLeftPanel() ) );
|
||||||
m_showLeftPanel->setShortcut( Qt::Key_F7 );
|
m_showLeftPanel->setShortcut( Qt::Key_F7 );
|
||||||
m_showLeftPanel->setChecked( Okular::Settings::showLeftPanel() );
|
m_showLeftPanel->setChecked( Okular::Settings::showLeftPanel() );
|
||||||
|
@ -403,13 +403,13 @@ m_cliPresentation(false), m_generatorGuiClient(0)
|
||||||
|
|
||||||
m_showEmbeddedFiles = ac->addAction("embedded_files");
|
m_showEmbeddedFiles = ac->addAction("embedded_files");
|
||||||
m_showEmbeddedFiles->setText(i18n("&Embedded Files"));
|
m_showEmbeddedFiles->setText(i18n("&Embedded Files"));
|
||||||
// m_showEmbeddedFiles->setIcon( KIcon( "attach" ) );
|
// m_showEmbeddedFiles->setIcon( KIcon( "mail-attachment" ) );
|
||||||
connect(m_showEmbeddedFiles, SIGNAL(triggered()), this, SLOT(slotShowEmbeddedFiles()));
|
connect(m_showEmbeddedFiles, SIGNAL(triggered()), this, SLOT(slotShowEmbeddedFiles()));
|
||||||
m_showEmbeddedFiles->setEnabled( false );
|
m_showEmbeddedFiles->setEnabled( false );
|
||||||
|
|
||||||
m_showPresentation = ac->addAction("presentation");
|
m_showPresentation = ac->addAction("presentation");
|
||||||
m_showPresentation->setText(i18n("P&resentation"));
|
m_showPresentation->setText(i18n("P&resentation"));
|
||||||
m_showPresentation->setIcon( KIcon( "document-start-presentation" ) );
|
m_showPresentation->setIcon( KIcon( "media-playback-start-presentation" ) );
|
||||||
connect(m_showPresentation, SIGNAL(triggered()), this, SLOT(slotShowPresentation()));
|
connect(m_showPresentation, SIGNAL(triggered()), this, SLOT(slotShowPresentation()));
|
||||||
m_showPresentation->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_P ) );
|
m_showPresentation->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_P ) );
|
||||||
m_showPresentation->setEnabled( false );
|
m_showPresentation->setEnabled( false );
|
||||||
|
@ -997,7 +997,7 @@ void Part::updateBookmarksActions()
|
||||||
if ( m_document->bookmarkManager()->isBookmarked( m_document->currentPage() ) )
|
if ( m_document->bookmarkManager()->isBookmarked( m_document->currentPage() ) )
|
||||||
{
|
{
|
||||||
m_addBookmark->setText( i18n( "Remove Bookmark" ) );
|
m_addBookmark->setText( i18n( "Remove Bookmark" ) );
|
||||||
m_addBookmark->setIcon( KIcon( "bookmark" ) ); // ### 'bookmark-remove' or similar
|
m_addBookmark->setIcon( KIcon( "bookmark-delete" ) );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1365,7 +1365,7 @@ void Part::slotShowMenu(const Okular::Page *page, const QPoint &point)
|
||||||
{
|
{
|
||||||
popup->addTitle( i18n( "Page %1", page->number() + 1 ) );
|
popup->addTitle( i18n( "Page %1", page->number() + 1 ) );
|
||||||
if ( m_document->bookmarkManager()->isBookmarked( page->number() ) )
|
if ( m_document->bookmarkManager()->isBookmarked( page->number() ) )
|
||||||
removeBookmark = popup->addAction( KIcon("bookmark"), i18n("Remove Bookmark") );
|
removeBookmark = popup->addAction( KIcon("bookmark-delete"), i18n("Remove Bookmark") );
|
||||||
else
|
else
|
||||||
addBookmark = popup->addAction( KIcon("bookmark-new"), i18n("Add Bookmark") );
|
addBookmark = popup->addAction( KIcon("bookmark-new"), i18n("Add Bookmark") );
|
||||||
if ( m_pageView->canFitPageWidth() )
|
if ( m_pageView->canFitPageWidth() )
|
||||||
|
|
|
@ -239,8 +239,8 @@ QWidget * StampAnnotationWidget::widget()
|
||||||
// FIXME!!! use the standard names instead (when we'll have the artwork)
|
// FIXME!!! use the standard names instead (when we'll have the artwork)
|
||||||
m_pixmapSelector->addItem( i18n( "okular" ), "graphics-viewer-document" );
|
m_pixmapSelector->addItem( i18n( "okular" ), "graphics-viewer-document" );
|
||||||
m_pixmapSelector->addItem( i18n( "Bookmark" ), "bookmark" );
|
m_pixmapSelector->addItem( i18n( "Bookmark" ), "bookmark" );
|
||||||
m_pixmapSelector->addItem( i18n( "KDE" ), "start-here" );
|
m_pixmapSelector->addItem( i18n( "KDE" ), "kde" );
|
||||||
m_pixmapSelector->addItem( i18n( "Information" ), "document-properties" );
|
m_pixmapSelector->addItem( i18n( "Information" ), "help-about" );
|
||||||
#if 0
|
#if 0
|
||||||
m_pixmapSelector->addItem( i18n( "Approved" ), "Approved" );
|
m_pixmapSelector->addItem( i18n( "Approved" ), "Approved" );
|
||||||
m_pixmapSelector->addItem( i18n( "As Is" ), "AsIs" );
|
m_pixmapSelector->addItem( i18n( "As Is" ), "AsIs" );
|
||||||
|
|
|
@ -176,7 +176,7 @@ void BookmarkList::slotContextMenu( const QPoint& p )
|
||||||
|
|
||||||
KMenu menu( this );
|
KMenu menu( this );
|
||||||
QAction * gotobm = menu.addAction( i18n( "Go to This Bookmark" ) );
|
QAction * gotobm = menu.addAction( i18n( "Go to This Bookmark" ) );
|
||||||
QAction * editbm = menu.addAction( KIcon( "edit" ), i18n( "Rename Bookmark" ) );
|
QAction * editbm = menu.addAction( KIcon( "edit-rename" ), i18n( "Rename Bookmark" ) );
|
||||||
QAction * removebm = menu.addAction( KIcon( "list-remove" ), i18n( "Remove Bookmark" ) );
|
QAction * removebm = menu.addAction( KIcon( "list-remove" ), i18n( "Remove Bookmark" ) );
|
||||||
QAction * res = menu.exec( QCursor::pos() );
|
QAction * res = menu.exec( QCursor::pos() );
|
||||||
if ( !res )
|
if ( !res )
|
||||||
|
|
Loading…
Reference in a new issue