anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve feedback when trying to create a custom bullet.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9886 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-04-28 15:34:19 +00:00
parent 076c15b63c
commit 48f1b22d5d
3 changed files with 72 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/frontends/qt2/BulletsModule.C
View File

@ -30,7 +30,8 @@ using std::string;
BulletsModule::BulletsModule(QWidget * parent, const char * name, WFlags fl)
: BulletsModuleBase(parent, name, fl), tmpbulletset(0)
: BulletsModuleBase(parent, name, fl), tmpbulletset(0),
bullet_pressed_(0)
{
for (int iter = 0; iter < 4; ++iter) {
bullets_[iter] = ITEMIZE_DEFAULTS[iter];
@ -69,9 +70,16 @@ BulletsModule::BulletsModule(QWidget * parent, const char * name, WFlags fl)
// FIXME: make this checkable
pm->insertItem(qt_("&Custom..."), this, SLOT(setCustom()), 0, 6);
connect(bullet1PB, SIGNAL(pressed()), this, SLOT(clicked1()));
bullet1PB->setPopup(pm);
connect(bullet2PB, SIGNAL(pressed()), this, SLOT(clicked2()));
bullet2PB->setPopup(pm);
connect(bullet3PB, SIGNAL(pressed()), this, SLOT(clicked3()));
bullet3PB->setPopup(pm);
connect(bullet4PB, SIGNAL(pressed()), this, SLOT(clicked4()));
bullet4PB->setPopup(pm);
// insert pixmaps
@ -112,10 +120,10 @@ BulletsModule::BulletsModule(QWidget * parent, const char * name, WFlags fl)
connect(ding4_, SIGNAL(selected(int, int)),
this, SLOT(ding4(int, int)));
connect(bullet1PB, SIGNAL(pressed()), this, SLOT(pressed1()));
connect(bullet2PB, SIGNAL(pressed()), this, SLOT(pressed2()));
connect(bullet3PB, SIGNAL(pressed()), this, SLOT(pressed3()));
connect(bullet4PB, SIGNAL(pressed()), this, SLOT(pressed4()));
connect(bullet1PB, SIGNAL(pressed()), this, SLOT(selected1()));
connect(bullet2PB, SIGNAL(pressed()), this, SLOT(selected2()));
connect(bullet3PB, SIGNAL(pressed()), this, SLOT(selected3()));
connect(bullet4PB, SIGNAL(pressed()), this, SLOT(selected4()));
connect(bulletsize1CO, SIGNAL(activated(int)), this, SLOT(updateSizes()));
connect(bulletsize2CO, SIGNAL(activated(int)), this, SLOT(updateSizes()));
connect(bulletsize3CO, SIGNAL(activated(int)), this, SLOT(updateSizes()));
@ -144,8 +152,33 @@ void BulletsModule::updateSizes()
}
// These arrive before the menus are launched.
void BulletsModule::clicked1()
{
bullet_pressed_ = &bullets_[0];
}
void BulletsModule::clicked2()
{
bullet_pressed_ = &bullets_[1];
}
void BulletsModule::clicked3()
{
bullet_pressed_ = &bullets_[2];
}
void BulletsModule::clicked4()
{
bullet_pressed_ = &bullets_[3];
}
// These arrive *after* the menus have done their work
void BulletsModule::pressed1()
void BulletsModule::selected1()
{
if (!tmpbulletset)
return;
@ -156,7 +189,7 @@ void BulletsModule::pressed1()
}
void BulletsModule::pressed2()
void BulletsModule::selected2()
{
if (!tmpbulletset)
return;
@ -167,7 +200,7 @@ void BulletsModule::pressed2()
}
void BulletsModule::pressed3()
void BulletsModule::selected3()
{
if (!tmpbulletset)
return;
@ -178,7 +211,7 @@ void BulletsModule::pressed3()
}
void BulletsModule::pressed4()
void BulletsModule::selected4()
{
if (!tmpbulletset)
return;
@ -247,7 +280,7 @@ void BulletsModule::setBullet(int level, const Bullet & bullet)
}
Bullet const BulletsModule::getBullet(int level)
Bullet const & BulletsModule::getBullet(int level) const
{
return bullets_[level];
}
@ -299,12 +332,15 @@ void BulletsModule::ding4(int row, int col)
void BulletsModule::setCustom()
{
bool ok = FALSE;
QString const input = bullet_pressed_ ?
toqstr(bullet_pressed_->getText()) : QString::null;
bool ok = false;
QString text = QInputDialog::getText(
qt_( "Bullets" ),
qt_( "Enter a custom bullet" ),
QLineEdit::Normal,
QString::null, &ok, this );
input, &ok, this );
if (!ok)
return;

16
src/frontends/qt2/BulletsModule.h
View File

@ -34,7 +34,7 @@ public:
void setBullet(int level, const Bullet & bullet);
/// get bullet setting
Bullet const getBullet(int level);
Bullet const & getBullet(int level) const;
signals:
void changed();
@ -51,10 +51,15 @@ protected slots:
void updateSizes();
void pressed1();
void pressed2();
void pressed3();
void pressed4();
void clicked1();
void clicked2();
void clicked3();
void clicked4();
void selected1();
void selected2();
void selected3();
void selected4();
/// set custom (text) bullet
void setCustom();
@ -80,6 +85,7 @@ private:
QBrowseBox * ding2_;
QBrowseBox * ding3_;
QBrowseBox * ding4_;
Bullet * bullet_pressed_;
};
#endif // BULLETSMODULE_H

13
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,16 @@
2005-04-28 Angus Leeming <leeming@lyx.org>
* BulletsModule.[Ch] (BulletsModule): emit a signal when the
bullet push buttons are clicked to set the currently-pressed
bullet list.
(clicked1, clicked2, clicked3, clicked4): new slots.
(selected1, selected2, selected3, selected4): rename the old
pressed[1-4] slots.
(setCustom): use the stored information about which button was
pressed to populate the custom dialog with the LaTeX of the
current choice.
(getBullet): return a reference to const.
2005-04-28 Angus Leeming <leeming@lyx.org>
* QLImage.[Ch] (transformed_pixmap_): new variable. The image