[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Re: [patch] partial solution for bug#69261
From: Brad Hards <bhards () bigpond ! net ! au>
Date: 2004-04-29 8:02:56
Message-ID: 200404291802.56961.bhards () bigpond ! net ! au
[Download RAW message or body]
On Thu, 29 Apr 2004 07:35 am, Thomas Zander wrote:
> The comment 'typically th action will be...' seems strange to me; those
> words are used most to describe a group of situations where the action
> differs in the different situations.
> We are talking about a very limited set of situations (next transition and
> next slide) where going to the next sheet is defined.
> In other words; could you be more specific?
Unfortunately not - it is configurable, so it can be done using other keys.
If there is a better way to express it, I'd be happy for you to propose the
text.
> Second; I think its better to have one whatsthis text for the buttongroup
> which both buttons can be part of. I suggest using <li></li> tags to show
> both items separately.
Done.
Is this OK now?
Brad
Index: pgconfdia.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/pgconfdia.cc,v
retrieving revision 1.67
diff -u -4 -p -r1.67 pgconfdia.cc
--- pgconfdia.cc 3 Jan 2004 06:58:45 -0000 1.67
+++ pgconfdia.cc 29 Apr 2004 08:01:44 -0000
@@ -31,9 +31,12 @@
#include <qlayout.h>
#include <qlistview.h>
#include <qpen.h>
#include <qpushbutton.h>
+#include <qradiobutton.h>
#include <qvaluelist.h>
+#include <qvbuttongroup.h>
+#include <qwhatsthis.h>
#include <kcolorbutton.h>
#include <kglobal.h>
#include <klocale.h>
@@ -54,38 +57,87 @@ PgConfDia::PgConfDia( QWidget* parent, K
void PgConfDia::setupPageGeneral()
{
QFrame* generalPage = addPage( i18n("&General") );
+ QWhatsThis::add( generalPage, i18n("<p>This dialog allows you to configure how \
the slideshow " + "will be displayed, including \
whether the slides are " + "automatically \
sequenced or manually controlled, and also " + \
"allows you to configure a <em>drawing pen</em> that can " + \
"be used during the display of the presentation to add " + \
"additional information or to emphasise particular points.</p>") );
QVBoxLayout *generalLayout = new QVBoxLayout( generalPage, \
KDialog::marginHint(), KDialog::spacingHint() ); generalLayout->setAutoAdd( true );
- manualSwitch = new QCheckBox( i18n( "&Manual switch to next step" ), generalPage \
);
- manualSwitch->setChecked( m_doc->spManualSwitch() );
- connect( manualSwitch, SIGNAL( toggled(bool) ), this, SLOT( \
manualSwitchToggled(bool) ) );
-
- infiniteLoop = new QCheckBox( i18n( "&Infinite loop" ), generalPage );
- infiniteLoop->setChecked( m_doc->spInfiniteLoop() );
- infiniteLoop->setEnabled( !m_doc->spManualSwitch() );
-
- presentationDuration = new QCheckBox( i18n( "Show presentation &duration" ), \
generalPage );
- presentationDuration->setChecked( m_doc->presentationDuration() );
-
- new QLabel( i18n("Speed:"), generalPage );
+ QVButtonGroup *switchGroup = new QVButtonGroup( i18n("&Transition type"), \
generalPage ); + QWhatsThis::add( switchGroup, i18n("<li><p>If you select \
<b>Manual transition to next step or slide</b> " + \
"then each transition and effect on a slide, or transition from " + \
"one slide to the next, will require an action. Typically this " + \
"action will be a mouse click, or the space bar.</p></li>" + \
"<li><p>If you select <b>Automatic transition to next step or slide</b> " + \
"then the presentation will automatically sequence each transition " + \
"and effect on a slide, and will automatically transition to the " + \
"next slide when the current slide is fully displayed. The speed " + \
"of sequencing is controlled using the slider below. This also " + \
"enables the option to automatically loop back to the first " + \
"slide after the last slide has been shown.</p></li>") ); + m_manualButton = new \
QRadioButton( i18n("&Manual transition to next step or slide"), switchGroup ); + \
m_manualButton->setChecked( m_doc->spManualSwitch() ); + m_autoButton = new \
QRadioButton( i18n("&Automatic transition to next step or slide"), switchGroup ); +
+ QLabel *speedLabel = new QLabel( i18n("Speed:"), generalPage );
+ QWhatsThis::add( speedLabel, i18n("<p>This slider allows you to configure the \
speed " + "of transition through the \
presentation.</p>") );
QWidget* sp = new QWidget( generalPage );
QBoxLayout* speedLayout = new QHBoxLayout( sp, 0, spacingHint() );
speedLayout->setAutoAdd( true );
- new QLabel( i18n("Slow"), sp );
+ QLabel *slowLabel = new QLabel( i18n("Slow"), sp );
speedSlider = new QSlider( 1, 10, 1, 1, Qt::Horizontal, sp );
speedSlider->setValue( m_doc->getPresSpeed() );
speedSlider->setTickmarks( QSlider::Below );
speedSlider->setTickInterval( 1 );
- new QLabel( i18n("Fast"), sp );
+ QLabel *fastLabel = new QLabel( i18n("Fast"), sp );
+ QWhatsThis::add( speedSlider, i18n("<p>This slider allows you to configure the \
speed " + "of transition through the \
presentation.</p>" ) ); + QWhatsThis::add( slowLabel, i18n("<p>This slider allows \
you to configure the speed " + "of transition \
through the presentation.</p>" ) ); + QWhatsThis::add( fastLabel, i18n("<p>This \
slider allows you to configure the speed " + "of \
transition through the presentation.</p>" ) ); +
+ infiniteLoop = new QCheckBox( i18n( "&Infinite loop" ), generalPage );
+ QWhatsThis::add( infiniteLoop, i18n("<p>If this checkbox is selected, then the \
slideshow " + "will restart at the first slide \
after the last slide " + "has been displayed. \
It is only available if the " + "<b>Automatic \
transition to next step or slide</b> " + \
"button is selected above.</p> <p>This option may be " + \
"useful if you are running a promotional display.</p>") ); + \
infiniteLoop->setChecked( m_doc->spInfiniteLoop() ); + infiniteLoop->setEnabled( \
!m_doc->spManualSwitch() ); + connect( m_autoButton, SIGNAL( toggled(bool) ), \
infiniteLoop, SLOT( setEnabled(bool) ) ); +
+ presentationDuration = new QCheckBox( i18n( "Measure presentation &duration" ), \
generalPage ); + QWhatsThis::add( presentationDuration, i18n("<p>If this checkbox \
is selected, the time that " + "each \
slide was displayed for, and the total time " + \
"for the presentation will be measured.</p> " + \
"<p>The times will be displayed at the end of the " + \
"presentation.</p> " + "<p>This can be \
used during rehersal to check " + \
"coverage for each issue in the presentation, " + \
"and to verify that the presentation duration " + \
"is correct.</p>" ) ); + presentationDuration->setChecked( \
m_doc->presentationDuration() );
// presentation pen (color and width)
QGroupBox* penGroup = new QGroupBox( 1, Qt::Horizontal, i18n("Presentation Pen") \
, generalPage ); + QWhatsThis::add( penGroup, i18n("<p>This part of the dialog \
allows you to configure the " + "<em>drawing \
mode</em>, which allows you to add additional " + \
"information, emphasise particular content, or to correct " + \
"errors during the presentation by drawing on the slides " + \
"using the mouse.</p>" + "<p>You can configure the \
color of the drawing pen and the " + "width of the \
pen.</p>" ) ); penGroup->setInsideSpacing( KDialog::spacingHint() );
penGroup->setInsideMargin( KDialog::marginHint() );
penGroup->setFlat(true);
@@ -104,8 +156,12 @@ void PgConfDia::setupPageGeneral()
void PgConfDia::setupPageSlides()
{
QFrame* slidesPage = addPage( i18n("&Slides") );
+ QWhatsThis::add( slidesPage, i18n("<p>This dialog allows you to configure which \
slides " + "are used in the presentation. Slides \
that are not " + "selected will not be displayed \
during the slide " + "show.</p>") );
QVBoxLayout *slidesLayout = new QVBoxLayout( slidesPage, 0, spacingHint() );
slidesLayout->setAutoAdd( true );
slides = new QListView( slidesPage );
@@ -145,9 +201,9 @@ bool PgConfDia::getInfiniteLoop() const
}
bool PgConfDia::getManualSwitch() const
{
- return manualSwitch->isChecked();
+ return m_manualButton->isChecked();
}
bool PgConfDia::getPresentationDuration() const
{
@@ -196,13 +252,8 @@ void PgConfDia::deselectAllSlides()
item = item->nextSibling();
}
}
-void PgConfDia::manualSwitchToggled( bool state )
-{
- infiniteLoop->setEnabled( !state );
-}
-
PresSpeed PgConfDia::getPresSpeed() const
{
int value = speedSlider->value();
if( value <= 0 ) value = 1;
Index: pgconfdia.h
===================================================================
RCS file: /home/kde/koffice/kpresenter/pgconfdia.h,v
retrieving revision 1.34
diff -u -4 -p -r1.34 pgconfdia.h
--- pgconfdia.h 27 Aug 2003 14:45:40 -0000 1.34
+++ pgconfdia.h 29 Apr 2004 08:01:44 -0000
@@ -35,8 +35,9 @@ class KPresenterDoc;
class QCheckBox;
class QComboBox;
class QColor;
class QListView;
+class QRadioButton;
class KIntNumInput;
class KColorButton;
class QSlider;
@@ -60,9 +61,10 @@ public:
protected:
KPresenterDoc* m_doc;
- QCheckBox *infiniteLoop, *manualSwitch, *presentationDuration;
+ QCheckBox *infiniteLoop, *presentationDuration;
+ QRadioButton *m_manualButton, *m_autoButton;
KColorButton* penColor;
KIntNumInput* penWidth;
QListView *slides;
@@ -79,9 +81,7 @@ signals:
protected slots:
void selectAllSlides();
void deselectAllSlides();
- void manualSwitchToggled( bool state );
-
};
#endif
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic