setting bullets now work in dialog. preview is rotten.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5613 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2002-11-12 10:12:06 +00:00
parent 1c687db9ad
commit 71a377eab3
9 changed files with 485 additions and 149 deletions

View File

@ -1,5 +1,5 @@
/** /**
* \file QBulletsModule.C * \file BulletsModule.C
* This file is part of LyX, the document processor. * This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING. * Licence details can be found in the file COPYING.
* *
@ -18,16 +18,17 @@
#include <qpopupmenu.h> #include <qpopupmenu.h>
#include <qpixmap.h> #include <qpixmap.h>
#include <qtoolbutton.h> #include <qtoolbutton.h>
#include <qlineedit.h>
#include <qcombobox.h>
#include "BulletsModule.h" #include "BulletsModule.h"
#include "ui/BulletsModuleBase.h" #include "ui/BulletsModuleBase.h"
#include "QBrowseBox.h" #include "QBrowseBox.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "bulletstrings.h"
BulletsModule::BulletsModule(QWidget * parent, char const * name, WFlags fl) BulletsModule::BulletsModule(QWidget * parent, char const * name, WFlags fl)
: BulletsModuleBase(parent, name, fl) : BulletsModuleBase(parent, name, fl), le_(bullet1LE)
{ {
QPopupMenu * pm = new QPopupMenu(this); QPopupMenu * pm = new QPopupMenu(this);
QPopupMenu * pm1 = new QPopupMenu(pm); QPopupMenu * pm1 = new QPopupMenu(pm);
@ -37,19 +38,19 @@ BulletsModule::BulletsModule(QWidget * parent, char const * name, WFlags fl)
QPopupMenu * pm5 = new QPopupMenu(pm); QPopupMenu * pm5 = new QPopupMenu(pm);
QPopupMenu * pm6 = new QPopupMenu(pm); QPopupMenu * pm6 = new QPopupMenu(pm);
standard = new QBrowseBox(6, 6, pm1); standard_ = new QBrowseBox(6, 6, pm1);
maths = new QBrowseBox(6, 6, pm2); maths_ = new QBrowseBox(6, 6, pm2);
ding1 = new QBrowseBox(6, 6, pm3); ding1_ = new QBrowseBox(6, 6, pm3);
ding2 = new QBrowseBox(6, 6, pm4); ding2_ = new QBrowseBox(6, 6, pm4);
ding3 = new QBrowseBox(6, 6, pm5); ding3_ = new QBrowseBox(6, 6, pm5);
ding4 = new QBrowseBox(6, 6, pm6); ding4_ = new QBrowseBox(6, 6, pm6);
pm1->insertItem(standard); pm1->insertItem(standard_);
pm2->insertItem(maths); pm2->insertItem(maths_);
pm3->insertItem(ding1); pm3->insertItem(ding1_);
pm4->insertItem(ding2); pm4->insertItem(ding2_);
pm5->insertItem(ding3); pm5->insertItem(ding3_);
pm6->insertItem(ding4); pm6->insertItem(ding4_);
pm->insertItem("Standard", pm1); pm->insertItem("Standard", pm1);
pm->insertItem("Maths", pm2); pm->insertItem("Maths", pm2);
@ -66,25 +67,52 @@ BulletsModule::BulletsModule(QWidget * parent, char const * name, WFlags fl)
// insert pixmaps // insert pixmaps
string bmfile; string bmfile;
bmfile = LibFileSearch("images", "standard", "xpm"); bmfile = LibFileSearch("images", "standard", "xpm");
standard->insertItem(QPixmap(bmfile.c_str())); standard_->insertItem(QPixmap(bmfile.c_str()));
bmfile = LibFileSearch("images", "amssymb", "xpm"); bmfile = LibFileSearch("images", "amssymb", "xpm");
maths->insertItem(QPixmap(bmfile.c_str())); maths_->insertItem(QPixmap(bmfile.c_str()));
bmfile = LibFileSearch("images", "psnfss1", "xpm"); bmfile = LibFileSearch("images", "psnfss1", "xpm");
ding1->insertItem(QPixmap(bmfile.c_str())); ding1_->insertItem(QPixmap(bmfile.c_str()));
bmfile = LibFileSearch("images", "psnfss2", "xpm"); bmfile = LibFileSearch("images", "psnfss2", "xpm");
ding2->insertItem(QPixmap(bmfile.c_str())); ding2_->insertItem(QPixmap(bmfile.c_str()));
bmfile = LibFileSearch("images", "psnfss3", "xpm"); bmfile = LibFileSearch("images", "psnfss3", "xpm");
ding3->insertItem(QPixmap(bmfile.c_str())); ding3_->insertItem(QPixmap(bmfile.c_str()));
bmfile = LibFileSearch("images", "psnfss4", "xpm"); bmfile = LibFileSearch("images", "psnfss4", "xpm");
ding4->insertItem(QPixmap(bmfile.c_str())); ding4_->insertItem(QPixmap(bmfile.c_str()));
connect(standard, SIGNAL(selected(int, int)), connect(standard_, SIGNAL(selected(int, int)),
this, SLOT(checkThis(int, int))); this, SLOT(standard(int, int)));
connect(maths_, SIGNAL(selected(int, int)),
this, SLOT(maths(int, int)));
connect(ding1_, SIGNAL(selected(int, int)),
this, SLOT(ding1(int, int)));
connect(ding2_, SIGNAL(selected(int, int)),
this, SLOT(ding2(int, int)));
connect(ding3_, SIGNAL(selected(int, int)),
this, SLOT(ding3(int, int)));
connect(ding4_, SIGNAL(selected(int, int)),
this, SLOT(ding4(int, int)));
connect(setbullet1TB, SIGNAL(pressed()),
this, SLOT(setlevel1()));
connect(setbullet2TB, SIGNAL(pressed()),
this, SLOT(setlevel2()));
connect(setbullet3TB, SIGNAL(pressed()),
this, SLOT(setlevel3()));
connect(setbullet4TB, SIGNAL(pressed()),
this, SLOT(setlevel4()));
} }
@ -93,14 +121,53 @@ BulletsModule::~BulletsModule()
{ {
} }
void BulletsModule::standard(int row, int col)
void BulletsModule::setLevel1()
{ {
qWarning("no setLevel1() yet"); le_->setText(bullets_standard[6*row + col]);
} }
void BulletsModule::maths(int row, int col)
void BulletsModule::checkThis(int x, int y)
{ {
qWarning("Check, x: %d y: %d ", x, y); le_->setText(bullets_amssymb[6*row + col]);
} }
void BulletsModule::ding1(int row, int col)
{
le_->setText(bullets_psnfss1[6*row + col]);
}
void BulletsModule::ding2(int row, int col)
{
le_->setText(bullets_psnfss2[6*row + col]);
}
void BulletsModule::ding3(int row, int col)
{
le_->setText(bullets_psnfss3[6*row + col]);
}
void BulletsModule::ding4(int row, int col)
{
le_->setText(bullets_psnfss4[6*row + col]);
}
void BulletsModule::setlevel1()
{
le_ = bullet1LE;
}
void BulletsModule::setlevel2()
{
le_ = bullet2LE;
}
void BulletsModule::setlevel3()
{
le_ = bullet3LE;
}
void BulletsModule::setlevel4()
{
le_ = bullet4LE;
}

View File

@ -18,8 +18,11 @@
#include "ui/BulletsModuleBase.h" #include "ui/BulletsModuleBase.h"
#include "LString.h" #include "LString.h"
#include <vector>
class QBrowseBox; class QBrowseBox;
class QLineEdit;
class BulletsModule : public BulletsModuleBase { class BulletsModule : public BulletsModuleBase {
Q_OBJECT Q_OBJECT
@ -28,17 +31,39 @@ public:
WFlags fl = 0); WFlags fl = 0);
~BulletsModule(); ~BulletsModule();
public slots: protected slots:
void checkThis(int,int); ///
void setLevel1(); void standard(int row, int col);
///
void maths(int row, int col);
///
void ding1(int row, int col);
///
void ding2(int row, int col);
///
void ding3(int row, int col);
///
void ding4(int row, int col);
///
void setlevel1();
///
void setlevel2();
///
void setlevel3();
///
void setlevel4();
private: private:
QBrowseBox * standard; QLineEdit * le_;
QBrowseBox * maths;
QBrowseBox * ding1; QBrowseBox * standard_;
QBrowseBox * ding2; QBrowseBox * maths_;
QBrowseBox * ding3; QBrowseBox * ding1_;
QBrowseBox * ding4; QBrowseBox * ding2_;
QBrowseBox * ding3_;
QBrowseBox * ding4_;
}; };
#endif // BULLETSMODULE_H #endif // BULLETSMODULE_H

View File

@ -1,3 +1,14 @@
2002-11-12 Edwin Leuven <leuven@fee.uva.nl>
* BulletsModule.C: more bullet changes
* BulletsModule.h
* Makefile.am
* QDocument.C
* QDocumentDialog.C
* bulletstrings.C
* bulletstrings.h
* ui/BulletsModuleBase.ui
2002-11-12 Edwin Leuven <leuven@fee.uva.nl> 2002-11-12 Edwin Leuven <leuven@fee.uva.nl>
* QBrowseBox: Juergen Spitzmueller's mouse focus fix * QBrowseBox: Juergen Spitzmueller's mouse focus fix

View File

@ -20,6 +20,8 @@ libqt2_la_SOURCES = \
Alert_pimpl.C \ Alert_pimpl.C \
qgridview.h \ qgridview.h \
qgridview.cpp \ qgridview.cpp \
bulletstrings.h \
bulletstrings.C \
BulletsModule.C \ BulletsModule.C \
BulletsModule.h \ BulletsModule.h \
QBrowseBox.C \ QBrowseBox.C \

View File

@ -204,10 +204,15 @@ void QDocument::apply()
dialog_->numberingModule->sectionnrDepthSB->value(); dialog_->numberingModule->sectionnrDepthSB->value();
// bullets // bullets
//BufferParams & param = lv_.buffer()->params; params.user_defined_bullets[0].setText(dialog_->bulletsModule->bullet1LE->text().latin1());
//param.temp_bullets[current_bullet_depth]. params.user_defined_bullets[1].setText(dialog_->bulletsModule->bullet2LE->text().latin1());
// setText(getString(bullets_->input_bullet_latex)); params.user_defined_bullets[2].setText(dialog_->bulletsModule->bullet3LE->text().latin1());
params.user_defined_bullets[3].setText(dialog_->bulletsModule->bullet4LE->text().latin1());
params.user_defined_bullets[0].setSize(dialog_->bulletsModule->bulletsize1CO->currentItem()-1);
params.user_defined_bullets[1].setSize(dialog_->bulletsModule->bulletsize2CO->currentItem()-1);
params.user_defined_bullets[2].setSize(dialog_->bulletsModule->bulletsize3CO->currentItem()-1);
params.user_defined_bullets[3].setSize(dialog_->bulletsModule->bulletsize4CO->currentItem()-1);
// packages // packages
switch (dialog_->packagesModule->lspacingCO->currentItem()) { switch (dialog_->packagesModule->lspacingCO->currentItem()) {
@ -428,30 +433,26 @@ void QDocument::update_contents()
params.tocdepth); params.tocdepth);
// bullets // bullets
QString s = params.user_defined_bullets[0].getText().c_str(); QString s;
s = params.user_defined_bullets[0].getText().c_str();
dialog_->bulletsModule->bullet1LE->setText(s); dialog_->bulletsModule->bullet1LE->setText(s);
s = params.user_defined_bullets[1].getText().c_str(); s = params.user_defined_bullets[1].getText().c_str();
dialog_->bulletsModule->bullet2LE->setText(s); dialog_->bulletsModule->bullet2LE->setText(s);
s = params.user_defined_bullets[2].getText().c_str(); s = params.user_defined_bullets[2].getText().c_str();
dialog_->bulletsModule->bullet3LE->setText(s); dialog_->bulletsModule->bullet3LE->setText(s);
s = params.user_defined_bullets[3].getText().c_str(); s = params.user_defined_bullets[3].getText().c_str();
dialog_->bulletsModule->bullet4LE->setText(s); dialog_->bulletsModule->bullet4LE->setText(s);
dialog_->bulletsModule->bulletsize1CO->setCurrentItem( dialog_->bulletsModule->bulletsize1CO->setCurrentItem(
params.user_defined_bullets[0].getSize() + 1); params.user_defined_bullets[0].getSize() + 1);
dialog_->bulletsModule->bulletsize2CO->setCurrentItem( dialog_->bulletsModule->bulletsize2CO->setCurrentItem(
params.user_defined_bullets[1].getSize() + 1); params.user_defined_bullets[1].getSize() + 1);
dialog_->bulletsModule->bulletsize3CO->setCurrentItem( dialog_->bulletsModule->bulletsize3CO->setCurrentItem(
params.user_defined_bullets[2].getSize() + 1); params.user_defined_bullets[2].getSize() + 1);
dialog_->bulletsModule->bulletsize4CO->setCurrentItem( dialog_->bulletsModule->bulletsize4CO->setCurrentItem(
params.user_defined_bullets[3].getSize() + 1); params.user_defined_bullets[3].getSize() + 1);
// packages // packages
QStringList enc; QStringList enc;
enc << "default" << "auto" << "latin1" << "latin2" << "latin3" << enc << "default" << "auto" << "latin1" << "latin2" << "latin3" <<

View File

@ -250,6 +250,17 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
connect( paperModule->facingPagesCB, SIGNAL( toggled(bool) ), connect( paperModule->facingPagesCB, SIGNAL( toggled(bool) ),
this , SLOT( change_adaptor() ) ); this , SLOT( change_adaptor() ) );
/* bullets */
connect( bulletsModule->bullet1LE, SIGNAL( textChanged(const QString&) ),
this , SLOT( change_adaptor() ) );
connect( bulletsModule->bulletsize1CO, SIGNAL( activated(int) ),
this , SLOT( change_adaptor() ) );
/*
connect( bulletsModule->levelSP, SIGNAL( valueChanged(int) ),
this , SLOT( setBullet(int) ) );
connect( bulletsModule->levelSP, SIGNAL( valueChanged(int) ),
this , SLOT( setBulletSize(int) ) );
*/
} }

