Git commit ca8fc44e914e5d6f2514ffb68903bcd332ec267e by Allen Winter. Committed on 16/02/2012 at 00:55. Pushed by winterz into branch 'master'.
Add a new option for printing the footer Fix up the layouts of all the print dialog pages add some more whatsthis and tooltips to the print dialogs MERGE: none GUI: BUG: 286945 FIXED-IN: 4.9.0 M +216 -173 korganizer/printing/calprintdayconfig_base.ui M +49 -19 korganizer/printing/calprintdefaultplugins.cpp M +1 -0 korganizer/printing/calprintdefaultplugins.h M +79 -48 korganizer/printing/calprintincidenceconfig_base.ui M +189 -146 korganizer/printing/calprintmonthconfig_base.ui M +19 -2 korganizer/printing/calprintpluginbase.cpp M +6 -0 korganizer/printing/calprintpluginbase.h M +211 -187 korganizer/printing/calprinttodoconfig_base.ui M +224 -175 korganizer/printing/calprintweekconfig_base.ui http://commits.kde.org/kdepim/ca8fc44e914e5d6f2514ffb68903bcd332ec267e diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index 4cd8d62..906abb1 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -1,103 +1,104 @@ -<ui version="4.0" > - <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> <comment>Configuration page for the print day mode.</comment> <class>CalPrintDayConfig_Base</class> - <widget class="QWidget" name="CalPrintDayConfig_Base" > - <property name="geometry" > + <widget class="QWidget" name="CalPrintDayConfig_Base"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>503</width> - <height>520</height> + <height>644</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout_3" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print day options:</span></p></body></html></string> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print day options:</span></p></body></html></string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="mDateRangeGroup" > - <property name="title" > + <item> + <widget class="QGroupBox" name="mDateRangeGroup"> + <property name="title"> <string>Date && Time Range</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <property name="topMargin" > + <layout class="QGridLayout" name="gridLayout"> + <property name="topMargin"> <number>0</number> </property> - <item row="0" column="0" > - <widget class="QLabel" name="mFromDateLabel" > - <property name="whatsThis" > - <string>If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date.</string> + <item row="0" column="0"> + <widget class="QLabel" name="mFromDateLabel"> + <property name="whatsThis"> + <string>If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date.</string> </property> - <property name="text" > + <property name="text"> <string>&Start date:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mFromDate</cstring> </property> </widget> </item> - <item row="0" column="1" > - <widget class="KDateComboBox" name="mFromDate" > - <property name="focusPolicy" > + <item row="0" column="1"> + <widget class="KDateComboBox" name="mFromDate"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="whatsThis" > - <string>If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date.</string> + <property name="whatsThis"> + <string>If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date.</string> </property> <item> - <property name="text" > + <property name="text"> <string>2009-01-19</string> </property> </item> </widget> </item> - <item row="0" column="2" > - <widget class="QLabel" name="mFromTimeLabel" > - <property name="whatsThis" > - <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the start of this time range. The end time should be defined with the <i>End time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> + <item row="0" column="2"> + <widget class="QLabel" name="mFromTimeLabel"> + <property name="whatsThis"> + <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the start of this time range. The end time should be defined with the <i>End time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> </property> - <property name="text" > + <property name="text"> <string>Start &time:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mFromTime</cstring> </property> </widget> </item> - <item row="0" column="3" > - <widget class="QTimeEdit" name="mFromTime" > - <property name="whatsThis" > - <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the start of this time range. The end time should be defined with the <i>End time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> - </property> - <property name="displayFormat" > - <string>hh:mm</string> + <item row="0" column="3"> + <widget class="QTimeEdit" name="mFromTime"> + <property name="whatsThis"> + <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the start of this time range. The end time should be defined with the <i>End time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> </property> - <property name="time" > + <property name="time"> <time> <hour>8</hour> <minute>0</minute> <second>0</second> </time> </property> + <property name="displayFormat"> + <string>hh:mm</string> + </property> </widget> </item> - <item row="0" column="4" > + <item row="0" column="4"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>97</width> <height>24</height> @@ -105,73 +106,73 @@ p, li { white-space: pre-wrap; } </property> </spacer> </item> - <item row="1" column="0" > - <widget class="QLabel" name="mToDateLabel" > - <property name="whatsThis" > - <string>If you want to print more days at once, you can define a range of dates with this option and the <i>Start date</i> option. This option is used to define the end date.</string> + <item row="1" column="0"> + <widget class="QLabel" name="mToDateLabel"> + <property name="whatsThis"> + <string>If you want to print more days at once, you can define a range of dates with this option and the <i>Start date</i> option. This option is used to define the end date.</string> </property> - <property name="text" > + <property name="text"> <string>&End date:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mToDate</cstring> </property> </widget> </item> - <item row="1" column="1" > - <widget class="KDateComboBox" name="mToDate" > - <property name="focusPolicy" > + <item row="1" column="1"> + <widget class="KDateComboBox" name="mToDate"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="whatsThis" > - <string>If you want to print more days at once, you can define a range of dates with this option and the <i>Start date</i> option. This option is used to define the end date.</string> + <property name="whatsThis"> + <string>If you want to print more days at once, you can define a range of dates with this option and the <i>Start date</i> option. This option is used to define the end date.</string> </property> <item> - <property name="text" > + <property name="text"> <string>2009-01-19</string> </property> </item> </widget> </item> - <item row="1" column="2" > - <widget class="QLabel" name="mToTimeLabel" > - <property name="whatsThis" > - <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the <i>Start time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> + <item row="1" column="2"> + <widget class="QLabel" name="mToTimeLabel"> + <property name="whatsThis"> + <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the <i>Start time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> </property> - <property name="text" > + <property name="text"> <string>End ti&me:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mToTime</cstring> </property> </widget> </item> - <item row="1" column="3" > - <widget class="QTimeEdit" name="mToTime" > - <property name="whatsThis" > - <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the <i>Start time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> - </property> - <property name="displayFormat" > - <string>hh:mm</string> + <item row="1" column="3"> + <widget class="QTimeEdit" name="mToTime"> + <property name="whatsThis"> + <string>It is possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the <i>Start time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>.</string> </property> - <property name="time" > + <property name="time"> <time> <hour>18</hour> <minute>0</minute> <second>0</second> </time> </property> + <property name="displayFormat"> + <string>hh:mm</string> + </property> </widget> </item> - <item row="1" column="4" > + <item row="1" column="4"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>97</width> <height>24</height> @@ -179,12 +180,12 @@ p, li { white-space: pre-wrap; } </property> </spacer> </item> - <item row="2" column="0" colspan="5" > - <widget class="QCheckBox" name="mIncludeAllEvents" > - <property name="whatsThis" > + <item row="2" column="0" colspan="5"> + <widget class="QCheckBox" name="mIncludeAllEvents"> + <property name="whatsThis"> <string>Check this option to automatically determine the required time range, so all events will be shown.</string> </property> - <property name="text" > + <property name="text"> <string>E&xtend time range to include all events</string> </property> </widget> @@ -192,34 +193,34 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="2" column="0" > - <widget class="QGroupBox" name="mPrintType" > - <property name="title" > + <item> + <widget class="QGroupBox" name="mPrintType"> + <property name="title"> <string>Print Layout</string> </property> - <layout class="QGridLayout" name="gridLayout_2" > - <property name="topMargin" > + <layout class="QGridLayout" name="gridLayout_2"> + <property name="topMargin"> <number>0</number> </property> - <item row="0" column="0" > - <widget class="QRadioButton" name="mPrintTypeFilofax" > - <property name="whatsThis" > + <item row="0" column="0"> + <widget class="QRadioButton" name="mPrintTypeFilofax"> + <property name="whatsThis"> <string>The Filofax format prints the information for the days selected without a timeline.</string> </property> - <property name="text" > + <property name="text"> <string>Print date range as &Filofax format, all on one page</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QRadioButton" name="mPrintTypeTimetable" > - <property name="whatsThis" > + <item row="1" column="0"> + <widget class="QRadioButton" name="mPrintTypeTimetable"> + <property name="whatsThis"> <string>The timetable print view has the times to the left of the page</string> </property> - <property name="text" > + <property name="text"> <string>Print as &timetable view, one page per day</string> </property> - <property name="checked" > + <property name="checked"> <bool>false</bool> </property> </widget> @@ -240,31 +241,31 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="3" column="0" > - <widget class="QGroupBox" name="mSecurity" > - <property name="title" > + <item> + <widget class="QGroupBox" name="mSecurity"> + <property name="title"> <string>Security Exclusions</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout" > - <property name="topMargin" > + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="topMargin"> <number>0</number> </property> <item> - <widget class="QCheckBox" name="mExcludeConfidential" > - <property name="whatsThis" > + <widget class="QCheckBox" name="mExcludeConfidential"> + <property name="whatsThis"> <string>Check this option to exclude confidential events.</string> </property> - <property name="text" > + <property name="text"> <string>Exclude c&onfidential</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mExcludePrivate" > - <property name="whatsThis" > + <widget class="QCheckBox" name="mExcludePrivate"> + <property name="whatsThis"> <string>Check this option to exclude private events</string> </property> - <property name="text" > + <property name="text"> <string>Exclude pri&vate</string> </property> </widget> @@ -272,81 +273,118 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="4" column="0" > - <widget class="QCheckBox" name="mExcludeTime" > - <property name="whatsThis" > - <string>Check this option to exclude the time in description box</string> - </property> - <property name="text" > - <string>Exclude t&ime from timetable detail display items</string> - </property> - </widget> - </item> - <item row="5" column="0" > - <widget class="QCheckBox" name="mIncludeTodos" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="whatsThis" > - <string>You should check this option if you want to print to-dos which are due on one of the dates which are in the supplied date range.</string> - </property> - <property name="text" > - <string>Include to-&dos that are due on the printed day(s)</string> - </property> - </widget> - </item> - <item row="6" column="0" > - <widget class="QCheckBox" name="mIncludeDescription" > - <property name="whatsThis" > - <string>Check this option to include the more detailed description for each event.</string> - </property> - <property name="text" > - <string>Include &descriptions</string> - </property> - </widget> - </item> - <item row="7" column="0" > - <widget class="QCheckBox" name="mShowNoteLines" > - <property name="whatsThis" > - <string>Check this option to draw note lines </string> - </property> - <property name="text" > - <string>Show note &lines</string> - </property> - </widget> - </item> - <item row="8" column="0" > - <widget class="QCheckBox" name="mSingleLineLimit" > - <property name="whatsThis" > - <string>Check this option to limit events to a single line.</string> - </property> - <property name="text" > - <string>Limit events in each day to a &single line</string> + <item> + <widget class="QGroupBox" name="mIncludeInfoGroup"> + <property name="title"> + <string>Include Information</string> </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="1" column="0"> + <widget class="QCheckBox" name="mIncludeTodos"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="whatsThis"> + <string>You should check this option if you want to print to-dos which are due on one of the dates which are in the supplied date range.</string> + </property> + <property name="text"> + <string>Include to-&dos that are due on the printed day(s)</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="mExcludeTime"> + <property name="whatsThis"> + <string>Check this option to exclude the time in description box</string> + </property> + <property name="text"> + <string>Exclude t&ime from timetable detail display items</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QCheckBox" name="mIncludeDescription"> + <property name="text"> + <string>Include &descriptions</string> + </property> + <property name="toolTip"> + <string>Print item descriptions</string> + </property> + <property name="whatsThis"> + <string>Check this option if you want to see the item descriptions printed.</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="9" column="0" > - <widget class="QCheckBox" name="mColors" > - <property name="whatsThis" > - <string>If you want to use colors to distinguish certain categories on the print, check this option.</string> - </property> - <property name="text" > - <string>&Use colors</string> + <item> + <widget class="QGroupBox" name="mGeneralGroup"> + <property name="title"> + <string comment="@title general print settings">General</string> </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QCheckBox" name="mSingleLineLimit"> + <property name="toolTip"> + <string>Print items on one line</string> + </property> + <property name="whatsThis"> + <string>Check this option to limit events to a single line, truncating as necessary to save space.</string> + </property> + <property name="text"> + <string>Limit events in each day to a &single line</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="mShowNoteLines"> + <property name="whatsThis"> + <string>Check this option to draw note lines </string> + </property> + <property name="text"> + <string>Show note &lines</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="mPrintFooter"> + <property name="text"> + <string>Print &Footer</string> + </property> + <property name="toolTip"> + <string>Print a datetime footer on each page</string> + </property> + <property name="whatsThis"> + <string>Check this box if you want to print a small footer on each page that contains the date of the print.</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="mColors"> + <property name="toolTip"> + <string>Print in color</string> + </property> + <property name="whatsThis"> + <string>If you want to use colors to distinguish certain categories on the print, check this option.</string> + </property> + <property name="text"> + <string>&Use colors</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="10" column="0" > - <spacer> - <property name="orientation" > + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> - <width>482</width> - <height>40</height> + <width>20</width> + <height>73</height> </size> </property> </spacer> @@ -356,9 +394,14 @@ p, li { white-space: pre-wrap; } <customwidgets> <customwidget> <class>KDateComboBox</class> - <extends>QComboBox</extends> + <extends>KComboBox</extends> <header>kdatecombobox.h</header> </customwidget> + <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> </customwidgets> <tabstops> <tabstop>mFromDate</tabstop> diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index eca671f..43d9a33 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -6,6 +6,7 @@ Copyright (c) 2003 Cornelius Schumacher <schumacher at kde.org> Copyright (c) 2008 Ron Goodheart <rong.dev at gmail.com> Copyright (c) 2010 Laurent Montel <montel at kde.org> + Copyright (c) 2012 Allen Winter <winter at kde.org> 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 @@ -33,11 +34,10 @@ #include <calendarsupport/kcalprefs.h> #include <calendarsupport/utils.h> -#include <kcalcore/visitor.h> -#include <kcalcore/todo.h> +#include <KCalCore/Visitor> -#include <kcalutils/incidenceformatter.h> -#include <kcalutils/stringify.h> +#include <KCalUtils/IncidenceFormatter> +#include <KCalUtils/Stringify> #include <KCalendarSystem> #include <KDateTime> @@ -79,6 +79,7 @@ void CalPrintIncidence::readSettingsWidget() dynamic_cast<CalPrintIncidenceConfig *>( ( QWidget* )mConfigWidget ); if ( cfg ) { mUseColors = cfg->mColors->isChecked(); + mPrintFooter = cfg->mPrintFooter->isChecked(); mShowOptions = cfg->mShowDetails->isChecked(); mShowSubitemsNotes = cfg->mShowSubitemsNotes->isChecked(); mShowAttendees = cfg->mShowAttendees->isChecked(); @@ -93,11 +94,12 @@ void CalPrintIncidence::setSettingsWidget() dynamic_cast<CalPrintIncidenceConfig *>( ( QWidget* )mConfigWidget ); if ( cfg ) { cfg->mColors->setChecked( mUseColors ); - cfg->mShowDetails->setChecked(mShowOptions); - cfg->mShowSubitemsNotes->setChecked(mShowSubitemsNotes); - cfg->mShowAttendees->setChecked(mShowAttendees); - cfg->mShowAttachments->setChecked(mShowAttachments); - cfg->mShowNoteLines->setChecked(mShowNoteLines); + cfg->mPrintFooter->setChecked( mPrintFooter ); + cfg->mShowDetails->setChecked( mShowOptions ); + cfg->mShowSubitemsNotes->setChecked( mShowSubitemsNotes ); + cfg->mShowAttendees->setChecked( mShowAttendees ); + cfg->mShowAttachments->setChecked( mShowAttachments ); + cfg->mShowNoteLines->setChecked( mShowNoteLines ); } } @@ -657,7 +659,9 @@ void CalPrintIncidence::print( QPainter &p, int width, int height ) (*it)->categories().join( i18nc( "Spacer for the joined list of categories", ", " ) ), /*sameLine=*/true, /*expand=*/false, captionFont, textFont ); - drawFooter( p, footerBox ); + if ( mPrintFooter ) { + drawFooter( p, footerBox ); + } } p.setFont( oldFont ); } @@ -703,6 +707,7 @@ void CalPrintDay::readSettingsWidget() mSingleLineLimit = cfg->mSingleLineLimit->isChecked(); mIncludeTodos = cfg->mIncludeTodos->isChecked(); mUseColors = cfg->mColors->isChecked(); + mPrintFooter = cfg->mPrintFooter->isChecked(); mShowNoteLines = cfg->mShowNoteLines->isChecked(); mExcludeTime = cfg->mExcludeTime->isChecked(); mExcludeConfidential = cfg->mExcludeConfidential->isChecked(); @@ -729,6 +734,7 @@ void CalPrintDay::setSettingsWidget() cfg->mSingleLineLimit->setChecked( mSingleLineLimit ); cfg->mIncludeTodos->setChecked( mIncludeTodos ); cfg->mColors->setChecked( mUseColors ); + cfg->mPrintFooter->setChecked( mPrintFooter ); cfg->mShowNoteLines->setChecked( mShowNoteLines ); cfg->mExcludeTime->setChecked( mExcludeTime ); cfg->mExcludeConfidential->setChecked( mExcludeConfidential ); @@ -825,7 +831,9 @@ void CalPrintDay::print( QPainter &p, int width, int height ) mIncludeDescription, mExcludeTime, mExcludeConfidential, mExcludePrivate ); } - drawFooter( p, daysBox ); + if ( mPrintFooter ) { + drawFooter( p, daysBox ); + } } break; @@ -925,7 +933,9 @@ void CalPrintDay::print( QPainter &p, int width, int height ) tlBox.setWidth( TIMELINE_WIDTH ); drawTimeLine( p, curStartTime, curEndTime, tlBox ); - drawFooter( p, footerBox ); + if ( mPrintFooter ) { + drawFooter( p, footerBox ); + } curDay = curDay.addDays( 1 ); if ( curDay <= mToDate ) { @@ -976,6 +986,7 @@ void CalPrintWeek::readSettingsWidget() mSingleLineLimit = cfg->mSingleLineLimit->isChecked(); mIncludeTodos = cfg->mIncludeTodos->isChecked(); mUseColors = cfg->mColors->isChecked(); + mPrintFooter = cfg->mPrintFooter->isChecked(); mIncludeDescription = cfg->mIncludeDescription->isChecked(); mExcludeTime = cfg->mExcludeTime->isChecked(); mExcludeConfidential = cfg->mExcludeConfidential->isChecked(); @@ -1001,6 +1012,7 @@ void CalPrintWeek::setSettingsWidget() cfg->mSingleLineLimit->setChecked( mSingleLineLimit ); cfg->mIncludeTodos->setChecked( mIncludeTodos ); cfg->mColors->setChecked( mUseColors ); + cfg->mPrintFooter->setChecked( mPrintFooter ); cfg->mIncludeDescription->setChecked( mIncludeDescription ); cfg->mExcludeTime->setChecked( mExcludeTime ); cfg->mExcludeConfidential->setChecked( mExcludeConfidential ); @@ -1107,7 +1119,9 @@ void CalPrintWeek::print( QPainter &p, int width, int height ) mShowNoteLines, mIncludeDescription, mExcludeConfidential, mExcludePrivate ); - drawFooter( p, footerBox ); + if ( mPrintFooter ) { + drawFooter( p, footerBox ); + } curWeek = curWeek.addDays( 7 ); if ( curWeek <= toWeek ) { @@ -1134,7 +1148,9 @@ void CalPrintWeek::print( QPainter &p, int width, int height ) mIncludeDescription, mExcludeTime, mExcludeConfidential, mExcludePrivate ); - drawFooter( p, footerBox ); + if ( mPrintFooter ) { + drawFooter( p, footerBox ); + } fromWeek = fromWeek.addDays( 7 ); curWeek = fromWeek.addDays( 6 ); @@ -1159,14 +1175,18 @@ void CalPrintWeek::print( QPainter &p, int width, int height ) drawTimeTable( p, fromWeek, endLeft, mStartTime, mEndTime, weekBox, mIncludeDescription, mExcludeTime, mExcludeConfidential, mExcludePrivate ); - drawFooter( p, weekBox1 ); + if ( mPrintFooter ) { + drawFooter( p, weekBox1 ); + } mPrinter->newPage(); drawSplitHeaderRight( p, fromWeek, curWeek, QDate(), width, hh ); drawTimeTable( p, endLeft.addDays( 1 ), curWeek, mStartTime, mEndTime, weekBox1, mIncludeDescription, mExcludeTime, mExcludeConfidential, mExcludePrivate ); - drawFooter( p, weekBox1 ); - drawFooter( p, footerBox ); + + if ( mPrintFooter ) { + drawFooter( p, footerBox ); + } fromWeek = fromWeek.addDays( 7 ); curWeek = fromWeek.addDays( 6 ); @@ -1211,6 +1231,7 @@ void CalPrintMonth::readSettingsWidget() mShowNoteLines = cfg->mShowNoteLines->isChecked(); mSingleLineLimit = cfg->mSingleLineLimit->isChecked(); mUseColors = cfg->mColors->isChecked(); + mPrintFooter = cfg->mPrintFooter->isChecked(); mIncludeDescription = cfg->mIncludeDescription->isChecked(); mExcludeConfidential = cfg->mExcludeConfidential->isChecked(); mExcludePrivate = cfg->mExcludePrivate->isChecked(); @@ -1231,6 +1252,7 @@ void CalPrintMonth::setSettingsWidget() cfg->mShowNoteLines->setChecked( mShowNoteLines ); cfg->mSingleLineLimit->setChecked( mSingleLineLimit ); cfg->mColors->setChecked( mUseColors ); + cfg->mPrintFooter->setChecked( mPrintFooter ); cfg->mIncludeDescription->setChecked( mIncludeDescription ); cfg->mExcludeConfidential->setChecked( mExcludeConfidential ); cfg->mExcludePrivate->setChecked( mExcludePrivate ); @@ -1325,7 +1347,9 @@ void CalPrintMonth::print( QPainter &p, int width, int height ) mSingleLineLimit, mShowNoteLines, mIncludeDescription, mExcludeConfidential, mExcludePrivate, monthBox ); - drawFooter( p, footerBox ); + if ( mPrintFooter ) { + drawFooter( p, footerBox ); + } curMonth = curMonth.addDays( curMonth.daysInMonth() ); if ( curMonth <= toMonth ) { @@ -1385,6 +1409,8 @@ void CalPrintTodos::readSettingsWidget() mTodoSortField = (eTodoSortField)cfg->mSortField->currentIndex(); mTodoSortDirection = (eTodoSortDirection)cfg->mSortDirection->currentIndex(); + + mPrintFooter = cfg->mPrintFooter->isChecked(); } } @@ -1427,6 +1453,8 @@ void CalPrintTodos::setSettingsWidget() cfg->mSortDirection->addItem( i18nc( "@option sort in descreasing order", "Descending" ) ); cfg->mSortDirection->setCurrentIndex( mTodoSortDirection ); } + + cfg->mPrintFooter->setChecked( mPrintFooter ); } } @@ -1616,6 +1644,8 @@ void CalPrintTodos::print( QPainter &p, int width, int height ) } } - drawFooter( p, footerBox ); + if ( mPrintFooter ) { + drawFooter( p, footerBox ); + } p.setFont( oldFont ); } diff --git a/korganizer/printing/calprintdefaultplugins.h b/korganizer/printing/calprintdefaultplugins.h index f3adb75..4b41ad3 100644 --- a/korganizer/printing/calprintdefaultplugins.h +++ b/korganizer/printing/calprintdefaultplugins.h @@ -4,6 +4,7 @@ Copyright (c) 1998 Preston Brown <pbrown at kde.org> Copyright (C) 2003 Reinhold Kainhofer <reinhold at kainhofer.com> Copyright (C) 2008 Ron Goodheart <rong.dev at gmail.com> + Copyright (c) 2012 Allen Winter <winter at kde.org> 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 diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui index a9cdbd8..0cd52a9 100644 --- a/korganizer/printing/calprintincidenceconfig_base.ui +++ b/korganizer/printing/calprintincidenceconfig_base.ui @@ -1,96 +1,127 @@ -<ui version="4.0" > - <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> <comment>Configuration page for printing incidences.</comment> <class>CalPrintIncidenceConfig_Base</class> - <widget class="QWidget" name="CalPrintIncidenceConfig_Base" > - <property name="geometry" > + <widget class="QWidget" name="CalPrintIncidenceConfig_Base"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>442</width> - <height>273</height> + <width>490</width> + <height>475</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print incidence options:</span></p></body></html></string> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print incidence options:</span></p></body></html></string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="mComponentsGroup" > - <property name="title" > + <item row="1" column="0"> + <widget class="QGroupBox" name="mIncludeInfoGroup"> + <property name="title"> <string>Include Information</string> </property> - <property name="selectedId" stdset="0" > + <property name="selectedId" stdset="0"> <number>-1</number> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QCheckBox" name="mShowDetails" > - <property name="text" > + <widget class="QCheckBox" name="mShowDetails"> + <property name="text"> <string>Detai&ls (visiblility, secrecy, etc.)</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mShowAttendees" > - <property name="text" > + <widget class="QCheckBox" name="mShowAttendees"> + <property name="text"> <string>&Attendees</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mShowSubitemsNotes" > - <property name="text" > + <widget class="QCheckBox" name="mShowSubitemsNotes"> + <property name="text"> <string>&Notes, subitems</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mShowAttachments" > - <property name="text" > + <widget class="QCheckBox" name="mShowAttachments"> + <property name="text"> <string>Attach&ments</string> </property> </widget> </item> </layout> + <zorder>mShowDetails</zorder> + <zorder>mShowAttendees</zorder> + <zorder>mShowSubitemsNotes</zorder> + <zorder>mShowAttachments</zorder> + <zorder>label</zorder> </widget> </item> - <item row="2" column="0" > - <widget class="QCheckBox" name="mShowNoteLines" > - <property name="whatsThis" > - <string>Draw note lines in empty area</string> - </property> - <property name="text" > - <string>Show note &lines</string> - </property> - </widget> - </item> - <item row="3" column="0" > - <widget class="QCheckBox" name="mColors" > - <property name="whatsThis" > - <string>If you want to use colors to distinguish certain categories on the print, check this option.</string> - </property> - <property name="text" > - <string>&Use colors</string> + <item row="2" column="0"> + <widget class="QGroupBox" name="mGeneralGroup"> + <property name="title"> + <string comment="@title general print settings">General</string> </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="mShowNoteLines"> + <property name="whatsThis"> + <string>Draw note lines in empty area</string> + </property> + <property name="text"> + <string>Show note &lines</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mColors"> + <property name="toolTip"> + <string>Print in color</string> + </property> + <property name="whatsThis"> + <string>If you want to use colors to distinguish certain categories on the print, check this option.</string> + </property> + <property name="text"> + <string>&Use colors</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mPrintFooter"> + <property name="text"> + <string>Print &Footer</string> + </property> + <property name="toolTip"> + <string>Print a datetime footer on each page</string> + </property> + <property name="whatsThis"> + <string>Check this box if you want to print a small footer on each page that contains the date of the print.</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="4" column="0" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="3" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>34</height> + <height>192</height> </size> </property> </spacer> diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index ff08e45..6376ea2 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -1,120 +1,121 @@ -<ui version="4.0" > - <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> <comment>Configuration page for the print day mode.</comment> <class>CalPrintMonthConfig_Base</class> - <widget class="QWidget" name="CalPrintMonthConfig_Base" > - <property name="geometry" > + <widget class="QWidget" name="CalPrintMonthConfig_Base"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>578</width> - <height>428</height> + <height>551</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print month options:</span></p></body></html></string> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print month options:</span></p></body></html></string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="mDateRangeGroup" > - <property name="title" > + <item row="1" column="0"> + <widget class="QGroupBox" name="mDateRangeGroup"> + <property name="title"> <string>Date && Time Range</string> </property> - <layout class="QHBoxLayout" > - <property name="spacing" > + <layout class="QHBoxLayout"> + <property name="spacing"> <number>6</number> </property> - <property name="leftMargin" > + <property name="leftMargin"> <number>9</number> </property> - <property name="topMargin" > + <property name="topMargin"> <number>0</number> </property> - <property name="rightMargin" > + <property name="rightMargin"> <number>9</number> </property> - <property name="bottomMargin" > + <property name="bottomMargin"> <number>9</number> </property> <item> - <widget class="QLabel" name="mFromDateLabel" > - <property name="whatsThis" > - <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> + <widget class="QLabel" name="mFromDateLabel"> + <property name="whatsThis"> + <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> </property> - <property name="text" > + <property name="text"> <string>&Start month:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mToMonth</cstring> </property> </widget> </item> <item> - <widget class="KComboBox" name="mFromMonth" > - <property name="whatsThis" > - <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> + <widget class="KComboBox" name="mFromMonth"> + <property name="whatsThis"> + <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> </property> </widget> </item> <item> - <widget class="KIntSpinBox" name="mFromYear" > - <property name="whatsThis" > - <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> + <widget class="KIntSpinBox" name="mFromYear"> + <property name="whatsThis"> + <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> </property> - <property name="maximum" > + <property name="maximum"> <number>3000</number> </property> - <property name="value" > + <property name="value"> <number>2007</number> </property> </widget> </item> <item> - <widget class="QLabel" name="mToDateLabel" > - <property name="whatsThis" > - <string>When you want to print more months at once, you can define a month range. This option defines the last month to be printed. Use the option <i>Start month</i> to define the first month in this range.</string> + <widget class="QLabel" name="mToDateLabel"> + <property name="whatsThis"> + <string>When you want to print more months at once, you can define a month range. This option defines the last month to be printed. Use the option <i>Start month</i> to define the first month in this range.</string> </property> - <property name="text" > + <property name="text"> <string>&End month:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mToMonth</cstring> </property> </widget> </item> <item> - <widget class="KComboBox" name="mToMonth" > - <property name="whatsThis" > - <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> + <widget class="KComboBox" name="mToMonth"> + <property name="whatsThis"> + <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> </property> </widget> </item> <item> - <widget class="KIntSpinBox" name="mToYear" > - <property name="whatsThis" > - <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> + <widget class="KIntSpinBox" name="mToYear"> + <property name="whatsThis"> + <string>When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the option <i>End month</i> to define the last month in this range.</string> </property> - <property name="maximum" > + <property name="maximum"> <number>3000</number> </property> - <property name="value" > + <property name="value"> <number>2007</number> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>1</width> <height>4</height> @@ -125,31 +126,31 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="2" column="0" > - <widget class="QGroupBox" name="mSecurity" > - <property name="title" > + <item row="2" column="0"> + <widget class="QGroupBox" name="mSecurity"> + <property name="title"> <string>Security Exclusions</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout" > - <property name="topMargin" > + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="topMargin"> <number>0</number> </property> <item> - <widget class="QCheckBox" name="mExcludeConfidential" > - <property name="whatsThis" > + <widget class="QCheckBox" name="mExcludeConfidential"> + <property name="whatsThis"> <string>Check this option to exclude confidential events.</string> </property> - <property name="text" > + <property name="text"> <string>Exclude c&onfidential</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mExcludePrivate" > - <property name="whatsThis" > + <widget class="QCheckBox" name="mExcludePrivate"> + <property name="whatsThis"> <string>Check this option to exclude private events</string> </property> - <property name="text" > + <property name="text"> <string>Exclude pri&vate</string> </property> </widget> @@ -157,101 +158,138 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="3" column="0" > - <widget class="QCheckBox" name="mWeekNumbers" > - <property name="whatsThis" > - <string>Enable this to print week numbers at the left of each row.</string> - </property> - <property name="text" > - <string>Print week &numbers</string> - </property> - </widget> - </item> - <item row="4" column="0" > - <widget class="QCheckBox" name="mRecurDaily" > - <property name="whatsThis" > - <string>With this option it is possible to leave out the daily recurring to-dos and events in the print. They take a lot of space and make the month view needlessly complicated.</string> - </property> - <property name="text" > - <string>Print daily re&curring to-dos and events</string> - </property> - </widget> - </item> - <item row="5" column="0" > - <widget class="QCheckBox" name="mRecurWeekly" > - <property name="whatsThis" > - <string>Similar to "Print daily recurring to-dos and events". Weekly to-dos and events will be omitted when making a print of the selected month.</string> - </property> - <property name="text" > - <string>Print weekl&y recurring to-dos and events</string> - </property> - </widget> - </item> - <item row="6" column="0" > - <widget class="QCheckBox" name="mIncludeTodos" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="whatsThis" > - <string>Check this option if you want to have to-dos on the print, placed by their due date.</string> - </property> - <property name="text" > - <string>Include to-&dos that are due on the printed day(s)</string> - </property> - </widget> - </item> - <item row="7" column="0" > - <widget class="QCheckBox" name="mIncludeDescription" > - <property name="whatsThis" > - <string>Check this option to include the more detailed description for each event.</string> - </property> - <property name="text" > - <string>Include &descriptions</string> - </property> - </widget> - </item> - <item row="8" column="0" > - <widget class="QCheckBox" name="mShowNoteLines" > - <property name="whatsThis" > - <string>Check this option to show note lines.</string> - </property> - <property name="text" > - <string>Show note &lines</string> - </property> - </widget> - </item> - <item row="9" column="0" > - <widget class="QCheckBox" name="mSingleLineLimit" > - <property name="whatsThis" > - <string>Check this option to limit events to a single line.</string> - </property> - <property name="text" > - <string>Limit events in each day to a &single line</string> + <item row="3" column="0"> + <widget class="QGroupBox" name="mIncludeInfoGroup"> + <property name="title"> + <string>Include Information</string> </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="mIncludeDescription"> + <property name="text"> + <string>Include &descriptions</string> + </property> + <property name="toolTip"> + <string>Print item descriptions</string> + </property> + <property name="whatsThis"> + <string>Check this option if you want to see the item descriptions printed.</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mIncludeTodos"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="whatsThis"> + <string>Check this option if you want to have to-dos on the print, placed by their due date.</string> + </property> + <property name="text"> + <string>Include to-&dos that are due on the printed day(s)</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mRecurDaily"> + <property name="whatsThis"> + <string>With this option it is possible to leave out the daily recurring to-dos and events in the print. They take a lot of space and make the month view needlessly complicated.</string> + </property> + <property name="text"> + <string>Include daily re&curring to-dos and events</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mRecurWeekly"> + <property name="whatsThis"> + <string>Similar to "Print daily recurring to-dos and events". Weekly to-dos and events will be omitted when making a print of the selected month.</string> + </property> + <property name="text"> + <string>Include weekl&y recurring to-dos and events</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="10" column="0" > - <widget class="QCheckBox" name="mColors" > - <property name="whatsThis" > - <string>The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used.</string> - </property> - <property name="text" > - <string>&Use colors</string> + <item row="4" column="0"> + <widget class="QGroupBox" name="mGeneralGroup"> + <property name="title"> + <string comment="@title general print settings">General</string> </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="mWeekNumbers"> + <property name="whatsThis"> + <string>Enable this to print week numbers at the left of each row.</string> + </property> + <property name="text"> + <string>Print week &numbers</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mSingleLineLimit"> + <property name="toolTip"> + <string>Print items on one line</string> + </property> + <property name="whatsThis"> + <string>Check this option to limit events to a single line, truncating as necessary to save space.</string> + </property> + <property name="text"> + <string>Limit events in each day to a &single line</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mShowNoteLines"> + <property name="whatsThis"> + <string>Check this option to show note lines.</string> + </property> + <property name="text"> + <string>Show note &lines</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mColors"> + <property name="toolTip"> + <string>Print in color</string> + </property> + <property name="whatsThis"> + <string>If you want to make use of colors you should check this option. The category colors will be used.</string> + </property> + <property name="text"> + <string>&Use colors</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mPrintFooter"> + <property name="text"> + <string>Print &Footer</string> + </property> + <property name="toolTip"> + <string>Print a datetime footer on each page</string> + </property> + <property name="whatsThis"> + <string>Check this box if you want to print a small footer on each page that contains the date of the print.</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="11" column="0" > - <spacer> - <property name="orientation" > + <item row="5" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> - <width>1</width> - <height>1</height> + <width>20</width> + <height>88</height> </size> </property> </spacer> @@ -260,6 +298,11 @@ p, li { white-space: pre-wrap; } </widget> <customwidgets> <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> + <customwidget> <class>KIntSpinBox</class> <extends>QSpinBox</extends> <header>knuminput.h</header> diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 1f1ca88..f37f660 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -4,6 +4,7 @@ Copyright (c) 1998 Preston Brown <pbrown at kde.org> Copyright (C) 2003 Reinhold Kainhofer <reinhold at kainhofer.com> Copyright (C) 2008 Ron Goodheart <rong.dev at gmail.com> + Copyright (c) 2012 Allen Winter <winter at kde.org> 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 @@ -108,7 +109,7 @@ class PrintCellItem : public EventViews::CellItem ******************************************************************/ CalPrintPluginBase::CalPrintPluginBase() - : PrintPlugin(), mUseColors( true ), + : PrintPlugin(), mUseColors( true ), mPrintFooter( true ), mHeaderHeight( -1 ), mSubHeaderHeight( SUBHEADER_HEIGHT ), mFooterHeight( -1 ), mMargin( MARGIN_SIZE ), mPadding( PADDING_SIZE ), mCalSys( 0 ) { @@ -180,6 +181,7 @@ void CalPrintPluginBase::doLoadConfig() mFromDate = group.readEntry( "FromDate", dt ).date(); mToDate = group.readEntry( "ToDate", dt ).date(); mUseColors = group.readEntry( "UseColors", true ); + mPrintFooter = group.readEntry( "PrintFooter", true ); mExcludeConfidential = group.readEntry( "Exclude confidential", true ); mExcludePrivate = group.readEntry( "Exclude private", true ); loadConfig(); @@ -199,6 +201,7 @@ void CalPrintPluginBase::doSaveConfig() dt.setDate( mToDate ); group.writeEntry( "ToDate", dt ); group.writeEntry( "UseColors", mUseColors ); + group.writeEntry( "PrintFooter", mPrintFooter ); group.writeEntry( "Exclude confidential", mExcludeConfidential ); group.writeEntry( "Exclude private", mExcludePrivate ); mConfig->sync(); @@ -225,6 +228,16 @@ void CalPrintPluginBase::setUseColors( bool useColors ) mUseColors = useColors; } +bool CalPrintPluginBase::printFooter() const +{ + return mPrintFooter; +} + +void CalPrintPluginBase::setPrintFooter( bool printFooter ) +{ + mPrintFooter = printFooter; +} + QPrinter::Orientation CalPrintPluginBase::orientation() const { return mPrinter ? mPrinter->orientation() : QPrinter::Portrait; @@ -327,6 +340,10 @@ void CalPrintPluginBase::setSubHeaderHeight( const int height ) int CalPrintPluginBase::footerHeight() const { + if ( !mPrintFooter ) { + return 0; + } + if ( mFooterHeight >= 0 ) { return mFooterHeight; } else if ( orientation() == QPrinter::Portrait ) { @@ -1117,7 +1134,7 @@ void CalPrintPluginBase::drawDayBox( QPainter &p, const QDate &qd, msgRect.width(), msgRect.height() ); p.save(); - p.setPen( Qt::red ); + p.setPen( Qt::red ); //krazy:exclude=qenums we don't allow custom print colors p.drawText( msgRect, Qt::AlignLeft, warningMsg ); p.restore(); } diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index 49250db..9dd0e65 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -4,6 +4,7 @@ Copyright (c) 1998 Preston Brown <pbrown at kde.org> Copyright (C) 2003 Reinhold Kainhofer <reinhold at kainhofer.com> Copyright (C) 2008 Ron Goodheart <rong.dev at gmail.com> + Copyright (c) 2012 Allen Winter <winter at kde.org> 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 @@ -114,9 +115,13 @@ class KORGANIZERPRIVATE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin /** HELPER FUNCTIONS */ public: void setKOrgCoreHelper( KOrg::CoreHelper *helper ); + bool useColors() const; void setUseColors( bool useColors ); + bool printFooter() const; + void setPrintFooter( bool printFooter ); + /** Helper functions to hide the KOrg::CoreHelper */ QColor categoryBgColor( const Incidence::Ptr &incidence ); QTime dayStart(); @@ -624,6 +629,7 @@ class KORGANIZERPRIVATE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin protected: bool mUseColors; + bool mPrintFooter; bool mShowNoteLines; bool mExcludeConfidential; bool mExcludePrivate; diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index 81d83ff..69b68d7 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -1,9 +1,10 @@ -<ui version="4.0" > - <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> <comment>Configuration page for the print day mode.</comment> <class>CalPrintTodoConfig_Base</class> - <widget class="QWidget" name="CalPrintTodoConfig_Base" > - <property name="geometry" > + <widget class="QWidget" name="CalPrintTodoConfig_Base"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -11,94 +12,94 @@ <height>566</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print to-dos options:</span></p></body></html></string> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print to-dos options:</span></p></body></html></string> </property> </widget> </item> - <item row="1" column="0" > - <layout class="QHBoxLayout" > + <item row="1" column="0"> + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="mTitleLabel" > - <property name="text" > + <widget class="QLabel" name="mTitleLabel"> + <property name="text"> <string>&Title:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mTitle</cstring> </property> </widget> </item> <item> - <widget class="KLineEdit" name="mTitle" > - <property name="text" > + <widget class="KLineEdit" name="mTitle"> + <property name="text"> <string>To-do List</string> </property> </widget> </item> </layout> </item> - <item row="2" column="0" > - <widget class="QGroupBox" name="mPrintType" > - <property name="title" > + <item row="2" column="0"> + <widget class="QGroupBox" name="mPrintType"> + <property name="title"> <string>To-dos to Print</string> </property> - <layout class="QGridLayout" > - <property name="topMargin" > + <layout class="QGridLayout"> + <property name="topMargin"> <number>0</number> </property> - <item row="0" column="0" > - <widget class="QRadioButton" name="mPrintAll" > - <property name="text" > + <item row="0" column="0"> + <widget class="QRadioButton" name="mPrintAll"> + <property name="text"> <string>Print &all to-dos</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QRadioButton" name="mPrintUnfinished" > - <property name="enabled" > + <item row="1" column="0"> + <widget class="QRadioButton" name="mPrintUnfinished"> + <property name="enabled"> <bool>true</bool> </property> - <property name="text" > + <property name="text"> <string>Print &unfinished to-dos only</string> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QRadioButton" name="mPrintDueRange" > - <property name="enabled" > + <item row="2" column="0"> + <widget class="QRadioButton" name="mPrintDueRange"> + <property name="enabled"> <bool>true</bool> </property> - <property name="text" > + <property name="text"> <string>Print only to-dos due in the &range:</string> </property> </widget> </item> - <item row="3" column="0" > - <layout class="QHBoxLayout" > - <property name="spacing" > + <item row="3" column="0"> + <layout class="QHBoxLayout"> + <property name="spacing"> <number>6</number> </property> - <property name="margin" > + <property name="margin"> <number>0</number> </property> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>16</width> <height>20</height> @@ -107,30 +108,30 @@ p, li { white-space: pre-wrap; } </spacer> </item> <item> - <widget class="QLabel" name="mFromDateLabel" > - <property name="enabled" > + <widget class="QLabel" name="mFromDateLabel"> + <property name="enabled"> <bool>false</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Maximum" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string>&Start date:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mFromDate</cstring> </property> </widget> </item> <item> - <widget class="KDateComboBox" name="mFromDate" > - <property name="enabled" > + <widget class="KDateComboBox" name="mFromDate"> + <property name="enabled"> <bool>false</bool> </property> - <property name="font" > + <property name="font"> <font> <family>Sans Serif</family> <pointsize>9</pointsize> @@ -141,51 +142,51 @@ p, li { white-space: pre-wrap; } <strikeout>false</strikeout> </font> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="whatsThis" > - <string>If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date.</string> + <property name="whatsThis"> + <string>If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date.</string> </property> <item> - <property name="text" > + <property name="text"> <string>2009-01-19</string> </property> </item> </widget> </item> <item> - <widget class="QLabel" name="mToDateLabel" > - <property name="enabled" > + <widget class="QLabel" name="mToDateLabel"> + <property name="enabled"> <bool>false</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Maximum" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string>&End date:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mToDate</cstring> </property> </widget> </item> <item> - <widget class="KDateComboBox" name="mToDate" > - <property name="enabled" > + <widget class="KDateComboBox" name="mToDate"> + <property name="enabled"> <bool>false</bool> </property> - <property name="focusPolicy" > + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="whatsThis" > - <string>If you want to print more days at once, you can define a range of dates with this option and the <i>Start date</i> option. This option is used to define the end date.</string> + <property name="whatsThis"> + <string>If you want to print more days at once, you can define a range of dates with this option and the <i>Start date</i> option. This option is used to define the end date.</string> </property> <item> - <property name="text" > + <property name="text"> <string>2009-01-19</string> </property> </item> @@ -193,13 +194,13 @@ p, li { white-space: pre-wrap; } </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>128</width> <height>20</height> @@ -212,160 +213,131 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="3" column="0" > - <widget class="QGroupBox" name="includeInfoBox" > - <property name="title" > - <string>Include Information</string> - </property> - <property name="checkable" > - <bool>false</bool> + <item row="3" column="0"> + <widget class="QGroupBox" name="mSecurity"> + <property name="title"> + <string>Security Exclusions</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout" > - <property name="topMargin" > + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <property name="topMargin"> <number>0</number> </property> <item> - <widget class="QCheckBox" name="mDescription" > - <property name="text" > - <string>&Description</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="mPriority" > - <property name="text" > - <string>&Priority</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="mDueDate" > - <property name="text" > - <string>Due date</string> - </property> - <property name="shortcut" > - <string/> + <widget class="QCheckBox" name="mExcludeConfidential"> + <property name="whatsThis"> + <string>Check this option to exclude confidential events.</string> </property> - <property name="checked" > - <bool>true</bool> + <property name="text"> + <string>Exclude c&onfidential</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mPercentComplete" > - <property name="text" > - <string>Per&centage completed</string> + <widget class="QCheckBox" name="mExcludePrivate"> + <property name="whatsThis"> + <string>Check this option to exclude private events</string> </property> - <property name="checked" > - <bool>true</bool> + <property name="text"> + <string>Exclude pri&vate</string> </property> </widget> </item> </layout> - <zorder>mDescription</zorder> - <zorder>mDueDate</zorder> - <zorder>mPercentComplete</zorder> - <zorder>mPriority</zorder> </widget> </item> - <item row="4" column="0" > - <widget class="QGroupBox" name="otherOptionsBox" > - <property name="title" > - <string>Other Options</string> + <item row="4" column="0"> + <widget class="QGroupBox" name="includeInfoBox"> + <property name="title"> + <string>Include Information</string> + </property> + <property name="checkable"> + <bool>false</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="topMargin" > + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="topMargin"> <number>0</number> </property> <item> - <widget class="QCheckBox" name="mConnectSubTodos" > - <property name="text" > - <string>Co&nnect sub-to-dos with its parent</string> + <widget class="QCheckBox" name="mDescription"> + <property name="text"> + <string>Include &descriptions</string> </property> - <property name="checked" > - <bool>true</bool> + <property name="toolTip"> + <string>Print item descriptions</string> + </property> + <property name="whatsThis"> + <string>Check this option if you want to see the item descriptions printed.</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mStrikeOutCompleted" > - <property name="text" > - <string>Strike &out completed to-do summaries</string> + <widget class="QCheckBox" name="mPriority"> + <property name="text"> + <string>&Priority</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> - </layout> - </widget> - </item> - <item row="5" column="0" > - <widget class="QGroupBox" name="mSecurity" > - <property name="title" > - <string>Security Exclusions</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_4" > - <property name="topMargin" > - <number>0</number> - </property> <item> - <widget class="QCheckBox" name="mExcludeConfidential" > - <property name="whatsThis" > - <string>Check this option to exclude confidential events.</string> + <widget class="QCheckBox" name="mDueDate"> + <property name="text"> + <string>Due date</string> </property> - <property name="text" > - <string>Exclude c&onfidential</string> + <property name="shortcut"> + <string/> + </property> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mExcludePrivate" > - <property name="whatsThis" > - <string>Check this option to exclude private events</string> + <widget class="QCheckBox" name="mPercentComplete"> + <property name="text"> + <string>Per&centage completed</string> </property> - <property name="text" > - <string>Exclude pri&vate</string> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> </layout> + <zorder>mDescription</zorder> + <zorder>mDueDate</zorder> + <zorder>mPercentComplete</zorder> + <zorder>mPriority</zorder> </widget> </item> - <item row="6" column="0" > - <widget class="QGroupBox" name="sortingOptionsBox" > - <property name="title" > + <item row="5" column="0"> + <widget class="QGroupBox" name="sortingOptionsBox"> + <property name="title"> <string>Sorting Options</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout_2" > - <property name="topMargin" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="topMargin"> <number>0</number> </property> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="sortFieldLabel" > - <property name="enabled" > + <widget class="QLabel" name="sortFieldLabel"> + <property name="enabled"> <bool>true</bool> </property> - <property name="text" > + <property name="text"> <string>Sort field:</string> </property> </widget> </item> <item> - <widget class="KComboBox" name="mSortField" > - <property name="enabled" > + <widget class="KComboBox" name="mSortField"> + <property name="enabled"> <bool>true</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>1</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -375,24 +347,24 @@ p, li { white-space: pre-wrap; } </layout> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="sortDirectionLabel" > - <property name="enabled" > + <widget class="QLabel" name="sortDirectionLabel"> + <property name="enabled"> <bool>true</bool> </property> - <property name="text" > + <property name="text"> <string>Sort direction:</string> </property> </widget> </item> <item> - <widget class="KComboBox" name="mSortDirection" > - <property name="enabled" > + <widget class="KComboBox" name="mSortDirection"> + <property name="enabled"> <bool>true</bool> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>1</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -404,12 +376,54 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="7" column="0" > - <spacer name="verticalSpacer" > - <property name="orientation" > + <item row="6" column="0"> + <widget class="QGroupBox" name="mGeneralGroup"> + <property name="title"> + <string comment="@title general print settings">General</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="mConnectSubTodos"> + <property name="text"> + <string>Co&nnect sub-to-dos with its parent</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mStrikeOutCompleted"> + <property name="text"> + <string>Strike &out completed to-do summaries</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mPrintFooter"> + <property name="text"> + <string>Print &Footer</string> + </property> + <property name="toolTip"> + <string>Print a datetime footer on each page</string> + </property> + <property name="whatsThis"> + <string>Check this box if you want to print a small footer on each page that contains the date of the print.</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="7" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>7</height> @@ -422,9 +436,19 @@ p, li { white-space: pre-wrap; } <customwidgets> <customwidget> <class>KDateComboBox</class> - <extends>QComboBox</extends> + <extends>KComboBox</extends> <header>kdatecombobox.h</header> </customwidget> + <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> + <customwidget> + <class>KLineEdit</class> + <extends>QLineEdit</extends> + <header>klineedit.h</header> + </customwidget> </customwidgets> <tabstops> <tabstop>mTitle</tabstop> @@ -450,11 +474,11 @@ p, li { white-space: pre-wrap; } <receiver>mFromDateLabel</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> @@ -466,11 +490,11 @@ p, li { white-space: pre-wrap; } <receiver>mToDate</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> @@ -482,11 +506,11 @@ p, li { white-space: pre-wrap; } <receiver>mToDateLabel</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> @@ -498,11 +522,11 @@ p, li { white-space: pre-wrap; } <receiver>mFromDate</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index b59dfe5..ce3a72d 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -1,57 +1,58 @@ -<ui version="4.0" > - <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Reinhold Kainhofer <reinhold at kainhofer.com></author> <comment>Configuration page for the print week mode.</comment> <class>CalPrintWeekConfig_Base</class> - <widget class="QWidget" name="CalPrintWeekConfig_Base" > - <property name="geometry" > + <widget class="QWidget" name="CalPrintWeekConfig_Base"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>684</width> - <height>503</height> + <height>615</height> </rect> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string><html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print week options:</span></p></body></html></string> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Print week options:</span></p></body></html></string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QGroupBox" name="mDateRangeGroup" > - <property name="title" > + <item> + <widget class="QGroupBox" name="mDateRangeGroup"> + <property name="title"> <string>Date && Time Range</string> </property> - <layout class="QGridLayout" > - <property name="leftMargin" > + <layout class="QGridLayout"> + <property name="leftMargin"> <number>9</number> </property> - <property name="topMargin" > + <property name="topMargin"> <number>0</number> </property> - <property name="rightMargin" > + <property name="rightMargin"> <number>9</number> </property> - <property name="bottomMargin" > + <property name="bottomMargin"> <number>9</number> </property> - <property name="spacing" > + <property name="spacing"> <number>6</number> </property> - <item row="0" column="4" > + <item row="0" column="4"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>16</width> <height>21</height> @@ -59,56 +60,62 @@ p, li { white-space: pre-wrap; } </property> </spacer> </item> - <item row="0" column="0" > - <widget class="QLabel" name="mFromDateLabel" > - <property name="whatsThis" > - <string>Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange.</string> + <item row="0" column="0"> + <widget class="QLabel" name="mFromDateLabel"> + <property name="toolTip"> + <string>Starting date for the print</string> </property> - <property name="text" > + <property name="whatsThis"> + <string>Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange.</string> + </property> + <property name="text"> <string>&Start date:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mFromDate</cstring> </property> </widget> </item> - <item row="0" column="1" > - <widget class="KDateComboBox" name="mFromDate" > - <property name="focusPolicy" > + <item row="0" column="1"> + <widget class="KDateComboBox" name="mFromDate"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="whatsThis" > - <string>Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange.</string> + <property name="toolTip"> + <string>Starting date for the print</string> + </property> + <property name="whatsThis"> + <string>Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange.</string> </property> <item> - <property name="text" > + <property name="text"> <string>2009-01-19</string> </property> </item> </widget> </item> - <item row="1" column="2" > - <widget class="QLabel" name="mToTimeLabel" > - <property name="whatsThis" > + <item row="1" column="2"> + <widget class="QLabel" name="mToTimeLabel"> + <property name="whatsThis"> <string>All events which start later than the given time will not be printed.</string> </property> - <property name="text" > + <property name="text"> <string>End ti&me:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mToTime</cstring> </property> </widget> </item> - <item row="1" column="4" > + <item row="1" column="4"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>110</width> <height>20</height> @@ -116,77 +123,77 @@ p, li { white-space: pre-wrap; } </property> </spacer> </item> - <item row="1" column="3" > - <widget class="QTimeEdit" name="mToTime" > - <property name="whatsThis" > + <item row="1" column="3"> + <widget class="QTimeEdit" name="mToTime"> + <property name="whatsThis"> <string>All events which start later than the given time will not be printed.</string> </property> - <property name="displayFormat" > - <string>hh:mm</string> - </property> - <property name="time" > + <property name="time"> <time> <hour>18</hour> <minute>0</minute> <second>0</second> </time> </property> + <property name="displayFormat"> + <string>hh:mm</string> + </property> </widget> </item> - <item row="0" column="2" > - <widget class="QLabel" name="mFromTimeLabel" > - <property name="whatsThis" > + <item row="0" column="2"> + <widget class="QLabel" name="mFromTimeLabel"> + <property name="whatsThis"> <string>All events which start earlier than the given time will not be printed.</string> </property> - <property name="text" > + <property name="text"> <string>Start &time:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mFromTime</cstring> </property> </widget> </item> - <item row="0" column="3" > - <widget class="QTimeEdit" name="mFromTime" > - <property name="whatsThis" > + <item row="0" column="3"> + <widget class="QTimeEdit" name="mFromTime"> + <property name="whatsThis"> <string>All events which start earlier than the given time will not be printed.</string> </property> - <property name="displayFormat" > - <string>hh:mm</string> - </property> - <property name="time" > + <property name="time"> <time> <hour>8</hour> <minute>0</minute> <second>0</second> </time> </property> + <property name="displayFormat"> + <string>hh:mm</string> + </property> </widget> </item> - <item row="1" column="1" > - <widget class="KDateComboBox" name="mToDate" > - <property name="focusPolicy" > + <item row="1" column="1"> + <widget class="KDateComboBox" name="mToDate"> + <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="whatsThis" > - <string>Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange.</string> + <property name="whatsThis"> + <string>Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange.</string> </property> <item> - <property name="text" > + <property name="text"> <string>2009-01-19</string> </property> </item> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="mToDateLabel" > - <property name="whatsThis" > - <string>Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange.</string> + <item row="1" column="0"> + <widget class="QLabel" name="mToDateLabel"> + <property name="whatsThis"> + <string>Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange.</string> </property> - <property name="text" > + <property name="text"> <string>&End date:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>mToDate</cstring> </property> </widget> @@ -194,56 +201,56 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="2" column="0" > - <widget class="QGroupBox" name="mPrintType" > - <property name="title" > + <item> + <widget class="QGroupBox" name="mPrintType"> + <property name="title"> <string>Print Layout</string> </property> - <layout class="QVBoxLayout" > - <property name="spacing" > + <layout class="QVBoxLayout"> + <property name="spacing"> <number>6</number> </property> - <property name="leftMargin" > + <property name="leftMargin"> <number>9</number> </property> - <property name="topMargin" > + <property name="topMargin"> <number>0</number> </property> - <property name="rightMargin" > + <property name="rightMargin"> <number>9</number> </property> - <property name="bottomMargin" > + <property name="bottomMargin"> <number>9</number> </property> <item> - <widget class="QRadioButton" name="mPrintTypeFilofax" > - <property name="whatsThis" > + <widget class="QRadioButton" name="mPrintTypeFilofax"> + <property name="whatsThis"> <string>The Filofax view prints one week per page, so all days have a large surface.</string> </property> - <property name="text" > + <property name="text"> <string>Print as &Filofax page</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QRadioButton" name="mPrintTypeTimetable" > - <property name="whatsThis" > - <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>.</string> + <widget class="QRadioButton" name="mPrintTypeTimetable"> + <property name="whatsThis"> + <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>.</string> </property> - <property name="text" > + <property name="text"> <string>Print as &timetable view</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="mPrintTypeSplitWeek" > - <property name="whatsThis" > + <widget class="QRadioButton" name="mPrintTypeSplitWeek"> + <property name="whatsThis"> <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.</string> </property> - <property name="text" > + <property name="text"> <string>Print as split week view</string> </property> </widget> @@ -251,31 +258,31 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="3" column="0" > - <widget class="QGroupBox" name="mSecurity" > - <property name="title" > + <item> + <widget class="QGroupBox" name="mSecurity"> + <property name="title"> <string>Security Exclusions</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout" > - <property name="topMargin" > + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="topMargin"> <number>0</number> </property> <item> - <widget class="QCheckBox" name="mExcludeConfidential" > - <property name="whatsThis" > + <widget class="QCheckBox" name="mExcludeConfidential"> + <property name="whatsThis"> <string>Check this option to exclude confidential events.</string> </property> - <property name="text" > + <property name="text"> <string>Exclude c&onfidential</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="mExcludePrivate" > - <property name="whatsThis" > + <widget class="QCheckBox" name="mExcludePrivate"> + <property name="whatsThis"> <string>Check this option to exclude private events</string> </property> - <property name="text" > + <property name="text"> <string>Exclude pri&vate</string> </property> </widget> @@ -283,81 +290,118 @@ p, li { white-space: pre-wrap; } </layout> </widget> </item> - <item row="4" column="0" > - <widget class="QCheckBox" name="mExcludeTime" > - <property name="whatsThis" > - <string>Check this option to exclude the time in description box</string> - </property> - <property name="text" > - <string>Exclude t&ime from timetable detail display items</string> - </property> - </widget> - </item> - <item row="5" column="0" > - <widget class="QCheckBox" name="mIncludeTodos" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="whatsThis" > - <string>Check this option if you want to have to-dos on the print, placed by their due date.</string> - </property> - <property name="text" > - <string>Include to-&dos that are due on the printed day(s)</string> - </property> - </widget> - </item> - <item row="6" column="0" > - <widget class="QCheckBox" name="mIncludeDescription" > - <property name="whatsThis" > - <string>Check this option to include the more detailed description for each event.</string> - </property> - <property name="text" > - <string>Include &descriptions</string> - </property> - </widget> - </item> - <item row="7" column="0" > - <widget class="QCheckBox" name="mShowNoteLines" > - <property name="whatsThis" > - <string>Check this option to draw note lines.</string> - </property> - <property name="text" > - <string>Show note &lines in Filofax layout</string> - </property> - </widget> - </item> - <item row="8" column="0" > - <widget class="QCheckBox" name="mSingleLineLimit" > - <property name="whatsThis" > - <string>Check this option to limit events to a single line.</string> - </property> - <property name="text" > - <string>Limit events in each day to a &single line</string> + <item> + <widget class="QGroupBox" name="mIncludeInfoGroup"> + <property name="title"> + <string>Include Information</string> </property> + <layout class="QGridLayout" name="includeInfoLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="mIncludeDescription"> + <property name="text"> + <string>Include &descriptions</string> + </property> + <property name="toolTip"> + <string>Print item descriptions</string> + </property> + <property name="whatsThis"> + <string>Check this option if you want to see the item descriptions printed.</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="mIncludeTodos"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="whatsThis"> + <string>Check this option if you want to have to-dos on the print, placed by their due date.</string> + </property> + <property name="text"> + <string>Include to-&dos that are due on the printed day(s)</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="mExcludeTime"> + <property name="whatsThis"> + <string>Check this option to exclude the time in description box</string> + </property> + <property name="text"> + <string>Exclude t&ime from timetable detail display items</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="9" column="0" > - <widget class="QCheckBox" name="mColors" > - <property name="whatsThis" > - <string>The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used.</string> - </property> - <property name="text" > - <string>&Use colors</string> + <item> + <widget class="QGroupBox" name="mGeneralGroup"> + <property name="title"> + <string comment="@title general print settings">General</string> </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="mSingleLineLimit"> + <property name="toolTip"> + <string>Print items on one line</string> + </property> + <property name="whatsThis"> + <string>Check this option to limit events to a single line, truncating as necessary to save space.</string> + </property> + <property name="text"> + <string>Limit events in each day to a &single line</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mShowNoteLines"> + <property name="whatsThis"> + <string>Check this option to draw note lines.</string> + </property> + <property name="text"> + <string>Show note &lines in Filofax layout</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mColors"> + <property name="toolTip"> + <string>Print in color</string> + </property> + <property name="whatsThis"> + <string>The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used.</string> + </property> + <property name="text"> + <string>&Use colors</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="mPrintFooter"> + <property name="text"> + <string>Print &Footer</string> + </property> + <property name="toolTip"> + <string>Print a datetime footer on each page</string> + </property> + <property name="whatsThis"> + <string>Check this box if you want to print a small footer on each page that contains the date of the print.</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="10" column="0" > - <spacer> - <property name="orientation" > + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> - <width>386</width> - <height>16</height> + <width>20</width> + <height>53</height> </size> </property> </spacer> @@ -367,9 +411,14 @@ p, li { white-space: pre-wrap; } <customwidgets> <customwidget> <class>KDateComboBox</class> - <extends>QComboBox</extends> + <extends>KComboBox</extends> <header>kdatecombobox.h</header> </customwidget> + <customwidget> + <class>KComboBox</class> + <extends>QComboBox</extends> + <header>kcombobox.h</header> + </customwidget> </customwidgets> <tabstops> <tabstop>mFromDate</tabstop>
