office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-24 18:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Applications/17.04'

Browse source
This commit is contained in:
Albert Astals Cid 2017-05-21 23:38:14 +02:00
parent 767a1c0eac 574fad92c8
commit dc85379ce1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
shell/main.cpp
View file

@ -34,14 +34,11 @@ int main(int argc, char** argv)
KLocalizedString::setApplicationDomain("okular");
KAboutData aboutData = okularAboutData();
app.setApplicationName(aboutData.applicationData().componentName());
app.setApplicationDisplayName(aboutData.applicationData().displayName());
app.setApplicationVersion(aboutData.version());
app.setOrganizationDomain(QStringLiteral("kde.org"));
KAboutData::setApplicationData(aboutData);
// set icon for shells which do not use desktop file metadata
QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular")));
QCommandLineParser parser;
KAboutData::setApplicationData(aboutData);
// The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility
parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
parser.addVersionOption();

2
ui/pageview.cpp
View file

@ -400,7 +400,9 @@ PageView::PageView( QWidget *parent, Okular::Document *document )
viewport()->setMouseTracking( true );
viewport()->setAutoFillBackground( false );
// the apparently "magic" value of 20 is the same used internally in QScrollArea
verticalScrollBar()->setCursor( Qt::ArrowCursor );
verticalScrollBar()->setSingleStep( 20 );
horizontalScrollBar()->setCursor( Qt::ArrowCursor );
horizontalScrollBar()->setSingleStep( 20 );
// conntect the padding of the viewport to pixmaps requests