diff options
| -rw-r--r-- | src/bookmarks/bookmarksmanager.cpp | 7 | ||||
| -rw-r--r-- | src/data/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/data/default.css | 8 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 9 |
4 files changed, 23 insertions, 9 deletions
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index 31bf2278..d54abb3c 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -55,8 +55,8 @@ BookmarkOwner::BookmarkOwner(QObject *parent) - : QObject(parent) - , KBookmarkOwner() + : QObject(parent) + , KBookmarkOwner() { } @@ -119,11 +119,10 @@ BookmarkMenu::BookmarkMenu(KBookmarkManager *manager, KBookmarkOwner *owner, KMenu *menu, KActionCollection* actionCollection) - : KBookmarkMenu(manager, owner, menu, actionCollection) + : KBookmarkMenu(manager, owner, menu, actionCollection) { KAction *a = KStandardAction::addBookmark(this, SLOT(slotAddBookmark()), this); -// a->setText(i18n("Bookmark this Page")); actionCollection->addAction(QLatin1String("rekonq_add_bookmark"),a); } diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt index 6ff3fefd..ef777c9c 100644 --- a/src/data/CMakeLists.txt +++ b/src/data/CMakeLists.txt @@ -7,7 +7,9 @@ INSTALL( ) INSTALL( - FILES defaultbookmarks.xbel + FILES + defaultbookmarks.xbel + default.css DESTINATION ${DATA_INSTALL_DIR}/rekonq ) @@ -17,6 +19,8 @@ INSTALL( ) INSTALL( - FILES rekonqinfo.html home.html + FILES + rekonqinfo.html + home.html DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls ) diff --git a/src/data/default.css b/src/data/default.css new file mode 100644 index 00000000..47c8e93d --- /dev/null +++ b/src/data/default.css @@ -0,0 +1,8 @@ +/* +rekonq default css properties +this file will not be considered +setting a local stylesheet in rekonq config +*/ + +/* Set background color to white for sites forgetting this */ +background-color:#FFFFFF; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 56b69cc6..abee13d5 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -599,7 +599,10 @@ void MainWindow::updateConfiguration() // Applies user defined CSS to all open webpages. If there no longer is a // user defined CSS removes it from all open webpages. - defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS()); + if(ReKonfig::userCSS().isEmpty()) + defaultSettings->setUserStyleSheetUrl( KUrl(KStandardDirs::locate("appdata" , "default.css")) ); + else + defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS()); // ====== load Settings on main classes Application::historyManager()->loadSettings(); @@ -842,8 +845,8 @@ void MainWindow::highlightAll() if(m_findBar->highlightAllState() && !m_findBar->isHidden()) { - if (m_findBar->matchCase()) - options |= QWebPage::FindCaseSensitively; + if (m_findBar->matchCase()) + options |= QWebPage::FindCaseSensitively; currentTab()->view()->findText(m_lastSearch, options); } |