View File

@ -0,0 +1,129 @@
#include "bulletstrings.h"
char const * bullets_standard[36] = {
/* standard */
"\\normalfont\\bfseries{--}", "\\(\\vdash\\)",
"\\(\\dashv\\)", "\\(\\flat\\)", "\\(\\natural\\)",
"\\(\\sharp\\)", "\\(\\ast\\)", "\\(\\star\\)",
"\\(\\bullet\\)", "\\(\\circ\\)", "\\(\\cdot\\)",
"\\(\\dagger\\)", "\\(\\bigtriangleup\\)",
"\\(\\bigtriangledown\\)", "\\(\\triangleleft\\)",
"\\(\\triangleright\\)", "\\(\\lhd\\)", "\\(\\rhd\\)",
"\\(\\oplus\\)", "\\(\\ominus\\)", "\\(\\otimes\\)",
"\\(\\oslash\\)", "\\(\\odot\\)", "\\(\\spadesuit\\)",
"\\(\\diamond\\)", "\\(\\Diamond\\)", "\\(\\Box\\)",
"\\(\\diamondsuit\\)", "\\(\\heartsuit\\)",
"\\(\\clubsuit\\)", "\\(\\rightarrow\\)", "\\(\\leadsto\\)",
"\\(\\rightharpoonup\\)", "\\(\\rightharpoondown\\)",
"\\(\\Rightarrow\\)", "\\(\\succ\\)"
};
char const * bullets_amssymb[36] = {
/* amssymb */
"\\(\\Rrightarrow\\)", "\\(\\rightarrowtail\\)",
"\\(\\twoheadrightarrow\\)", "\\(\\rightsquigarrow\\)",
"\\(\\looparrowright\\)", "\\(\\multimap\\)",
"\\(\\boxtimes\\)", "\\(\\boxplus\\)", "\\(\\boxminus\\)",
"\\(\\boxdot\\)", "\\(\\divideontimes\\)", "\\(\\Vvdash\\)",
"\\(\\lessdot\\)", "\\(\\gtrdot\\)", "\\(\\maltese\\)",
"\\(\\bigstar\\)", "\\(\\checkmark\\)", "\\(\\Vdash\\)",
"\\(\\backsim\\)", "\\(\\thicksim\\)",
"\\(\\centerdot\\)", "\\(\\circleddash\\)",
"\\(\\circledast\\)", "\\(\\circledcirc\\)",
"\\(\\vartriangleleft\\)", "\\(\\vartriangleright\\)",
"\\(\\vartriangle\\)", "\\(\\triangledown\\)",
"\\(\\lozenge\\)", "\\(\\square\\)", "\\(\\blacktriangleleft\\)",
"\\(\\blacktriangleright\\)", "\\(\\blacktriangle\\)",
"\\(\\blacktriangledown\\)", "\\(\\blacklozenge\\)",
"\\(\\blacksquare\\)"
};
char const * bullets_psnfss1[36] = {
/* psnfss1 */
"\\ding{108}", "\\ding{109}",
"\\ding{119}", "\\Pisymbol{psy}{197}",
"\\Pisymbol{psy}{196}", "\\Pisymbol{psy}{183}",
"\\ding{71}", "\\ding{70}",
"\\ding{118}", "\\ding{117}",
"\\Pisymbol{psy}{224}", "\\Pisymbol{psy}{215}",
"\\ding{111}", "\\ding{112}",
"\\ding{113}", "\\ding{114}",
"\\Pisymbol{psy}{68}", "\\Pisymbol{psy}{209}",
"\\ding{120}", "\\ding{121}",
"\\ding{122}", "\\ding{110}",
"\\ding{115}", "\\ding{116}",
"\\Pisymbol{psy}{42}", "\\ding{67}",
"\\ding{66}", "\\ding{82}",
"\\ding{81}", "\\ding{228}",
"\\ding{162}", "\\ding{163}",
"\\ding{166}", "\\ding{167}",
"\\ding{226}", "\\ding{227}"
};
char const * bullets_psnfss2[36] = {
/* psnfss2 */
"\\ding{37}", "\\ding{38}",
"\\ding{34}", "\\ding{36}",
"\\ding{39}", "\\ding{40}",
"\\ding{41}", "\\ding{42}",
"\\ding{43}", "\\ding{44}",
"\\ding{45}", "\\ding{47}",
"\\ding{53}", "\\ding{54}",
"\\ding{59}", "\\ding{57}",
"\\ding{62}", "\\ding{61}",
"\\ding{55}", "\\ding{56}",
"\\ding{58}", "\\ding{60}",
"\\ding{63}", "\\ding{64}",
"\\ding{51}", "\\ding{52}",
"\\Pisymbol{psy}{170}", "\\Pisymbol{psy}{167}",
"\\Pisymbol{psy}{168}", "\\Pisymbol{psy}{169}",
"\\ding{164}", "\\ding{165}",
"\\ding{171}", "\\ding{168}",
"\\ding{169}", "\\ding{170}"
};
char const * bullets_psnfss3[36] = {
/* psnfss3 */
"\\ding{65}", "\\ding{76}",
"\\ding{75}", "\\ding{72}",
"\\ding{80}", "\\ding{74}",
"\\ding{78}", "\\ding{77}",
"\\ding{79}", "\\ding{85}",
"\\ding{90}", "\\ding{98}",
"\\ding{83}", "\\ding{84}",
"\\ding{86}", "\\ding{87}",
"\\ding{88}", "\\ding{89}",
"\\ding{92}", "\\ding{91}",
"\\ding{93}", "\\ding{105}",
"\\ding{94}", "\\ding{99}",
"\\ding{103}", "\\ding{104}",
"\\ding{106}", "\\ding{107}",
"\\ding{68}", "\\ding{69}",
"\\ding{100}", "\\ding{101}",
"\\ding{102}", "\\ding{96}",
"\\ding{95}", "\\ding{97}"
};
char const * bullets_psnfss4[36] = {
/* psnfss4 */
"\\ding{223}", "\\ding{224}",
"\\ding{225}", "\\ding{232}",
"\\ding{229}", "\\ding{230}",
"\\ding{238}", "\\ding{237}",
"\\ding{236}", "\\ding{235}",
"\\ding{234}", "\\ding{233}",
"\\ding{239}", "\\ding{241}",
"\\ding{250}", "\\ding{251}",
"\\ding{49}", "\\ding{50}",
"\\ding{217}", "\\ding{245}",
"\\ding{243}", "\\ding{248}",
"\\ding{252}", "\\ding{253}",
"\\ding{219}", "\\ding{213}",
"\\ding{221}", "\\ding{222}",
"\\ding{220}", "\\ding{212}",
"\\Pisymbol{psy}{174}", "\\Pisymbol{psy}{222}",
"\\ding{254}", "\\ding{242}",
"\\ding{231}", "\\Pisymbol{psy}{45}"
};
char const ** BulletPanels[6] = {
bullets_standard, bullets_amssymb,
bullets_psnfss1, bullets_psnfss2,
bullets_psnfss3, bullets_psnfss4
};

