diff options
Diffstat (limited to 'kpdf/conf')
| -rw-r--r-- | kpdf/conf/dlggeneral.ui | 16 | ||||
| -rw-r--r-- | kpdf/conf/dlggeneral.ui.h | 2 | ||||
| -rw-r--r-- | kpdf/conf/dlgperformance.ui | 4 | ||||
| -rw-r--r-- | kpdf/conf/kpdf.kcfg | 10 | ||||
| -rw-r--r-- | kpdf/conf/preferencesdialog.cpp | 31 | ||||
| -rw-r--r-- | kpdf/conf/preferencesdialog.h | 4 |
6 files changed, 52 insertions, 15 deletions
diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui index 5348111d..dd8c2bd5 100644 --- a/kpdf/conf/dlggeneral.ui +++ b/kpdf/conf/dlggeneral.ui @@ -78,6 +78,22 @@ </widget> <widget class="TQCheckBox"> <property name="name"> + <cstring>kcfg_OpenInExistingKPDF</cstring> + </property> + <property name="text"> + <string>Open documents in &new tab instead of new window</string> + </property> + </widget> + <widget class="TQCheckBox"> + <property name="name"> + <cstring>kcfg_TabsHoverCloseButton</cstring> + </property> + <property name="text"> + <string>Show &close button on tabs when mouse is hovering over them</string> + </property> + </widget> + <widget class="TQCheckBox"> + <property name="name"> <cstring>kcfg_ObeyDRM</cstring> </property> <property name="text"> diff --git a/kpdf/conf/dlggeneral.ui.h b/kpdf/conf/dlggeneral.ui.h index 3a12c7c9..262d3c71 100644 --- a/kpdf/conf/dlggeneral.ui.h +++ b/kpdf/conf/dlggeneral.ui.h @@ -19,7 +19,7 @@ void DlgGeneral::showEvent( TQShowEvent * ) #if KPDF_FORCE_DRM kcfg_ObeyDRM->hide(); #else - if (kapp->authorize("skip_drm")) kcfg_ObeyDRM->show(); + if (tdeApp->authorize("skip_drm")) kcfg_ObeyDRM->show(); else kcfg_ObeyDRM->hide(); #endif } diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui index 3676c3ba..d0730717 100644 --- a/kpdf/conf/dlgperformance.ui +++ b/kpdf/conf/dlgperformance.ui @@ -265,11 +265,11 @@ <include location="global" impldecl="in implementation">kiconloader.h</include> <include location="local" impldecl="in implementation">dlgperformance.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>lowRadio_toggled( bool on )</slot> <slot>normalRadio_toggled( bool on )</slot> <slot>aggressiveRadio_toggled( bool on )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private">init()</function> </functions> diff --git a/kpdf/conf/kpdf.kcfg b/kpdf/conf/kpdf.kcfg index 7f84081e..5c331ec4 100644 --- a/kpdf/conf/kpdf.kcfg +++ b/kpdf/conf/kpdf.kcfg @@ -6,7 +6,7 @@ <kcfgfile name="kpdfpartrc" /> <group name="Accessibility" > <entry key="PaperColor" type="Color" > - <default code="true" >Qt::white</default> + <default code="true" >TQt::white</default> </entry> <entry key="HighlightImages" type="Bool" > <default>false</default> @@ -53,6 +53,12 @@ <entry key="WatchFile" type="Bool" > <default>true</default> </entry> + <entry key="OpenInExistingKPDF" type="Bool" > + <default>false</default> + </entry> + <entry key="TabsHoverCloseButton" type="Bool" > + <default>false</default> + </entry> <entry key="ObeyDRM" type="Bool" > <default>true</default> </entry> @@ -129,7 +135,7 @@ <default>false</default> </entry> <entry key="SlidesBackgroundColor" type="Color" > - <default code="true" >Qt::black</default> + <default code="true" >TQt::black</default> </entry> <entry key="SlidesTransition" type="Enum" > <default>Replace</default> diff --git a/kpdf/conf/preferencesdialog.cpp b/kpdf/conf/preferencesdialog.cpp index 3b8de428..dbcf56bd 100644 --- a/kpdf/conf/preferencesdialog.cpp +++ b/kpdf/conf/preferencesdialog.cpp @@ -8,6 +8,7 @@ ***************************************************************************/ #include <tdelocale.h> +#include <tqcheckbox.h> // single config pages #include "dlggeneral.h" @@ -19,16 +20,26 @@ #include "preferencesdialog.h" PreferencesDialog::PreferencesDialog( TQWidget * parent, TDEConfigSkeleton * skeleton ) - : TDEConfigDialog( parent, "preferences", skeleton ) + : TDEConfigDialog( parent, "preferences", skeleton ), + m_shellMode(false) { - m_general = new DlgGeneral(0); - m_performance = new DlgPerformance(0); - m_accessibility = new DlgAccessibility(0); - m_presentation = new DlgPresentation(0); + m_general = new DlgGeneral(nullptr); + m_performance = new DlgPerformance(nullptr); + m_accessibility = new DlgAccessibility(nullptr); + m_presentation = new DlgPresentation(nullptr); - addPage( m_general, i18n("General"), "kpdf", i18n("General Options") ); - addPage( m_accessibility, i18n("Accessibility"), "access", i18n("Reading Aids") ); - addPage( m_performance, i18n("Performance"), "launch", i18n("Performance Tuning") ); - addPage( m_presentation, i18n("Presentation"), "application-x-kpresenter", - i18n("Options for Presentation Mode") ); + addPage(m_general, i18n("General"), "kpdf", i18n("General Options")); + addPage(m_accessibility, i18n("Accessibility"), "access", i18n("Reading Aids")); + addPage(m_performance, i18n("Performance"), "launch", i18n("Performance Tuning")); + addPage(m_presentation, i18n("Presentation"), "application-x-kpresenter", + i18n("Options for Presentation Mode")); + + setShellMode(m_shellMode); +} + +void PreferencesDialog::setShellMode(bool on) +{ + m_shellMode = on; + m_general->kcfg_TabsHoverCloseButton->setHidden(!m_shellMode); + m_general->kcfg_OpenInExistingKPDF->setHidden(!m_shellMode); } diff --git a/kpdf/conf/preferencesdialog.h b/kpdf/conf/preferencesdialog.h index bc7b0cbf..c0b2fc53 100644 --- a/kpdf/conf/preferencesdialog.h +++ b/kpdf/conf/preferencesdialog.h @@ -27,6 +27,9 @@ class PreferencesDialog : public TDEConfigDialog public: PreferencesDialog( TQWidget * parent, TDEConfigSkeleton * config ); + bool shellMode() { return m_shellMode; } + void setShellMode(bool on); + protected: // void updateSettings(); // Called when OK/Apply is pressed. // void updateWidgets(); // Called upon construction or when Reset is pressed @@ -39,6 +42,7 @@ class PreferencesDialog : public TDEConfigDialog DlgPerformance * m_performance; DlgAccessibility * m_accessibility; DlgPresentation * m_presentation; + bool m_shellMode; }; #endif |
