- fix item selection after update
- improve gui
* src/frontends/qt4/QBranches.[Ch]: add alterColor method (alter color on double click)
* src/frontends/qt4/QocumentDialog.C: add comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15737
a592a061-630c-0410-9148-
cb99ea01b6c8
* No icon for "note-next" in the "review" toolbar
* No icon for "note-next" in the "review" toolbar
-ADDED (JSpitzm 2006-11-04).
\ No newline at end of file
+ADDED (JSpitzm 2006-11-04).
+
+* Branches gui broken (buttons do nothing)
+
+FIXED (JSpitzm 2006-11-04).
\ No newline at end of file
: QWidget(parent, f)
{
setupUi(this);
: QWidget(parent, f)
{
setupUi(this);
- branchesTW->setColumnCount(2);
+ branchesTW->setColumnCount(3);
branchesTW->headerItem()->setText(0, qt_("Branch"));
branchesTW->headerItem()->setText(1, qt_("Activated"));
branchesTW->headerItem()->setText(0, qt_("Branch"));
branchesTW->headerItem()->setText(1, qt_("Activated"));
+ branchesTW->headerItem()->setText(2, qt_("Color"));
+ branchesTW->setSortingEnabled(true);
}
void QBranches::update(BufferParams const & params)
}
void QBranches::update(BufferParams const & params)
QColor const itemcolor = rgb2qcolor(it->getColor());
if (itemcolor.isValid()) {
QColor const itemcolor = rgb2qcolor(it->getColor());
if (itemcolor.isValid()) {
- QPixmap coloritem(32, 32);
+ QPixmap coloritem(30, 10);
coloritem.fill(itemcolor);
coloritem.fill(itemcolor);
- newItem->setIcon(0, QIcon(coloritem));
+ newItem->setIcon(2, QIcon(coloritem));
}
// restore selected branch
}
// restore selected branch
- if (bname == sel_branch)
+ if (bname == sel_branch) {
+ branchesTW->setCurrentItem(newItem);
branchesTW->setItemSelected(newItem, true);
branchesTW->setItemSelected(newItem, true);
}
// emit signal
changed();
}
// emit signal
changed();
-void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int /*col*/)
+void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int col)
+ if (col < 2)
+ toggleBranch(item);
+ else
+ toggleColor(item);
void QBranches::on_colorPB_clicked()
{
void QBranches::on_colorPB_clicked()
{
- QTreeWidgetItem * selItem =
- branchesTW->currentItem();
- QString sel_branch;
- if (selItem != 0)
- sel_branch = selItem->text(0);
+ toggleColor(branchesTW->currentItem());
+}
+
+
+void QBranches::toggleColor(QTreeWidgetItem * item)
+{
+ if (item == 0)
+ return;
+
+ QString sel_branch = item->text(0);
if (!sel_branch.isEmpty()) {
docstring current_branch = qstring_to_ucs4(sel_branch);
Branch * branch =
if (!sel_branch.isEmpty()) {
docstring current_branch = qstring_to_ucs4(sel_branch);
Branch * branch =
protected:
void toggleBranch(QTreeWidgetItem *);
protected:
void toggleBranch(QTreeWidgetItem *);
+ void toggleColor(QTreeWidgetItem *);
void update();
protected Q_SLOTS:
void update();
protected Q_SLOTS:
branchesModule = new QBranches;
connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
branchesModule = new QBranches;
connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
// preamble
preambleModule = new UiWidget<Ui::PreambleUi>;
connect(preambleModule->preambleTE, SIGNAL(textChanged()), this, SLOT(change_adaptor()));
// preamble
preambleModule = new UiWidget<Ui::PreambleUi>;
connect(preambleModule->preambleTE, SIGNAL(textChanged()), this, SLOT(change_adaptor()));