diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "18") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(okular VERSION 1.4.${KDE_APPLICATIONS_VERSION_MICRO}) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -88,6 +88,7 @@ "Name[nn]": "CHM-motor", "Name[pl]": "Silnik CHM", "Name[pt]": "Infra-Estrutura de CHM", + "Name[pt_BR]": "Infraestrutura CHM", "Name[ru]": "Модуль поддержки формата CHM", "Name[sl]": "Zaledje za CHM", "Name[sr@ijekavian]": "Позадина за ЦХМ", diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -83,6 +83,7 @@ "Name[nn]": "ComicBook-motor", "Name[pl]": "Moduł ComicBook", "Name[pt]": "Infra-Estrutura de ComicBook (BD)", + "Name[pt_BR]": "Infraestrutura ComicBook", "Name[ru]": "Модуль поддержки формата ComicBook", "Name[sk]": "Backend pre knihy komiksov", "Name[sl]": "Zaledje za stripe", diff --git a/generators/djvu/libokularGenerator_djvu.json b/generators/djvu/libokularGenerator_djvu.json --- a/generators/djvu/libokularGenerator_djvu.json +++ b/generators/djvu/libokularGenerator_djvu.json @@ -79,6 +79,7 @@ "Name[nn]": "DjVu-motor", "Name[pl]": "Silnik DjVu", "Name[pt]": "Infra-Estrutura do DjVu", + "Name[pt_BR]": "Infraestrutura DjVu", "Name[ru]": "Модуль поддержки формата DjVu", "Name[sl]": "Zaledje za DjVu", "Name[sr@ijekavian]": "Позадина за ДјВу", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -77,6 +77,7 @@ "Name[nn]": "DVI-motor", "Name[pl]": "Obsługa DVI", "Name[pt]": "Infra-Estrutura de DVI", + "Name[pt_BR]": "Infraestrutura DVI", "Name[ru]": "Модуль поддержки формата DVI", "Name[sl]": "Zaledje za DVI", "Name[sr@ijekavian]": "Позадина за ДВИ", diff --git a/generators/epub/libokularGenerator_epub.json b/generators/epub/libokularGenerator_epub.json --- a/generators/epub/libokularGenerator_epub.json +++ b/generators/epub/libokularGenerator_epub.json @@ -77,6 +77,7 @@ "Name[nn]": "EPUB-motor", "Name[pl]": "Moduł EPub", "Name[pt]": "Infra-Estrutura de EPub", + "Name[pt_BR]": "Infraestrutura EPub", "Name[ru]": "Модуль поддержки формата EPub", "Name[sl]": "Zaledje za EPub", "Name[sr@ijekavian]": "Позадина за ЕПУБ", diff --git a/generators/fax/libokularGenerator_fax.json b/generators/fax/libokularGenerator_fax.json --- a/generators/fax/libokularGenerator_fax.json +++ b/generators/fax/libokularGenerator_fax.json @@ -80,6 +80,7 @@ "Name[nl]": "Faxbackend", "Name[nn]": "Faksmotor", "Name[pl]": "Obsługa faksu", + "Name[pt_BR]": "Infraestrutura de fax", "Name[ru]": "Модуль поддержки форматов факсов", "Name[sl]": "Zaledje za faks", "Name[sr@ijekavian]": "Позадина за факсове", diff --git a/generators/kimgio/libokularGenerator_kimgio.json b/generators/kimgio/libokularGenerator_kimgio.json --- a/generators/kimgio/libokularGenerator_kimgio.json +++ b/generators/kimgio/libokularGenerator_kimgio.json @@ -122,6 +122,7 @@ "Name[nn]": "Biletmotor", "Name[pl]": "Silnik obrazów", "Name[pt]": "Infra-Estrutura de Imagens", + "Name[pt_BR]": "Infraestrutura de imagem", "Name[ru]": "Модуль поддержки форматов изображений", "Name[sk]": "Backend obrázkov", "Name[sl]": "Zaledje za slike", diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json --- a/generators/mobipocket/libokularGenerator_mobi.json +++ b/generators/mobipocket/libokularGenerator_mobi.json @@ -80,6 +80,7 @@ "Name[nn]": "Mobipocket-motor", "Name[pl]": "Obsługa Mobipocket", "Name[pt]": "Infra-Estrutura de Mobipocket", + "Name[pt_BR]": "Infraestrutura Mobipocket", "Name[ru]": "Модуль поддержки формата Mobipocket", "Name[sl]": "Zaledje za Mobipocket", "Name[sr@ijekavian]": "Позадина за Мобипокет", diff --git a/generators/ooo/libokularGenerator_ooo.json b/generators/ooo/libokularGenerator_ooo.json --- a/generators/ooo/libokularGenerator_ooo.json +++ b/generators/ooo/libokularGenerator_ooo.json @@ -80,6 +80,7 @@ "Name[nn]": "OpenDocument-tekstmotor", "Name[pl]": "Silnik dokumentów OpenDocument", "Name[pt]": "Infra-Estrutura de Texto em OpenDocument", + "Name[pt_BR]": "Infraestrutura de texto OpenDocument", "Name[ru]": "Модуль поддержки формата OpenDocument", "Name[sk]": "Backend OpenDocument Text", "Name[sl]": "Zaledje za dokumente OpenDocument", diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json --- a/generators/plucker/libokularGenerator_plucker.json +++ b/generators/plucker/libokularGenerator_plucker.json @@ -80,6 +80,7 @@ "Name[nn]": "Plucker-dokumentmotor", "Name[pl]": "Obsługa dokumentów Plucker", "Name[pt]": "Infra-Estrutura de Documentos do Plucker", + "Name[pt_BR]": "Infraestrutura de documento Plucker", "Name[ru]": "Модуль поддержки формата Plucker", "Name[sk]": "Backend dokumentov Plucker", "Name[sl]": "Zaledje za dokumente Plucker", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -82,6 +82,7 @@ "Name[nn]": "PDF-motor", "Name[pl]": "Silnik PDF", "Name[pt]": "Infra-Estrutura de PDF", + "Name[pt_BR]": "Infraestrutura PDF", "Name[ru]": "Модуль поддержки формата PDF", "Name[sl]": "Zaledje za PDF", "Name[sr@ijekavian]": "Позадина за ПДФ", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -81,6 +81,7 @@ "Name[nn]": "PS-motor", "Name[pl]": "Silnik PS", "Name[pt]": "Infra-Estrutura de PS", + "Name[pt_BR]": "Infraestrutura PS", "Name[ru]": "Модуль поддержки формата PS", "Name[sl]": "Zaledje za PS", "Name[sr@ijekavian]": "Позадина за постскрипт", diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json --- a/generators/tiff/libokularGenerator_tiff.json +++ b/generators/tiff/libokularGenerator_tiff.json @@ -78,6 +78,7 @@ "Name[nn]": "TIFF-motor", "Name[pl]": "Silnik TIFF", "Name[pt]": "Infra-Estrutura de TIFF", + "Name[pt_BR]": "Infraestrutura TIFF", "Name[ru]": "Модуль поддержки формата TIFF", "Name[sl]": "Zaledje za TIFF", "Name[sr@ijekavian]": "Позадина за ТИФФ", diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json --- a/generators/txt/libokularGenerator_txt.json +++ b/generators/txt/libokularGenerator_txt.json @@ -76,6 +76,7 @@ "Name[nn]": "Txt-motor", "Name[pl]": "Silnik tekstowy", "Name[pt]": "Infra-Estrutura de TXT", + "Name[pt_BR]": "Infraestrutura TXT", "Name[ru]": "Модуль поддержки формата Txt", "Name[sk]": "Txt backend", "Name[sl]": "Zaledje za txt", diff --git a/generators/xps/libokularGenerator_xps.json b/generators/xps/libokularGenerator_xps.json --- a/generators/xps/libokularGenerator_xps.json +++ b/generators/xps/libokularGenerator_xps.json @@ -99,6 +99,7 @@ "Name[nn]": "XPS-motor", "Name[pl]": "Silnik XPS", "Name[pt]": "Infra-Estrutura de XPS", + "Name[pt_BR]": "Infraestrutura XPS", "Name[ru]": "Модуль поддержки формата XPS", "Name[sl]": "Zaledje za XPS", "Name[sr@ijekavian]": "Позадина за ИксПС", diff --git a/part.h b/part.h --- a/part.h +++ b/part.h @@ -163,6 +163,8 @@ Q_SCRIPTABLE void slotGotoFirst(); Q_SCRIPTABLE void slotGotoLast(); Q_SCRIPTABLE void slotTogglePresentation(); + Q_SCRIPTABLE void slotToggleChangeColors(); + Q_SCRIPTABLE void slotSetChangeColors(bool active); Q_SCRIPTABLE Q_NOREPLY void reload(); Q_SCRIPTABLE Q_NOREPLY void enableStartWithPrint(); Q_SCRIPTABLE Q_NOREPLY void enableExitAfterPrint(); diff --git a/part.cpp b/part.cpp --- a/part.cpp +++ b/part.cpp @@ -2843,6 +2843,15 @@ dialog->show(); } +void Part::slotToggleChangeColors() +{ + m_pageView->slotToggleChangeColors(); +} + +void Part::slotSetChangeColors(bool active) +{ + m_pageView->slotSetChangeColors(active); +} void Part::slotAnnotationPreferences() { diff --git a/ui/pageview.h b/ui/pageview.h --- a/ui/pageview.h +++ b/ui/pageview.h @@ -124,6 +124,9 @@ void openAnnotationWindow( Okular::Annotation *annotation, int pageNumber ); void reloadForms(); + void slotToggleChangeColors(); + void slotSetChangeColors(bool active); + Q_SIGNALS: void rightClick( const Okular::Page *, const QPoint & ); void mouseBackButtonClick(); @@ -269,7 +272,6 @@ void slotAnnotationWindowDestroyed( QObject *window ); void slotProcessMovieAction( const Okular::MovieAction *action ); void slotProcessRenditionAction( const Okular::RenditionAction *action ); - void slotToggleChangeColors(); void slotFitWindowToPage(); }; diff --git a/ui/pageview.cpp b/ui/pageview.cpp --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -5495,13 +5495,18 @@ }; } -void PageView::slotToggleChangeColors() +void PageView::slotSetChangeColors(bool active) { - Okular::SettingsCore::setChangeColors( !Okular::SettingsCore::changeColors() ); + Okular::SettingsCore::setChangeColors(active); Okular::Settings::self()->save(); viewport()->update(); } +void PageView::slotToggleChangeColors() +{ + slotSetChangeColors( !Okular::SettingsCore::changeColors() ); +} + void PageView::slotFitWindowToPage() { PageViewItem currentPageItem = nullptr;