Skip to content

GitLab

Commit 5f27d019 authored by Glen Ditchfield's avatar Glen Ditchfield 🐛
Browse files

Clean up the UI files 

Simplify layouts, use fewer distinct strings, make tool tips and
"Whats this" more consistent.
parent a8598bbf
Pipeline #68146 passed with stage
in 6 minutes and 40 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 633 deletions
src/printing/calprintdayconfig_base.ui
View file @ 5f27d019
......@@ -4,27 +4,10 @@
<comment>Configuration page for the print day mode.</comment>
<class>CalPrintDayConfig_Base</class>
<widget class="QWidget" name="CalPrintDayConfig_Base">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>503</width>
<height>644</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
......@@ -40,12 +23,12 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string>Date &amp;&amp; Time Range</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="topMargin">
<number>0</number>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mFromDateLabel">
<property name="toolTip">
<string>Starting date for the print</string>
</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 &lt;i&gt;End date&lt;/i&gt; option. This option is used to define the start date.</string>
</property>
......@@ -62,6 +45,9 @@ p, li { white-space: pre-wrap; }
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Starting date for the print</string>
</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 &lt;i&gt;End date&lt;/i&gt; option. This option is used to define the start date.</string>
</property>
......@@ -74,8 +60,11 @@ p, li { white-space: pre-wrap; }
</item>
<item row="0" column="2">
<widget class="QLabel" name="mFromTimeLabel">
<property name="toolTip">
<string>Starting time for the print</string>
</property>
<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 &lt;i&gt;End time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
<string>It is possible to print only those events which are inside a given time range. With this time selection box you can define the start of this time range. The end time should be defined with the &lt;i&gt;End time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
</property>
<property name="text">
<string>Start &amp;time:</string>
......@@ -87,8 +76,11 @@ p, li { white-space: pre-wrap; }
</item>
<item row="0" column="3">
<widget class="QTimeEdit" name="mFromTime">
<property name="toolTip">
<string>Starting time for the print</string>
</property>
<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 &lt;i&gt;End time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
<string>It is possible to print only those events which are inside a given time range. With this time selection box you can define the start of this time range. The end time should be defined with the &lt;i&gt;End time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
</property>
<property name="displayFormat">
<string>hh:mm</string>
......@@ -110,16 +102,13 @@ p, li { white-space: pre-wrap; }
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>97</width>
<height>24</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mToDateLabel">
<property name="toolTip">
<string>Ending date for the print</string>
</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 &lt;i&gt;Start date&lt;/i&gt; option. This option is used to define the end date.</string>
</property>
......@@ -136,6 +125,9 @@ p, li { white-space: pre-wrap; }
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Ending date for the print</string>
</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 &lt;i&gt;Start date&lt;/i&gt; option. This option is used to define the end date.</string>
</property>
......@@ -148,8 +140,11 @@ p, li { white-space: pre-wrap; }
</item>
<item row="1" column="2">
<widget class="QLabel" name="mToTimeLabel">
<property name="toolTip">
<string>Ending time for the print</string>
</property>
<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 &lt;i&gt;Start time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
<string>It is possible to print only those events which are inside a given time range. With this time selection box you can define the end of this time range. The start time should be defined with the &lt;i&gt;Start time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
</property>
<property name="text">
<string>End ti&amp;me:</string>
......@@ -161,8 +156,11 @@ p, li { white-space: pre-wrap; }
</item>
<item row="1" column="3">
<widget class="QTimeEdit" name="mToTime">
<property name="toolTip">
<string>Ending time for the print</string>
</property>
<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 &lt;i&gt;Start time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
<string>It is possible to print only those events which are inside a given time range. With this time selection box you can define the end of this time range. The start time should be defined with the &lt;i&gt;Start time&lt;/i&gt; option. Note you can automatically modify these settings if you check &lt;i&gt;Extend time range to include all events&lt;/i&gt;.</string>
</property>
<property name="displayFormat">
<string>hh:mm</string>
......@@ -184,17 +182,11 @@ p, li { white-space: pre-wrap; }
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>97</width>
<height>24</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="5">
<widget class="QCheckBox" name="mIncludeAllEvents">
<property name="whatsThis">
<property name="toolTip">
<string>Check this option to automatically determine the required time range, so all events will be shown.</string>
</property>
<property name="text">
......@@ -210,13 +202,10 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string>Print Layout</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0">
<layout class="QVBoxLayout">
<item>
<widget class="QRadioButton" name="mPrintTypeFilofax">
<property name="whatsThis">
<property name="toolTip">
<string>The Filofax format prints the information for the days selected without a timeline.</string>
</property>
<property name="text">
......@@ -224,30 +213,24 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="0">
<item>
<widget class="QRadioButton" name="mPrintTypeTimetable">
<property name="whatsThis">
<string>The timetable print view has the times to the left of the page</string>
<property name="toolTip">
<string>The timetable print view has the times to the left of the page.</string>
</property>
<property name="text">
<string>Print as timeta&amp;ble view, one page per day</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<item>
<widget class="QRadioButton" name="mPrintTypeSingleTimetable">
<property name="whatsThis">
<string>The timetable print view has the times to the left of the page, all days are printed as columns in one big timetable.</string>
<property name="toolTip">
<string>The timetable print view has the times to the left of the page. All days are printed as columns in one big timetable.</string>
</property>
<property name="text">
<string>Print as timetable view, all da&amp;ys on a single page</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
......@@ -259,13 +242,10 @@ p, li { white-space: pre-wrap; }
<string>Security Exclusions</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<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>
<property name="toolTip">
<string>Check this option to exclude items that have their Access level set to &#8220;Confidential&#8221;</string>
</property>
<property name="text">
<string>Exclude c&amp;onfidential</string>
......@@ -274,8 +254,8 @@ p, li { white-space: pre-wrap; }
</item>
<item>
<widget class="QCheckBox" name="mExcludePrivate">
<property name="whatsThis">
<string>Check this option to exclude private events</string>
<property name="toolTip">
<string>Check this option to exclude items that have their Access level set to &#8220;Private&#8221;</string>
</property>
<property name="text">
<string>Exclude pri&amp;vate</string>
......@@ -290,53 +270,56 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string>Include Information</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mIncludeTodos">
<property name="enabled">
<bool>false</bool>
<layout class="QGridLayout" name="includeInfoLayout">
<item row="0" column="0">
<widget class="QCheckBox" name="mIncludeDescription">
<property name="toolTip">
<string>Print item descriptions</string>
</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>
<string>Check this option if you want to see the item descriptions printed.</string>
</property>
<property name="text">
<string>Include to-&amp;dos that are due on the printed day(s)</string>
<string>&amp;Descriptions</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mExcludeTime">
<item row="0" column="1">
<widget class="QCheckBox" name="mIncludeCategories">
<property name="toolTip">
<string>Print item tags</string>
</property>
<property name="whatsThis">
<string>Check this option to exclude the time in description box</string>
<string>Check this option if you want to see the item tags printed.</string>
</property>
<property name="text">
<string>Exclude t&amp;ime from timetable detail display items</string>
<string>Ta&amp;gs</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="mIncludeDescription">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mIncludeTodos">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Print item descriptions</string>
<string>Print to-dos due within the specified date range</string>
</property>
<property name="whatsThis">
<string>Check this option if you want to see the item descriptions printed.</string>
<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>&amp;Descriptions</string>
<string>Include to-&amp;dos that are due on the printed day(s)</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="mIncludeCategories">
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mExcludeTime">
<property name="toolTip">
<string>Print item tags</string>
</property>
<property name="whatsThis">
<string>Check this option if you want to see the item tags printed.</string>
<string>Check this option to exclude the time in description box</string>
</property>
<property name="text">
<string>Ta&amp;gs</string>
<string>Exclude t&amp;ime from timetable detail display items</string>
</property>
</widget>
</item>
......@@ -348,8 +331,8 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string comment="@title general print settings">General</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QVBoxLayout" name="generalLayout">
<item>
<widget class="QCheckBox" name="mSingleLineLimit">
<property name="toolTip">
<string>Print items on one line</string>
......@@ -362,39 +345,39 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="0">
<item>
<widget class="QCheckBox" name="mShowNoteLines">
<property name="whatsThis">
<string>Check this option to draw note lines </string>
<property name="toolTip">
<string>Check this option to draw note lines in empty areas.</string>
</property>
<property name="text">
<string>Show note &amp;lines</string>
<string>Show note &amp;lines in Filofax layout</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="mPrintFooter">
<item>
<widget class="QCheckBox" name="mColors">
<property name="toolTip">
<string>Print a datetime footer on each page</string>
<string>Print in color</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>
<string>If you want to use colors to distinguish certain tags in the printed output, check this option.</string>
</property>
<property name="text">
<string>Print &amp;Footer</string>
<string>&amp;Use colors</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="mColors">
<item>
<widget class="QCheckBox" name="mPrintFooter">
<property name="toolTip">
<string>Print in color</string>
<string>Print a datetime footer on each page</string>
</property>
<property name="whatsThis">
<string>If you want to use colors to distinguish certain tags in the printed output, check this option.</string>
<string>Check this box if you want to print a small footer on each page that contains the date of the print.</string>
</property>
<property name="text">
<string>&amp;Use colors</string>
<string>Print &amp;Footer</string>
</property>
</widget>
</item>
......@@ -406,12 +389,6 @@ p, li { white-space: pre-wrap; }
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>73</height>
</size>
</property>
</spacer>
</item>
</layout>
......@@ -423,20 +400,6 @@ p, li { white-space: pre-wrap; }
<header>kdatecombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mFromDate</tabstop>
<tabstop>mFromTime</tabstop>
<tabstop>mToDate</tabstop>
<tabstop>mToTime</tabstop>
<tabstop>mIncludeAllEvents</tabstop>
<tabstop>mPrintTypeFilofax</tabstop>
<tabstop>mPrintTypeTimetable</tabstop>
<tabstop>mIncludeTodos</tabstop>
<tabstop>mIncludeDescription</tabstop>
<tabstop>mShowNoteLines</tabstop>
<tabstop>mSingleLineLimit</tabstop>
<tabstop>mColors</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
src/printing/calprintincidenceconfig_base.ui
View file @ 5f27d019
......@@ -4,28 +4,11 @@
<comment>Configuration page for printing incidences.</comment>
<class>CalPrintIncidenceConfig_Base</class>
<widget class="QWidget" name="CalPrintIncidenceConfig_Base">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>490</width>
<height>475</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<layout class="QVBoxLayout">
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
......@@ -35,7 +18,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="0">
<item>
<widget class="QGroupBox" name="mIncludeInfoGroup">
<property name="title">
<string>Include Information</string>
......@@ -99,7 +82,7 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<item row="2" column="0">
<item>
<widget class="QGroupBox" name="mGeneralGroup">
<property name="title">
<string comment="@title general print settings">General</string>
......@@ -108,7 +91,7 @@ p, li { white-space: pre-wrap; }
<item>
<widget class="QCheckBox" name="mShowNoteLines">
<property name="toolTip">
<string>Draw note lines in empty area</string>
<string>Check this option to draw note lines in empty areas.</string>
</property>
<property name="whatsThis">
<string>Check this box if you want to draw note lines in the empty area of the print. This is useful if you want to hand-write notes on this print-out.</string>
......@@ -147,29 +130,15 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<item row="3" column="0">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>192</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<tabstops>
<tabstop>mShowDetails</tabstop>
<tabstop>mShowAttendees</tabstop>
<tabstop>mShowSubitemsNotes</tabstop>
<tabstop>mShowAttachments</tabstop>
<tabstop>mShowNoteLines</tabstop>
<tabstop>mColors</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
src/printing/calprintjournalconfig_base.ui
View file @ 5f27d019
......@@ -4,30 +4,10 @@
<comment>Configuration page for the print journal mode.</comment>
<class>CalPrintJournalConfig_Base</class>
<widget class="QWidget" name="CalPrintJournalConfig_Base">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>507</width>
<height>311</height>
</rect>
</property>
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
......@@ -69,21 +49,6 @@ p, li { white-space: pre-wrap; }
</item>
<item>
<layout class="QHBoxLayout" name="mDateRangeLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
......@@ -94,14 +59,20 @@ p, li { white-space: pre-wrap; }
</property>
<property name="sizeHint" stdset="0">
<size>
<width>15</width>
<height>20</height>
<width>24</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="mFromDateLabel">
<property name="toolTip">
<string>Starting date for the print</string>
</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 &lt;i&gt;End date&lt;/i&gt; option. This option is used to define the start date.</string>
</property>
<property name="text">
<string>&amp;Start date:</string>
</property>
......@@ -115,10 +86,22 @@ p, li { white-space: pre-wrap; }
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Starting date for the print</string>
</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 &lt;i&gt;End date&lt;/i&gt; option. This option is used to define the start date.</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="mToDateLabel">
<property name="toolTip">
<string>Ending date for the print</string>
</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 &lt;i&gt;Start date&lt;/i&gt; option. This option is used to define the end date.</string>
</property>
<property name="text">
<string>&amp;End date:</string>
</property>
......@@ -132,6 +115,12 @@ p, li { white-space: pre-wrap; }
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Ending date for the print</string>
</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 &lt;i&gt;Start date&lt;/i&gt; option. This option is used to define the end date.</string>
</property>
</widget>
</item>
<item>
......@@ -142,12 +131,6 @@ p, li { white-space: pre-wrap; }
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>324</width>
<height>21</height>
</size>