Commit dc85379c authored by Albert Astals Cid's avatar Albert Astals Cid

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

parents 767a1c0e 574fad92
...@@ -34,14 +34,11 @@ int main(int argc, char** argv) ...@@ -34,14 +34,11 @@ int main(int argc, char** argv)
KLocalizedString::setApplicationDomain("okular"); KLocalizedString::setApplicationDomain("okular");
KAboutData aboutData = okularAboutData(); KAboutData aboutData = okularAboutData();
KAboutData::setApplicationData(aboutData);
app.setApplicationName(aboutData.applicationData().componentName()); // set icon for shells which do not use desktop file metadata
app.setApplicationDisplayName(aboutData.applicationData().displayName()); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular")));
app.setApplicationVersion(aboutData.version());
app.setOrganizationDomain(QStringLiteral("kde.org"));
QCommandLineParser parser; QCommandLineParser parser;
KAboutData::setApplicationData(aboutData);
// The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility // The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility
parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
parser.addVersionOption(); parser.addVersionOption();
......
...@@ -400,7 +400,9 @@ PageView::PageView( QWidget *parent, Okular::Document *document ) ...@@ -400,7 +400,9 @@ PageView::PageView( QWidget *parent, Okular::Document *document )
viewport()->setMouseTracking( true ); viewport()->setMouseTracking( true );
viewport()->setAutoFillBackground( false ); viewport()->setAutoFillBackground( false );
// the apparently "magic" value of 20 is the same used internally in QScrollArea // the apparently "magic" value of 20 is the same used internally in QScrollArea
verticalScrollBar()->setCursor( Qt::ArrowCursor );
verticalScrollBar()->setSingleStep( 20 ); verticalScrollBar()->setSingleStep( 20 );
horizontalScrollBar()->setCursor( Qt::ArrowCursor );
horizontalScrollBar()->setSingleStep( 20 ); horizontalScrollBar()->setSingleStep( 20 );
// conntect the padding of the viewport to pixmaps requests // conntect the padding of the viewport to pixmaps requests
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment