From c051a6d137e908eacc9e92115ad37df951c8895e Mon Sep 17 00:00:00 2001 From: Enrico Ros Date: Fri, 5 Nov 2004 10:27:38 +0000 Subject: [PATCH] Added 'performance' dialog. Code still not in place. Need to implement all options now. Changed some options inside kpdf.kcfg (KConfigXT configuration description). svn path=/branches/kpdf_experiments/kdegraphics/kpdf/; revision=360658 --- kpdf/conf/Makefile.am | 5 +- kpdf/conf/dlgaccessibility.ui | 54 ++++------- kpdf/conf/dlgaccessibility.ui.h | 50 ---------- kpdf/conf/dlggeneral.ui | 24 +---- kpdf/conf/dlgperformance.ui | 160 ++++++++++++++++++++++++++++++++ kpdf/conf/dlgperformance.ui.h | 37 ++++++++ kpdf/conf/kpdf.kcfg | 22 +++-- kpdf/conf/preferencesdialog.cpp | 3 + kpdf/conf/preferencesdialog.h | 2 + kpdf/pageview.cpp | 2 +- 10 files changed, 240 insertions(+), 119 deletions(-) delete mode 100644 kpdf/conf/dlgaccessibility.ui.h create mode 100644 kpdf/conf/dlgperformance.ui create mode 100644 kpdf/conf/dlgperformance.ui.h diff --git a/kpdf/conf/Makefile.am b/kpdf/conf/Makefile.am index 9f1b21919..dcdca967d 100644 --- a/kpdf/conf/Makefile.am +++ b/kpdf/conf/Makefile.am @@ -1,8 +1,7 @@ noinst_LTLIBRARIES = libconf.la -libconf_la_SOURCES = dlggeneral.ui dlgaccessibility.ui \ - preferencesdialog.cpp \ - settings.kcfgc +libconf_la_SOURCES = dlggeneral.ui dlgperformance.ui dlgaccessibility.ui \ + preferencesdialog.cpp settings.kcfgc INCLUDES = -I$(srcdir)/.. $(all_includes) diff --git a/kpdf/conf/dlgaccessibility.ui b/kpdf/conf/dlgaccessibility.ui index 092736eb4..7b748585a 100644 --- a/kpdf/conf/dlgaccessibility.ui +++ b/kpdf/conf/dlgaccessibility.ui @@ -24,7 +24,7 @@ - buttonGroup1 + kcfg_RenderMode @@ -46,7 +46,7 @@ radioNormal - Normal + Normal (default) true @@ -54,7 +54,7 @@ - layout4 + layout5 @@ -102,6 +102,20 @@ + + + textLabel1_2 + + + true + + + (needs restart) + + + kcfg_PaperColor + + spacer7_2 @@ -114,7 +128,7 @@ - 180 + 30 20 @@ -455,41 +469,13 @@ radioNormal toggled(bool) - DlgAccessibility - radioNormal_toggled(bool) - - - radioInverted - toggled(bool) - DlgAccessibility - radioInverted_toggled(bool) - - - radioRecolor - toggled(bool) - DlgAccessibility - radioRecolor_toggled(bool) - - - radioContrast - toggled(bool) - DlgAccessibility - radioContrast_toggled(bool) + textLabel1_2 + setEnabled(bool) kdialog.h - dlgaccessibility.ui.h - - radioNormal_toggled( bool on ) - radioInverted_toggled( bool on ) - radioRecolor_toggled( bool on ) - radioContrast_toggled( bool on ) - - - init() - kcolorbutton.h diff --git a/kpdf/conf/dlgaccessibility.ui.h b/kpdf/conf/dlgaccessibility.ui.h deleted file mode 100644 index 1d9e947de..000000000 --- a/kpdf/conf/dlgaccessibility.ui.h +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2004 by Enrico Ros * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - ***************************************************************************/ - -#include "settings.h" - - -void DlgAccessibility::init() -{ - switch ( Settings::renderMode() ) - { - case Settings::EnumRenderMode::Normal: - radioNormal->setChecked( true ); - break; - case Settings::EnumRenderMode::Inverted: - radioInverted->setChecked( true ); - break; - case Settings::EnumRenderMode::Recolor: - radioRecolor->setChecked( true ); - break; - case Settings::EnumRenderMode::BlackWhite: - radioContrast->setChecked( true ); - break; - } -} - -void DlgAccessibility::radioNormal_toggled( bool on ) -{ - if ( on ) Settings::setRenderMode( Settings::EnumRenderMode::Normal ); -} - -void DlgAccessibility::radioInverted_toggled( bool on ) -{ - if ( on ) Settings::setRenderMode( Settings::EnumRenderMode::Inverted ); -} - -void DlgAccessibility::radioRecolor_toggled( bool on ) -{ - if ( on ) Settings::setRenderMode( Settings::EnumRenderMode::Recolor ); -} - -void DlgAccessibility::radioContrast_toggled( bool on ) -{ - if ( on ) Settings::setRenderMode( Settings::EnumRenderMode::BlackWhite ); -} diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui index d21388e9b..06e53fe34 100644 --- a/kpdf/conf/dlggeneral.ui +++ b/kpdf/conf/dlggeneral.ui @@ -9,7 +9,7 @@ 0 0 266 - 161 + 109 @@ -96,28 +96,6 @@ Alt+H - - - kcfg_TempUseCompositing - - - USE COMPOSITE - - - - - - - - kcfg_TempDrawBoundaries - - - DRAW BOUNDARIES - - - - - spacer3 diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui new file mode 100644 index 000000000..ad47e8156 --- /dev/null +++ b/kpdf/conf/dlgperformance.ui @@ -0,0 +1,160 @@ + +DlgPerformance + + + DlgPerformance + + + + 0 + 0 + 350 + 218 + + + + DlgPerformance + + + + unnamed + + + 0 + + + + groupBox1 + + + CPU Usage + + + + unnamed + + + + kcfg_UseCompositing + + + Enable transparency and other effects (default) + + + + + kcfg_TempDrawBoundaries + + + (TEMP) DRAW BOUNDARIES + + + + + + + + + + kcfg_MemoryLevel + + + Memory Usage + + + + unnamed + + + + lowRadio + + + Low + + + + + normalRadio + + + Normal (default) + + + + + aggressiveRadio + + + Aggressive + + + + + descLabel + + + ... + + + PlainText + + + WordBreak|AlignVCenter + + + + + + + spacer3 + + + Vertical + + + Expanding + + + + 20 + 90 + + + + + + + + lowRadio + toggled(bool) + DlgPerformance + lowRadio_toggled(bool) + + + normalRadio + toggled(bool) + DlgPerformance + normalRadio_toggled(bool) + + + aggressiveRadio + toggled(bool) + DlgPerformance + aggressiveRadio_toggled(bool) + + + + kdialog.h + dlgperformance.ui.h + + + lowRadio_toggled( bool on ) + normalRadio_toggled( bool on ) + aggressiveRadio_toggled( bool on ) + + + init() + + + diff --git a/kpdf/conf/dlgperformance.ui.h b/kpdf/conf/dlgperformance.ui.h new file mode 100644 index 000000000..629167f6c --- /dev/null +++ b/kpdf/conf/dlgperformance.ui.h @@ -0,0 +1,37 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. +** +** If you want to add, delete, or rename functions or slots, use +** Qt Designer to update this file, preserving your code. +** +** You should not define a constructor or destructor in this file. +** Instead, write your code in functions called init() and destroy(). +** These will automatically be called by the form's constructor and +** destructor. +*****************************************************************************/ + +#include + + +void DlgPerformance::init() +{ + QFont labelFont = descLabel->font(); + labelFont.setBold( true ); + descLabel->setFont( labelFont ); +} + +void DlgPerformance::lowRadio_toggled( bool on ) +{ + if ( on ) descLabel->setText( i18n("Keeps used memory as low as possible. Don't reuse anything. (for systems with low memory)") ); +} + +void DlgPerformance::normalRadio_toggled( bool on ) +{ + if ( on ) descLabel->setText( i18n("A good compromise between memory usage and speed gain. Preload next page and boost searches. (for systems with 256MB of memory typically)") ); +} + +void DlgPerformance::aggressiveRadio_toggled( bool on ) +{ + if ( on ) descLabel->setText( i18n("Keeps everything in mempory. Preload next pages. Boost searches. (for systems with more than 512MB of memory)") ); +} + diff --git a/kpdf/conf/kpdf.kcfg b/kpdf/conf/kpdf.kcfg index 505f55637..afd8e9238 100644 --- a/kpdf/conf/kpdf.kcfg +++ b/kpdf/conf/kpdf.kcfg @@ -15,9 +15,13 @@ Normal + + + + @@ -61,17 +65,19 @@ - - Low - Normal - Aggressive - + Normal + + + + + + + + + true - - false - false diff --git a/kpdf/conf/preferencesdialog.cpp b/kpdf/conf/preferencesdialog.cpp index 7b6ebdf5b..99246baab 100644 --- a/kpdf/conf/preferencesdialog.cpp +++ b/kpdf/conf/preferencesdialog.cpp @@ -11,6 +11,7 @@ // single config pages #include "dlggeneral.h" +#include "dlgperformance.h" #include "dlgaccessibility.h" // reimplementing this @@ -20,8 +21,10 @@ PreferencesDialog::PreferencesDialog( QWidget * parent, KConfigSkeleton * skelet : KConfigDialog( parent, "preferences", skeleton ) { m_general = new DlgGeneral(0); + m_performance = new DlgPerformance(0); m_accessibility = new DlgAccessibility(0); addPage( m_general, i18n("General"), "gohome", i18n("General Options") ); + addPage( m_performance, i18n("Performance"), "launch", i18n("Performance Tuning") ); addPage( m_accessibility, i18n("Accessibility"), "viewmag", i18n("Reading Aids") ); } diff --git a/kpdf/conf/preferencesdialog.h b/kpdf/conf/preferencesdialog.h index 96b26a60b..9c8d73a98 100644 --- a/kpdf/conf/preferencesdialog.h +++ b/kpdf/conf/preferencesdialog.h @@ -17,6 +17,7 @@ class QWidget; class KConfigSkeleton; class DlgGeneral; +class DlgPerformance; class DlgAccessibility; class PreferencesDialog : public KConfigDialog @@ -34,6 +35,7 @@ class PreferencesDialog : public KConfigDialog private: DlgGeneral * m_general; + DlgPerformance * m_performance; DlgAccessibility * m_accessibility; }; diff --git a/kpdf/pageview.cpp b/kpdf/pageview.cpp index 339ad2de3..5619e49c8 100644 --- a/kpdf/pageview.cpp +++ b/kpdf/pageview.cpp @@ -331,7 +331,7 @@ void PageView::viewportPaintEvent( QPaintEvent * pe ) continue; } - if ( Settings::tempUseCompositing() ) + if ( Settings::useCompositing() ) { // create pixmap and open a painter over it QPixmap doubleBuffer( contentsRect.size() );