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

* src/frontends/qt4/QBranches.C:

Browse Source 
- 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
This commit is contained in:
Jürgen Spitzmüller 2006-11-04 15:08:53 +00:00
parent dfee517417
commit fd5b78d42b
4 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Status.15x
View File

@ -210,4 +210,8 @@ focus.
* No icon for "note-next" in the "review" toolbar * No icon for "note-next" in the "review" toolbar
ADDED (JSpitzm 2006-11-04). ADDED (JSpitzm 2006-11-04).
* Branches gui broken (buttons do nothing)
FIXED (JSpitzm 2006-11-04).

34
src/frontends/qt4/QBranches.C
View File

@ -38,9 +38,11 @@ QBranches::QBranches(QWidget * parent, Qt::WFlags f)
: QWidget(parent, f) : QWidget(parent, f)
{ {
setupUi(this); setupUi(this);
branchesTW->setColumnCount(2); branchesTW->setColumnCount(3);
branchesTW->headerItem()->setText(0, qt_("Branch")); branchesTW->headerItem()->setText(0, qt_("Branch"));
branchesTW->headerItem()->setText(1, qt_("Activated")); 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)
@ -73,13 +75,15 @@ void QBranches::update()
QColor const itemcolor = rgb2qcolor(it->getColor()); QColor const itemcolor = rgb2qcolor(it->getColor());
if (itemcolor.isValid()) { 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 // emit signal
changed(); changed();
@ -122,9 +126,12 @@ void QBranches::on_activatePB_pressed()
} }
void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int /*col*/) void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int col)
{ {
toggleBranch(item); if (col < 2)
toggleBranch(item);
else
toggleColor(item);
} }
@ -147,11 +154,16 @@ void QBranches::toggleBranch(QTreeWidgetItem * item)
void QBranches::on_colorPB_clicked() void QBranches::on_colorPB_clicked()
{ {
QTreeWidgetItem * selItem = toggleColor(branchesTW->currentItem());
branchesTW->currentItem(); }
QString sel_branch;
if (selItem != 0)
sel_branch = selItem->text(0); void QBranches::toggleColor(QTreeWidgetItem * item)
{
if (item == 0)
return;
QString sel_branch = item->text(0);
if (!sel_branch.isEmpty()) { if (!sel_branch.isEmpty()) {
docstring current_branch = qstring_to_ucs4(sel_branch); docstring current_branch = qstring_to_ucs4(sel_branch);
Branch * branch = Branch * branch =

1
src/frontends/qt4/QBranches.h
View File

@ -45,6 +45,7 @@ Q_SIGNALS:
protected: protected:
void toggleBranch(QTreeWidgetItem *); void toggleBranch(QTreeWidgetItem *);
void toggleColor(QTreeWidgetItem *);
void update(); void update();
protected Q_SLOTS: protected Q_SLOTS:

4
src/frontends/qt4/QDocumentDialog.C
View File

@ -372,12 +372,10 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
} }
} }
// branches
branchesModule = new QBranches; branchesModule = new QBranches;
connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor())); connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
// preamble // preamble
preambleModule = new UiWidget<Ui::PreambleUi>; preambleModule = new UiWidget<Ui::PreambleUi>;
connect(preambleModule->preambleTE, SIGNAL(textChanged()), this, SLOT(change_adaptor())); connect(preambleModule->preambleTE, SIGNAL(textChanged()), this, SLOT(change_adaptor()));