View File

@ -0,0 +1,27 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#ifndef BULLET_STRINGS
#define BULLET_STRINGS
#ifdef __GNUG__
#pragma interface
#endif
extern char const * bullets_standard[];
extern char const * bullets_amssymb[];
extern char const * bullets_psnfss1[];
extern char const * bullets_psnfss2[];
extern char const * bullets_psnfss3[];
extern char const * bullets_psnfss4[];
extern char const ** BulletPanels[];
#endif // BULLET_STRINGS

View File

@ -13,7 +13,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>291</width> <width>308</width>
<height>176</height> <height>176</height>
</rect> </rect>
</property> </property>
@ -34,43 +34,7 @@
<name>spacing</name> <name>spacing</name>
<number>6</number> <number>6</number>
</property> </property>
<widget row="1" column="1" > <spacer row="5" column="0" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet1LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
</widget>
<widget row="0" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>sizeL</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Size:</string>
</property>
</widget>
<widget row="0" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>latexL</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>LaTeX:</string>
</property>
</widget>
<spacer row="6" column="1" >
<property> <property>
<name>name</name> <name>name</name>
<cstring>Spacer25</cstring> <cstring>Spacer25</cstring>
@ -91,18 +55,52 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget row="3" column="1" > <widget row="0" column="1" >
<class>QLineEdit</class> <class>QLabel</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>bullet3LE</cstring> <cstring>latexL</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Bullet (LaTeX):</string>
</property>
<property>
<name>buddy</name>
<cstring>bullet1LE</cstring>
</property> </property>
</widget> </widget>
<widget row="4" column="1" > <widget row="0" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>sizeL</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Si&amp;ze:</string>
</property>
<property>
<name>buddy</name>
<cstring>bulletsize1CO</cstring>
</property>
</widget>
<widget row="1" column="1" >
<class>QLineEdit</class> <class>QLineEdit</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>bullet4LE</cstring> <cstring>bullet1LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 1 bullet</string>
</property> </property>
</widget> </widget>
<widget row="2" column="1" > <widget row="2" column="1" >
@ -111,65 +109,52 @@
<name>name</name> <name>name</name>
<cstring>bullet2LE</cstring> <cstring>bullet2LE</cstring>
</property> </property>
</widget>
<widget row="2" column="0" >
<class>QToolButton</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>sizePolicy</name>
<cstring>setbullet2TB</cstring> <sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property> </property>
<property stdset="1"> <property>
<name>text</name> <name>toolTip</name>
<string>Set Level 2</string> <string>Level 2 bullet</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
</property> </property>
</widget> </widget>
<widget row="3" column="0" > <widget row="3" column="1" >
<class>QToolButton</class> <class>QLineEdit</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>setbullet3TB</cstring> <cstring>bullet3LE</cstring>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>sizePolicy</name>
<string>Set Level 3</string> <sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property> </property>
<property stdset="1"> <property>
<name>popupDelay</name> <name>toolTip</name>
<number>1</number> <string>Level 3 bullet</string>
</property> </property>
</widget> </widget>
<widget row="4" column="0" > <widget row="4" column="1" >
<class>QToolButton</class> <class>QLineEdit</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>setbullet4TB</cstring> <cstring>bullet4LE</cstring>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>sizePolicy</name>
<string>Set Level 4</string> <sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property> </property>
<property stdset="1"> <property>
<name>popupDelay</name> <name>toolTip</name>
<number>1</number> <string>Level 4 bullet</string>
</property>
</widget>
<widget row="1" column="0" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet1TB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level 1</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
</property> </property>
</widget> </widget>
<widget row="1" column="2" > <widget row="1" column="2" >
@ -244,6 +229,10 @@
<name>name</name> <name>name</name>
<cstring>bulletsize1CO</cstring> <cstring>bulletsize1CO</cstring>
</property> </property>
<property>
<name>toolTip</name>
<string>Level 1 bullet size</string>
</property>
</widget> </widget>
<widget row="2" column="2" > <widget row="2" column="2" >
<class>QComboBox</class> <class>QComboBox</class>
@ -317,6 +306,10 @@
<name>name</name> <name>name</name>
<cstring>bulletsize2CO</cstring> <cstring>bulletsize2CO</cstring>
</property> </property>
<property>
<name>toolTip</name>
<string>Level 2 bullet size</string>
</property>
</widget> </widget>
<widget row="3" column="2" > <widget row="3" column="2" >
<class>QComboBox</class> <class>QComboBox</class>
@ -390,6 +383,10 @@
<name>name</name> <name>name</name>
<cstring>bulletsize3CO</cstring> <cstring>bulletsize3CO</cstring>
</property> </property>
<property>
<name>toolTip</name>
<string>Level 3 bullet size</string>
</property>
</widget> </widget>
<widget row="4" column="2" > <widget row="4" column="2" >
<class>QComboBox</class> <class>QComboBox</class>
@ -463,21 +460,87 @@
<name>name</name> <name>name</name>
<cstring>bulletsize4CO</cstring> <cstring>bulletsize4CO</cstring>
</property> </property>
<property>
<name>toolTip</name>
<string>Level 4 bullet size</string>
</property>
</widget>
<widget row="1" column="0" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet1TB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;1...</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
</property>
<property>
<name>toolTip</name>
<string>Shows menu with bullet options</string>
</property>
</widget>
<widget row="2" column="0" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet2TB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;2...</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
</property>
<property>
<name>toolTip</name>
<string>Shows menu with bullet options</string>
</property>
</widget>
<widget row="3" column="0" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet3TB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;3...</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
</property>
<property>
<name>toolTip</name>
<string>Shows menu with bullet options</string>
</property>
</widget>
<widget row="4" column="0" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet4TB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;4...</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
</property>
<property>
<name>toolTip</name>
<string>Shows menu with bullet options</string>
</property>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<connections>
<connection>
<sender>setbullet1TB</sender>
<signal>pressed()</signal>
<receiver>BulletsModuleBase</receiver>
<slot>setLevel1()</slot>
</connection>
<slot access="public">setLevel1()</slot>
<slot access="public">setLevel2()</slot>
<slot access="public">setLevel3()</slot>
<slot access="public">setLevel4()</slot>
<slot access="public">setLevel5()</slot>
<slot access="public">updateBulletSet(int)</slot>
</connections>
</UI> </UI>